| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -namespace PXLBSAdminify\Inc\Admin\Frames; | |
| 3 | +namespace WPAdminify\Inc\Admin\Frames; | |
| 4 | 4 | |
| 5 | -use PXLBSAdminify\Inc\Utils; | |
| 6 | -use PXLBSAdminify\Inc\Modules\MenuEditor\MenuEditorOptions; | |
| 7 | -use PXLBSAdminify\Inc\Admin\AdminSettings; | |
| 5 | +use WPAdminify\Inc\Utils; | |
| 6 | +use WPAdminify\Inc\Modules\MenuEditor\MenuEditorOptions; | |
| 7 | +use WPAdminify\Inc\Admin\AdminSettings; | |
| 8 | 8 | |
| 9 | 9 | // no direct access allowed |
| 10 | 10 | if (!defined('ABSPATH')) { |
| 11 | 11 | exit; |
| @@ -65,18 +65,18 @@ | ||
| 65 | 65 | * @return void |
| 66 | 66 | */ |
| 67 | 67 | public function load_scripts() |
| 68 | 68 | { |
| 69 | - wp_enqueue_style('frame-adminify--admin', PXLBSADMINIFY_ASSETS . 'admin/css/admin' . Utils::assets_ext('.css'), [], PXLBSADMINIFY_VER); | |
| 70 | - wp_enqueue_script('frame-adminify--admin', PXLBSADMINIFY_ASSETS . 'admin/js/frame' . Utils::assets_ext('.js'), ['jquery', 'react'], PXLBSADMINIFY_VER, true); | |
| 69 | + wp_enqueue_style('frame-adminify--admin', WP_ADMINIFY_ASSETS . 'admin/css/admin' . Utils::assets_ext('.css'), [], WP_ADMINIFY_VER); | |
| 70 | + wp_enqueue_script('frame-adminify--admin', WP_ADMINIFY_ASSETS . 'admin/js/frame' . Utils::assets_ext('.js'), ['jquery', 'react'], WP_ADMINIFY_VER, true); | |
| 71 | 71 | |
| 72 | 72 | $localize_array_data = [ |
| 73 | 73 | 'ajax_url' => admin_url('admin-ajax.php'), |
| 74 | - 'security_nonce' => wp_create_nonce('pxlbsadminify_frame_nonce') | |
| 74 | + 'security_nonce' => wp_create_nonce('adminify_nonce') | |
| 75 | 75 | ]; |
| 76 | 76 | |
| 77 | - wp_localize_script( 'frame-adminify--admin', 'PXLBSADMINIFY_FRAME', $localize_array_data ); | |
| 78 | - wp_localize_script( 'frame-adminify--admin', 'PXLBSADMINIFY_FRAME_NOT_ALLOWED_URLS', self::get_not_allowed_urls() ); | |
| 77 | + wp_localize_script( 'frame-adminify--admin', 'WPAdminify', $localize_array_data ); | |
| 78 | + wp_localize_script( 'frame-adminify--admin', 'WPAdminifyFrameNotAllowedURLs', self::get_not_allowed_urls() ); | |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | public static function get_not_allowed_urls() { |
| 82 | 82 | |
| @@ -150,12 +150,8 @@ | ||
| 150 | 150 | [ |
| 151 | 151 | 'url' => '*', |
| 152 | 152 | 'query_params' => ['page' => 'suretriggers'] |
| 153 | 153 | ], |
| 154 | - [ | |
| 155 | - 'url' => '*', | |
| 156 | - 'query_params' => ['tab' => 'plugin-information', 'TB_iframe' => 'true'] | |
| 157 | - ], | |
| 158 | 154 | // [ |
| 159 | 155 | // 'url' => '/wp-admin/post-new.php', |
| 160 | 156 | // 'post_type' => ['post', 'page'] |
| 161 | 157 | // ], |
| @@ -164,9 +160,9 @@ | ||
| 164 | 160 | // 'post_type' => ['post', 'page'] |
| 165 | 161 | // ] |
| 166 | 162 | ]; |
| 167 | 163 | |
| 168 | - return apply_filters( 'pxlbsadminify_frame_not_allowed_urls', $not_allowed_urls ); | |
| 164 | + return apply_filters( 'adminify_frame_not_allowed_urls', $not_allowed_urls ); | |
| 169 | 165 | } |
| 170 | 166 | |
| 171 | 167 | /** |
| 172 | 168 | * Adds the 'frame-adminify-app="true"' attribute to the given attribute string. |
| @@ -187,15 +183,9 @@ | ||
| 187 | 183 | * @return void |
| 188 | 184 | */ |
| 189 | 185 | public function load_template() |
| 190 | 186 | { |
| 191 | - // async-upload.php & friends fire admin_init but answer with a raw payload, | |
| 192 | - // so the frame markup would be read as part of the response. | |
| 193 | - if ( ! Utils::is_admin_page_request() ) { | |
| 194 | - return; | |
| 195 | - } | |
| 196 | - | |
| 197 | - Utils::load_template('Templates.php'); | |
| 187 | + adminify_load_template('Templates.php'); | |
| 198 | 188 | } |
| 199 | 189 | |
| 200 | 190 | public function capture_wp_menu($parent_file) |
| 201 | 191 | { |
| @@ -200,9 +190,9 @@ | ||
| 200 | 190 | public function capture_wp_menu($parent_file) |
| 201 | 191 | { |
| 202 | 192 | global $menu, $submenu; |
| 203 | 193 | |
| 204 | - $menu_build = pxlbsadminify_build_menu($menu, $submenu, $this->menu_settings); | |
| 194 | + $menu_build = jltwp_adminify_build_menu($menu, $submenu, $this->menu_settings); | |
| 205 | 195 | |
| 206 | 196 | $this->enqueue_menu($menu_build); |
| 207 | 197 | |
| 208 | 198 | return $parent_file; |
| @@ -218,9 +208,9 @@ | ||
| 218 | 208 | $default_light_dark_mode = [ |
| 219 | 209 | 'admin_ui_mode' => 'light', |
| 220 | 210 | 'admin_ui_logo_type' => 'image_logo', |
| 221 | 211 | 'admin_ui_light_mode' => [ |
| 222 | - 'admin_ui_light_logo_text' => 'Adminify', | |
| 212 | + 'admin_ui_light_logo_text' => 'WP Adminify', | |
| 223 | 213 | 'admin_ui_light_logo_text_typo' => array_fill_keys( |
| 224 | 214 | ['font-family', 'font-weight', 'font-style', 'font-size', 'letter-spacing', 'color', 'type', 'unit'], '' |
| 225 | 215 | ) + ['unit' => 'px'], |
| 226 | 216 | 'admin_ui_light_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''), |
| @@ -227,9 +217,9 @@ | ||
| 227 | 217 | 'light_logo_size' => ['width' => 120, 'height' => 32, 'unit' => 'px'], |
| 228 | 218 | 'mini_admin_ui_light_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''), |
| 229 | 219 | ], |
| 230 | 220 | 'admin_ui_dark_mode' => [ |
| 231 | - 'admin_ui_dark_logo_text' => 'Adminify', | |
| 221 | + 'admin_ui_dark_logo_text' => 'WP Adminify', | |
| 232 | 222 | 'admin_ui_dark_logo_text_typo' => array_fill_keys( |
| 233 | 223 | ['font-family', 'font-weight', 'font-style', 'font-size', 'letter-spacing', 'color', 'type', 'unit'], '' |
| 234 | 224 | ) + ['unit' => 'px'], |
| 235 | 225 | 'admin_ui_dark_logo' => array_fill_keys(['url', 'id', 'width', 'height', 'thumbnail', 'alt', 'title', 'description'], ''), |
| @@ -253,13 +243,13 @@ | ||
| 253 | 243 | 'profile_url' => esc_url(admin_url('profile.php')), |
| 254 | 244 | 'username' => esc_html($current_user->user_login), |
| 255 | 245 | 'email' => wp_kses_post(is_email($current_user->user_email)), |
| 256 | 246 | ], |
| 257 | - 'image_path' => PXLBSADMINIFY_ASSETS_IMAGE, | |
| 258 | - 'is_pro' => (class_exists('\\PXLBSAdminify\\Pro\\Adminify_Pro') && !empty(\PXLBSAdminify\Pro\Adminify_Pro::is_premium())) ? true : false | |
| 247 | + 'image_path' => WP_ADMINIFY_ASSETS_IMAGE, | |
| 248 | + 'is_pro' => (class_exists('\\WPAdminify\\Pro\\Adminify_Pro') && !empty(\WPAdminify\Pro\Adminify_Pro::is_premium())) ? true : false | |
| 259 | 249 | ]; |
| 260 | 250 | |
| 261 | - $data = "var frame_adminify_menu=" . wp_json_encode($menu_settings); | |
| 251 | + $data = "var frame_adminify_menu=" . json_encode($menu_settings); | |
| 262 | 252 | wp_print_inline_script_tag($data, ["id" => "frame_adminify_menu"]); |
| 263 | 253 | }; |
| 264 | 254 | |
| 265 | 255 | add_action("admin_footer", $outputter, 0); |
| @@ -275,16 +265,12 @@ | ||
| 275 | 265 | |
| 276 | 266 | $admin_bar_menu_data = []; |
| 277 | 267 | |
| 278 | 268 | // Admin Bar Exits |
| 279 | - if ( Utils::is_plugin_active('admin-bar/admin-bar.php') ) { | |
| 269 | + if ( Utils::is_plugin_active('admin-bar/admin-bar.php') || Utils::is_plugin_active('admin-bar-pro/admin-bar-pro.php') ) { | |
| 280 | 270 | $admin_bar_items = get_option('_jltadminbar_settings'); |
| 271 | + if( empty($admin_bar_items) ) return; | |
| 281 | 272 | |
| 282 | - // Only build the customized admin bar when settings exist. | |
| 283 | - // Otherwise fall through so the default admin bar data is still | |
| 284 | - // printed and `adminify_admin_bar_data` is always defined. | |
| 285 | - if ( !empty($admin_bar_items) ) { | |
| 286 | - | |
| 287 | 273 | $existing_admin_bar = !empty($admin_bar_items['existing_admin_bar']) ? $admin_bar_items['existing_admin_bar'] : ''; |
| 288 | 274 | $saved_admin_bar = !empty($admin_bar_items['saved_admin_bar']) ? $admin_bar_items['saved_admin_bar'] : []; |
| 289 | 275 | |
| 290 | 276 | $parsed_admin_bar_backend = empty($saved_admin_bar) ? $existing_admin_bar : $this->parse_menu_items($saved_admin_bar, $existing_admin_bar, 'backend'); |
| @@ -301,14 +287,12 @@ | ||
| 301 | 287 | $admin_bar_menu_data = $this->nodes_to_array_for_admin_bar($remove_admin_menu); |
| 302 | 288 | foreach($admin_bar_menu_data as $key => $value){ |
| 303 | 289 | if( array_key_exists($value['id'],$admin_bar_data_nested)){ |
| 304 | 290 | $value['href'] = $admin_bar_data_nested[$value['id']]['href']; |
| 305 | - $value = $this->return_original_admin_bar_item_url($value, $admin_bar_data_nested[$value['id']]); | |
| 306 | 291 | } |
| 292 | + $value = $this->return_original_admin_bar_item_url($value, $admin_bar_data_nested[$value['id']]); | |
| 307 | 293 | $admin_bar_menu_data[$key] = $value; |
| 308 | 294 | } |
| 309 | - | |
| 310 | - } // end if ( !empty($admin_bar_items) ) | |
| 311 | 295 | } |
| 312 | 296 | |
| 313 | 297 | unset($admin_bar_data_nested['wp-logo']); |
| 314 | 298 | unset($admin_bar_data_nested['site-name']); |
| @@ -315,22 +299,9 @@ | ||
| 315 | 299 | unset($admin_bar_data_nested['updates']); |
| 316 | 300 | unset($admin_bar_data_nested['menu-toggle']); |
| 317 | 301 | unset($admin_bar_data_nested['comments']); |
| 318 | 302 | |
| 319 | - $admin_bar_data_nested = pxlbsadminify_replaceAmpersandInHref($admin_bar_data_nested); | |
| 320 | - | |
| 321 | - // WP Adminify Pricing/Upgrade - open in new tab | |
| 322 | - if (isset($admin_bar_data_nested['wp-adminify-settings']['submenu'])) { | |
| 323 | - foreach ($admin_bar_data_nested['wp-adminify-settings']['submenu'] as $key => &$bar_item) { | |
| 324 | - if (isset($bar_item['href']) && strpos($bar_item['href'], 'wp-adminify-settings-pricing') !== false) { | |
| 325 | - $bar_item['href'] = 'https://wpadminify.com/pricing'; | |
| 326 | - $bar_item['meta']['target'] = '_blank'; | |
| 327 | - break; | |
| 328 | - } | |
| 329 | - } | |
| 330 | - unset($bar_item); | |
| 331 | - } | |
| 332 | - | |
| 303 | + $admin_bar_data_nested = jlt_adminify_replaceAmpersandInHref($admin_bar_data_nested); | |
| 333 | 304 | $outputter = function () use ($admin_bar_data_nested, $admin_bar_menu_data) { |
| 334 | 305 | $extra_data = [ |
| 335 | 306 | 'data' => !empty($admin_bar_menu_data) ? $admin_bar_menu_data : array_values($admin_bar_data_nested), |
| 336 | 307 | 'logout_url' => wp_logout_url(home_url('/')), |
| @@ -340,9 +311,9 @@ | ||
| 340 | 311 | 'search' => $this->options['admin_bar_search'], |
| 341 | 312 | 'notification' => $this->options['admin_bar_notif'], |
| 342 | 313 | 'light_dark_switcher' => $this->options['admin_bar_dark_light_btn'], |
| 343 | 314 | ]; |
| 344 | - $data = "var adminify_admin_bar_data=" . wp_json_encode($extra_data); | |
| 315 | + $data = "var adminify_admin_bar_data=" . json_encode($extra_data); | |
| 345 | 316 | wp_print_inline_script_tag($data, ["id" => "adminify_admin_bar_data"]); |
| 346 | 317 | }; |
| 347 | 318 | |
| 348 | 319 | add_action("admin_footer", $outputter, 0); |
| @@ -352,13 +323,10 @@ | ||
| 352 | 323 | |
| 353 | 324 | public function return_original_admin_bar_item_url( $value ,$admin_bar_data_nested ){ |
| 354 | 325 | if( array_key_exists('submenu',$value) ){ |
| 355 | 326 | foreach($value['submenu'] as $submenuKey => $submenuItem){ |
| 356 | - $submenuId = $submenuItem['id'] ?? null; | |
| 357 | - if( $submenuId && isset($admin_bar_data_nested['submenu'][$submenuId]) ){ | |
| 358 | - $submenuItem = $this->return_original_admin_bar_item_url($submenuItem, $admin_bar_data_nested['submenu'][$submenuId]); | |
| 359 | - $submenuItem['href'] = $admin_bar_data_nested['submenu'][$submenuId]['href'] ?? $submenuItem['href']; | |
| 360 | - } | |
| 327 | + $submenuItem = $this->return_original_admin_bar_item_url($submenuItem, $admin_bar_data_nested['submenu'][$submenuItem['id']]); | |
| 328 | + $submenuItem['href'] = $admin_bar_data_nested['submenu'][$submenuItem['id']]['href']; | |
| 361 | 329 | $value['submenu'][$submenuKey] = $submenuItem; |
| 362 | 330 | } |
| 363 | 331 | } |
| 364 | 332 | return $value; |
| @@ -364,12 +332,9 @@ | ||
| 364 | 332 | return $value; |
| 365 | 333 | } |
| 366 | 334 | |
| 367 | 335 | public function adminify_adminbar_localize_script(){ |
| 368 | - // get_admin_bar_menu_list() returns an array and prints its script via | |
| 369 | - // wp_print_inline_script_tag() on the footer hook, so call it for that side effect | |
| 370 | - // rather than echoing the return value. | |
| 371 | - $this->get_admin_bar_menu_list(); | |
| 336 | + echo $this->get_admin_bar_menu_list(); | |
| 372 | 337 | } |
| 373 | 338 | |
| 374 | 339 | /** |
| 375 | 340 | * Turn admin bar items object to array |
| @@ -493,9 +458,9 @@ | ||
| 493 | 458 | $disable_for[$hidden_key] = strtolower($hidden_user['value']); |
| 494 | 459 | |
| 495 | 460 | } |
| 496 | 461 | |
| 497 | - if (\PXLBSAdminify\Inc\Utils::restrict_for($disable_for)) { | |
| 462 | + if (\WPAdminify\Inc\Utils::restrict_for($disable_for)) { | |
| 498 | 463 | unset($flat_array[$menu_id]); |
| 499 | 464 | continue; |
| 500 | 465 | } |
| 501 | 466 | } |
