| @@ -1,8 +1,5 @@ | ||
| 1 | 1 | <?php |
| 2 | -/** | |
| 3 | - * @package Polylang | |
| 4 | - */ | |
| 5 | 2 | |
| 6 | 3 | /** |
| 7 | 4 | * Admin side controller |
| 8 | 5 | * accessible in $polylang global object |
| @@ -7,84 +4,35 @@ | ||
| 7 | 4 | * Admin side controller |
| 8 | 5 | * accessible in $polylang global object |
| 9 | 6 | * |
| 10 | 7 | * Properties: |
| 11 | - * options => inherited, reference to Polylang options array | |
| 12 | - * model => inherited, reference to PLL_Model object | |
| 13 | - * links_model => inherited, reference to PLL_Links_Model object | |
| 14 | - * links => inherited, reference to PLL_Admin_Links object | |
| 15 | - * static_pages => inherited, reference to PLL_Admin_Static_Pages object | |
| 16 | - * filters_links => inherited, reference to PLL_Filters_Links object | |
| 17 | - * curlang => inherited, optional, current language used to filter the content (language of the post or term being edited, equal to filter_lang otherwise) | |
| 18 | - * filter_lang => inherited, optional, current status of the admin languages filter (in the admin bar) | |
| 19 | - * pref_lang => inherited, preferred language used as default when saving posts or terms | |
| 20 | - * posts => reference to PLL_CRUD_Posts object | |
| 21 | - * terms => reference to PLL_CRUD_Terms object | |
| 22 | - * filters => reference to PLL_Admin_Filters object | |
| 23 | - * filters_sanitization => reference to PLL_Filters_Sanitization object | |
| 24 | - * filters_columns => reference to PLL_Admin_Filters_Columns object | |
| 25 | - * filters_post => reference to PLL_Admin_Filters_Post object | |
| 26 | - * filters_term => reference to PLL_Admin_filters_Term object | |
| 27 | - * nav_menu => reference to PLL_Admin_Nav_Menu object | |
| 28 | - * block_editor => reference to PLL_Admin_Block_Editor object | |
| 29 | - * classic_editor => reference to PLL_Admin_Classic_Editor object | |
| 30 | - * filters_media => optional, reference to PLL_Admin_Filters_Media object | |
| 8 | + * options => inherited, reference to Polylang options array | |
| 9 | + * model => inherited, reference to PLL_Model object | |
| 10 | + * links_model => inherited, reference to PLL_Links_Model object | |
| 11 | + * links => inherited, reference to PLL_Admin_Links object | |
| 12 | + * static_pages => inherited, reference to PLL_Admin_Static_Pages object | |
| 13 | + * filters_links => inherited, reference to PLL_Filters_Links object | |
| 14 | + * curlang => inherited, optional, current language used to filter the content (language of the post or term being edited, equal to filter_lang otherwise) | |
| 15 | + * filter_lang => inherited, optional, current status of the admin languages filter (in the admin bar) | |
| 16 | + * pref_lang => inherited, preferred language used as default when saving posts or terms | |
| 17 | + * posts => reference to PLL_CRUD_Posts object | |
| 18 | + * terms => reference to PLL_CRUD_Terms object | |
| 19 | + * filters => reference to PLL_Admin_Filters object | |
| 20 | + * filters_columns => reference to PLL_Admin_Filters_Columns object | |
| 21 | + * filters_post => reference to PLL_Admin_Filters_Post object | |
| 22 | + * filters_term => reference to PLL_Admin_filters_Term object | |
| 23 | + * nav_menu => reference to PLL_Admin_Nav_Menu object | |
| 24 | + * sync => reference to PLL_Admin_Sync object | |
| 25 | + * block_editor => reference to PLL_Admin_Block_Editor object | |
| 26 | + * classic_editor => reference to PLL_Admin_Classic_Editor object | |
| 27 | + * filters_media => optional, reference to PLL_Admin_Filters_Media object | |
| 31 | 28 | * |
| 32 | 29 | * @since 1.2 |
| 33 | 30 | */ |
| 34 | 31 | class PLL_Admin extends PLL_Admin_Base { |
| 35 | - /** | |
| 36 | - * Instance of PLL_Admin_Filters | |
| 37 | - * | |
| 38 | - * @var PLL_Admin_Filters | |
| 39 | - */ | |
| 40 | - public $filters; | |
| 32 | + public $filters, $filters_columns, $filters_post, $filters_term, $nav_menu, $sync, $filters_media; | |
| 41 | 33 | |
| 42 | 34 | /** |
| 43 | - * Instance of PLL_Admin_Filters_Columns | |
| 44 | - * | |
| 45 | - * @var PLL_Admin_Filters_Columns | |
| 46 | - */ | |
| 47 | - public $filters_columns; | |
| 48 | - | |
| 49 | - /** | |
| 50 | - * Instance of PLL_Admin_Filters_Post | |
| 51 | - * | |
| 52 | - * @var PLL_Admin_Filters_Post | |
| 53 | - */ | |
| 54 | - public $filters_post; | |
| 55 | - | |
| 56 | - /** | |
| 57 | - * Instance of PLL_Admin_filters_Term | |
| 58 | - * | |
| 59 | - * @var PLL_Admin_filters_Term | |
| 60 | - */ | |
| 61 | - public $filters_term; | |
| 62 | - | |
| 63 | - /** | |
| 64 | - * Instance of PLL_Admin_Nav_Menu | |
| 65 | - * | |
| 66 | - * @var PLL_Admin_Nav_Menu | |
| 67 | - */ | |
| 68 | - public $nav_menu; | |
| 69 | - | |
| 70 | - /** | |
| 71 | - * Instance of PLL_Admin_Filters_Media | |
| 72 | - * | |
| 73 | - * @var PLL_Admin_Filters_Media | |
| 74 | - */ | |
| 75 | - public $filters_media; | |
| 76 | - | |
| 77 | - /** | |
| 78 | - * Instance of PLL_Filters_Sanitization | |
| 79 | - * | |
| 80 | - * @since 2.9 | |
| 81 | - * | |
| 82 | - * @var PLL_Filters_Sanitization | |
| 83 | - */ | |
| 84 | - public $filters_sanitization; | |
| 85 | - | |
| 86 | - /** | |
| 87 | 35 | * Loads the polylang text domain |
| 88 | 36 | * Setups filters and action needed on all admin pages and on plugins page |
| 89 | 37 | * |
| 90 | 38 | * @since 1.2 |
| @@ -99,9 +47,9 @@ | ||
| 99 | 47 | add_action( 'in_plugin_update_message-' . POLYLANG_BASENAME, array( $this, 'plugin_update_message' ), 10, 2 ); |
| 100 | 48 | } |
| 101 | 49 | |
| 102 | 50 | /** |
| 103 | - * Setups filters and action needed on all admin pages and on plugins page | |
| 51 | + * Aetups filters and action needed on all admin pages and on plugins page | |
| 104 | 52 | * Loads the settings pages or the filters base on the request |
| 105 | 53 | * |
| 106 | 54 | * @since 1.2 |
| 107 | 55 | */ |
| @@ -145,14 +93,12 @@ | ||
| 145 | 93 | /** |
| 146 | 94 | * Setup filters for admin pages |
| 147 | 95 | * |
| 148 | 96 | * @since 1.2 |
| 149 | - * @since 2.7 instantiate a PLL_Bulk_Translate instance. | |
| 150 | 97 | */ |
| 151 | 98 | public function add_filters() { |
| 152 | - $this->filters_sanitization = new PLL_Filters_Sanitization( $this->get_locale_for_sanitization() ); | |
| 153 | 99 | // All these are separated just for convenience and maintainability |
| 154 | - $classes = array( 'Filters', 'Filters_Columns', 'Filters_Post', 'Filters_Term', 'Nav_Menu', 'Classic_Editor', 'Block_Editor' ); | |
| 100 | + $classes = array( 'Filters', 'Filters_Columns', 'Filters_Post', 'Filters_Term', 'Nav_Menu', 'Sync', 'Classic_Editor', 'Block_Editor' ); | |
| 155 | 101 | |
| 156 | 102 | // Don't load media filters if option is disabled or if user has no right |
| 157 | 103 | if ( $this->options['media_support'] && ( $obj = get_post_type_object( 'attachment' ) ) && ( current_user_can( $obj->cap->edit_posts ) || current_user_can( $obj->cap->create_posts ) ) ) { |
| 158 | 104 | $classes[] = 'Filters_Media'; |
| @@ -170,29 +116,9 @@ | ||
| 170 | 116 | */ |
| 171 | 117 | $class = apply_filters( 'pll_' . $obj, 'PLL_Admin_' . $class ); |
| 172 | 118 | $this->$obj = new $class( $this ); |
| 173 | 119 | } |
| 174 | - } | |
| 175 | - /** | |
| 176 | - * Retrieve the locale according to the current language instead of the language | |
| 177 | - * of the admin interface. | |
| 178 | - * | |
| 179 | - * @since 2.0 | |
| 180 | - * | |
| 181 | - * @return string | |
| 182 | - */ | |
| 183 | - public function get_locale_for_sanitization() { | |
| 184 | - $locale = get_locale(); | |
| 185 | 120 | |
| 186 | - if ( isset( $_POST['post_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['post_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 187 | - $locale = $lang->locale; | |
| 188 | - } elseif ( isset( $_POST['term_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['term_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 189 | - $locale = $lang->locale; | |
| 190 | - } elseif ( isset( $_POST['inline_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['inline_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 191 | - $locale = $lang->locale; | |
| 192 | - } elseif ( ! empty( $this->curlang ) ) { | |
| 193 | - $locale = $this->curlang->locale; | |
| 194 | - } | |
| 195 | - | |
| 196 | - return $locale; | |
| 121 | + $this->posts = new PLL_CRUD_Posts( $this ); | |
| 122 | + $this->terms = new PLL_CRUD_Terms( $this ); | |
| 197 | 123 | } |
| 198 | 124 | } |
