@@ -154,6 +154,7 @@ |
||
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | /** |
| 157 | + * @param integer $imageId |
|
| 157 | 158 | * @return void |
| 158 | 159 | * @callback add_meta_box |
| 159 | 160 | */ |
@@ -40,7 +40,8 @@ discard block |
||
| 40 | 40 | public function filterBeforeInstructions() |
| 41 | 41 | { |
| 42 | 42 | return sprintf( '<pre class="my-sites nav-tab-active misc-pub-section">%s</pre>', |
| 43 | - array_reduce( ['title', 'content', 'featured'], function( $instructions, $id ) { |
|
| 43 | + array_reduce( ['title', 'content', 'featured'], function( $instructions, $id ) |
|
| 44 | + { |
|
| 44 | 45 | return $instructions . $this->filterInstruction( null, ['slug' => $id], ['slug' => $this->getPostType()] ) . PHP_EOL; |
| 45 | 46 | }) |
| 46 | 47 | ); |
@@ -110,7 +111,9 @@ discard block |
||
| 110 | 111 | */ |
| 111 | 112 | public function registerFeaturedImageMetaBox() |
| 112 | 113 | { |
| 113 | - if( !current_user_can( 'upload_files' ))return; |
|
| 114 | + if( !current_user_can( 'upload_files' )) { |
|
| 115 | + return; |
|
| 116 | + } |
|
| 114 | 117 | add_meta_box( 'postimagediv', __( 'Featured Image', 'pollux' ), [$this, 'renderFeaturedImageMetaBox'], null, 'side', 'low' ); |
| 115 | 118 | } |
| 116 | 119 | |
@@ -186,7 +189,9 @@ discard block |
||
| 186 | 189 | public function renderPage() |
| 187 | 190 | { |
| 188 | 191 | $type = $this->getPostType(); |
| 189 | - if( empty( $type ))return; |
|
| 192 | + if( empty( $type )) { |
|
| 193 | + return; |
|
| 194 | + } |
|
| 190 | 195 | $labels = get_post_type_labels( get_post_type_object( $type )); |
| 191 | 196 | $this->app->render( 'archive/index', [ |
| 192 | 197 | 'columns' => get_current_screen()->get_columns(), |
@@ -223,7 +228,8 @@ discard block |
||
| 223 | 228 | */ |
| 224 | 229 | protected function getPostTypesWithArchive() |
| 225 | 230 | { |
| 226 | - $types = array_map( function( $value ) { |
|
| 231 | + $types = array_map( function( $value ) |
|
| 232 | + { |
|
| 227 | 233 | return sprintf( 'edit.php?post_type=%s', $value ); |
| 228 | 234 | }, get_post_types( ['has_archive' => 1] )); |
| 229 | 235 | return array_merge( $types, ['post' => 'edit.php'] ); |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | |
| 10 | 10 | class Archive extends Settings |
| 11 | 11 | { |
| 12 | - CONST ID = 'archives'; |
|
| 12 | + const ID = 'archives'; |
|
| 13 | 13 | |
| 14 | 14 | const CAPABILITY = 'edit_others_posts'; |
| 15 | 15 | const DEPENDENCY = ''; |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | public static $current; |
| 18 | 18 | |
| 19 | - public $hooks = []; |
|
| 19 | + public $hooks = [ ]; |
|
| 20 | 20 | |
| 21 | 21 | /** |
| 22 | 22 | * {@inheritdoc} |
@@ -25,12 +25,12 @@ discard block |
||
| 25 | 25 | { |
| 26 | 26 | parent::init(); |
| 27 | 27 | |
| 28 | - add_action( 'wp_ajax_pollux/archives/featured/html', [$this, 'getFeaturedImageHtml'] ); |
|
| 29 | - add_action( 'pollux/archives/init', [$this, 'registerFeaturedImageMetaBox'] ); |
|
| 30 | - add_action( 'pollux/archives/editor', [$this, 'renderEditor'], 10, 2 ); |
|
| 31 | - add_action( 'wp_ajax_pollux/archives/featured', [$this, 'setFeaturedImage'] ); |
|
| 32 | - add_filter( 'pollux/archives/metabox/submit', [$this, 'filterSubmitMetaBox'] ); |
|
| 33 | - add_filter( 'pollux/archives/show/instructions', '__return_true' ); |
|
| 28 | + add_action( 'wp_ajax_pollux/archives/featured/html', [ $this, 'getFeaturedImageHtml' ] ); |
|
| 29 | + add_action( 'pollux/archives/init', [ $this, 'registerFeaturedImageMetaBox' ] ); |
|
| 30 | + add_action( 'pollux/archives/editor', [ $this, 'renderEditor' ], 10, 2 ); |
|
| 31 | + add_action( 'wp_ajax_pollux/archives/featured', [ $this, 'setFeaturedImage' ] ); |
|
| 32 | + add_filter( 'pollux/archives/metabox/submit', [ $this, 'filterSubmitMetaBox' ] ); |
|
| 33 | + add_filter( 'pollux/archives/show/instructions', '__return_true' ); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | public function canProceed() |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | public function filterBeforeInstructions() |
| 47 | 47 | { |
| 48 | 48 | return sprintf( '<pre class="my-sites nav-tab-active misc-pub-section">%s</pre>', |
| 49 | - array_reduce( ['title', 'content', 'featured'], function( $instructions, $id ) { |
|
| 50 | - return $instructions . $this->filterInstruction( null, ['slug' => $id], ['slug' => $this->getPostType()] ) . PHP_EOL; |
|
| 49 | + array_reduce( [ 'title', 'content', 'featured' ], function( $instructions, $id ) { |
|
| 50 | + return $instructions . $this->filterInstruction( null, [ 'slug' => $id ], [ 'slug' => $this->getPostType() ] ) . PHP_EOL; |
|
| 51 | 51 | }) |
| 52 | 52 | ); |
| 53 | 53 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function filterInstruction( $instruction, array $field, array $metabox ) |
| 61 | 61 | { |
| 62 | - return sprintf( "ArchiveMeta::%s('%s');", $metabox['slug'], $field['slug'] ); |
|
| 62 | + return sprintf( "ArchiveMeta::%s('%s');", $metabox[ 'slug' ], $field[ 'slug' ] ); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function filterSubmitMetaBox( array $args ) |
| 70 | 70 | { |
| 71 | - $args[1] = __( 'Save Archive', 'pollux' ); |
|
| 71 | + $args[ 1 ] = __( 'Save Archive', 'pollux' ); |
|
| 72 | 72 | return $args; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -79,10 +79,10 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | public function getFeaturedImageHtml() |
| 81 | 81 | { |
| 82 | - check_ajax_referer( sprintf( '%s-options', static::id() )); |
|
| 82 | + check_ajax_referer( sprintf( '%s-options', static::id() ) ); |
|
| 83 | 83 | static::$current = filter_input( INPUT_POST, 'post_type' ); |
| 84 | 84 | ob_start(); |
| 85 | - $this->renderFeaturedImageMetaBox( intval( filter_input( INPUT_POST, 'thumbnail_id' ))); |
|
| 85 | + $this->renderFeaturedImageMetaBox( intval( filter_input( INPUT_POST, 'thumbnail_id' ) ) ); |
|
| 86 | 86 | wp_send_json_success( ob_get_clean() ); |
| 87 | 87 | } |
| 88 | 88 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | public function register() |
| 105 | 105 | { |
| 106 | 106 | $screenId = ( new Helper )->getCurrentScreen()->id; |
| 107 | - if( in_array( $screenId, $this->hooks )) { |
|
| 107 | + if( in_array( $screenId, $this->hooks ) ) { |
|
| 108 | 108 | $this->hook = $screenId; |
| 109 | 109 | } |
| 110 | 110 | parent::register(); |
@@ -116,8 +116,8 @@ discard block |
||
| 116 | 116 | */ |
| 117 | 117 | public function registerFeaturedImageMetaBox() |
| 118 | 118 | { |
| 119 | - if( !current_user_can( 'upload_files' ))return; |
|
| 120 | - add_meta_box( 'postimagediv', __( 'Featured Image', 'pollux' ), [$this, 'renderFeaturedImageMetaBox'], null, 'side', 'low' ); |
|
| 119 | + if( !current_user_can( 'upload_files' ) )return; |
|
| 120 | + add_meta_box( 'postimagediv', __( 'Featured Image', 'pollux' ), [ $this, 'renderFeaturedImageMetaBox' ], null, 'side', 'low' ); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | /** |
@@ -127,15 +127,15 @@ discard block |
||
| 127 | 127 | public function registerPage() |
| 128 | 128 | { |
| 129 | 129 | foreach( $this->getPostTypesWithArchive() as $type => $page ) { |
| 130 | - $labels = get_post_type_labels( get_post_type_object( $type )); |
|
| 131 | - $this->hooks[$type] = call_user_func_array( 'add_submenu_page', $this->filter( 'page', [ |
|
| 130 | + $labels = get_post_type_labels( get_post_type_object( $type ) ); |
|
| 131 | + $this->hooks[ $type ] = call_user_func_array( 'add_submenu_page', $this->filter( 'page', [ |
|
| 132 | 132 | $page, |
| 133 | 133 | sprintf( _x( '%s Archive', 'post archive', 'pollux' ), $labels->singular_name ), |
| 134 | 134 | sprintf( _x( '%s Archive', 'post archive', 'pollux' ), $labels->singular_name ), |
| 135 | 135 | static::CAPABILITY, |
| 136 | 136 | sprintf( '%s_archive', $type ), |
| 137 | - [$this, 'renderPage'], |
|
| 138 | - ])); |
|
| 137 | + [ $this, 'renderPage' ], |
|
| 138 | + ] ) ); |
|
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | 'resize' => false, |
| 157 | 157 | 'wp_autoresize_on' => true, |
| 158 | 158 | ], |
| 159 | - ]); |
|
| 159 | + ] ); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -165,12 +165,12 @@ discard block |
||
| 165 | 165 | */ |
| 166 | 166 | public function renderFeaturedImageMetaBox( $imageId = null ) |
| 167 | 167 | { |
| 168 | - if( !is_numeric( $imageId )) { |
|
| 168 | + if( !is_numeric( $imageId ) ) { |
|
| 169 | 169 | $imageId = ArchiveMeta::get( $this->getPostType(), 'featured', -1 ); |
| 170 | 170 | } |
| 171 | - $imageSize = isset( wp_get_additional_image_sizes()['post-thumbnail'] ) |
|
| 171 | + $imageSize = isset( wp_get_additional_image_sizes()[ 'post-thumbnail' ] ) |
|
| 172 | 172 | ? 'post-thumbnail' |
| 173 | - : [266, 266]; |
|
| 173 | + : [ 266, 266 ]; |
|
| 174 | 174 | $thumbnail = get_post( $imageId ) |
| 175 | 175 | ? wp_get_attachment_image( $imageId, $imageSize ) |
| 176 | 176 | : __( 'Set Featured Image', 'pollux' ); |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | 'post_type' => $this->getPostType(), |
| 183 | 183 | 'remove_image' => __( 'Remove featured image', 'pollux' ), |
| 184 | 184 | 'thumbnail' => $thumbnail, |
| 185 | - ]); |
|
| 185 | + ] ); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | /** |
@@ -192,8 +192,8 @@ discard block |
||
| 192 | 192 | public function renderPage() |
| 193 | 193 | { |
| 194 | 194 | $type = $this->getPostType(); |
| 195 | - if( empty( $type ))return; |
|
| 196 | - $labels = get_post_type_labels( get_post_type_object( $type )); |
|
| 195 | + if( empty( $type ) )return; |
|
| 196 | + $labels = get_post_type_labels( get_post_type_object( $type ) ); |
|
| 197 | 197 | $this->app->render( 'archive/index', [ |
| 198 | 198 | 'columns' => get_current_screen()->get_columns(), |
| 199 | 199 | 'content' => ArchiveMeta::get( $type, 'content', '' ), |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | 'id' => static::id(), |
| 202 | 202 | 'post_type' => $type, |
| 203 | 203 | 'title' => ArchiveMeta::get( $type, 'title', '' ), |
| 204 | - ]); |
|
| 204 | + ] ); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | /** |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | */ |
| 210 | 210 | protected function getDefaults() |
| 211 | 211 | { |
| 212 | - return []; |
|
| 212 | + return [ ]; |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | /** |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | protected function getPostType() |
| 219 | 219 | { |
| 220 | 220 | $type = array_search( $this->hook, $this->hooks ); |
| 221 | - if( !empty( $type ) && is_string( $type )) { |
|
| 221 | + if( !empty( $type ) && is_string( $type ) ) { |
|
| 222 | 222 | static::$current = $type; |
| 223 | 223 | } |
| 224 | 224 | return static::$current; |
@@ -231,8 +231,8 @@ discard block |
||
| 231 | 231 | { |
| 232 | 232 | $types = array_map( function( $value ) { |
| 233 | 233 | return sprintf( 'edit.php?post_type=%s', $value ); |
| 234 | - }, get_post_types( ['has_archive' => 1] )); |
|
| 235 | - return array_merge( $types, ['post' => 'edit.php'] ); |
|
| 234 | + }, get_post_types( [ 'has_archive' => 1 ] ) ); |
|
| 235 | + return array_merge( $types, [ 'post' => 'edit.php' ] ); |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | /** |
@@ -36,8 +36,8 @@ |
||
| 36 | 36 | $data = wp_parse_args( $data, $defaults ); |
| 37 | 37 | foreach( $defaults as $key => $value ) { |
| 38 | 38 | $method = ( new Helper )->buildMethodName( $key, 'normalize' ); |
| 39 | - if( method_exists( $this, $method )) { |
|
| 40 | - $data[$key] = $this->$method( $data[$key], $data, $id ); |
|
| 39 | + if( method_exists( $this, $method ) ) { |
|
| 40 | + $data[ $key ] = $this->$method( $data[ $key ], $data, $id ); |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | return $data; |
@@ -14,10 +14,10 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | const TAXONOMY_DEFAULTS = [ |
| 16 | 16 | 'hierarchical' => true, |
| 17 | - 'labels' => [], |
|
| 17 | + 'labels' => [ ], |
|
| 18 | 18 | 'menu_name' => '', |
| 19 | 19 | 'plural' => '', |
| 20 | - 'post_types' => [], |
|
| 20 | + 'post_types' => [ ], |
|
| 21 | 21 | 'public' => true, |
| 22 | 22 | 'rewrite' => true, |
| 23 | 23 | 'show_admin_column' => true, |
@@ -28,20 +28,20 @@ discard block |
||
| 28 | 28 | /** |
| 29 | 29 | * @var array |
| 30 | 30 | */ |
| 31 | - public $taxonomies = []; |
|
| 31 | + public $taxonomies = [ ]; |
|
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * {@inheritdoc} |
| 35 | 35 | */ |
| 36 | 36 | public function init() |
| 37 | 37 | { |
| 38 | - if( empty( $this->app->config->taxonomies ))return; |
|
| 38 | + if( empty( $this->app->config->taxonomies ) )return; |
|
| 39 | 39 | |
| 40 | 40 | $this->normalize(); |
| 41 | 41 | |
| 42 | - add_action( 'restrict_manage_posts', [ $this, 'printFilters'] ); |
|
| 43 | - add_action( 'init', [ $this, 'register'] ); |
|
| 44 | - add_filter( 'parse_query', [ $this, 'filterByTaxonomy'] ); |
|
| 42 | + add_action( 'restrict_manage_posts', [ $this, 'printFilters' ] ); |
|
| 43 | + add_action( 'init', [ $this, 'register' ] ); |
|
| 44 | + add_filter( 'parse_query', [ $this, 'filterByTaxonomy' ] ); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | if( !is_admin() || ( new Helper )->getCurrentScreen()->base != 'edit' )return; |
| 54 | 54 | $vars = &$query->query_vars; |
| 55 | 55 | foreach( array_keys( $this->taxonomies ) as $taxonomy ) { |
| 56 | - if( !isset( $vars[$taxonomy] ))return; |
|
| 57 | - if( $term = get_term_by( 'id', $vars[$taxonomy], $taxonomy )) { |
|
| 58 | - $vars[$taxonomy] = $term->slug; |
|
| 56 | + if( !isset( $vars[ $taxonomy ] ) )return; |
|
| 57 | + if( $term = get_term_by( 'id', $vars[ $taxonomy ], $taxonomy ) ) { |
|
| 58 | + $vars[ $taxonomy ] = $term->slug; |
|
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | return $query; |
@@ -69,18 +69,18 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | global $wp_query; |
| 71 | 71 | foreach( $this->taxonomies as $taxonomy => $args ) { |
| 72 | - if( !in_array( get_current_screen()->post_type, $args['post_types'] ))continue; |
|
| 73 | - $selected = isset( $wp_query->query[$taxonomy] ) |
|
| 74 | - ? $wp_query->query[$taxonomy] |
|
| 72 | + if( !in_array( get_current_screen()->post_type, $args[ 'post_types' ] ) )continue; |
|
| 73 | + $selected = isset( $wp_query->query[ $taxonomy ] ) |
|
| 74 | + ? $wp_query->query[ $taxonomy ] |
|
| 75 | 75 | : false; |
| 76 | - wp_dropdown_categories([ |
|
| 76 | + wp_dropdown_categories( [ |
|
| 77 | 77 | 'hide_if_empty' => true, |
| 78 | 78 | 'name' => $taxonomy, |
| 79 | 79 | 'orderby' => 'name', |
| 80 | 80 | 'selected' => $selected, |
| 81 | - 'show_option_all' => $args['labels']['all_items'], |
|
| 81 | + 'show_option_all' => $args[ 'labels' ][ 'all_items' ], |
|
| 82 | 82 | 'taxonomy' => $taxonomy, |
| 83 | - ]); |
|
| 83 | + ] ); |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | |
@@ -91,8 +91,8 @@ discard block |
||
| 91 | 91 | public function register() |
| 92 | 92 | { |
| 93 | 93 | array_walk( $this->taxonomies, function( $args, $taxonomy ) { |
| 94 | - register_taxonomy( $taxonomy, $args['post_types'], array_diff_key( $args, array_flip( static::CUSTOM_KEYS ))); |
|
| 95 | - foreach( $args['post_types'] as $type ) { |
|
| 94 | + register_taxonomy( $taxonomy, $args[ 'post_types' ], array_diff_key( $args, array_flip( static::CUSTOM_KEYS ) ) ); |
|
| 95 | + foreach( $args[ 'post_types' ] as $type ) { |
|
| 96 | 96 | register_taxonomy_for_object_type( $taxonomy, $type ); |
| 97 | 97 | } |
| 98 | 98 | }); |
@@ -104,13 +104,13 @@ discard block |
||
| 104 | 104 | protected function normalize() |
| 105 | 105 | { |
| 106 | 106 | foreach( $this->app->config->taxonomies as $taxonomy => $args ) { |
| 107 | - $this->taxonomies[$taxonomy] = apply_filters( 'pollux/taxonomy/args', |
|
| 107 | + $this->taxonomies[ $taxonomy ] = apply_filters( 'pollux/taxonomy/args', |
|
| 108 | 108 | $this->normalizeThis( $args, static::TAXONOMY_DEFAULTS, $taxonomy ) |
| 109 | 109 | ); |
| 110 | 110 | } |
| 111 | 111 | $this->taxonomies = array_diff_key( |
| 112 | 112 | $this->taxonomies, |
| 113 | - get_taxonomies( ['_builtin' => true] ) |
|
| 113 | + get_taxonomies( [ '_builtin' => true ] ) |
|
| 114 | 114 | ); |
| 115 | 115 | } |
| 116 | 116 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | */ |
| 121 | 121 | protected function normalizeLabels( $labels, array $args ) |
| 122 | 122 | { |
| 123 | - return wp_parse_args( $labels, $this->setLabels( $args )); |
|
| 123 | + return wp_parse_args( $labels, $this->setLabels( $args ) ); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | /** |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | protected function normalizeMenuName( $menuname, array $args ) |
| 131 | 131 | { |
| 132 | 132 | return empty( $menuname ) |
| 133 | - ? $args['plural'] |
|
| 133 | + ? $args[ 'plural' ] |
|
| 134 | 134 | : $menuname; |
| 135 | 135 | } |
| 136 | 136 | |
@@ -149,17 +149,17 @@ discard block |
||
| 149 | 149 | protected function setLabels( array $args ) |
| 150 | 150 | { |
| 151 | 151 | return apply_filters( 'pollux/taxonomy/labels', [ |
| 152 | - 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new taxonomy', 'pollux' ), $args['single'] ), |
|
| 153 | - 'all_items' => sprintf( _x( 'All %s', 'All taxonomies', 'pollux' ), $args['plural'] ), |
|
| 154 | - 'edit_item' => sprintf( _x( 'Edit %s', 'Edit taxonomy', 'pollux' ), $args['single'] ), |
|
| 155 | - 'menu_name' => $this->normalizeMenuName( $args['menu_name'], $args ), |
|
| 156 | - 'name' => $args['plural'], |
|
| 157 | - 'new_item_name' => sprintf( _x( 'New %s Name', 'New taxonomy name', 'pollux' ), $args['single'] ), |
|
| 158 | - 'not_found' => sprintf( _x( 'No %s found', 'No taxonomies found', 'pollux' ), $args['plural'] ), |
|
| 159 | - 'search_items' => sprintf( _x( 'Search %s', 'Search taxonomies', 'pollux' ), $args['plural'] ), |
|
| 160 | - 'singular_name' => $args['single'], |
|
| 161 | - 'update_item' => sprintf( _x( 'Update %s', 'Update taxonomy', 'pollux' ), $args['single'] ), |
|
| 162 | - 'view_item' => sprintf( _x( 'View %s', 'View taxonomy', 'pollux' ), $args['single'] ), |
|
| 152 | + 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
| 153 | + 'all_items' => sprintf( _x( 'All %s', 'All taxonomies', 'pollux' ), $args[ 'plural' ] ), |
|
| 154 | + 'edit_item' => sprintf( _x( 'Edit %s', 'Edit taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
| 155 | + 'menu_name' => $this->normalizeMenuName( $args[ 'menu_name' ], $args ), |
|
| 156 | + 'name' => $args[ 'plural' ], |
|
| 157 | + 'new_item_name' => sprintf( _x( 'New %s Name', 'New taxonomy name', 'pollux' ), $args[ 'single' ] ), |
|
| 158 | + 'not_found' => sprintf( _x( 'No %s found', 'No taxonomies found', 'pollux' ), $args[ 'plural' ] ), |
|
| 159 | + 'search_items' => sprintf( _x( 'Search %s', 'Search taxonomies', 'pollux' ), $args[ 'plural' ] ), |
|
| 160 | + 'singular_name' => $args[ 'single' ], |
|
| 161 | + 'update_item' => sprintf( _x( 'Update %s', 'Update taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
| 162 | + 'view_item' => sprintf( _x( 'View %s', 'View taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
| 163 | 163 | ], $args ); |
| 164 | 164 | } |
| 165 | 165 | } |
@@ -35,7 +35,9 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | public function init() |
| 37 | 37 | { |
| 38 | - if( empty( $this->app->config->taxonomies ))return; |
|
| 38 | + if( empty( $this->app->config->taxonomies )) { |
|
| 39 | + return; |
|
| 40 | + } |
|
| 39 | 41 | |
| 40 | 42 | $this->normalize(); |
| 41 | 43 | |
@@ -50,10 +52,14 @@ discard block |
||
| 50 | 52 | */ |
| 51 | 53 | public function filterByTaxonomy( WP_Query $query ) |
| 52 | 54 | { |
| 53 | - if( !is_admin() || ( new Helper )->getCurrentScreen()->base != 'edit' )return; |
|
| 55 | + if( !is_admin() || ( new Helper )->getCurrentScreen()->base != 'edit' ) { |
|
| 56 | + return; |
|
| 57 | + } |
|
| 54 | 58 | $vars = &$query->query_vars; |
| 55 | 59 | foreach( array_keys( $this->taxonomies ) as $taxonomy ) { |
| 56 | - if( !isset( $vars[$taxonomy] ))return; |
|
| 60 | + if( !isset( $vars[$taxonomy] )) { |
|
| 61 | + return; |
|
| 62 | + } |
|
| 57 | 63 | if( $term = get_term_by( 'id', $vars[$taxonomy], $taxonomy )) { |
| 58 | 64 | $vars[$taxonomy] = $term->slug; |
| 59 | 65 | } |
@@ -69,7 +75,9 @@ discard block |
||
| 69 | 75 | { |
| 70 | 76 | global $wp_query; |
| 71 | 77 | foreach( $this->taxonomies as $taxonomy => $args ) { |
| 72 | - if( !in_array( get_current_screen()->post_type, $args['post_types'] ))continue; |
|
| 78 | + if( !in_array( get_current_screen()->post_type, $args['post_types'] )) { |
|
| 79 | + continue; |
|
| 80 | + } |
|
| 73 | 81 | $selected = isset( $wp_query->query[$taxonomy] ) |
| 74 | 82 | ? $wp_query->query[$taxonomy] |
| 75 | 83 | : false; |
@@ -90,7 +98,8 @@ discard block |
||
| 90 | 98 | */ |
| 91 | 99 | public function register() |
| 92 | 100 | { |
| 93 | - array_walk( $this->taxonomies, function( $args, $taxonomy ) { |
|
| 101 | + array_walk( $this->taxonomies, function( $args, $taxonomy ) |
|
| 102 | + { |
|
| 94 | 103 | register_taxonomy( $taxonomy, $args['post_types'], array_diff_key( $args, array_flip( static::CUSTOM_KEYS ))); |
| 95 | 104 | foreach( $args['post_types'] as $type ) { |
| 96 | 105 | register_taxonomy_for_object_type( $taxonomy, $type ); |
@@ -45,7 +45,9 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function init() |
| 47 | 47 | { |
| 48 | - if( empty( $this->app->config->post_types ))return; |
|
| 48 | + if( empty( $this->app->config->post_types )) { |
|
| 49 | + return; |
|
| 50 | + } |
|
| 49 | 51 | |
| 50 | 52 | $this->setColumns(); |
| 51 | 53 | $this->normalize(); |
@@ -64,7 +66,8 @@ discard block |
||
| 64 | 66 | $this->types, |
| 65 | 67 | get_post_types( ['_builtin' => true] ) |
| 66 | 68 | ); |
| 67 | - array_walk( $types, function( $args, $type ) { |
|
| 69 | + array_walk( $types, function( $args, $type ) |
|
| 70 | + { |
|
| 68 | 71 | register_post_type( $type, array_diff_key( $args, array_flip( static::CUSTOM_KEYS ))); |
| 69 | 72 | }); |
| 70 | 73 | } |
@@ -15,10 +15,10 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | const POST_TYPE_DEFAULTS = [ |
| 17 | 17 | 'capability_type' => 'post', |
| 18 | - 'columns' => [], |
|
| 18 | + 'columns' => [ ], |
|
| 19 | 19 | 'has_archive' => false, |
| 20 | 20 | 'hierarchical' => false, |
| 21 | - 'labels' => [], |
|
| 21 | + 'labels' => [ ], |
|
| 22 | 22 | 'map_meta_cap' => true, |
| 23 | 23 | 'menu_icon' => null, |
| 24 | 24 | 'menu_name' => '', |
@@ -30,27 +30,27 @@ discard block |
||
| 30 | 30 | 'show_in_menu' => true, |
| 31 | 31 | 'show_ui' => true, |
| 32 | 32 | 'single' => '', |
| 33 | - 'supports' => ['title', 'editor', 'thumbnail'], |
|
| 34 | - 'taxonomies' => [], |
|
| 33 | + 'supports' => [ 'title', 'editor', 'thumbnail' ], |
|
| 34 | + 'taxonomies' => [ ], |
|
| 35 | 35 | ]; |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @var array |
| 39 | 39 | */ |
| 40 | - public $types = []; |
|
| 40 | + public $types = [ ]; |
|
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | 43 | * {@inheritdoc} |
| 44 | 44 | */ |
| 45 | 45 | public function init() |
| 46 | 46 | { |
| 47 | - if( empty( $this->app->config->post_types ))return; |
|
| 47 | + if( empty( $this->app->config->post_types ) )return; |
|
| 48 | 48 | |
| 49 | 49 | $this->setColumns(); |
| 50 | 50 | $this->normalize(); |
| 51 | 51 | $this->initColumns(); |
| 52 | 52 | |
| 53 | - add_action( 'init', [$this, 'register'] ); |
|
| 53 | + add_action( 'init', [ $this, 'register' ] ); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
@@ -61,10 +61,10 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | $types = array_diff_key( |
| 63 | 63 | $this->types, |
| 64 | - get_post_types( ['_builtin' => true] ) |
|
| 64 | + get_post_types( [ '_builtin' => true ] ) |
|
| 65 | 65 | ); |
| 66 | 66 | array_walk( $types, function( $args, $type ) { |
| 67 | - register_post_type( $type, array_diff_key( $args, array_flip( static::CUSTOM_KEYS ))); |
|
| 67 | + register_post_type( $type, array_diff_key( $args, array_flip( static::CUSTOM_KEYS ) ) ); |
|
| 68 | 68 | }); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | protected function normalize() |
| 75 | 75 | { |
| 76 | 76 | foreach( $this->app->config->post_types as $type => $args ) { |
| 77 | - $this->types[$type] = apply_filters( 'pollux/post_type/args', |
|
| 77 | + $this->types[ $type ] = apply_filters( 'pollux/post_type/args', |
|
| 78 | 78 | $this->normalizeThis( $args, static::POST_TYPE_DEFAULTS, $type ), |
| 79 | 79 | $type |
| 80 | 80 | ); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | */ |
| 88 | 88 | protected function normalizeLabels( $labels, array $args ) |
| 89 | 89 | { |
| 90 | - return wp_parse_args( $labels, $this->setLabels( $args )); |
|
| 90 | + return wp_parse_args( $labels, $this->setLabels( $args ) ); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | protected function normalizeMenuName( $menuname, array $args ) |
| 98 | 98 | { |
| 99 | 99 | return empty( $menuname ) |
| 100 | - ? $args['plural'] |
|
| 100 | + ? $args[ 'plural' ] |
|
| 101 | 101 | : $menuname; |
| 102 | 102 | } |
| 103 | 103 | |
@@ -108,17 +108,17 @@ discard block |
||
| 108 | 108 | { |
| 109 | 109 | return apply_filters( 'pollux/post_type/labels', [ |
| 110 | 110 | 'add_new' => __( 'Add New', 'pollux' ), |
| 111 | - 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new post', 'pollux' ), $args['single'] ), |
|
| 112 | - 'all_items' => sprintf( _x( 'All %s', 'All posts', 'pollux' ), $args['plural'] ), |
|
| 113 | - 'edit_item' => sprintf( _x( 'Edit %s', 'Edit post', 'pollux' ), $args['single'] ), |
|
| 114 | - 'menu_name' => $this->normalizeMenuName( $args['menu_name'], $args ), |
|
| 115 | - 'name' => $args['plural'], |
|
| 116 | - 'new_item' => sprintf( _x( 'New %s', 'New post', 'pollux' ), $args['single'] ), |
|
| 117 | - 'not_found' => sprintf( _x( 'No %s found', 'No posts found', 'pollux' ), $args['plural'] ), |
|
| 118 | - 'not_found_in_trash' => sprintf( _x( 'No %s found in Trash', 'No posts found in trash', 'pollux' ), $args['plural'] ), |
|
| 119 | - 'search_items' => sprintf( _x( 'Search %s', 'Search posts', 'pollux' ), $args['plural'] ), |
|
| 120 | - 'singular_name' => $args['single'], |
|
| 121 | - 'view_item' => sprintf( _x( 'View %s', 'View post', 'pollux' ), $args['single'] ), |
|
| 111 | + 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new post', 'pollux' ), $args[ 'single' ] ), |
|
| 112 | + 'all_items' => sprintf( _x( 'All %s', 'All posts', 'pollux' ), $args[ 'plural' ] ), |
|
| 113 | + 'edit_item' => sprintf( _x( 'Edit %s', 'Edit post', 'pollux' ), $args[ 'single' ] ), |
|
| 114 | + 'menu_name' => $this->normalizeMenuName( $args[ 'menu_name' ], $args ), |
|
| 115 | + 'name' => $args[ 'plural' ], |
|
| 116 | + 'new_item' => sprintf( _x( 'New %s', 'New post', 'pollux' ), $args[ 'single' ] ), |
|
| 117 | + 'not_found' => sprintf( _x( 'No %s found', 'No posts found', 'pollux' ), $args[ 'plural' ] ), |
|
| 118 | + 'not_found_in_trash' => sprintf( _x( 'No %s found in Trash', 'No posts found in trash', 'pollux' ), $args[ 'plural' ] ), |
|
| 119 | + 'search_items' => sprintf( _x( 'Search %s', 'Search posts', 'pollux' ), $args[ 'plural' ] ), |
|
| 120 | + 'singular_name' => $args[ 'single' ], |
|
| 121 | + 'view_item' => sprintf( _x( 'View %s', 'View post', 'pollux' ), $args[ 'single' ] ), |
|
| 122 | 122 | ], $args ); |
| 123 | 123 | } |
| 124 | 124 | } |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if( !function_exists( 'pollux_app' )) { |
|
| 3 | +if( !function_exists( 'pollux_app' ) ) { |
|
| 4 | 4 | function pollux_app() { |
| 5 | 5 | return GeminiLabs\Pollux\Application::getInstance(); |
| 6 | 6 | } |
@@ -1,7 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | if( !function_exists( 'pollux_app' )) { |
| 4 | - function pollux_app() { |
|
| 4 | + function pollux_app() |
|
| 5 | + { |
|
| 5 | 6 | return GeminiLabs\Pollux\Application::getInstance(); |
| 6 | 7 | } |
| 7 | 8 | } |
@@ -27,8 +27,8 @@ |
||
| 27 | 27 | |
| 28 | 28 | $app = Application::getInstance(); |
| 29 | 29 | |
| 30 | -register_activation_hook( __FILE__, array( $app, 'onActivation' )); |
|
| 31 | -register_deactivation_hook( __FILE__, array( $app, 'onDeactivation' )); |
|
| 30 | +register_activation_hook( __FILE__, array( $app, 'onActivation' ) ); |
|
| 31 | +register_deactivation_hook( __FILE__, array( $app, 'onDeactivation' ) ); |
|
| 32 | 32 | |
| 33 | 33 | if( $app->gatekeeper->canActivate() ) { |
| 34 | 34 | $app->register( new Provider ); |
@@ -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' )); |
@@ -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,13 +100,13 @@ 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 | 106 | return $this->filter( 'save', array_merge( |
| 107 | 107 | array_intersect_key( $this->getSettings(), $settings ), |
| 108 | 108 | $settings |
| 109 | - )); |
|
| 109 | + ) ); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | */ |
| 127 | 127 | public function register() |
| 128 | 128 | { |
| 129 | - if(( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
| 130 | - if( $this->app->gatekeeper->hasDependency( self::DEPENDENCY )) { |
|
| 129 | + if( ( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
| 130 | + if( $this->app->gatekeeper->hasDependency( self::DEPENDENCY ) ) { |
|
| 131 | 131 | foreach( parent::register() as $metabox ) { |
| 132 | 132 | new RWMetaBox( $metabox, static::ID, $this ); |
| 133 | 133 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | add_screen_option( 'layout_columns', [ |
| 136 | 136 | 'max' => 2, |
| 137 | 137 | 'default' => 2, |
| 138 | - ]); |
|
| 138 | + ] ); |
|
| 139 | 139 | $this->action( 'init' ); |
| 140 | 140 | } |
| 141 | 141 | |
@@ -150,10 +150,10 @@ discard block |
||
| 150 | 150 | __( 'Site Settings', 'pollux' ), |
| 151 | 151 | static::CAPABILITY, |
| 152 | 152 | static::id(), |
| 153 | - [$this, 'renderPage'], |
|
| 153 | + [ $this, 'renderPage' ], |
|
| 154 | 154 | 'dashicons-screenoptions', |
| 155 | 155 | 1313 |
| 156 | - ])); |
|
| 156 | + ] ) ); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /** |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | */ |
| 163 | 163 | public function registerSetting() |
| 164 | 164 | { |
| 165 | - register_setting( static::id(), static::id(), [$this, 'filterSavedSettings'] ); |
|
| 165 | + register_setting( static::id(), static::id(), [ $this, 'filterSavedSettings' ] ); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | /** |
@@ -171,12 +171,12 @@ discard block |
||
| 171 | 171 | */ |
| 172 | 172 | public function renderFooterScript() |
| 173 | 173 | { |
| 174 | - if(( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
| 174 | + if( ( new Helper )->getCurrentScreen()->id != $this->hook )return; |
|
| 175 | 175 | $this->app->render( 'settings/script', [ |
| 176 | 176 | 'confirm' => __( 'Are you sure want to do this?', 'pollux' ), |
| 177 | 177 | 'hook' => $this->hook, |
| 178 | 178 | 'id' => static::id(), |
| 179 | - ]); |
|
| 179 | + ] ); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | /** |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | 'columns' => get_current_screen()->get_columns(), |
| 190 | 190 | 'heading' => __( 'Site Settings', 'pollux' ), |
| 191 | 191 | 'id' => static::id(), |
| 192 | - ]); |
|
| 192 | + ] ); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | /** |
@@ -206,9 +206,9 @@ discard block |
||
| 206 | 206 | ]; |
| 207 | 207 | $this->app->render( 'settings/submit', [ |
| 208 | 208 | 'reset' => __( 'Reset all', 'pollux' ), |
| 209 | - 'reset_url' => esc_url( add_query_arg( $query, admin_url( $pagenow ))), |
|
| 209 | + 'reset_url' => esc_url( add_query_arg( $query, admin_url( $pagenow ) ) ), |
|
| 210 | 210 | 'submit' => get_submit_button( __( 'Save', 'pollux' ), 'primary', 'submit', false ), |
| 211 | - ]); |
|
| 211 | + ] ); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | /** |
@@ -220,15 +220,15 @@ discard block |
||
| 220 | 220 | if( filter_input( INPUT_GET, 'page' ) !== static::id() |
| 221 | 221 | || filter_input( INPUT_GET, 'action' ) !== 'reset' |
| 222 | 222 | )return; |
| 223 | - if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook )) { |
|
| 223 | + if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook ) ) { |
|
| 224 | 224 | update_option( static::id(), $this->getDefaults() ); |
| 225 | 225 | add_settings_error( static::id(), 'reset', __( 'Reset successful.', 'pollux' ), 'updated' ); |
| 226 | 226 | } |
| 227 | 227 | else { |
| 228 | - add_settings_error( static::id(), 'failed', __( 'Failed to reset. Please try again.', 'pollux' )); |
|
| 228 | + add_settings_error( static::id(), 'failed', __( 'Failed to reset. Please try again.', 'pollux' ) ); |
|
| 229 | 229 | } |
| 230 | 230 | set_transient( 'settings_errors', get_settings_errors(), 30 ); |
| 231 | - wp_safe_redirect( add_query_arg( 'settings-updated', 'true', wp_get_referer() )); |
|
| 231 | + wp_safe_redirect( add_query_arg( 'settings-updated', 'true', wp_get_referer() ) ); |
|
| 232 | 232 | exit; |
| 233 | 233 | } |
| 234 | 234 | |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | protected function filterArrayByKey( array $array, $key ) |
| 240 | 240 | { |
| 241 | 241 | return array_filter( $array, function( $value ) use( $key ) { |
| 242 | - return !empty( $value[$key] ); |
|
| 242 | + return !empty( $value[ $key ] ); |
|
| 243 | 243 | }); |
| 244 | 244 | } |
| 245 | 245 | |
@@ -252,11 +252,11 @@ discard block |
||
| 252 | 252 | |
| 253 | 253 | array_walk( $metaboxes, function( &$metabox ) { |
| 254 | 254 | $fields = array_map( function( $field ) { |
| 255 | - $field = wp_parse_args( $field, ['std' => ''] ); |
|
| 256 | - return [$field['slug'] => $field['std']]; |
|
| 257 | - }, $this->filterArrayByKey( $metabox['fields'], 'slug' )); |
|
| 255 | + $field = wp_parse_args( $field, [ 'std' => '' ] ); |
|
| 256 | + return [ $field[ 'slug' ] => $field[ 'std' ] ]; |
|
| 257 | + }, $this->filterArrayByKey( $metabox[ 'fields' ], 'slug' ) ); |
|
| 258 | 258 | $metabox = [ |
| 259 | - $metabox['slug'] => call_user_func_array( 'array_merge', $fields ), |
|
| 259 | + $metabox[ 'slug' ] => call_user_func_array( 'array_merge', $fields ), |
|
| 260 | 260 | ]; |
| 261 | 261 | }); |
| 262 | 262 | return call_user_func_array( 'array_merge', $metaboxes ); |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | */ |
| 275 | 275 | protected function normalizeFieldName( $name, array $data, $parentId ) |
| 276 | 276 | { |
| 277 | - return sprintf( '%s[%s][%s]', static::id(), $parentId, $data['slug'] ); |
|
| 277 | + return sprintf( '%s[%s][%s]', static::id(), $parentId, $data[ 'slug' ] ); |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | /** |
@@ -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 | } |