@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | const MIN_PHP_VERSION = '5.6.0'; |
18 | 18 | const MIN_WORDPRESS_VERSION = '4.7'; |
19 | 19 | |
20 | - public $errors = []; |
|
20 | + public $errors = [ ]; |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * @var Application |
@@ -39,11 +39,11 @@ discard block |
||
39 | 39 | $this->plugin = $plugin; |
40 | 40 | |
41 | 41 | if( $this->canActivate() ) { |
42 | - add_action( 'admin_init', array( $this, 'init' )); |
|
42 | + add_action( 'admin_init', array( $this, 'init' ) ); |
|
43 | 43 | } |
44 | 44 | else { |
45 | - add_action( 'activated_plugin', array( $this, 'deactivate' )); |
|
46 | - add_action( 'admin_notices', array( $this, 'deactivate' )); |
|
45 | + add_action( 'activated_plugin', array( $this, 'deactivate' ) ); |
|
46 | + add_action( 'admin_notices', array( $this, 'deactivate' ) ); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | |
@@ -52,10 +52,10 @@ discard block |
||
52 | 52 | $this->app = pollux_app(); |
53 | 53 | $this->notice = pollux_app()->make( 'Notice' ); |
54 | 54 | |
55 | - add_action( 'current_screen', array( $this, 'activatePlugin' )); |
|
56 | - add_action( 'wp_ajax_pollux/dependency/activate_url', array( $this, 'ajaxActivatePluginLink' )); |
|
57 | - add_action( 'admin_notices', array( $this, 'printNotices' )); |
|
58 | - add_action( 'current_screen', array( $this, 'setDependencyNotice' )); |
|
55 | + add_action( 'current_screen', array( $this, 'activatePlugin' ) ); |
|
56 | + add_action( 'wp_ajax_pollux/dependency/activate_url', array( $this, 'ajaxActivatePluginLink' ) ); |
|
57 | + add_action( 'admin_notices', array( $this, 'printNotices' ) ); |
|
58 | + add_action( 'current_screen', array( $this, 'setDependencyNotice' ) ); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $plugin = filter_input( INPUT_GET, 'plugin' ); |
70 | 70 | check_admin_referer( 'activate-plugin_' . $plugin ); |
71 | 71 | $result = activate_plugin( $plugin, null, is_network_admin(), true ); |
72 | - if( is_wp_error( $result )) { |
|
72 | + if( is_wp_error( $result ) ) { |
|
73 | 73 | wp_die( $result->get_error_message() ); |
74 | 74 | } |
75 | 75 | wp_safe_redirect( wp_get_referer() ); |
@@ -83,19 +83,19 @@ discard block |
||
83 | 83 | { |
84 | 84 | check_ajax_referer( 'updates' ); |
85 | 85 | $plugin = filter_input( INPUT_POST, 'plugin' ); |
86 | - if( !$this->isPluginDependency( $plugin )) { |
|
86 | + if( !$this->isPluginDependency( $plugin ) ) { |
|
87 | 87 | wp_send_json_error(); |
88 | 88 | } |
89 | - $activateUrl = add_query_arg([ |
|
90 | - '_wpnonce' => wp_create_nonce( sprintf( 'activate-plugin_%s', $plugin )), |
|
89 | + $activateUrl = add_query_arg( [ |
|
90 | + '_wpnonce' => wp_create_nonce( sprintf( 'activate-plugin_%s', $plugin ) ), |
|
91 | 91 | 'action' => 'activate', |
92 | 92 | 'page' => $this->app->id, |
93 | 93 | 'plugin' => $plugin, |
94 | - ], self_admin_url( 'options-general.php' )); |
|
95 | - wp_send_json_success([ |
|
94 | + ], self_admin_url( 'options-general.php' ) ); |
|
95 | + wp_send_json_success( [ |
|
96 | 96 | 'activate_url' => $activateUrl, |
97 | 97 | filter_input( INPUT_POST, 'type' ) => $plugin, |
98 | - ]); |
|
98 | + ] ); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | */ |
129 | 129 | public function hasDependency( $plugin ) |
130 | 130 | { |
131 | - if( !$this->isPluginDependency( $plugin )) { |
|
131 | + if( !$this->isPluginDependency( $plugin ) ) { |
|
132 | 132 | return true; |
133 | 133 | } |
134 | 134 | return $this->isPluginInstalled( $plugin ) && $this->isPluginValid( $plugin ); |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | public function hasPendingDependencies() |
141 | 141 | { |
142 | 142 | foreach( static::DEPENDENCIES as $plugin => $data ) { |
143 | - if( !$this->isPluginDependency( $plugin ))continue; |
|
143 | + if( !$this->isPluginDependency( $plugin ) )continue; |
|
144 | 144 | $this->isPluginActive( $plugin ); |
145 | 145 | $this->isPluginVersionValid( $plugin ); |
146 | 146 | } |
@@ -205,17 +205,17 @@ discard block |
||
205 | 205 | */ |
206 | 206 | public function isPluginVersionValid( $plugin ) |
207 | 207 | { |
208 | - if( !$this->isPluginDependency( $plugin )) { |
|
208 | + if( !$this->isPluginDependency( $plugin ) ) { |
|
209 | 209 | return true; |
210 | 210 | } |
211 | - if( !$this->isPluginInstalled( $plugin )) { |
|
211 | + if( !$this->isPluginInstalled( $plugin ) ) { |
|
212 | 212 | return false; |
213 | 213 | } |
214 | 214 | return $this->catchError( $plugin, 'wrong_version', version_compare( |
215 | 215 | $this->getPluginRequirements( $plugin, 'version' ), |
216 | - $this->getAllPlugins()[$plugin]['Version'], |
|
216 | + $this->getAllPlugins()[ $plugin ][ 'Version' ], |
|
217 | 217 | '<=' |
218 | - )); |
|
218 | + ) ); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | /** |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | __( 'Pollux requires the latest version of the following plugins', 'pollux' ), |
242 | 242 | $this->getDependencyLinks() |
243 | 243 | ); |
244 | - $this->notice->addWarning( [$message, $this->getDependencyActions()] ); |
|
244 | + $this->notice->addWarning( [ $message, $this->getDependencyActions() ] ); |
|
245 | 245 | } |
246 | 246 | |
247 | 247 | /** |
@@ -249,11 +249,11 @@ discard block |
||
249 | 249 | */ |
250 | 250 | protected function addInvalidPHPVersionNotice() |
251 | 251 | { |
252 | - $this->notice->addError([ |
|
253 | - $this->notice->title( __( 'The Pollux plugin was deactivated.', 'pollux' )), |
|
252 | + $this->notice->addError( [ |
|
253 | + $this->notice->title( __( 'The Pollux plugin was deactivated.', 'pollux' ) ), |
|
254 | 254 | sprintf( __( 'Sorry, Pollux requires PHP %s or greater in order to work properly (your server is running PHP %s).', 'pollux' ), self::MIN_PHP_VERSION, PHP_VERSION ), |
255 | 255 | __( 'Please contact your hosting provider or server administrator to upgrade the version of PHP running on your server, or find an alternate plugin.', 'pollux' ), |
256 | - ]); |
|
256 | + ] ); |
|
257 | 257 | } |
258 | 258 | |
259 | 259 | /** |
@@ -261,11 +261,11 @@ discard block |
||
261 | 261 | */ |
262 | 262 | protected function addInvalidWPVersionNotice() |
263 | 263 | { |
264 | - $this->notice->addError([ |
|
265 | - $this->notice->title( __( 'The Pollux plugin was deactivated.', 'pollux' )), |
|
264 | + $this->notice->addError( [ |
|
265 | + $this->notice->title( __( 'The Pollux plugin was deactivated.', 'pollux' ) ), |
|
266 | 266 | sprintf( __( 'Sorry, Pollux requires WordPress %s or greater in order to work properly.', 'pollux' ), self::MIN_WORDPRESS_VERSION ), |
267 | - $this->notice->button( __( 'Update WordPress', 'pollux' ), self_admin_url( 'update-core.php' )), |
|
268 | - ]); |
|
267 | + $this->notice->button( __( 'Update WordPress', 'pollux' ), self_admin_url( 'update-core.php' ) ), |
|
268 | + ] ); |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | /** |
@@ -277,12 +277,12 @@ discard block |
||
277 | 277 | protected function catchError( $plugin, $error, $isValid ) |
278 | 278 | { |
279 | 279 | if( !$isValid ) { |
280 | - if( !isset( $this->errors[$plugin] )) { |
|
281 | - $this->errors[$plugin] = []; |
|
280 | + if( !isset( $this->errors[ $plugin ] ) ) { |
|
281 | + $this->errors[ $plugin ] = [ ]; |
|
282 | 282 | } |
283 | - $this->errors[$plugin] = array_keys( array_flip( |
|
284 | - array_merge( $this->errors[$plugin], [$error] ) |
|
285 | - )); |
|
283 | + $this->errors[ $plugin ] = array_keys( array_flip( |
|
284 | + array_merge( $this->errors[ $plugin ], [ $error ] ) |
|
285 | + ) ); |
|
286 | 286 | } |
287 | 287 | return $isValid; |
288 | 288 | } |
@@ -303,14 +303,14 @@ discard block |
||
303 | 303 | { |
304 | 304 | $actions = ''; |
305 | 305 | foreach( $this->errors as $plugin => $errors ) { |
306 | - if( in_array( 'not_found', $errors ) && current_user_can( 'install_plugins' )) { |
|
307 | - $actions .= $this->notice->installButton( $this->getPluginRequirements( $plugin )); |
|
306 | + if( in_array( 'not_found', $errors ) && current_user_can( 'install_plugins' ) ) { |
|
307 | + $actions .= $this->notice->installButton( $this->getPluginRequirements( $plugin ) ); |
|
308 | 308 | } |
309 | - else if( in_array( 'wrong_version', $errors ) && current_user_can( 'update_plugins' )) { |
|
310 | - $actions .= $this->notice->updateButton( $this->getPluginInformation( $plugin )); |
|
309 | + else if( in_array( 'wrong_version', $errors ) && current_user_can( 'update_plugins' ) ) { |
|
310 | + $actions .= $this->notice->updateButton( $this->getPluginInformation( $plugin ) ); |
|
311 | 311 | } |
312 | - else if( in_array( 'inactive', $errors ) && current_user_can( 'activate_plugins' )) { |
|
313 | - $actions .= $this->notice->activateButton( $this->getPluginInformation( $plugin )); |
|
312 | + else if( in_array( 'inactive', $errors ) && current_user_can( 'activate_plugins' ) ) { |
|
313 | + $actions .= $this->notice->activateButton( $this->getPluginInformation( $plugin ) ); |
|
314 | 314 | } |
315 | 315 | } |
316 | 316 | return $actions; |
@@ -332,10 +332,10 @@ discard block |
||
332 | 332 | protected function getMustUsePlugins() |
333 | 333 | { |
334 | 334 | $plugins = get_mu_plugins(); |
335 | - if( in_array( 'Bedrock Autoloader', array_column( $plugins, 'Name' ))) { |
|
335 | + if( in_array( 'Bedrock Autoloader', array_column( $plugins, 'Name' ) ) ) { |
|
336 | 336 | $autoloadedPlugins = get_site_option( 'bedrock_autoloader' ); |
337 | - if( !empty( $autoloadedPlugins['plugins'] )) { |
|
338 | - return array_merge( $plugins, $autoloadedPlugins['plugins'] ); |
|
337 | + if( !empty( $autoloadedPlugins[ 'plugins' ] ) ) { |
|
338 | + return array_merge( $plugins, $autoloadedPlugins[ 'plugins' ] ); |
|
339 | 339 | } |
340 | 340 | } |
341 | 341 | return $plugins; |
@@ -346,8 +346,8 @@ discard block |
||
346 | 346 | */ |
347 | 347 | protected function getPlugin( $plugin ) |
348 | 348 | { |
349 | - if( $this->isPluginInstalled( $plugin )) { |
|
350 | - return $this->getAllPlugins()[$plugin]; |
|
349 | + if( $this->isPluginInstalled( $plugin ) ) { |
|
350 | + return $this->getAllPlugins()[ $plugin ]; |
|
351 | 351 | } |
352 | 352 | return false; |
353 | 353 | } |
@@ -357,18 +357,18 @@ discard block |
||
357 | 357 | */ |
358 | 358 | protected function getPluginData( $plugin, $data, $key = null ) |
359 | 359 | { |
360 | - if( !is_array( $data )) { |
|
361 | - throw new Exception( sprintf( 'Plugin information not found for: %s', $plugin )); |
|
360 | + if( !is_array( $data ) ) { |
|
361 | + throw new Exception( sprintf( 'Plugin information not found for: %s', $plugin ) ); |
|
362 | 362 | } |
363 | - $data['plugin'] = $plugin; |
|
364 | - $data['slug'] = $this->getPluginSlug( $plugin ); |
|
363 | + $data[ 'plugin' ] = $plugin; |
|
364 | + $data[ 'slug' ] = $this->getPluginSlug( $plugin ); |
|
365 | 365 | $data = array_change_key_case( $data ); |
366 | - if( is_null( $key )) { |
|
366 | + if( is_null( $key ) ) { |
|
367 | 367 | return $data; |
368 | 368 | } |
369 | 369 | $key = strtolower( $key ); |
370 | - return isset( $data[$key] ) |
|
371 | - ? $data[$key] |
|
370 | + return isset( $data[ $key ] ) |
|
371 | + ? $data[ $key ] |
|
372 | 372 | : ''; |
373 | 373 | } |
374 | 374 | |
@@ -392,9 +392,9 @@ discard block |
||
392 | 392 | $data = $this->getPluginRequirements( $plugin ); |
393 | 393 | } |
394 | 394 | return sprintf( '<span class="plugin-%s"><a href="%s">%s</a></span>', |
395 | - $data['slug'], |
|
396 | - $data['pluginuri'], |
|
397 | - $data['name'] |
|
395 | + $data[ 'slug' ], |
|
396 | + $data[ 'pluginuri' ], |
|
397 | + $data[ 'name' ] |
|
398 | 398 | ); |
399 | 399 | } |
400 | 400 | |
@@ -403,9 +403,9 @@ discard block |
||
403 | 403 | */ |
404 | 404 | protected function getPluginRequirements( $plugin, $key = null ) |
405 | 405 | { |
406 | - $keys = ['Name', 'Version', 'PluginURI']; |
|
406 | + $keys = [ 'Name', 'Version', 'PluginURI' ]; |
|
407 | 407 | $requirements = $this->isPluginDependency( $plugin ) |
408 | - ? array_pad( explode( '|', static::DEPENDENCIES[$plugin] ), 3, '' ) |
|
408 | + ? array_pad( explode( '|', static::DEPENDENCIES[ $plugin ] ), 3, '' ) |
|
409 | 409 | : array_fill( 0, 3, '' ); |
410 | 410 | return $this->getPluginData( $plugin, array_combine( $keys, $requirements ), $key ); |
411 | 411 | } |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | */ |
416 | 416 | protected function getPluginSlug( $plugin ) |
417 | 417 | { |
418 | - return substr( $plugin, 0, strrpos( $plugin, '/' )); |
|
418 | + return substr( $plugin, 0, strrpos( $plugin, '/' ) ); |
|
419 | 419 | } |
420 | 420 | |
421 | 421 | /** |
@@ -427,7 +427,7 @@ discard block |
||
427 | 427 | filter_input( INPUT_GET, 'plugin_status' ), |
428 | 428 | filter_input( INPUT_GET, 'paged' ), |
429 | 429 | filter_input( INPUT_GET, 's' ) |
430 | - ))); |
|
430 | + ) ) ); |
|
431 | 431 | exit; |
432 | 432 | } |
433 | 433 | } |
@@ -65,7 +65,9 @@ discard block |
||
65 | 65 | { |
66 | 66 | if( get_current_screen()->id != sprintf( 'settings_page_%s', $this->app->id ) |
67 | 67 | || filter_input( INPUT_GET, 'action' ) != 'activate' |
68 | - )return; |
|
68 | + ) { |
|
69 | + return; |
|
70 | + } |
|
69 | 71 | $plugin = filter_input( INPUT_GET, 'plugin' ); |
70 | 72 | check_admin_referer( 'activate-plugin_' . $plugin ); |
71 | 73 | $result = activate_plugin( $plugin, null, is_network_admin(), true ); |
@@ -140,7 +142,9 @@ discard block |
||
140 | 142 | public function hasPendingDependencies() |
141 | 143 | { |
142 | 144 | foreach( static::DEPENDENCIES as $plugin => $data ) { |
143 | - if( !$this->isPluginDependency( $plugin ))continue; |
|
145 | + if( !$this->isPluginDependency( $plugin )) { |
|
146 | + continue; |
|
147 | + } |
|
144 | 148 | $this->isPluginActive( $plugin ); |
145 | 149 | $this->isPluginVersionValid( $plugin ); |
146 | 150 | } |
@@ -236,7 +240,9 @@ discard block |
||
236 | 240 | if( get_current_screen()->id != 'settings_page_pollux' |
237 | 241 | || $this->app->config->disable_config |
238 | 242 | || !$this->hasPendingDependencies() |
239 | - )return; |
|
243 | + ) { |
|
244 | + return; |
|
245 | + } |
|
240 | 246 | $message = sprintf( '<strong>%s:</strong> %s', |
241 | 247 | __( 'Pollux requires the latest version of the following plugins', 'pollux' ), |
242 | 248 | $this->getDependencyLinks() |
@@ -321,7 +327,8 @@ discard block |
||
321 | 327 | */ |
322 | 328 | protected function getDependencyLinks() |
323 | 329 | { |
324 | - return array_reduce( array_keys( $this->errors ), function( $carry, $plugin ) { |
|
330 | + return array_reduce( array_keys( $this->errors ), function( $carry, $plugin ) |
|
331 | + { |
|
325 | 332 | return $carry . $this->getPluginLink( $plugin ); |
326 | 333 | }); |
327 | 334 | } |