From 37ee11d541d6902d26883d8a1f464fcffb574db6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 21:16:50 +0000 Subject: [PATCH 01/23] Bump dompurify from 2.4.7 to 2.5.4 Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.4.7 to 2.5.4. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.4.7...2.5.4) --- updated-dependencies: - dependency-name: dompurify dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb501540..a854bb7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "3.3.1", "license": "GPL-2.0-or-later", "dependencies": { - "dompurify": "^2.4.1" + "dompurify": "^2.5.4" }, "devDependencies": { "@babel/core": "^7.16.12", @@ -4819,9 +4819,9 @@ } }, "node_modules/dompurify": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz", - "integrity": "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==" + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.4.tgz", + "integrity": "sha512-l5NNozANzaLPPe0XaAwvg3uZcHtDBnziX/HjsY1UcDj1MxTK8Dd0Kv096jyPK5HRzs/XM5IMj20dW8Fk+HnbUA==" }, "node_modules/electron-to-chromium": { "version": "1.4.640", @@ -12778,9 +12778,9 @@ "dev": true }, "dompurify": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.7.tgz", - "integrity": "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ==" + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.4.tgz", + "integrity": "sha512-l5NNozANzaLPPe0XaAwvg3uZcHtDBnziX/HjsY1UcDj1MxTK8Dd0Kv096jyPK5HRzs/XM5IMj20dW8Fk+HnbUA==" }, "electron-to-chromium": { "version": "1.4.640", diff --git a/package.json b/package.json index ffb7dd84..4a9276d9 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,6 @@ "makepot": "wp i18n make-pot . ./languages/publishpress.pot --domain=publishpress" }, "dependencies": { - "dompurify": "^2.4.1" + "dompurify": "^2.5.4" } } From 2f2132b1da19d1c7721f8812422b03a25508598b Mon Sep 17 00:00:00 2001 From: olatechpro Date: Mon, 30 Sep 2024 23:15:25 +0100 Subject: [PATCH 02/23] Optimize file size --- .../icons/content-icon.svg | 0 common/php/class-module.php | 77 +- modules/calendar/calendar.php | 3344 +---------------- modules/calendar/library/calendar-methods.php | 1569 ++++++++ .../calendar/library/calendar-utilities.php | 1012 +++++ modules/content-board/content-board.php | 1265 +------ .../content-board/lib/content-board-icon.svg | 1 - .../library/content-board-utilities.php | 1255 +++++++ modules/content-overview/content-overview.php | 1263 +------ .../lib/content-overview-icon.svg | 1 - .../library/content-overview-utilities.php | 1252 ++++++ .../editorial-metadata/editorial-metadata.php | 917 +---- .../library/editorial-metadata-list-table.php | 167 + .../library/editorial-metadata-utilities.php | 748 ++++ 14 files changed, 6304 insertions(+), 6567 deletions(-) rename modules/calendar/lib/content-calendar-icon.svg => common/icons/content-icon.svg (100%) create mode 100644 modules/calendar/library/calendar-methods.php create mode 100644 modules/calendar/library/calendar-utilities.php delete mode 100644 modules/content-board/lib/content-board-icon.svg create mode 100644 modules/content-board/library/content-board-utilities.php delete mode 100644 modules/content-overview/lib/content-overview-icon.svg create mode 100644 modules/content-overview/library/content-overview-utilities.php create mode 100644 modules/editorial-metadata/library/editorial-metadata-list-table.php create mode 100644 modules/editorial-metadata/library/editorial-metadata-utilities.php diff --git a/modules/calendar/lib/content-calendar-icon.svg b/common/icons/content-icon.svg similarity index 100% rename from modules/calendar/lib/content-calendar-icon.svg rename to common/icons/content-icon.svg diff --git a/common/php/class-module.php b/common/php/class-module.php index 6ab27d5e..9259922d 100644 --- a/common/php/class-module.php +++ b/common/php/class-module.php @@ -196,7 +196,7 @@ public function get_post_statuses() return $publishpress->getPostStatuses(); } - + /** * Returns the CSS class name and color for the given custom status. @@ -503,11 +503,11 @@ public function print_ajax_response($status, $message = '', $data = null) protected function is_whitelisted_functional_view($module_name = null) { $whitelisted_pages = ['pp-calendar', 'pp-content-overview', 'pp-content-board', 'pp-notif-log', 'pp-modules-settings']; - + if (isset($_GET['page']) && in_array($_GET['page'], $whitelisted_pages)) { return true; } - + return false; } @@ -911,22 +911,22 @@ public function getPostStatusOptions() /** * Retrieve wordpress registered taxonomy - * + * * Private taxonomy are excluded * * @since 3.7.0 */ public function get_all_taxonomies() { - + //category and post tag are not included in public taxonomy $category = get_taxonomies(['name' => 'category'], 'objects'); $post_tag = get_taxonomies(['name' => 'post_tag'], 'objects'); - + $public = get_taxonomies(['_builtin' => false, 'public' => true], 'objects'); - + $taxonomies = array_merge($category, $post_tag, $public); - + return $taxonomies; } @@ -949,13 +949,13 @@ public function filter_get_param($param, $request_filter = false) } elseif (empty($request_filter[$param])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended return ''; } - + return sanitize_key($request_filter[$param]); // phpcs:ignore WordPress.Security.NonceVerification.Recommended } - + /** * This function is an alternative to filter_get_param() that's stripping out date characters - * + * * @param string $param The parameter to look for in $_GET * * @return mixed null if the parameter is not set in $_GET, empty string if the parameter is empty in $_GET, @@ -975,7 +975,7 @@ public function filter_get_param_text($param, $request_filter = false) } elseif (empty($request_filter[$param])) { return ''; } - + return sanitize_text_field($request_filter[$param]); } @@ -985,41 +985,46 @@ public function meta_query_operator_label($operator = false) { 'not_equals' => 'Does not equal (!=)', 'greater_than' => 'Greater than (>)', 'greater_than_or_equals' => 'Greater than or equals (>=)', - 'less_than' => 'Less than (<)', - 'less_than_or_equals' => 'Less than or equals (<=)', + 'less_than' => 'Less than (<)', + 'less_than_or_equals' => 'Less than or equals (<=)', 'like' => 'Like/Contains', 'not_like' => 'Not Like', 'not_exists' => 'Not Exists/Empty', ]; - + if ($operator) { $return = array_key_exists($operator, $operators) ? $operators[$operator] : $operator; } else { $return = $operators; } - + return $return; } - + public function meta_query_operator_symbol($operator = false) { + + return self::meta_query_operator_symbol($operator = false); + } + + public static function static_meta_query_operator_symbol($operator = false) { $operators = [ 'equals' => '=', 'not_equals' => '!=', 'greater_than' => '>', 'greater_than_or_equals' => '>=', - 'less_than' => '<', - 'less_than_or_equals' => '<=', + 'less_than' => '<', + 'less_than_or_equals' => '<=', 'like' => 'LIKE', 'not_like' => 'NOT LIKE', 'not_exists' => 'NOT EXISTS', ]; - + if ($operator) { $return = array_key_exists($operator, $operators) ? $operators[$operator] : $operator; } else { $return = $operators; } - + return $return; } @@ -1029,7 +1034,7 @@ public function localize_post_data($localized_post_data, $post, $can_edit_post) // add taxonomies $taxonomies = get_object_taxonomies($post->post_type, 'object'); foreach ($taxonomies as $taxonomy => $tax_object ) { - if (!empty($tax_object->public) + if (!empty($tax_object->public) && !in_array($taxonomy, ['author', 'post_format', 'post_status', 'post_status_core_wp_pp', 'post_visibility_pp'])) { $terms = get_the_terms($post->ID, $taxonomy); //add post content to localized data @@ -1172,7 +1177,7 @@ public function get_author_markup($post, $can_edit_post) { $post_author = get_userdata($post->post_author); $author_name = is_object($post_author) ? $post_author->display_name : ''; $author_name = apply_filters('the_author', $author_name); - + $author_name = apply_filters('publishpress_content_overview_author_column', $author_name, $post); return $author_name; } @@ -1193,25 +1198,25 @@ public function get_publish_date_markup() { public function touch_time( $tab_index = 0, $multi = 0 ) { global $wp_locale; - + $tab_index_attribute = ''; if ( (int) $tab_index > 0 ) { $tab_index_attribute = " tabindex=\"$tab_index\""; } - + $jj = current_time( 'd' ); $mm = current_time( 'm' ); $aa = current_time( 'Y' ); $hh = current_time( 'H' ); $mn = current_time( 'i' ); $ss = current_time( 's' ); - + $cur_jj = current_time( 'd' ); $cur_mm = current_time( 'm' ); $cur_aa = current_time( 'Y' ); $cur_hh = current_time( 'H' ); $cur_mn = current_time( 'i' ); - + $month = ''; - + $day = ''; - + echo '
'; /* translators: 1: Month, 2: Day, 3: Year, 4: Hour, 5: Minute. */ printf( __( '%1$s %2$s, %3$s at %4$s:%5$s' ), $month, $day, $year, $hour, $minute ); - + echo '
'; - + if ( $multi ) { return; } - + echo "\n\n"; - + $map = array( 'mm' => array( $mm, $cur_mm ), 'jj' => array( $jj, $cur_jj ), @@ -1261,10 +1266,10 @@ public function touch_time( $tab_index = 0, $multi = 0 ) { 'hh' => array( $hh, $cur_hh ), 'mn' => array( $mn, $cur_mn ), ); - + foreach ( $map as $timeunit => $value ) { list( $unit, $curr ) = $value; - + echo '' . "\n"; $cur_timeunit = 'cur_' . $timeunit; echo '' . "\n"; @@ -1272,7 +1277,7 @@ public function touch_time( $tab_index = 0, $multi = 0 ) { ?> dateUtil = new \PublishPress\Utility\Date(); $this->module = PublishPress()->register_module('calendar', $args); + + // Load utilities files. + $this->load_utilities_files(); + + $this->content_calendar_methods = new PP_Calendar_Methods([ + 'module' => $this->module, + 'module_url' => $this->module_url + ]); } /** @@ -275,6 +290,7 @@ public function __construct() */ public function init() { + add_action('template_include', [$this, 'handle_public_calendar_feed']); if (is_admin()) { @@ -301,25 +317,25 @@ public function init() require_once PUBLISHPRESS_BASE_PATH . '/common/php/' . 'screen-options.php'; - add_action('admin_init', [$this, 'register_settings']); - add_action('admin_print_styles', [$this, 'add_admin_styles']); + add_action('admin_init', [$this->content_calendar_methods, 'register_settings']); + add_action('admin_print_styles', [$this->content_calendar_methods, 'add_admin_styles']); add_action('admin_enqueue_scripts', [$this, 'enqueue_admin_scripts']); // Ajax insert post placeholder for a specific date add_action('wp_ajax_pp_insert_post', [$this, 'handle_ajax_insert_post']); - add_action('wp_ajax_publishpress_calendar_search_authors', [$this, 'searchAuthors']); - add_action('wp_ajax_publishpress_calendar_search_terms', [$this, 'searchTerms']); + add_action('wp_ajax_publishpress_calendar_search_authors', ['PP_Calendar_Utilities', 'searchAuthors']); + add_action('wp_ajax_publishpress_calendar_search_terms', ['PP_Calendar_Utilities', 'searchTerms']); add_action('wp_ajax_publishpress_calendar_get_data', [$this, 'fetchCalendarDataJson']); - add_action('wp_ajax_publishpress_calendar_move_item', [$this, 'moveCalendarItemToNewDate']); + add_action('wp_ajax_publishpress_calendar_move_item', [$this->content_calendar_methods, 'moveCalendarItemToNewDate']); add_action('wp_ajax_publishpress_calendar_get_post_data', [$this, 'getPostData']); add_action('wp_ajax_publishpress_calendar_get_post_type_fields', [$this, 'getPostTypeFields']); add_action('wp_ajax_publishpress_calendar_create_item', [$this, 'createItem']); // Action to regenerate the calendar feed secret - add_action('admin_init', [$this, 'handle_regenerate_calendar_feed_secret']); + add_action('admin_init', [$this->content_calendar_methods, 'handle_regenerate_calendar_feed_secret']); - add_filter('post_date_column_status', [$this, 'filter_post_date_column_status'], 12, 4); + add_filter('post_date_column_status', [$this->content_calendar_methods, 'filter_post_date_column_status'], 12, 4); add_filter('pp_calendar_after_form_submission_sanitize_title', [$this, 'sanitize_text_input'], 10, 1); add_filter('pp_calendar_after_form_submission_sanitize_content', [$this, 'sanitize_text_input'], 10, 1); @@ -365,72 +381,17 @@ public function handle_public_calendar_feed($original_template) return $original_template; } - add_filter('pp_calendar_total_weeks', [$this, 'filter_calendar_total_weeks_public_feed'], 10, 3); + add_filter('pp_calendar_total_weeks', [$this->content_calendar_methods, 'filter_calendar_total_weeks_public_feed'], 10, 3); add_filter( 'pp_calendar_ics_subscription_start_date', - [$this, 'filter_calendar_start_date_public_feed'], + [$this->content_calendar_methods, 'filter_calendar_start_date_public_feed'], 10 ); $this->handle_ics_subscription(); - remove_filter('pp_calendar_total_weeks', [$this, 'filter_calendar_total_weeks_public_feed']); - remove_filter('pp_calendar_ics_subscription_start_date', [$this, 'filter_calendar_start_date_public_feed']); - } - - /** - * @param $weeks - * @param $startDate - * @param $context - * - * @return float|int - */ - public function filter_calendar_total_weeks_public_feed($weeks, $startDate, $context) - { - if (! isset($_GET['end'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended - $end = 'm2'; - } else { - $end = preg_replace('/[^wm0-9]/', '', sanitize_text_field($_GET['end'])); // phpcs:ignore WordPress.Security.NonceVerification.Recommended - } - - if (preg_match('/m[0-9]*/', $end)) { - $weeks = (int)str_replace('m', '', $end) * 4; - } else { - $weeks = (int)str_replace('w', '', $end); - } - - // Calculate the diff in weeks from start date until now - $today = date('Y-m-d'); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date - - $first = DateTime::createFromFormat('Y-m-d', $startDate); - $second = DateTime::createFromFormat('Y-m-d', $today); - - $diff = floor($first->diff($second)->days / 7); - - $weeks += $diff; - - return $weeks; - } - - /** - * @param $startDate - * - * @return false|string - */ - public function filter_calendar_start_date_public_feed($startDate) - { - if (! isset($_GET['start'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended - // Current week - $start = 0; - } else { - $start = (int)$_GET['start']; // phpcs:ignore WordPress.Security.NonceVerification.Recommended - } - - if ($start > 0) { - $startDate = date('Y-m-d', strtotime('-' . $start . ' months', strtotime($startDate))); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date - } - - return $startDate; + remove_filter('pp_calendar_total_weeks', [$this->content_calendar_methods, 'filter_calendar_total_weeks_public_feed']); + remove_filter('pp_calendar_ics_subscription_start_date', [$this->content_calendar_methods, 'filter_calendar_start_date_public_feed']); } /** @@ -531,57 +492,6 @@ public function upgrade($previous_version) } } - /** - * Add any necessary CSS to the WordPress admin - * - * @uses wp_enqueue_style() - */ - public function add_admin_styles() - { - global $pagenow; - - // Only load calendar styles on the calendar page - if ('admin.php' === $pagenow && isset($_GET['page']) && $_GET['page'] === 'pp-calendar') { // phpcs:ignore WordPress.Security.NonceVerification.Recommended - wp_enqueue_style( - 'publishpress-calendar-css', - $this->module_url . 'lib/calendar.css', - ['publishpress-select2'], - PUBLISHPRESS_VERSION - ); - - wp_enqueue_style( - 'publishpress-async-calendar-theme-light-css', - $this->module_url . 'lib/async-calendar/styles/themes/theme-light.css', - [], - PUBLISHPRESS_VERSION - ); - - wp_enqueue_style( - 'publishpress-async-calendar-css', - $this->module_url . 'lib/async-calendar/styles/async-calendar.css', - ['publishpress-async-calendar-theme-light-css'], - PUBLISHPRESS_VERSION - ); - - if (isset($this->module->options->show_calendar_posts_full_title) && 'on' === $this->module->options->show_calendar_posts_full_title) { - $inline_style = '.publishpress-calendar .publishpress-calendar-item { - height: auto; - max-height: max-content; - white-space: break-spaces; - }'; - wp_add_inline_style('publishpress-async-calendar-css', $inline_style); - } - - wp_enqueue_style( - 'publishpress-select2', - PUBLISHPRESS_URL . 'common/libs/select2-v4.0.13.1/css/select2.min.css', - false, - PUBLISHPRESS_VERSION, - 'screen' - ); - } - } - /** * Check whether the user should have the ability to view the calendar. * Returns true if the user can view. @@ -604,248 +514,20 @@ public function enqueue_admin_scripts() if ($this->is_whitelisted_functional_view()) { $this->enqueue_datepicker_resources(); - $js_libraries = [ - 'jquery', - 'jquery-ui-core', - 'jquery-ui-sortable', - 'jquery-ui-draggable', - 'jquery-ui-droppable', - 'clipboard-js', - 'publishpress-select2' - ]; - foreach ($js_libraries as $js_library) { - wp_enqueue_script($js_library); - } - wp_enqueue_script( - 'clipboard-js', - $this->module_url . 'lib/clipboard.min.js', - ['jquery'], - PUBLISHPRESS_VERSION, - true - ); - - wp_enqueue_script( - 'publishpress-admin', - PUBLISHPRESS_URL . 'common/js/publishpress-admin.js', - ['jquery'], - PUBLISHPRESS_VERSION - ); - - wp_enqueue_script( - 'publishpress-calendar-js', - $this->module_url . 'lib/calendar.js', - $js_libraries, - PUBLISHPRESS_VERSION, - true - ); - - wp_enqueue_script( - 'publishpress-select2', - PUBLISHPRESS_URL . 'common/libs/select2-v4.0.13.1/js/select2.min.js', - ['jquery'], - PUBLISHPRESS_VERSION - ); - - if (is_admin() && isset($_GET['page']) && $_GET['page'] === 'pp-calendar' && ! isset($_GET['stop-the-calendar'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended - global $wp_scripts; - - if (! isset($wp_scripts->queue['react'])) { - wp_enqueue_script( - 'react', - PUBLISHPRESS_URL . 'common/js/react.min.js', - [], - PUBLISHPRESS_VERSION, - true - ); - wp_enqueue_script( - 'react-dom', - PUBLISHPRESS_URL . 'common/js/react-dom.min.js', - ['react'], - PUBLISHPRESS_VERSION, - true - ); - } - - wp_enqueue_script( - 'jquery-inputmask', - PUBLISHPRESS_URL . 'common/js/jquery.inputmask.min.js', - [ - 'jquery', - ], - PUBLISHPRESS_VERSION, - true - ); - - wp_enqueue_script( - 'date_i18n', - PUBLISHPRESS_URL . 'common/js/date-i18n.js', - [], - PUBLISHPRESS_VERSION, - true - ); - - // TODO: Replace react and react-dom with the wp.element dependency - wp_enqueue_script( - 'publishpress-async-calendar-js', - $this->module_url . 'lib/async-calendar/js/index.min.js', - [ - 'react', - 'react-dom', - 'jquery', - 'jquery-ui-core', - 'jquery-ui-sortable', - 'jquery-ui-draggable', - 'jquery-ui-droppable', - 'jquery-inputmask', - 'wp-i18n', - 'wp-element', - 'date_i18n', - ], - PUBLISHPRESS_VERSION, - true - ); - - /* - * Filters - */ - $userFilters = $this->get_filters(); - $calendar_request_args = $userFilters; - $calendar_request_filter = $userFilters; - - $maxVisibleItemsOption = isset($this->module->options->max_visible_posts_per_date) && ! empty($this->default_max_visible_posts_per_date) ? - (int)$this->module->options->max_visible_posts_per_date : $this->default_max_visible_posts_per_date; - - $postStatuses = $this->getPostStatusOptions(); - - $postTypes = []; - $postTypesUserCanCreate = []; - foreach ($this->get_selected_post_types() as $postTypeName) { - $postType = get_post_type_object($postTypeName); - - $postTypes[] = [ - 'value' => esc_attr($postTypeName), - 'text' => esc_html($postType->label) - ]; - - if (current_user_can($postType->cap->edit_posts)) { - $postTypesUserCanCreate[] = [ - 'value' => esc_attr($postTypeName), - 'text' => esc_html($postType->labels->singular_name) - ]; - } - } - - $numberOfWeeksToDisplay = isset($calendar_request_filter['weeks']) ? // phpcs:ignore WordPress.Security.NonceVerification.Recommended - (int)$calendar_request_filter['weeks'] : self::DEFAULT_NUM_WEEKS; // phpcs:ignore WordPress.Security.NonceVerification.Recommended - - $firstDateToDisplay = (isset($calendar_request_filter['start_date']) ? // phpcs:ignore WordPress.Security.NonceVerification.Recommended - sanitize_text_field($calendar_request_filter['start_date']) : date('Y-m-d')) . ' 00:00:00'; // phpcs:ignore WordPress.Security.NonceVerification.Recommended,WordPress.DateTime.RestrictedFunctions.date_date - $firstDateToDisplay = $this->get_beginning_of_week($firstDateToDisplay); - $endDate = $this->get_ending_of_week( - $firstDateToDisplay, - 'Y-m-d', - $numberOfWeeksToDisplay - ); - - $params = [ - 'requestFilter' => $calendar_request_filter, - 'numberOfWeeksToDisplay' => $numberOfWeeksToDisplay, - 'firstDateToDisplay' => esc_js($firstDateToDisplay), - 'theme' => 'light', - 'weekStartsOnSunday' => (int)get_option('start_of_week') === 0, - 'todayDate' => esc_js(date('Y-m-d 00:00:00')), // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date - 'dateFormat' => esc_js(get_option('date_format', 'Y-m-d H:i:s')), - 'timeFormat' => esc_js($this->getCalendarTimeFormat()), - 'maxVisibleItems' => $maxVisibleItemsOption, - 'statuses' => $postStatuses, - 'postTypes' => $postTypes, - 'postTypesCanCreate' => $postTypesUserCanCreate, - 'ajaxUrl' => esc_url(admin_url('admin-ajax.php')), - 'nonce' => wp_create_nonce('publishpress-calendar-get-data'), - 'userCanAddPosts' => count($postTypesUserCanCreate) > 0, - 'items' => $this->getCalendarData($firstDateToDisplay, $endDate, $calendar_request_args), - 'allowAddingMultipleAuthors' => (bool)apply_filters( - 'publishpress_calendar_allow_multiple_authors', - false - ), - 'proActive' => Util::isPlannersProActive(), - 'strings' => [ - 'loading' => esc_js(__('Loading...', 'publishpress')), - 'loadingItem' => esc_js(__('Loading item...', 'publishpress')), - 'clickToAdd' => esc_js(__('Click to add', 'publishpress')), - 'movingTheItem' => esc_js(__('Moving the item...', 'publishpress')), - 'hideItems' => esc_js(__('Hide the %s last items', 'publishpress')), - 'showMore' => esc_js(__('Show %s more', 'publishpress')), - 'untitled' => esc_js(__('Untitled', 'publishpress')), - 'close' => esc_js(__('Close', 'publishpress')), - 'save' => esc_js(__('Save', 'publishpress')), - 'saving' => esc_js(__('Saving...', 'publishpress')), - 'saveAndEdit' => esc_js(__('Save and edit', 'publishpress')), - 'addContentFor' => esc_js(__('Add content for %s', 'publishpress')), - 'postTypeNotFound' => esc_js(__('Post type not found', 'publishpress')), - 'postType' => esc_js(__('Post type:', 'publishpress')), - 'pleaseWaitLoadingFormFields' => esc_js(__('Please, wait! Loading the form fields...', 'publishpress')), - 'weekDaySun' => esc_js(__('Sun', 'publishpress')), - 'weekDayMon' => esc_js(__('Mon', 'publishpress')), - 'weekDayTue' => esc_js(__('Tue', 'publishpress')), - 'weekDayWed' => esc_js(__('Wed', 'publishpress')), - 'weekDayThu' => esc_js(__('Thu', 'publishpress')), - 'weekDayFri' => esc_js(__('Fri', 'publishpress')), - 'weekDaySat' => esc_js(__('Sat', 'publishpress')), - 'monthJan' => esc_js(__('Jan', 'publishpress')), - 'monthFeb' => esc_js(__('Feb', 'publishpress')), - 'monthMar' => esc_js(__('Mar', 'publishpress')), - 'monthApr' => esc_js(__('Apr', 'publishpress')), - 'monthMay' => esc_js(__('May', 'publishpress')), - 'monthJun' => esc_js(__('Jun', 'publishpress')), - 'monthJul' => esc_js(__('Jul', 'publishpress')), - 'monthAug' => esc_js(__('Aug', 'publishpress')), - 'monthSep' => esc_js(__('Sep', 'publishpress')), - 'monthOct' => esc_js(__('Oct', 'publishpress')), - 'monthNov' => esc_js(__('Nov', 'publishpress')), - 'monthDec' => esc_js(__('Dec', 'publishpress')), - 'allStatuses' => esc_js(__('All statuses', 'publishpress')), - 'allCategories' => esc_js(__('All categories', 'publishpress')), - 'allTags' => esc_js(__('All tags', 'publishpress')), - 'allAuthors' => esc_js(__('All authors', 'publishpress')), - 'allTypes' => esc_js(__('All types', 'publishpress')), - 'xWeek' => esc_js(__('%d week', 'publishpress')), - 'xWeeks' => esc_js(__('%d weeks', 'publishpress')), - 'today' => esc_js(__('Today', 'publishpress')), - 'noTerms' => esc_js(__('No terms', 'publishpress')), - 'post_date_label' => esc_html__('Post Date', 'publishpress'), - 'edit_label' => esc_html__('Edit', 'publishpress'), - 'delete_label' => esc_html__('Trash', 'publishpress'), - 'preview_label' => esc_html__('Preview', 'publishpress'), - 'view_label' => esc_html__('View', 'publishpress'), - 'prev_label' => esc_html__('Previous Post', 'publishpress'), - 'next_label' => esc_html__('Next Post', 'publishpress'), - 'post_status_label' => esc_html__('Post Status', 'publishpress'), - 'update_label' => esc_html__('Save Changes', 'publishpress'), - 'empty_term' => esc_html__('Taxonomy not set.', 'publishpress'), - 'post_author' => esc_html__('Author', 'publishpress'), - 'date_format' => pp_convert_date_format_to_jqueryui_datepicker(get_option('date_format')), - 'week_first_day' => esc_js(get_option('start_of_week')), - ] - ]; - wp_localize_script('publishpress-async-calendar-js', 'publishpressCalendarParams', $params); - - global $wp_locale; - $monthNames = array_map([&$wp_locale, 'get_month'], range(1, 12)); - $monthNamesShort = array_map([&$wp_locale, 'get_month_abbrev'], $monthNames); - $dayNames = array_map([&$wp_locale, 'get_weekday'], range(0, 6)); - $dayNamesShort = array_map([&$wp_locale, 'get_weekday_abbrev'], $dayNames); - wp_localize_script( - "date_i18n", - "DATE_I18N", - array( - "month_names" => $monthNames, - "month_names_short" => $monthNamesShort, - "day_names" => $dayNames, - "day_names_short" => $dayNamesShort - ) - ); - } + $method_args = []; + $method_args['content_calendar_datas'] = $this->get_content_calendar_datas(); + $method_args['userFilters'] = $this->get_filters(); + $method_args['postStatuses'] = $this->getPostStatusOptions(); + $method_args['selectedPostTypes'] = $this->get_selected_post_types(); + $method_args['timeFormat'] = $this->getCalendarTimeFormat(); + $method_args['proActive'] = Util::isPlannersProActive(); + $method_args['operator_labels'] = $this->meta_query_operator_label(); + $method_args['post_statuses'] = $this->get_post_statuses(); + $method_args['terms_options'] = $this->terms_options; + $method_args['form_filters'] = $this->form_filters; + $method_args['form_filter_list'] = $this->form_filter_list; + $method_args['all_filters'] = $this->filters; + $this->content_calendar_methods->enqueue_admin_scripts($method_args); } } @@ -871,135 +553,6 @@ private function getTimezoneString() return $timezoneString; } - /** - * Returns a VTIMEZONE component for a Olson timezone identifier - * with daylight transitions covering the given date range. - * - * @param \Sabre\VObject\Component\VCalendar - * @param string $tzid Timezone ID as used in PHP's Date functions - * @param int $from Unix timestamp with first date/time in this timezone - * @param int $to Unix timestap with last date/time in this timezone - * - * @return mixed A Sabre\VObject\Component object representing a VTIMEZONE definition - * or false if no timezone information is available - */ - private function generateVTimeZone(&$calendar, $tzid, $from = 0, $to = 0) - { - if (! $from) { - $from = time(); - } - if (! $to) { - $to = $from; - } - - try { - $tz = new DateTimeZone($tzid); - } catch (Exception $e) { - return false; - } - - // get all transitions for one year back/ahead - $year = 86400 * 360; - $transitions = $tz->getTransitions($from - $year, $to + $year); - - $vTimeZone = $calendar->add( - 'VTIMEZONE', - [ - 'TZID' => $tz->getName(), - ] - ); - - $standard = null; - $daylight = null; - $t_std = null; - $t_dst = null; - $tzfrom = 0; - if (is_array($transitions) || is_object($transitions)) { - foreach ($transitions as $i => $trans) { - if ($i == 0) { - $tzfrom = $trans['offset'] / 3600; - continue; - } - - // daylight saving time definition - if ($trans['isdst']) { - $t_dst = $trans['ts']; - $dt = new DateTime($trans['time']); - $offset = $trans['offset'] / 3600; - - $daylight = $vTimeZone->add( - 'DAYLIGHT', - [ - 'DTSTART' => $dt->format('Ymd\THis'), - 'TZOFFSETFROM' => sprintf( - '%s%02d%02d', - $tzfrom >= 0 ? '+' : '', - floor($tzfrom), - ($tzfrom - floor($tzfrom)) * 60 - ), - 'TZOFFSETTO' => sprintf( - '%s%02d%02d', - $offset >= 0 ? '+' : '', - floor($offset), - ($offset - floor($offset)) * 60 - ), - ] - ); - - // add abbreviated timezone name if available - if (! empty($trans['abbr'])) { - $daylight->add('TZNAME', [$trans['abbr']]); - } - - $tzfrom = $offset; - } else { - $t_std = $trans['ts']; - $dt = new DateTime($trans['time']); - $offset = $trans['offset'] / 3600; - - $standard = $vTimeZone->add( - 'STANDARD', - [ - 'DTSTART' => $dt->format('Ymd\THis'), - 'TZOFFSETFROM' => sprintf( - '%s%02d%02d', - $tzfrom >= 0 ? '+' : '', - floor($tzfrom), - ($tzfrom - floor($tzfrom)) * 60 - ), - 'TZOFFSETTO' => sprintf( - '%s%02d%02d', - $offset >= 0 ? '+' : '', - floor($offset), - ($offset - floor($offset)) * 60 - ), - ] - ); - - // add abbreviated timezone name if available - if (! empty($trans['abbr'])) { - $standard->add('TZNAME', [$trans['abbr']]); - } - - $tzfrom = $offset; - } - - // we covered the entire date range - if ($standard && $daylight && min($t_std, $t_dst) < $from && max($t_std, $t_dst) > $to) { - break; - } - } - } - - // add X-MICROSOFT-CDO-TZID if available - $microsoftExchangeMap = array_flip(Sabre\VObject\TimeZoneUtil::$microsoftExchangeMap); - if (array_key_exists($tz->getName(), $microsoftExchangeMap)) { - $vTimeZone->add('X-MICROSOFT-CDO-TZID', $microsoftExchangeMap[$tz->getName()]); - } - - return $vTimeZone; - } - /** * After checking that the request is valid, do an .ics file * @@ -1029,7 +582,7 @@ public function handle_ics_subscription() // Set up the post data to be printed $post_query_args = []; - $calendar_filters = $this->calendar_filters(); + $calendar_filters = PP_Calendar_Utilities::calendar_filters(); foreach ($calendar_filters as $filter) { if (isset($_GET[$filter]) && false !== ($value = $this->sanitize_filter( $filter, @@ -1045,7 +598,7 @@ public function handle_ics_subscription() $this->start_date = sanitize_text_field( apply_filters( 'pp_calendar_ics_subscription_start_date', - $this->get_beginning_of_week(date('Y-m-d', current_time('timestamp'))) // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date + PP_Calendar_Utilities::get_beginning_of_week(date('Y-m-d', current_time('timestamp'))) // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date ) ); @@ -1066,7 +619,7 @@ public function handle_ics_subscription() $timezoneString = $this->dateUtil->getTimezoneString(); - $this->generateVtimezone( + PP_Calendar_Utilities::generateVtimezone( $vCalendar, $timezoneString, strtotime($this->start_date), @@ -1120,7 +673,7 @@ public function handle_ics_subscription() 'VEVENT', [ 'UID' => $post->guid, - 'SUMMARY' => $this->do_ics_escaping(apply_filters('the_title', $post->post_title)) + 'SUMMARY' => PP_Calendar_Utilities::do_ics_escaping(apply_filters('the_title', $post->post_title)) . ' - ' . $this->get_post_status_friendly_name(get_post_status($post->ID)), 'DTSTART' => $start_date, 'DTEND' => $end_date, @@ -1142,63 +695,6 @@ public function handle_ics_subscription() // phpcs:enable } - /** - * Perform the encoding necessary for ICS feed text. - * - * @param string $text The string that needs to be escaped - * - * @return string The string after escaping for ICS. - * @since 0.8 - * */ - - public function do_ics_escaping($text) - { - $text = str_replace(',', '\,', $text); - $text = str_replace(';', '\:', $text); - $text = str_replace('\\', '\\\\', $text); - - return $text; - } - - /** - * Handle a request to regenerate the calendar feed secret - * - * @since 0.8 - */ - public function handle_regenerate_calendar_feed_secret() - { - if (! isset($_GET['action']) || 'pp_calendar_regenerate_calendar_feed_secret' != $_GET['action']) { - return; - } - - if (! current_user_can('manage_options')) { - wp_die($this->module->messages['invalid-permissions']); - } - - if (! isset($_GET['_wpnonce']) - || ! wp_verify_nonce(sanitize_text_field($_GET['_wpnonce']), 'pp-regenerate-ics-key') - ) { - wp_die($this->module->messages['nonce-failed']); - } - - PublishPress()->update_module_option($this->module->name, 'ics_secret_key', wp_generate_password()); - - $args = [ - 'page' => PP_Modules_Settings::SETTINGS_SLUG, - 'settings_module' => $this->module->settings_slug, - ]; - - wp_safe_redirect( - add_query_arg( - 'message', - 'key-regenerated', - add_query_arg($args, admin_url('admin.php')) - ) - ); - - exit; - } - /** * Get the user's filters for calendar, either with $_GET or from saved * @@ -1326,7 +822,7 @@ public function update_user_filters($request_filter = []) } // Set the start date as the beginning of the week, according to blog settings - $user_filters['start_date'] = $this->get_beginning_of_week($user_filters['start_date']); + $user_filters['start_date'] = PP_Calendar_Utilities::get_beginning_of_week($user_filters['start_date']); if (!empty($user_filters['me_mode'])) { $user_filters['author'] = $current_user->ID; @@ -1400,408 +896,14 @@ public function content_calendar_filters() return apply_filters('PP_Content_Calendar_filter_names', $select_filter_names); } - public function content_calendar_filter_options($select_id, $select_name, $filters) - { - - if (array_key_exists($select_id, $this->terms_options)) { - $select_id = 'metadata_key'; - } - - if (array_key_exists($select_id, $this->content_calendar_datas['taxonomies']) && taxonomy_exists($select_id)) { - $select_id = 'taxonomy'; - } - - $filter_label = ''; - $selected_value = ''; - - ob_start(); - - switch ($select_id) { - case 'post_status': - $post_statuses = $this->get_post_statuses(); - $filter_label = esc_html__('Post Status', 'publishpress'); - ?> - - label); - ?> - - - - - - - - terms_options[$select_name]; - - $metadata_type = $metadata_term['type']; - $selected_value = $metadata_value; - $filter_label = $metadata_term['name']; - - ?> -
-
- -
-
- - -
- 'filter-submit']); ?> -
- - - - - - - - - ', - esc_attr($metadata_start_name), - esc_attr($metadata_start_value), - esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), - '' - ); - printf( - '', - esc_attr($metadata_start_name), - esc_attr($metadata_start_value_hidden) - ); - ?> -
- ', - esc_attr($metadata_end_name), - esc_attr($metadata_end_value), - esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), - '' - ); - printf( - '', - esc_attr($metadata_end_name), - esc_attr($metadata_end_value_hidden) - ); - ?> -
- 'filter-submit']); ?> -
- display_name; - } - } - $user_dropdown_args = [ - 'show_option_all' => $metadata_term['name'], - 'name' => $select_name, - 'selected' => $metadata_value, - 'class' => 'pp-custom-select2' - ]; - $user_dropdown_args = apply_filters('pp_editorial_metadata_user_dropdown_args', $user_dropdown_args); - wp_dropdown_users($user_dropdown_args); - } elseif ($metadata_type === 'checkbox') { - if ($metadata_value == '1') { - $selected_value = esc_html__('Checked', 'publishpress'); - } else { - $selected_value = ''; - } - ?> - - - /> -
- 'filter-submit']); ?> -
-
'; - break; - - default: - if (array_key_exists($select_name, $this->form_filter_list)) { - $selected_value_meta = isset($filters[$select_name]) ? sanitize_text_field($filters[$select_name]) : ''; - $filter_label = $this->filters[$select_name]; - $selected_value = $selected_value_meta; - - if (strpos($select_name, "ppch_co_checklist_") === 0) { - ?> - - -
-
- -
-
- - -
- 'filter-submit']); ?> -
- -
-
- $selected_value, 'filter_label' => $filter_label, 'html' => ob_get_clean()]; + /** + * Load utilities files + * + * @return void + */ + private function load_utilities_files() { + require_once dirname(__FILE__) . "/library/calendar-utilities.php"; + require_once dirname(__FILE__) . "/library/calendar-methods.php"; } /** @@ -1809,109 +911,22 @@ class="date-time-pick" * @return string */ public function get_calendar_filters() { - ob_start(); - ?> -
-
- user_filters['me_mode']; - $active_me_mode = !empty($me_mode) ? 'active-filter' : ''; - ?> -
- -
- user_filters); ?> - -
- -
- -
-
-
-
- - 'co-searchbox-search-submit']); ?> -
-
-
-
-
-
- - - user_filters); ?> -
- user_filters['weeks']) ? (int)$this->user_filters['weeks'] : self::DEFAULT_NUM_WEEKS; - $modal_id++; - ?> - - - content_calendar_filters() as $select_id => $select_name) { - $modal_id++; - $filter_data = $this->content_calendar_filter_options($select_id, $select_name, $this->user_filters); - $active_class = !empty($filter_data['selected_value']) ? 'active-filter' : ''; - $button_label = $filter_data['filter_label']; - $button_label .= !empty($filter_data['selected_value']) ? ': ' . $filter_data['selected_value'] : ''; - ?> - - - - - - - - -
-
- -
- - -
- user_filters; + $args['calendar_filters'] = $this->content_calendar_filters(); + $args['terms_options'] = $this->terms_options; + $args['content_calendar_datas'] = $this->content_calendar_datas; + $args['post_statuses'] = $this->get_post_statuses(); + $args['post_types'] = $this->get_selected_post_types(); + $args['form_filter_list'] = $this->form_filter_list; + $args['form_filters'] = $this->form_filters; + $args['all_filters'] = $this->filters; + $args['operator_labels'] = $this->meta_query_operator_label(); + + $calendar_filters = PP_Calendar_Utilities::get_calendar_filters($args); + + return $calendar_filters; } /** @@ -2084,155 +1099,6 @@ public function get_content_calendar_form_filters() { return $filters; } - - - public function content_calendar_customize_filter_form() { - - ob_start(); - - $content_calendar_datas = $this->content_calendar_datas; - $enabled_filters = array_keys($content_calendar_datas['content_calendar_filters']); - $filters = $this->form_filters; - $meta_keys = $content_calendar_datas['meta_keys']; - - $all_filters = []; - ?> -
- - -
-
-
-
-
-
-
-

-
-
- $filter_datas) : - $filter_index++; - $hidden_style = empty($filter_datas['filters']) ? 'display: none;' : ''; - ?> -
-
- -
- -
- -
- - - - -
- - $filter_label) : - $active_class = (in_array($filter_name, $enabled_filters)) ? 'active-item' : ''; - $input_name = (in_array($filter_name, $enabled_filters)) ? 'content_calendar_filters['. $filter_name .']' : ''; - - $all_filters[$filter_name] = [ - 'filter_label' => $filter_label, - 'filter_group' => $filter_group - ]; - ?> -
- - - - -
- -
-
- -
-
-
()
-
- -
- -
- -
- - - -
-
- -
-
- -
-
-
-
- // phpcs:enable } - /** - * Generates the HTML for a single post item in the calendar - * - * @param WP_Post $post The WordPress post in question - * @param string $post_date The date of the post - * @param int $num The index of the post - * - * @return str HTML for a single post item - */ - public function generate_post_li_html($post, $post_date, $num = 0) - { - $can_modify = $this->current_user_can_modify_post($post); - $cache_key = sprintf( - '%s%s', - $post->ID, - $can_modify ? 'can_modify' : 'read_only' - ); - $cache_val = wp_cache_get($cache_key, self::$post_li_html_cache_key); - // Because $num is pertinent to the display of the post LI, need to make sure that's what's in cache - if (is_array($cache_val) && $cache_val['num'] == $num) { - $this->hidden = $cache_val['hidden']; - - return $cache_val['post_li_html']; - } - - ob_start(); - - $post_id = $post->ID; - $edit_post_link = get_edit_post_link($post_id); - - $show_posts_publish_time = $this->showPostsPublishTime($post->post_status); - - $post_publish_date_time = ''; - if ($show_posts_publish_time) { - $post_publish_datetime = get_the_date('c', $post); - $post_publish_date_timestamp = get_post_time('U', false, $post); - $posts_publish_time_format = isset($this->module->options->posts_publish_time_format) && ! empty( - $this->module->options->posts_publish_time_format - ) - ? $this->module->options->posts_publish_time_format - : self::TIME_FORMAT_12H_NO_LEADING_ZEROES; - } - - $post_classes = [ - 'day-item', - 'custom-status-' . $post->post_status, - ]; - - $post_type_options = $this->get_post_status_options($post->post_status); - - // Only allow the user to drag the post if they have permissions to - // or if it's in an approved post status - // This is checked on the ajax request too. - if ($can_modify) { - $post_classes[] = 'sortable'; - } else { - $post_classes[] = 'read-only'; - } - - if (in_array($post->post_status, $this->published_statuses)) { - $post_classes[] = 'is-published'; - } - - // Hide posts over a certain number to prevent clutter, unless user is only viewing 1 or 2 weeks - $max_visible_posts_option = isset($this->module->options->max_visible_posts_per_date) && ! empty($this->default_max_visible_posts_per_date) ? - (int)$this->module->options->max_visible_posts_per_date : $this->default_max_visible_posts_per_date; - - if ($max_visible_posts_option < 0) { - $max_visible_posts_option = 9999; - } - - $max_visible_posts = apply_filters( - 'pp_calendar_max_visible_posts_per_date', - $max_visible_posts_option - ); - - if ($num >= $max_visible_posts && $this->total_weeks > 2) { - $post_classes[] = 'hidden'; - $this->hidden++; - } - $post_classes = apply_filters('pp_calendar_table_td_li_classes', $post_classes, $post_date, $post->ID); ?> - -
  • - -
    -
    -
    -
    - - ID)); ?> - - - - - - - -
    -
    -
    - get_inner_information($this->get_post_information_fields($post), $post); ?> -
    - current_user_can_modify_post($post)) : ?> -
    - -
    - -
    -
    • - $num, - 'post_li_html' => $post_li_html, - 'hidden' => $this->hidden, - ]; - wp_cache_set($cache_key, $post_li_cache, self::$post_li_html_cache_key); - - return $post_li_html; - } - - /** - * get_inner_information description - * Functionality for generating the inner html elements on the calendar - * has been separated out so various ajax functions can reload certain - * parts of an inner html element. - * - * @param array $pp_calendar_item_information_fields - * @param WP_Post $post - * @param array $published_statuses - * - * @since 0.8 - */ - public function get_inner_information($pp_calendar_item_information_fields, $post) - { - ?> - - $values) : ?> - - - - current_user_can_modify_post($post)) : ?> - - - - - - - - - - - - - - - ID); ?> -
    : - - - - - -
    - post_type); - $item_actions = []; - if ($this->current_user_can_modify_post($post)) { - // Edit this post - $item_actions['edit'] = '' . __( - 'Edit', - 'publishpress' - ) . ''; - // Trash this post - $item_actions['trash'] = '' . __('Trash', 'publishpress') . ''; - // Preview/view this post - if (! in_array($post->post_status, $this->published_statuses)) { - $item_actions['view'] = '' . __('Preview', 'publishpress') . ''; - } elseif ('trash' != $post->post_status) { - $item_actions['view'] = '' . __( - 'View', - 'publishpress' - ) . ''; - } - // Save metadata - $item_actions['save hidden'] = '' . __('Save', 'publishpress') . ''; - } - - // Allow other plugins to add actions - $item_actions = apply_filters('pp_calendar_item_actions', $item_actions, $post->ID); - - if (count($item_actions)) { - echo '
    '; - $html = ''; - foreach ($item_actions as $class => $item_action) { - $html .= '' . $item_action . ' | '; - } - echo rtrim($html, '| '); - echo '
    '; - } ?> -
    - '; - break; - case 'paragraph': - return ''; - break; - case 'date': - return ''; - break; - case 'checkbox': - $output = ''; - - return $output; - break; - case 'user': - return wp_dropdown_users( - [ - 'echo' => false, - ] - ); - break; - case 'taxonomy': - return ''; - break; - case 'taxonomy hierarchical': - return wp_dropdown_categories( - [ - 'echo' => 0, - 'hide_empty' => 0, - ] - ); - break; - } - } - /** * Get the information fields to be presented with each post popup * @@ -2973,161 +1469,21 @@ public function get_post_information_fields($post) return $information_fields; } - /** - * Generates the filtering and navigation options for the top of the calendar - * - * @param array $filters Any set filters - * @param array $dates All of the days of the week. Used for generating navigation links - */ - public function print_top_navigation($filters, $dates) - { - ?> -
      -
    • -
      - - - - calendar_filters() as $select_id => $select_name) { - echo $this->calendar_filter_options($select_id, $select_name, $filters); - } ?> -
      -
      • - -
    • -
      - - - calendar_filters() as $select_id => $select_name) { - echo ''; - } ?> - -
      -
      • - - -
    • - - total_weeks > 1) : ?> - - -
      • -
    • - -
      • -
    • - total_weeks > 1) : ?> - - - -
      • -
    • - -
      • -
    - '; - $html .= esc_html(date_i18n('l', strtotime($date))); - $html .= ''; - } - - return $html; - } - /** * Query to get all of the calendar posts for a given day * * @param array $args Any filter arguments we want to pass - * @param string $context Where the query is coming from, to distinguish dashboard and subscriptions + * @param string $request_context Where the query is coming from, to distinguish dashboard and subscriptions * * @return array $posts All of the posts as an array sorted by date */ - public function getCalendarDataForMultipleWeeks($args = [], $context = 'dashboard') + public function get_calendar_posts_for_week($args = [], $context = 'dashboard') { $supported_post_types = $this->get_post_types_for_module($this->module); $defaults = [ 'post_status' => null, + 'cat' => null, + 'tag' => null, 'author' => null, 'post_type' => $supported_post_types, 'posts_per_page' => -1, @@ -3136,199 +1492,8 @@ public function getCalendarDataForMultipleWeeks($args = [], $context = 'dashboar $args = array_merge($defaults, $args); - if (isset($args['s']) && ! empty($args['s'])) { - $args['s'] = sanitize_text_field($args['s']); - } - - $current_user_id = get_current_user_id(); - - $this->user_filters = $this->get_filters(); - - // Get content calendar data - $this->content_calendar_datas = $this->get_content_calendar_datas(); - - $filters = $this->content_calendar_datas['content_calendar_filters']; - /** - * @param array $filters - * - * @return array - */ - $this->filters = apply_filters('publishpress_content_calendar_filters', $filters); - - $enabled_filters = array_keys($this->filters); - $editorial_metadata = $this->terms_options; - - if (!empty($args['cpt'])) { - $args['post_type'] = $args['cpt']; - } - - - if (empty($args['post_type']) || ! in_array($args['post_type'], $supported_post_types)) { - $args['post_type'] = $supported_post_types; - } - - //remove inactive builtin filter - if (!in_array('cpt', $enabled_filters)) { - // show all post type - $args['post_type'] = $supported_post_types; - } - - if (!in_array('author', $enabled_filters)) { - unset($args['author']); - } - - $meta_query = $tax_query = ['relation' => 'AND']; - $metadata_filter = $taxonomy_filter = false; - $checklists_filters = []; - - // apply enabled filter - foreach ($enabled_filters as $enabled_filter) { - if (array_key_exists($enabled_filter, $editorial_metadata)) { - //metadata field filter - $meta_key = $enabled_filter; - $metadata_term = $editorial_metadata[$meta_key]; - unset($args[$enabled_filter]); - if ($metadata_term['type'] === 'date') { - $date_type_metaquery = []; - - if (! empty($this->user_filters[$meta_key . '_start'])) { - $date_type_metaquery[] = strtotime($this->user_filters[$meta_key . '_start_hidden']); - } - if (! empty($this->user_filters[$meta_key . '_end'])) { - $date_type_metaquery[] = strtotime($this->user_filters[$meta_key . '_end_hidden']); - } - if (count($date_type_metaquery) === 2) { - $metadata_filter = true; - $compare = 'BETWEEN'; - $meta_value = $date_type_metaquery; - } elseif (count($date_type_metaquery) === 1) { - $metadata_filter = true; - $compare = '='; - $meta_value = $date_type_metaquery[0]; - } - - if (!empty($date_type_metaquery)) { - $metadata_filter = true; - $meta_query[] = array( - 'key' => '_pp_editorial_meta_' . $metadata_term['type'] . '_' . $metadata_term['slug'], - 'value' => $meta_value, - 'compare' => $compare - ); - } - - } elseif (! empty($this->user_filters[$meta_key])) { - if ($metadata_term['type'] === 'date') { - continue; - } else { - $meta_value = sanitize_text_field($this->user_filters[$meta_key]); - } - - $compare = '='; - if ($metadata_term['type'] === 'paragraph' - || ($metadata_term['type'] === 'select' && isset($metadata_term->select_type) && $metadata_term['select_type'] === 'multiple') - ) { - $compare = 'LIKE'; - } - $metadata_filter = true; - $meta_query[] = array( - 'key' => '_pp_editorial_meta_' . $metadata_term['type'] . '_' . $metadata_term['slug'], - 'value' => $meta_value, - 'compare' => $compare - ); - } - - } elseif( - in_array($enabled_filter, $this->content_calendar_datas['meta_keys']) - && ( - isset($this->user_filters[$enabled_filter]) - && - ( - !empty($this->user_filters[$enabled_filter]) - || $this->user_filters[$enabled_filter] == '0' - || ( - !empty($this->user_filters[$enabled_filter . '_operator']) - && $this->user_filters[$enabled_filter . '_operator'] === 'not_exists' - ) - ) - ) - ) { - // metakey filter - unset($args[$enabled_filter]); - $meta_value = sanitize_text_field($this->user_filters[$enabled_filter]); - $meta_operator = !empty($this->user_filters[$enabled_filter . '_operator']) ? $this->user_filters[$enabled_filter . '_operator'] : 'equals'; - $compare = $this->meta_query_operator_symbol($meta_operator); - - $metadata_filter = true; - - if ($meta_operator == 'not_exists') { - $meta_query[] = array( - 'relation' => 'OR', - array( - 'key' => $enabled_filter, - 'compare' => 'NOT EXISTS' - ), - array( - 'key' => $enabled_filter, - 'value' => '', - 'compare' => '=' - ) - ); - } else { - $meta_query[] = array( - 'key' => $enabled_filter, - 'value' => $meta_value, - 'compare' => $compare - ); - } - } elseif (in_array($enabled_filter, ['ppch_co_yoast_seo__yoast_wpseo_linkdex', 'ppch_co_yoast_seo__yoast_wpseo_content_score']) && !empty($this->user_filters[$enabled_filter]) && array_key_exists($enabled_filter, $this->form_filter_list) && class_exists('WPSEO_Meta')) { - // yoast seo filter - unset($args[$enabled_filter]); - $meta_value = sanitize_text_field($this->user_filters[$enabled_filter]); - $meta_key = str_replace('ppch_co_yoast_seo_', '', $enabled_filter); - $meta_operator = !empty($this->user_filters[$enabled_filter . '_operator']) ? $this->user_filters[$enabled_filter . '_operator'] : 'equals'; - $compare = $this->meta_query_operator_symbol($meta_operator); - $metadata_filter = true; - $meta_query[] = array( - 'key' => $meta_key, - 'value' => $meta_value, - 'compare' => $compare - ); - - } elseif(array_key_exists($enabled_filter, $this->content_calendar_datas['taxonomies']) && !empty($this->user_filters[$enabled_filter])) { - //taxonomy filter - unset($args[$enabled_filter]); - $tax_value = sanitize_text_field($this->user_filters[$enabled_filter]); - $taxonomy_filter = true; - $tax_query[] = array( - 'taxonomy' => $enabled_filter, - 'field' => 'slug', - 'terms' => [$tax_value], - 'include_children' => true, - 'operator' => 'IN', - ); - } elseif(!empty($this->user_filters[$enabled_filter]) && strpos($enabled_filter, "ppch_co_checklist_") === 0 && array_key_exists($enabled_filter, $this->form_filter_list)) { - // checklists filter - /** - * TODO: Implement metaquery filter when checklists started storing checklists status in meta_key - */ - unset($args[$enabled_filter]); - $meta_value = sanitize_text_field($this->user_filters[$enabled_filter]); - $meta_key = str_replace('ppch_co_checklist_', '', $enabled_filter); - $checklists_filters[$meta_key] = $meta_value; - } - - } - - if ($metadata_filter) { - $args['meta_query'] = $meta_query; - } - - if ($taxonomy_filter) { - $args['tax_query'] = $tax_query; - } - // Unpublished as a status is just an array of everything but 'publish' - if ($args['post_status'] == 'unpublish') { + if ($args['post_status'] == 'unpublish' || $context == 'ics_subscription') { $args['post_status'] = ''; $post_statuses = $this->get_post_statuses(); foreach ($post_statuses as $post_status) { @@ -3339,152 +1504,41 @@ public function getCalendarDataForMultipleWeeks($args = [], $context = 'dashboar if (apply_filters('pp_show_scheduled_as_unpublished', true)) { $args['post_status'] .= ', future'; } + if ($context == 'ics_subscription') { + $args['post_status'] .= ', publish'; + } + + if (isset($this->module->options->ics_subscription_public_visibility) && 'on' === $this->module->options->ics_subscription_public_visibility) { + $args['suppress_filters'] = true; + } } - // unset legacy options - if (isset($args['cat'])) { + // The WP functions for printing the category and author assign a value of 0 to the default + // options, but passing this to the query is bad (trashed and auto-draft posts appear!), so + // unset those arguments. + if ($args['cat'] === '0') { unset($args['cat']); } - if (isset($args['tag'])) { + if ($args['tag'] === '0') { + unset($args['tag']); + } else { + $args['tag_id'] = $args['tag']; unset($args['tag']); } - if (!empty($args['me_mode']) && !empty($current_user_id)) { - $args['author'] = $current_user_id; + if ($args['author'] === '0') { + unset($args['author']); } - // Filter by post_author if it's set - if (isset($args['author']) && empty($args['author'])) { - unset($args['author']); + if (empty($args['post_type']) || ! in_array($args['post_type'], $supported_post_types)) { + $args['post_type'] = $supported_post_types; } // Filter for an end user to implement any of their own query args - $args = apply_filters('pp_calendar_posts_query_args', $args, $context, $enabled_filters, $this->user_filters); + $args = apply_filters('pp_calendar_posts_query_args', $args, $context); - if (isset($this->module->options->sort_by)) { - add_filter('posts_orderby', [$this, 'filterPostsOrderBy'], 10); - } + add_filter('posts_where', [$this, 'posts_where_week_range']); $post_results = new WP_Query($args); - - $posts = []; - while ($post_results->have_posts()) { - $post_results->the_post(); - global $post; - - $add_post = true; - - if (!empty($checklists_filters)) { - $post_checklists = apply_filters('publishpress_checklists_requirement_list', [], $post); - foreach ($checklists_filters as $checklists_filter_name => $checklists_filter_check) { - if (!array_key_exists($checklists_filter_name, $post_checklists)) { - // post that doesn't have this requirement shouldn't show? - $add_post = false; - } elseif ($checklists_filter_check == 'passed' && empty($post_checklists[$checklists_filter_name]['status'])) { - // filter posts that failed when condition is passed - $add_post = false; - } elseif ($checklists_filter_check == 'failed' && !empty($post_checklists[$checklists_filter_name]['status'])) { - // filter out post that passed when condition is failed - $add_post = false; - } - } - } - - if ($add_post) { - /** - * TODO: Should we require posts like x2 if results is empty due to $add_post been false for all? - */ - $key_date = date('Y-m-d', strtotime($post->post_date)); - $posts[$key_date][] = $post; - } - } - - if (isset($this->module->options->sort_by)) { - remove_filter('posts_orderby', [$this, 'filterPostsOrderBy']); - } - - return $posts; - } - - public function filterPostsOrderBy($orderBy) - { - if ($this->module->options->sort_by === 'status') { - $orderBy = 'post_status ASC, post_date ASC'; - } else { - $orderBy = 'post_date ASC'; - } - - return $orderBy; - } - - /** - * Query to get all of the calendar posts for a given day - * - * @param array $args Any filter arguments we want to pass - * @param string $request_context Where the query is coming from, to distinguish dashboard and subscriptions - * - * @return array $posts All of the posts as an array sorted by date - */ - public function get_calendar_posts_for_week($args = [], $context = 'dashboard') - { - $supported_post_types = $this->get_post_types_for_module($this->module); - $defaults = [ - 'post_status' => null, - 'cat' => null, - 'tag' => null, - 'author' => null, - 'post_type' => $supported_post_types, - 'posts_per_page' => -1, - 'order' => 'ASC', - ]; - - $args = array_merge($defaults, $args); - - // Unpublished as a status is just an array of everything but 'publish' - if ($args['post_status'] == 'unpublish' || $context == 'ics_subscription') { - $args['post_status'] = ''; - $post_statuses = $this->get_post_statuses(); - foreach ($post_statuses as $post_status) { - $args['post_status'] .= $post_status->slug . ', '; - } - $args['post_status'] = rtrim($args['post_status'], ', '); - // Optional filter to include scheduled content as unpublished - if (apply_filters('pp_show_scheduled_as_unpublished', true)) { - $args['post_status'] .= ', future'; - } - if ($context == 'ics_subscription') { - $args['post_status'] .= ', publish'; - } - - if (isset($this->module->options->ics_subscription_public_visibility) && 'on' === $this->module->options->ics_subscription_public_visibility) { - $args['suppress_filters'] = true; - } - } - // The WP functions for printing the category and author assign a value of 0 to the default - // options, but passing this to the query is bad (trashed and auto-draft posts appear!), so - // unset those arguments. - if ($args['cat'] === '0') { - unset($args['cat']); - } - if ($args['tag'] === '0') { - unset($args['tag']); - } else { - $args['tag_id'] = $args['tag']; - unset($args['tag']); - } - - if ($args['author'] === '0') { - unset($args['author']); - } - - if (empty($args['post_type']) || ! in_array($args['post_type'], $supported_post_types)) { - $args['post_type'] = $supported_post_types; - } - - // Filter for an end user to implement any of their own query args - $args = apply_filters('pp_calendar_posts_query_args', $args, $context); - - add_filter('posts_where', [$this, 'posts_where_week_range']); - $post_results = new WP_Query($args); - remove_filter('posts_where', [$this, 'posts_where_week_range']); + remove_filter('posts_where', [$this, 'posts_where_week_range']); $posts = []; while ($post_results->have_posts()) { @@ -3494,602 +1548,40 @@ public function get_calendar_posts_for_week($args = [], $context = 'dashboard') $posts[$key_date][] = $post; } - return $posts; - } - - /** - * Filter the WP_Query so we can get a week range of posts - * - * @param string $where The original WHERE SQL query string - * - * @return string $where Our modified WHERE query string - */ - public function posts_where_week_range($where = '') - { - global $wpdb; - - $beginning_date = $this->get_beginning_of_week($this->start_date, 'Y-m-d', $this->current_week); - $ending_date = $this->get_ending_of_week($this->start_date, 'Y-m-d', $this->current_week); - // Adjust the ending date to account for the entire day of the last day of the week - $ending_date = date('Y-m-d', strtotime('+1 day', strtotime($ending_date))); - $where = $where . $wpdb->prepare( - " AND ($wpdb->posts.post_date >= %s AND $wpdb->posts.post_date < %s)", - $beginning_date, - $ending_date - ); - - return $where; - } - - /** - * Gets the link for the next time period - * - * @param string $direction 'previous' or 'next', direction to go in time - * @param array $filters Any filters that need to be applied - * @param int $weeks_offset Number of weeks we're offsetting the range - * - * @return string $url The URL for the next page - */ - public function get_pagination_link($direction = 'next', $filters = [], $weeks_offset = null) - { - $supported_post_types = $this->get_post_types_for_module($this->module); - - if (! isset($weeks_offset)) { - $weeks_offset = $this->total_weeks; - } elseif ($weeks_offset == 0) { - $filters['start_date'] = $this->get_beginning_of_week(date('Y-m-d', current_time('timestamp'))); - } - - if ($direction === 'previous') { - $weeks_offset = '-' . $weeks_offset; - } - - $filters['start_date'] = date( - 'Y-m-d', - strtotime($weeks_offset . ' weeks', strtotime($filters['start_date'])) - ); - $url = add_query_arg($filters, menu_page_url('pp-calendar', false)); - - if (count($supported_post_types) > 1) { - $url = add_query_arg('cpt', $filters['cpt'], $url); - } - - return $url; - } - - /** - * Given a day in string format, returns the day at the beginning of that week, which can be the given date. - * The end of the week is determined by the blog option, 'start_of_week'. - * - * @see http://www.php.net/manual/en/datetime.formats.date.php for valid date formats - * - * @param string $date String representing a date - * @param string $format Date format in which the end of the week should be returned - * @param int $week Number of weeks we're offsetting the range - * - * @return string $formatted_start_of_week End of the week - */ - public function get_beginning_of_week($date, $format = 'Y-m-d', $week = 1) - { - $date = strtotime($date); - $start_of_week = (int)get_option('start_of_week'); - $day_of_week = date('w', $date); - $date += (($start_of_week - $day_of_week - 7) % 7) * 60 * 60 * 24 * $week; - $additional = 3600 * 24 * 7 * ($week - 1); - $formatted_start_of_week = date($format, $date + $additional); - - return $formatted_start_of_week; - } - - /** - * Given a day in string format, returns the day at the end of that week, which can be the given date. - * The end of the week is determined by the blog option, 'start_of_week'. - * - * @see http://www.php.net/manual/en/datetime.formats.date.php for valid date formats - * - * @param string $date String representing a date - * @param string $format Date format in which the end of the week should be returned - * @param int $week Number of weeks we're offsetting the range - * - * @return string $formatted_end_of_week End of the week - */ - public function get_ending_of_week($date, $format = 'Y-m-d', $week = 1) - { - $date = strtotime($date); - $end_of_week = (int)get_option('start_of_week') - 1; - $day_of_week = date('w', $date); - $date += (($end_of_week - $day_of_week + 7) % 7) * 60 * 60 * 24; - $additional = 3600 * 24 * 7 * ($week - 1); - $formatted_end_of_week = date($format, $date + $additional); - - return $formatted_end_of_week; - } - - /** - * Check whether the current user should have the ability to modify the post - * - * @param object $post The post object we're checking - * - * @return bool $can Whether or not the current user can modify the post - * @since 0.7 - * - */ - public function current_user_can_modify_post($post) - { - if (! $post) { - return false; - } - - $post_type_object = get_post_type_object($post->post_type); - - // Is the current user an author of the post? - $userId = (int)wp_get_current_user()->ID; - $isAuthor = apply_filters( - 'publishpress_is_author_of_post', - $userId === (int)$post->post_author, - $userId, - $post->ID - ); - $isPublished = in_array($post->post_status, $this->published_statuses); - $canPublish = current_user_can($post_type_object->cap->publish_posts, $post->ID); - $passedPublishedPostRule = (! $isPublished || ($isPublished && $canPublish)); - - // Published posts only can be updated by those who can publish posts. - // Is the user an author for the content? - if ($isAuthor && $passedPublishedPostRule) { - return true; - } - - // If the user can edit others_posts he can edits the posts depending on the status. - if (current_user_can($post_type_object->cap->edit_others_posts, $post->ID) && $passedPublishedPostRule) { - return true; - } - - return false; - } - - /** - * Register settings for notifications so we can partially use the Settings API - * We use the Settings API for form generation, but not saving because we have our - * own way of handling the data. - * - * @since 0.7 - */ - public function register_settings() - { - add_settings_section( - $this->module->options_group_name . '_general', - false, - '__return_false', - $this->module->options_group_name - ); - - add_settings_field( - 'post_types', - __('Post types to show', 'publishpress'), - [$this, 'settings_post_types_option'], - $this->module->options_group_name, - $this->module->options_group_name . '_general' - ); - - add_settings_field( - 'ics_subscription', - __('Enable subscriptions in iCal or Google Calendar', 'publishpress'), - [$this, 'settings_ics_subscription_option'], - $this->module->options_group_name, - $this->module->options_group_name . '_general' - ); - - add_settings_field( - 'ics_subscription_public_visibility', - __('Allow public access to subscriptions in iCal or Google Calendar', 'publishpress'), - [$this, 'settings_ics_subscription_public_visibility_option'], - $this->module->options_group_name, - $this->module->options_group_name . '_general' - ); - - add_settings_field( - 'show_posts_publish_time', - __('Statuses to display publish time', 'publishpress'), - [$this, 'settings_show_posts_publish_time_option'], - $this->module->options_group_name, - $this->module->options_group_name . '_general' - ); - - add_settings_field( - 'posts_publish_time_format', - __('Posts publish time format', 'publishpress'), - [$this, 'settings_posts_publish_time_format_option'], - $this->module->options_group_name, - $this->module->options_group_name . '_general' - ); - - add_settings_field( - 'default_publish_time', - __('Default publish time for items created in the calendar', 'publishpress'), - [$this, 'settings_default_publish_time_option'], - $this->module->options_group_name, - $this->module->options_group_name . '_general' - ); - - add_settings_field( - 'sort_by', - __('Field used for sorting the calendar items in a day cell', 'publishpress'), - [$this, 'settings_sort_by_option'], - $this->module->options_group_name, - $this->module->options_group_name . '_general' - ); - - add_settings_field( - 'max_visible_posts_per_date', - __('Max visible posts per date', 'publishpress'), - [$this, 'settings_max_visible_posts_per_date'], - $this->module->options_group_name, - $this->module->options_group_name . '_general' - ); - - add_settings_field( - 'show_calendar_posts_full_title', - __('Always show complete post titles', 'publishpress'), - [$this, 'settings_show_calendar_posts_full_title_option'], - $this->module->options_group_name, - $this->module->options_group_name . '_general' - ); - } - - /** - * Choose the post types that should be displayed on the calendar - * - * @since 0.7 - */ - public function settings_post_types_option() - { - global $publishpress; - $publishpress->settings->helper_option_custom_post_type($this->module); - - // Check if we need to display the message about selecting at lest one post type - if (get_transient(static::TRANSIENT_SHOW_ONE_POST_TYPE_WARNING)) { - echo '

    ' . __( - 'At least one post type must be selected', - 'publishpress' - ) . '

    '; - - delete_transient(static::TRANSIENT_SHOW_ONE_POST_TYPE_WARNING); - } - } - - /** - * Give a bit of helper text to indicate the user can change - * number of weeks in the screen options - * - * @since 0.7 - */ - public function settings_number_weeks_option() - { - echo '' . __( - 'The number of weeks shown on the calendar can be changed on a user-by-user basis using the calendar\'s screen options.', - 'publishpress' - ) . ''; - } - - /** - * Enable calendar subscriptions via .ics in iCal or Google Calendar - * - * @since 0.8 - */ - public function settings_ics_subscription_option() - { - $options = [ - 'off' => __('Disabled', 'publishpress'), - 'on' => __('Enabled', 'publishpress'), - ]; - echo ''; - - $regenerate_url = add_query_arg( - 'action', - 'pp_calendar_regenerate_calendar_feed_secret', - admin_url('admin.php?page=pp-calendar') - ); - $regenerate_url = wp_nonce_url($regenerate_url, 'pp-regenerate-ics-key'); - echo '   ' . __( - 'Regenerate calendar feed secret', - 'publishpress' - ) . ''; - - // If our secret key doesn't exist, create a new one - if (empty($this->module->options->ics_secret_key)) { - PublishPress()->update_module_option($this->module->name, 'ics_secret_key', wp_generate_password()); - } - } - - /** - * Enable calendar subscriptions via .ics in iCal or Google Calendar - * - * @since 0.8 - */ - public function settings_ics_subscription_public_visibility_option() - { - - - echo '
    '; - - echo sprintf( - '', - esc_attr($this->module->options_group_name) . '[ics_subscription_public_visibility]', - 'on' === $this->module->options->ics_subscription_public_visibility ? 'checked' : '' - ); - - echo '
    '; - } - - /** - * Option that define either Posts publish times are displayed or not. - * - * @since 1.20.0 - */ - public function settings_show_posts_publish_time_option() - { - global $publishpress; - - $field_name = esc_attr($this->module->options_group_name) . '[show_posts_publish_time]'; - - $customStatuses = $publishpress->getCustomStatuses(); - - if (empty($customStatuses)) { - $statuses = [ - 'publish' => __('Publish'), - 'future' => __('Scheduled'), - ]; - } else { - $statuses = []; - - foreach ($customStatuses as $status) { - $statuses[$status->slug] = ['title' => $status->label, 'status_obj' => $status]; - } - } - - // Add support to the legacy value for this setting, where "on" means post and page selected. - if ($this->module->options->show_posts_publish_time === 'on') { - $this->module->options->show_posts_publish_time = [ - 'publish' => 'on', - 'future' => 'on', - ]; - } - - if (empty($customStatuses)) { - foreach ($statuses as $status => $title) { - $id = esc_attr($status) . '-display-publish-time'; - - echo '
    '; - - echo '
    '; - } - } else { - echo ''; - - echo '
    '; - - foreach ($statuses as $status => $arr_status) { - $id = esc_attr($status) . '-display-publish-time'; - - echo '
    '; - - if (class_exists('PublishPress_Statuses')) { - $_args = [ - 'action' => 'edit-status', - 'return_module' => 'pp-calendar-settings', - ]; - - $_args['name'] = $arr_status['status_obj']->name; - - $item_edit_link = esc_url( - PublishPress_Statuses::get_link( - $_args - ) - ); - - echo ' ' . __('edit') . ''; - } - - echo '
    '; - } - - echo '
    '; - } - } - - private function getCalendarTimeFormat() - { - return ! isset($this->module->options->posts_publish_time_format) || is_null( - $this->module->options->posts_publish_time_format - ) - ? self::TIME_FORMAT_12H_NO_LEADING_ZEROES - : $this->module->options->posts_publish_time_format; - } - - /** - * Define the time format for Posts publish date. - * - * @since 1.20.0 - */ - public function settings_posts_publish_time_format_option() - { - $timeFormats = [ - self::TIME_FORMAT_12H_NO_LEADING_ZEROES => '1-12 am/pm', - self::TIME_FORMAT_12H_WITH_LEADING_ZEROES => '01-12 am/pm', - self::TIME_FORMAT_24H => '00-23', - ]; - - $posts_publish_time_format = $this->getCalendarTimeFormat(); - - echo '
    '; - - foreach ($timeFormats as $timeFormat => $timeMockValue) { - printf( - ' -
    - - %2$s -
    ', - esc_attr($this->module->options_group_name) . '[posts_publish_time_format]', - $timeFormat, - $posts_publish_time_format === $timeFormat ? 'checked' : '', - $timeMockValue - ); - } - - echo '
    '; - } - - /** - * @since 2.0.7 - */ - public function settings_default_publish_time_option() - { - echo '
    '; - - echo sprintf( - '', - esc_attr($this->module->options_group_name) . '[default_publish_time]', - $this->module->options->default_publish_time - ); - - echo '
    '; - } - - public function settings_show_calendar_posts_full_title_option() - { - echo '
    '; - - echo sprintf( - '', - esc_attr($this->module->options_group_name) . '[show_calendar_posts_full_title]', - 'on' === $this->module->options->show_calendar_posts_full_title ? 'checked' : '' - ); - - echo '
    '; + return $posts; } - public function settings_sort_by_option() + /** + * Filter the WP_Query so we can get a week range of posts + * + * @param string $where The original WHERE SQL query string + * + * @return string $where Our modified WHERE query string + */ + public function posts_where_week_range($where = '') { - $fields = [ - 'time' => __('Publishing Time', 'publishpress'), - 'status' => __('Post Status', 'publishpress'), - ]; + global $wpdb; - $sortByOptionValue = ! isset($this->module->options->sort_by) || is_null( - $this->module->options->sort_by - ) - ? 'time' - : $this->module->options->sort_by; - - echo '
    '; - - foreach ($fields as $key => $label) { - printf( - ' -
    - -
    ', - esc_attr($this->module->options_group_name) . '[sort_by]', - $key, - $key === $sortByOptionValue ? 'checked' : '', - $label + $beginning_date = PP_Calendar_Utilities::get_beginning_of_week($this->start_date, 'Y-m-d', $this->current_week); + $ending_date = PP_Calendar_Utilities::get_ending_of_week($this->start_date, 'Y-m-d', $this->current_week); + // Adjust the ending date to account for the entire day of the last day of the week + $ending_date = date('Y-m-d', strtotime('+1 day', strtotime($ending_date))); + $where = $where . $wpdb->prepare( + " AND ($wpdb->posts.post_date >= %s AND $wpdb->posts.post_date < %s)", + $beginning_date, + $ending_date ); - } - echo '
    '; + return $where; } - public function settings_max_visible_posts_per_date() + private function getCalendarTimeFormat() { - $maxVisiblePostsPerDate = ! isset($this->module->options->max_visible_posts_per_date) || is_null( - $this->module->options->max_visible_posts_per_date + return ! isset($this->module->options->posts_publish_time_format) || is_null( + $this->module->options->posts_publish_time_format ) - ? (int)$this->default_max_visible_posts_per_date - : (int)$this->module->options->max_visible_posts_per_date; - - echo '
    '; - - echo sprintf( - '
    '; + ? self::TIME_FORMAT_12H_NO_LEADING_ZEROES + : $this->module->options->posts_publish_time_format; } /** @@ -4225,131 +1717,6 @@ private function isPostStatusValid($subject) return false; } - /** - * Allow altering modified date when creating posts. WordPress by default - * doesn't allow that. We need it to fix an issue where the post_modified - * field is saved with the post_date value. That is a problem when you save - * a post with post_date to the future. For scheduled posts. - * - * @param array $data - * @param array $postarr - * - * @return array - */ - public function alter_post_modification_time($data, $postarr) - { - if (! empty($postarr['post_modified']) && ! empty($postarr['post_modified_gmt'])) { - $data['post_modified'] = $postarr['post_modified']; - $data['post_modified_gmt'] = $postarr['post_modified_gmt']; - } - - return $data; - } - - public function calendar_filters() - { - $select_filter_names = []; - - $select_filter_names['post_status'] = 'post_status'; - $select_filter_names['cat'] = 'cat'; - $select_filter_names['tag'] = 'tag'; - $select_filter_names['author'] = 'author'; - $select_filter_names['type'] = 'cpt'; - $select_filter_names['weeks'] = 'weeks'; - - return apply_filters('pp_calendar_filter_names', $select_filter_names); - } - - public function searchAuthors() - { - header('Content-type: application/json;'); - - if (! wp_verify_nonce(sanitize_text_field($_GET['nonce']), 'publishpress-calendar-get-data')) { - wp_send_json([]); - } - - $queryText = isset($_GET['q']) ? sanitize_text_field($_GET['q']) : ''; - $user_roles = (isset($_GET['user_role']) && is_array($_GET['user_role'])) ? array_map('sanitize_text_field', $_GET['user_role']) : []; - - if (empty($user_roles)) { - /** - * @param array $results - * @param string $searchText - */ - $results = apply_filters('publishpress_search_authors_results_pre_search', [], $queryText); - } else { - /** - * @param array $results - * @param array $args - */ - $results = apply_filters( - 'publishpress_search_authors_with_args_results_pre_search', - [], - ['search' => $queryText, 'role__in' => $user_roles] - ); - } - - if (! empty($results)) { - wp_send_json($results); - } - - $user_args = [ - 'number' => 20, - 'orderby' => 'display_name', - ]; - - if (!empty($user_roles)) { - $user_args['role__in'] = $user_roles; - } else { - $user_args['capability'] = 'edit_posts'; - } - - if (! empty($queryText)) { - $user_args['search'] = '*' . $queryText . '*'; - } - - $users = get_users($user_args); - - foreach ($users as $user) { - $results[] = [ - 'id' => $user->ID, - 'text' => $user->display_name, - ]; - } - - wp_send_json($results); - } - - public function searchTerms() - { - header('Content-type: application/json;'); - - if (! wp_verify_nonce(sanitize_text_field($_GET['nonce']), 'publishpress-calendar-get-data')) { - wp_send_json([]); - } - - $queryText = isset($_GET['q']) ? sanitize_text_field($_GET['q']) : ''; - $taxonomy = isset($_GET['taxonomy']) ? sanitize_text_field($_GET['taxonomy']) : ''; - global $wpdb; - - $queryResult = $wpdb->get_results( - $wpdb->prepare( - "SELECT DISTINCT t.slug AS id, t.name AS text - FROM {$wpdb->term_taxonomy} as tt - INNER JOIN {$wpdb->terms} as t ON (tt.term_id = t.term_id) - WHERE tt.taxonomy = %s AND t.name LIKE %s - ORDER BY 2 - LIMIT 20", - $taxonomy, - '%' . $wpdb->esc_like($queryText) . '%' - ) - ); - - $queryResult = map_deep($queryResult, 'html_entity_decode'); - - wp_send_json($queryResult); - } - private function getPostTypeObject($postType) { if (! isset($this->postTypeObjectCache[$postType])) { @@ -4359,99 +1726,6 @@ private function getPostTypeObject($postType) return $this->postTypeObjectCache[$postType]; } - private function extractPostDataForTheCalendar($post) - { - - - $filtered_title = apply_filters('pp_calendar_post_title_html', $post->post_title, $post); - $post->filtered_title = $filtered_title; - - $postTypeOptions = $this->get_post_status_options($post->post_status); - $postTypeObject = $this->getPostTypeObject($post->post_type); - $canEdit = current_user_can($postTypeObject->cap->edit_post, $post->ID); - - $data = [ - 'label' => $filtered_title, - 'id' => (int)$post->ID, - 'timestamp' => esc_attr($post->post_date), - 'icon' => esc_attr($postTypeOptions['icon']), - 'color' => esc_attr($postTypeOptions['color']), - 'showTime' => (bool)$this->showPostsPublishTime($post->post_status), - 'canEdit' => $canEdit, - ]; - - if (Util::isPlannersProActive()) { - $modal_data = $this->localize_post_data([], $post, $canEdit); - - $data['calendar_post_data'] = !empty($modal_data['posts'][0]) ? $modal_data['posts'][0] : []; - $data['calendar_taxonomies_data'] = !empty($modal_data['taxonomies'][$post->ID]) ? $modal_data['taxonomies'][$post->ID] : []; - } else { - $data['calendar_post_data'] = []; - $data['calendar_taxonomies_data'] = []; - } - - return $data; - } - - public function moveCalendarItemToNewDate() - { - if (! wp_verify_nonce(sanitize_text_field($_GET['nonce']), 'publishpress-calendar-get-data')) { - wp_send_json(['error' => __('Invalid nonce', 'publishpress')], 403); - } - - $postId = isset($_POST['id']) ? (int)$_POST['id'] : null; - $newYear = isset($_POST['year']) ? (int)$_POST['year'] : null; - $newMonth = isset($_POST['month']) ? (int)$_POST['month'] : null; - $newDay = isset($_POST['day']) ? (int)$_POST['day'] : null; - - if (empty($postId) || empty($newYear) || empty($newMonth) || empty($newDay)) { - wp_send_json(['error' => __('Invalid input', 'publishpress')], 400); - } - - $post = get_post($postId); - - if (empty($post) || is_wp_error($post)) { - wp_send_json(['error' => __('Post not found', 'publishpress')], 404); - } - - // Check that the user can modify the post - if (! $this->current_user_can_modify_post($post)) { - wp_send_json(['error' => __('No enough permissions', 'publishpress')], 403); - } - - $oldPostDate = $post->post_date; - $postDate = null; - try { - $postDate = new DateTime($post->post_date); - $postDate->setDate($newYear, $newMonth, $newDay); - } catch (Exception $e) { - wp_send_json(['error' => __('Invalid date', 'publishpress')], 400); - } - - $newDate = $postDate->format('Y-m-d H:i:s'); - - wp_update_post( - [ - 'ID' => $postId, - 'post_date' => $newDate, - 'post_date_gmt' => get_gmt_from_date($newDate), - 'edit_date' => true, - - ] - ); - - /** - * @param int $postId - * @param string $newDate - */ - do_action('publishpress_after_moving_calendar_item', $postId, $newDate, $oldPostDate); - - wp_send_json( - true, - 200 - ); - } - private function addTaxQueryToArgs($taxonomy, $termSlug, $args) { if (! isset($args['tax_query'])) { @@ -4473,14 +1747,28 @@ public function fetchCalendarDataJson() wp_send_json([], 403); } - $beginningDate = $this->get_beginning_of_week(sanitize_text_field($_GET['start_date'])); - $endingDate = $this->get_ending_of_week($beginningDate, 'Y-m-d', (int)$_GET['number_of_weeks']); + $beginningDate = PP_Calendar_Utilities::get_beginning_of_week(sanitize_text_field($_GET['start_date'])); + $endingDate = PP_Calendar_Utilities::get_ending_of_week($beginningDate, 'Y-m-d', (int)$_GET['number_of_weeks']); //get and update filters $args = $this->get_filters(); + + $method_args = []; + $method_args['content_calendar_datas'] = $this->get_content_calendar_datas(); + $method_args['userFilters'] = $args; + $method_args['postStatuses'] = $this->getPostStatusOptions(); + $method_args['selectedPostTypes'] = $this->get_selected_post_types(); + $method_args['timeFormat'] = $this->getCalendarTimeFormat(); + $method_args['proActive'] = Util::isPlannersProActive(); + $method_args['operator_labels'] = $this->meta_query_operator_label(); + $method_args['post_statuses'] = $this->get_post_statuses(); + $method_args['terms_options'] = $this->terms_options; + $method_args['form_filters'] = $this->form_filters; + $method_args['form_filter_list'] = $this->form_filter_list; + $method_args['all_filters'] = $this->filters; wp_send_json( - $this->getCalendarData($beginningDate, $endingDate, $args), + $this->content_calendar_methods->getCalendarData($beginningDate, $endingDate, $args, $method_args), 200 ); } @@ -4648,119 +1936,7 @@ public function getPostTypeFields() wp_send_json([], 404); } - $fields = [ - 'title' => [ - 'label' => __('Title', 'publishpress'), - 'value' => null, - 'type' => 'text', - ], - 'status' => [ - 'label' => __('Post Status', 'publishpress'), - 'value' => 'draft', - 'type' => 'status', - 'options' => $this->getUserAuthorizedPostStatusOptions($postType) - ], - 'time' => [ - 'label' => __('Publish Time', 'publishpress'), - 'value' => null, - 'type' => 'time', - 'placeholder' => isset($this->module->options->default_publish_time) ? $this->module->options->default_publish_time : null, - ] - ]; - - if (current_user_can($postTypeObject->cap->edit_others_posts)) { - $fields['authors'] = [ - 'label' => __('Author', 'publishpress'), - 'value' => null, - 'type' => 'authors', - ]; - } - - $taxonomies = get_object_taxonomies($postType); - - if (in_array('category', $taxonomies)) { - $fields['categories'] = [ - 'label' => __('Categories', 'publishpress'), - 'value' => null, - 'type' => 'taxonomy', - 'taxonomy' => 'category', - ]; - } - - if (in_array('post_tag', $taxonomies)) { - $fields['tags'] = [ - 'label' => __('Tags', 'publishpress'), - 'value' => null, - 'type' => 'taxonomy', - 'taxonomy' => 'post_tag', - ]; - } - - $fields['content'] = [ - 'label' => __('Content', 'publishpress'), - 'value' => null, - 'type' => 'html' - ]; - - if (class_exists('PP_Editorial_Metadata')) { - $editorial_metadata_class = new PP_Editorial_Metadata; - $editorial_metadata_terms = $publishpress->editorial_metadata->get_editorial_metadata_terms(['show_in_calendar_form' => true]); - foreach ($editorial_metadata_terms as $term) { - if (isset($term->post_types) && is_array($term->post_types) && in_array($postType, $term->post_types)) { - $term_options = $editorial_metadata_class->get_editorial_metadata_term_by('id', $term->term_id); - $postmeta_key = esc_attr($editorial_metadata_class->get_postmeta_key($term)); - $post_types = (isset($term->post_types) && is_array($term->post_types)) ? array_values($term->post_types) : []; - $post_types = join(" ", $post_types); - $term_data = [ - 'name' => $postmeta_key, - 'label' => $term->name, - 'description' => $term->description, - 'term_options' => $term_options, - ]; - $term_type = $term->type; - if ($term_type === 'user') { - $ajaxArgs = []; - if (isset($term->user_role)) { - $ajaxArgs['user_role'] = $term->user_role; - } - $fields[$term_data['name']] = [ - 'metadata' => true, - 'term' => $term, - 'label' => $term->name, - 'value' => '', - 'ajaxArgs' => $ajaxArgs, - 'post_types' => $post_types, - 'type' => 'authors', - 'multiple' => '' - ]; - } elseif ($term_type === 'paragraph') { - $fields[$term_data['name']] = [ - 'metadata' => true, - 'term' => $term, - 'label' => $term->name, - 'post_types' => $post_types, - 'value' => '', - 'type' => 'html' - ]; - } else { - $html = apply_filters("pp_editorial_metadata_{$term->type}_get_input_html", $term_data, ''); - $fields[$term_data['name']] = [ - 'metadata' => true, - 'post_types' => $post_types, - 'html' => (is_object($html) || is_array($html)) ? '' : '
    ' . $html . '
    ', - 'term' => $term, - 'label' => $term->name, - 'value' => '', - 'type' => 'metafield' - ]; - } - } - } - } - - $fields = apply_filters('publishpress_calendar_get_post_type_fields', $fields, $postType); - - $data = ['fields' => $fields]; + $data = $this->content_calendar_methods->getPostTypeFields($this->getUserAuthorizedPostStatusOptions($postType)); wp_send_json($data, 202); } @@ -4892,9 +2068,9 @@ public function createItem() } // Create the post - add_filter('wp_insert_post_data', [$this, 'alter_post_modification_time'], 99, 2); + add_filter('wp_insert_post_data', ['PP_Calendar_Utilities', 'alter_post_modification_time'], 99, 2); $postId = wp_insert_post($postPlaceholder); - remove_filter('wp_insert_post_data', [$this, 'alter_post_modification_time'], 99); + remove_filter('wp_insert_post_data', ['PP_Calendar_Utilities', 'alter_post_modification_time'], 99); do_action('publishpress_calendar_after_create_post', $postId, $authors); @@ -4943,54 +2119,6 @@ public function createItem() } } - private function getCalendarData($beginningDate, $endingDate, $args = []) - { - $post_query_args = [ - 'post_status' => null, - 'post_type' => null, - 'author' => null, - 'date_query' => [ - 'column' => 'post_date', - 'after' => $beginningDate, - 'before' => $endingDate, - 'inclusive' => true, - ] - ]; - - $post_query_args = wp_parse_args($args, $post_query_args); - - if (isset($this->module->options->sort_by) && $this->module->options->sort_by === 'status') { - $post_query_args['orderby'] = ['post_status' => 'ASC']; - } else { - $post_query_args['orderby'] = ['post_date' => 'ASC']; - } - - /** - * @param array $post_query_args The array with args passed to post query - * @param string $beginningDate The beginning date showed in the calendar - * @param string $endingDate The ending date showed in the calendar - * - * @return array - */ - $post_query_args = apply_filters('publishpress_calendar_data_args', $post_query_args, $beginningDate, $endingDate); - - $postsList = $this->getCalendarDataForMultipleWeeks($post_query_args); - - $data = []; - - foreach ($postsList as $date => $posts) { - if (! isset($data[$date])) { - $data[$date] = []; - } - - foreach ($posts as $post) { - $data[$date][] = $this->extractPostDataForTheCalendar($post); - } - } - - return $data; - } - /** * Sanitize a $_GET or similar filter being used on the calendar * @@ -5045,137 +2173,6 @@ public function sanitize_filter($key, $dirty_value) } } - public function calendar_filter_options($select_id, $select_name, $filters) - { - switch ($select_id) { - case 'post_status': - $post_statuses = $this->get_post_statuses(); - ?> - - - - - - - - get_post_types_for_module($this->module); - if (count($supported_post_types) > 1) { - ?> - - '; - for ($i = 1; $i <= 12; $i++) { - $output .= ''; - } - $output .= ''; - echo $output; - break; - default: - do_action('pp_calendar_filter_display', $select_id, $select_name, $filters); - break; - } - } - /** * When a post is updated, clean the
  • html post cache for it */ @@ -5185,63 +2182,6 @@ public function action_clean_li_html_cache($post_id) wp_cache_delete($post_id . 'read_only', self::$post_li_html_cache_key); } - /** - * Filters the status text of the post. Fixing the text for future and past dates. - * - * @param string $status The status text. - * @param WP_Post $post Post object. - * @param string $column_name The column name. - * @param string $mode The list display mode ('excerpt' or 'list'). - */ - public function filter_post_date_column_status($status, $post, $column_name, $mode) - { - if ('date' === $column_name) { - if ('0000-00-00 00:00:00' === $post->post_date) { - $time_diff = 0; - } else { - $time = get_post_time('G', true, $post); - - $time_diff = time() - $time; - } - - if ('future' === $post->post_status) { - if ($time_diff > 0) { - return '' . esc_html__('Missed schedule') . ''; - } else { - return esc_html__('Scheduled'); - } - } - - if ('publish' === $post->post_status) { - return esc_html__('Published'); - } - - return esc_html__('Publish on'); - } - - return $status; - } - - /** - * @param $status - * - * @return bool - * - * @access private - */ - private function showPostsPublishTime($status) - { - if ($this->module->options->show_posts_publish_time === 'on') { - $this->module->options->show_posts_publish_time = [ - 'publish' => 'on', - 'future' => 'on', - ]; - } - - return isset($this->module->options->show_posts_publish_time[$status]) - && $this->module->options->show_posts_publish_time[$status] === 'on'; - } - /** * Sanitizes a given string input. * @@ -5320,4 +2260,4 @@ private function getViewCapability() return apply_filters('publishpress_calendar_cap_view_calendar', $viewCapability); } } -} +} \ No newline at end of file diff --git a/modules/calendar/library/calendar-methods.php b/modules/calendar/library/calendar-methods.php new file mode 100644 index 00000000..ed6c3c82 --- /dev/null +++ b/modules/calendar/library/calendar-methods.php @@ -0,0 +1,1569 @@ +module_url = $args['module_url']; + $this->module = $args['module']; + } + + /** + * Register settings for notifications so we can partially use the Settings API + * We use the Settings API for form generation, but not saving because we have our + * own way of handling the data. + * + * @since 0.7 + */ + public function register_settings() + { + add_settings_section( + $this->module->options_group_name . '_general', + false, + '__return_false', + $this->module->options_group_name + ); + + add_settings_field( + 'post_types', + __('Post types to show', 'publishpress'), + [$this, 'settings_post_types_option'], + $this->module->options_group_name, + $this->module->options_group_name . '_general' + ); + + add_settings_field( + 'ics_subscription', + __('Enable subscriptions in iCal or Google Calendar', 'publishpress'), + [$this, 'settings_ics_subscription_option'], + $this->module->options_group_name, + $this->module->options_group_name . '_general' + ); + + add_settings_field( + 'ics_subscription_public_visibility', + __('Allow public access to subscriptions in iCal or Google Calendar', 'publishpress'), + [$this, 'settings_ics_subscription_public_visibility_option'], + $this->module->options_group_name, + $this->module->options_group_name . '_general' + ); + + add_settings_field( + 'show_posts_publish_time', + __('Statuses to display publish time', 'publishpress'), + [$this, 'settings_show_posts_publish_time_option'], + $this->module->options_group_name, + $this->module->options_group_name . '_general' + ); + + add_settings_field( + 'posts_publish_time_format', + __('Posts publish time format', 'publishpress'), + [$this, 'settings_posts_publish_time_format_option'], + $this->module->options_group_name, + $this->module->options_group_name . '_general' + ); + + add_settings_field( + 'default_publish_time', + __('Default publish time for items created in the calendar', 'publishpress'), + [$this, 'settings_default_publish_time_option'], + $this->module->options_group_name, + $this->module->options_group_name . '_general' + ); + + add_settings_field( + 'sort_by', + __('Field used for sorting the calendar items in a day cell', 'publishpress'), + [$this, 'settings_sort_by_option'], + $this->module->options_group_name, + $this->module->options_group_name . '_general' + ); + + add_settings_field( + 'max_visible_posts_per_date', + __('Max visible posts per date', 'publishpress'), + [$this, 'settings_max_visible_posts_per_date'], + $this->module->options_group_name, + $this->module->options_group_name . '_general' + ); + + add_settings_field( + 'show_calendar_posts_full_title', + __('Always show complete post titles', 'publishpress'), + [$this, 'settings_show_calendar_posts_full_title_option'], + $this->module->options_group_name, + $this->module->options_group_name . '_general' + ); + } + + + /** + * Choose the post types that should be displayed on the calendar + * + * @since 0.7 + */ + public function settings_post_types_option() + { + global $publishpress; + $publishpress->settings->helper_option_custom_post_type($this->module); + + // Check if we need to display the message about selecting at lest one post type + if (get_transient(static::TRANSIENT_SHOW_ONE_POST_TYPE_WARNING)) { + echo '

    ' . __( + 'At least one post type must be selected', + 'publishpress' + ) . '

    '; + + delete_transient(static::TRANSIENT_SHOW_ONE_POST_TYPE_WARNING); + } + } + + /** + * Option that define either Posts publish times are displayed or not. + * + * @since 1.20.0 + */ + public function settings_show_posts_publish_time_option() + { + global $publishpress; + + $field_name = esc_attr($this->module->options_group_name) . '[show_posts_publish_time]'; + + $customStatuses = $publishpress->getCustomStatuses(); + + if (empty($customStatuses)) { + $statuses = [ + 'publish' => __('Publish'), + 'future' => __('Scheduled'), + ]; + } else { + $statuses = []; + + foreach ($customStatuses as $status) { + $statuses[$status->slug] = ['title' => $status->label, 'status_obj' => $status]; + } + } + + // Add support to the legacy value for this setting, where "on" means post and page selected. + if ($this->module->options->show_posts_publish_time === 'on') { + $this->module->options->show_posts_publish_time = [ + 'publish' => 'on', + 'future' => 'on', + ]; + } + + if (empty($customStatuses)) { + foreach ($statuses as $status => $title) { + $id = esc_attr($status) . '-display-publish-time'; + + echo '
    '; + + echo '
    '; + } + } else { + echo ''; + + echo '
    '; + + foreach ($statuses as $status => $arr_status) { + $id = esc_attr($status) . '-display-publish-time'; + + echo '
    '; + + if (class_exists('PublishPress_Statuses')) { + $_args = [ + 'action' => 'edit-status', + 'return_module' => 'pp-calendar-settings', + ]; + + $_args['name'] = $arr_status['status_obj']->name; + + $item_edit_link = esc_url( + PublishPress_Statuses::get_link( + $_args + ) + ); + + echo ' ' . __('edit') . ''; + } + + echo '
    '; + } + + echo '
    '; + } + } + + private function getCalendarTimeFormat() + { + return ! isset($this->module->options->posts_publish_time_format) || is_null( + $this->module->options->posts_publish_time_format + ) + ? self::TIME_FORMAT_12H_NO_LEADING_ZEROES + : $this->module->options->posts_publish_time_format; + } + + /** + * Define the time format for Posts publish date. + * + * @since 1.20.0 + */ + public function settings_posts_publish_time_format_option() + { + $timeFormats = [ + self::TIME_FORMAT_12H_NO_LEADING_ZEROES => '1-12 am/pm', + self::TIME_FORMAT_12H_WITH_LEADING_ZEROES => '01-12 am/pm', + self::TIME_FORMAT_24H => '00-23', + ]; + + $posts_publish_time_format = $this->getCalendarTimeFormat(); + + echo '
    '; + + foreach ($timeFormats as $timeFormat => $timeMockValue) { + printf( + ' +
    + + %2$s +
    ', + esc_attr($this->module->options_group_name) . '[posts_publish_time_format]', + $timeFormat, + $posts_publish_time_format === $timeFormat ? 'checked' : '', + $timeMockValue + ); + } + + echo '
    '; + } + + /** + * @since 2.0.7 + */ + public function settings_default_publish_time_option() + { + echo '
    '; + + echo sprintf( + '', + esc_attr($this->module->options_group_name) . '[default_publish_time]', + $this->module->options->default_publish_time + ); + + echo '
    '; + } + + public function settings_sort_by_option() + { + $fields = [ + 'time' => __('Publishing Time', 'publishpress'), + 'status' => __('Post Status', 'publishpress'), + ]; + + $sortByOptionValue = ! isset($this->module->options->sort_by) || is_null( + $this->module->options->sort_by + ) + ? 'time' + : $this->module->options->sort_by; + + echo '
    '; + + foreach ($fields as $key => $label) { + printf( + ' +
    + +
    ', + esc_attr($this->module->options_group_name) . '[sort_by]', + $key, + $key === $sortByOptionValue ? 'checked' : '', + $label + ); + } + + echo '
    '; + } + + public function settings_max_visible_posts_per_date() + { + $maxVisiblePostsPerDate = ! isset($this->module->options->max_visible_posts_per_date) || is_null( + $this->module->options->max_visible_posts_per_date + ) + ? (int)$this->default_max_visible_posts_per_date + : (int)$this->module->options->max_visible_posts_per_date; + + echo '
    '; + + echo sprintf( + '
    '; + } + + public function settings_show_calendar_posts_full_title_option() + { + echo '
    '; + + echo sprintf( + '', + esc_attr($this->module->options_group_name) . '[show_calendar_posts_full_title]', + 'on' === $this->module->options->show_calendar_posts_full_title ? 'checked' : '' + ); + + echo '
    '; + } + + /** + * Enable calendar subscriptions via .ics in iCal or Google Calendar + * + * @since 0.8 + */ + public function settings_ics_subscription_option() + { + $options = [ + 'off' => __('Disabled', 'publishpress'), + 'on' => __('Enabled', 'publishpress'), + ]; + echo ''; + + $regenerate_url = add_query_arg( + 'action', + 'pp_calendar_regenerate_calendar_feed_secret', + admin_url('admin.php?page=pp-calendar') + ); + $regenerate_url = wp_nonce_url($regenerate_url, 'pp-regenerate-ics-key'); + echo '   ' . __( + 'Regenerate calendar feed secret', + 'publishpress' + ) . ''; + + // If our secret key doesn't exist, create a new one + if (empty($this->module->options->ics_secret_key)) { + PublishPress()->update_module_option($this->module->name, 'ics_secret_key', wp_generate_password()); + } + } + + /** + * Enable calendar subscriptions via .ics in iCal or Google Calendar + * + * @since 0.8 + */ + public function settings_ics_subscription_public_visibility_option() + { + + + echo '
    '; + + echo sprintf( + '', + esc_attr($this->module->options_group_name) . '[ics_subscription_public_visibility]', + 'on' === $this->module->options->ics_subscription_public_visibility ? 'checked' : '' + ); + + echo '
    '; + } + + /** + * @param $weeks + * @param $startDate + * @param $context + * + * @return float|int + */ + public function filter_calendar_total_weeks_public_feed($weeks, $startDate, $context) + { + if (! isset($_GET['end'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended + $end = 'm2'; + } else { + $end = preg_replace('/[^wm0-9]/', '', sanitize_text_field($_GET['end'])); // phpcs:ignore WordPress.Security.NonceVerification.Recommended + } + + if (preg_match('/m[0-9]*/', $end)) { + $weeks = (int)str_replace('m', '', $end) * 4; + } else { + $weeks = (int)str_replace('w', '', $end); + } + + // Calculate the diff in weeks from start date until now + $today = date('Y-m-d'); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date + + $first = DateTime::createFromFormat('Y-m-d', $startDate); + $second = DateTime::createFromFormat('Y-m-d', $today); + + $diff = floor($first->diff($second)->days / 7); + + $weeks += $diff; + + return $weeks; + } + + /** + * @param $startDate + * + * @return false|string + */ + public function filter_calendar_start_date_public_feed($startDate) + { + if (! isset($_GET['start'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended + // Current week + $start = 0; + } else { + $start = (int)$_GET['start']; // phpcs:ignore WordPress.Security.NonceVerification.Recommended + } + + if ($start > 0) { + $startDate = date('Y-m-d', strtotime('-' . $start . ' months', strtotime($startDate))); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date + } + + return $startDate; + } + + /** + * Add any necessary CSS to the WordPress admin + * + * @uses wp_enqueue_style() + */ + public function add_admin_styles() + { + global $pagenow; + + // Only load calendar styles on the calendar page + if ('admin.php' === $pagenow && isset($_GET['page']) && $_GET['page'] === 'pp-calendar') { // phpcs:ignore WordPress.Security.NonceVerification.Recommended + wp_enqueue_style( + 'publishpress-calendar-css', + $this->module_url . 'lib/calendar.css', + ['publishpress-select2'], + PUBLISHPRESS_VERSION + ); + + wp_enqueue_style( + 'publishpress-async-calendar-theme-light-css', + $this->module_url . 'lib/async-calendar/styles/themes/theme-light.css', + [], + PUBLISHPRESS_VERSION + ); + + wp_enqueue_style( + 'publishpress-async-calendar-css', + $this->module_url . 'lib/async-calendar/styles/async-calendar.css', + ['publishpress-async-calendar-theme-light-css'], + PUBLISHPRESS_VERSION + ); + + if (isset($this->module->options->show_calendar_posts_full_title) && 'on' === $this->module->options->show_calendar_posts_full_title) { + $inline_style = '.publishpress-calendar .publishpress-calendar-item { + height: auto; + max-height: max-content; + white-space: break-spaces; + }'; + wp_add_inline_style('publishpress-async-calendar-css', $inline_style); + } + + wp_enqueue_style( + 'publishpress-select2', + PUBLISHPRESS_URL . 'common/libs/select2-v4.0.13.1/css/select2.min.css', + false, + PUBLISHPRESS_VERSION, + 'screen' + ); + } + } + + /** + * Handle a request to regenerate the calendar feed secret + * + * @since 0.8 + */ + public function handle_regenerate_calendar_feed_secret() + { + if (! isset($_GET['action']) || 'pp_calendar_regenerate_calendar_feed_secret' != $_GET['action']) { + return; + } + + if (! current_user_can('manage_options')) { + wp_die($this->module->messages['invalid-permissions']); + } + + if (! isset($_GET['_wpnonce']) + || ! wp_verify_nonce(sanitize_text_field($_GET['_wpnonce']), 'pp-regenerate-ics-key') + ) { + wp_die($this->module->messages['nonce-failed']); + } + + PublishPress()->update_module_option($this->module->name, 'ics_secret_key', wp_generate_password()); + + $args = [ + 'page' => PP_Modules_Settings::SETTINGS_SLUG, + 'settings_module' => $this->module->settings_slug, + ]; + + wp_safe_redirect( + add_query_arg( + 'message', + 'key-regenerated', + add_query_arg($args, admin_url('admin.php')) + ) + ); + + exit; + } + + public function filterPostsOrderBy($orderBy) + { + if ($this->module->options->sort_by === 'status') { + $orderBy = 'post_status ASC, post_date ASC'; + } else { + $orderBy = 'post_date ASC'; + } + + return $orderBy; + } + + /** + * Check whether the current user should have the ability to modify the post + * + * @param object $post The post object we're checking + * + * @return bool $can Whether or not the current user can modify the post + * @since 0.7 + * + */ + public function current_user_can_modify_post($post) + { + if (! $post) { + return false; + } + + $post_type_object = get_post_type_object($post->post_type); + + // Is the current user an author of the post? + $userId = (int)wp_get_current_user()->ID; + $isAuthor = apply_filters( + 'publishpress_is_author_of_post', + $userId === (int)$post->post_author, + $userId, + $post->ID + ); + $isPublished = in_array($post->post_status, $this->published_statuses); + $canPublish = current_user_can($post_type_object->cap->publish_posts, $post->ID); + $passedPublishedPostRule = (! $isPublished || ($isPublished && $canPublish)); + + // Published posts only can be updated by those who can publish posts. + // Is the user an author for the content? + if ($isAuthor && $passedPublishedPostRule) { + return true; + } + + // If the user can edit others_posts he can edits the posts depending on the status. + if (current_user_can($post_type_object->cap->edit_others_posts, $post->ID) && $passedPublishedPostRule) { + return true; + } + + return false; + } + + public function moveCalendarItemToNewDate() + { + if (! wp_verify_nonce(sanitize_text_field($_GET['nonce']), 'publishpress-calendar-get-data')) { + wp_send_json(['error' => __('Invalid nonce', 'publishpress')], 403); + } + + $postId = isset($_POST['id']) ? (int)$_POST['id'] : null; + $newYear = isset($_POST['year']) ? (int)$_POST['year'] : null; + $newMonth = isset($_POST['month']) ? (int)$_POST['month'] : null; + $newDay = isset($_POST['day']) ? (int)$_POST['day'] : null; + + if (empty($postId) || empty($newYear) || empty($newMonth) || empty($newDay)) { + wp_send_json(['error' => __('Invalid input', 'publishpress')], 400); + } + + $post = get_post($postId); + + if (empty($post) || is_wp_error($post)) { + wp_send_json(['error' => __('Post not found', 'publishpress')], 404); + } + + // Check that the user can modify the post + if (! $this->current_user_can_modify_post($post)) { + wp_send_json(['error' => __('No enough permissions', 'publishpress')], 403); + } + + $oldPostDate = $post->post_date; + $postDate = null; + try { + $postDate = new DateTime($post->post_date); + $postDate->setDate($newYear, $newMonth, $newDay); + } catch (Exception $e) { + wp_send_json(['error' => __('Invalid date', 'publishpress')], 400); + } + + $newDate = $postDate->format('Y-m-d H:i:s'); + + wp_update_post( + [ + 'ID' => $postId, + 'post_date' => $newDate, + 'post_date_gmt' => get_gmt_from_date($newDate), + 'edit_date' => true, + + ] + ); + + /** + * @param int $postId + * @param string $newDate + */ + do_action('publishpress_after_moving_calendar_item', $postId, $newDate, $oldPostDate); + + wp_send_json( + true, + 200 + ); + } + + public function getPostTypeFields($post_status_options) + { + global $publishpress; + + if (! wp_verify_nonce(sanitize_text_field($_GET['nonce']), 'publishpress-calendar-get-data')) { + wp_send_json([], 403); + } + + $postType = isset($_GET['postType']) ? sanitize_text_field($_GET['postType']) : 'post'; + $postTypeObject = get_post_type_object($postType); + if (empty($postTypeObject) || is_wp_error($postTypeObject)) { + wp_send_json([], 404); + } + + $fields = [ + 'title' => [ + 'label' => __('Title', 'publishpress'), + 'value' => null, + 'type' => 'text', + ], + 'status' => [ + 'label' => __('Post Status', 'publishpress'), + 'value' => 'draft', + 'type' => 'status', + 'options' => $post_status_options + ], + 'time' => [ + 'label' => __('Publish Time', 'publishpress'), + 'value' => null, + 'type' => 'time', + 'placeholder' => isset($this->module->options->default_publish_time) ? $this->module->options->default_publish_time : null, + ] + ]; + + if (current_user_can($postTypeObject->cap->edit_others_posts)) { + $fields['authors'] = [ + 'label' => __('Author', 'publishpress'), + 'value' => null, + 'type' => 'authors', + ]; + } + + $taxonomies = get_object_taxonomies($postType); + + if (in_array('category', $taxonomies)) { + $fields['categories'] = [ + 'label' => __('Categories', 'publishpress'), + 'value' => null, + 'type' => 'taxonomy', + 'taxonomy' => 'category', + ]; + } + + if (in_array('post_tag', $taxonomies)) { + $fields['tags'] = [ + 'label' => __('Tags', 'publishpress'), + 'value' => null, + 'type' => 'taxonomy', + 'taxonomy' => 'post_tag', + ]; + } + + $fields['content'] = [ + 'label' => __('Content', 'publishpress'), + 'value' => null, + 'type' => 'html' + ]; + + if (class_exists('PP_Editorial_Metadata')) { + $editorial_metadata_class = new PP_Editorial_Metadata; + $editorial_metadata_terms = $publishpress->editorial_metadata->get_editorial_metadata_terms(['show_in_calendar_form' => true]); + foreach ($editorial_metadata_terms as $term) { + if (isset($term->post_types) && is_array($term->post_types) && in_array($postType, $term->post_types)) { + $term_options = $editorial_metadata_class->get_editorial_metadata_term_by('id', $term->term_id); + $postmeta_key = esc_attr($editorial_metadata_class->get_postmeta_key($term)); + $post_types = (isset($term->post_types) && is_array($term->post_types)) ? array_values($term->post_types) : []; + $post_types = join(" ", $post_types); + $term_data = [ + 'name' => $postmeta_key, + 'label' => $term->name, + 'description' => $term->description, + 'term_options' => $term_options, + ]; + $term_type = $term->type; + if ($term_type === 'user') { + $ajaxArgs = []; + if (isset($term->user_role)) { + $ajaxArgs['user_role'] = $term->user_role; + } + $fields[$term_data['name']] = [ + 'metadata' => true, + 'term' => $term, + 'label' => $term->name, + 'value' => '', + 'ajaxArgs' => $ajaxArgs, + 'post_types' => $post_types, + 'type' => 'authors', + 'multiple' => '' + ]; + } elseif ($term_type === 'paragraph') { + $fields[$term_data['name']] = [ + 'metadata' => true, + 'term' => $term, + 'label' => $term->name, + 'post_types' => $post_types, + 'value' => '', + 'type' => 'html' + ]; + } else { + $html = apply_filters("pp_editorial_metadata_{$term->type}_get_input_html", $term_data, ''); + $fields[$term_data['name']] = [ + 'metadata' => true, + 'post_types' => $post_types, + 'html' => (is_object($html) || is_array($html)) ? '' : '
    ' . $html . '
    ', + 'term' => $term, + 'label' => $term->name, + 'value' => '', + 'type' => 'metafield' + ]; + } + } + } + } + + $fields = apply_filters('publishpress_calendar_get_post_type_fields', $fields, $postType); + + $data = ['fields' => $fields]; + + return $data; + } + + /** + * Filters the status text of the post. Fixing the text for future and past dates. + * + * @param string $status The status text. + * @param WP_Post $post Post object. + * @param string $column_name The column name. + * @param string $mode The list display mode ('excerpt' or 'list'). + */ + public function filter_post_date_column_status($status, $post, $column_name, $mode) + { + if ('date' === $column_name) { + if ('0000-00-00 00:00:00' === $post->post_date) { + $time_diff = 0; + } else { + $time = get_post_time('G', true, $post); + + $time_diff = time() - $time; + } + + if ('future' === $post->post_status) { + if ($time_diff > 0) { + return '' . esc_html__('Missed schedule') . ''; + } else { + return esc_html__('Scheduled'); + } + } + + if ('publish' === $post->post_status) { + return esc_html__('Published'); + } + + return esc_html__('Publish on'); + } + + return $status; + } + + /** + * @param $status + * + * @return bool + * + * @access private + */ + public function showPostsPublishTime($status) + { + if ($this->module->options->show_posts_publish_time === 'on') { + $this->module->options->show_posts_publish_time = [ + 'publish' => 'on', + 'future' => 'on', + ]; + } + + return isset($this->module->options->show_posts_publish_time[$status]) + && $this->module->options->show_posts_publish_time[$status] === 'on'; + } + + /** + * Add any necessary JS to the WordPress admin + * + * @since 0.7 + * @uses wp_enqueue_script() + */ + public function enqueue_admin_scripts($method_args) + { + global $wp_scripts; + + $js_libraries = [ + 'jquery', + 'jquery-ui-core', + 'jquery-ui-sortable', + 'jquery-ui-draggable', + 'jquery-ui-droppable', + 'clipboard-js', + 'publishpress-select2' + ]; + foreach ($js_libraries as $js_library) { + wp_enqueue_script($js_library); + } + wp_enqueue_script( + 'clipboard-js', + $this->module_url . 'lib/clipboard.min.js', + ['jquery'], + PUBLISHPRESS_VERSION, + true + ); + + wp_enqueue_script( + 'publishpress-admin', + PUBLISHPRESS_URL . 'common/js/publishpress-admin.js', + ['jquery'], + PUBLISHPRESS_VERSION + ); + + wp_enqueue_script( + 'publishpress-calendar-js', + $this->module_url . 'lib/calendar.js', + $js_libraries, + PUBLISHPRESS_VERSION, + true + ); + + wp_enqueue_script( + 'publishpress-select2', + PUBLISHPRESS_URL . 'common/libs/select2-v4.0.13.1/js/select2.min.js', + ['jquery'], + PUBLISHPRESS_VERSION + ); + + + + if (! isset($wp_scripts->queue['react'])) { + wp_enqueue_script( + 'react', + PUBLISHPRESS_URL . 'common/js/react.min.js', + [], + PUBLISHPRESS_VERSION, + true + ); + wp_enqueue_script( + 'react-dom', + PUBLISHPRESS_URL . 'common/js/react-dom.min.js', + ['react'], + PUBLISHPRESS_VERSION, + true + ); + } + + wp_enqueue_script( + 'jquery-inputmask', + PUBLISHPRESS_URL . 'common/js/jquery.inputmask.min.js', + [ + 'jquery', + ], + PUBLISHPRESS_VERSION, + true + ); + + wp_enqueue_script( + 'date_i18n', + PUBLISHPRESS_URL . 'common/js/date-i18n.js', + [], + PUBLISHPRESS_VERSION, + true + ); + + // TODO: Replace react and react-dom with the wp.element dependency + wp_enqueue_script( + 'publishpress-async-calendar-js', + $this->module_url . 'lib/async-calendar/js/index.min.js', + [ + 'react', + 'react-dom', + 'jquery', + 'jquery-ui-core', + 'jquery-ui-sortable', + 'jquery-ui-draggable', + 'jquery-ui-droppable', + 'jquery-inputmask', + 'wp-i18n', + 'wp-element', + 'date_i18n', + ], + PUBLISHPRESS_VERSION, + true + ); + + /* + * Filters + */ + $userFilters = $method_args['userFilters']; + $calendar_request_args = $userFilters; + $calendar_request_filter = $userFilters; + + $maxVisibleItemsOption = isset($this->module->options->max_visible_posts_per_date) && ! empty($this->default_max_visible_posts_per_date) ? + (int)$this->module->options->max_visible_posts_per_date : $this->default_max_visible_posts_per_date; + + $postStatuses = $method_args['postStatuses']; + + $postTypes = []; + $postTypesUserCanCreate = []; + foreach ($method_args['selectedPostTypes'] as $postTypeName) { + $postType = get_post_type_object($postTypeName); + + $postTypes[] = [ + 'value' => esc_attr($postTypeName), + 'text' => esc_html($postType->label) + ]; + + if (current_user_can($postType->cap->edit_posts)) { + $postTypesUserCanCreate[] = [ + 'value' => esc_attr($postTypeName), + 'text' => esc_html($postType->labels->singular_name) + ]; + } + } + + $numberOfWeeksToDisplay = isset($calendar_request_filter['weeks']) ? // phpcs:ignore WordPress.Security.NonceVerification.Recommended + (int)$calendar_request_filter['weeks'] : self::DEFAULT_NUM_WEEKS; // phpcs:ignore WordPress.Security.NonceVerification.Recommended + + $firstDateToDisplay = (isset($calendar_request_filter['start_date']) ? // phpcs:ignore WordPress.Security.NonceVerification.Recommended + sanitize_text_field($calendar_request_filter['start_date']) : date('Y-m-d')) . ' 00:00:00'; // phpcs:ignore WordPress.Security.NonceVerification.Recommended,WordPress.DateTime.RestrictedFunctions.date_date + $firstDateToDisplay = PP_Calendar_Utilities::get_beginning_of_week($firstDateToDisplay); + $endDate = PP_Calendar_Utilities::get_ending_of_week( + $firstDateToDisplay, + 'Y-m-d', + $numberOfWeeksToDisplay + ); + + $params = [ + 'requestFilter' => $calendar_request_filter, + 'numberOfWeeksToDisplay' => $numberOfWeeksToDisplay, + 'firstDateToDisplay' => esc_js($firstDateToDisplay), + 'theme' => 'light', + 'weekStartsOnSunday' => (int)get_option('start_of_week') === 0, + 'todayDate' => esc_js(date('Y-m-d 00:00:00')), // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date + 'dateFormat' => esc_js(get_option('date_format', 'Y-m-d H:i:s')), + 'timeFormat' => esc_js($method_args['timeFormat']), + 'maxVisibleItems' => $maxVisibleItemsOption, + 'statuses' => $postStatuses, + 'postTypes' => $postTypes, + 'postTypesCanCreate' => $postTypesUserCanCreate, + 'ajaxUrl' => esc_url(admin_url('admin-ajax.php')), + 'nonce' => wp_create_nonce('publishpress-calendar-get-data'), + 'userCanAddPosts' => count($postTypesUserCanCreate) > 0, + 'items' => $this->getCalendarData($firstDateToDisplay, $endDate, $calendar_request_args, $method_args), + 'allowAddingMultipleAuthors' => (bool)apply_filters( + 'publishpress_calendar_allow_multiple_authors', + false + ), + 'proActive' => $method_args['proActive'], + 'strings' => [ + 'loading' => esc_js(__('Loading...', 'publishpress')), + 'loadingItem' => esc_js(__('Loading item...', 'publishpress')), + 'clickToAdd' => esc_js(__('Click to add', 'publishpress')), + 'movingTheItem' => esc_js(__('Moving the item...', 'publishpress')), + 'hideItems' => esc_js(__('Hide the %s last items', 'publishpress')), + 'showMore' => esc_js(__('Show %s more', 'publishpress')), + 'untitled' => esc_js(__('Untitled', 'publishpress')), + 'close' => esc_js(__('Close', 'publishpress')), + 'save' => esc_js(__('Save', 'publishpress')), + 'saving' => esc_js(__('Saving...', 'publishpress')), + 'saveAndEdit' => esc_js(__('Save and edit', 'publishpress')), + 'addContentFor' => esc_js(__('Add content for %s', 'publishpress')), + 'postTypeNotFound' => esc_js(__('Post type not found', 'publishpress')), + 'postType' => esc_js(__('Post type:', 'publishpress')), + 'pleaseWaitLoadingFormFields' => esc_js(__('Please, wait! Loading the form fields...', 'publishpress')), + 'weekDaySun' => esc_js(__('Sun', 'publishpress')), + 'weekDayMon' => esc_js(__('Mon', 'publishpress')), + 'weekDayTue' => esc_js(__('Tue', 'publishpress')), + 'weekDayWed' => esc_js(__('Wed', 'publishpress')), + 'weekDayThu' => esc_js(__('Thu', 'publishpress')), + 'weekDayFri' => esc_js(__('Fri', 'publishpress')), + 'weekDaySat' => esc_js(__('Sat', 'publishpress')), + 'monthJan' => esc_js(__('Jan', 'publishpress')), + 'monthFeb' => esc_js(__('Feb', 'publishpress')), + 'monthMar' => esc_js(__('Mar', 'publishpress')), + 'monthApr' => esc_js(__('Apr', 'publishpress')), + 'monthMay' => esc_js(__('May', 'publishpress')), + 'monthJun' => esc_js(__('Jun', 'publishpress')), + 'monthJul' => esc_js(__('Jul', 'publishpress')), + 'monthAug' => esc_js(__('Aug', 'publishpress')), + 'monthSep' => esc_js(__('Sep', 'publishpress')), + 'monthOct' => esc_js(__('Oct', 'publishpress')), + 'monthNov' => esc_js(__('Nov', 'publishpress')), + 'monthDec' => esc_js(__('Dec', 'publishpress')), + 'allStatuses' => esc_js(__('All statuses', 'publishpress')), + 'allCategories' => esc_js(__('All categories', 'publishpress')), + 'allTags' => esc_js(__('All tags', 'publishpress')), + 'allAuthors' => esc_js(__('All authors', 'publishpress')), + 'allTypes' => esc_js(__('All types', 'publishpress')), + 'xWeek' => esc_js(__('%d week', 'publishpress')), + 'xWeeks' => esc_js(__('%d weeks', 'publishpress')), + 'today' => esc_js(__('Today', 'publishpress')), + 'noTerms' => esc_js(__('No terms', 'publishpress')), + 'post_date_label' => esc_html__('Post Date', 'publishpress'), + 'edit_label' => esc_html__('Edit', 'publishpress'), + 'delete_label' => esc_html__('Trash', 'publishpress'), + 'preview_label' => esc_html__('Preview', 'publishpress'), + 'view_label' => esc_html__('View', 'publishpress'), + 'prev_label' => esc_html__('Previous Post', 'publishpress'), + 'next_label' => esc_html__('Next Post', 'publishpress'), + 'post_status_label' => esc_html__('Post Status', 'publishpress'), + 'update_label' => esc_html__('Save Changes', 'publishpress'), + 'empty_term' => esc_html__('Taxonomy not set.', 'publishpress'), + 'post_author' => esc_html__('Author', 'publishpress'), + 'date_format' => pp_convert_date_format_to_jqueryui_datepicker(get_option('date_format')), + 'week_first_day' => esc_js(get_option('start_of_week')), + ] + ]; + wp_localize_script('publishpress-async-calendar-js', 'publishpressCalendarParams', $params); + + global $wp_locale; + $monthNames = array_map([&$wp_locale, 'get_month'], range(1, 12)); + $monthNamesShort = array_map([&$wp_locale, 'get_month_abbrev'], $monthNames); + $dayNames = array_map([&$wp_locale, 'get_weekday'], range(0, 6)); + $dayNamesShort = array_map([&$wp_locale, 'get_weekday_abbrev'], $dayNames); + wp_localize_script( + "date_i18n", + "DATE_I18N", + array( + "month_names" => $monthNames, + "month_names_short" => $monthNamesShort, + "day_names" => $dayNames, + "day_names_short" => $dayNamesShort + ) + ); + } + + public function getCalendarData($beginningDate, $endingDate, $args = [], $method_args = []) + { + $post_query_args = [ + 'post_status' => null, + 'post_type' => null, + 'author' => null, + 'date_query' => [ + 'column' => 'post_date', + 'after' => $beginningDate, + 'before' => $endingDate, + 'inclusive' => true, + ] + ]; + + $post_query_args = wp_parse_args($args, $post_query_args); + + if (isset($this->module->options->sort_by) && $this->module->options->sort_by === 'status') { + $post_query_args['orderby'] = ['post_status' => 'ASC']; + } else { + $post_query_args['orderby'] = ['post_date' => 'ASC']; + } + + /** + * @param array $post_query_args The array with args passed to post query + * @param string $beginningDate The beginning date showed in the calendar + * @param string $endingDate The ending date showed in the calendar + * + * @return array + */ + $post_query_args = apply_filters('publishpress_calendar_data_args', $post_query_args, $beginningDate, $endingDate); + + $postsList = $this->getCalendarDataForMultipleWeeks($post_query_args, 'dashboard', $method_args); + + $data = []; + + foreach ($postsList as $date => $posts) { + if (! isset($data[$date])) { + $data[$date] = []; + } + + foreach ($posts as $post) { + $data[$date][] = $this->extractPostDataForTheCalendar($post); + } + } + + return $data; + } + + private function getPostTypeObject($postType) + { + if (! isset($this->postTypeObjectCache[$postType])) { + $this->postTypeObjectCache[$postType] = get_post_type_object($postType); + } + + return $this->postTypeObjectCache[$postType]; + } + + private function extractPostDataForTheCalendar($post) + { + //$module_class = new PP_Module(); + + $filtered_title = apply_filters('pp_calendar_post_title_html', $post->post_title, $post); + $post->filtered_title = $filtered_title; + + $postTypeOptions = $this->get_post_status_options($post->post_status); + $postTypeObject = $this->getPostTypeObject($post->post_type); + $canEdit = current_user_can($postTypeObject->cap->edit_post, $post->ID); + + $data = [ + 'label' => $filtered_title, + 'id' => (int)$post->ID, + 'timestamp' => esc_attr($post->post_date), + 'icon' => esc_attr($postTypeOptions['icon']), + 'color' => esc_attr($postTypeOptions['color']), + 'showTime' => (bool)$this->showPostsPublishTime($post->post_status), + 'canEdit' => $canEdit, + ]; + + if (PublishPress\Legacy\Util::isPlannersProActive()) { + $modal_data = $this->localize_post_data([], $post, $canEdit); + + $data['calendar_post_data'] = !empty($modal_data['posts'][0]) ? $modal_data['posts'][0] : []; + $data['calendar_taxonomies_data'] = !empty($modal_data['taxonomies'][$post->ID]) ? $modal_data['taxonomies'][$post->ID] : []; + } else { + $data['calendar_post_data'] = []; + $data['calendar_taxonomies_data'] = []; + } + + return $data; + } + + /** + * Query to get all of the calendar posts for a given day + * + * @param array $args Any filter arguments we want to pass + * @param string $context Where the query is coming from, to distinguish dashboard and subscriptions + * + * @return array $posts All of the posts as an array sorted by date + */ + public function getCalendarDataForMultipleWeeks($args = [], $context = 'dashboard', $method_args = []) + { + $supported_post_types = PublishPress\Legacy\Util::get_post_types_for_module($this->module); + $defaults = [ + 'post_status' => null, + 'author' => null, + 'post_type' => $supported_post_types, + 'posts_per_page' => -1, + 'order' => 'ASC', + ]; + + $args = array_merge($defaults, $args); + + if (isset($args['s']) && ! empty($args['s'])) { + $args['s'] = sanitize_text_field($args['s']); + } + + $current_user_id = get_current_user_id(); + + $user_filters = $method_args['userFilters']; + + // Get content calendar data + $content_calendar_datas = $method_args['content_calendar_datas']; + + $filters = $content_calendar_datas['content_calendar_filters']; + /** + * @param array $filters + * + * @return array + */ + $filters = apply_filters('publishpress_content_calendar_filters', $filters); + + $enabled_filters = array_keys($filters); + $editorial_metadata = $method_args['terms_options']; + + if (!empty($args['cpt'])) { + $args['post_type'] = $args['cpt']; + } + + + if (empty($args['post_type']) || ! in_array($args['post_type'], $supported_post_types)) { + $args['post_type'] = $supported_post_types; + } + + //remove inactive builtin filter + if (!in_array('cpt', $enabled_filters)) { + // show all post type + $args['post_type'] = $supported_post_types; + } + + if (!in_array('author', $enabled_filters)) { + unset($args['author']); + } + + $meta_query = $tax_query = ['relation' => 'AND']; + $metadata_filter = $taxonomy_filter = false; + $checklists_filters = []; + + // apply enabled filter + foreach ($enabled_filters as $enabled_filter) { + if (array_key_exists($enabled_filter, $editorial_metadata)) { + //metadata field filter + $meta_key = $enabled_filter; + $metadata_term = $editorial_metadata[$meta_key]; + unset($args[$enabled_filter]); + if ($metadata_term['type'] === 'date') { + $date_type_metaquery = []; + + if (! empty($user_filters[$meta_key . '_start'])) { + $date_type_metaquery[] = strtotime($user_filters[$meta_key . '_start_hidden']); + } + if (! empty($user_filters[$meta_key . '_end'])) { + $date_type_metaquery[] = strtotime($user_filters[$meta_key . '_end_hidden']); + } + if (count($date_type_metaquery) === 2) { + $metadata_filter = true; + $compare = 'BETWEEN'; + $meta_value = $date_type_metaquery; + } elseif (count($date_type_metaquery) === 1) { + $metadata_filter = true; + $compare = '='; + $meta_value = $date_type_metaquery[0]; + } + + if (!empty($date_type_metaquery)) { + $metadata_filter = true; + $meta_query[] = array( + 'key' => '_pp_editorial_meta_' . $metadata_term['type'] . '_' . $metadata_term['slug'], + 'value' => $meta_value, + 'compare' => $compare + ); + } + + } elseif (! empty($user_filters[$meta_key])) { + if ($metadata_term['type'] === 'date') { + continue; + } else { + $meta_value = sanitize_text_field($user_filters[$meta_key]); + } + + $compare = '='; + if ($metadata_term['type'] === 'paragraph' + || ($metadata_term['type'] === 'select' && isset($metadata_term->select_type) && $metadata_term['select_type'] === 'multiple') + ) { + $compare = 'LIKE'; + } + $metadata_filter = true; + $meta_query[] = array( + 'key' => '_pp_editorial_meta_' . $metadata_term['type'] . '_' . $metadata_term['slug'], + 'value' => $meta_value, + 'compare' => $compare + ); + } + + } elseif( + in_array($enabled_filter, $content_calendar_datas['meta_keys']) + && ( + isset($user_filters[$enabled_filter]) + && + ( + !empty($user_filters[$enabled_filter]) + || $user_filters[$enabled_filter] == '0' + || ( + !empty($user_filters[$enabled_filter . '_operator']) + && $user_filters[$enabled_filter . '_operator'] === 'not_exists' + ) + ) + ) + ) { + // metakey filter + unset($args[$enabled_filter]); + $meta_value = sanitize_text_field($user_filters[$enabled_filter]); + $meta_operator = !empty($user_filters[$enabled_filter . '_operator']) ? $user_filters[$enabled_filter . '_operator'] : 'equals'; + $compare = $method_args['operator_labels']; + + $metadata_filter = true; + + if ($meta_operator == 'not_exists') { + $meta_query[] = array( + 'relation' => 'OR', + array( + 'key' => $enabled_filter, + 'compare' => 'NOT EXISTS' + ), + array( + 'key' => $enabled_filter, + 'value' => '', + 'compare' => '=' + ) + ); + } else { + $meta_query[] = array( + 'key' => $enabled_filter, + 'value' => $meta_value, + 'compare' => $compare + ); + } + } elseif (in_array($enabled_filter, ['ppch_co_yoast_seo__yoast_wpseo_linkdex', 'ppch_co_yoast_seo__yoast_wpseo_content_score']) && !empty($user_filters[$enabled_filter]) && array_key_exists($enabled_filter, $method_args['form_filter_list']) && class_exists('WPSEO_Meta')) { + // yoast seo filter + unset($args[$enabled_filter]); + $meta_value = sanitize_text_field($user_filters[$enabled_filter]); + $meta_key = str_replace('ppch_co_yoast_seo_', '', $enabled_filter); + $meta_operator = !empty($user_filters[$enabled_filter . '_operator']) ? $user_filters[$enabled_filter . '_operator'] : 'equals'; + $compare = PP_Module::static_meta_query_operator_symbol($meta_operator); + $metadata_filter = true; + $meta_query[] = array( + 'key' => $meta_key, + 'value' => $meta_value, + 'compare' => $compare + ); + + } elseif(array_key_exists($enabled_filter, $content_calendar_datas['taxonomies']) && !empty($user_filters[$enabled_filter])) { + //taxonomy filter + unset($args[$enabled_filter]); + $tax_value = sanitize_text_field($user_filters[$enabled_filter]); + $taxonomy_filter = true; + $tax_query[] = array( + 'taxonomy' => $enabled_filter, + 'field' => 'slug', + 'terms' => [$tax_value], + 'include_children' => true, + 'operator' => 'IN', + ); + } elseif(!empty($user_filters[$enabled_filter]) && strpos($enabled_filter, "ppch_co_checklist_") === 0 && array_key_exists($enabled_filter, $method_args['form_filter_list'])) { + // checklists filter + /** + * TODO: Implement metaquery filter when checklists started storing checklists status in meta_key + */ + unset($args[$enabled_filter]); + $meta_value = sanitize_text_field($user_filters[$enabled_filter]); + $meta_key = str_replace('ppch_co_checklist_', '', $enabled_filter); + $checklists_filters[$meta_key] = $meta_value; + } + + } + + if ($metadata_filter) { + $args['meta_query'] = $meta_query; + } + + if ($taxonomy_filter) { + $args['tax_query'] = $tax_query; + } + + // Unpublished as a status is just an array of everything but 'publish' + if ($args['post_status'] == 'unpublish') { + $args['post_status'] = ''; + $post_statuses = $method_args['post_statuses']; + foreach ($post_statuses as $post_status) { + $args['post_status'] .= $post_status->slug . ', '; + } + $args['post_status'] = rtrim($args['post_status'], ', '); + // Optional filter to include scheduled content as unpublished + if (apply_filters('pp_show_scheduled_as_unpublished', true)) { + $args['post_status'] .= ', future'; + } + } + // unset legacy options + if (isset($args['cat'])) { + unset($args['cat']); + } + if (isset($args['tag'])) { + unset($args['tag']); + } + + if (!empty($args['me_mode']) && !empty($current_user_id)) { + $args['author'] = $current_user_id; + } + + // Filter by post_author if it's set + if (isset($args['author']) && empty($args['author'])) { + unset($args['author']); + } + + // Filter for an end user to implement any of their own query args + $args = apply_filters('pp_calendar_posts_query_args', $args, $context, $enabled_filters, $user_filters); + + if (isset($this->module->options->sort_by)) { + add_filter('posts_orderby', [$this, 'filterPostsOrderBy'], 10); + } + $post_results = new WP_Query($args); + + $posts = []; + while ($post_results->have_posts()) { + $post_results->the_post(); + global $post; + + $add_post = true; + + if (!empty($checklists_filters)) { + $post_checklists = apply_filters('publishpress_checklists_requirement_list', [], $post); + foreach ($checklists_filters as $checklists_filter_name => $checklists_filter_check) { + if (!array_key_exists($checklists_filter_name, $post_checklists)) { + // post that doesn't have this requirement shouldn't show? + $add_post = false; + } elseif ($checklists_filter_check == 'passed' && empty($post_checklists[$checklists_filter_name]['status'])) { + // filter posts that failed when condition is passed + $add_post = false; + } elseif ($checklists_filter_check == 'failed' && !empty($post_checklists[$checklists_filter_name]['status'])) { + // filter out post that passed when condition is failed + $add_post = false; + } + } + } + + if ($add_post) { + /** + * TODO: Should we require posts like x2 if results is empty due to $add_post been false for all? + */ + $key_date = date('Y-m-d', strtotime($post->post_date)); + $posts[$key_date][] = $post; + } + } + + if (isset($this->module->options->sort_by)) { + remove_filter('posts_orderby', [$this, 'filterPostsOrderBy']); + } + + return $posts; + } + + } + +} \ No newline at end of file diff --git a/modules/calendar/library/calendar-utilities.php b/modules/calendar/library/calendar-utilities.php new file mode 100644 index 00000000..1c59c667 --- /dev/null +++ b/modules/calendar/library/calendar-utilities.php @@ -0,0 +1,1012 @@ + + + label); + ?> + + + + + + + + +
    +
    + +
    +
    + + +
    + 'filter-submit']); ?> +
    + + + + + + + + + ', + esc_attr($metadata_start_name), + esc_attr($metadata_start_value), + esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), + '' + ); + printf( + '', + esc_attr($metadata_start_name), + esc_attr($metadata_start_value_hidden) + ); + ?> +
    + ', + esc_attr($metadata_end_name), + esc_attr($metadata_end_value), + esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), + '' + ); + printf( + '', + esc_attr($metadata_end_name), + esc_attr($metadata_end_value_hidden) + ); + ?> +
    + 'filter-submit']); ?> +
    + display_name; + } + } + $user_dropdown_args = [ + 'show_option_all' => $metadata_term['name'], + 'name' => $select_name, + 'selected' => $metadata_value, + 'class' => 'pp-custom-select2' + ]; + $user_dropdown_args = apply_filters('pp_editorial_metadata_user_dropdown_args', $user_dropdown_args); + wp_dropdown_users($user_dropdown_args); + } elseif ($metadata_type === 'checkbox') { + if ($metadata_value == '1') { + $selected_value = esc_html__('Checked', 'publishpress'); + } else { + $selected_value = ''; + } + ?> + + + /> +
    + 'filter-submit']); ?> +
    +
    '; + break; + + default: + if (array_key_exists($select_name, $form_filter_list)) { + $selected_value_meta = isset($filters[$select_name]) ? sanitize_text_field($filters[$select_name]) : ''; + $filter_label = $all_filters[$select_name]; + $selected_value = $selected_value_meta; + + if (strpos($select_name, "ppch_co_checklist_") === 0) { + ?> + + +
    +
    + +
    +
    + + +
    + 'filter-submit']); ?> +
    + +
    +
    + $selected_value, 'filter_label' => $filter_label, 'html' => ob_get_clean()]; + } + + /** + * Return calendar filters + * @return string + */ + public static function get_calendar_filters($args) { + ob_start(); + + $user_filters = $args['user_filters']; + $calendar_filters = $args['calendar_filters']; + ?> +
    +
    + +
    + +
    + + +
    + +
    + +
    +
    +
    +
    + + 'co-searchbox-search-submit']); ?> +
    +
    +
    +
    +
    +
    + + + +
    + + + + $select_name) { + $modal_id++; + $args['select_id'] = $select_id; + $args['select_name'] = $select_name; + $filter_data = self::content_calendar_filter_options($args); + $active_class = !empty($filter_data['selected_value']) ? 'active-filter' : ''; + $button_label = $filter_data['filter_label']; + $button_label .= !empty($filter_data['selected_value']) ? ': ' . $filter_data['selected_value'] : ''; + ?> + + + + + + + + +
    +
    + +
    + + +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    +

    +
    +
    + $filter_datas) : + $filter_index++; + $hidden_style = empty($filter_datas['filters']) ? 'display: none;' : ''; + ?> +
    +
    + +
    + +
    + +
    + + + + +
    + + $filter_label) : + $active_class = (in_array($filter_name, $enabled_filters)) ? 'active-item' : ''; + $input_name = (in_array($filter_name, $enabled_filters)) ? 'content_calendar_filters['. $filter_name .']' : ''; + + $all_filters[$filter_name] = [ + 'filter_label' => $filter_label, + 'filter_group' => $filter_group + ]; + ?> +
    + + + + +
    + +
    +
    + +
    +
    +
    ()
    +
    + +
    + +
    + +
    + + + +
    +
    + +
    +
    + +
    +
    +
    +
    + $queryText, 'role__in' => $user_roles] + ); + } + + if (! empty($results)) { + wp_send_json($results); + } + + $user_args = [ + 'number' => 20, + 'orderby' => 'display_name', + ]; + + if (!empty($user_roles)) { + $user_args['role__in'] = $user_roles; + } else { + $user_args['capability'] = 'edit_posts'; + } + + if (! empty($queryText)) { + $user_args['search'] = '*' . $queryText . '*'; + } + + $users = get_users($user_args); + + foreach ($users as $user) { + $results[] = [ + 'id' => $user->ID, + 'text' => $user->display_name, + ]; + } + + wp_send_json($results); + } + + public static function searchTerms() + { + header('Content-type: application/json;'); + + if (! wp_verify_nonce(sanitize_text_field($_GET['nonce']), 'publishpress-calendar-get-data')) { + wp_send_json([]); + } + + $queryText = isset($_GET['q']) ? sanitize_text_field($_GET['q']) : ''; + $taxonomy = isset($_GET['taxonomy']) ? sanitize_text_field($_GET['taxonomy']) : ''; + global $wpdb; + + $queryResult = $wpdb->get_results( + $wpdb->prepare( + "SELECT DISTINCT t.slug AS id, t.name AS text + FROM {$wpdb->term_taxonomy} as tt + INNER JOIN {$wpdb->terms} as t ON (tt.term_id = t.term_id) + WHERE tt.taxonomy = %s AND t.name LIKE %s + ORDER BY 2 + LIMIT 20", + $taxonomy, + '%' . $wpdb->esc_like($queryText) . '%' + ) + ); + + $queryResult = map_deep($queryResult, 'html_entity_decode'); + + wp_send_json($queryResult); + } + + /** + * Returns a VTIMEZONE component for a Olson timezone identifier + * with daylight transitions covering the given date range. + * + * @param \Sabre\VObject\Component\VCalendar + * @param string $tzid Timezone ID as used in PHP's Date functions + * @param int $from Unix timestamp with first date/time in this timezone + * @param int $to Unix timestap with last date/time in this timezone + * + * @return mixed A Sabre\VObject\Component object representing a VTIMEZONE definition + * or false if no timezone information is available + */ + public static function generateVTimeZone(&$calendar, $tzid, $from = 0, $to = 0) + { + if (! $from) { + $from = time(); + } + if (! $to) { + $to = $from; + } + + try { + $tz = new DateTimeZone($tzid); + } catch (Exception $e) { + return false; + } + + // get all transitions for one year back/ahead + $year = 86400 * 360; + $transitions = $tz->getTransitions($from - $year, $to + $year); + + $vTimeZone = $calendar->add( + 'VTIMEZONE', + [ + 'TZID' => $tz->getName(), + ] + ); + + $standard = null; + $daylight = null; + $t_std = null; + $t_dst = null; + $tzfrom = 0; + if (is_array($transitions) || is_object($transitions)) { + foreach ($transitions as $i => $trans) { + if ($i == 0) { + $tzfrom = $trans['offset'] / 3600; + continue; + } + + // daylight saving time definition + if ($trans['isdst']) { + $t_dst = $trans['ts']; + $dt = new DateTime($trans['time']); + $offset = $trans['offset'] / 3600; + + $daylight = $vTimeZone->add( + 'DAYLIGHT', + [ + 'DTSTART' => $dt->format('Ymd\THis'), + 'TZOFFSETFROM' => sprintf( + '%s%02d%02d', + $tzfrom >= 0 ? '+' : '', + floor($tzfrom), + ($tzfrom - floor($tzfrom)) * 60 + ), + 'TZOFFSETTO' => sprintf( + '%s%02d%02d', + $offset >= 0 ? '+' : '', + floor($offset), + ($offset - floor($offset)) * 60 + ), + ] + ); + + // add abbreviated timezone name if available + if (! empty($trans['abbr'])) { + $daylight->add('TZNAME', [$trans['abbr']]); + } + + $tzfrom = $offset; + } else { + $t_std = $trans['ts']; + $dt = new DateTime($trans['time']); + $offset = $trans['offset'] / 3600; + + $standard = $vTimeZone->add( + 'STANDARD', + [ + 'DTSTART' => $dt->format('Ymd\THis'), + 'TZOFFSETFROM' => sprintf( + '%s%02d%02d', + $tzfrom >= 0 ? '+' : '', + floor($tzfrom), + ($tzfrom - floor($tzfrom)) * 60 + ), + 'TZOFFSETTO' => sprintf( + '%s%02d%02d', + $offset >= 0 ? '+' : '', + floor($offset), + ($offset - floor($offset)) * 60 + ), + ] + ); + + // add abbreviated timezone name if available + if (! empty($trans['abbr'])) { + $standard->add('TZNAME', [$trans['abbr']]); + } + + $tzfrom = $offset; + } + + // we covered the entire date range + if ($standard && $daylight && min($t_std, $t_dst) < $from && max($t_std, $t_dst) > $to) { + break; + } + } + } + + // add X-MICROSOFT-CDO-TZID if available + $microsoftExchangeMap = array_flip(Sabre\VObject\TimeZoneUtil::$microsoftExchangeMap); + if (array_key_exists($tz->getName(), $microsoftExchangeMap)) { + $vTimeZone->add('X-MICROSOFT-CDO-TZID', $microsoftExchangeMap[$tz->getName()]); + } + + return $vTimeZone; + } + + /** + * Perform the encoding necessary for ICS feed text. + * + * @param string $text The string that needs to be escaped + * + * @return string The string after escaping for ICS. + * @since 0.8 + * */ + + public static function do_ics_escaping($text) + { + $text = str_replace(',', '\,', $text); + $text = str_replace(';', '\:', $text); + $text = str_replace('\\', '\\\\', $text); + + return $text; + } + + + /** + * Given a day in string format, returns the day at the beginning of that week, which can be the given date. + * The end of the week is determined by the blog option, 'start_of_week'. + * + * @see http://www.php.net/manual/en/datetime.formats.date.php for valid date formats + * + * @param string $date String representing a date + * @param string $format Date format in which the end of the week should be returned + * @param int $week Number of weeks we're offsetting the range + * + * @return string $formatted_start_of_week End of the week + */ + public static function get_beginning_of_week($date, $format = 'Y-m-d', $week = 1) + { + $date = strtotime($date); + $start_of_week = (int)get_option('start_of_week'); + $day_of_week = date('w', $date); + $date += (($start_of_week - $day_of_week - 7) % 7) * 60 * 60 * 24 * $week; + $additional = 3600 * 24 * 7 * ($week - 1); + $formatted_start_of_week = date($format, $date + $additional); + + return $formatted_start_of_week; + } + + /** + * Given a day in string format, returns the day at the end of that week, which can be the given date. + * The end of the week is determined by the blog option, 'start_of_week'. + * + * @see http://www.php.net/manual/en/datetime.formats.date.php for valid date formats + * + * @param string $date String representing a date + * @param string $format Date format in which the end of the week should be returned + * @param int $week Number of weeks we're offsetting the range + * + * @return string $formatted_end_of_week End of the week + */ + public static function get_ending_of_week($date, $format = 'Y-m-d', $week = 1) + { + $date = strtotime($date); + $end_of_week = (int)get_option('start_of_week') - 1; + $day_of_week = date('w', $date); + $date += (($end_of_week - $day_of_week + 7) % 7) * 60 * 60 * 24; + $additional = 3600 * 24 * 7 * ($week - 1); + $formatted_end_of_week = date($format, $date + $additional); + + return $formatted_end_of_week; + } + + } + +} \ No newline at end of file diff --git a/modules/content-board/content-board.php b/modules/content-board/content-board.php index 30120b48..4de0357d 100644 --- a/modules/content-board/content-board.php +++ b/modules/content-board/content-board.php @@ -179,6 +179,9 @@ public function init() if (! $this->currentUserCanViewContentBoard()) { return; } + + // Load utilities files. + $this->load_utilities_files(); add_action('admin_init', [$this, 'handle_form_date_range_change']); @@ -755,78 +758,6 @@ public function handle_form_date_range_change() $this->update_user_meta($current_user->ID, self::USERMETA_KEY_PREFIX . 'filters', $user_filters); } - - /** - * Allow the user to define the date range in a new and exciting way - * - * @since 0.7 - */ - public function content_board_time_range() - { - $filtered_start_date = $this->user_filters['start_date']; - $filtered_start_date_timestamp = strtotime($filtered_start_date); - - $filtered_end_date = $this->user_filters['end_date']; - $filtered_end_date_timestamp = strtotime($filtered_end_date); - - $output = '
    '; - $output .= '
    '; - $output .= esc_html__('Show content from', 'publishpress'); - $output .= '
    '; - $output .= '
    '; - - $date_format = get_option('date_format'); - - $start_date_value = ''; - $start_date_value .= ''; - $start_date_value .= ''; - - $end_date_value = ''; - $end_date_value .= ''; - $end_date_value .= ''; - - $output .= sprintf( - _x( - ' %1$s
    to
    %2$s', - '%1$s = start date, %2$s = end date', - 'publishpress' - ), - $start_date_value, - $end_date_value - ); - $output .= '  '; - $output .= ''; - $output .= ' '; - $output .= ''; - $output .= ''; - $output .= ' '; - $output .= ''; - $output .= ''; - $output .= wp_nonce_field('change-date', 'nonce', 'change-date-nonce', false); - $output .= ''; - $output .= '
    '; - - $output .= '
    '; - $output .= '
    '; - - return $output; - } /** * Print any messages that should appear based on the action performed @@ -1205,305 +1136,6 @@ public function get_content_board_form_filters() { return $filters; } - - public function content_board_customize_column_form() { - - ob_start(); - - $content_board_datas = $this->content_board_datas; - $enabled_columns = array_keys($content_board_datas['content_board_columns']); - $columns = $this->form_columns; - $meta_keys = $content_board_datas['meta_keys']; - - $all_columns = []; - - ?> -
    - - -
    -
    -
    -
    -
    -
    -
    -

    -
    -
    - $column_datas) : - $column_index++; - $hidden_style = empty($column_datas['columns']) ? 'display: none;' : ''; - ?> -
    -
    - -
    - -
    - -
    - - - - -
    - - $column_label) : - $active_class = (in_array($column_name, $enabled_columns)) ? 'active-item' : ''; - $input_name = (in_array($column_name, $enabled_columns)) ? 'content_board_columns['. $column_name .']' : ''; - - $all_columns[$column_name] = [ - 'column_label' => $column_label, - 'column_group' => $column_group - ]; - ?> -
    - - - - -
    - -
    -
    - -
    -
    -
    ()
    -
    - -
    - -
    - -
    - - - -
    -
    - -
    -
    - -
    -
    -
    -
    - content_board_datas; - $enabled_filters = array_keys($content_board_datas['content_board_filters']); - $filters = $this->form_filters; - $meta_keys = $content_board_datas['meta_keys']; - - $all_filters = []; - ?> -
    - - -
    -
    -
    -
    -
    -
    -
    -

    -
    -
    - $filter_datas) : - $filter_index++; - $hidden_style = empty($filter_datas['filters']) ? 'display: none;' : ''; - ?> -
    -
    - -
    - -
    - -
    - - - - -
    - - $filter_label) : - $active_class = (in_array($filter_name, $enabled_filters)) ? 'active-item' : ''; - $input_name = (in_array($filter_name, $enabled_filters)) ? 'content_board_filters['. $filter_name .']' : ''; - - $all_filters[$filter_name] = [ - 'filter_label' => $filter_label, - 'filter_group' => $filter_group - ]; - ?> -
    - - - - -
    - -
    -
    - -
    -
    -
    ()
    -
    - -
    - -
    - -
    - - - -
    -
    - -
    -
    - -
    -
    -
    -
    - get_editable_post_types(); + $form_args['default_post_type'] = $post_type; + $form_args['post_status_options'] = $this->getUserAuthorizedPostStatusOptions($post_type); + $form_args['publish_date_markup'] = $this->get_publish_date_markup(); $response['status'] = 'success'; - $response['content'] = $this->content_board_get_post_form($post_type); + $response['content'] = PP_Content_Board_Utilities::content_board_get_post_form($form_args); } wp_send_json($response); } - public function content_board_get_post_form($post_type) { - - ob_start(); - - $postTypeObject = get_post_type_object($post_type); - $post_fields = $this->getPostTypeFields($post_type); - ?> -
    - - -
    - labels->singular_name)); ?> -
    -
    -
    -
    -
    - - - $field_options) : ?> - - - - - - -
    - - - - - - - - - - - - - - - - - - > - - - -
    -
    -
    -
    -
    - labels->singular_name)); ?> -
    - -
    -
    -
    - -
    - - - - -
    - - [ - 'label' => __('Post Type', 'publishpress'), - 'value' => $postType, - 'type' => 'post_type', - 'options' => $this->get_editable_post_types(), - ], - 'title' => [ - 'label' => __('Title', 'publishpress'), - 'value' => null, - 'type' => 'text', - 'required' => 1, - ], - 'status' => [ - 'label' => __('Post Status', 'publishpress'), - 'value' => 'draft', - 'type' => 'status', - 'options' => $this->getUserAuthorizedPostStatusOptions($postType) - ], - 'pdate' => [ - 'label' => __('Publish Date', 'publishpress'), - 'value' => 'immediately', - 'type' => 'pdate', - 'html' => $this->get_publish_date_markup() - ] - ]; - - if (current_user_can($postTypeObject->cap->edit_others_posts)) { - $fields['authors'] = [ - 'label' => __('Author', 'publishpress'), - 'value' => get_current_user_id(), - 'type' => 'authors', - ]; - } - - $taxonomies = get_object_taxonomies($postType); - - if (in_array('category', $taxonomies)) { - $fields['categories'] = [ - 'label' => __('Categories', 'publishpress'), - 'value' => null, - 'type' => 'taxonomy', - 'taxonomy' => 'category', - ]; - } - - if (in_array('post_tag', $taxonomies)) { - $fields['tags'] = [ - 'label' => __('Tags', 'publishpress'), - 'value' => null, - 'type' => 'taxonomy', - 'taxonomy' => 'post_tag', - ]; - } - - $fields['content'] = [ - 'label' => __('Content', 'publishpress'), - 'value' => null, - 'type' => 'html' - ]; - - if (class_exists('PP_Editorial_Metadata')) { - $editorial_metadata_class = new PP_Editorial_Metadata; - $editorial_metadata_terms = $publishpress->editorial_metadata->get_editorial_metadata_terms(['show_in_calendar_form' => true]); - foreach ($editorial_metadata_terms as $term) { - if (isset($term->post_types) && is_array($term->post_types) && in_array($postType, $term->post_types)) { - $term_options = $editorial_metadata_class->get_editorial_metadata_term_by('id', $term->term_id); - $postmeta_key = esc_attr($editorial_metadata_class->get_postmeta_key($term)); - $post_types = (isset($term->post_types) && is_array($term->post_types)) ? array_values($term->post_types) : []; - $post_types = join(" ", $post_types); - $term_data = [ - 'name' => $postmeta_key, - 'label' => $term->name, - 'description' => $term->description, - 'term_options' => $term_options, - ]; - $term_type = $term->type; - if ($term_type === 'user') { - $ajaxArgs = []; - if (isset($term->user_role)) { - $ajaxArgs['user_role'] = $term->user_role; - } - $fields[$term_data['name']] = [ - 'metadata' => true, - 'term' => $term, - 'label' => $term->name, - 'value' => '', - 'ajaxArgs' => $ajaxArgs, - 'post_types' => $post_types, - 'type' => 'authors', - 'multiple' => '' - ]; - } elseif ($term_type === 'paragraph') { - $fields[$term_data['name']] = [ - 'metadata' => true, - 'term' => $term, - 'label' => $term->name, - 'post_types' => $post_types, - 'value' => '', - 'type' => 'html' - ]; - } else { - $html = apply_filters("pp_editorial_metadata_{$term->type}_get_input_html", $term_data, ''); - $fields[$term_data['name']] = [ - 'metadata' => true, - 'post_types' => $post_types, - 'html' => (is_object($html) || is_array($html)) ? '' : '
    ' . $html . '
    ', - 'term' => $term, - 'label' => $term->name, - 'value' => '', - 'type' => 'metafield' - ]; - } - } - } - } - - $fields = apply_filters('publishpress_content_board_get_post_type_fields', $fields, $postType); - - return $fields; - } - /** * Get post types user has capability to edit posts in */ @@ -1917,167 +1262,46 @@ public function get_editable_post_types() { return $editable_post_types; } + /** + * Load utilities files + * + * @return void + */ + private function load_utilities_files() { + require_once dirname(__FILE__) . "/library/content-board-utilities.php"; + } + /** * Print the table navigation and filter controls, using the current user's filters if any are set. */ public function table_navigation() { - // phpcs:disable WordPress.Security.NonceVerification.Recommended - - $editable_post_types = $this->get_editable_post_types(); - ?> -
    -
    - user_filters['me_mode']; - $active_me_mode = !empty($me_mode) ? 'active-filter' : ''; - ?> -
    - -
    - user_filters); ?> -
    - -
    - - -
    - -
    - - -
    -
    - - -
    - -
    - - -
    -
    - - 'co-searchbox-search-submit']); ?> -
    -
    -
    -
    -
    -
    - - user_filters); ?> - -
    - user_filters['start_date']; - $filtered_end_date = $this->user_filters['end_date']; - $selected_date = ': ' . date("F j, Y", strtotime($filtered_start_date)) . ' '. esc_html__('to', 'publishpress').' ' . date("F j, Y", strtotime($filtered_end_date)); - $modal_id++; - ?> - - - content_board_filters() as $select_id => $select_name) { - $modal_id++; - $filter_data = $this->content_board_filter_options($select_id, $select_name, $this->user_filters); - $active_class = !empty($filter_data['selected_value']) ? 'active-filter' : ''; - $button_label = $filter_data['filter_label']; - $button_label .= !empty($filter_data['selected_value']) ? ': ' . $filter_data['selected_value'] : ''; - ?> - - - - - - - - -
    -
    - -
    - - - - - - user_filters); ?> - - - content_board_filters() as $select_id => $select_name) { - echo ''; - } ?> - '; - $start_date_value .= ''; - - $end_date_value = ''; - $end_date_value .= ''; - - $nonce = wp_nonce_field('change-date', 'nonce', 'change-date-nonce', false); - - echo $start_date_value . $end_date_value . $nonce; - ?> - -
    - get_editable_post_types(); + $args['post_types'] = $this->get_selected_post_types(); + $args['user_filters'] = $this->user_filters; + $args['post_form'] = []; + $args['default_post_type'] = []; + $args['board_filters'] = $this->content_board_filters(); + $args['content_board_datas'] = $this->content_board_datas; + $args['form_columns'] = $this->form_columns; + $args['form_filters'] = $this->form_filters; + $args['form_filter_list'] = $this->form_filter_list; + $args['all_filters'] = $this->filters; + $args['terms_options'] = $this->terms_options; + $args['operator_labels'] = $this->meta_query_operator_label(); + $args['post_statuses'] = $this->get_post_statuses(); + $args['post_status_options'] = ''; + $args['publish_date_markup'] = ''; + if (!empty($args['editable_post_types'])) { + $default_post_type = array_keys($args['editable_post_types'])[0]; + $args['default_post_type'] = $default_post_type; + $args['post_status_options'] = $this->getUserAuthorizedPostStatusOptions($default_post_type); + $args['publish_date_markup'] = $this->get_publish_date_markup(); + $args['post_form'] = PP_Content_Board_Utilities::content_board_get_post_form($args); + } + + PP_Content_Board_Utilities::table_navigation($args); } public function content_board_filters() @@ -2099,407 +1323,6 @@ public function content_board_filters() return apply_filters('PP_Content_Board_filter_names', $select_filter_names); } - public function content_board_filter_options($select_id, $select_name, $filters) - { - - if (array_key_exists($select_id, $this->terms_options)) { - $select_id = 'metadata_key'; - } - - if (array_key_exists($select_id, $this->content_board_datas['taxonomies']) && taxonomy_exists($select_id)) { - $select_id = 'taxonomy'; - } - - $filter_label = ''; - $selected_value = ''; - - ob_start(); - - switch ($select_id) { - case 'post_status': - $post_statuses = $this->get_post_statuses(); - $filter_label = esc_html__('Post Status', 'publishpress'); - ?> - - label); - ?> - - - - - - - - terms_options[$select_name]; - - $metadata_type = $metadata_term['type']; - $selected_value = $metadata_value; - $filter_label = $metadata_term['name']; - - ?> -
    -
    - -
    -
    - - -
    - 'filter-submit']); ?> -
    - - - - - - - - - ', - esc_attr($metadata_start_name), - esc_attr($metadata_start_value), - esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), - '' - ); - printf( - '', - esc_attr($metadata_start_name), - esc_attr($metadata_start_value_hidden) - ); - ?> -
    - ', - esc_attr($metadata_end_name), - esc_attr($metadata_end_value), - esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), - '' - ); - printf( - '', - esc_attr($metadata_end_name), - esc_attr($metadata_end_value_hidden) - ); - ?> -
    - 'filter-submit']); ?> -
    - display_name; - } - } - $user_dropdown_args = [ - 'show_option_all' => $metadata_term['name'], - 'name' => $select_name, - 'selected' => $metadata_value, - 'class' => 'pp-custom-select2' - ]; - $user_dropdown_args = apply_filters('pp_editorial_metadata_user_dropdown_args', $user_dropdown_args); - wp_dropdown_users($user_dropdown_args); - } elseif ($metadata_type === 'checkbox') { - if ($metadata_value == '1') { - $selected_value = esc_html__('Checked', 'publishpress'); - } else { - $selected_value = ''; - } - ?> - - - /> -
    - 'filter-submit']); ?> -
    -
    '; - break; - - default: - if (array_key_exists($select_name, $this->form_filter_list)) { - $selected_value_meta = isset($filters[$select_name]) ? sanitize_text_field($filters[$select_name]) : ''; - $filter_label = $this->filters[$select_name]; - $selected_value = $selected_value_meta; - - if (strpos($select_name, "ppch_co_checklist_") === 0) { - ?> - - -
    -
    - -
    -
    - - -
    - 'filter-submit']); ?> -
    - -
    -
    - $selected_value, 'filter_label' => $filter_label, 'html' => ob_get_clean()]; - } - /** * Prints the stories in a single term in the content board. * diff --git a/modules/content-board/lib/content-board-icon.svg b/modules/content-board/lib/content-board-icon.svg deleted file mode 100644 index 2129aed2..00000000 --- a/modules/content-board/lib/content-board-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/modules/content-board/library/content-board-utilities.php b/modules/content-board/library/content-board-utilities.php new file mode 100644 index 00000000..1d974821 --- /dev/null +++ b/modules/content-board/library/content-board-utilities.php @@ -0,0 +1,1255 @@ + +
    +
    + +
    + +
    + +
    + +
    + + +
    + +
    + + +
    +
    + + +
    + +
    + + +
    +
    + + 'co-searchbox-search-submit']); ?> +
    +
    +
    +
    +
    +
    + + + +
    + + + + $select_name) { + $modal_id++; + $args['select_id'] = $select_id; + $args['select_name'] = $select_name; + $filter_data = self::content_board_filter_options($args); + $active_class = !empty($filter_data['selected_value']) ? 'active-filter' : ''; + $button_label = $filter_data['filter_label']; + $button_label .= !empty($filter_data['selected_value']) ? ': ' . $filter_data['selected_value'] : ''; + ?> + + + + + + + + +
    +
    + +
    + + + + + + + + + $select_name) { + echo ''; + } ?> + '; + $start_date_value .= ''; + + $end_date_value = ''; + $end_date_value .= ''; + + $nonce = wp_nonce_field('change-date', 'nonce', 'change-date-nonce', false); + + echo $start_date_value . $end_date_value . $nonce; + ?> + +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    +

    +
    +
    + $column_datas) : + $column_index++; + $hidden_style = empty($column_datas['columns']) ? 'display: none;' : ''; + ?> +
    +
    + +
    + +
    + +
    + + + + +
    + + $column_label) : + $active_class = (in_array($column_name, $enabled_columns)) ? 'active-item' : ''; + $input_name = (in_array($column_name, $enabled_columns)) ? 'content_board_columns['. $column_name .']' : ''; + + $all_columns[$column_name] = [ + 'column_label' => $column_label, + 'column_group' => $column_group + ]; + ?> +
    + + + + +
    + +
    +
    + +
    +
    +
    ()
    +
    + +
    + +
    + +
    + + + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    +

    +
    +
    + $filter_datas) : + $filter_index++; + $hidden_style = empty($filter_datas['filters']) ? 'display: none;' : ''; + ?> +
    +
    + +
    + +
    + +
    + + + + +
    + + $filter_label) : + $active_class = (in_array($filter_name, $enabled_filters)) ? 'active-item' : ''; + $input_name = (in_array($filter_name, $enabled_filters)) ? 'content_board_filters['. $filter_name .']' : ''; + + $all_filters[$filter_name] = [ + 'filter_label' => $filter_label, + 'filter_group' => $filter_group + ]; + ?> +
    + + + + +
    + +
    +
    + +
    +
    +
    ()
    +
    + +
    + +
    + +
    + + + +
    +
    + +
    +
    + +
    +
    +
    +
    + '; + $output .= '
    '; + $output .= esc_html__('Show content from', 'publishpress'); + $output .= '
    '; + $output .= '
    '; + + $date_format = get_option('date_format'); + + $start_date_value = ''; + $start_date_value .= ''; + $start_date_value .= ''; + + $end_date_value = ''; + $end_date_value .= ''; + $end_date_value .= ''; + + $output .= sprintf( + _x( + ' %1$s
    to
    %2$s', + '%1$s = start date, %2$s = end date', + 'publishpress' + ), + $start_date_value, + $end_date_value + ); + $output .= '  '; + $output .= ''; + $output .= ' '; + $output .= ''; + $output .= ''; + $output .= ' '; + $output .= ''; + $output .= ''; + $output .= wp_nonce_field('change-date', 'nonce', 'change-date-nonce', false); + $output .= ''; + $output .= '
    '; + + $output .= '
    '; + $output .= '
    '; + + return $output; + } + + public static function content_board_filter_options($args) + { + $select_id = $args['select_id']; + $select_name = $args['select_name']; + $filters = $args['user_filters']; + $terms_options = $args['terms_options']; + $content_board_datas = $args['content_board_datas']; + $post_statuses = $args['post_statuses']; + $post_types = $args['post_types']; + $form_filter_list = $args['form_filter_list']; + $all_filters = $args['all_filters']; + $operator_labels = $args['operator_labels']; + + if (array_key_exists($select_id, $terms_options)) { + $select_id = 'metadata_key'; + } + + if (array_key_exists($select_id, $content_board_datas['taxonomies']) && taxonomy_exists($select_id)) { + $select_id = 'taxonomy'; + } + + $filter_label = ''; + $selected_value = ''; + + ob_start(); + + switch ($select_id) { + case 'post_status': + $filter_label = esc_html__('Post Status', 'publishpress'); + ?> + + label); + ?> + + + + + + + + +
    +
    + +
    +
    + + +
    + 'filter-submit']); ?> +
    + + + + + + + + + ', + esc_attr($metadata_start_name), + esc_attr($metadata_start_value), + esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), + '' + ); + printf( + '', + esc_attr($metadata_start_name), + esc_attr($metadata_start_value_hidden) + ); + ?> +
    + ', + esc_attr($metadata_end_name), + esc_attr($metadata_end_value), + esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), + '' + ); + printf( + '', + esc_attr($metadata_end_name), + esc_attr($metadata_end_value_hidden) + ); + ?> +
    + 'filter-submit']); ?> +
    + display_name; + } + } + $user_dropdown_args = [ + 'show_option_all' => $metadata_term['name'], + 'name' => $select_name, + 'selected' => $metadata_value, + 'class' => 'pp-custom-select2' + ]; + $user_dropdown_args = apply_filters('pp_editorial_metadata_user_dropdown_args', $user_dropdown_args); + wp_dropdown_users($user_dropdown_args); + } elseif ($metadata_type === 'checkbox') { + if ($metadata_value == '1') { + $selected_value = esc_html__('Checked', 'publishpress'); + } else { + $selected_value = ''; + } + ?> + + + /> +
    + 'filter-submit']); ?> +
    +
    '; + break; + + default: + if (array_key_exists($select_name, $form_filter_list)) { + $selected_value_meta = isset($filters[$select_name]) ? sanitize_text_field($filters[$select_name]) : ''; + $filter_label = $all_filters[$select_name]; + $selected_value = $selected_value_meta; + + if (strpos($select_name, "ppch_co_checklist_") === 0) { + ?> + + +
    +
    + +
    +
    + + +
    + 'filter-submit']); ?> +
    + +
    +
    + $selected_value, 'filter_label' => $filter_label, 'html' => ob_get_clean()]; + } + + public static function content_board_get_post_form($args) { + + ob_start(); + + $post_type = $args['default_post_type']; + + $postTypeObject = get_post_type_object($post_type); + $post_fields = self::getPostTypeFields($args); + ?> +
    + + +
    + labels->singular_name)); ?> +
    +
    +
    +
    +
    + + + $field_options) : ?> + + + + + + +
    + + + + + + + + + + + + + + + + + + > + + + +
    +
    +
    +
    +
    + labels->singular_name)); ?> +
    + +
    +
    +
    + +
    + + + + +
    + + [ + 'label' => __('Post Type', 'publishpress'), + 'value' => $postType, + 'type' => 'post_type', + 'options' => $editablePostTypes, + ], + 'title' => [ + 'label' => __('Title', 'publishpress'), + 'value' => null, + 'type' => 'text', + 'required' => 1, + ], + 'status' => [ + 'label' => __('Post Status', 'publishpress'), + 'value' => 'draft', + 'type' => 'status', + 'options' => $postStatusOptions + ], + 'pdate' => [ + 'label' => __('Publish Date', 'publishpress'), + 'value' => 'immediately', + 'type' => 'pdate', + 'html' => $publish_date_markup + ] + ]; + + if (current_user_can($postTypeObject->cap->edit_others_posts)) { + $fields['authors'] = [ + 'label' => __('Author', 'publishpress'), + 'value' => get_current_user_id(), + 'type' => 'authors', + ]; + } + + $taxonomies = get_object_taxonomies($postType); + + if (in_array('category', $taxonomies)) { + $fields['categories'] = [ + 'label' => __('Categories', 'publishpress'), + 'value' => null, + 'type' => 'taxonomy', + 'taxonomy' => 'category', + ]; + } + + if (in_array('post_tag', $taxonomies)) { + $fields['tags'] = [ + 'label' => __('Tags', 'publishpress'), + 'value' => null, + 'type' => 'taxonomy', + 'taxonomy' => 'post_tag', + ]; + } + + $fields['content'] = [ + 'label' => __('Content', 'publishpress'), + 'value' => null, + 'type' => 'html' + ]; + + if (class_exists('PP_Editorial_Metadata')) { + $editorial_metadata_class = new PP_Editorial_Metadata; + $editorial_metadata_terms = $publishpress->editorial_metadata->get_editorial_metadata_terms(['show_in_calendar_form' => true]); + foreach ($editorial_metadata_terms as $term) { + if (isset($term->post_types) && is_array($term->post_types) && in_array($postType, $term->post_types)) { + $term_options = $editorial_metadata_class->get_editorial_metadata_term_by('id', $term->term_id); + $postmeta_key = esc_attr($editorial_metadata_class->get_postmeta_key($term)); + $post_types = (isset($term->post_types) && is_array($term->post_types)) ? array_values($term->post_types) : []; + $post_types = join(" ", $post_types); + $term_data = [ + 'name' => $postmeta_key, + 'label' => $term->name, + 'description' => $term->description, + 'term_options' => $term_options, + ]; + $term_type = $term->type; + if ($term_type === 'user') { + $ajaxArgs = []; + if (isset($term->user_role)) { + $ajaxArgs['user_role'] = $term->user_role; + } + $fields[$term_data['name']] = [ + 'metadata' => true, + 'term' => $term, + 'label' => $term->name, + 'value' => '', + 'ajaxArgs' => $ajaxArgs, + 'post_types' => $post_types, + 'type' => 'authors', + 'multiple' => '' + ]; + } elseif ($term_type === 'paragraph') { + $fields[$term_data['name']] = [ + 'metadata' => true, + 'term' => $term, + 'label' => $term->name, + 'post_types' => $post_types, + 'value' => '', + 'type' => 'html' + ]; + } else { + $html = apply_filters("pp_editorial_metadata_{$term->type}_get_input_html", $term_data, ''); + $fields[$term_data['name']] = [ + 'metadata' => true, + 'post_types' => $post_types, + 'html' => (is_object($html) || is_array($html)) ? '' : '
    ' . $html . '
    ', + 'term' => $term, + 'label' => $term->name, + 'value' => '', + 'type' => 'metafield' + ]; + } + } + } + } + + $fields = apply_filters('publishpress_content_board_get_post_type_fields', $fields, $postType); + + return $fields; + } + + + } + +} \ No newline at end of file diff --git a/modules/content-overview/content-overview.php b/modules/content-overview/content-overview.php index dcc8ae14..c70b9d6d 100644 --- a/modules/content-overview/content-overview.php +++ b/modules/content-overview/content-overview.php @@ -188,6 +188,9 @@ public function init() if (! $this->currentUserCanViewContentOverview()) { return; } + + // Load utilities files. + $this->load_utilities_files(); // Filter to allow users to pick a taxonomy other than 'category' for sorting their posts $this->taxonomy_used = apply_filters('PP_Content_Overview_taxonomy_used', $this->taxonomy_used); @@ -774,78 +777,6 @@ public function handle_form_date_range_change() $this->update_user_meta($current_user->ID, self::USERMETA_KEY_PREFIX . 'filters', $user_filters); } - - /** - * Allow the user to define the date range in a new and exciting way - * - * @since 0.7 - */ - public function content_overview_time_range() - { - $filtered_start_date = $this->user_filters['start_date']; - $filtered_start_date_timestamp = strtotime($filtered_start_date); - - $filtered_end_date = $this->user_filters['end_date']; - $filtered_end_date_timestamp = strtotime($filtered_end_date); - - $output = '
    '; - $output .= '
    '; - $output .= esc_html__('Show content from', 'publishpress'); - $output .= '
    '; - $output .= '
    '; - - $date_format = get_option('date_format'); - - $start_date_value = ''; - $start_date_value .= ''; - $start_date_value .= ''; - - $end_date_value = ''; - $end_date_value .= ''; - $end_date_value .= ''; - - $output .= sprintf( - _x( - ' %1$s
    to
    %2$s', - '%1$s = start date, %2$s = end date', - 'publishpress' - ), - $start_date_value, - $end_date_value - ); - $output .= '  '; - $output .= ''; - $output .= ' '; - $output .= ''; - $output .= ''; - $output .= ' '; - $output .= ''; - $output .= ''; - $output .= wp_nonce_field('change-date', 'nonce', 'change-date-nonce', false); - $output .= ''; - $output .= '
    '; - - $output .= '
    '; - $output .= '
    '; - - return $output; - } /** * Print any messages that should appear based on the action performed @@ -1231,304 +1162,6 @@ public function get_content_overview_form_filters() { return $filters; } - public function content_overview_customize_column_form() { - - ob_start(); - - $content_overview_datas = $this->content_overview_datas; - $enabled_columns = array_keys($content_overview_datas['content_overview_columns']); - $columns = $this->form_columns; - $meta_keys = $content_overview_datas['meta_keys']; - - $all_columns = []; - - ?> -
    - - -
    -
    -
    -
    -
    -
    -
    -

    -
    -
    - $column_datas) : - $column_index++; - $hidden_style = empty($column_datas['columns']) ? 'display: none;' : ''; - ?> -
    -
    - -
    - -
    - -
    - - - - -
    - - $column_label) : - $active_class = (in_array($column_name, $enabled_columns)) ? 'active-item' : ''; - $input_name = (in_array($column_name, $enabled_columns)) ? 'content_overview_columns['. $column_name .']' : ''; - - $all_columns[$column_name] = [ - 'column_label' => $column_label, - 'column_group' => $column_group - ]; - ?> -
    - - - - -
    - -
    -
    - -
    -
    -
    ()
    -
    - -
    - -
    - -
    - - - -
    -
    - -
    -
    - -
    -
    -
    -
    - content_overview_datas; - $enabled_filters = array_keys($content_overview_datas['content_overview_filters']); - $filters = $this->form_filters; - $meta_keys = $content_overview_datas['meta_keys']; - - $all_filters = []; - ?> -
    - - -
    -
    -
    -
    -
    -
    -
    -

    -
    -
    - $filter_datas) : - $filter_index++; - $hidden_style = empty($filter_datas['filters']) ? 'display: none;' : ''; - ?> -
    -
    - -
    - -
    - -
    - - - - -
    - - $filter_label) : - $active_class = (in_array($filter_name, $enabled_filters)) ? 'active-item' : ''; - $input_name = (in_array($filter_name, $enabled_filters)) ? 'content_overview_filters['. $filter_name .']' : ''; - - $all_filters[$filter_name] = [ - 'filter_label' => $filter_label, - 'filter_group' => $filter_group - ]; - ?> -
    - - - - -
    - -
    -
    - -
    -
    -
    ()
    -
    - -
    - -
    - -
    - - - -
    -
    - -
    -
    - -
    -
    -
    -
    - get_editable_post_types(); + $form_args['default_post_type'] = $post_type; + $form_args['post_status_options'] = $this->getUserAuthorizedPostStatusOptions($post_type); + $form_args['publish_date_markup'] = $this->get_publish_date_markup(); $response['status'] = 'success'; - $response['content'] = $this->content_overview_get_post_form($post_type); + $response['content'] = PP_Content_Overview_Utilities::content_overview_get_post_form($form_args); } wp_send_json($response); } - public function content_overview_get_post_form($post_type) { - - ob_start(); - - $postTypeObject = get_post_type_object($post_type); - $post_fields = $this->getPostTypeFields($post_type); - ?> -
    - - -
    - labels->singular_name)); ?> -
    -
    -
    -
    -
    - - - $field_options) : ?> - - - - - - -
    - - - - - - - - - - - - - - - - - - > - - - -
    -
    -
    -
    -
    - labels->singular_name)); ?> -
    - -
    -
    -
    - -
    - - - - -
    - - [ - 'label' => __('Post Type', 'publishpress'), - 'value' => $postType, - 'type' => 'post_type', - 'options' => $this->get_editable_post_types(), - ], - 'title' => [ - 'label' => __('Title', 'publishpress'), - 'value' => null, - 'type' => 'text', - 'required' => 1, - ], - 'status' => [ - 'label' => __('Post Status', 'publishpress'), - 'value' => 'draft', - 'type' => 'status', - 'options' => $this->getUserAuthorizedPostStatusOptions($postType) - ], - 'pdate' => [ - 'label' => __('Publish Date', 'publishpress'), - 'value' => 'immediately', - 'type' => 'pdate', - 'html' => $this->get_publish_date_markup() - ] - ]; - - if (current_user_can($postTypeObject->cap->edit_others_posts)) { - $fields['authors'] = [ - 'label' => __('Author', 'publishpress'), - 'value' => get_current_user_id(), - 'type' => 'authors', - ]; - } - - $taxonomies = get_object_taxonomies($postType); - - if (in_array('category', $taxonomies)) { - $fields['categories'] = [ - 'label' => __('Categories', 'publishpress'), - 'value' => null, - 'type' => 'taxonomy', - 'taxonomy' => 'category', - ]; - } - - if (in_array('post_tag', $taxonomies)) { - $fields['tags'] = [ - 'label' => __('Tags', 'publishpress'), - 'value' => null, - 'type' => 'taxonomy', - 'taxonomy' => 'post_tag', - ]; - } - - $fields['content'] = [ - 'label' => __('Content', 'publishpress'), - 'value' => null, - 'type' => 'html' - ]; - - if (class_exists('PP_Editorial_Metadata')) { - $editorial_metadata_class = new PP_Editorial_Metadata; - $editorial_metadata_terms = $publishpress->editorial_metadata->get_editorial_metadata_terms(['show_in_calendar_form' => true]); - foreach ($editorial_metadata_terms as $term) { - if (isset($term->post_types) && is_array($term->post_types) && in_array($postType, $term->post_types)) { - $term_options = $editorial_metadata_class->get_editorial_metadata_term_by('id', $term->term_id); - $postmeta_key = esc_attr($editorial_metadata_class->get_postmeta_key($term)); - $post_types = (isset($term->post_types) && is_array($term->post_types)) ? array_values($term->post_types) : []; - $post_types = join(" ", $post_types); - $term_data = [ - 'name' => $postmeta_key, - 'label' => $term->name, - 'description' => $term->description, - 'term_options' => $term_options, - ]; - $term_type = $term->type; - if ($term_type === 'user') { - $ajaxArgs = []; - if (isset($term->user_role)) { - $ajaxArgs['user_role'] = $term->user_role; - } - $fields[$term_data['name']] = [ - 'metadata' => true, - 'term' => $term, - 'label' => $term->name, - 'value' => '', - 'ajaxArgs' => $ajaxArgs, - 'post_types' => $post_types, - 'type' => 'authors', - 'multiple' => '' - ]; - } elseif ($term_type === 'paragraph') { - $fields[$term_data['name']] = [ - 'metadata' => true, - 'term' => $term, - 'label' => $term->name, - 'post_types' => $post_types, - 'value' => '', - 'type' => 'html' - ]; - } else { - $html = apply_filters("pp_editorial_metadata_{$term->type}_get_input_html", $term_data, ''); - $fields[$term_data['name']] = [ - 'metadata' => true, - 'post_types' => $post_types, - 'html' => (is_object($html) || is_array($html)) ? '' : '
    ' . $html . '
    ', - 'term' => $term, - 'label' => $term->name, - 'value' => '', - 'type' => 'metafield' - ]; - } - } - } - } - - $fields = apply_filters('publishpress_content_overview_get_post_type_fields', $fields, $postType); - - return $fields; - } - /** * Get post types user has capability to edit posts in */ @@ -1854,167 +1201,46 @@ public function get_editable_post_types() { return $editable_post_types; } + /** + * Load utilities files + * + * @return void + */ + private function load_utilities_files() { + require_once dirname(__FILE__) . "/library/content-overview-utilities.php"; + } + /** * Print the table navigation and filter controls, using the current user's filters if any are set. */ public function table_navigation() { - // phpcs:disable WordPress.Security.NonceVerification.Recommended - - $editable_post_types = $this->get_editable_post_types(); - ?> -
    -
    - user_filters['me_mode']; - $active_me_mode = !empty($me_mode) ? 'active-filter' : ''; - ?> -
    - -
    - user_filters); ?> -
    - -
    - - -
    - -
    - - -
    -
    - - -
    - -
    - - -
    -
    - - 'co-searchbox-search-submit']); ?> -
    -
    -
    -
    -
    -
    - - - user_filters); ?> -
    - user_filters['start_date']; - $filtered_end_date = $this->user_filters['end_date']; - $selected_date = ': ' . date("F j, Y", strtotime($filtered_start_date)) . ' '. esc_html__('to', 'publishpress').' ' . date("F j, Y", strtotime($filtered_end_date)); - $modal_id++; - ?> - - - content_overview_filters() as $select_id => $select_name) { - $modal_id++; - $filter_data = $this->content_overview_filter_options($select_id, $select_name, $this->user_filters); - $active_class = !empty($filter_data['selected_value']) ? 'active-filter' : ''; - $button_label = $filter_data['filter_label']; - $button_label .= !empty($filter_data['selected_value']) ? ': ' . $filter_data['selected_value'] : ''; - ?> - - - - - - - - -
    -
    - -
    - - - - - - user_filters); ?> - - - content_overview_filters() as $select_id => $select_name) { - echo ''; - } ?> - '; - $start_date_value .= ''; - - $end_date_value = ''; - $end_date_value .= ''; - - $nonce = wp_nonce_field('change-date', 'nonce', 'change-date-nonce', false); - - echo $start_date_value . $end_date_value . $nonce; - ?> - -
    - get_editable_post_types(); + $args['post_types'] = $this->get_selected_post_types(); + $args['user_filters'] = $this->user_filters; + $args['post_form'] = []; + $args['default_post_type'] = []; + $args['overview_filters'] = $this->content_overview_filters(); + $args['content_overview_datas'] = $this->content_overview_datas; + $args['form_columns'] = $this->form_columns; + $args['form_filters'] = $this->form_filters; + $args['form_filter_list'] = $this->form_filter_list; + $args['all_filters'] = $this->filters; + $args['terms_options'] = $this->terms_options; + $args['operator_labels'] = $this->meta_query_operator_label(); + $args['post_statuses'] = $this->get_post_statuses(); + $args['post_status_options'] = ''; + $args['publish_date_markup'] = ''; + if (!empty($args['editable_post_types'])) { + $default_post_type = array_keys($args['editable_post_types'])[0]; + $args['default_post_type'] = $default_post_type; + $args['post_status_options'] = $this->getUserAuthorizedPostStatusOptions($default_post_type); + $args['publish_date_markup'] = $this->get_publish_date_markup(); + $args['post_form'] = PP_Content_Overview_Utilities::content_overview_get_post_form($args); + } + + PP_Content_Overview_Utilities::table_navigation($args); } public function content_overview_filters() @@ -2036,407 +1262,6 @@ public function content_overview_filters() return apply_filters('PP_Content_Overview_filter_names', $select_filter_names); } - public function content_overview_filter_options($select_id, $select_name, $filters) - { - - if (array_key_exists($select_id, $this->terms_options)) { - $select_id = 'metadata_key'; - } - - if (array_key_exists($select_id, $this->content_overview_datas['taxonomies']) && taxonomy_exists($select_id)) { - $select_id = 'taxonomy'; - } - - $filter_label = ''; - $selected_value = ''; - - ob_start(); - - switch ($select_id) { - case 'post_status': - $post_statuses = $this->get_post_statuses(); - $filter_label = esc_html__('Post Status', 'publishpress'); - ?> - - label); - ?> - - - - - - - - terms_options[$select_name]; - - $metadata_type = $metadata_term['type']; - $selected_value = $metadata_value; - $filter_label = $metadata_term['name']; - - ?> -
    -
    - -
    -
    - - -
    - 'filter-submit']); ?> -
    - - - - - - - - - ', - esc_attr($metadata_start_name), - esc_attr($metadata_start_value), - esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), - '' - ); - printf( - '', - esc_attr($metadata_start_name), - esc_attr($metadata_start_value_hidden) - ); - ?> -
    - ', - esc_attr($metadata_end_name), - esc_attr($metadata_end_value), - esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), - '' - ); - printf( - '', - esc_attr($metadata_end_name), - esc_attr($metadata_end_value_hidden) - ); - ?> -
    - 'filter-submit']); ?> -
    - display_name; - } - } - $user_dropdown_args = [ - 'show_option_all' => $metadata_term['name'], - 'name' => $select_name, - 'selected' => $metadata_value, - 'class' => 'pp-custom-select2' - ]; - $user_dropdown_args = apply_filters('pp_editorial_metadata_user_dropdown_args', $user_dropdown_args); - wp_dropdown_users($user_dropdown_args); - } elseif ($metadata_type === 'checkbox') { - if ($metadata_value == '1') { - $selected_value = esc_html__('Checked', 'publishpress'); - } else { - $selected_value = ''; - } - ?> - - - /> -
    - 'filter-submit']); ?> -
    -
    '; - break; - - default: - if (array_key_exists($select_name, $this->form_filter_list)) { - $selected_value_meta = isset($filters[$select_name]) ? sanitize_text_field($filters[$select_name]) : ''; - $filter_label = $this->filters[$select_name]; - $selected_value = $selected_value_meta; - - if (strpos($select_name, "ppch_co_checklist_") === 0) { - ?> - - -
    -
    - -
    -
    - - -
    - 'filter-submit']); ?> -
    - -
    -
    - $selected_value, 'filter_label' => $filter_label, 'html' => ob_get_clean()]; - } - /** * Prints the stories in a single term in the content overview. * diff --git a/modules/content-overview/lib/content-overview-icon.svg b/modules/content-overview/lib/content-overview-icon.svg deleted file mode 100644 index 2129aed2..00000000 --- a/modules/content-overview/lib/content-overview-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/modules/content-overview/library/content-overview-utilities.php b/modules/content-overview/library/content-overview-utilities.php new file mode 100644 index 00000000..33699d3f --- /dev/null +++ b/modules/content-overview/library/content-overview-utilities.php @@ -0,0 +1,1252 @@ + +
    +
    + +
    + +
    + +
    + +
    + + +
    + +
    + + +
    +
    + + +
    + +
    + + +
    +
    + + 'co-searchbox-search-submit']); ?> +
    +
    +
    +
    +
    +
    + + + +
    + + + + $select_name) { + $modal_id++; + $args['select_id'] = $select_id; + $args['select_name'] = $select_name; + $filter_data = self::content_overview_filter_options($args); + $active_class = !empty($filter_data['selected_value']) ? 'active-filter' : ''; + $button_label = $filter_data['filter_label']; + $button_label .= !empty($filter_data['selected_value']) ? ': ' . $filter_data['selected_value'] : ''; + ?> + + + + + + + + +
    +
    + +
    + + + + + + + + + $select_name) { + echo ''; + } ?> + '; + $start_date_value .= ''; + + $end_date_value = ''; + $end_date_value .= ''; + + $nonce = wp_nonce_field('change-date', 'nonce', 'change-date-nonce', false); + + echo $start_date_value . $end_date_value . $nonce; + ?> + +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    +

    +
    +
    + $column_datas) : + $column_index++; + $hidden_style = empty($column_datas['columns']) ? 'display: none;' : ''; + ?> +
    +
    + +
    + +
    + +
    + + + + +
    + + $column_label) : + $active_class = (in_array($column_name, $enabled_columns)) ? 'active-item' : ''; + $input_name = (in_array($column_name, $enabled_columns)) ? 'content_overview_columns['. $column_name .']' : ''; + + $all_columns[$column_name] = [ + 'column_label' => $column_label, + 'column_group' => $column_group + ]; + ?> +
    + + + + +
    + +
    +
    + +
    +
    +
    ()
    +
    + +
    + +
    + +
    + + + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    +
    +
    +
    +

    +
    +
    + $filter_datas) : + $filter_index++; + $hidden_style = empty($filter_datas['filters']) ? 'display: none;' : ''; + ?> +
    +
    + +
    + +
    + +
    + + + + +
    + + $filter_label) : + $active_class = (in_array($filter_name, $enabled_filters)) ? 'active-item' : ''; + $input_name = (in_array($filter_name, $enabled_filters)) ? 'content_overview_filters['. $filter_name .']' : ''; + + $all_filters[$filter_name] = [ + 'filter_label' => $filter_label, + 'filter_group' => $filter_group + ]; + ?> +
    + + + + +
    + +
    +
    + +
    +
    +
    ()
    +
    + +
    + +
    + +
    + + + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    + + +
    + labels->singular_name)); ?> +
    +
    +
    +
    +
    + + + $field_options) : ?> + + + + + + +
    + + + + + + + + + + + + + + + + + + > + + + +
    +
    +
    +
    +
    + labels->singular_name)); ?> +
    + +
    +
    +
    + +
    + + + + +
    + + [ + 'label' => __('Post Type', 'publishpress'), + 'value' => $postType, + 'type' => 'post_type', + 'options' => $editablePostTypes, + ], + 'title' => [ + 'label' => __('Title', 'publishpress'), + 'value' => null, + 'type' => 'text', + 'required' => 1, + ], + 'status' => [ + 'label' => __('Post Status', 'publishpress'), + 'value' => 'draft', + 'type' => 'status', + 'options' => $postStatusOptions + ], + 'pdate' => [ + 'label' => __('Publish Date', 'publishpress'), + 'value' => 'immediately', + 'type' => 'pdate', + 'html' => $publish_date_markup + ] + ]; + + if (current_user_can($postTypeObject->cap->edit_others_posts)) { + $fields['authors'] = [ + 'label' => __('Author', 'publishpress'), + 'value' => get_current_user_id(), + 'type' => 'authors', + ]; + } + + $taxonomies = get_object_taxonomies($postType); + + if (in_array('category', $taxonomies)) { + $fields['categories'] = [ + 'label' => __('Categories', 'publishpress'), + 'value' => null, + 'type' => 'taxonomy', + 'taxonomy' => 'category', + ]; + } + + if (in_array('post_tag', $taxonomies)) { + $fields['tags'] = [ + 'label' => __('Tags', 'publishpress'), + 'value' => null, + 'type' => 'taxonomy', + 'taxonomy' => 'post_tag', + ]; + } + + $fields['content'] = [ + 'label' => __('Content', 'publishpress'), + 'value' => null, + 'type' => 'html' + ]; + + if (class_exists('PP_Editorial_Metadata')) { + $editorial_metadata_class = new PP_Editorial_Metadata; + $editorial_metadata_terms = $publishpress->editorial_metadata->get_editorial_metadata_terms(['show_in_calendar_form' => true]); + foreach ($editorial_metadata_terms as $term) { + if (isset($term->post_types) && is_array($term->post_types) && in_array($postType, $term->post_types)) { + $term_options = $editorial_metadata_class->get_editorial_metadata_term_by('id', $term->term_id); + $postmeta_key = esc_attr($editorial_metadata_class->get_postmeta_key($term)); + $post_types = (isset($term->post_types) && is_array($term->post_types)) ? array_values($term->post_types) : []; + $post_types = join(" ", $post_types); + $term_data = [ + 'name' => $postmeta_key, + 'label' => $term->name, + 'description' => $term->description, + 'term_options' => $term_options, + ]; + $term_type = $term->type; + if ($term_type === 'user') { + $ajaxArgs = []; + if (isset($term->user_role)) { + $ajaxArgs['user_role'] = $term->user_role; + } + $fields[$term_data['name']] = [ + 'metadata' => true, + 'term' => $term, + 'label' => $term->name, + 'value' => '', + 'ajaxArgs' => $ajaxArgs, + 'post_types' => $post_types, + 'type' => 'authors', + 'multiple' => '' + ]; + } elseif ($term_type === 'paragraph') { + $fields[$term_data['name']] = [ + 'metadata' => true, + 'term' => $term, + 'label' => $term->name, + 'post_types' => $post_types, + 'value' => '', + 'type' => 'html' + ]; + } else { + $html = apply_filters("pp_editorial_metadata_{$term->type}_get_input_html", $term_data, ''); + $fields[$term_data['name']] = [ + 'metadata' => true, + 'post_types' => $post_types, + 'html' => (is_object($html) || is_array($html)) ? '' : '
    ' . $html . '
    ', + 'term' => $term, + 'label' => $term->name, + 'value' => '', + 'type' => 'metafield' + ]; + } + } + } + } + + $fields = apply_filters('publishpress_content_overview_get_post_type_fields', $fields, $postType); + + return $fields; + } + + /** + * Allow the user to define the date range in a new and exciting way + * + * @since 0.7 + */ + public static function content_overview_time_range($args) + { + $filtered_start_date = $args['user_filters']['start_date']; + $filtered_start_date_timestamp = strtotime($filtered_start_date); + + $filtered_end_date = $args['user_filters']['end_date']; + $filtered_end_date_timestamp = strtotime($filtered_end_date); + + $output = '
    '; + $output .= '
    '; + $output .= esc_html__('Show content from', 'publishpress'); + $output .= '
    '; + $output .= '
    '; + + $date_format = get_option('date_format'); + + $start_date_value = ''; + $start_date_value .= ''; + $start_date_value .= ''; + + $end_date_value = ''; + $end_date_value .= ''; + $end_date_value .= ''; + + $output .= sprintf( + _x( + ' %1$s
    to
    %2$s', + '%1$s = start date, %2$s = end date', + 'publishpress' + ), + $start_date_value, + $end_date_value + ); + $output .= '  '; + $output .= ''; + $output .= ' '; + $output .= ''; + $output .= ''; + $output .= ' '; + $output .= ''; + $output .= ''; + $output .= wp_nonce_field('change-date', 'nonce', 'change-date-nonce', false); + $output .= ''; + $output .= '
    '; + + $output .= '
    '; + $output .= '
    '; + + return $output; + } + + public static function content_overview_filter_options($args) + { + $select_id = $args['select_id']; + $select_name = $args['select_name']; + $filters = $args['user_filters']; + $terms_options = $args['terms_options']; + $content_overview_datas = $args['content_overview_datas']; + $post_statuses = $args['post_statuses']; + $post_types = $args['post_types']; + $form_filter_list = $args['form_filter_list']; + $all_filters = $args['all_filters']; + $operator_labels = $args['operator_labels']; + + if (array_key_exists($select_id, $terms_options)) { + $select_id = 'metadata_key'; + } + + if (array_key_exists($select_id, $content_overview_datas['taxonomies']) && taxonomy_exists($select_id)) { + $select_id = 'taxonomy'; + } + + $filter_label = ''; + $selected_value = ''; + + ob_start(); + + switch ($select_id) { + case 'post_status': + $filter_label = esc_html__('Post Status', 'publishpress'); + ?> + + label); + ?> + + + + + + + + +
    +
    + +
    +
    + + +
    + 'filter-submit']); ?> +
    + + + + + + + + + ', + esc_attr($metadata_start_name), + esc_attr($metadata_start_value), + esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), + '' + ); + printf( + '', + esc_attr($metadata_start_name), + esc_attr($metadata_start_value_hidden) + ); + ?> +
    + ', + esc_attr($metadata_end_name), + esc_attr($metadata_end_value), + esc_attr(pp_convert_date_format_to_jqueryui_datepicker('Y-m-d')), + '' + ); + printf( + '', + esc_attr($metadata_end_name), + esc_attr($metadata_end_value_hidden) + ); + ?> +
    + 'filter-submit']); ?> +
    + display_name; + } + } + $user_dropdown_args = [ + 'show_option_all' => $metadata_term['name'], + 'name' => $select_name, + 'selected' => $metadata_value, + 'class' => 'pp-custom-select2' + ]; + $user_dropdown_args = apply_filters('pp_editorial_metadata_user_dropdown_args', $user_dropdown_args); + wp_dropdown_users($user_dropdown_args); + } elseif ($metadata_type === 'checkbox') { + if ($metadata_value == '1') { + $selected_value = esc_html__('Checked', 'publishpress'); + } else { + $selected_value = ''; + } + ?> + + + /> +
    + 'filter-submit']); ?> +
    +
    '; + break; + + default: + if (array_key_exists($select_name, $form_filter_list)) { + $selected_value_meta = isset($filters[$select_name]) ? sanitize_text_field($filters[$select_name]) : ''; + $filter_label = $all_filters[$select_name]; + $selected_value = $selected_value_meta; + + if (strpos($select_name, "ppch_co_checklist_") === 0) { + ?> + + +
    +
    + +
    +
    + + +
    + 'filter-submit']); ?> +
    + +
    +
    + $selected_value, 'filter_label' => $filter_label, 'html' => ob_get_clean()]; + } + + + } + +} \ No newline at end of file diff --git a/modules/editorial-metadata/editorial-metadata.php b/modules/editorial-metadata/editorial-metadata.php index 23477b97..4969648e 100644 --- a/modules/editorial-metadata/editorial-metadata.php +++ b/modules/editorial-metadata/editorial-metadata.php @@ -29,7 +29,6 @@ */ use PublishPress\Notifications\Traits\Dependency_Injector; -use PublishPress\Legacy\Util; if (! class_exists('PP_Editorial_Metadata')) { /** @@ -144,6 +143,8 @@ public function init() // Load the chain of input-type handlers. $this->load_input_handlers(); + // Load utilities files. + $this->load_utilities_files(); if (is_admin()) { // Anything that needs to happen in the admin @@ -547,7 +548,7 @@ public function display_meta_box($post) if (! count($terms)) { $message = esc_html__('No editorial fields available.'); if (current_user_can('manage_options')) { - $message .= sprintf(' Add fields to get started.', esc_url($this->get_link())); + $message .= sprintf(' Add fields to get started.', esc_url(PP_Editorial_Metadata_Utilities::get_link())); } else { $message .= esc_html__( ' Encourage your site administrator to configure your editorial workflow by adding editorial fields.' @@ -601,7 +602,7 @@ public function display_meta_box($post) if ($this->checkEditCapability()) { // Make the metabox title include a link to edit the Editorial Fields terms. Logic similar to how Core dashboard widgets work. - echo '' . esc_html__( + echo '' . esc_html__( 'Configure' ) . ''; } @@ -1178,35 +1179,6 @@ private function delete_editorial_metadata_term($term_id) return $result; } - /** - * Generate a link to one of the editorial fields actions - * - * @param array $args (optional) Action and any query args to add to the URL - * - * @return string $link Direct link to complete the action - * @since 0.7 - * - */ - public function get_link($args = []) - { - if (! isset($args['action'])) { - $args['action'] = ''; - } - if (! isset($args['page'])) { - $args['page'] = self::MENU_SLUG; - } - - // Add other things we may need depending on the action - switch ($args['action']) { - case 'delete-term': - $args['nonce'] = wp_create_nonce($args['action']); - break; - default: - break; - } - return add_query_arg($args, get_admin_url(null, 'admin.php')); - } - /** * Handles a request to add a new piece of editorial fields */ @@ -1359,7 +1331,7 @@ public function handle_add_editorial_metadata() wp_die(esc_html__('Error adding term.', 'publishpress')); } - $redirect_url = $this->get_link(['message' => 'term-added']); + $redirect_url = PP_Editorial_Metadata_Utilities::get_link(['message' => 'term-added']); wp_redirect($redirect_url); exit; @@ -1509,7 +1481,7 @@ public function handle_edit_editorial_metadata() wp_die(esc_html__('Error updating term.', 'publishpress')); } - $redirect_url = $this->get_link(['message' => 'term-updated']); + $redirect_url = PP_Editorial_Metadata_Utilities::get_link(['message' => 'term-updated']); wp_redirect($redirect_url); exit; } @@ -1552,7 +1524,7 @@ public function handle_change_editorial_metadata_visibility() wp_die(esc_html__('Error updating term.', 'publishpress')); } - $redirect_url = $this->get_link(['message' => 'term-visibility-changed']); + $redirect_url = PP_Editorial_Metadata_Utilities::get_link(['message' => 'term-visibility-changed']); wp_redirect($redirect_url); exit; @@ -1618,7 +1590,7 @@ public function handle_delete_editorial_metadata() wp_die(esc_html__('Error deleting term.', 'publishpress')); } - $redirect_url = $this->get_link(['message' => 'term-deleted']); + $redirect_url = PP_Editorial_Metadata_Utilities::get_link(['message' => 'term-deleted']); wp_redirect($redirect_url); exit; } @@ -1766,692 +1738,30 @@ public function action_admin_submenu() public function render_admin_page() { $publishpress = $this->get_service('publishpress'); - $editorial_metadata = $publishpress->modules->editorial_metadata; - if (! isset($_GET['action']) || !in_array($_GET['action'], ['edit-term', 'add-new'])) { - $editorial_metadata->title = $editorial_metadata->title . ' '. esc_html__('Add New', 'publishpress') .''; - } - $publishpress->settings->print_default_header($editorial_metadata); - $wp_list_table = new PP_Editorial_Metadata_List_Table(); - $wp_list_table->prepare_items(); - - $showOptionsTab = (! isset($_GET['action']) || $_GET['action'] != 'add-new') && (! isset($_REQUEST['form-errors']) || empty($_REQUEST['form-errors'])); - - if (! isset($_GET['action']) || (isset($_GET['action']) && !in_array($_GET['action'], ['edit-term', 'add-new']))): ?> -
    -
    -
    -
    -
    - display(); ?> - -
    -
    - -
    - -
    - -
    -
    -
    - - - - module; + $args['metadata_types'] = $this->get_supported_metadata_types(); + $args['valid_post_types'] = $this->get_all_post_types(); + $args['metadata_user_roles'] = $this->get_supported_metadata_user_roles(); + + if (isset($_GET['action'], $_GET['term-id']) && $_GET['action'] == 'edit-term') { $term_id = (int)$_GET['term-id']; - $term = $this->get_editorial_metadata_term_by('id', $term_id); - if (! $term) { - echo '

    ' . $this->module->messages['term-missing'] . '

    '; - return; - } - $metadata_types = $this->get_supported_metadata_types(); - $type = $term->type; - $term_user_role = isset($term->user_role) ? (array)$term->user_role : []; - $term_select_type = isset($term->select_type) ? $term->select_type : ''; - $term_select_default = isset($term->select_default) ? $term->select_default : ''; - $term_select_options = isset($term->select_options) ? $term->select_options : ''; - $term_post_types= isset($term->post_types) ? $term->post_types : []; - $term_post_types_column = isset($term->post_types_column) ? $term->post_types_column : []; - $edit_term_link = $this->get_link(['action' => 'edit-term', 'term-id' => $term->term_id]); - - $term_select_type = (isset($_POST['metadata_select_type'])) ? sanitize_key($_POST['metadata_select_type']) : $term_select_type; - $term_select_default = (isset($_POST['select_dropdown_default'])) ? sanitize_text_field($_POST['select_dropdown_default']) : $term_select_default; - $term_select_options = (isset($_POST['metadata_select_options']) && is_array($_POST['metadata_select_options'])) ? $_POST['metadata_select_options'] : $term_select_options; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized - $term_post_types = (isset($_POST['post_types']) && is_array($_POST['post_types'])) ? array_map('sanitize_key', $_POST['post_types']) : $term_post_types; - $term_post_types_column = (isset($_POST['post_types_column']) && is_array($_POST['post_types_column'])) ? array_map('sanitize_key', $_POST['post_types_column']) : $term_post_types_column; - - $name = (isset($_POST['name'])) ? stripslashes(sanitize_text_field($_POST['name'])) : $term->name; - $description = (isset($_POST['description'])) ? stripslashes( - sanitize_textarea_field($_POST['description']) - ) : $term->description; - - if ($term->show_in_calendar_form) { - $show_in_calendar_form = 'yes'; - } else { - $show_in_calendar_form = 'no'; - } - $show_in_calendar_form = (isset($_POST['show_in_calendar_form'])) ? stripslashes($_POST['show_in_calendar_form']) : $show_in_calendar_form; - - $valid_post_types = $this->get_all_post_types($this->module); - ?> - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - settings->helper_print_error_or_description( - 'name', - esc_html__('The name is for labeling the editorial fields.', 'publishpress') - ); ?> -
    - -

    -
    - - settings->helper_print_error_or_description( - 'description', - esc_html__( - 'The description can be used to communicate with your team about what the field is for.', - 'publishpress' - ) - ); ?> -
    - -

    -
    - get_supported_metadata_user_roles(); - $current_metadata_user_role = $term_user_role; ?> - -

    -
    - esc_html__('Single Select', 'publishpress'), - 'multiple' => esc_html__('Multiple Select', 'publishpress'), - ]; - $current_metadata_select_type = $term_select_type; ?> - -

    settings->helper_print_error_or_description( - 'select_type', - esc_html__('Indicate the select type.', 'publishpress') - ); ?>

    -
    -

    settings->helper_print_error_or_description( - 'select_options', - esc_html__('Enter the dropdown option value and label. You can move options to change their order.', 'publishpress') - ); ?>

    - -
    -
    -
    - $value) { - ?> -
    - - - - -
    - -
    -
    - -
    - - - - - -
    - -
    -

    -
    -
    -
    - esc_html__('No', 'publishpress'), - 'yes' => esc_html__('Yes', 'publishpress'), - ]; ?> - '; - ?> - settings->helper_print_error_or_description( - 'show_in_calendar_form', - esc_html__( - 'If enabled, this field will be available when adding new posts on the Content Calendar and Overview screen.', - 'publishpress' - ) - ); ?> -
    - settings->helper_print_error_or_description( - 'post_types', - esc_html__( - 'This field will be available for these post types.', - 'publishpress' - ) - ); ?> - $post_types_name) : ?> - '; - echo '   ' . esc_html($post_types_name) . ''; - echo '
    '; - ?> - -
    - settings->helper_print_error_or_description( - 'post_types_column', - esc_html__( - 'This field will be viewable on the overview screens for these post types.', - 'publishpress' - ) - ); ?> - $post_types_name) : ?> - '; - echo '   ' . esc_html($post_types_name) . ''; - echo '
    '; - ?> - -
    -

    - - -

    -
    - - -
    -
    -
    - - -
    -
    - - - settings->helper_print_error_or_description( - 'name', - esc_html__('The name is for labeling the editorial fields.', 'publishpress') - ); ?> -
    -
    - - - settings->helper_print_error_or_description( - 'slug', - esc_html__( - 'The "slug" is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.', - 'publishpress' - ) - ); ?> -
    -
    - - - settings->helper_print_error_or_description( - 'description', - esc_html__( - 'The description can be used to communicate with your team about what the metadata is for.', - 'publishpress' - ) - ); ?> -
    -
    - - get_supported_metadata_types(); - // Select the previously selected metadata type if a valid one exists - $current_metadata_type = (isset($_POST['metadata_type']) && in_array( - $_POST['metadata_type'], - array_keys($metadata_types) - )) ? sanitize_key($_POST['metadata_type']) : false; ?> - - settings->helper_print_error_or_description( - 'type', - esc_html__('Indicate the type of editorial fields.', 'publishpress') - ); ?> -
    - - - - -
    - - esc_html__('No', 'publishpress'), - 'yes' => esc_html__('Yes', 'publishpress'), - ]; - $current_show_in_calendar_form = (isset($_POST['show_in_calendar_form']) && in_array( - $_POST['show_in_calendar_form'], - array_keys($show_in_calendar_form_options) - )) ? $_POST['show_in_calendar_form'] : 'no'; ?> - '; - ?> - settings->helper_print_error_or_description( - 'show_in_calendar_form', - esc_html__( - 'If enabled, this field will be available when adding new posts on the Content Calendar and Overview screen.', - 'publishpress' - ) - ); ?> -
    -
    - - settings->helper_print_error_or_description( - 'post_types', - esc_html__('This field will be available for these post types.', 'publishpress') - ); ?> - get_all_post_types($this->module); - $current_post_types = (isset($_POST['post_types']) && is_array($_POST['post_types'])) - ? array_map('sanitize_key', $_POST['post_types']) : ['post']; ?> - $post_types_name) : ?> - '; - echo '   ' . esc_html($post_types_name) . ''; - echo '
    '; - ?> - -
    -
    - - settings->helper_print_error_or_description( - 'post_types_column', - esc_html__('This field will be viewable on the overview screens for these post types.', 'publishpress') - ); ?> - - $post_types_name) : ?> - '; - echo '   ' . esc_html($post_types_name) . ''; - echo '
    '; - ?> - -
    - - - -

     

    -
    - -
    -
    -
    + $args['edited_term'] = $this->get_editorial_metadata_term_by('id', $term_id); + } + PP_Editorial_Metadata_Utilities::render_admin_page($args); + } - settings->print_default_footer($publishpress->modules->editorial_metadata); + /** + * Load utilities files + * + * @return void + */ + private function load_utilities_files() { + require_once dirname(__FILE__) . "/library/editorial-metadata-list-table.php"; + require_once dirname(__FILE__) . "/library/editorial-metadata-utilities.php"; } /** @@ -2507,171 +1817,4 @@ private function load_input_handlers() } } } -} - -/** - * Management interface for Editorial Fields. Extends WP_List_Table class - */ -class PP_Editorial_Metadata_List_Table extends WP_List_Table -{ - public $callback_args; - public $taxonomy; - public $tax; - - /** - * Construct the class - */ - public function __construct() - { - global $publishpress; - - $this->taxonomy = PP_Editorial_Metadata::metadata_taxonomy; - - $this->tax = get_taxonomy($this->taxonomy); - - $columns = $this->get_columns(); - $hidden = [ - 'position', - ]; - $sortable = []; - - $this->_column_headers = [$columns, $hidden, $sortable]; - - parent::__construct([ - 'plural' => 'metadata', - 'singular' => 'metadata', - ]); - } - - /** - * Register the columns to appear in the table - * - * @since 0.7 - */ - public function get_columns() - { - $columns = [ - 'position' => esc_html__('Position', 'publishpress'), - 'name' => esc_html__('Name', 'publishpress'), - 'post_types' => esc_html__('Post Types', 'publishpress'), - 'type' => esc_html__('Field Type', 'publishpress'), - 'description' => esc_html__('Description', 'publishpress') - ]; - - return $columns; - } - - /** - * Prepare a single row of Editorial Fields - * - * @param object $term The current term we're displaying - * @param int $level Level is always zero because it isn't a parent-child tax - * - * @since 0.7 - * - */ - public function single_row($term, $level = 0) - { - static $alternate_class = ''; - $alternate_class = ($alternate_class == '' ? ' alternate' : ''); - $row_class = ' class="term-static' . $alternate_class . '"'; - - echo ''; - echo $this->single_row_columns($term); - echo ''; - } - - /** - * Handle the column output when there's no method for it - * - * @param object $item Editorial Fields term as an object - * @param string $column_name How the column was registered at birth - * - * @since 0.7 - * - */ - public function column_default($item, $column_name) - { - global $publishpress; - - switch ($column_name) { - case 'position': - case 'type': - case 'description': - return esc_html($item->$column_name); - case 'post_types': - $post_types = (isset($item->post_types) && !empty(($item->post_types))) ? (array) $item->post_types : []; - if (!empty($post_types)) { - $valid_post_types = $publishpress->editorial_metadata->get_all_post_types($publishpress->editorial_metadata->module); - $post_type_names = []; - foreach ($valid_post_types as $post_type => $post_types_name) { - if (in_array($post_type, $post_types)) { - $post_type_names[] = $post_types_name; - } - } - return join(', ', $post_type_names); - } else { - return '-'; - } - break; - default: - break; - } - } - - /** - * Prepare the items to be displayed on the list table - * - * @since 0.7 - */ - public function prepare_items() - { - global $publishpress; - $this->items = $publishpress->editorial_metadata->get_editorial_metadata_terms(); - - $this->set_pagination_args([ - 'total_items' => count($this->items), - 'per_page' => count($this->items), - ]); - } - - /** - * Message to be displayed when there is no editorial fields - * - * @since 0.7 - */ - public function no_items() - { - esc_html_e('No editorial fields found.', 'publishpress'); - } - - /** - * Column for displaying the term's name and associated actions - * - * @param object $item Editorial Fields term as an object - * - * @since 0.7 - * - */ - public function column_name($item) - { - global $publishpress; - $item_edit_link = esc_url( - $publishpress->editorial_metadata->get_link(['action' => 'edit-term', 'term-id' => $item->term_id]) - ); - $item_delete_link = esc_url( - $publishpress->editorial_metadata->get_link(['action' => 'delete-term', 'term-id' => $item->term_id]) - ); - - $out = '' . esc_html($item->name) . ''; - - $actions = []; - $actions['edit'] = "" . esc_html__('Edit', 'publishpress') . ""; - - $actions['delete delete-status'] = "" . esc_html__('Delete', 'publishpress') . ""; - - $out .= $this->row_actions($actions, false); - - return $out; - } -} +} \ No newline at end of file diff --git a/modules/editorial-metadata/library/editorial-metadata-list-table.php b/modules/editorial-metadata/library/editorial-metadata-list-table.php new file mode 100644 index 00000000..ea92e41c --- /dev/null +++ b/modules/editorial-metadata/library/editorial-metadata-list-table.php @@ -0,0 +1,167 @@ +taxonomy = PP_Editorial_Metadata::metadata_taxonomy; + + $this->tax = get_taxonomy($this->taxonomy); + + $columns = $this->get_columns(); + $hidden = [ + 'position', + ]; + $sortable = []; + + $this->_column_headers = [$columns, $hidden, $sortable]; + + parent::__construct([ + 'plural' => 'metadata', + 'singular' => 'metadata', + ]); + } + + /** + * Register the columns to appear in the table + * + * @since 0.7 + */ + public function get_columns() + { + $columns = [ + 'position' => esc_html__('Position', 'publishpress'), + 'name' => esc_html__('Name', 'publishpress'), + 'post_types' => esc_html__('Post Types', 'publishpress'), + 'type' => esc_html__('Field Type', 'publishpress'), + 'description' => esc_html__('Description', 'publishpress') + ]; + + return $columns; + } + + /** + * Prepare a single row of Editorial Fields + * + * @param object $term The current term we're displaying + * @param int $level Level is always zero because it isn't a parent-child tax + * + * @since 0.7 + * + */ + public function single_row($term, $level = 0) + { + static $alternate_class = ''; + $alternate_class = ($alternate_class == '' ? ' alternate' : ''); + $row_class = ' class="term-static' . $alternate_class . '"'; + + echo ''; + echo $this->single_row_columns($term); + echo ''; + } + + /** + * Handle the column output when there's no method for it + * + * @param object $item Editorial Fields term as an object + * @param string $column_name How the column was registered at birth + * + * @since 0.7 + * + */ + public function column_default($item, $column_name) + { + global $publishpress; + + switch ($column_name) { + case 'position': + case 'type': + case 'description': + return esc_html($item->$column_name); + case 'post_types': + $post_types = (isset($item->post_types) && !empty(($item->post_types))) ? (array) $item->post_types : []; + if (!empty($post_types)) { + $valid_post_types = $publishpress->editorial_metadata->get_all_post_types($publishpress->editorial_metadata->module); + $post_type_names = []; + foreach ($valid_post_types as $post_type => $post_types_name) { + if (in_array($post_type, $post_types)) { + $post_type_names[] = $post_types_name; + } + } + return join(', ', $post_type_names); + } else { + return '-'; + } + break; + default: + break; + } + } + + /** + * Prepare the items to be displayed on the list table + * + * @since 0.7 + */ + public function prepare_items() + { + global $publishpress; + $this->items = $publishpress->editorial_metadata->get_editorial_metadata_terms(); + + $this->set_pagination_args([ + 'total_items' => count($this->items), + 'per_page' => count($this->items), + ]); + } + + /** + * Message to be displayed when there is no editorial fields + * + * @since 0.7 + */ + public function no_items() + { + esc_html_e('No editorial fields found.', 'publishpress'); + } + + /** + * Column for displaying the term's name and associated actions + * + * @param object $item Editorial Fields term as an object + * + * @since 0.7 + * + */ + public function column_name($item) + { + global $publishpress; + $item_edit_link = esc_url( + PP_Editorial_Metadata_Utilities::get_link(['action' => 'edit-term', 'term-id' => $item->term_id]) + ); + $item_delete_link = esc_url( + PP_Editorial_Metadata_Utilities::get_link(['action' => 'delete-term', 'term-id' => $item->term_id]) + ); + + $out = '' . esc_html($item->name) . ''; + + $actions = []; + $actions['edit'] = "" . esc_html__('Edit', 'publishpress') . ""; + + $actions['delete delete-status'] = "" . esc_html__('Delete', 'publishpress') . ""; + + $out .= $this->row_actions($actions, false); + + return $out; + } +} \ No newline at end of file diff --git a/modules/editorial-metadata/library/editorial-metadata-utilities.php b/modules/editorial-metadata/library/editorial-metadata-utilities.php new file mode 100644 index 00000000..49ca5805 --- /dev/null +++ b/modules/editorial-metadata/library/editorial-metadata-utilities.php @@ -0,0 +1,748 @@ +modules->editorial_metadata; + if (! isset($_GET['action']) || !in_array($_GET['action'], ['edit-term', 'add-new'])) { + $editorial_metadata->title = $editorial_metadata->title . ' '. esc_html__('Add New', 'publishpress') .''; + } + $publishpress->settings->print_default_header($editorial_metadata); + $wp_list_table = new PP_Editorial_Metadata_List_Table(); + $wp_list_table->prepare_items(); + + $showOptionsTab = (! isset($_GET['action']) || $_GET['action'] != 'add-new') && (! isset($_REQUEST['form-errors']) || empty($_REQUEST['form-errors'])); + + if (! isset($_GET['action']) || (isset($_GET['action']) && !in_array($_GET['action'], ['edit-term', 'add-new']))): ?> +
    +
    +
    +
    +
    + display(); ?> + +
    +
    + +
    + +
    + +
    +
    +
    + + + + +

    ' . $current_module->messages['term-missing'] . '

    '; + return; + } + $type = $term->type; + $term_user_role = isset($term->user_role) ? (array)$term->user_role : []; + $term_select_type = isset($term->select_type) ? $term->select_type : ''; + $term_select_default = isset($term->select_default) ? $term->select_default : ''; + $term_select_options = isset($term->select_options) ? $term->select_options : ''; + $term_post_types= isset($term->post_types) ? $term->post_types : []; + $term_post_types_column = isset($term->post_types_column) ? $term->post_types_column : []; + $edit_term_link = self::get_link(['action' => 'edit-term', 'term-id' => $term->term_id]); + + $term_select_type = (isset($_POST['metadata_select_type'])) ? sanitize_key($_POST['metadata_select_type']) : $term_select_type; + $term_select_default = (isset($_POST['select_dropdown_default'])) ? sanitize_text_field($_POST['select_dropdown_default']) : $term_select_default; + $term_select_options = (isset($_POST['metadata_select_options']) && is_array($_POST['metadata_select_options'])) ? $_POST['metadata_select_options'] : $term_select_options; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized + $term_post_types = (isset($_POST['post_types']) && is_array($_POST['post_types'])) ? array_map('sanitize_key', $_POST['post_types']) : $term_post_types; + $term_post_types_column = (isset($_POST['post_types_column']) && is_array($_POST['post_types_column'])) ? array_map('sanitize_key', $_POST['post_types_column']) : $term_post_types_column; + + $name = (isset($_POST['name'])) ? stripslashes(sanitize_text_field($_POST['name'])) : $term->name; + $description = (isset($_POST['description'])) ? stripslashes( + sanitize_textarea_field($_POST['description']) + ) : $term->description; + + if ($term->show_in_calendar_form) { + $show_in_calendar_form = 'yes'; + } else { + $show_in_calendar_form = 'no'; + } + $show_in_calendar_form = (isset($_POST['show_in_calendar_form'])) ? stripslashes($_POST['show_in_calendar_form']) : $show_in_calendar_form; + ?> + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + settings->helper_print_error_or_description( + 'name', + esc_html__('The name is for labeling the editorial fields.', 'publishpress') + ); ?> +
    + +

    +
    + + settings->helper_print_error_or_description( + 'description', + esc_html__( + 'The description can be used to communicate with your team about what the field is for.', + 'publishpress' + ) + ); ?> +
    + +

    +
    + + +

    +
    + esc_html__('Single Select', 'publishpress'), + 'multiple' => esc_html__('Multiple Select', 'publishpress'), + ]; + $current_metadata_select_type = $term_select_type; ?> + +

    settings->helper_print_error_or_description( + 'select_type', + esc_html__('Indicate the select type.', 'publishpress') + ); ?>

    +
    +

    settings->helper_print_error_or_description( + 'select_options', + esc_html__('Enter the dropdown option value and label. You can move options to change their order.', 'publishpress') + ); ?>

    + +
    +
    +
    + $value) { + ?> +
    + + + + +
    + +
    +
    + +
    + + + + + +
    + +
    +

    +
    +
    +
    + esc_html__('No', 'publishpress'), + 'yes' => esc_html__('Yes', 'publishpress'), + ]; ?> + '; + ?> + settings->helper_print_error_or_description( + 'show_in_calendar_form', + esc_html__( + 'If enabled, this field will be available when adding new posts on the Content Calendar and Overview screen.', + 'publishpress' + ) + ); ?> +
    + settings->helper_print_error_or_description( + 'post_types', + esc_html__( + 'This field will be available for these post types.', + 'publishpress' + ) + ); ?> + $post_types_name) : ?> + '; + echo '   ' . esc_html($post_types_name) . ''; + echo '
    '; + ?> + +
    + settings->helper_print_error_or_description( + 'post_types_column', + esc_html__( + 'This field will be viewable on the overview screens for these post types.', + 'publishpress' + ) + ); ?> + $post_types_name) : ?> + '; + echo '   ' . esc_html($post_types_name) . ''; + echo '
    '; + ?> + +
    +

    + + +

    +
    + + +
    +
    +
    + + +
    +
    + + + settings->helper_print_error_or_description( + 'name', + esc_html__('The name is for labeling the editorial fields.', 'publishpress') + ); ?> +
    +
    + + + settings->helper_print_error_or_description( + 'slug', + esc_html__( + 'The "slug" is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.', + 'publishpress' + ) + ); ?> +
    +
    + + + settings->helper_print_error_or_description( + 'description', + esc_html__( + 'The description can be used to communicate with your team about what the metadata is for.', + 'publishpress' + ) + ); ?> +
    +
    + + + + settings->helper_print_error_or_description( + 'type', + esc_html__('Indicate the type of editorial fields.', 'publishpress') + ); ?> +
    + + + + +
    + + esc_html__('No', 'publishpress'), + 'yes' => esc_html__('Yes', 'publishpress'), + ]; + $current_show_in_calendar_form = (isset($_POST['show_in_calendar_form']) && in_array( + $_POST['show_in_calendar_form'], + array_keys($show_in_calendar_form_options) + )) ? $_POST['show_in_calendar_form'] : 'no'; ?> + '; + ?> + settings->helper_print_error_or_description( + 'show_in_calendar_form', + esc_html__( + 'If enabled, this field will be available when adding new posts on the Content Calendar and Overview screen.', + 'publishpress' + ) + ); ?> +
    +
    + + settings->helper_print_error_or_description( + 'post_types', + esc_html__('This field will be available for these post types.', 'publishpress') + ); ?> + + $post_types_name) : ?> + '; + echo '   ' . esc_html($post_types_name) . ''; + echo '
    '; + ?> + +
    +
    + + settings->helper_print_error_or_description( + 'post_types_column', + esc_html__('This field will be viewable on the overview screens for these post types.', 'publishpress') + ); ?> + + $post_types_name) : ?> + '; + echo '   ' . esc_html($post_types_name) . ''; + echo '
    '; + ?> + +
    + + + +

     

    +
    + +
    +
    +
    + + settings->print_default_footer($publishpress->modules->editorial_metadata); + } + + } +} \ No newline at end of file From 434db48fd773150cd7aafb1cfab76b3f875cd82e Mon Sep 17 00:00:00 2001 From: olatechpro Date: Tue, 1 Oct 2024 06:23:56 +0100 Subject: [PATCH 03/23] Reduce calendar file size --- modules/calendar/calendar.php | 191 +-------- .../async-calendar/js/fields/MetaField.jsx | 3 +- .../lib/async-calendar/js/index.min.js | 4 +- modules/calendar/library/calendar-methods.php | 188 ++++++++ modules/content-board/content-board.php | 396 +---------------- .../library/content-board-methods.php | 404 ++++++++++++++++++ modules/efmigration/lib/js/efmigration.min.js | 2 +- 7 files changed, 623 insertions(+), 565 deletions(-) create mode 100644 modules/content-board/library/content-board-methods.php diff --git a/modules/calendar/calendar.php b/modules/calendar/calendar.php index 4edbbb66..fedba597 100644 --- a/modules/calendar/calendar.php +++ b/modules/calendar/calendar.php @@ -330,7 +330,7 @@ public function init() add_action('wp_ajax_publishpress_calendar_move_item', [$this->content_calendar_methods, 'moveCalendarItemToNewDate']); add_action('wp_ajax_publishpress_calendar_get_post_data', [$this, 'getPostData']); add_action('wp_ajax_publishpress_calendar_get_post_type_fields', [$this, 'getPostTypeFields']); - add_action('wp_ajax_publishpress_calendar_create_item', [$this, 'createItem']); + add_action('wp_ajax_publishpress_calendar_create_item', [$this->content_calendar_methods, 'createItem']); // Action to regenerate the calendar feed secret add_action('admin_init', [$this->content_calendar_methods, 'handle_regenerate_calendar_feed_secret']); @@ -511,7 +511,10 @@ private function currentUserCanViewCalendar() */ public function enqueue_admin_scripts() { - if ($this->is_whitelisted_functional_view()) { + global $pagenow; + + // Only load calendar scripts on the calendar page + if ('admin.php' === $pagenow && isset($_GET['page']) && $_GET['page'] === 'pp-calendar') { // $this->enqueue_datepicker_resources(); $method_args = []; @@ -1705,18 +1708,6 @@ public function print_configure_view() get_post_statuses() as $post_status) { - $is_status_valid = $subject === $post_status->slug; - if ($is_status_valid) { - return true; - } - } - - return false; - } - private function getPostTypeObject($postType) { if (! isset($this->postTypeObjectCache[$postType])) { @@ -1947,178 +1938,6 @@ private function formatDateFromString($date, $originalFormat = 'Y-m-d') return $datetime->format(get_option('date_format', 'Y-m-d H:i:s')); } - /** - * @throws Exception - */ - public function createItem() - { - if (! wp_verify_nonce(sanitize_text_field($_POST['nonce']), 'publishpress-calendar-get-data')) { - $this->print_ajax_response('error', $this->module->messages['nonce-failed']); - } - - // Check that the user has the right capabilities to add posts to the calendar (defaults to 'edit_posts') - if (! current_user_can($this->create_post_cap)) { - $this->print_ajax_response('error', $this->module->messages['invalid-permissions']); - } - - $postType = isset($_POST['post_type']) ? sanitize_text_field($_POST['post_type']) : null; - $date = isset($_POST['date']) ? sanitize_text_field($_POST['date']) : null; - $status = isset($_POST['status']) ? sanitize_text_field($_POST['status']) : null; - $title = isset($_POST['title']) ? sanitize_text_field($_POST['title']) : ''; - // Sanitized by the wp_filter_post_kses function. - // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized - $content = isset($_POST['content']) ? wp_filter_post_kses($_POST['content']) : ''; - $time = isset($_POST['time']) ? sanitize_text_field($_POST['time']) : ''; - $authors = isset($_POST['authors']) ? explode(',', sanitize_text_field($_POST['authors'])) : []; - $categories = isset($_POST['categories']) ? explode(',', sanitize_text_field($_POST['categories'])) : []; - $tags = isset($_POST['tags']) ? explode(',', sanitize_text_field($_POST['tags'])) : []; - - if (empty($date)) { - $this->print_ajax_response('error', __('No date supplied.', 'publishpress')); - } - - // Post type has to be visible on the calendar to create a placeholder - if (empty($postType)) { - $postType = 'post'; - } - - if (! in_array($postType, $this->get_post_types_for_module($this->module))) { - $this->print_ajax_response( - 'error', - __('The selected post type is not enabled for the calendar.', 'publishpress') - ); - } - - $title = apply_filters('pp_calendar_after_form_submission_sanitize_title', $title); - if (empty($title)) { - $title = __('Untitled', 'publishpress'); - } - - $content = apply_filters('pp_calendar_after_form_submission_sanitize_content', $content); - if (empty($content)) { - $content = ''; - } - - $authors = apply_filters('pp_calendar_after_form_submission_sanitize_author', $authors); - try { - $authors = apply_filters('pp_calendar_after_form_submission_validate_author', $authors); - } catch (Exception $e) { - $this->print_ajax_response('error', $e->getMessage()); - } - - if (empty($authors)) { - $authors = apply_filters('publishpress_calendar_default_author', get_current_user_id()); - } - - if (! is_array($authors)) { - $authors = [$authors]; - } - - if (! $this->isPostStatusValid($status)) { - $this->print_ajax_response('error', __('Invalid Status supplied.', 'publishpress')); - } - - $categories = array_map('sanitize_text_field', $categories); - $tags = array_map('sanitize_text_field', $tags); - - $dateTimestamp = strtotime($date); - - if (empty($time)) { - $time = $this->module->options->default_publish_time; - } - - if (! empty($time)) { - $date = sprintf( - '%s %s', - $date, - ((function_exists('mb_strlen') ? mb_strlen($time) : strlen($time)) === 5) - ? "{$time}:" . date('s', $dateTimestamp) - : date('H:i:s', $dateTimestamp) - ); - } - - $dateTimeInstance = new DateTime($date); - if (! $dateTimeInstance) { - $this->print_ajax_response('error', __('Invalid Publish Date supplied.', 'publishpress')); - } - unset($dateTimeInstance); - - // Set new post parameters - $postPlaceholder = [ - 'post_author' => $authors[0], - 'post_title' => $title, - 'post_content' => $content, - 'post_type' => $postType, - 'post_status' => $status, - 'post_date' => $date, - 'post_modified' => current_time('mysql'), - 'post_modified_gmt' => current_time('mysql', 1), - ]; - - /* - * By default, adding a post to the calendar will set the timestamp. - * If the user don't desires that to be the behavior, they can set the result of this filter to 'false' - * With how WordPress works internally, setting 'post_date_gmt' will set the timestamp. - * But check the Custom Status module and the hook to "wp_insert_post_data". It will reset the date if not - * publishing or scheduling. - */ - - if (apply_filters('pp_calendar_allow_ajax_to_set_timestamp', true)) { - $postPlaceholder['post_date_gmt'] = get_gmt_from_date($date); - } - - // Create the post - add_filter('wp_insert_post_data', ['PP_Calendar_Utilities', 'alter_post_modification_time'], 99, 2); - $postId = wp_insert_post($postPlaceholder); - remove_filter('wp_insert_post_data', ['PP_Calendar_Utilities', 'alter_post_modification_time'], 99); - - do_action('publishpress_calendar_after_create_post', $postId, $authors); - - if ($postId) { - if (! empty($categories)) { - $categoriesIdList = []; - foreach ($categories as $categorySlug) { - $category = get_term_by('slug', $categorySlug, 'category'); - - if (! $category || is_wp_error($category)) { - $category = wp_create_category($categorySlug); - $category = get_term($category); - } - - if (! is_wp_error($category)) { - $categoriesIdList[] = $category->term_id; - } - } - - wp_set_post_terms($postId, $categoriesIdList, 'category'); - } - - if (! empty($tags)) { - foreach ($tags as $tagSlug) { - $tag = get_term_by('slug', $tagSlug, 'post_tag'); - - if (! $tag || is_wp_error($tag)) { - wp_create_tag($tagSlug); - } - } - - wp_set_post_terms($postId, $tags); - } - - // announce success and send back the html to inject - $this->print_ajax_response( - 'success', - __('Post created successfully', 'publishpress'), - [ - 'postId' => $postId, - 'link' => htmlspecialchars_decode(get_edit_post_link($postId)), - ] - ); - } else { - $this->print_ajax_response('error', __('Post could not be created', 'publishpress')); - } - } - /** * Sanitize a $_GET or similar filter being used on the calendar * diff --git a/modules/calendar/lib/async-calendar/js/fields/MetaField.jsx b/modules/calendar/lib/async-calendar/js/fields/MetaField.jsx index 095ed841..cdcb081e 100644 --- a/modules/calendar/lib/async-calendar/js/fields/MetaField.jsx +++ b/modules/calendar/lib/async-calendar/js/fields/MetaField.jsx @@ -1,4 +1,3 @@ -import DOMPurify from 'dompurify'; const $ = jQuery; export default function MetaField(props) { @@ -48,7 +47,7 @@ export default function MetaField(props) { return (
    + dangerouslySetInnerHTML={{ __html: props.html }}>
    ) } diff --git a/modules/calendar/lib/async-calendar/js/index.min.js b/modules/calendar/lib/async-calendar/js/index.min.js index 758a3909..d0dce731 100644 --- a/modules/calendar/lib/async-calendar/js/index.min.js +++ b/modules/calendar/lib/async-calendar/js/index.min.js @@ -1,3 +1 @@ -!function(e){var t={};function a(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.m=e,a.c=t,a.d=function(e,t,n){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(a.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)a.d(n,r,function(t){return e[t]}.bind(null,r));return n},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="",a(a.s=4)}([function(e,t){e.exports=wp.element},function(e,t,a){ -/*! @license DOMPurify 2.4.7 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/2.4.7/LICENSE */ -e.exports=function(){"use strict";function e(t){return(e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(t)}function t(e,a){return(t=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,a)}function a(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],(function(){}))),!0}catch(e){return!1}}function n(e,r,o){return(n=a()?Reflect.construct:function(e,a,n){var r=[null];r.push.apply(r,a);var o=new(Function.bind.apply(e,r));return n&&t(o,n.prototype),o}).apply(null,arguments)}function r(e){return function(e){if(Array.isArray(e))return o(e)}(e)||function(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}(e)||function(e,t){if(e){if("string"==typeof e)return o(e,t);var a=Object.prototype.toString.call(e).slice(8,-1);return"Object"===a&&e.constructor&&(a=e.constructor.name),"Map"===a||"Set"===a?Array.from(e):"Arguments"===a||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(a)?o(e,t):void 0}}(e)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(e,t){(null==t||t>e.length)&&(t=e.length);for(var a=0,n=new Array(t);a1?a-1:0),r=1;r/gm),q=d(/\${[\w\W]*}/gm),Y=d(/^data-[\-\w.\u00B7-\uFFFF]/),V=d(/^aria-[\-\w]+$/),$=d(/^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i),K=d(/^(?:\w+script|data):/i),J=d(/[\u0000-\u0020\u00A0\u1680\u180E\u2000-\u2029\u205F\u3000]/g),X=d(/^html$/i),Z=function(){return"undefined"==typeof window?null:window},ee=function(t,a){if("object"!==e(t)||"function"!=typeof t.createPolicy)return null;var n=null;a.currentScript&&a.currentScript.hasAttribute("data-tt-policy-suffix")&&(n=a.currentScript.getAttribute("data-tt-policy-suffix"));var r="dompurify"+(n?"#"+n:"");try{return t.createPolicy(r,{createHTML:function(e){return e},createScriptURL:function(e){return e}})}catch(e){return console.warn("TrustedTypes policy "+r+" could not be created."),null}};return function t(){var a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:Z(),n=function(e){return t(e)};if(n.version="2.4.7",n.removed=[],!a||!a.document||9!==a.document.nodeType)return n.isSupported=!1,n;var o=a.document,i=a.document,l=a.DocumentFragment,s=a.HTMLTemplateElement,c=a.Node,u=a.Element,d=a.NodeFilter,m=a.NamedNodeMap,f=void 0===m?a.NamedNodeMap||a.MozNamedAttrMap:m,h=a.HTMLFormElement,g=a.DOMParser,v=a.trustedTypes,O=u.prototype,te=A(O,"cloneNode"),ae=A(O,"nextSibling"),ne=A(O,"childNodes"),re=A(O,"parentNode");if("function"==typeof s){var oe=i.createElement("template");oe.content&&oe.content.ownerDocument&&(i=oe.content.ownerDocument)}var ie=ee(v,o),le=ie?ie.createHTML(""):"",se=i,ce=se.implementation,ue=se.createNodeIterator,pe=se.createDocumentFragment,de=se.getElementsByTagName,me=o.importNode,fe={};try{fe=j(i).documentMode?i.documentMode:{}}catch(e){}var he={};n.isSupported="function"==typeof re&&ce&&void 0!==ce.createHTMLDocument&&9!==fe;var ge,ve,ye=B,be=W,Ee=q,we=Y,_e=V,ke=K,Ce=J,xe=$,Re=null,Se=D({},[].concat(r(N),r(P),r(L),r(I),r(U))),Te=null,Oe=D({},[].concat(r(H),r(G),r(z),r(Q))),De=Object.seal(Object.create(null,{tagNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},attributeNameCheck:{writable:!0,configurable:!1,enumerable:!0,value:null},allowCustomizedBuiltInElements:{writable:!0,configurable:!1,enumerable:!0,value:!1}})),je=null,Ae=null,Ne=!0,Pe=!0,Le=!1,Me=!0,Ie=!1,Fe=!1,Ue=!1,He=!1,Ge=!1,ze=!1,Qe=!1,Be=!0,We=!1,qe="user-content-",Ye=!0,Ve=!1,$e={},Ke=null,Je=D({},["annotation-xml","audio","colgroup","desc","foreignobject","head","iframe","math","mi","mn","mo","ms","mtext","noembed","noframes","noscript","plaintext","script","style","svg","template","thead","title","video","xmp"]),Xe=null,Ze=D({},["audio","video","img","source","image","track"]),et=null,tt=D({},["alt","class","for","id","label","name","pattern","placeholder","role","summary","title","value","style","xmlns"]),at="http://www.w3.org/1998/Math/MathML",nt="http://www.w3.org/2000/svg",rt="http://www.w3.org/1999/xhtml",ot=rt,it=!1,lt=null,st=D({},[at,nt,rt],_),ct=["application/xhtml+xml","text/html"],ut="text/html",pt=null,dt=i.createElement("form"),mt=function(e){return e instanceof RegExp||e instanceof Function},ft=function(t){pt&&pt===t||(t&&"object"===e(t)||(t={}),t=j(t),ge=ge=-1===ct.indexOf(t.PARSER_MEDIA_TYPE)?ut:t.PARSER_MEDIA_TYPE,ve="application/xhtml+xml"===ge?_:w,Re="ALLOWED_TAGS"in t?D({},t.ALLOWED_TAGS,ve):Se,Te="ALLOWED_ATTR"in t?D({},t.ALLOWED_ATTR,ve):Oe,lt="ALLOWED_NAMESPACES"in t?D({},t.ALLOWED_NAMESPACES,_):st,et="ADD_URI_SAFE_ATTR"in t?D(j(tt),t.ADD_URI_SAFE_ATTR,ve):tt,Xe="ADD_DATA_URI_TAGS"in t?D(j(Ze),t.ADD_DATA_URI_TAGS,ve):Ze,Ke="FORBID_CONTENTS"in t?D({},t.FORBID_CONTENTS,ve):Je,je="FORBID_TAGS"in t?D({},t.FORBID_TAGS,ve):{},Ae="FORBID_ATTR"in t?D({},t.FORBID_ATTR,ve):{},$e="USE_PROFILES"in t&&t.USE_PROFILES,Ne=!1!==t.ALLOW_ARIA_ATTR,Pe=!1!==t.ALLOW_DATA_ATTR,Le=t.ALLOW_UNKNOWN_PROTOCOLS||!1,Me=!1!==t.ALLOW_SELF_CLOSE_IN_ATTR,Ie=t.SAFE_FOR_TEMPLATES||!1,Fe=t.WHOLE_DOCUMENT||!1,Ge=t.RETURN_DOM||!1,ze=t.RETURN_DOM_FRAGMENT||!1,Qe=t.RETURN_TRUSTED_TYPE||!1,He=t.FORCE_BODY||!1,Be=!1!==t.SANITIZE_DOM,We=t.SANITIZE_NAMED_PROPS||!1,Ye=!1!==t.KEEP_CONTENT,Ve=t.IN_PLACE||!1,xe=t.ALLOWED_URI_REGEXP||xe,ot=t.NAMESPACE||rt,De=t.CUSTOM_ELEMENT_HANDLING||{},t.CUSTOM_ELEMENT_HANDLING&&mt(t.CUSTOM_ELEMENT_HANDLING.tagNameCheck)&&(De.tagNameCheck=t.CUSTOM_ELEMENT_HANDLING.tagNameCheck),t.CUSTOM_ELEMENT_HANDLING&&mt(t.CUSTOM_ELEMENT_HANDLING.attributeNameCheck)&&(De.attributeNameCheck=t.CUSTOM_ELEMENT_HANDLING.attributeNameCheck),t.CUSTOM_ELEMENT_HANDLING&&"boolean"==typeof t.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements&&(De.allowCustomizedBuiltInElements=t.CUSTOM_ELEMENT_HANDLING.allowCustomizedBuiltInElements),Ie&&(Pe=!1),ze&&(Ge=!0),$e&&(Re=D({},r(U)),Te=[],!0===$e.html&&(D(Re,N),D(Te,H)),!0===$e.svg&&(D(Re,P),D(Te,G),D(Te,Q)),!0===$e.svgFilters&&(D(Re,L),D(Te,G),D(Te,Q)),!0===$e.mathMl&&(D(Re,I),D(Te,z),D(Te,Q))),t.ADD_TAGS&&(Re===Se&&(Re=j(Re)),D(Re,t.ADD_TAGS,ve)),t.ADD_ATTR&&(Te===Oe&&(Te=j(Te)),D(Te,t.ADD_ATTR,ve)),t.ADD_URI_SAFE_ATTR&&D(et,t.ADD_URI_SAFE_ATTR,ve),t.FORBID_CONTENTS&&(Ke===Je&&(Ke=j(Ke)),D(Ke,t.FORBID_CONTENTS,ve)),Ye&&(Re["#text"]=!0),Fe&&D(Re,["html","head","body"]),Re.table&&(D(Re,["tbody"]),delete je.tbody),p&&p(t),pt=t)},ht=D({},["mi","mo","mn","ms","mtext"]),gt=D({},["foreignobject","desc","title","annotation-xml"]),vt=D({},["title","style","font","a","script"]),yt=D({},P);D(yt,L),D(yt,M);var bt=D({},I);D(bt,F);var Et=function(e){var t=re(e);t&&t.tagName||(t={namespaceURI:ot,tagName:"template"});var a=w(e.tagName),n=w(t.tagName);return!!lt[e.namespaceURI]&&(e.namespaceURI===nt?t.namespaceURI===rt?"svg"===a:t.namespaceURI===at?"svg"===a&&("annotation-xml"===n||ht[n]):Boolean(yt[a]):e.namespaceURI===at?t.namespaceURI===rt?"math"===a:t.namespaceURI===nt?"math"===a&>[n]:Boolean(bt[a]):e.namespaceURI===rt?!(t.namespaceURI===nt&&!gt[n])&&!(t.namespaceURI===at&&!ht[n])&&!bt[a]&&(vt[a]||!yt[a]):!("application/xhtml+xml"!==ge||!lt[e.namespaceURI]))},wt=function(e){E(n.removed,{element:e});try{e.parentNode.removeChild(e)}catch(t){try{e.outerHTML=le}catch(t){e.remove()}}},_t=function(e,t){try{E(n.removed,{attribute:t.getAttributeNode(e),from:t})}catch(e){E(n.removed,{attribute:null,from:t})}if(t.removeAttribute(e),"is"===e&&!Te[e])if(Ge||ze)try{wt(t)}catch(e){}else try{t.setAttribute(e,"")}catch(e){}},kt=function(e){var t,a;if(He)e=""+e;else{var n=k(e,/^[\r\n\t ]+/);a=n&&n[0]}"application/xhtml+xml"===ge&&ot===rt&&(e=''+e+"");var r=ie?ie.createHTML(e):e;if(ot===rt)try{t=(new g).parseFromString(r,ge)}catch(e){}if(!t||!t.documentElement){t=ce.createDocument(ot,"template",null);try{t.documentElement.innerHTML=it?le:r}catch(e){}}var o=t.body||t.documentElement;return e&&a&&o.insertBefore(i.createTextNode(a),o.childNodes[0]||null),ot===rt?de.call(t,Fe?"html":"body")[0]:Fe?t.documentElement:o},Ct=function(e){return ue.call(e.ownerDocument||e,e,d.SHOW_ELEMENT|d.SHOW_COMMENT|d.SHOW_TEXT,null,!1)},xt=function(e){return e instanceof h&&("string"!=typeof e.nodeName||"string"!=typeof e.textContent||"function"!=typeof e.removeChild||!(e.attributes instanceof f)||"function"!=typeof e.removeAttribute||"function"!=typeof e.setAttribute||"string"!=typeof e.namespaceURI||"function"!=typeof e.insertBefore||"function"!=typeof e.hasChildNodes)},Rt=function(t){return"object"===e(c)?t instanceof c:t&&"object"===e(t)&&"number"==typeof t.nodeType&&"string"==typeof t.nodeName},St=function(e,t,a){he[e]&&y(he[e],(function(e){e.call(n,t,a,pt)}))},Tt=function(e){var t;if(St("beforeSanitizeElements",e,null),xt(e))return wt(e),!0;if(S(/[\u0080-\uFFFF]/,e.nodeName))return wt(e),!0;var a=ve(e.nodeName);if(St("uponSanitizeElement",e,{tagName:a,allowedTags:Re}),e.hasChildNodes()&&!Rt(e.firstElementChild)&&(!Rt(e.content)||!Rt(e.content.firstElementChild))&&S(/<[/\w]/g,e.innerHTML)&&S(/<[/\w]/g,e.textContent))return wt(e),!0;if("select"===a&&S(/