@@ -18,8 +18,8 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | $this->plugin = $plugin; |
| 20 | 20 | |
| 21 | - add_action( 'activated_plugin', array( $this, 'deactivate' )); |
|
| 22 | - add_action( 'admin_notices', array( $this, 'deactivate' )); |
|
| 21 | + add_action( 'activated_plugin', array( $this, 'deactivate' ) ); |
|
| 22 | + add_action( 'admin_notices', array( $this, 'deactivate' ) ); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | /** |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | : sprintf( __( 'Sorry, Pollux requires PHP %s or greater in order to work properly (your server is running PHP %s).', 'pollux' ), self::MIN_PHP_VERSION, PHP_VERSION ); |
| 62 | 62 | |
| 63 | 63 | $message2 = $this->checkPhpVersion() |
| 64 | - ? sprintf( '<a href="%s">%s</a>', admin_url( 'update-core.php' ), __( 'Update WordPress', 'pollux' )) |
|
| 64 | + ? sprintf( '<a href="%s">%s</a>', admin_url( 'update-core.php' ), __( 'Update WordPress', 'pollux' ) ) |
|
| 65 | 65 | : __( 'Please contact your hosting provider or server administrator to upgrade the version of PHP running on your server, or find an alternate plugin.', 'pollux' ); |
| 66 | 66 | |
| 67 | 67 | printf( '<div id="message" class="notice notice-error error is-dismissible"><p><strong>%s</strong></p><p>%s %s</p></div>', |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | filter_input( INPUT_GET, 'plugin_status' ), |
| 89 | 89 | filter_input( INPUT_GET, 'paged' ), |
| 90 | 90 | filter_input( INPUT_GET, 's' ) |
| 91 | - ))); |
|
| 91 | + ) ) ); |
|
| 92 | 92 | exit; |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -14,7 +14,9 @@ |
||
| 14 | 14 | |
| 15 | 15 | public function __construct( $plugin ) |
| 16 | 16 | { |
| 17 | - if( $this->proceed() )return; |
|
| 17 | + if( $this->proceed() ) { |
|
| 18 | + return; |
|
| 19 | + } |
|
| 18 | 20 | |
| 19 | 21 | $this->plugin = $plugin; |
| 20 | 22 | |
@@ -27,7 +27,9 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | public function init() |
| 29 | 29 | { |
| 30 | - if( !is_plugin_active( 'meta-box/meta-box.php' ))return; |
|
| 30 | + if( !is_plugin_active( 'meta-box/meta-box.php' )) { |
|
| 31 | + return; |
|
| 32 | + } |
|
| 31 | 33 | |
| 32 | 34 | $this->normalize(); |
| 33 | 35 | |
@@ -96,7 +98,9 @@ discard block |
||
| 96 | 98 | */ |
| 97 | 99 | public function register( $metaboxes = [] ) |
| 98 | 100 | { |
| 99 | - if( get_current_screen()->id != $this->hook )return; |
|
| 101 | + if( get_current_screen()->id != $this->hook ) { |
|
| 102 | + return; |
|
| 103 | + } |
|
| 100 | 104 | foreach( parent::register() as $metabox ) { |
| 101 | 105 | new SettingsMetaBox( $metabox ); |
| 102 | 106 | } |
@@ -151,7 +155,8 @@ discard block |
||
| 151 | 155 | */ |
| 152 | 156 | protected function getInstructions() |
| 153 | 157 | { |
| 154 | - return array_filter( $this->metaboxes, function( $metabox ) { |
|
| 158 | + return array_filter( $this->metaboxes, function( $metabox ) |
|
| 159 | + { |
|
| 155 | 160 | return $this->verifyMetaBoxCondition( $metabox['condition'] ); |
| 156 | 161 | }); |
| 157 | 162 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | /** |
| 16 | 16 | * @var string |
| 17 | 17 | */ |
| 18 | - CONST ID = 'pollux-settings'; |
|
| 18 | + const ID = 'pollux-settings'; |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * @var string |
@@ -27,15 +27,15 @@ discard block |
||
| 27 | 27 | */ |
| 28 | 28 | public function init() |
| 29 | 29 | { |
| 30 | - if( !is_plugin_active( 'meta-box/meta-box.php' ))return; |
|
| 30 | + if( !is_plugin_active( 'meta-box/meta-box.php' ) )return; |
|
| 31 | 31 | |
| 32 | 32 | $this->normalize(); |
| 33 | 33 | |
| 34 | - add_action( 'admin_menu', [$this, 'addPage'] ); |
|
| 35 | - add_action( 'pollux/settings/init', [$this, 'addSubmitMetaBox'] ); |
|
| 36 | - add_filter( 'pollux/settings/instruction', [$this, 'filterInstruction'], 10, 3 ); |
|
| 37 | - add_action( 'current_screen', [$this, 'register'] ); |
|
| 38 | - add_action( 'admin_footer-toplevel_page_' . self::ID, [$this, 'renderFooterScript'] ); |
|
| 34 | + add_action( 'admin_menu', [ $this, 'addPage' ] ); |
|
| 35 | + add_action( 'pollux/settings/init', [ $this, 'addSubmitMetaBox' ] ); |
|
| 36 | + add_filter( 'pollux/settings/instruction', [ $this, 'filterInstruction' ], 10, 3 ); |
|
| 37 | + add_action( 'current_screen', [ $this, 'register' ] ); |
|
| 38 | + add_action( 'admin_footer-toplevel_page_' . self::ID, [ $this, 'renderFooterScript' ] ); |
|
| 39 | 39 | |
| 40 | 40 | // add_filter( 'pollux/settings/save', [$this, 'save'] ); |
| 41 | 41 | } |
@@ -50,10 +50,10 @@ discard block |
||
| 50 | 50 | __( 'Site Settings', 'pollux' ), |
| 51 | 51 | 'edit_theme_options', |
| 52 | 52 | self::ID, |
| 53 | - [$this, 'renderPage'], |
|
| 53 | + [ $this, 'renderPage' ], |
|
| 54 | 54 | 'dashicons-screenoptions', |
| 55 | 55 | 1313 |
| 56 | - ])); |
|
| 56 | + ] ) ); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | call_user_func_array( 'add_meta_box', apply_filters( 'pollux/settings/metabox/submit', [ |
| 65 | 65 | 'submitdiv', |
| 66 | 66 | __( 'Save Settings', 'pollux' ), |
| 67 | - [ $this, 'renderSubmitMetaBox'], |
|
| 67 | + [ $this, 'renderSubmitMetaBox' ], |
|
| 68 | 68 | $this->hook, |
| 69 | 69 | 'side', |
| 70 | 70 | 'high', |
| 71 | - ])); |
|
| 71 | + ] ) ); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -88,16 +88,16 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | public function isVisible( $bool, array $metabox ) |
| 90 | 90 | { |
| 91 | - if( defined( 'DOING_AJAX' ) && DOING_AJAX || !isset( $metabox['condition'] )) { |
|
| 91 | + if( defined( 'DOING_AJAX' ) && DOING_AJAX || !isset( $metabox[ 'condition' ] ) ) { |
|
| 92 | 92 | return $bool; |
| 93 | 93 | } |
| 94 | - return $this->verifyMetaBoxCondition( $metabox['condition'] ); |
|
| 94 | + return $this->verifyMetaBoxCondition( $metabox[ 'condition' ] ); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
| 98 | 98 | * @return void |
| 99 | 99 | */ |
| 100 | - public function register( $metaboxes = [] ) |
|
| 100 | + public function register( $metaboxes = [ ] ) |
|
| 101 | 101 | { |
| 102 | 102 | if( get_current_screen()->id != $this->hook )return; |
| 103 | 103 | foreach( parent::register() as $metabox ) { |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | 'confirm' => __( 'Are you sure want to do this?', 'pollux' ), |
| 117 | 117 | 'hook' => $this->hook, |
| 118 | 118 | 'id' => self::ID, |
| 119 | - ]); |
|
| 119 | + ] ); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | /** |
@@ -126,10 +126,10 @@ discard block |
||
| 126 | 126 | { |
| 127 | 127 | // add_screen_option( 'layout_columns', ['max' => 2, 'default' => 2] ); |
| 128 | 128 | $this->render( 'settings/index', [ |
| 129 | - 'columns' => 2,//get_current_screen()->get_columns(), |
|
| 129 | + 'columns' => 2, //get_current_screen()->get_columns(), |
|
| 130 | 130 | 'id' => self::ID, |
| 131 | 131 | 'title' => __( 'Site Settings', 'pollux' ), |
| 132 | - ]); |
|
| 132 | + ] ); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |
@@ -138,15 +138,15 @@ discard block |
||
| 138 | 138 | public function renderSubmitMetaBox() |
| 139 | 139 | { |
| 140 | 140 | $query = [ |
| 141 | - '_wpnonce' => wp_create_nonce( sprintf( '%s-reset', self::ID )), |
|
| 141 | + '_wpnonce' => wp_create_nonce( sprintf( '%s-reset', self::ID ) ), |
|
| 142 | 142 | 'action' => 'reset_settings', |
| 143 | 143 | 'page' => self::ID, |
| 144 | 144 | ]; |
| 145 | 145 | $this->render( 'settings/submit', [ |
| 146 | 146 | 'reset' => __( 'Reset Settings', 'pollux' ), |
| 147 | - 'reset_url' => esc_url( add_query_arg( $query, admin_url( 'admin.php' ))), |
|
| 147 | + 'reset_url' => esc_url( add_query_arg( $query, admin_url( 'admin.php' ) ) ), |
|
| 148 | 148 | 'submit' => get_submit_button( __( 'Save', 'pollux' ), 'primary', 'submit', false ), |
| 149 | - ]); |
|
| 149 | + ] ); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | protected function getInstructions() |
| 156 | 156 | { |
| 157 | 157 | return array_filter( $this->metaboxes, function( $metabox ) { |
| 158 | - return $this->verifyMetaBoxCondition( $metabox['condition'] ); |
|
| 158 | + return $this->verifyMetaBoxCondition( $metabox[ 'condition' ] ); |
|
| 159 | 159 | }); |
| 160 | 160 | } |
| 161 | 161 | |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | */ |
| 165 | 165 | protected function getPostTypes() |
| 166 | 166 | { |
| 167 | - return []; |
|
| 167 | + return [ ]; |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /** |
@@ -172,16 +172,16 @@ discard block |
||
| 172 | 172 | */ |
| 173 | 173 | protected function normalize() |
| 174 | 174 | { |
| 175 | - $this->metaboxes = []; |
|
| 176 | - foreach( $this->app->config['settings'] as $id => $metabox ) { |
|
| 177 | - unset( $metabox['post_types'], $metabox['pages'] ); |
|
| 175 | + $this->metaboxes = [ ]; |
|
| 176 | + foreach( $this->app->config[ 'settings' ] as $id => $metabox ) { |
|
| 177 | + unset( $metabox[ 'post_types' ], $metabox[ 'pages' ] ); |
|
| 178 | 178 | $defaults = [ |
| 179 | - 'condition' => [], |
|
| 180 | - 'fields' => [], |
|
| 179 | + 'condition' => [ ], |
|
| 180 | + 'fields' => [ ], |
|
| 181 | 181 | 'id' => $id, |
| 182 | 182 | 'slug' => $id, |
| 183 | 183 | ]; |
| 184 | - $this->metaboxes[] = $this->normalizeThis( $metabox, $defaults, $id ); |
|
| 184 | + $this->metaboxes[ ] = $this->normalizeThis( $metabox, $defaults, $id ); |
|
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | |
@@ -192,10 +192,10 @@ discard block |
||
| 192 | 192 | */ |
| 193 | 193 | protected function normalizeFieldName( $name, array $data, $parentId ) |
| 194 | 194 | { |
| 195 | - if( !empty( $name )) { |
|
| 195 | + if( !empty( $name ) ) { |
|
| 196 | 196 | return $name; |
| 197 | 197 | } |
| 198 | - $name = str_replace( sprintf( '%s-%s-', self::ID, $parentId ), '', $data['id'] ); |
|
| 198 | + $name = str_replace( sprintf( '%s-%s-', self::ID, $parentId ), '', $data[ 'id' ] ); |
|
| 199 | 199 | return sprintf( '%s[%s][%s]', self::ID, $parentId, $name ); |
| 200 | 200 | } |
| 201 | 201 | |
@@ -30,14 +30,14 @@ discard block |
||
| 30 | 30 | * @param string $view |
| 31 | 31 | * @return void |
| 32 | 32 | */ |
| 33 | - public function render( $view, array $data = [] ) |
|
| 33 | + public function render( $view, array $data = [ ] ) |
|
| 34 | 34 | { |
| 35 | 35 | $file = apply_filters( 'pollux/views/file', |
| 36 | - $this->app->path( sprintf( 'views/%s.php', str_replace( '.php', '', $view ))), |
|
| 36 | + $this->app->path( sprintf( 'views/%s.php', str_replace( '.php', '', $view ) ) ), |
|
| 37 | 37 | $view, |
| 38 | 38 | $data |
| 39 | 39 | ); |
| 40 | - if( file_exists( $file )) { |
|
| 40 | + if( file_exists( $file ) ) { |
|
| 41 | 41 | extract( $data ); |
| 42 | 42 | return include $file; |
| 43 | 43 | } |
@@ -49,9 +49,9 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | protected function getClassname( $toLowerCase = true ) |
| 51 | 51 | { |
| 52 | - $paths = explode( '\\', get_class( $this )); |
|
| 52 | + $paths = explode( '\\', get_class( $this ) ); |
|
| 53 | 53 | return wp_validate_boolean( $toLowerCase ) |
| 54 | - ? strtolower( end( $paths )) |
|
| 54 | + ? strtolower( end( $paths ) ) |
|
| 55 | 55 | : end( $paths ); |
| 56 | 56 | } |
| 57 | 57 | |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | $data = wp_parse_args( $data, $defaults ); |
| 65 | 65 | foreach( $defaults as $key => $value ) { |
| 66 | 66 | $method = $this->app->buildMethodName( $key, 'normalize' ); |
| 67 | - if( method_exists( $this, $method )) { |
|
| 68 | - $data[$key] = $this->$method( $data[$key], $data, $id ); |
|
| 67 | + if( method_exists( $this, $method ) ) { |
|
| 68 | + $data[ $key ] = $this->$method( $data[ $key ], $data, $id ); |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | return $data; |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public static function clearResolvedInstances() |
| 50 | 50 | { |
| 51 | - static::$resolvedInstance = []; |
|
| 51 | + static::$resolvedInstance = [ ]; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | protected static function resolveFacadeInstance( $name ) |
| 104 | 104 | { |
| 105 | - if( is_object( $name )) { |
|
| 105 | + if( is_object( $name ) ) { |
|
| 106 | 106 | return $name; |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - if( isset( static::$resolvedInstance[$name] )) { |
|
| 110 | - return static::$resolvedInstance[$name]; |
|
| 109 | + if( isset( static::$resolvedInstance[ $name ] ) ) { |
|
| 110 | + return static::$resolvedInstance[ $name ]; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - return static::$resolvedInstance[$name] = static::$app->make( $name ); |
|
| 113 | + return static::$resolvedInstance[ $name ] = static::$app->make( $name ); |
|
| 114 | 114 | } |
| 115 | 115 | } |
@@ -10,19 +10,19 @@ discard block |
||
| 10 | 10 | * @param string $metaKey |
| 11 | 11 | * @return mixed |
| 12 | 12 | */ |
| 13 | - public function get( $metaKey, array $args = [] ) |
|
| 13 | + public function get( $metaKey, array $args = [ ] ) |
|
| 14 | 14 | { |
| 15 | - if( empty( $metaKey ))return; |
|
| 15 | + if( empty( $metaKey ) )return; |
|
| 16 | 16 | |
| 17 | 17 | $args = $this->normalize( $args ); |
| 18 | - $metaKey = $this->buildMetaKey( $metaKey, $args['prefix'] ); |
|
| 19 | - $metaValue = get_post_meta( $args['id'], $metaKey, $args['single'] ); |
|
| 18 | + $metaKey = $this->buildMetaKey( $metaKey, $args[ 'prefix' ] ); |
|
| 19 | + $metaValue = get_post_meta( $args[ 'id' ], $metaKey, $args[ 'single' ] ); |
|
| 20 | 20 | |
| 21 | - if( is_string( $metaValue )) { |
|
| 21 | + if( is_string( $metaValue ) ) { |
|
| 22 | 22 | $metaValue = trim( $metaValue ); |
| 23 | 23 | } |
| 24 | 24 | return empty( $metaValue ) |
| 25 | - ? $args['fallback'] |
|
| 25 | + ? $args[ 'fallback' ] |
|
| 26 | 26 | : $metaValue; |
| 27 | 27 | } |
| 28 | 28 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | protected function buildMetaKey( $metaKey, $prefix ) |
| 35 | 35 | { |
| 36 | - return ( substr( $metaKey, 0, 1 ) == '_' && !empty( $prefix )) |
|
| 36 | + return ( substr( $metaKey, 0, 1 ) == '_' && !empty( $prefix ) ) |
|
| 37 | 37 | ? sprintf( '_%s%s', rtrim( $prefix, '_' ), $metaKey ) |
| 38 | 38 | : $prefix . $metaKey; |
| 39 | 39 | } |
@@ -49,6 +49,6 @@ discard block |
||
| 49 | 49 | 'single' => true, |
| 50 | 50 | 'prefix' => Application::PREFIX, |
| 51 | 51 | ]; |
| 52 | - return shortcode_atts( $defaults, array_change_key_case( $args )); |
|
| 52 | + return shortcode_atts( $defaults, array_change_key_case( $args ) ); |
|
| 53 | 53 | } |
| 54 | 54 | } |
@@ -12,7 +12,9 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function get( $metaKey, array $args = [] ) |
| 14 | 14 | { |
| 15 | - if( empty( $metaKey ))return; |
|
| 15 | + if( empty( $metaKey )) { |
|
| 16 | + return; |
|
| 17 | + } |
|
| 16 | 18 | |
| 17 | 19 | $args = $this->normalize( $args ); |
| 18 | 20 | $metaKey = $this->buildMetaKey( $metaKey, $args['prefix'] ); |
@@ -46,10 +46,14 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | public function filterBy( WP_Query $query ) |
| 48 | 48 | { |
| 49 | - if( !is_admin() || get_current_screen()->base != 'edit' )return; |
|
| 49 | + if( !is_admin() || get_current_screen()->base != 'edit' ) { |
|
| 50 | + return; |
|
| 51 | + } |
|
| 50 | 52 | $vars = &$query->query_vars; |
| 51 | 53 | foreach( array_keys( $this->taxonomies ) as $taxonomy ) { |
| 52 | - if( empty( $vars[$taxonomy] ) || !is_numeric( $vars[$taxonomy] ))continue; |
|
| 54 | + if( empty( $vars[$taxonomy] ) || !is_numeric( $vars[$taxonomy] )) { |
|
| 55 | + continue; |
|
| 56 | + } |
|
| 53 | 57 | $vars[$taxonomy] = get_term_by( 'id', $vars[$taxonomy], $taxonomy )->slug; |
| 54 | 58 | } |
| 55 | 59 | return $query; |
@@ -62,7 +66,9 @@ discard block |
||
| 62 | 66 | { |
| 63 | 67 | global $wp_query; |
| 64 | 68 | foreach( $this->taxonomies as $taxonomy => $args ) { |
| 65 | - if( !in_array( get_current_screen()->post_type, $args['post_types'] ))continue; |
|
| 69 | + if( !in_array( get_current_screen()->post_type, $args['post_types'] )) { |
|
| 70 | + continue; |
|
| 71 | + } |
|
| 66 | 72 | $selected = isset( $wp_query->query[$taxonomy] ) |
| 67 | 73 | ? $wp_query->query[$taxonomy] |
| 68 | 74 | : false; |
@@ -82,7 +88,8 @@ discard block |
||
| 82 | 88 | */ |
| 83 | 89 | public function register() |
| 84 | 90 | { |
| 85 | - array_walk( $this->taxonomies, function( $args, $taxonomy ) { |
|
| 91 | + array_walk( $this->taxonomies, function( $args, $taxonomy ) |
|
| 92 | + { |
|
| 86 | 93 | register_taxonomy( $taxonomy, $args['post_types'], array_diff_key( $args, array_flip( self::CUSTOM_KEYS ))); |
| 87 | 94 | foreach( $args['post_types'] as $type ) { |
| 88 | 95 | register_taxonomy_for_object_type( $taxonomy, $type ); |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | const TAXONOMY_DEFAULTS = [ |
| 15 | 15 | 'hierarchical' => true, |
| 16 | - 'labels' => [], |
|
| 16 | + 'labels' => [ ], |
|
| 17 | 17 | 'menu_name' => '', |
| 18 | 18 | 'plural' => '', |
| 19 | - 'post_types' => [], |
|
| 19 | + 'post_types' => [ ], |
|
| 20 | 20 | 'public' => true, |
| 21 | 21 | 'rewrite' => true, |
| 22 | 22 | 'show_admin_column' => true, |
@@ -36,9 +36,9 @@ discard block |
||
| 36 | 36 | { |
| 37 | 37 | $this->normalize(); |
| 38 | 38 | |
| 39 | - add_filter( 'parse_query', [ $this, 'filterBy'] ); |
|
| 40 | - add_action( 'restrict_manage_posts', [ $this, 'printFilters'] ); |
|
| 41 | - add_action( 'init', [ $this, 'register'] ); |
|
| 39 | + add_filter( 'parse_query', [ $this, 'filterBy' ] ); |
|
| 40 | + add_action( 'restrict_manage_posts', [ $this, 'printFilters' ] ); |
|
| 41 | + add_action( 'init', [ $this, 'register' ] ); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
@@ -49,8 +49,8 @@ discard block |
||
| 49 | 49 | if( !is_admin() || get_current_screen()->base != 'edit' )return; |
| 50 | 50 | $vars = &$query->query_vars; |
| 51 | 51 | foreach( array_keys( $this->taxonomies ) as $taxonomy ) { |
| 52 | - if( empty( $vars[$taxonomy] ) || !is_numeric( $vars[$taxonomy] ))continue; |
|
| 53 | - $vars[$taxonomy] = get_term_by( 'id', $vars[$taxonomy], $taxonomy )->slug; |
|
| 52 | + if( empty( $vars[ $taxonomy ] ) || !is_numeric( $vars[ $taxonomy ] ) )continue; |
|
| 53 | + $vars[ $taxonomy ] = get_term_by( 'id', $vars[ $taxonomy ], $taxonomy )->slug; |
|
| 54 | 54 | } |
| 55 | 55 | return $query; |
| 56 | 56 | } |
@@ -62,18 +62,18 @@ discard block |
||
| 62 | 62 | { |
| 63 | 63 | global $wp_query; |
| 64 | 64 | foreach( $this->taxonomies as $taxonomy => $args ) { |
| 65 | - if( !in_array( get_current_screen()->post_type, $args['post_types'] ))continue; |
|
| 66 | - $selected = isset( $wp_query->query[$taxonomy] ) |
|
| 67 | - ? $wp_query->query[$taxonomy] |
|
| 65 | + if( !in_array( get_current_screen()->post_type, $args[ 'post_types' ] ) )continue; |
|
| 66 | + $selected = isset( $wp_query->query[ $taxonomy ] ) |
|
| 67 | + ? $wp_query->query[ $taxonomy ] |
|
| 68 | 68 | : false; |
| 69 | - wp_dropdown_categories([ |
|
| 69 | + wp_dropdown_categories( [ |
|
| 70 | 70 | 'hide_if_empty' => true, |
| 71 | 71 | 'name' => $taxonomy, |
| 72 | 72 | 'orderby' => 'name', |
| 73 | 73 | 'selected' => $selected, |
| 74 | - 'show_option_all' => $args['labels']['all_items'], |
|
| 74 | + 'show_option_all' => $args[ 'labels' ][ 'all_items' ], |
|
| 75 | 75 | 'taxonomy' => $taxonomy, |
| 76 | - ]); |
|
| 76 | + ] ); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | public function register() |
| 84 | 84 | { |
| 85 | 85 | array_walk( $this->taxonomies, function( $args, $taxonomy ) { |
| 86 | - register_taxonomy( $taxonomy, $args['post_types'], array_diff_key( $args, array_flip( self::CUSTOM_KEYS ))); |
|
| 87 | - foreach( $args['post_types'] as $type ) { |
|
| 86 | + register_taxonomy( $taxonomy, $args[ 'post_types' ], array_diff_key( $args, array_flip( self::CUSTOM_KEYS ) ) ); |
|
| 87 | + foreach( $args[ 'post_types' ] as $type ) { |
|
| 88 | 88 | register_taxonomy_for_object_type( $taxonomy, $type ); |
| 89 | 89 | } |
| 90 | 90 | }); |
@@ -95,14 +95,14 @@ discard block |
||
| 95 | 95 | */ |
| 96 | 96 | protected function normalize() |
| 97 | 97 | { |
| 98 | - foreach( $this->app->config['taxonomies'] as $taxonomy => $args ) { |
|
| 99 | - $this->taxonomies[$taxonomy] = apply_filters( 'pollux/taxonomy/args', |
|
| 98 | + foreach( $this->app->config[ 'taxonomies' ] as $taxonomy => $args ) { |
|
| 99 | + $this->taxonomies[ $taxonomy ] = apply_filters( 'pollux/taxonomy/args', |
|
| 100 | 100 | $this->normalizeThis( $args, self::TAXONOMY_DEFAULTS, $taxonomy ) |
| 101 | 101 | ); |
| 102 | 102 | } |
| 103 | 103 | $this->taxonomies = array_diff_key( |
| 104 | 104 | $this->taxonomies, |
| 105 | - get_taxonomies( ['_builtin' => true] ) |
|
| 105 | + get_taxonomies( [ '_builtin' => true ] ) |
|
| 106 | 106 | ); |
| 107 | 107 | } |
| 108 | 108 | |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | protected function normalizeLabels( $labels, array $args ) |
| 114 | 114 | { |
| 115 | - return wp_parse_args( $labels, $this->setLabels( $args )); |
|
| 115 | + return wp_parse_args( $labels, $this->setLabels( $args ) ); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | protected function normalizeMenuName( $menuname, array $args ) |
| 123 | 123 | { |
| 124 | 124 | return empty( $menuname ) |
| 125 | - ? $args['plural'] |
|
| 125 | + ? $args[ 'plural' ] |
|
| 126 | 126 | : $menuname; |
| 127 | 127 | } |
| 128 | 128 | |
@@ -141,17 +141,17 @@ discard block |
||
| 141 | 141 | protected function setLabels( array $args ) |
| 142 | 142 | { |
| 143 | 143 | return apply_filters( 'pollux/taxonomy/labels', [ |
| 144 | - 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new taxonomy', 'pollux' ), $args['single'] ), |
|
| 145 | - 'all_items' => sprintf( _x( 'All %s', 'All taxonomies', 'pollux' ), $args['plural'] ), |
|
| 146 | - 'edit_item' => sprintf( _x( 'Edit %s', 'Edit taxonomy', 'pollux' ), $args['single'] ), |
|
| 147 | - 'menu_name' => $this->normalizeMenuName( $args['menu_name'], $args ), |
|
| 148 | - 'name' => $args['plural'], |
|
| 149 | - 'new_item_name' => sprintf( _x( 'New %s Name', 'New taxonomy name', 'pollux' ), $args['single'] ), |
|
| 150 | - 'not_found' => sprintf( _x( 'No %s found', 'No taxonomies found', 'pollux' ), $args['plural'] ), |
|
| 151 | - 'search_items' => sprintf( _x( 'Search %s', 'Search taxonomies', 'pollux' ), $args['plural'] ), |
|
| 152 | - 'singular_name' => $args['single'], |
|
| 153 | - 'update_item' => sprintf( _x( 'Update %s', 'Update taxonomy', 'pollux' ), $args['single'] ), |
|
| 154 | - 'view_item' => sprintf( _x( 'View %s', 'View taxonomy', 'pollux' ), $args['single'] ), |
|
| 144 | + 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
| 145 | + 'all_items' => sprintf( _x( 'All %s', 'All taxonomies', 'pollux' ), $args[ 'plural' ] ), |
|
| 146 | + 'edit_item' => sprintf( _x( 'Edit %s', 'Edit taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
| 147 | + 'menu_name' => $this->normalizeMenuName( $args[ 'menu_name' ], $args ), |
|
| 148 | + 'name' => $args[ 'plural' ], |
|
| 149 | + 'new_item_name' => sprintf( _x( 'New %s Name', 'New taxonomy name', 'pollux' ), $args[ 'single' ] ), |
|
| 150 | + 'not_found' => sprintf( _x( 'No %s found', 'No taxonomies found', 'pollux' ), $args[ 'plural' ] ), |
|
| 151 | + 'search_items' => sprintf( _x( 'Search %s', 'Search taxonomies', 'pollux' ), $args[ 'plural' ] ), |
|
| 152 | + 'singular_name' => $args[ 'single' ], |
|
| 153 | + 'update_item' => sprintf( _x( 'Update %s', 'Update taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
| 154 | + 'view_item' => sprintf( _x( 'View %s', 'View taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
| 155 | 155 | ], $args ); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -15,10 +15,10 @@ discard block |
||
| 15 | 15 | public function get( $group = null, $key = null, $fallback = null ) |
| 16 | 16 | { |
| 17 | 17 | $options = get_option( Settings::ID ); |
| 18 | - if( empty( $options )) { |
|
| 18 | + if( empty( $options ) ) { |
|
| 19 | 19 | return $fallback; |
| 20 | 20 | } |
| 21 | - if( empty( $group )) { |
|
| 21 | + if( empty( $group ) ) { |
|
| 22 | 22 | return $options; |
| 23 | 23 | } |
| 24 | 24 | $group = $this->normalize( $options, $group, $fallback ); |
@@ -34,10 +34,10 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | protected function normalize( array $options, $key, $fallback ) |
| 36 | 36 | { |
| 37 | - if( !array_key_exists( $key, $options )) { |
|
| 37 | + if( !array_key_exists( $key, $options ) ) { |
|
| 38 | 38 | return $fallback; |
| 39 | 39 | } |
| 40 | - $option = $options[$key]; |
|
| 40 | + $option = $options[ $key ]; |
|
| 41 | 41 | $option = is_array( $option ) |
| 42 | 42 | ? array_filter( $option ) |
| 43 | 43 | : trim( $option ); |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | { |
| 14 | 14 | parent::__construct( $metabox ); |
| 15 | 15 | |
| 16 | - remove_action( 'add_meta_boxes', [$this, 'add_meta_boxes'] ); |
|
| 16 | + remove_action( 'add_meta_boxes', [ $this, 'add_meta_boxes' ] ); |
|
| 17 | 17 | |
| 18 | - add_filter( 'rwmb_field_meta', [$this, '_get_field_meta'], 10, 3 ); |
|
| 19 | - add_action( 'pollux/settings/init', [$this, 'add_meta_boxes'] ); |
|
| 18 | + add_filter( 'rwmb_field_meta', [ $this, '_get_field_meta' ], 10, 3 ); |
|
| 19 | + add_action( 'pollux/settings/init', [ $this, 'add_meta_boxes' ] ); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -26,13 +26,13 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function _get_field_meta( $meta, array $field, $saved ) |
| 28 | 28 | { |
| 29 | - if( !$this->is_edit_screen() || empty( $field['id'] )) { |
|
| 29 | + if( !$this->is_edit_screen() || empty( $field[ 'id' ] ) ) { |
|
| 30 | 30 | return $meta; |
| 31 | 31 | } |
| 32 | - $meta = call_user_func( [RWMB_Field::get_class_name( $field ), 'esc_meta'], ( $saved |
|
| 33 | - ? (new SiteMeta)->get( $this->meta_box['id'], $field['id'] ) |
|
| 34 | - : $field['std'] |
|
| 35 | - )); |
|
| 32 | + $meta = call_user_func( [ RWMB_Field::get_class_name( $field ), 'esc_meta' ], ( $saved |
|
| 33 | + ? ( new SiteMeta )->get( $this->meta_box[ 'id' ], $field[ 'id' ] ) |
|
| 34 | + : $field[ 'std' ] |
|
| 35 | + ) ); |
|
| 36 | 36 | return $this->_normalize_field_meta( $meta, $field ); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -42,12 +42,12 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | public function _normalize_field_meta( $meta, array $field ) |
| 44 | 44 | { |
| 45 | - if( empty( $meta ) || !is_array( $meta )) { |
|
| 46 | - if( $field['multiple'] ) { |
|
| 47 | - $meta = []; |
|
| 45 | + if( empty( $meta ) || !is_array( $meta ) ) { |
|
| 46 | + if( $field[ 'multiple' ] ) { |
|
| 47 | + $meta = [ ]; |
|
| 48 | 48 | } |
| 49 | - if( $field['clone'] ) { |
|
| 50 | - $meta = ['']; |
|
| 49 | + if( $field[ 'clone' ] ) { |
|
| 50 | + $meta = [ '' ]; |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | return $meta; |
@@ -59,12 +59,12 @@ discard block |
||
| 59 | 59 | public function add_meta_boxes() |
| 60 | 60 | { |
| 61 | 61 | add_meta_box( |
| 62 | - $this->meta_box['id'], |
|
| 63 | - $this->meta_box['title'], |
|
| 64 | - [$this, 'show'], |
|
| 62 | + $this->meta_box[ 'id' ], |
|
| 63 | + $this->meta_box[ 'title' ], |
|
| 64 | + [ $this, 'show' ], |
|
| 65 | 65 | null, |
| 66 | - $this->meta_box['context'], |
|
| 67 | - $this->meta_box['priority'] |
|
| 66 | + $this->meta_box[ 'context' ], |
|
| 67 | + $this->meta_box[ 'priority' ] |
|
| 68 | 68 | ); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | public function is_saved() |
| 83 | 83 | { |
| 84 | 84 | foreach( array_column( $this->fields, 'id' ) as $field ) { |
| 85 | - if( !is_null( (new SiteMeta)->get( $this->meta_box['id'], $field, null ))) { |
|
| 85 | + if( !is_null( ( new SiteMeta )->get( $this->meta_box[ 'id' ], $field, null ) ) ) { |
|
| 86 | 86 | return true; |
| 87 | 87 | } |
| 88 | 88 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | public static function normalize( $metabox ) |
| 97 | 97 | { |
| 98 | 98 | $metabox = parent::normalize( $metabox ); |
| 99 | - $metabox['post_types'] = []; |
|
| 99 | + $metabox[ 'post_types' ] = [ ]; |
|
| 100 | 100 | return $metabox; |
| 101 | 101 | } |
| 102 | 102 | } |