@@ -127,11 +127,11 @@ discard block |
||
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /** |
| 130 | - * Adds an admin notice reminding the user if their license key has not been saved |
|
| 131 | - * |
|
| 132 | - * @since 0.9.7 |
|
| 133 | - * @todo make dismissible |
|
| 134 | - */ |
|
| 130 | + * Adds an admin notice reminding the user if their license key has not been saved |
|
| 131 | + * |
|
| 132 | + * @since 0.9.7 |
|
| 133 | + * @todo make dismissible |
|
| 134 | + */ |
|
| 135 | 135 | public function license_nag(){ |
| 136 | 136 | |
| 137 | 137 | $screen = get_current_screen(); |
@@ -152,26 +152,26 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | if ( empty( $license ) ) { |
| 154 | 154 | |
| 155 | - printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link ); |
|
| 155 | + printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_empty, $license_link, $dismiss_link ); |
|
| 156 | 156 | |
| 157 | - } else if ( 'invalid' == $status ){ // license key entered wrong or something |
|
| 157 | + } else if ( 'invalid' == $status ){ // license key entered wrong or something |
|
| 158 | 158 | |
| 159 | 159 | printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_invalid, $license_link , $dismiss_link ); |
| 160 | 160 | |
| 161 | - } else if ( empty( $status ) ){ // license key saved but not activated |
|
| 161 | + } else if ( empty( $status ) ){ // license key saved but not activated |
|
| 162 | 162 | |
| 163 | 163 | printf('<div class="lasso-notice error" style="position:relative;"><p>%s %s</p>%s</div>', $message_inactive, $license_link, $dismiss_link ); |
| 164 | 164 | |
| 165 | - } |
|
| 165 | + } |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /** |
| 171 | - * Process hiding the dimiss |
|
| 172 | - * |
|
| 173 | - * @since 0.9.7 |
|
| 174 | - */ |
|
| 171 | + * Process hiding the dimiss |
|
| 172 | + * |
|
| 173 | + * @since 0.9.7 |
|
| 174 | + */ |
|
| 175 | 175 | public function dismiss_nag() { |
| 176 | 176 | |
| 177 | 177 | if ( isset( $_GET['lasso-notice'] ) && 'dismiss' == $_GET['lasso-notice'] && current_user_can('manage_options') ) { |
@@ -115,8 +115,8 @@ |
||
| 115 | 115 | // replace namespace separators with directory separators |
| 116 | 116 | // in the relative class name, append with .php |
| 117 | 117 | $file = $base_dir |
| 118 | - . str_replace('\\', '/', $relative_class) |
|
| 119 | - . '.php'; |
|
| 118 | + . str_replace('\\', '/', $relative_class) |
|
| 119 | + . '.php'; |
|
| 120 | 120 | |
| 121 | 121 | // if the mapped file exists, require it |
| 122 | 122 | if ($this->requireFile($file)) { |
@@ -50,7 +50,6 @@ |
||
| 50 | 50 | * @param string $action The AJAX action we are processing. |
| 51 | 51 | * @param string|object $callback_class The class to use for the callback. Either the name of the class or an instance of that class. |
| 52 | 52 | * @param string $method The name of the callback method. |
| 53 | - |
|
| 54 | 53 | */ |
| 55 | 54 | public function __construct( $action, $callback_class) { |
| 56 | 55 | if ( ! is_object( $callback_class ) ) { |
@@ -81,7 +81,6 @@ |
||
| 81 | 81 | * |
| 82 | 82 | * @param string $action The AJAX action we are processing. |
| 83 | 83 | * @param string|object $callback The class to use for the callback. Either the name of the class or an instance of that class. |
| 84 | - |
|
| 85 | 84 | * |
| 86 | 85 | * @return \lasso\internal_api\auth |
| 87 | 86 | */ |
@@ -1322,13 +1322,13 @@ |
||
| 1322 | 1322 | $key = preg_replace( '`[^A-Za-z0-9_-]`', '', $key ); |
| 1323 | 1323 | |
| 1324 | 1324 | /** |
| 1325 | - * Filter a sanitized key string. |
|
| 1326 | - * |
|
| 1327 | - * @since 3.0.0 |
|
| 1328 | - * |
|
| 1329 | - * @param string $key Sanitized key. |
|
| 1330 | - * @param string $raw_key The key prior to sanitization. |
|
| 1331 | - */ |
|
| 1325 | + * Filter a sanitized key string. |
|
| 1326 | + * |
|
| 1327 | + * @since 3.0.0 |
|
| 1328 | + * |
|
| 1329 | + * @param string $key Sanitized key. |
|
| 1330 | + * @param string $raw_key The key prior to sanitization. |
|
| 1331 | + */ |
|
| 1332 | 1332 | return apply_filters( 'tgmpa_sanitize_key', $key, $raw_key ); |
| 1333 | 1333 | } |
| 1334 | 1334 | |
@@ -11,16 +11,16 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | public function __construct() { |
| 13 | 13 | |
| 14 | - $disable_tour = lasso_editor_get_option('disable_tour', 'lasso_editor'); |
|
| 14 | + $disable_tour = lasso_editor_get_option('disable_tour', 'lasso_editor'); |
|
| 15 | 15 | if (!$disable_tour) { |
| 16 | - add_action( 'wp_footer', array( $this, 'draw_tour' ) ); |
|
| 16 | + add_action( 'wp_footer', array( $this, 'draw_tour' ) ); |
|
| 17 | 17 | } |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * Draw the modal used to house the walk through |
|
| 22 | - * @since 0.6 |
|
| 23 | - */ |
|
| 21 | + * Draw the modal used to house the walk through |
|
| 22 | + * @since 0.6 |
|
| 23 | + */ |
|
| 24 | 24 | public function draw_tour() { |
| 25 | 25 | |
| 26 | 26 | $tour_hidden = get_user_meta( get_current_user_ID(), 'lasso_hide_tour', true ); |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
| 83 | - * Draw the inner slides for the welcome walkthrough |
|
| 84 | - * @since 0.6 |
|
| 85 | - */ |
|
| 83 | + * Draw the inner slides for the welcome walkthrough |
|
| 84 | + * @since 0.6 |
|
| 85 | + */ |
|
| 86 | 86 | public function tour_slides() { ?> |
| 87 | 87 | |
| 88 | 88 | <div id="lasso--loading" class="lasso--loading"><div class="lasso--loader"></div></div> |
@@ -11,8 +11,8 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | // only run on posts and pages if user is logged in |
| 13 | 13 | if ( is_user_logged_in() && lasso_user_can('edit_posts') ) { |
| 14 | - if ( !class_exists( 'WP_REST_Controller' ) ) { |
|
| 15 | - // using rest api v1 |
|
| 14 | + if ( !class_exists( 'WP_REST_Controller' ) ) { |
|
| 15 | + // using rest api v1 |
|
| 16 | 16 | ?> |
| 17 | 17 | <script type="text/html" id="lasso-tmpl--post"> |
| 18 | 18 | <li> |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | <?php |
| 32 | 32 | } else { |
| 33 | 33 | // using rest api v2 |
| 34 | - ?> |
|
| 34 | + ?> |
|
| 35 | 35 | <script type="text/html" id="lasso-tmpl--post"> |
| 36 | 36 | <li> |
| 37 | 37 | <a href="<%= post.link %>" class="lasso--post-list__item <?php echo $can_delete_class;?> <%= post.status %>" data-postid="<%= post.id %>" > |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | </li> |
| 48 | 48 | </script> |
| 49 | 49 | <?php |
| 50 | - } |
|
| 50 | + } |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | } |
@@ -204,47 +204,47 @@ |
||
| 204 | 204 | */ |
| 205 | 205 | function required_plugins() { |
| 206 | 206 | |
| 207 | - $plugins = array( |
|
| 208 | - |
|
| 209 | - array( |
|
| 210 | - 'name' => __('Aesop Story Engine','lasso'), |
|
| 211 | - 'slug' => 'aesop-story-engine', |
|
| 212 | - 'required' => false, |
|
| 213 | - ), |
|
| 214 | - |
|
| 215 | - ); |
|
| 216 | - |
|
| 217 | - $config = array( |
|
| 218 | - 'default_path' => '', // Default absolute path to pre-packaged plugins. |
|
| 219 | - 'menu' => 'lasso-install-plugins', // Menu slug. |
|
| 220 | - 'has_notices' => true, // Show admin notices or not. |
|
| 221 | - 'dismissable' => true, // If false, a user cannot dismiss the nag message. |
|
| 222 | - 'dismiss_msg' => '', // If 'dismissable' is false, this message will be output at top of nag. |
|
| 223 | - 'is_automatic' => false, // Automatically activate plugins after installation or not. |
|
| 224 | - 'message' => '', // Message to output right before the plugins table. |
|
| 225 | - 'strings' => array( |
|
| 226 | - 'page_title' => __( 'Install Required Plugins', 'lasso' ), |
|
| 227 | - 'menu_title' => __( 'Install Plugins', 'lasso' ), |
|
| 228 | - 'installing' => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name. |
|
| 229 | - 'oops' => __( 'Something went wrong with the plugin API.', 'lasso' ), |
|
| 230 | - 'notice_can_install_required' => _n_noop( 'This plugin requires the following plugin: %1$s.', 'This plugin requires the following plugins: %1$s.' ), // %1$s = plugin name(s). |
|
| 231 | - 'notice_can_install_recommended' => _n_noop( 'This plugin recommends the following plugin: %1$s.', 'This plugin recommends the following plugins: %1$s.' ), // %1$s = plugin name(s). |
|
| 232 | - 'notice_cannot_install' => _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.' ), // %1$s = plugin name(s). |
|
| 233 | - 'notice_can_activate_required' => _n_noop( 'The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s). |
|
| 234 | - 'notice_can_activate_recommended' => _n_noop( 'The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s). |
|
| 235 | - 'notice_cannot_activate' => _n_noop( 'Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.' ), // %1$s = plugin name(s). |
|
| 236 | - 'notice_ask_to_update' => _n_noop( 'The following plugin needs to be updated to its latest version to ensure maximum compatibility with this plugin: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this plugin: %1$s.' ), // %1$s = plugin name(s). |
|
| 237 | - 'notice_cannot_update' => _n_noop( 'Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.' ), // %1$s = plugin name(s). |
|
| 238 | - 'install_link' => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ), |
|
| 239 | - 'activate_link' => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ), |
|
| 240 | - 'return' => __( 'Return to Required Plugins Installer', 'lasso' ), |
|
| 241 | - 'plugin_activated' => __( 'Plugin activated successfully.', 'lasso' ), |
|
| 242 | - 'complete' => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link. |
|
| 243 | - 'nag_type' => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'. |
|
| 244 | - ) |
|
| 245 | - ); |
|
| 246 | - |
|
| 247 | - tgmpa( $plugins, $config ); |
|
| 207 | + $plugins = array( |
|
| 208 | + |
|
| 209 | + array( |
|
| 210 | + 'name' => __('Aesop Story Engine','lasso'), |
|
| 211 | + 'slug' => 'aesop-story-engine', |
|
| 212 | + 'required' => false, |
|
| 213 | + ), |
|
| 214 | + |
|
| 215 | + ); |
|
| 216 | + |
|
| 217 | + $config = array( |
|
| 218 | + 'default_path' => '', // Default absolute path to pre-packaged plugins. |
|
| 219 | + 'menu' => 'lasso-install-plugins', // Menu slug. |
|
| 220 | + 'has_notices' => true, // Show admin notices or not. |
|
| 221 | + 'dismissable' => true, // If false, a user cannot dismiss the nag message. |
|
| 222 | + 'dismiss_msg' => '', // If 'dismissable' is false, this message will be output at top of nag. |
|
| 223 | + 'is_automatic' => false, // Automatically activate plugins after installation or not. |
|
| 224 | + 'message' => '', // Message to output right before the plugins table. |
|
| 225 | + 'strings' => array( |
|
| 226 | + 'page_title' => __( 'Install Required Plugins', 'lasso' ), |
|
| 227 | + 'menu_title' => __( 'Install Plugins', 'lasso' ), |
|
| 228 | + 'installing' => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name. |
|
| 229 | + 'oops' => __( 'Something went wrong with the plugin API.', 'lasso' ), |
|
| 230 | + 'notice_can_install_required' => _n_noop( 'This plugin requires the following plugin: %1$s.', 'This plugin requires the following plugins: %1$s.' ), // %1$s = plugin name(s). |
|
| 231 | + 'notice_can_install_recommended' => _n_noop( 'This plugin recommends the following plugin: %1$s.', 'This plugin recommends the following plugins: %1$s.' ), // %1$s = plugin name(s). |
|
| 232 | + 'notice_cannot_install' => _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.' ), // %1$s = plugin name(s). |
|
| 233 | + 'notice_can_activate_required' => _n_noop( 'The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s). |
|
| 234 | + 'notice_can_activate_recommended' => _n_noop( 'The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s). |
|
| 235 | + 'notice_cannot_activate' => _n_noop( 'Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.' ), // %1$s = plugin name(s). |
|
| 236 | + 'notice_ask_to_update' => _n_noop( 'The following plugin needs to be updated to its latest version to ensure maximum compatibility with this plugin: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this plugin: %1$s.' ), // %1$s = plugin name(s). |
|
| 237 | + 'notice_cannot_update' => _n_noop( 'Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.' ), // %1$s = plugin name(s). |
|
| 238 | + 'install_link' => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ), |
|
| 239 | + 'activate_link' => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ), |
|
| 240 | + 'return' => __( 'Return to Required Plugins Installer', 'lasso' ), |
|
| 241 | + 'plugin_activated' => __( 'Plugin activated successfully.', 'lasso' ), |
|
| 242 | + 'complete' => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link. |
|
| 243 | + 'nag_type' => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'. |
|
| 244 | + ) |
|
| 245 | + ); |
|
| 246 | + |
|
| 247 | + tgmpa( $plugins, $config ); |
|
| 248 | 248 | |
| 249 | 249 | } |
| 250 | 250 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $postid = get_the_ID(); |
| 69 | 69 | |
| 70 | 70 | $post_date = get_the_time('U', $postid); |
| 71 | - $delta = time() - $post_date; |
|
| 71 | + $delta = time() - $post_date; |
|
| 72 | 72 | |
| 73 | 73 | $strings = array( |
| 74 | 74 | 'save' => __('Save','lasso'), |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | |
| 194 | 194 | |
| 195 | 195 | if (!$using_restapiv2) { |
| 196 | - // enqueue REST API V1 |
|
| 196 | + // enqueue REST API V1 |
|
| 197 | 197 | wp_enqueue_script( 'wp-api-js', LASSO_URL.'/public/assets/js/source/util--wp-api.js', array( 'jquery', 'underscore', 'backbone' ), LASSO_VERSION, true ); |
| 198 | 198 | $settings = array( 'root' => home_url( $home_url ), 'nonce' => wp_create_nonce( 'wp_json' ) ); |
| 199 | 199 | wp_localize_script( 'wp-api-js', 'WP_API_Settings', $settings ); |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | if ($show_color) { |
| 204 | 204 | wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery', 'iris'), LASSO_VERSION, true); |
| 205 | 205 | } else { |
| 206 | - wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true); |
|
| 206 | + wp_enqueue_script('lasso', LASSO_URL. "/public/assets/js/lasso{$postfix}.js", array('jquery'), LASSO_VERSION, true); |
|
| 207 | 207 | } |
| 208 | 208 | wp_localize_script('lasso', 'lasso_editor', apply_filters('lasso_localized_objects', $objects ) ); |
| 209 | 209 | |