@@ -1328,13 +1328,13 @@ discard block |
||
1328 | 1328 | $key = preg_replace( '`[^A-Za-z0-9_-]`', '', $key ); |
1329 | 1329 | |
1330 | 1330 | /** |
1331 | - * Filter a sanitized key string. |
|
1332 | - * |
|
1333 | - * @since 3.0.0 |
|
1334 | - * |
|
1335 | - * @param string $key Sanitized key. |
|
1336 | - * @param string $raw_key The key prior to sanitization. |
|
1337 | - */ |
|
1331 | + * Filter a sanitized key string. |
|
1332 | + * |
|
1333 | + * @since 3.0.0 |
|
1334 | + * |
|
1335 | + * @param string $key Sanitized key. |
|
1336 | + * @param string $raw_key The key prior to sanitization. |
|
1337 | + */ |
|
1338 | 1338 | return apply_filters( 'tgmpa_sanitize_key', $key, $raw_key ); |
1339 | 1339 | } |
1340 | 1340 | |
@@ -2540,7 +2540,7 @@ discard block |
||
2540 | 2540 | * @return string |
2541 | 2541 | */ |
2542 | 2542 | protected function get_default_primary_column_name() { |
2543 | - return 'plugin'; |
|
2543 | + return 'plugin'; |
|
2544 | 2544 | } |
2545 | 2545 | |
2546 | 2546 | /** |
@@ -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') ) { |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Class responsible for adding a settings submenu |
|
4 | - * |
|
5 | - */ |
|
3 | + * Class responsible for adding a settings submenu |
|
4 | + * |
|
5 | + */ |
|
6 | 6 | namespace lasso_admin\menus; |
7 | 7 | |
8 | 8 | class settings { |
@@ -197,53 +197,53 @@ |
||
197 | 197 | */ |
198 | 198 | function required_plugins() { |
199 | 199 | |
200 | - $plugins = array( |
|
201 | - |
|
202 | - array( |
|
203 | - 'name' => __('WP REST API','lasso'), |
|
204 | - 'slug' => 'json-rest-api', |
|
205 | - 'required' => true, |
|
206 | - ), |
|
207 | - |
|
208 | - array( |
|
209 | - 'name' => __('Aesop Story Engine','lasso'), |
|
210 | - 'slug' => 'aesop-story-engine', |
|
211 | - 'required' => false, |
|
212 | - ), |
|
213 | - |
|
214 | - ); |
|
215 | - |
|
216 | - $config = array( |
|
217 | - 'default_path' => '', // Default absolute path to pre-packaged plugins. |
|
218 | - 'menu' => 'lasso-install-plugins', // Menu slug. |
|
219 | - 'has_notices' => true, // Show admin notices or not. |
|
220 | - 'dismissable' => true, // If false, a user cannot dismiss the nag message. |
|
221 | - 'dismiss_msg' => '', // If 'dismissable' is false, this message will be output at top of nag. |
|
222 | - 'is_automatic' => false, // Automatically activate plugins after installation or not. |
|
223 | - 'message' => '', // Message to output right before the plugins table. |
|
224 | - 'strings' => array( |
|
225 | - 'page_title' => __( 'Install Required Plugins', 'lasso' ), |
|
226 | - 'menu_title' => __( 'Install Plugins', 'lasso' ), |
|
227 | - 'installing' => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name. |
|
228 | - 'oops' => __( 'Something went wrong with the plugin API.', 'lasso' ), |
|
229 | - '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). |
|
230 | - '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). |
|
231 | - '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). |
|
232 | - '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). |
|
233 | - '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). |
|
234 | - '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). |
|
235 | - '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). |
|
236 | - '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). |
|
237 | - 'install_link' => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ), |
|
238 | - 'activate_link' => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ), |
|
239 | - 'return' => __( 'Return to Required Plugins Installer', 'lasso' ), |
|
240 | - 'plugin_activated' => __( 'Plugin activated successfully.', 'lasso' ), |
|
241 | - 'complete' => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link. |
|
242 | - 'nag_type' => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'. |
|
243 | - ) |
|
244 | - ); |
|
245 | - |
|
246 | - tgmpa( $plugins, $config ); |
|
200 | + $plugins = array( |
|
201 | + |
|
202 | + array( |
|
203 | + 'name' => __('WP REST API','lasso'), |
|
204 | + 'slug' => 'json-rest-api', |
|
205 | + 'required' => true, |
|
206 | + ), |
|
207 | + |
|
208 | + array( |
|
209 | + 'name' => __('Aesop Story Engine','lasso'), |
|
210 | + 'slug' => 'aesop-story-engine', |
|
211 | + 'required' => false, |
|
212 | + ), |
|
213 | + |
|
214 | + ); |
|
215 | + |
|
216 | + $config = array( |
|
217 | + 'default_path' => '', // Default absolute path to pre-packaged plugins. |
|
218 | + 'menu' => 'lasso-install-plugins', // Menu slug. |
|
219 | + 'has_notices' => true, // Show admin notices or not. |
|
220 | + 'dismissable' => true, // If false, a user cannot dismiss the nag message. |
|
221 | + 'dismiss_msg' => '', // If 'dismissable' is false, this message will be output at top of nag. |
|
222 | + 'is_automatic' => false, // Automatically activate plugins after installation or not. |
|
223 | + 'message' => '', // Message to output right before the plugins table. |
|
224 | + 'strings' => array( |
|
225 | + 'page_title' => __( 'Install Required Plugins', 'lasso' ), |
|
226 | + 'menu_title' => __( 'Install Plugins', 'lasso' ), |
|
227 | + 'installing' => __( 'Installing Plugin: %s', 'lasso' ), // %s = plugin name. |
|
228 | + 'oops' => __( 'Something went wrong with the plugin API.', 'lasso' ), |
|
229 | + '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). |
|
230 | + '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). |
|
231 | + '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). |
|
232 | + '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). |
|
233 | + '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). |
|
234 | + '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). |
|
235 | + '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). |
|
236 | + '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). |
|
237 | + 'install_link' => _n_noop( 'Begin installing plugin', 'Begin installing plugins' ), |
|
238 | + 'activate_link' => _n_noop( 'Begin activating plugin', 'Begin activating plugins' ), |
|
239 | + 'return' => __( 'Return to Required Plugins Installer', 'lasso' ), |
|
240 | + 'plugin_activated' => __( 'Plugin activated successfully.', 'lasso' ), |
|
241 | + 'complete' => __( 'All plugins installed and activated successfully. %s', 'lasso' ), // %s = dashboard link. |
|
242 | + 'nag_type' => 'updated' // Determines admin notice type - can only be 'updated', 'update-nag' or 'error'. |
|
243 | + ) |
|
244 | + ); |
|
245 | + |
|
246 | + tgmpa( $plugins, $config ); |
|
247 | 247 | |
248 | 248 | } |
249 | 249 | } |
@@ -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)) { |
@@ -1,9 +1,9 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Process various gallery fucntions like fetching and saving images |
|
4 | - * |
|
5 | - * @since 1.0 |
|
6 | - */ |
|
3 | + * Process various gallery fucntions like fetching and saving images |
|
4 | + * |
|
5 | + * @since 1.0 |
|
6 | + */ |
|
7 | 7 | namespace lasso\process; |
8 | 8 | |
9 | 9 | use lasso\internal_api\api_action; |
@@ -118,7 +118,7 @@ |
||
118 | 118 | * @since 0.9.3 |
119 | 119 | * |
120 | 120 | * @param int $postid The current postid |
121 | - * @param string|bool $value The term slug, or a comma separated list of slugs. Or false to remove all terms set for post. |
|
121 | + * @param string|bool $value The term slug, or a comma separated list of slugs. Or false to remove all terms set for post. |
|
122 | 122 | * @param string $taxonomy The name of the taxonomy to which the term belongs. |
123 | 123 | * |
124 | 124 | * @return bool True if update was successful, false if not. |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Find data & sanatize data for this request. |
|
4 | - * |
|
5 | - * @package lasso |
|
6 | - * @author Josh Pollock <[email protected]> |
|
7 | - * @license GPL-2.0+ |
|
8 | - */ |
|
3 | + * Find data & sanatize data for this request. |
|
4 | + * |
|
5 | + * @package lasso |
|
6 | + * @author Josh Pollock <[email protected]> |
|
7 | + * @license GPL-2.0+ |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | namespace lasso\internal_api; |
11 | 11 |
@@ -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 | */ |