| @@ -1,12 +1,11 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -namespace PXLBSAdminify\Inc\Classes; | |
| 3 | +namespace WPAdminify\Inc\Classes; | |
| 4 | 4 | |
| 5 | -use PXLBSAdminify\Inc\Utils; | |
| 6 | -use PXLBSAdminify\Inc\Admin\AdminSettings; | |
| 7 | -use PXLBSAdminify\Inc\Admin\AdminSettingsModel; | |
| 8 | -use PXLBSAdminify\Inc\Classes\Addons_Plugins; | |
| 5 | +use WPAdminify\Inc\Utils; | |
| 6 | +use WPAdminify\Inc\Admin\AdminSettings; | |
| 7 | +use WPAdminify\Inc\Admin\AdminSettingsModel; | |
| 9 | 8 | |
| 10 | 9 | |
| 11 | 10 | |
| 12 | 11 | // no direct access allowed |
| @@ -23,13 +22,11 @@ | ||
| 23 | 22 | |
| 24 | 23 | public function __construct() |
| 25 | 24 | { |
| 26 | 25 | $this->options = (array) AdminSettings::get_instance()->get(); |
| 27 | - $global_dark_mode = !empty($this->options['light_dark_mode']['admin_ui_mode']) ? $this->options['light_dark_mode']['admin_ui_mode'] : 'light'; | |
| 28 | - $this->dark_mode = empty(get_user_meta(get_current_user_id(), 'color_mode', true)) ? $global_dark_mode : get_user_meta(get_current_user_id(), 'color_mode', true); | |
| 29 | - add_action('admin_enqueue_scripts', array($this, 'pxlbsadminify_admin_scripts'), 100); | |
| 30 | - add_action('wp_ajax_pxlbsadminify_addons_install_active', array( $this, 'pxlbsadminify_addons_install_active' ) ); | |
| 31 | - add_action('wp_ajax_pxlbsadminify_ssl_check', array( $this, 'pxlbsadminify_ssl_check' ) ); | |
| 26 | + $this->dark_mode = $this->options['light_dark_mode']['admin_ui_mode']; | |
| 27 | + add_action('admin_enqueue_scripts', array($this, 'jltwp_adminify_admin_scripts'), 100); | |
| 28 | + add_action('wp_ajax_jltwp_adminify_addons_install_active', 'jltwp_adminify_addons_install_active'); | |
| 32 | 29 | |
| 33 | 30 | if ($this->is_dark_mode() || $this->classic_editor || $this->block_editor) { |
| 34 | 31 | add_action('admin_head', array($this, 'header_scripts')); |
| 35 | 32 | } |
| @@ -38,9 +35,9 @@ | ||
| 38 | 35 | |
| 39 | 36 | /** |
| 40 | 37 | * Function: Ajax Call for Install and Activate WP Adminify Plugin |
| 41 | 38 | */ |
| 42 | - function pxlbsadminify_addons_install_active() | |
| 39 | + function jltwp_adminify_addons_install_active() | |
| 43 | 40 | { |
| 44 | 41 | |
| 45 | 42 | // Include necessary WordPress files |
| 46 | 43 | require_once ABSPATH . 'wp-admin/includes/plugin-install.php'; |
| @@ -51,9 +48,9 @@ | ||
| 51 | 48 | if (isset($_POST['plugin'])) { |
| 52 | 49 | |
| 53 | 50 | $nonce = isset($_POST['nonce']) ? sanitize_text_field(wp_unslash($_POST['nonce'])) : ''; |
| 54 | 51 | |
| 55 | - if (!wp_verify_nonce($nonce, 'pxlbsadminify_addons_nonce')) { | |
| 52 | + if (!wp_verify_nonce($nonce, 'jltwp_adminify_addons_nonce')) { | |
| 56 | 53 | wp_send_json_error(array('mess' => esc_html__('Nonce is invalid', 'adminify'))); |
| 57 | 54 | } |
| 58 | 55 | |
| 59 | 56 | if ((is_multisite() && is_network_admin()) || !current_user_can('install_plugins')) { |
| @@ -65,37 +62,14 @@ | ||
| 65 | 62 | if (empty($plugin)) { |
| 66 | 63 | wp_send_json_error(array('mess' => esc_html__('Invalid plugin', 'adminify'))); |
| 67 | 64 | } |
| 68 | 65 | |
| 69 | - // Validate the requested plugin against the trusted addons list | |
| 70 | - // and replace the user-supplied value with the canonical | |
| 71 | - // download URL from that list before passing it to the upgrader. | |
| 72 | - $addons = new Addons_Plugins(); | |
| 73 | - $plugins_list = (array) $addons->get_adminify_plugins_lists(); | |
| 74 | - $requested_slug = ''; | |
| 75 | - $trusted_source = ''; | |
| 76 | - foreach ( $plugins_list as $slug => $entry ) { | |
| 77 | - if ( ! empty( $entry['download_link'] ) && $entry['download_link'] === $plugin ) { | |
| 78 | - $requested_slug = $slug; | |
| 79 | - $trusted_source = $entry['download_link']; | |
| 80 | - break; | |
| 81 | - } | |
| 82 | - if ( $slug === $plugin ) { | |
| 83 | - $requested_slug = $slug; | |
| 84 | - $trusted_source = ! empty( $entry['download_link'] ) ? $entry['download_link'] : ''; | |
| 85 | - break; | |
| 86 | - } | |
| 87 | - } | |
| 88 | - if ( empty( $requested_slug ) || empty( $trusted_source ) ) { | |
| 89 | - wp_send_json_error( array( 'mess' => esc_html__( 'Invalid plugin', 'adminify' ) ) ); | |
| 90 | - } | |
| 91 | - | |
| 92 | 66 | $type = isset($_POST['type']) ? sanitize_text_field(wp_unslash($_POST['type'])) : 'install'; |
| 93 | 67 | $skin = new \WP_Ajax_Upgrader_Skin(); |
| 94 | 68 | $upgrader = new \Plugin_Upgrader($skin); |
| 95 | 69 | |
| 96 | 70 | if ('install' === $type) { |
| 97 | - $result = $upgrader->install( $trusted_source ); | |
| 71 | + $result = $upgrader->install($plugin); | |
| 98 | 72 | if (is_wp_error($result)) { |
| 99 | 73 | wp_send_json_error( |
| 100 | 74 | array( |
| 101 | 75 | 'mess' => $result->get_error_message(), |
| @@ -151,12 +125,8 @@ | ||
| 151 | 125 | } |
| 152 | 126 | |
| 153 | 127 | public function header_scripts() |
| 154 | 128 | { |
| 155 | - // Skip on excluded pages | |
| 156 | - if ( $this->should_skip_adminify_scripts() ) { | |
| 157 | - return; | |
| 158 | - } | |
| 159 | 129 | |
| 160 | 130 | if (!empty($this->dark_mode) && $this->dark_mode == 'dark') { ?> |
| 161 | 131 | |
| 162 | 132 | <script> |
| @@ -200,254 +170,146 @@ | ||
| 200 | 170 | } |
| 201 | 171 | |
| 202 | 172 | |
| 203 | 173 | |
| 204 | - /** | |
| 205 | - * Check if current page should skip Adminify scripts | |
| 206 | - * Handles root, subdirectory, subdomain, and multisite installations | |
| 207 | - * | |
| 208 | - * @return bool True if scripts should be skipped | |
| 209 | - */ | |
| 210 | - private function should_skip_adminify_scripts() { | |
| 211 | - global $pagenow; | |
| 174 | + // Google Fonts | |
| 175 | + function jltwp_adminify_google_fonts_url() | |
| 176 | + { | |
| 177 | + $font_url = ''; | |
| 178 | + $font_family = !empty($this->options['admin_general_google_font']['font-family']) ? ($this->options['admin_general_google_font']['font-family']) : 'Nunito Sans:300,400,600,700,800'; | |
| 212 | 179 | |
| 213 | - // Pages where Adminify scripts should not load | |
| 214 | - $excluded_pages = [ | |
| 215 | - 'customize.php', | |
| 216 | - 'wp-login.php', | |
| 217 | - 'wp-register.php', | |
| 218 | - ]; | |
| 219 | - | |
| 220 | - // Check global $pagenow | |
| 221 | - if ( in_array( $pagenow, $excluded_pages, true ) ) { | |
| 222 | - return true; | |
| 180 | + if ('off' !== _x('on', 'Google font: on or off', 'adminify')) { | |
| 181 | + $font_url = add_query_arg('family', urlencode($font_family), '//fonts.googleapis.com/css'); | |
| 223 | 182 | } |
| 224 | 183 | |
| 225 | - // Fallback: Check PHP_SELF for subdirectory WordPress installs | |
| 226 | - // Normalize path by extracting just the filename | |
| 227 | - $php_self = isset( $_SERVER['PHP_SELF'] ) ? sanitize_text_field( wp_unslash( $_SERVER['PHP_SELF'] ) ) : ''; | |
| 228 | - $current_file = basename( $php_self ); | |
| 229 | - | |
| 230 | - if ( in_array( $current_file, $excluded_pages, true ) ) { | |
| 231 | - return true; | |
| 232 | - } | |
| 233 | - | |
| 234 | - // Additional check using REQUEST_URI for edge cases | |
| 235 | - $request_uri = isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : ''; | |
| 236 | - foreach ( $excluded_pages as $page ) { | |
| 237 | - if ( strpos( $request_uri, '/' . $page ) !== false ) { | |
| 238 | - return true; | |
| 239 | - } | |
| 240 | - } | |
| 241 | - | |
| 242 | - return false; | |
| 184 | + return $font_url; | |
| 243 | 185 | } |
| 244 | 186 | |
| 245 | 187 | |
| 246 | - public function pxlbsadminify_admin_scripts() | |
| 188 | + public function jltwp_adminify_admin_scripts() | |
| 247 | 189 | { |
| 248 | - // Skip loading scripts on excluded pages (customize.php, login, etc.) | |
| 249 | - if ( $this->should_skip_adminify_scripts() ) { | |
| 250 | - return; | |
| 251 | - } | |
| 252 | - | |
| 253 | 190 | $screen = get_current_screen(); |
| 254 | 191 | |
| 255 | - | |
| 256 | 192 | // Register Styles |
| 257 | - wp_register_style('adminify-admin', PXLBSADMINIFY_ASSETS . 'css/wp-adminify' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 258 | - wp_register_style('adminify-default-ui', PXLBSADMINIFY_ASSETS . 'css/wp-adminify-default-ui' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 259 | - // wp_register_style('wp-adminify-admin-bar', PXLBSADMINIFY_ASSETS . 'css/admin-bar' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 260 | - wp_register_style('adminify-menu-editor', PXLBSADMINIFY_ASSETS . 'css/adminify-menu-editor' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 261 | - // wp_register_style('wp-adminify-dark-mode', PXLBSADMINIFY_ASSETS . 'css/dark-mode' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 262 | - // wp_register_style('wp-adminify-rtl', PXLBSADMINIFY_ASSETS . 'css/adminify-rtl' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 263 | - // wp_register_style('wp-adminify-responsive', PXLBSADMINIFY_ASSETS . 'css/adminify-responsive' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 264 | - // wp_register_style('wp-adminify-animate', PXLBSADMINIFY_ASSETS . 'vendors/animatecss/animate' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 265 | - wp_register_style('adminify-tokenize2', PXLBSADMINIFY_ASSETS . 'vendors/tokenize/tokenize2' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 266 | - wp_register_style('adminify-select2', PXLBSADMINIFY_ASSETS . 'vendors/select2/select2' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 193 | + wp_register_style('wp-adminify-admin', WP_ADMINIFY_ASSETS . 'css/wp-adminify' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 194 | + wp_register_style('wp-adminify-default-ui', WP_ADMINIFY_ASSETS . 'css/wp-adminify-default-ui' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 195 | + wp_register_style('wp-adminify-admin-bar', WP_ADMINIFY_ASSETS . 'css/admin-bar' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 196 | + wp_register_style('wp-adminify-menu-editor', WP_ADMINIFY_ASSETS . 'css/adminify-menu-editor' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 197 | + // wp_register_style('wp-adminify-dark-mode', WP_ADMINIFY_ASSETS . 'css/dark-mode' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 198 | + // wp_register_style('wp-adminify-rtl', WP_ADMINIFY_ASSETS . 'css/adminify-rtl' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 199 | + // wp_register_style('wp-adminify-responsive', WP_ADMINIFY_ASSETS . 'css/adminify-responsive' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 200 | + // wp_register_style('wp-adminify-animate', WP_ADMINIFY_ASSETS . 'vendors/animatecss/animate' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 201 | + wp_register_style('wp-adminify-tokenize2', WP_ADMINIFY_ASSETS . 'vendors/tokenize/tokenize2' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 267 | 202 | |
| 268 | 203 | |
| 269 | 204 | // Register Scripts |
| 270 | - wp_register_script('adminify-tokenize2', PXLBSADMINIFY_ASSETS . 'vendors/tokenize/tokenize2.min.js', array('jquery'), PXLBSADMINIFY_VER, false); | |
| 271 | - wp_register_script('adminify-select2', PXLBSADMINIFY_ASSETS . 'vendors/select2/select2.min.js', array('jquery'), PXLBSADMINIFY_VER, true); | |
| 272 | - wp_register_script('adminify-admin', PXLBSADMINIFY_ASSETS . 'admin/js/wp-adminify' . Utils::assets_ext('.js'), array('jquery'), PXLBSADMINIFY_VER, true); | |
| 205 | + wp_register_script('wp-adminify-tokenize2', WP_ADMINIFY_ASSETS . 'vendors/tokenize/tokenize2.min.js', array('jquery'), WP_ADMINIFY_VER, false); | |
| 206 | + wp_register_script('wp-adminify-admin', WP_ADMINIFY_ASSETS . 'admin/js/wp-adminify' . Utils::assets_ext('.js'), array('jquery'), WP_ADMINIFY_VER, true); | |
| 273 | 207 | |
| 274 | - // wp_register_script('wp-adminify-realtime-server', PXLBSADMINIFY_ASSETS . 'js/adminify-realtime-server.js', array('jquery'), PXLBSADMINIFY_VER, true); | |
| 208 | + // wp_register_script('wp-adminify-realtime-server', WP_ADMINIFY_ASSETS . 'js/adminify-realtime-server.js', array('jquery'), WP_ADMINIFY_VER, true); | |
| 275 | 209 | |
| 276 | 210 | // Adminify Icon Picker |
| 277 | - wp_register_style('adminify-simple-line-icons', PXLBSADMINIFY_ASSETS . 'vendors/font-icons/simple-line-icons/css/simple-line-icons' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 278 | - wp_register_style('adminify-icon-picker', PXLBSADMINIFY_ASSETS . 'vendors/adminify-icon-picker/css/style' . Utils::assets_ext('.css'), false, PXLBSADMINIFY_VER); | |
| 279 | - wp_register_script('adminify-icon-picker', PXLBSADMINIFY_ASSETS . 'vendors/adminify-icon-picker/js/adminify-icon-picker' . Utils::assets_ext('.js'), array('jquery'), PXLBSADMINIFY_VER, true); | |
| 211 | + wp_register_style('wp-adminify-simple-line-icons', WP_ADMINIFY_ASSETS . 'vendors/font-icons/simple-line-icons/css/simple-line-icons' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 212 | + wp_register_style('wp-adminify-icon-picker', WP_ADMINIFY_ASSETS . 'vendors/adminify-icon-picker/css/style' . Utils::assets_ext('.css'), false, WP_ADMINIFY_VER); | |
| 213 | + wp_register_script('wp-adminify-icon-picker', WP_ADMINIFY_ASSETS . 'vendors/adminify-icon-picker/js/adminify-icon-picker' . Utils::assets_ext('.js'), array('jquery'), WP_ADMINIFY_VER, true); | |
| 280 | 214 | |
| 281 | 215 | // Dark Mode |
| 282 | - wp_register_script('adminify--dark-mode', PXLBSADMINIFY_ASSETS . 'admin/js/wp-adminify-dark-mode' . Utils::assets_ext('.js'), array(), PXLBSADMINIFY_VER, false); | |
| 216 | + wp_register_script('wp-adminify--dark-mode', WP_ADMINIFY_ASSETS . 'admin/js/wp-adminify-dark-mode' . Utils::assets_ext('.js'), array(), WP_ADMINIFY_VER, false); | |
| 283 | 217 | |
| 284 | 218 | // Menu Editor |
| 285 | - wp_register_script('adminify-menu-editor', PXLBSADMINIFY_ASSETS . 'admin/js/wp-adminify-menu-editor' . Utils::assets_ext('.js'), array('jquery', 'jquery-ui-sortable', 'adminify-icon-picker'), PXLBSADMINIFY_VER, true); | |
| 219 | + wp_register_script('wp-adminify-menu-editor', WP_ADMINIFY_ASSETS . 'admin/js/wp-adminify-menu-editor' . Utils::assets_ext('.js'), array('jquery', 'jquery-ui-sortable', 'wp-adminify-icon-picker'), WP_ADMINIFY_VER, true); | |
| 286 | 220 | |
| 287 | 221 | // Styles Enqueue |
| 222 | + if ( !empty($this->options['admin_general_google_font']['font-family'])) { | |
| 223 | + wp_enqueue_style('wp-adminify-google-fonts', $this->jltwp_adminify_google_fonts_url()); | |
| 224 | + } | |
| 225 | + | |
| 288 | 226 | if (!empty($this->options['admin_ui'])) { |
| 289 | 227 | // wp_enqueue_style('wp-adminify-animate'); |
| 290 | - wp_enqueue_style('adminify-admin'); | |
| 228 | + wp_enqueue_style('wp-adminify-admin'); | |
| 291 | 229 | // Commented on: 9-6-24 |
| 292 | 230 | // wp_enqueue_style('wp-adminify-admin-bar'); |
| 293 | 231 | // wp_enqueue_style('wp-adminify-responsive'); |
| 294 | 232 | } else { |
| 295 | - wp_enqueue_style('adminify-default-ui'); | |
| 233 | + wp_enqueue_style('wp-adminify-default-ui'); | |
| 296 | 234 | } |
| 297 | 235 | |
| 298 | 236 | |
| 299 | 237 | // RTL CSS |
| 300 | 238 | if ( is_rtl() ) { |
| 301 | - wp_enqueue_style( 'adminify-rtl', PXLBSADMINIFY_URL . 'Libs/adminify-framework/assets/css/style-rtl'. Utils::assets_ext('.css'), array(), PXLBSADMINIFY_VER, 'all' ); | |
| 239 | + wp_enqueue_style( 'adminify-rtl', WP_ADMINIFY_URL . 'Libs/adminify-framework/assets/css/style-rtl'. Utils::assets_ext('.css'), array(), WP_ADMINIFY_VER, 'all' ); | |
| 302 | 240 | } |
| 241 | + | |
| 303 | 242 | |
| 304 | - | |
| 305 | 243 | // Dark Mode Style |
| 306 | - // wp_enqueue_style('adminify-dark-mode'); | |
| 307 | - wp_enqueue_script('adminify--dark-mode'); | |
| 244 | + // wp_enqueue_style('wp-adminify-dark-mode'); | |
| 245 | + wp_enqueue_script('wp-adminify--dark-mode'); | |
| 308 | 246 | |
| 309 | 247 | |
| 310 | - // Get local fonts data for frontend - download if not exists | |
| 311 | - $local_fonts = GoogleFontsLocal::get_instance(); | |
| 312 | - $local_fonts_urls = []; | |
| 313 | - | |
| 314 | - // Process light mode logo font | |
| 315 | - if (!empty($this->options['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo_text_typo']['font-family'])) { | |
| 316 | - $font_family = $this->options['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo_text_typo']['font-family']; | |
| 317 | - $font_weight = !empty($this->options['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo_text_typo']['font-weight']) ? $this->options['light_dark_mode']['admin_ui_light_mode']['admin_ui_light_logo_text_typo']['font-weight'] : '400'; | |
| 318 | - | |
| 319 | - if (!$local_fonts->is_font_local($font_family)) { | |
| 320 | - $local_fonts->download_font($font_family, $font_weight); | |
| 321 | - } | |
| 322 | - | |
| 323 | - $local_url = $local_fonts->get_local_font_url($font_family); | |
| 324 | - if ($local_url) { | |
| 325 | - $local_fonts_urls['light_logo'] = $local_url; | |
| 326 | - } | |
| 327 | - } | |
| 328 | - | |
| 329 | - // Process dark mode logo font | |
| 330 | - if (!empty($this->options['light_dark_mode']['admin_ui_dark_mode']['admin_ui_dark_logo_text_typo']['font-family'])) { | |
| 331 | - $font_family = $this->options['light_dark_mode']['admin_ui_dark_mode']['admin_ui_dark_logo_text_typo']['font-family']; | |
| 332 | - $font_weight = !empty($this->options['light_dark_mode']['admin_ui_dark_mode']['admin_ui_dark_logo_text_typo']['font-weight']) ? $this->options['light_dark_mode']['admin_ui_dark_mode']['admin_ui_dark_logo_text_typo']['font-weight'] : '400'; | |
| 333 | - | |
| 334 | - if (!$local_fonts->is_font_local($font_family)) { | |
| 335 | - $local_fonts->download_font($font_family, $font_weight); | |
| 336 | - } | |
| 337 | - | |
| 338 | - $local_url = $local_fonts->get_local_font_url($font_family); | |
| 339 | - if ($local_url) { | |
| 340 | - $local_fonts_urls['dark_logo'] = $local_url; | |
| 341 | - } | |
| 342 | - } | |
| 343 | - | |
| 344 | - $local_fonts_data = [ | |
| 345 | - 'base_url' => $local_fonts->get_folder_url(), | |
| 346 | - 'urls' => $local_fonts_urls, | |
| 347 | - ]; | |
| 348 | - | |
| 349 | 248 | $localize_array_data = [ |
| 350 | 249 | 'admin_ajax' => admin_url('admin-ajax.php'), |
| 351 | 250 | 'settings' => [ |
| 352 | - 'adminify_ui' => !empty($this->options['admin_ui']) ? true : false, | |
| 251 | + 'adminify_ui' => !empty($this->options['admin_ui']) ? true : false | |
| 353 | 252 | ], |
| 354 | - 'admin_nonce' => wp_create_nonce('pxlbsadminify_frame_nonce'), | |
| 355 | - 'is_pro' => (class_exists('\\PXLBSAdminify\\Pro\\Adminify_Pro') && !empty(\PXLBSAdminify\Pro\Adminify_Pro::is_premium())) ? true : false, | |
| 356 | - 'local_fonts' => $local_fonts_data | |
| 253 | + 'admin_nonce' => wp_create_nonce('adminify_nonce'), | |
| 254 | + 'is_pro' => (class_exists('\\WPAdminify\\Pro\\Adminify_Pro') && !empty(\WPAdminify\Pro\Adminify_Pro::is_premium())) ? true : false | |
| 357 | 255 | ]; |
| 358 | 256 | |
| 359 | - // Pro-only settings flags (e.g. menu_search) attach via this | |
| 360 | - // filter from Pro/Classes/Assets_Pro.php. Free leaves the | |
| 361 | - // localize array untouched. | |
| 362 | - $localize_array_data = (array) apply_filters( 'pxlbsadminify_admin_localize_data', $localize_array_data, $this->options ); | |
| 363 | - | |
| 364 | 257 | // Scripts Enqueue |
| 365 | - wp_enqueue_script('adminify-admin'); | |
| 366 | - wp_localize_script( 'adminify-admin', 'PXLBSADMINIFY_ADMIN', $localize_array_data ); | |
| 258 | + wp_enqueue_script('wp-adminify-admin'); | |
| 259 | + wp_localize_script( 'wp-adminify-admin', 'WP_ADMINIFY_ADMIN', $localize_array_data ); | |
| 367 | 260 | |
| 368 | 261 | if (!wp_script_is('adminify-fa', 'enqueued') || !wp_script_is('adminify-fa5', 'enqueued')) { |
| 369 | 262 | if (apply_filters('adminify_fa4', false)) { |
| 370 | - wp_enqueue_style('adminify-fa', PXLBSADMINIFY_ASSETS . 'vendors/fontawesome/fa4/css/font-awesome.min.css', array(), '4.7.0', 'all'); | |
| 263 | + wp_enqueue_style('adminify-fa', 'https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome' . Utils::assets_ext('.css'), array(), '4.7.0', 'all'); | |
| 371 | 264 | } else { |
| 372 | - wp_enqueue_style('adminify-fa5', PXLBSADMINIFY_ASSETS . 'vendors/fontawesome/fa5/css/all.min.css', array(), '5.15.4', 'all'); | |
| 373 | - wp_enqueue_style('adminify-fa5-v4-shims', PXLBSADMINIFY_ASSETS . 'vendors/fontawesome/fa5/css/v4-shims.min.css', array(), '5.15.4', 'all'); | |
| 265 | + wp_enqueue_style('adminify-fa5', 'https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/all' . Utils::assets_ext('.css'), array(), '5.15.5', 'all'); | |
| 266 | + wp_enqueue_style('adminify-fa5-v4-shims', 'https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.15.4/css/v4-shims' . Utils::assets_ext('.css'), array(), '5.15.5', 'all'); | |
| 374 | 267 | } |
| 375 | 268 | } |
| 376 | - wp_enqueue_style('adminify-simple-line-icons'); | |
| 377 | 269 | |
| 378 | - // Adminify UI HTTPS gate — only on the main settings screen where the switcher lives. | |
| 379 | - if (isset($screen->id) && false !== strpos($screen->id, 'wp-adminify-settings')) { | |
| 380 | - wp_enqueue_script('adminify-ui-ssl-check', PXLBSADMINIFY_ASSETS . 'admin/js/adminify-ui-ssl-check.js', array('jquery'), PXLBSADMINIFY_VER, true); | |
| 381 | - wp_localize_script( | |
| 382 | - 'adminify-ui-ssl-check', | |
| 383 | - 'PXLBSADMINIFY_SSL', | |
| 384 | - array( | |
| 385 | - 'ajax_url' => admin_url('admin-ajax.php'), | |
| 386 | - 'nonce' => wp_create_nonce('pxlbsadminify_frame_nonce'), | |
| 387 | - 'field_id' => 'admin_ui', | |
| 388 | - 'i18n' => array( | |
| 389 | - 'label' => esc_html__('Adminify UI needs HTTPS:', 'adminify'), | |
| 390 | - 'generic_error' => esc_html__('Could not verify HTTPS right now. Please try again.', 'adminify'), | |
| 391 | - ), | |
| 392 | - ) | |
| 393 | - ); | |
| 270 | + // Load Scripts/Styles only WP Adminify Admin Page | |
| 271 | + if ($screen->id === 'toplevel_page_wp-adminify-settings') { | |
| 272 | + // Admin Notice Dismiss | |
| 273 | + // $this->jltwp_adminify_admin_script(); | |
| 274 | + | |
| 275 | + global $menu, $submenu; | |
| 276 | + $set_menu = new \WPAdminify\Inc\Modules\MenuEditor\MenuEditor(); | |
| 277 | + $main_menus = $set_menu->sort_menu_settings($menu); | |
| 278 | + $sub_menus = $set_menu->sort_sub_menu_settings( $main_menus, $submenu ); | |
| 279 | + | |
| 280 | + // Menu Editor | |
| 281 | + wp_enqueue_script('wp-adminify-menu-editor-script'); | |
| 282 | + wp_localize_script( | |
| 283 | + 'wp-adminify-menu-editor-script', | |
| 284 | + 'WPAdminifyIconPicker', | |
| 285 | + [ | |
| 286 | + 'main_menu' => $main_menus, | |
| 287 | + 'sub_menu' => $sub_menus, | |
| 288 | + // 'is_elementor_active' => Utils::is_plugin_active('elementor/elementor.php'), | |
| 289 | + ] | |
| 290 | + ); | |
| 291 | + | |
| 394 | 292 | } |
| 395 | 293 | |
| 396 | - if ($screen->id === 'adminify_page_wp-adminify-addons-plugins' || $screen->id === 'adminify-pro_page_wp-adminify-addons-plugins') { | |
| 294 | + | |
| 295 | + if ($screen->id === 'wp-adminify_page_wp-adminify-addons-plugins') { | |
| 397 | 296 | // JS Files . |
| 398 | - wp_enqueue_script('adminify-addons', PXLBSADMINIFY_ASSETS . 'admin/js/wp-adminify-addons' . Utils::assets_ext('.js'), array('jquery'), PXLBSADMINIFY_VER, true); | |
| 297 | + wp_enqueue_script('wp-adminify-addons', WP_ADMINIFY_ASSETS . 'admin/js/wp-adminify-addons' . Utils::assets_ext('.js'), array('jquery'), WP_ADMINIFY_VER, true); | |
| 399 | 298 | wp_localize_script( |
| 400 | - 'adminify-addons', | |
| 401 | - 'PXLBSADMINIFY_CORE', | |
| 299 | + 'wp-adminify-addons', | |
| 300 | + 'WP_ADMINIFYCORE', | |
| 402 | 301 | array( |
| 403 | 302 | 'admin_ajax' => admin_url('admin-ajax.php'), |
| 404 | - 'addons_nonce' => wp_create_nonce('pxlbsadminify_addons_nonce'), | |
| 405 | - 'plugin_key' => 'pxlbsadminify' | |
| 303 | + 'addons_nonce' => wp_create_nonce('jltwp_adminify_addons_nonce'), | |
| 304 | + 'plugin_key' => 'jltwp_adminify' | |
| 406 | 305 | ) |
| 407 | 306 | ); |
| 408 | 307 | } |
| 409 | 308 | } |
| 410 | 309 | |
| 411 | - /** | |
| 412 | - * AJAX: verify the site is HTTPS-ready before enabling the Adminify UI. | |
| 413 | - * | |
| 414 | - * Called from assets/admin/js/adminify-ui-ssl-check.js when the user flips | |
| 415 | - * the "Adminify UI" switcher on. Returns success only when the dashboard | |
| 416 | - * frame would actually load (see Utils::adminify_ui_https_status()). | |
| 417 | - */ | |
| 418 | - public function pxlbsadminify_ssl_check() | |
| 419 | - { | |
| 420 | - $nonce = isset($_POST['nonce']) ? sanitize_text_field(wp_unslash($_POST['nonce'])) : ''; | |
| 421 | - | |
| 422 | - if (!wp_verify_nonce($nonce, 'pxlbsadminify_frame_nonce')) { | |
| 423 | - wp_send_json_error(array( | |
| 424 | - 'https_ready' => false, | |
| 425 | - 'message' => esc_html__('Security check failed. Please reload the page and try again.', 'adminify'), | |
| 426 | - )); | |
| 427 | - } | |
| 428 | - | |
| 429 | - if (!current_user_can('manage_options')) { | |
| 430 | - wp_send_json_error(array( | |
| 431 | - 'https_ready' => false, | |
| 432 | - 'message' => esc_html__('You do not have permission to change this setting.', 'adminify'), | |
| 433 | - )); | |
| 434 | - } | |
| 435 | - | |
| 436 | - $status = Utils::adminify_ui_https_status(); | |
| 437 | - | |
| 438 | - if (!empty($status['ready'])) { | |
| 439 | - wp_send_json_success(array('https_ready' => true)); | |
| 440 | - } | |
| 441 | - | |
| 442 | - wp_send_json_error(array( | |
| 443 | - 'https_ready' => false, | |
| 444 | - 'message' => $status['message'], | |
| 445 | - )); | |
| 446 | - } | |
| 447 | - | |
| 448 | 310 | // WP Adminify Options Page Style |
| 449 | - public function pxlbsadminify_admin_script() | |
| 311 | + public function jltwp_adminify_admin_script() | |
| 450 | 312 | { |
| 451 | 313 | echo '<style>.wp-adminify-two-columns{ display: flex; flex-wrap: wrap; padding: 15px; } .wp-adminify .adminify-hightlight-field{ border: 2px solid #0347FF !important; font-weight: 600 !important;} .wp-adminify-two-columns .adminify-full-width-field{ width: 100% !important; flex-basis: 100% !important; } .wp-adminify-two-columns > .adminify-field{ width: 49%; flex-basis: 49%; margin-right: 1%; margin-top: -1px; border: 1px solid #eee; box-sizing: border-box; } .wp-adminify-two-columns.aminify-title-width-40 .adminify-title, .aminify-title-width-40 .adminify-title{ width: 40% !important;} .wp-adminify-two-columns.aminify-title-width-40 .adminify-fieldset, .aminify-title-width-40 .adminify-fieldset{ width: calc(60% - 20px) !important;} .wp-adminify-two-columns.aminify-title-width-65 .adminify-title{ width: 65%;} .wp-adminify-two-columns.aminify-title-width-65 .adminify-fieldset{ width: calc(35% - 20px);} .wp-adminify-two-columns .adminify-field-subheading{height:25px;box-sizing: content-box; width: 100%; flex-basis: 100%;} .wp-adminify-white-label-notice-content { background-color: #fff; box-shadow: 0px 0px 50px rgb(0 0 0 / 13%); position: absolute; top: 150px; left: 400px; width: 530px; padding: 32px; padding-bottom: 50px; -webkit-border-radius: 20px; border-radius: 20px; text-align: center; z-index: 2; } .wp-adminify-white-label-notice-logo img { height: 100px; width: 250px; padding: 10px; padding-top: 10px; } .wp-adminify-white-label-notice-content h2 span{ color: #6814cd; text-transform: uppercase; } .wp-adminify-white-label-notice-content em{ font-size: 13px; color: red; } .wp-adminify-white-label-notice .wp-adminify-get-pro{ background-image: -moz-linear-gradient( 0deg, rgb(223,29,198) 0%, rgb(106,20,209) 100%); background-image: -webkit-linear-gradient( 0deg , rgb(223,29,198) 0%, rgb(106,20,209) 100%); background-image: -ms-linear-gradient( 0deg, rgb(223,29,198) 0%, rgb(106,20,209) 100%); border: none; box-shadow: none; color: #fff; cursor: pointer; font-weight: 700; line-height: 35px; padding: 0 15px; text-transform: uppercase; text-decoration: none; display: inline-block; width: 180px; padding: 5px 15px !important; border-radius: 10px; font-size: 15px; font-weight: 800; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } .wp-adminify-white-label-notice{ position: absolute !important; top: 0; left: 0; width: 100% !important; height: 100%; background: rgba(200, 200, 200, 0.5); -js-display: flex; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display: flex; -webkit-box-pack: center; -webkit-justify-content: center; -moz-box-pack: center; -ms-flex-pack: center; justify-content: center;z-index: 1; } .wp-adminify-white-label-notice .wp-adminify-get-pro:hover { color:#fff; background-image: -moz-linear-gradient(0deg, rgb(106, 20, 209) 0%, rgb(223, 29, 198) 100%); background-image: -webkit-linear-gradient( 0deg, rgb(106, 20, 209) 0%, rgb(223, 29, 198) 100%); background-image: -ms-linear-gradient(0deg, rgb(106, 20, 209) 0%, rgb(223, 29, 198) 100%);} .adminify-field-callback a.wp-adminify-rollback-button{font-family:inherit !important;} .wp-adminify-rollback-button.dashicons, .wp-adminify-rollback-button.dashicons-before:before{ width: inherit !important;}</style>'; |
| 452 | 314 | } |
| 453 | 315 | |
