| @@ -8,9 +8,9 @@ | ||
| 8 | 8 | function sh_cd_build_admin_menu() { |
| 9 | 9 | |
| 10 | 10 | $allowed_viewer = sh_cd_permission_role(); |
| 11 | 11 | |
| 12 | - add_menu_page( SH_CD_PLUGIN_NAME, SH_CD_PLUGIN_NAME, 'manage_options', 'sh-cd-shortcode-variables-main-menu', 'sh_cd_pages_your_shortcodes', 'dashicons-snippet-shortcodes' ); | |
| 12 | + add_menu_page( SH_CD_PLUGIN_NAME, SH_CD_PLUGIN_NAME, 'manage_options', 'sh-cd-shortcode-variables-main-menu', 'sh_cd_pages_your_shortcodes', 'dashicons-editor-kitchensink' ); | |
| 13 | 13 | |
| 14 | 14 | // Hide duplicated sub menu (wee hack!) |
| 15 | 15 | add_submenu_page( 'sh-cd-shortcode-variables-main-menu', '', '', 'manage_options', 'sh-cd-shortcode-variables-main-menu', 'sh_cd_pages_your_shortcodes'); |
| 16 | 16 | |
| @@ -17,16 +17,13 @@ | ||
| 17 | 17 | // Add sub menus |
| 18 | 18 | add_submenu_page( 'sh-cd-shortcode-variables-main-menu', __( 'Your Shortcodes', SH_CD_SLUG ), __( 'Your shortcodes', SH_CD_SLUG ), $allowed_viewer, 'sh-cd-shortcode-variables-your-shortcodes', 'sh_cd_pages_your_shortcodes'); |
| 19 | 19 | add_submenu_page( 'sh-cd-shortcode-variables-main-menu', __( 'Premade Shortcodes', SH_CD_SLUG ), __( 'Premade shortcodes', SH_CD_SLUG ), $allowed_viewer, 'sh-cd-shortcode-variables-sub-premade', 'sh_cd_premade_shortcodes_page'); |
| 20 | 20 | |
| 21 | - add_submenu_page( 'sh-cd-shortcode-variables-main-menu', __( 'Import / Export', SH_CD_SLUG ), __( 'Import / Export', SH_CD_SLUG ), 'manage_options', 'sh-cd-import', 'sh_cd_admin_page_import' ); | |
| 21 | + add_submenu_page( 'sh-cd-shortcode-variables-main-menu', __( 'Import shortcodes', SH_CD_SLUG ), __( 'Import shortcodes', SH_CD_SLUG ), 'manage_options', 'sh-cd-import', 'sh_cd_admin_page_import' ); | |
| 22 | 22 | |
| 23 | - if( false === sh_cd_is_premium_plugin_activated() ) { | |
| 24 | - add_submenu_page( 'sh-cd-shortcode-variables-main-menu', '<i class="fa-solid fa-star"></i> ' . __( 'Upgrade to Premium', SH_CD_SLUG ), '<i class="fa-solid fa-star"></i> ' . __( 'Get Premium', SH_CD_SLUG ), 'manage_options', 'sh-cd-shortcode-variables-upgrade', 'sh_cd_page_upgrade'); | |
| 25 | - } | |
| 26 | - | |
| 27 | - do_action( 'sh-cd-admin-menu-upgrade' ); | |
| 28 | - | |
| 23 | + $menu_text = ( true === SH_CD_IS_PREMIUM ) ? __( 'Your License', SH_CD_SLUG ) : __( 'Upgrade to Premium', SH_CD_SLUG ); | |
| 24 | + | |
| 25 | + add_submenu_page( 'sh-cd-shortcode-variables-main-menu', $menu_text, $menu_text, 'manage_options', 'sh-cd-shortcode-variables-license', 'sh_cd_advertise_pro'); | |
| 29 | 26 | add_submenu_page( 'sh-cd-shortcode-variables-main-menu', __( 'Settings', SH_CD_SLUG ), __( 'Settings', SH_CD_SLUG ), 'manage_options', 'sh-cd-settings', 'sh_cd_settings_page_generic' ); |
| 30 | 27 | add_submenu_page( 'sh-cd-shortcode-variables-main-menu', __( 'Help', SH_CD_SLUG ), __( 'Help', SH_CD_SLUG ), 'manage_options', 'sh-cd-help', 'sh_cd_help_page' ); |
| 31 | 28 | } |
| 32 | 29 | add_action( 'admin_menu', 'sh_cd_build_admin_menu' ); |
| @@ -34,38 +31,12 @@ | ||
| 34 | 31 | /** |
| 35 | 32 | * Enqueue relevant CSS / JS |
| 36 | 33 | */ |
| 37 | 34 | function sh_cd_enqueue_scripts() { |
| 35 | + wp_enqueue_style( 'sh-cd', plugins_url( '../assets/css/sh-cd.css', __FILE__ ), [], SH_CD_PLUGIN_VERSION ) ; | |
| 36 | + wp_enqueue_style('fontawesome', 'https://use.fontawesome.com/releases/v5.7.2/css/all.css', [], SH_CD_PLUGIN_VERSION); | |
| 37 | + wp_enqueue_script( 'sh-cd', plugins_url( '../assets/js/sh-cd.js', __FILE__ ), [ 'jquery' ], SH_CD_PLUGIN_VERSION, true ); | |
| 38 | 38 | |
| 39 | - wp_enqueue_style( 'sh-cd-dashicon', plugins_url( '../assets/css/sh-cd-dashicon.css', __FILE__ ), [], SH_CD_PLUGIN_VERSION ); | |
| 40 | - | |
| 41 | - // Allow marketing.js on any page so admin's can dismiss admin notices anywhere | |
| 42 | - wp_enqueue_script( 'sh-cd-marketing', plugins_url( '../assets/js/marketing.js', __FILE__ ), [ 'jquery' ], SH_CD_PLUGIN_VERSION, true ); | |
| 43 | - | |
| 44 | - if ( ! sh_cd_is_snippet_shortcodes_admin_page() ) { | |
| 45 | - return; | |
| 46 | - } | |
| 47 | - | |
| 48 | - $main_js_dependencies = [ 'jquery', 'sh-cd-clipboard' ]; | |
| 49 | - | |
| 50 | - // Tooltips | |
| 51 | - if ( sh_cd_tooltips_is_enabled() ) { | |
| 52 | - wp_enqueue_script( 'sh-cd-tooltip', plugins_url( '../assets/zerbratooltips/zebra_tooltips.min.js', __FILE__ ), [ ], SH_CD_PLUGIN_VERSION ); | |
| 53 | - wp_enqueue_style( 'sh-cd-tooltip', plugins_url( '../assets/zerbratooltips/zebra_tooltips.min.css', __FILE__ ), [], SH_CD_PLUGIN_VERSION ) ; | |
| 54 | - | |
| 55 | - $main_js_dependencies[] = 'sh-cd-tooltip'; | |
| 56 | - } | |
| 57 | - | |
| 58 | - // CSS | |
| 59 | - wp_enqueue_style( 'sh-cd', plugins_url( '../assets/css/sh-cd.css', __FILE__ ), [ 'sh-cd-dashicon' ], SH_CD_PLUGIN_VERSION ); | |
| 60 | - wp_enqueue_style( 'sh-cd-fontawesome', plugins_url( '../assets/fontawesome/css/fontawesome.min.css', __FILE__ ), [], SH_CD_PLUGIN_VERSION ); | |
| 61 | - wp_enqueue_style( 'sh-cd-fontawesome-solid', plugins_url( '../assets/fontawesome/css/solid.min.css', __FILE__ ), [ 'sh-cd-fontawesome' ], SH_CD_PLUGIN_VERSION ); | |
| 62 | - wp_enqueue_style( 'sh-cd-fontawesome-regular', plugins_url( '../assets/fontawesome/css/regular.min.css', __FILE__ ), [ 'sh-cd-fontawesome' ], SH_CD_PLUGIN_VERSION ); | |
| 63 | - wp_enqueue_style( 'sh-cd-fontawesome-brands', plugins_url( '../assets/fontawesome/css/brands.min.css', __FILE__ ), [ 'sh-cd-fontawesome' ], SH_CD_PLUGIN_VERSION ); | |
| 64 | - | |
| 65 | - // JS | |
| 66 | - wp_enqueue_script( 'sh-cd-clipboard', plugins_url( '../assets/js/clipboard.min.js', __FILE__ ), [], SH_CD_PLUGIN_VERSION, true ); | |
| 67 | - wp_enqueue_script( 'sh-cd', plugins_url( '../assets/js/sh-cd.js', __FILE__ ), $main_js_dependencies, SH_CD_PLUGIN_VERSION, true ); | |
| 68 | 39 | wp_localize_script( 'sh-cd', 'sh_cd', sh_cd_js_config() ); |
| 69 | 40 | |
| 70 | 41 | } |
| 71 | 42 | add_action( 'admin_enqueue_scripts', 'sh_cd_enqueue_scripts' ); |
| @@ -70,46 +41,20 @@ | ||
| 70 | 41 | } |
| 71 | 42 | add_action( 'admin_enqueue_scripts', 'sh_cd_enqueue_scripts' ); |
| 72 | 43 | |
| 73 | 44 | /** |
| 74 | - * Determine if we are on a Snippet Shortcodes admin page | |
| 75 | - * | |
| 76 | - * @return bool | |
| 77 | - */ | |
| 78 | -function sh_cd_is_snippet_shortcodes_admin_page() { | |
| 79 | - | |
| 80 | - if ( true === empty( $_GET['page' ] ) ) { | |
| 81 | - return false; | |
| 82 | - } | |
| 83 | - | |
| 84 | - $known_admin_pages = apply_filters( 'sh-cd-admin-pages', [ 'sh-cd-shortcode-variables-main-menu', | |
| 85 | - 'sh-cd-shortcode-variables-your-shortcodes', | |
| 86 | - 'sh-cd-shortcode-variables-sub-premade', | |
| 87 | - 'sh-cd-import', | |
| 88 | - 'sh-cd-shortcode-variables-upgrade', | |
| 89 | - 'sh-cd-settings', | |
| 90 | - 'sh-cd-help' ] ); | |
| 91 | - | |
| 92 | - return in_array( $_GET['page'], $known_admin_pages ); | |
| 93 | -} | |
| 94 | - | |
| 95 | -/** | |
| 96 | 45 | * Config for JS |
| 97 | 46 | * @return array |
| 98 | 47 | */ |
| 99 | 48 | function sh_cd_js_config() { |
| 100 | - return [ 'editor' => sh_cd_default_editor_get(), | |
| 101 | - 'page' => false === empty( $_GET['page'] ) ? $_GET['page'] : '', | |
| 102 | - 'action' => false === empty( $_GET['action'] ) ? $_GET['action'] : '', | |
| 49 | + return [ | |
| 103 | 50 | 'security' => wp_create_nonce( 'sh-cd-security' ), |
| 104 | - 'premium' => sh_cd_is_premium(), | |
| 51 | + 'premium' => SH_CD_IS_PREMIUM, | |
| 105 | 52 | 'text-delete-confirm' => __( 'Are you sure you wish to delete this shortcode?', SH_CD_SLUG ), |
| 106 | 53 | 'text-add' => __( 'Add', SH_CD_SLUG ), |
| 107 | 54 | 'text-save' => __( 'Save', SH_CD_SLUG ), |
| 108 | 55 | 'text-saved' => __( 'Saved!', SH_CD_SLUG ), |
| 109 | - 'text-editor-change' => __( 'Changing the editor will cause any unsaved changes to be lost. Please ensure you have saved your shortcode before proceeding.', SH_CD_SLUG ), | |
| 110 | - 'text-error' => __( 'Unfortunately something went wrong!', SH_CD_SLUG ), | |
| 111 | - 'tooltips-enabled' => sh_cd_tooltips_is_enabled() ? 'yes' : 'no', | |
| 56 | + 'text-error' => __( 'Unfortunately something went wrong!', SH_CD_SLUG ) | |
| 112 | 57 | ]; |
| 113 | 58 | } |
| 114 | 59 | |
| 115 | 60 | /** |
| @@ -122,9 +67,9 @@ | ||
| 122 | 67 | sh_cd_create_database_table(); |
| 123 | 68 | |
| 124 | 69 | sh_cd_create_database_table_multisite(); |
| 125 | 70 | |
| 126 | - sh_cd_create_database_table_revisions(); | |
| 71 | + sh_cd_cron_licence_check(); | |
| 127 | 72 | |
| 128 | 73 | do_action( 'sh-cd-upgrade' ); |
| 129 | 74 | } |
| 130 | 75 | } |
| @@ -135,9 +80,9 @@ | ||
| 135 | 80 | Ajax handler for toggling disable status of a shortcode |
| 136 | 81 | **/ |
| 137 | 82 | function sh_cd_ajax_toggle_status() { |
| 138 | 83 | |
| 139 | - if ( false === sh_cd_is_premium() ) { | |
| 84 | + if ( false === SH_CD_IS_PREMIUM ) { | |
| 140 | 85 | wp_send_json( 'not-premium' ); |
| 141 | 86 | } |
| 142 | 87 | |
| 143 | 88 | check_ajax_referer( 'sh-cd-security', 'security' ); |
| @@ -183,9 +128,9 @@ | ||
| 183 | 128 | Ajax handler for toggling disable status of a shortcode |
| 184 | 129 | **/ |
| 185 | 130 | function sh_cd_ajax_toggle_multisite() { |
| 186 | 131 | |
| 187 | - if ( false === sh_cd_is_multisite_enabled() ) { | |
| 132 | + if ( false === SH_CD_IS_PREMIUM ) { | |
| 188 | 133 | wp_send_json( 'not-premium' ); |
| 189 | 134 | } |
| 190 | 135 | |
| 191 | 136 | check_ajax_referer( 'sh-cd-security', 'security' ); |
| @@ -209,9 +154,9 @@ | ||
| 209 | 154 | Ajax handler for saving shortcode inline |
| 210 | 155 | **/ |
| 211 | 156 | function sh_cd_ajax_update_shortcode() { |
| 212 | 157 | |
| 213 | - if ( false === sh_cd_is_premium() ) { | |
| 158 | + if ( false === SH_CD_IS_PREMIUM ) { | |
| 214 | 159 | wp_send_json( 'not-premium' ); |
| 215 | 160 | } |
| 216 | 161 | |
| 217 | 162 | check_ajax_referer( 'sh-cd-security', 'security' ); |
| @@ -236,9 +181,9 @@ | ||
| 236 | 181 | Ajax handler for adding shortcode inline |
| 237 | 182 | **/ |
| 238 | 183 | function sh_cd_ajax_add_shortcode() { |
| 239 | 184 | |
| 240 | - if ( false === sh_cd_is_premium() ) { | |
| 185 | + if ( false === SH_CD_IS_PREMIUM ) { | |
| 241 | 186 | wp_send_json( 'not-premium' ); |
| 242 | 187 | } |
| 243 | 188 | |
| 244 | 189 | check_ajax_referer( 'sh-cd-security', 'security' ); |