@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | public $gatekeeper; |
19 | 19 | public $id; |
20 | 20 | public $name; |
21 | - public $notices = []; |
|
21 | + public $notices = [ ]; |
|
22 | 22 | public $version; |
23 | 23 | |
24 | 24 | /** |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | |
32 | 32 | public function __construct() |
33 | 33 | { |
34 | - $this->file = realpath( dirname( dirname( __FILE__ )) . '/pollux.php' ); |
|
35 | - $this->gatekeeper = new GateKeeper( plugin_basename( $this->file )); |
|
34 | + $this->file = realpath( dirname( dirname( __FILE__ ) ) . '/pollux.php' ); |
|
35 | + $this->gatekeeper = new GateKeeper( plugin_basename( $this->file ) ); |
|
36 | 36 | |
37 | 37 | $data = get_file_data( $this->file, array( |
38 | 38 | 'id' => 'Text Domain', |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | $basename = plugin_basename( $this->file ); |
58 | 58 | $controller = $this->make( 'Controller' ); |
59 | 59 | |
60 | - add_action( 'admin_enqueue_scripts', array( $controller, 'registerAssets' )); |
|
61 | - add_action( 'admin_init', array( $controller, 'removeDashboardWidgets' )); |
|
62 | - add_action( 'wp_before_admin_bar_render', array( $controller, 'removeWordPressMenu' )); |
|
63 | - add_filter( "plugin_action_links_{$basename}", array( $controller, 'filterPluginLinks' )); |
|
64 | - add_filter( 'admin_footer_text', array( $controller, 'filterWordPressFooter' )); |
|
60 | + add_action( 'admin_enqueue_scripts', array( $controller, 'registerAssets' ) ); |
|
61 | + add_action( 'admin_init', array( $controller, 'removeDashboardWidgets' ) ); |
|
62 | + add_action( 'wp_before_admin_bar_render', array( $controller, 'removeWordPressMenu' ) ); |
|
63 | + add_filter( "plugin_action_links_{$basename}", array( $controller, 'filterPluginLinks' ) ); |
|
64 | + add_filter( 'admin_footer_text', array( $controller, 'filterWordPressFooter' ) ); |
|
65 | 65 | |
66 | 66 | // Disallow indexing of the site on non-production environments |
67 | 67 | if( !$this->environment( 'production' ) && !is_admin() ) { |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | public function environment( $checkFor = '' ) |
77 | 77 | { |
78 | 78 | $environment = defined( 'WP_ENV' ) ? WP_ENV : 'production'; |
79 | - if( !empty( $checkFor )) { |
|
79 | + if( !empty( $checkFor ) ) { |
|
80 | 80 | return $environment == $checkFor; |
81 | 81 | } |
82 | 82 | return $environment; |
@@ -109,14 +109,14 @@ discard block |
||
109 | 109 | * @param string $view |
110 | 110 | * @return bool |
111 | 111 | */ |
112 | - public function render( $view, array $data = [] ) |
|
112 | + public function render( $view, array $data = [ ] ) |
|
113 | 113 | { |
114 | 114 | $file = apply_filters( 'pollux/views/file', |
115 | - $this->path( sprintf( 'views/%s.php', str_replace( '.php', '', $view ))), |
|
115 | + $this->path( sprintf( 'views/%s.php', str_replace( '.php', '', $view ) ) ), |
|
116 | 116 | $view, |
117 | 117 | $data |
118 | 118 | ); |
119 | - if( file_exists( $file )) { |
|
119 | + if( file_exists( $file ) ) { |
|
120 | 120 | extract( $data ); |
121 | 121 | return include $file; |
122 | 122 | } |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public function url( $path = '' ) |
131 | 131 | { |
132 | - return esc_url( plugin_dir_url( $this->file ) . ltrim( trim( $path ), '/' )); |
|
132 | + return esc_url( plugin_dir_url( $this->file ) . ltrim( trim( $path ), '/' ) ); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | /** |
@@ -164,6 +164,6 @@ discard block |
||
164 | 164 | 'ArchiveMeta' => 'GeminiLabs\Pollux\Facades\ArchiveMeta', |
165 | 165 | 'PostMeta' => 'GeminiLabs\Pollux\Facades\PostMeta', |
166 | 166 | 'SiteMeta' => 'GeminiLabs\Pollux\Facades\SiteMeta', |
167 | - )))->register(); |
|
167 | + ) ) )->register(); |
|
168 | 168 | } |
169 | 169 | } |
@@ -42,14 +42,14 @@ discard block |
||
42 | 42 | |
43 | 43 | $this->normalize( $this->app->config->{static::ID} ); |
44 | 44 | |
45 | - add_action( 'pollux/'.static::ID.'/init', [$this, 'addSubmitMetaBox'] ); |
|
46 | - add_action( 'current_screen', [$this, 'register'] ); |
|
47 | - add_action( 'admin_menu', [$this, 'registerPage'] ); |
|
48 | - add_action( 'admin_menu', [$this, 'registerSetting'] ); |
|
49 | - add_action( 'pollux/'.static::ID.'/init', [$this, 'resetPage'] ); |
|
50 | - add_action( 'admin_print_footer_scripts', [$this, 'renderFooterScript'] ); |
|
51 | - add_filter( 'pollux/'.static::ID.'/instruction', [$this, 'filterInstruction'], 10, 3 ); |
|
52 | - add_filter( 'pollux/'.static::ID.'/before/instructions', [$this, 'filterBeforeInstructions'] ); |
|
45 | + add_action( 'pollux/' . static::ID . '/init', [ $this, 'addSubmitMetaBox' ] ); |
|
46 | + add_action( 'current_screen', [ $this, 'register' ] ); |
|
47 | + add_action( 'admin_menu', [ $this, 'registerPage' ] ); |
|
48 | + add_action( 'admin_menu', [ $this, 'registerSetting' ] ); |
|
49 | + add_action( 'pollux/' . static::ID . '/init', [ $this, 'resetPage' ] ); |
|
50 | + add_action( 'admin_print_footer_scripts', [ $this, 'renderFooterScript' ] ); |
|
51 | + add_filter( 'pollux/' . static::ID . '/instruction', [ $this, 'filterInstruction' ], 10, 3 ); |
|
52 | + add_filter( 'pollux/' . static::ID . '/before/instructions', [ $this, 'filterBeforeInstructions' ] ); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | public function canProceed() |
@@ -67,11 +67,11 @@ discard block |
||
67 | 67 | call_user_func_array( 'add_meta_box', $this->filter( 'metabox/submit', [ |
68 | 68 | 'submitdiv', |
69 | 69 | __( 'Save Settings', 'pollux' ), |
70 | - [$this, 'renderSubmitMetaBox'], |
|
70 | + [ $this, 'renderSubmitMetaBox' ], |
|
71 | 71 | $this->hook, |
72 | 72 | 'side', |
73 | 73 | 'high', |
74 | - ])); |
|
74 | + ] ) ); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | */ |
91 | 91 | public function filterInstruction( $instruction, array $field, array $metabox ) |
92 | 92 | { |
93 | - return sprintf( "SiteMeta::%s('%s');", $metabox['slug'], $field['slug'] ); |
|
93 | + return sprintf( "SiteMeta::%s('%s');", $metabox[ 'slug' ], $field[ 'slug' ] ); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
@@ -100,10 +100,10 @@ discard block |
||
100 | 100 | */ |
101 | 101 | public function filterSavedSettings( $settings ) |
102 | 102 | { |
103 | - if( is_null( $settings )) { |
|
104 | - $settings = []; |
|
103 | + if( is_null( $settings ) ) { |
|
104 | + $settings = [ ]; |
|
105 | 105 | } |
106 | - return $this->filter( 'save', array_merge( $this->getSettings(), $settings )); |
|
106 | + return $this->filter( 'save', array_merge( $this->getSettings(), $settings ) ); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
@@ -123,8 +123,8 @@ discard block |
||
123 | 123 | */ |
124 | 124 | public function register() |
125 | 125 | { |
126 | - if(( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
127 | - if( $this->app->gatekeeper->hasDependency( self::DEPENDENCY )) { |
|
126 | + if( ( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
127 | + if( $this->app->gatekeeper->hasDependency( self::DEPENDENCY ) ) { |
|
128 | 128 | foreach( parent::register() as $metabox ) { |
129 | 129 | new RWMetaBox( $metabox, static::ID, $this ); |
130 | 130 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | add_screen_option( 'layout_columns', [ |
133 | 133 | 'max' => 2, |
134 | 134 | 'default' => 2, |
135 | - ]); |
|
135 | + ] ); |
|
136 | 136 | $this->action( 'init' ); |
137 | 137 | } |
138 | 138 | |
@@ -147,10 +147,10 @@ discard block |
||
147 | 147 | __( 'Site Settings', 'pollux' ), |
148 | 148 | static::CAPABILITY, |
149 | 149 | static::id(), |
150 | - [$this, 'renderPage'], |
|
150 | + [ $this, 'renderPage' ], |
|
151 | 151 | 'dashicons-screenoptions', |
152 | 152 | 1313 |
153 | - ])); |
|
153 | + ] ) ); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public function registerSetting() |
161 | 161 | { |
162 | - register_setting( static::id(), static::id(), [$this, 'filterSavedSettings'] ); |
|
162 | + register_setting( static::id(), static::id(), [ $this, 'filterSavedSettings' ] ); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | /** |
@@ -168,12 +168,12 @@ discard block |
||
168 | 168 | */ |
169 | 169 | public function renderFooterScript() |
170 | 170 | { |
171 | - if(( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
171 | + if( ( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
172 | 172 | $this->app->render( 'settings/script', [ |
173 | 173 | 'confirm' => __( 'Are you sure want to do this?', 'pollux' ), |
174 | 174 | 'hook' => $this->hook, |
175 | 175 | 'id' => static::id(), |
176 | - ]); |
|
176 | + ] ); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | /** |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | 'columns' => get_current_screen()->get_columns(), |
187 | 187 | 'heading' => __( 'Site Settings', 'pollux' ), |
188 | 188 | 'id' => static::id(), |
189 | - ]); |
|
189 | + ] ); |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | /** |
@@ -203,9 +203,9 @@ discard block |
||
203 | 203 | ]; |
204 | 204 | $this->app->render( 'settings/submit', [ |
205 | 205 | 'reset' => __( 'Reset all', 'pollux' ), |
206 | - 'reset_url' => esc_url( add_query_arg( $query, admin_url( $pagenow ))), |
|
206 | + 'reset_url' => esc_url( add_query_arg( $query, admin_url( $pagenow ) ) ), |
|
207 | 207 | 'submit' => get_submit_button( __( 'Save', 'pollux' ), 'primary', 'submit', false ), |
208 | - ]); |
|
208 | + ] ); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | /** |
@@ -217,15 +217,15 @@ discard block |
||
217 | 217 | if( filter_input( INPUT_GET, 'page' ) !== static::id() |
218 | 218 | || filter_input( INPUT_GET, 'action' ) !== 'reset' |
219 | 219 | )return; |
220 | - if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook )) { |
|
220 | + if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook ) ) { |
|
221 | 221 | update_option( static::id(), $this->getDefaults() ); |
222 | 222 | add_settings_error( static::id(), 'reset', __( 'Reset successful.', 'pollux' ), 'updated' ); |
223 | 223 | } |
224 | 224 | else { |
225 | - add_settings_error( static::id(), 'failed', __( 'Failed to reset. Please try again.', 'pollux' )); |
|
225 | + add_settings_error( static::id(), 'failed', __( 'Failed to reset. Please try again.', 'pollux' ) ); |
|
226 | 226 | } |
227 | 227 | set_transient( 'settings_errors', get_settings_errors(), 30 ); |
228 | - wp_safe_redirect( add_query_arg( 'settings-updated', 'true', wp_get_referer() )); |
|
228 | + wp_safe_redirect( add_query_arg( 'settings-updated', 'true', wp_get_referer() ) ); |
|
229 | 229 | exit; |
230 | 230 | } |
231 | 231 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | protected function filterArrayByKey( array $array, $key ) |
237 | 237 | { |
238 | 238 | return array_filter( $array, function( $value ) use( $key ) { |
239 | - return !empty( $value[$key] ); |
|
239 | + return !empty( $value[ $key ] ); |
|
240 | 240 | }); |
241 | 241 | } |
242 | 242 | |
@@ -249,11 +249,11 @@ discard block |
||
249 | 249 | |
250 | 250 | array_walk( $metaboxes, function( &$metabox ) { |
251 | 251 | $fields = array_map( function( $field ) { |
252 | - $field = wp_parse_args( $field, ['std' => ''] ); |
|
253 | - return [$field['slug'] => $field['std']]; |
|
254 | - }, $this->filterArrayByKey( $metabox['fields'], 'slug' )); |
|
252 | + $field = wp_parse_args( $field, [ 'std' => '' ] ); |
|
253 | + return [ $field[ 'slug' ] => $field[ 'std' ] ]; |
|
254 | + }, $this->filterArrayByKey( $metabox[ 'fields' ], 'slug' ) ); |
|
255 | 255 | $metabox = [ |
256 | - $metabox['slug'] => call_user_func_array( 'array_merge', $fields ), |
|
256 | + $metabox[ 'slug' ] => call_user_func_array( 'array_merge', $fields ), |
|
257 | 257 | ]; |
258 | 258 | }); |
259 | 259 | return call_user_func_array( 'array_merge', $metaboxes ); |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | */ |
272 | 272 | protected function normalizeFieldName( $name, array $data, $parentId ) |
273 | 273 | { |
274 | - return sprintf( '%s[%s][%s]', static::id(), $parentId, $data['slug'] ); |
|
274 | + return sprintf( '%s[%s][%s]', static::id(), $parentId, $data[ 'slug' ] ); |
|
275 | 275 | } |
276 | 276 | |
277 | 277 | /** |
@@ -38,7 +38,9 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function init() |
40 | 40 | { |
41 | - if( !$this->canProceed() )return; |
|
41 | + if( !$this->canProceed() ) { |
|
42 | + return; |
|
43 | + } |
|
42 | 44 | |
43 | 45 | $this->normalize( $this->app->config->{static::ID} ); |
44 | 46 | |
@@ -123,7 +125,9 @@ discard block |
||
123 | 125 | */ |
124 | 126 | public function register() |
125 | 127 | { |
126 | - if(( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
128 | + if(( new Helper )->getCurrentScreen()->id != $this->hook ) { |
|
129 | + return; |
|
130 | + } |
|
127 | 131 | if( $this->app->gatekeeper->hasDependency( self::DEPENDENCY )) { |
128 | 132 | foreach( parent::register() as $metabox ) { |
129 | 133 | new RWMetaBox( $metabox, static::ID, $this ); |
@@ -168,7 +172,9 @@ discard block |
||
168 | 172 | */ |
169 | 173 | public function renderFooterScript() |
170 | 174 | { |
171 | - if(( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
175 | + if(( new Helper )->getCurrentScreen()->id != $this->hook ) { |
|
176 | + return; |
|
177 | + } |
|
172 | 178 | $this->app->render( 'settings/script', [ |
173 | 179 | 'confirm' => __( 'Are you sure want to do this?', 'pollux' ), |
174 | 180 | 'hook' => $this->hook, |
@@ -216,7 +222,9 @@ discard block |
||
216 | 222 | { |
217 | 223 | if( filter_input( INPUT_GET, 'page' ) !== static::id() |
218 | 224 | || filter_input( INPUT_GET, 'action' ) !== 'reset' |
219 | - )return; |
|
225 | + ) { |
|
226 | + return; |
|
227 | + } |
|
220 | 228 | if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook )) { |
221 | 229 | update_option( static::id(), $this->getDefaults() ); |
222 | 230 | add_settings_error( static::id(), 'reset', __( 'Reset successful.', 'pollux' ), 'updated' ); |
@@ -235,7 +243,8 @@ discard block |
||
235 | 243 | */ |
236 | 244 | protected function filterArrayByKey( array $array, $key ) |
237 | 245 | { |
238 | - return array_filter( $array, function( $value ) use( $key ) { |
|
246 | + return array_filter( $array, function( $value ) use( $key ) |
|
247 | + { |
|
239 | 248 | return !empty( $value[$key] ); |
240 | 249 | }); |
241 | 250 | } |
@@ -247,8 +256,10 @@ discard block |
||
247 | 256 | { |
248 | 257 | $metaboxes = $this->filterArrayByKey( $this->metaboxes, 'slug' ); |
249 | 258 | |
250 | - array_walk( $metaboxes, function( &$metabox ) { |
|
251 | - $fields = array_map( function( $field ) { |
|
259 | + array_walk( $metaboxes, function( &$metabox ) |
|
260 | + { |
|
261 | + $fields = array_map( function( $field ) |
|
262 | + { |
|
252 | 263 | $field = wp_parse_args( $field, ['std' => ''] ); |
253 | 264 | return [$field['slug'] => $field['std']]; |
254 | 265 | }, $this->filterArrayByKey( $metabox['fields'], 'slug' )); |
@@ -72,7 +72,8 @@ discard block |
||
72 | 72 | 'href' => '', |
73 | 73 | ]); |
74 | 74 | $atts['class'] = trim( $atts['class'] . ' button button-small' ); |
75 | - $attributes = array_reduce( array_keys( $atts ), function( $carry, $key ) use( $atts ) { |
|
75 | + $attributes = array_reduce( array_keys( $atts ), function( $carry, $key ) use( $atts ) |
|
76 | + { |
|
76 | 77 | return $carry . sprintf( ' %s="%s"', $key, $atts[$key] ); |
77 | 78 | }); |
78 | 79 | return sprintf( '<a%s>%s</a>', $attributes, $title ); |
@@ -151,7 +152,9 @@ discard block |
||
151 | 152 | protected function buildMessage( array $messages ) |
152 | 153 | { |
153 | 154 | foreach( $messages as $key => &$message ) { |
154 | - if( !is_wp_error( $message ))continue; |
|
155 | + if( !is_wp_error( $message )) { |
|
156 | + continue; |
|
157 | + } |
|
155 | 158 | $message = $message->get_error_message(); |
156 | 159 | } |
157 | 160 | return wpautop( implode( PHP_EOL . PHP_EOL, $messages )); |
@@ -29,10 +29,10 @@ discard block |
||
29 | 29 | { |
30 | 30 | $method = strtolower( $name ); |
31 | 31 | $status = substr( $method, 3 ); |
32 | - if( 'add' == substr( $method, 0, 3 ) && in_array( $status, ['error', 'info', 'success', 'warning'] )) { |
|
33 | - return call_user_func_array( [$this, 'addNotice'], array_merge( [$status], $args )); |
|
32 | + if( 'add' == substr( $method, 0, 3 ) && in_array( $status, [ 'error', 'info', 'success', 'warning' ] ) ) { |
|
33 | + return call_user_func_array( [ $this, 'addNotice' ], array_merge( [ $status ], $args ) ); |
|
34 | 34 | } |
35 | - throw new BadMethodCallException( sprintf( 'Not a valid method: %s', $name )); |
|
35 | + throw new BadMethodCallException( sprintf( 'Not a valid method: %s', $name ) ); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function __get( $property ) |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | if( $property == 'all' ) { |
41 | 41 | return $this->app->notices; |
42 | 42 | } |
43 | - throw new Exception( sprintf( 'Not a valid property: %s', $property )); |
|
43 | + throw new Exception( sprintf( 'Not a valid property: %s', $property ) ); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
@@ -48,28 +48,28 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function activateButton( array $plugin ) |
50 | 50 | { |
51 | - $actionUrl = self_admin_url( sprintf( 'options-general.php?page=%s&action=activate&plugin=%s', $this->app->id, $plugin['plugin'] )); |
|
52 | - return $this->button( sprintf( '%s %s', __( 'Activate', 'pollux' ), $plugin['name'] ), [ |
|
53 | - 'data-name' => $plugin['name'], |
|
54 | - 'data-plugin' => $plugin['plugin'], |
|
55 | - 'data-slug' => $plugin['slug'], |
|
56 | - 'href' => wp_nonce_url( $actionUrl, sprintf( 'activate-plugin_%s', $plugin['plugin'] )), |
|
57 | - ]); |
|
51 | + $actionUrl = self_admin_url( sprintf( 'options-general.php?page=%s&action=activate&plugin=%s', $this->app->id, $plugin[ 'plugin' ] ) ); |
|
52 | + return $this->button( sprintf( '%s %s', __( 'Activate', 'pollux' ), $plugin[ 'name' ] ), [ |
|
53 | + 'data-name' => $plugin[ 'name' ], |
|
54 | + 'data-plugin' => $plugin[ 'plugin' ], |
|
55 | + 'data-slug' => $plugin[ 'slug' ], |
|
56 | + 'href' => wp_nonce_url( $actionUrl, sprintf( 'activate-plugin_%s', $plugin[ 'plugin' ] ) ), |
|
57 | + ] ); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | /** |
61 | 61 | * @param string $title |
62 | 62 | * @return string |
63 | 63 | */ |
64 | - public function button( $title, array $atts = [] ) |
|
64 | + public function button( $title, array $atts = [ ] ) |
|
65 | 65 | { |
66 | 66 | $atts = wp_parse_args( $atts, [ |
67 | 67 | 'class' => '', |
68 | 68 | 'href' => '', |
69 | - ]); |
|
70 | - $atts['class'] = trim( $atts['class'] . ' button button-small' ); |
|
69 | + ] ); |
|
70 | + $atts[ 'class' ] = trim( $atts[ 'class' ] . ' button button-small' ); |
|
71 | 71 | $attributes = array_reduce( array_keys( $atts ), function( $carry, $key ) use( $atts ) { |
72 | - return $carry . sprintf( ' %s="%s"', $key, $atts[$key] ); |
|
72 | + return $carry . sprintf( ' %s="%s"', $key, $atts[ $key ] ); |
|
73 | 73 | }); |
74 | 74 | return sprintf( '<a%s>%s</a>', $attributes, $title ); |
75 | 75 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | if( $unset ) { |
83 | 83 | $index = array_search( $notice, $this->app->notices ); |
84 | 84 | if( $index !== false ) { |
85 | - unset( $this->app->notices[$index] ); |
|
85 | + unset( $this->app->notices[ $index ] ); |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | return $this->buildNotice( $notice ); |
@@ -93,13 +93,13 @@ discard block |
||
93 | 93 | */ |
94 | 94 | public function installButton( array $plugin ) |
95 | 95 | { |
96 | - $actionUrl = self_admin_url( sprintf( 'update.php?action=install-plugin&plugin=%s', $plugin['slug'] )); |
|
97 | - return $this->button( sprintf( '%s %s', __( 'Install', 'pollux' ), $plugin['name'] ), [ |
|
98 | - 'data-name' => $plugin['name'], |
|
99 | - 'data-plugin' => $plugin['plugin'], |
|
100 | - 'data-slug' => $plugin['slug'], |
|
101 | - 'href' => wp_nonce_url( $actionUrl, sprintf( 'install-plugin_%s', $plugin['slug'] )), |
|
102 | - ]); |
|
96 | + $actionUrl = self_admin_url( sprintf( 'update.php?action=install-plugin&plugin=%s', $plugin[ 'slug' ] ) ); |
|
97 | + return $this->button( sprintf( '%s %s', __( 'Install', 'pollux' ), $plugin[ 'name' ] ), [ |
|
98 | + 'data-name' => $plugin[ 'name' ], |
|
99 | + 'data-plugin' => $plugin[ 'plugin' ], |
|
100 | + 'data-slug' => $plugin[ 'slug' ], |
|
101 | + 'href' => wp_nonce_url( $actionUrl, sprintf( 'install-plugin_%s', $plugin[ 'slug' ] ) ), |
|
102 | + ] ); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -107,13 +107,13 @@ discard block |
||
107 | 107 | */ |
108 | 108 | public function updateButton( array $plugin ) |
109 | 109 | { |
110 | - $actionUrl = self_admin_url( sprintf( 'update.php?action=upgrade-plugin&plugin=%s', $plugin['plugin'] )); |
|
111 | - return $this->button( sprintf( '%s %s', __( 'Update', 'pollux' ), $plugin['name'] ), [ |
|
112 | - 'data-name' => $plugin['name'], |
|
113 | - 'data-plugin' => $plugin['plugin'], |
|
114 | - 'data-slug' => $plugin['slug'], |
|
115 | - 'href' => wp_nonce_url( $actionUrl, sprintf( 'upgrade-plugin_%s', $plugin['plugin'] )), |
|
116 | - ]); |
|
110 | + $actionUrl = self_admin_url( sprintf( 'update.php?action=upgrade-plugin&plugin=%s', $plugin[ 'plugin' ] ) ); |
|
111 | + return $this->button( sprintf( '%s %s', __( 'Update', 'pollux' ), $plugin[ 'name' ] ), [ |
|
112 | + 'data-name' => $plugin[ 'name' ], |
|
113 | + 'data-plugin' => $plugin[ 'plugin' ], |
|
114 | + 'data-slug' => $plugin[ 'slug' ], |
|
115 | + 'href' => wp_nonce_url( $actionUrl, sprintf( 'upgrade-plugin_%s', $plugin[ 'plugin' ] ) ), |
|
116 | + ] ); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
@@ -133,9 +133,9 @@ discard block |
||
133 | 133 | */ |
134 | 134 | protected function addNotice( $type, $messages, $dismissible = true ) |
135 | 135 | { |
136 | - $this->app->notices[] = [ |
|
136 | + $this->app->notices[ ] = [ |
|
137 | 137 | 'dismissible' => $dismissible, |
138 | - 'message' => $this->buildMessage( array_filter( (array) $messages )), |
|
138 | + 'message' => $this->buildMessage( array_filter( (array) $messages ) ), |
|
139 | 139 | 'type' => $type, |
140 | 140 | ]; |
141 | 141 | $this->app->notices = array_unique( $this->app->notices, SORT_REGULAR ); |
@@ -147,10 +147,10 @@ discard block |
||
147 | 147 | protected function buildMessage( array $messages ) |
148 | 148 | { |
149 | 149 | foreach( $messages as $key => &$message ) { |
150 | - if( !is_wp_error( $message ))continue; |
|
150 | + if( !is_wp_error( $message ) )continue; |
|
151 | 151 | $message = $message->get_error_message(); |
152 | 152 | } |
153 | - return wpautop( implode( PHP_EOL . PHP_EOL, $messages )); |
|
153 | + return wpautop( implode( PHP_EOL . PHP_EOL, $messages ) ); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
@@ -158,10 +158,10 @@ discard block |
||
158 | 158 | */ |
159 | 159 | protected function buildNotice( array $notice ) |
160 | 160 | { |
161 | - $class = sprintf( 'notice notice-%s', $notice['type'] ); |
|
162 | - if( $notice['dismissible'] ) { |
|
161 | + $class = sprintf( 'notice notice-%s', $notice[ 'type' ] ); |
|
162 | + if( $notice[ 'dismissible' ] ) { |
|
163 | 163 | $class .= ' is-dismissible'; |
164 | 164 | } |
165 | - return sprintf( '<div class="pollux-notice %s">%s</div>', $class, $notice['message'] ); |
|
165 | + return sprintf( '<div class="pollux-notice %s">%s</div>', $class, $notice[ 'message' ] ); |
|
166 | 166 | } |
167 | 167 | } |
@@ -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 | } |
@@ -124,6 +124,7 @@ discard block |
||
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
127 | + * @param string $plugin |
|
127 | 128 | * @return bool |
128 | 129 | */ |
129 | 130 | public function hasDependency( $plugin ) |
@@ -403,6 +404,7 @@ discard block |
||
403 | 404 | } |
404 | 405 | |
405 | 406 | /** |
407 | + * @param string $key |
|
406 | 408 | * @return array|string |
407 | 409 | */ |
408 | 410 | protected function getPluginRequirements( $plugin, $key = null ) |
@@ -423,6 +425,7 @@ discard block |
||
423 | 425 | } |
424 | 426 | |
425 | 427 | /** |
428 | + * @param string $message |
|
426 | 429 | * @return void |
427 | 430 | */ |
428 | 431 | protected function printDeactivationNotice( $message ) |
@@ -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 | /** |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | $this->printDeactivationNotice( sprintf( '%s %s', |
255 | 255 | $message1, |
256 | 256 | $message2 |
257 | - )); |
|
257 | + ) ); |
|
258 | 258 | } |
259 | 259 | |
260 | 260 | /** |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | protected function addInvalidWPVersionNotice() |
264 | 264 | { |
265 | 265 | $message = sprintf( __( 'Pollux requires WordPress %s or greater in order to work properly.', 'pollux' ), self::MIN_WORDPRESS_VERSION ); |
266 | - if( current_user_can( 'update_core' )) { |
|
266 | + if( current_user_can( 'update_core' ) ) { |
|
267 | 267 | $message .= PHP_EOL . PHP_EOL . sprintf( '<a href="%s" class="button button-small">%s</a>', |
268 | 268 | self_admin_url( 'update-core.php' ), |
269 | 269 | __( 'Update WordPress', 'pollux' ) |
@@ -280,13 +280,13 @@ discard block |
||
280 | 280 | */ |
281 | 281 | protected function catchError( $plugin, $error, $isValid ) |
282 | 282 | { |
283 | - if( !$isValid && $this->isPluginDependency( $plugin )) { |
|
284 | - if( !isset( $this->errors[$plugin] )) { |
|
285 | - $this->errors[$plugin] = []; |
|
283 | + if( !$isValid && $this->isPluginDependency( $plugin ) ) { |
|
284 | + if( !isset( $this->errors[ $plugin ] ) ) { |
|
285 | + $this->errors[ $plugin ] = [ ]; |
|
286 | 286 | } |
287 | - $this->errors[$plugin] = array_keys( array_flip( |
|
288 | - array_merge( $this->errors[$plugin], [$error] ) |
|
289 | - )); |
|
287 | + $this->errors[ $plugin ] = array_keys( array_flip( |
|
288 | + array_merge( $this->errors[ $plugin ], [ $error ] ) |
|
289 | + ) ); |
|
290 | 290 | } |
291 | 291 | return $isValid; |
292 | 292 | } |
@@ -307,14 +307,14 @@ discard block |
||
307 | 307 | { |
308 | 308 | $actions = ''; |
309 | 309 | foreach( $this->errors as $plugin => $errors ) { |
310 | - if( in_array( 'not_found', $errors ) && current_user_can( 'install_plugins' )) { |
|
311 | - $actions .= $this->notice->installButton( $this->getPluginRequirements( $plugin )); |
|
310 | + if( in_array( 'not_found', $errors ) && current_user_can( 'install_plugins' ) ) { |
|
311 | + $actions .= $this->notice->installButton( $this->getPluginRequirements( $plugin ) ); |
|
312 | 312 | } |
313 | - else if( in_array( 'wrong_version', $errors ) && current_user_can( 'update_plugins' )) { |
|
314 | - $actions .= $this->notice->updateButton( $this->getPluginInformation( $plugin )); |
|
313 | + else if( in_array( 'wrong_version', $errors ) && current_user_can( 'update_plugins' ) ) { |
|
314 | + $actions .= $this->notice->updateButton( $this->getPluginInformation( $plugin ) ); |
|
315 | 315 | } |
316 | - else if( in_array( 'inactive', $errors ) && current_user_can( 'activate_plugins' )) { |
|
317 | - $actions .= $this->notice->activateButton( $this->getPluginInformation( $plugin )); |
|
316 | + else if( in_array( 'inactive', $errors ) && current_user_can( 'activate_plugins' ) ) { |
|
317 | + $actions .= $this->notice->activateButton( $this->getPluginInformation( $plugin ) ); |
|
318 | 318 | } |
319 | 319 | } |
320 | 320 | return $actions; |
@@ -336,10 +336,10 @@ discard block |
||
336 | 336 | protected function getMustUsePlugins() |
337 | 337 | { |
338 | 338 | $plugins = get_mu_plugins(); |
339 | - if( in_array( 'Bedrock Autoloader', array_column( $plugins, 'Name' ))) { |
|
339 | + if( in_array( 'Bedrock Autoloader', array_column( $plugins, 'Name' ) ) ) { |
|
340 | 340 | $autoloadedPlugins = get_site_option( 'bedrock_autoloader' ); |
341 | - if( !empty( $autoloadedPlugins['plugins'] )) { |
|
342 | - return array_merge( $plugins, $autoloadedPlugins['plugins'] ); |
|
341 | + if( !empty( $autoloadedPlugins[ 'plugins' ] ) ) { |
|
342 | + return array_merge( $plugins, $autoloadedPlugins[ 'plugins' ] ); |
|
343 | 343 | } |
344 | 344 | } |
345 | 345 | return $plugins; |
@@ -350,8 +350,8 @@ discard block |
||
350 | 350 | */ |
351 | 351 | protected function getPlugin( $plugin ) |
352 | 352 | { |
353 | - if( $this->isPluginInstalled( $plugin )) { |
|
354 | - return $this->getAllPlugins()[$plugin]; |
|
353 | + if( $this->isPluginInstalled( $plugin ) ) { |
|
354 | + return $this->getAllPlugins()[ $plugin ]; |
|
355 | 355 | } |
356 | 356 | return false; |
357 | 357 | } |
@@ -361,18 +361,18 @@ discard block |
||
361 | 361 | */ |
362 | 362 | protected function getPluginData( $plugin, $data, $key = null ) |
363 | 363 | { |
364 | - if( !is_array( $data )) { |
|
365 | - throw new Exception( sprintf( 'Plugin information not found for: %s', $plugin )); |
|
364 | + if( !is_array( $data ) ) { |
|
365 | + throw new Exception( sprintf( 'Plugin information not found for: %s', $plugin ) ); |
|
366 | 366 | } |
367 | - $data['plugin'] = $plugin; |
|
368 | - $data['slug'] = $this->getPluginSlug( $plugin ); |
|
367 | + $data[ 'plugin' ] = $plugin; |
|
368 | + $data[ 'slug' ] = $this->getPluginSlug( $plugin ); |
|
369 | 369 | $data = array_change_key_case( $data ); |
370 | - if( is_null( $key )) { |
|
370 | + if( is_null( $key ) ) { |
|
371 | 371 | return $data; |
372 | 372 | } |
373 | 373 | $key = strtolower( $key ); |
374 | - return isset( $data[$key] ) |
|
375 | - ? $data[$key] |
|
374 | + return isset( $data[ $key ] ) |
|
375 | + ? $data[ $key ] |
|
376 | 376 | : ''; |
377 | 377 | } |
378 | 378 | |
@@ -396,9 +396,9 @@ discard block |
||
396 | 396 | $data = $this->getPluginRequirements( $plugin ); |
397 | 397 | } |
398 | 398 | return sprintf( '<span class="plugin-%s"><a href="%s">%s</a></span>', |
399 | - $data['slug'], |
|
400 | - $data['pluginuri'], |
|
401 | - $data['name'] |
|
399 | + $data[ 'slug' ], |
|
400 | + $data[ 'pluginuri' ], |
|
401 | + $data[ 'name' ] |
|
402 | 402 | ); |
403 | 403 | } |
404 | 404 | |
@@ -407,9 +407,9 @@ discard block |
||
407 | 407 | */ |
408 | 408 | protected function getPluginRequirements( $plugin, $key = null ) |
409 | 409 | { |
410 | - $keys = ['Name', 'Version', 'PluginURI']; |
|
410 | + $keys = [ 'Name', 'Version', 'PluginURI' ]; |
|
411 | 411 | $requirements = $this->isPluginDependency( $plugin ) |
412 | - ? array_pad( explode( '|', static::DEPENDENCIES[$plugin] ), 3, '' ) |
|
412 | + ? array_pad( explode( '|', static::DEPENDENCIES[ $plugin ] ), 3, '' ) |
|
413 | 413 | : array_fill( 0, 3, '' ); |
414 | 414 | return $this->getPluginData( $plugin, array_combine( $keys, $requirements ), $key ); |
415 | 415 | } |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | */ |
420 | 420 | protected function getPluginSlug( $plugin ) |
421 | 421 | { |
422 | - return substr( $plugin, 0, strrpos( $plugin, '/' )); |
|
422 | + return substr( $plugin, 0, strrpos( $plugin, '/' ) ); |
|
423 | 423 | } |
424 | 424 | |
425 | 425 | /** |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | filter_input( INPUT_GET, 'plugin_status' ), |
443 | 443 | filter_input( INPUT_GET, 'paged' ), |
444 | 444 | filter_input( INPUT_GET, 's' ) |
445 | - ))); |
|
445 | + ) ) ); |
|
446 | 446 | exit; |
447 | 447 | } |
448 | 448 | } |
@@ -27,10 +27,10 @@ discard block |
||
27 | 27 | */ |
28 | 28 | public function filterPluginLinks( array $links ) |
29 | 29 | { |
30 | - $settings_url = admin_url( sprintf( 'options-general.php?page=%s', $this->app->id )); |
|
31 | - $links[] = $this->app->config->disable_config |
|
32 | - ? sprintf( '<span class="network_only">%s</span>', __( 'Settings Disabled', 'pollux' )) |
|
33 | - : sprintf( '<a href="%s">%s</a>', $settings_url, __( 'Settings', 'pollux' )); |
|
30 | + $settings_url = admin_url( sprintf( 'options-general.php?page=%s', $this->app->id ) ); |
|
31 | + $links[ ] = $this->app->config->disable_config |
|
32 | + ? sprintf( '<span class="network_only">%s</span>', __( 'Settings Disabled', 'pollux' ) ) |
|
33 | + : sprintf( '<a href="%s">%s</a>', $settings_url, __( 'Settings', 'pollux' ) ); |
|
34 | 34 | return $links; |
35 | 35 | } |
36 | 36 | |
@@ -59,17 +59,17 @@ discard block |
||
59 | 59 | |
60 | 60 | wp_enqueue_style( 'pollux/main.css', |
61 | 61 | $this->app->url( 'assets/main.css' ), |
62 | - apply_filters( 'pollux/enqueue/css/deps', [] ), |
|
62 | + apply_filters( 'pollux/enqueue/css/deps', [ ] ), |
|
63 | 63 | $this->app->version |
64 | 64 | ); |
65 | 65 | wp_enqueue_script( 'pollux/main.js', |
66 | 66 | $this->app->url( 'assets/main.js' ), |
67 | - apply_filters( 'pollux/enqueue/js/deps', [] ), |
|
67 | + apply_filters( 'pollux/enqueue/js/deps', [ ] ), |
|
68 | 68 | $this->app->version |
69 | 69 | ); |
70 | 70 | wp_localize_script( 'pollux/main.js', |
71 | 71 | apply_filters( 'pollux/enqueue/js/localize/name', $this->app->id ), |
72 | - ['vars' => apply_filters( 'pollux/enqueue/js/localize/variables', [] )] |
|
72 | + [ 'vars' => apply_filters( 'pollux/enqueue/js/localize/variables', [ ] ) ] |
|
73 | 73 | ); |
74 | 74 | } |
75 | 75 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $widgets = apply_filters( 'pollux/dashoard/widgets', [ |
84 | 84 | 'dashboard_primary', |
85 | 85 | 'dashboard_quick_press', |
86 | - ]); |
|
86 | + ] ); |
|
87 | 87 | foreach( $widgets as $widget ) { |
88 | 88 | remove_meta_box( $widget, 'dashboard', 'normal' ); |
89 | 89 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | */ |
106 | 106 | protected function registerArchiveAssets( WP_Screen $screen ) |
107 | 107 | { |
108 | - if(( new Helper )->endsWith( '_archive', $screen->id ) && $screen->pagenow == 'edit.php' ) { |
|
108 | + if( ( new Helper )->endsWith( '_archive', $screen->id ) && $screen->pagenow == 'edit.php' ) { |
|
109 | 109 | wp_enqueue_script( 'common' ); |
110 | 110 | wp_enqueue_script( 'editor-expand' ); |
111 | 111 | wp_enqueue_script( 'post' ); |
@@ -125,12 +125,12 @@ discard block |
||
125 | 125 | if( $screen->id == 'settings_page_pollux' && $screen->pagenow == 'options-general.php' ) { |
126 | 126 | wp_enqueue_style( 'pollux/codemirror.css', |
127 | 127 | $this->app->url( 'assets/codemirror.css' ), |
128 | - [], |
|
128 | + [ ], |
|
129 | 129 | $this->app->version |
130 | 130 | ); |
131 | 131 | wp_enqueue_script( 'pollux/codemirror.js', |
132 | 132 | $this->app->url( 'assets/codemirror.js' ), |
133 | - ['pollux/main.js'], |
|
133 | + [ 'pollux/main.js' ], |
|
134 | 134 | $this->app->version |
135 | 135 | ); |
136 | 136 | } |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | */ |
154 | 154 | protected function registerSettingsAssets( WP_Screen $screen ) |
155 | 155 | { |
156 | - if( $screen->id == sprintf( 'toplevel_page_%s', Settings::id() )) { |
|
156 | + if( $screen->id == sprintf( 'toplevel_page_%s', Settings::id() ) ) { |
|
157 | 157 | wp_enqueue_script( 'common' ); |
158 | 158 | wp_enqueue_script( 'postbox' ); |
159 | 159 | wp_enqueue_script( 'wp-lists' ); |
@@ -40,7 +40,9 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function filterWordPressFooter( $text ) |
42 | 42 | { |
43 | - if( $this->app->config->remove_wordpress_footer )return; |
|
43 | + if( $this->app->config->remove_wordpress_footer ) { |
|
44 | + return; |
|
45 | + } |
|
44 | 46 | return $text; |
45 | 47 | } |
46 | 48 | |
@@ -79,7 +81,9 @@ discard block |
||
79 | 81 | */ |
80 | 82 | public function removeDashboardWidgets() |
81 | 83 | { |
82 | - if( !$this->app->config->remove_dashboard_widgets )return; |
|
84 | + if( !$this->app->config->remove_dashboard_widgets ) { |
|
85 | + return; |
|
86 | + } |
|
83 | 87 | $widgets = apply_filters( 'pollux/dashoard/widgets', [ |
84 | 88 | 'dashboard_primary', |
85 | 89 | 'dashboard_quick_press', |
@@ -95,7 +99,9 @@ discard block |
||
95 | 99 | */ |
96 | 100 | public function removeWordPressMenu() |
97 | 101 | { |
98 | - if( !$this->app->config->remove_wordpress_menu )return; |
|
102 | + if( !$this->app->config->remove_wordpress_menu ) { |
|
103 | + return; |
|
104 | + } |
|
99 | 105 | global $wp_admin_bar; |
100 | 106 | $wp_admin_bar->remove_menu( 'wp-logo' ); |
101 | 107 | } |
@@ -27,15 +27,15 @@ discard block |
||
27 | 27 | |
28 | 28 | remove_action( 'welcome_panel', 'wp_welcome_panel' ); |
29 | 29 | |
30 | - add_action( 'init', [$this, 'disable'] ); |
|
31 | - add_action( 'wp_dashboard_setup', [$this, 'modifyDashboardWidgets'] ); |
|
32 | - add_action( 'welcome_panel', [$this, 'modifyWelcomePanel'] ); |
|
33 | - add_action( 'admin_bar_menu', [$this, 'removeFromAdminBar'], 999 ); |
|
34 | - add_action( 'admin_menu', [$this, 'removeFromAdminMenu'] ); |
|
35 | - add_action( 'admin_init', [$this, 'unregisterDashboardWidgets'] ); |
|
36 | - add_action( 'widgets_init', [$this, 'unregisterWidgets'], 1 ); |
|
37 | - add_filter( 'posts_results', [$this, 'filterPostQuery'] ); |
|
38 | - add_filter( 'pre_get_posts', [$this, 'filterSearchQuery'] ); |
|
30 | + add_action( 'init', [ $this, 'disable' ] ); |
|
31 | + add_action( 'wp_dashboard_setup', [ $this, 'modifyDashboardWidgets' ] ); |
|
32 | + add_action( 'welcome_panel', [ $this, 'modifyWelcomePanel' ] ); |
|
33 | + add_action( 'admin_bar_menu', [ $this, 'removeFromAdminBar' ], 999 ); |
|
34 | + add_action( 'admin_menu', [ $this, 'removeFromAdminMenu' ] ); |
|
35 | + add_action( 'admin_init', [ $this, 'unregisterDashboardWidgets' ] ); |
|
36 | + add_action( 'widgets_init', [ $this, 'unregisterWidgets' ], 1 ); |
|
37 | + add_filter( 'posts_results', [ $this, 'filterPostQuery' ] ); |
|
38 | + add_filter( 'pre_get_posts', [ $this, 'filterSearchQuery' ] ); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -44,14 +44,14 @@ discard block |
||
44 | 44 | */ |
45 | 45 | public function disable() |
46 | 46 | { |
47 | - if( !in_array(( new Helper )->getCurrentScreen()->pagenow, [ |
|
47 | + if( !in_array( ( new Helper )->getCurrentScreen()->pagenow, [ |
|
48 | 48 | 'edit.php', 'edit-tags.php', 'post-new.php', |
49 | - ]))return; |
|
49 | + ] ) )return; |
|
50 | 50 | |
51 | 51 | if( !filter_input_array( INPUT_GET, [ |
52 | 52 | 'post_type' => FILTER_DEFAULT, |
53 | 53 | 'taxonomy' => FILTER_DEFAULT, |
54 | - ])) { |
|
54 | + ] ) ) { |
|
55 | 55 | wp_safe_redirect( get_admin_url(), 301 ); |
56 | 56 | exit; |
57 | 57 | } |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | * @return array |
70 | 70 | * @filter posts_results |
71 | 71 | */ |
72 | - public function filterPostQuery( $posts = [] ) |
|
72 | + public function filterPostQuery( $posts = [ ] ) |
|
73 | 73 | { |
74 | 74 | global $wp_query; |
75 | 75 | return $this->isAdmin() || strpos( $wp_query->request, "wp_posts.post_type = 'post'" ) === false |
76 | 76 | ? $posts |
77 | - : []; |
|
77 | + : [ ]; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -86,8 +86,8 @@ discard block |
||
86 | 86 | if( $this->isAdmin() || !$query->is_main_query() || !is_search() ) { |
87 | 87 | return $query; |
88 | 88 | } |
89 | - $post_types = get_post_types( ['exclude_from_search' => false ] ); |
|
90 | - unset( $post_types['post'] ); |
|
89 | + $post_types = get_post_types( [ 'exclude_from_search' => false ] ); |
|
90 | + unset( $post_types[ 'post' ] ); |
|
91 | 91 | $query->set( 'post_type', array_values( $post_types ) ); |
92 | 92 | return $query; |
93 | 93 | } |
@@ -98,12 +98,12 @@ discard block |
||
98 | 98 | */ |
99 | 99 | public function modifyDashboardWidgets() |
100 | 100 | { |
101 | - if( !is_blog_admin() || !current_user_can( 'edit_posts' ))return; |
|
101 | + if( !is_blog_admin() || !current_user_can( 'edit_posts' ) )return; |
|
102 | 102 | |
103 | 103 | global $wp_meta_boxes; |
104 | - $widgets = &$wp_meta_boxes['dashboard']['normal']['core']; |
|
105 | - if( !isset( $widgets['dashboard_right_now']['callback'] ))return; |
|
106 | - $widgets['dashboard_right_now']['callback'] = function() { |
|
104 | + $widgets = &$wp_meta_boxes[ 'dashboard' ][ 'normal' ][ 'core' ]; |
|
105 | + if( !isset( $widgets[ 'dashboard_right_now' ][ 'callback' ] ) )return; |
|
106 | + $widgets[ 'dashboard_right_now' ][ 'callback' ] = function() { |
|
107 | 107 | ob_start(); |
108 | 108 | wp_dashboard_right_now(); |
109 | 109 | echo preg_replace( '/<li class="post-count">(.*?)<\/li>/', '', ob_get_clean() ); |
@@ -23,7 +23,9 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public function init() |
25 | 25 | { |
26 | - if( !$this->app->config->disable_posts )return; |
|
26 | + if( !$this->app->config->disable_posts ) { |
|
27 | + return; |
|
28 | + } |
|
27 | 29 | |
28 | 30 | remove_action( 'welcome_panel', 'wp_welcome_panel' ); |
29 | 31 | |
@@ -46,7 +48,9 @@ discard block |
||
46 | 48 | { |
47 | 49 | if( !in_array(( new Helper )->getCurrentScreen()->pagenow, [ |
48 | 50 | 'edit.php', 'edit-tags.php', 'post-new.php', |
49 | - ]))return; |
|
51 | + ])) { |
|
52 | + return; |
|
53 | + } |
|
50 | 54 | |
51 | 55 | if( !filter_input_array( INPUT_GET, [ |
52 | 56 | 'post_type' => FILTER_DEFAULT, |
@@ -98,12 +102,17 @@ discard block |
||
98 | 102 | */ |
99 | 103 | public function modifyDashboardWidgets() |
100 | 104 | { |
101 | - if( !is_blog_admin() || !current_user_can( 'edit_posts' ))return; |
|
105 | + if( !is_blog_admin() || !current_user_can( 'edit_posts' )) { |
|
106 | + return; |
|
107 | + } |
|
102 | 108 | |
103 | 109 | global $wp_meta_boxes; |
104 | 110 | $widgets = &$wp_meta_boxes['dashboard']['normal']['core']; |
105 | - if( !isset( $widgets['dashboard_right_now']['callback'] ))return; |
|
106 | - $widgets['dashboard_right_now']['callback'] = function() { |
|
111 | + if( !isset( $widgets['dashboard_right_now']['callback'] )) { |
|
112 | + return; |
|
113 | + } |
|
114 | + $widgets['dashboard_right_now']['callback'] = function() |
|
115 | + { |
|
107 | 116 | ob_start(); |
108 | 117 | wp_dashboard_right_now(); |
109 | 118 | echo preg_replace( '/<li class="post-count">(.*?)<\/li>/', '', ob_get_clean() ); |
@@ -42,13 +42,13 @@ discard block |
||
42 | 42 | $yamlFile = $this->getYamlFile(); |
43 | 43 | $yaml = $this->normalizeYamlValues( $this->normalize( |
44 | 44 | $this->parseYaml( file_get_contents( $yamlFile ), $yamlFile ) |
45 | - )); |
|
46 | - if( !$yaml['disable_config'] ) { |
|
47 | - $config = array_filter( (array) get_option( Config::id(), [] )); |
|
45 | + ) ); |
|
46 | + if( !$yaml[ 'disable_config' ] ) { |
|
47 | + $config = array_filter( (array) get_option( Config::id(), [ ] ) ); |
|
48 | 48 | } |
49 | 49 | return empty( $config ) |
50 | - ? $this->setTimestamp( $yaml, filemtime( $yamlFile )) |
|
51 | - : $this->normalizeYamlValues( $this->normalize( $config )); |
|
50 | + ? $this->setTimestamp( $yaml, filemtime( $yamlFile ) ) |
|
51 | + : $this->normalizeYamlValues( $this->normalize( $config ) ); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -57,15 +57,15 @@ discard block |
||
57 | 57 | public function compile() |
58 | 58 | { |
59 | 59 | $configFile = $this->getCompileDestination(); |
60 | - if( $this->shouldCompile( $configFile )) { |
|
60 | + if( $this->shouldCompile( $configFile ) ) { |
|
61 | 61 | $config = $this->normalizeArray( $this->options ); |
62 | 62 | if( $this->parseError ) { |
63 | 63 | return (object) $config; |
64 | 64 | } |
65 | 65 | file_put_contents( $configFile, sprintf( '<?php // DO NOT MODIFY THIS FILE DIRECTLY!%sreturn (object) %s;', |
66 | 66 | PHP_EOL, |
67 | - $this->parseRawStrings( var_export( $this->setTimestamp( $config ), true )) |
|
68 | - )); |
|
67 | + $this->parseRawStrings( var_export( $this->setTimestamp( $config ), true ) ) |
|
68 | + ) ); |
|
69 | 69 | } |
70 | 70 | return include $configFile; |
71 | 71 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | public function convertArrayToYaml( array $array ) |
77 | 77 | { |
78 | 78 | return !empty( $array ) |
79 | - ? trim( $this->parseRawStrings( $this->dumpYaml( $array ))) |
|
79 | + ? trim( $this->parseRawStrings( $this->dumpYaml( $array ) ) ) |
|
80 | 80 | : ''; |
81 | 81 | } |
82 | 82 | |
@@ -103,11 +103,11 @@ discard block |
||
103 | 103 | trailingslashit( trailingslashit( $theme->theme_root ) . $theme->template ), |
104 | 104 | trailingslashit( WP_CONTENT_DIR ), |
105 | 105 | trailingslashit( ABSPATH ), |
106 | - trailingslashit( dirname( ABSPATH )), |
|
107 | - trailingslashit( dirname( dirname( ABSPATH ))), |
|
108 | - ]); |
|
106 | + trailingslashit( dirname( ABSPATH ) ), |
|
107 | + trailingslashit( dirname( dirname( ABSPATH ) ) ), |
|
108 | + ] ); |
|
109 | 109 | foreach( (array) $configLocations as $location ) { |
110 | - if( !file_exists( $location . $configYaml ))continue; |
|
110 | + if( !file_exists( $location . $configYaml ) )continue; |
|
111 | 111 | return $location . $configYaml; |
112 | 112 | } |
113 | 113 | return $this->app->path( 'defaults.yml' ); |
@@ -119,10 +119,10 @@ discard block |
||
119 | 119 | public function normalizeArray( array $array ) |
120 | 120 | { |
121 | 121 | array_walk( $array, function( &$value, $key ) { |
122 | - if( !is_numeric( $value ) && is_string( $value )) { |
|
122 | + if( !is_numeric( $value ) && is_string( $value ) ) { |
|
123 | 123 | $value = $this->parseYaml( $value, $key ); |
124 | 124 | if( $this->parseError == $key ) { |
125 | - $value = []; |
|
125 | + $value = [ ]; |
|
126 | 126 | } |
127 | 127 | } |
128 | 128 | }); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | public function setTimestamp( array $config, $timestamp = null ) |
148 | 148 | { |
149 | 149 | $timestamp || $timestamp = time(); |
150 | - $config['updated'] = $timestamp; |
|
150 | + $config[ 'updated' ] = $timestamp; |
|
151 | 151 | return $config; |
152 | 152 | } |
153 | 153 | |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | return wp_parse_args( |
173 | 173 | $config, |
174 | 174 | $this->parseYaml( |
175 | - file_get_contents( $this->app->path( 'defaults.yml' )), |
|
175 | + file_get_contents( $this->app->path( 'defaults.yml' ) ), |
|
176 | 176 | $this->app->path( 'defaults.yml' ) |
177 | 177 | ) |
178 | 178 | ); |
@@ -186,13 +186,13 @@ discard block |
||
186 | 186 | protected function parseRawStrings( $configString ) |
187 | 187 | { |
188 | 188 | $strings = apply_filters( 'pollux/config/raw_strings', static::RAW_STRINGS ); |
189 | - if( empty( $strings )) { |
|
189 | + if( empty( $strings ) ) { |
|
190 | 190 | return $configString; |
191 | 191 | } |
192 | 192 | $pattern = '/(\')((' . implode( '|', $strings ) . ')\(?.+\))(\')/'; |
193 | 193 | return stripslashes( |
194 | 194 | preg_replace_callback( $pattern, function( $matches ) { |
195 | - return str_replace( "''", "'", $matches[2] ); |
|
195 | + return str_replace( "''", "'", $matches[ 2 ] ); |
|
196 | 196 | }, $configString ) |
197 | 197 | ); |
198 | 198 | } |
@@ -211,13 +211,13 @@ discard block |
||
211 | 211 | if( $file ) { |
212 | 212 | $file = sprintf( '<code>%s</code>', $file ); |
213 | 213 | } |
214 | - $this->app->make( 'Notice' )->addError([ |
|
214 | + $this->app->make( 'Notice' )->addError( [ |
|
215 | 215 | sprintf( '<strong>Pollux Error:</strong> Unable to parse config at line %s (near "%s").', |
216 | 216 | $e->getParsedLine(), |
217 | 217 | $e->getSnippet() |
218 | 218 | ), |
219 | 219 | $file |
220 | - ]); |
|
220 | + ] ); |
|
221 | 221 | return $value; |
222 | 222 | } |
223 | 223 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | */ |
229 | 229 | protected function shouldCompile( $configFile ) |
230 | 230 | { |
231 | - if( !file_exists( $configFile )) { |
|
231 | + if( !file_exists( $configFile ) ) { |
|
232 | 232 | return true; |
233 | 233 | } |
234 | 234 | $config = include $configFile; |
@@ -107,7 +107,9 @@ discard block |
||
107 | 107 | trailingslashit( dirname( dirname( ABSPATH ))), |
108 | 108 | ]); |
109 | 109 | foreach( (array) $configLocations as $location ) { |
110 | - if( !file_exists( $location . $configYaml ))continue; |
|
110 | + if( !file_exists( $location . $configYaml )) { |
|
111 | + continue; |
|
112 | + } |
|
111 | 113 | return $location . $configYaml; |
112 | 114 | } |
113 | 115 | return $this->app->path( 'defaults.yml' ); |
@@ -118,7 +120,8 @@ discard block |
||
118 | 120 | */ |
119 | 121 | public function normalizeArray( array $array ) |
120 | 122 | { |
121 | - array_walk( $array, function( &$value, $key ) { |
|
123 | + array_walk( $array, function( &$value, $key ) |
|
124 | + { |
|
122 | 125 | if( !is_numeric( $value ) && is_string( $value )) { |
123 | 126 | $value = $this->parseYaml( $value, $key ); |
124 | 127 | if( $this->parseError == $key ) { |
@@ -134,7 +137,8 @@ discard block |
||
134 | 137 | */ |
135 | 138 | public function normalizeYamlValues( array $array ) |
136 | 139 | { |
137 | - return array_map( function( $value ) { |
|
140 | + return array_map( function( $value ) |
|
141 | + { |
|
138 | 142 | return is_array( $value ) |
139 | 143 | ? $this->convertArrayToYaml( $value ) |
140 | 144 | : $value; |
@@ -191,7 +195,8 @@ discard block |
||
191 | 195 | } |
192 | 196 | $pattern = '/(\')((' . implode( '|', $strings ) . ')\(?.+\))(\')/'; |
193 | 197 | return stripslashes( |
194 | - preg_replace_callback( $pattern, function( $matches ) { |
|
198 | + preg_replace_callback( $pattern, function( $matches ) |
|
199 | + { |
|
195 | 200 | return str_replace( "''", "'", $matches[2] ); |
196 | 201 | }, $configString ) |
197 | 202 | ); |