| @@ -1,22 +1,21 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -namespace PXLBSAdminify\Inc\Admin; | |
| 3 | +namespace WPAdminify\Inc\Admin; | |
| 4 | 4 | |
| 5 | -use PXLBSAdminify\Inc\Utils; | |
| 6 | -use \PXLBSAdminify\Inc\Classes\CustomAdminColumns; | |
| 7 | -use \PXLBSAdminify\Inc\Classes\Tweaks; | |
| 8 | -use \PXLBSAdminify\Inc\Classes\MenuStyle; | |
| 9 | -use \PXLBSAdminify\Inc\Classes\AdminBar; | |
| 10 | -use \PXLBSAdminify\Inc\Classes\OutputCSS; | |
| 11 | -use \PXLBSAdminify\Inc\Classes\ThirdPartyCompatibility; | |
| 12 | -use \PXLBSAdminify\Inc\Classes\AdminFooterText; | |
| 13 | -use \PXLBSAdminify\Inc\Admin\Modules; | |
| 14 | -use \PXLBSAdminify\Inc\Classes\Sidebar_Widgets; | |
| 15 | -use \PXLBSAdminify\Inc\Classes\Remove_DashboardWidgets; | |
| 16 | -use PXLBSAdminify\Inc\Classes\Adminify_Rollback; | |
| 17 | -use PXLBSAdminify\Inc\Admin\AdminSettings; | |
| 18 | -use PXLBSAdminify\Inc\Admin\Frames\Init as FrameInit; | |
| 5 | +use WPAdminify\Inc\Utils; | |
| 6 | +use \WPAdminify\Inc\Classes\CustomAdminColumns; | |
| 7 | +use \WPAdminify\Inc\Classes\Tweaks; | |
| 8 | +use \WPAdminify\Inc\Classes\MenuStyle; | |
| 9 | +use \WPAdminify\Inc\Classes\AdminBar; | |
| 10 | +use \WPAdminify\Inc\Classes\OutputCSS; | |
| 11 | +use \WPAdminify\Inc\Classes\ThirdPartyCompatibility; | |
| 12 | +use \WPAdminify\Inc\Classes\AdminFooterText; | |
| 13 | +use \WPAdminify\Inc\Admin\Modules; | |
| 14 | +use \WPAdminify\Inc\Classes\Sidebar_Widgets; | |
| 15 | +use \WPAdminify\Inc\Classes\DashboardWidgets; | |
| 16 | +use WPAdminify\Inc\Classes\Adminify_Rollback; | |
| 17 | +use WPAdminify\Inc\Admin\AdminSettings; | |
| 19 | 18 | |
| 20 | 19 | // no direct access allowed |
| 21 | 20 | if (!defined('ABSPATH')) { |
| 22 | 21 | exit; |
| @@ -36,9 +35,9 @@ | ||
| 36 | 35 | public function __construct() |
| 37 | 36 | { |
| 38 | 37 | $this->options = AdminSettings::get_instance()->get(); |
| 39 | 38 | |
| 40 | - $this->pxlbsadminify_modules_manager(); | |
| 39 | + $this->jltwp_adminify_modules_manager(); | |
| 41 | 40 | |
| 42 | 41 | // Remove Page Header like - Dashboard, Plugins, Users etc |
| 43 | 42 | // add_action('admin_head', [$this, 'remove_page_headline'], 99); |
| 44 | 43 | |
| @@ -43,14 +42,12 @@ | ||
| 43 | 42 | // add_action('admin_head', [$this, 'remove_page_headline'], 99); |
| 44 | 43 | |
| 45 | 44 | |
| 46 | 45 | // Freemius Hooks |
| 47 | - jltwp_adminify()->add_filter('plugin_icon', array($this, 'pxlbsadminify_logo_icon')); | |
| 46 | + jltwp_adminify()->add_filter('freemius_pricing_js_path', array($this, 'jltwp_new_freemius_pricing_js')); | |
| 47 | + jltwp_adminify()->add_filter('plugin_icon', array($this, 'jltwp_adminify_logo_icon')); | |
| 48 | 48 | |
| 49 | - add_action('admin_menu', array($this, 'support_menu'), 1100); | |
| 50 | - add_action('network_admin_menu', array($this, 'support_menu'), 1100); | |
| 51 | - add_action('admin_menu', [$this, 'submenu_link_new_tab']); | |
| 52 | - // jltwp_adminify()->add_filter('support_forum_url', [$this, 'pxlbsadminify_support_forum_url']); | |
| 49 | + jltwp_adminify()->add_filter('support_forum_url', [$this, 'jltwp_adminify_support_forum_url']); | |
| 53 | 50 | |
| 54 | 51 | // Disable deactivation feedback form |
| 55 | 52 | jltwp_adminify()->add_filter('show_deactivation_feedback_form', '__return_false'); |
| 56 | 53 | |
| @@ -57,35 +54,10 @@ | ||
| 57 | 54 | // Disable after deactivation subscription cancellation window |
| 58 | 55 | jltwp_adminify()->add_filter('show_deactivation_subscription_cancellation', '__return_false'); |
| 59 | 56 | |
| 60 | 57 | $this->disable_gutenberg_editor(); |
| 61 | - | |
| 62 | - add_filter('show_admin_bar', [ $this, 'pxlbsadminify_removeAdminBar'], PHP_INT_MAX); | |
| 63 | - add_action('wp_head', [ $this,'pxlbsadminify_remove_header_for_baknd'], PHP_INT_MAX); | |
| 64 | - | |
| 65 | 58 | } |
| 66 | 59 | |
| 67 | - function pxlbsadminify_removeAdminBar($status) | |
| 68 | - { | |
| 69 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only check, no state change. | |
| 70 | - if (!empty($_GET['bknd']) && sanitize_text_field(wp_unslash($_GET['bknd']))) { | |
| 71 | - return false; | |
| 72 | - } | |
| 73 | - return $status; | |
| 74 | - } | |
| 75 | - | |
| 76 | - function pxlbsadminify_remove_header_for_baknd() { | |
| 77 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only check, no state change. | |
| 78 | - if (isset($_GET['bknd']) && sanitize_text_field(wp_unslash($_GET['bknd'])) == '1') { | |
| 79 | - echo '<script> | |
| 80 | - jQuery(document).ready(function($){ | |
| 81 | - $("header").remove(); | |
| 82 | - $("footer").remove(); | |
| 83 | - }) | |
| 84 | - </script>'; | |
| 85 | - } | |
| 86 | - } | |
| 87 | - | |
| 88 | 60 | public function disable_gutenberg_editor() |
| 89 | 61 | { |
| 90 | 62 | // Sidebar Widgets Remove |
| 91 | 63 | if (!empty($this->options['remove_widgets']['disable_gutenberg_editor'])) { |
| @@ -95,15 +67,16 @@ | ||
| 95 | 67 | add_filter('use_widgets_block_editor', '__return_false'); |
| 96 | 68 | } |
| 97 | 69 | |
| 98 | 70 | // Disable Block Editor Gutenberg |
| 99 | - if (!empty($this->options["disable_gutenberg"]['disable_for']) && in_array('block_editor', $this->options["disable_gutenberg"]['disable_for'])) { | |
| 71 | + if ( !empty($this->options["disable_gutenberg"]['disable_for']) && in_array('block_editor', $this->options["disable_gutenberg"]['disable_for'] ) ) { | |
| 100 | 72 | add_filter('use_block_editor_for_post', '__return_false'); |
| 101 | 73 | add_action('wp_enqueue_scripts', [$this, 'remove_backend_gutenberg_scripts'], 20); |
| 102 | 74 | } |
| 103 | 75 | |
| 76 | + | |
| 104 | 77 | // Remove all scripts and styles added by Gutenberg |
| 105 | - if (isset($this->options["disable_gutenberg"]['disable_gutenberg_enable']) && $this->options["disable_gutenberg"]['disable_gutenberg_enable'] && in_array('remove_gutenberg_scripts', $this->options["disable_gutenberg"]['disable_for'])) { | |
| 78 | + if (!empty($this->options["disable_gutenberg"]['disable_for']) && in_array('remove_gutenberg_scripts', $this->options["disable_gutenberg"]['disable_for'])) { | |
| 106 | 79 | add_action('wp_enqueue_scripts', [$this, 'remove_gutenberg_scripts']); |
| 107 | 80 | remove_action('enqueue_block_assets', 'wp_enqueue_registered_block_scripts_and_styles'); |
| 108 | 81 | } |
| 109 | 82 | } |
| @@ -112,13 +85,9 @@ | ||
| 112 | 85 | // Dequeue all Frontend scripts and styles added by Gutenberg |
| 113 | 86 | public function remove_gutenberg_scripts() |
| 114 | 87 | { |
| 115 | 88 | wp_dequeue_style('wp-block-library'); |
| 116 | - wp_dequeue_style('wc-block-style'); // Remove WooCommerce block CSS | |
| 117 | - | |
| 118 | - // Remove Inline CSS | |
| 119 | - // wp_deregister_style('wp-block-library-inline'); | |
| 120 | - // wp_dequeue_style('wp-block-library-inline'); | |
| 89 | + wp_dequeue_style('wc-block-style'); | |
| 121 | 90 | } |
| 122 | 91 | |
| 123 | 92 | /** |
| 124 | 93 | * Remove Gutenberg Scripts |
| @@ -126,9 +95,9 @@ | ||
| 126 | 95 | * @return void |
| 127 | 96 | */ |
| 128 | 97 | public function remove_backend_gutenberg_scripts() |
| 129 | 98 | { |
| 130 | - if (is_admin()) { | |
| 99 | + if(is_admin()){ | |
| 131 | 100 | // Remove CSS on the front end. |
| 132 | 101 | wp_dequeue_style('wp-block-library'); |
| 133 | 102 | |
| 134 | 103 | // Remove Gutenberg theme. |
| @@ -145,22 +114,26 @@ | ||
| 145 | 114 | * @param [type] $logo |
| 146 | 115 | * |
| 147 | 116 | * @return void |
| 148 | 117 | */ |
| 149 | - public function pxlbsadminify_logo_icon($logo) | |
| 118 | + public function jltwp_adminify_logo_icon($logo) | |
| 150 | 119 | { |
| 151 | - $logo = PXLBSADMINIFY_PATH . '/assets/images/adminify.svg'; | |
| 120 | + $logo = WP_ADMINIFY_PATH . '/assets/images/adminify.svg'; | |
| 152 | 121 | return $logo; |
| 153 | 122 | } |
| 154 | 123 | |
| 124 | + public function jltwp_new_freemius_pricing_js($default_pricing_js_path) | |
| 125 | + { | |
| 126 | + return WP_ADMINIFY_PATH . '/Libs/freemius-pricing/freemius-pricing.js'; | |
| 127 | + } | |
| 155 | 128 | |
| 156 | 129 | /** |
| 157 | 130 | * WP Adminify: Modules |
| 158 | 131 | */ |
| 159 | - public function pxlbsadminify_modules_manager() | |
| 132 | + public function jltwp_adminify_modules_manager() | |
| 160 | 133 | { |
| 161 | - // new MenuStyle(); | |
| 162 | 134 | new Modules(); |
| 135 | + new MenuStyle(); | |
| 163 | 136 | new AdminBar(); |
| 164 | 137 | new Tweaks(); |
| 165 | 138 | new OutputCSS(); |
| 166 | 139 | new ThirdPartyCompatibility(); |
| @@ -165,12 +138,15 @@ | ||
| 165 | 138 | new OutputCSS(); |
| 166 | 139 | new ThirdPartyCompatibility(); |
| 167 | 140 | new AdminFooterText(); |
| 168 | 141 | new Sidebar_Widgets(); |
| 169 | - new Remove_DashboardWidgets(); | |
| 142 | + new DashboardWidgets(); | |
| 170 | 143 | |
| 171 | - if (!empty($this->options['admin_ui']) && preg_match('/https:\/\//', site_url()) && is_ssl()) { | |
| 172 | - FrameInit::instance(); | |
| 144 | + | |
| 145 | + if (!empty($this->options['admin_ui'])) { | |
| 146 | + if (preg_match('/https:\/\//', site_url()) && is_ssl()) { | |
| 147 | + \WPAdminify\Inc\Admin\Frames\Init::instance(); | |
| 148 | + } | |
| 173 | 149 | } |
| 174 | 150 | |
| 175 | 151 | // Version Rollback |
| 176 | 152 | // Adminify_Rollback::get_instance(); |
| @@ -219,73 +195,22 @@ | ||
| 219 | 195 | } |
| 220 | 196 | } |
| 221 | 197 | |
| 222 | 198 | |
| 223 | - public function support_menu() | |
| 224 | - { | |
| 225 | - // $this->submenu_link_new_tab(); | |
| 226 | - // $adminify_ui = AdminSettings::get_instance()->get('admin_ui'); | |
| 227 | - $support_url = 'adminify-support'; | |
| 228 | - // if($adminify_ui ) { | |
| 229 | - // $support_urlsss = \PXLBSAdminify\Inc\Admin\AdminSettings::support_url(); | |
| 230 | - // } | |
| 231 | - add_submenu_page( | |
| 232 | - 'wp-adminify-settings', // Ex. wp-adminify-settings | |
| 233 | - __('Get Support', 'adminify'), | |
| 234 | - __('Support', 'adminify'), | |
| 235 | - 'manage_options', | |
| 236 | - $support_url, | |
| 237 | - [$this, 'support_menu_redirect'], | |
| 238 | - 60 | |
| 239 | - ); | |
| 240 | - | |
| 241 | - // Hook into admin_init to handle the redirect early, before any output | |
| 242 | - add_action('admin_init', [$this, 'handle_support_redirect']); | |
| 243 | - } | |
| 244 | - | |
| 245 | 199 | /** |
| 246 | - * Handle support menu redirect | |
| 247 | - * This method is called when the support page would normally load | |
| 200 | + * Support Contact URL | |
| 201 | + * | |
| 202 | + * @param [type] $support_url and Pro Support | |
| 203 | + * | |
| 204 | + * @return void | |
| 248 | 205 | */ |
| 249 | - public function support_menu_redirect() | |
| 206 | + public function jltwp_adminify_support_forum_url($support_url) | |
| 250 | 207 | { |
| 251 | - // This function body will never execute because we redirect in admin_init | |
| 252 | - // But it needs to exist as the callback | |
| 253 | - } | |
| 254 | - | |
| 255 | - /** | |
| 256 | - * Handle the actual redirect in admin_init before any output | |
| 257 | - */ | |
| 258 | - public function handle_support_redirect() | |
| 259 | - { | |
| 260 | - // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- read-only check, no state change. | |
| 261 | - if (isset($_GET['page']) && sanitize_key(wp_unslash($_GET['page'])) === 'adminify-support') { | |
| 262 | - $redirect_url = \PXLBSAdminify\Inc\Admin\AdminSettings::support_url(); | |
| 263 | - | |
| 264 | - // Add the URLs to the allowed redirect hosts filter | |
| 265 | - add_filter('allowed_redirect_hosts', function($hosts) { | |
| 266 | - $hosts[] = 'wpadminify.com'; | |
| 267 | - $hosts[] = 'wordpress.org'; | |
| 268 | - return $hosts; | |
| 269 | - }); | |
| 270 | - | |
| 271 | - wp_safe_redirect($redirect_url, 301); | |
| 272 | - exit; | |
| 208 | + if (jltwp_adminify()->is_premium()) { | |
| 209 | + $support_url = 'https://wpadminify.com/contact'; | |
| 210 | + } else { | |
| 211 | + $support_url = 'https://wordpress.org/support/plugin/adminify/'; | |
| 273 | 212 | } |
| 213 | + return $support_url; | |
| 274 | 214 | } |
| 275 | - | |
| 276 | - | |
| 277 | - public function submenu_link_new_tab() | |
| 278 | - { | |
| 279 | - add_action('admin_footer', function () { | |
| 280 | -?> | |
| 281 | - <script type="text/javascript"> | |
| 282 | - jQuery(document).ready(function($) { | |
| 283 | - $('a[href="admin.php?page=adminify-support"]').attr('target', '_blank'); | |
| 284 | - }); | |
| 285 | - </script> | |
| 286 | -<?php | |
| 287 | - }); | |
| 288 | - } | |
| 289 | - | |
| 290 | 215 | } |
| 291 | 216 | } |