@@ -5,7 +5,7 @@ |
||
| 5 | 5 | * |
| 6 | 6 | * @return mixed |
| 7 | 7 | */ |
| 8 | -function pollux_get_post_meta( $metaKey, array $args = [] ) { |
|
| 8 | +function pollux_get_post_meta( $metaKey, array $args = [ ] ) { |
|
| 9 | 9 | return \GeminiLabs\Pollux\Facades\PostMeta::get( $metaKey, $args ); |
| 10 | 10 | } |
| 11 | 11 | |
@@ -5,7 +5,8 @@ discard block |
||
| 5 | 5 | * |
| 6 | 6 | * @return mixed |
| 7 | 7 | */ |
| 8 | -function pollux_get_post_meta( $metaKey, array $args = [] ) { |
|
| 8 | +function pollux_get_post_meta( $metaKey, array $args = [] ) |
|
| 9 | +{ |
|
| 9 | 10 | return \GeminiLabs\Pollux\Facades\PostMeta::get( $metaKey, $args ); |
| 10 | 11 | } |
| 11 | 12 | |
@@ -14,6 +15,7 @@ discard block |
||
| 14 | 15 | * |
| 15 | 16 | * @return mixed |
| 16 | 17 | */ |
| 17 | -function pollux_get_option( $group, $key = false, $fallback = '' ) { |
|
| 18 | +function pollux_get_option( $group, $key = false, $fallback = '' ) |
|
| 19 | +{ |
|
| 18 | 20 | return \GeminiLabs\Pollux\Facades\SiteMeta::get( $group, $key, $fallback ); |
| 19 | 21 | } |
@@ -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->proceed() ) { |
| 34 | 34 | $app->register( new Provider ); |
@@ -13,9 +13,13 @@ |
||
| 13 | 13 | ]; |
| 14 | 14 | foreach( $namespaces as $prefix => $base_dir ) { |
| 15 | 15 | $len = strlen( $prefix ); |
| 16 | - if( strncmp( $prefix, $class, $len ) !== 0 )continue; |
|
| 16 | + if( strncmp( $prefix, $class, $len ) !== 0 ) { |
|
| 17 | + continue; |
|
| 18 | + } |
|
| 17 | 19 | $file = $base_dir . str_replace( '\\', '/', substr( $class, $len ) ) . '.php'; |
| 18 | - if( !file_exists( $file ) )continue; |
|
| 20 | + if( !file_exists( $file ) ) { |
|
| 21 | + continue; |
|
| 22 | + } |
|
| 19 | 23 | require $file; |
| 20 | 24 | break; |
| 21 | 25 | } |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @return AliasLoader |
| 40 | 40 | */ |
| 41 | - public static function getInstance( array $aliases = [] ) |
|
| 41 | + public static function getInstance( array $aliases = [ ] ) |
|
| 42 | 42 | { |
| 43 | - if( is_null( static::$instance )) { |
|
| 43 | + if( is_null( static::$instance ) ) { |
|
| 44 | 44 | return static::$instance = new static( $aliases ); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -60,8 +60,8 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | public function load( $alias ) |
| 62 | 62 | { |
| 63 | - if( isset( $this->aliases[$alias] )) { |
|
| 64 | - return class_alias( $this->aliases[$alias], $alias ); |
|
| 63 | + if( isset( $this->aliases[ $alias ] ) ) { |
|
| 64 | + return class_alias( $this->aliases[ $alias ], $alias ); |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | public function register() |
| 74 | 74 | { |
| 75 | 75 | if( !$this->registered ) { |
| 76 | - spl_autoload_register( [$this, 'load'], true, true ); |
|
| 76 | + spl_autoload_register( [ $this, 'load' ], true, true ); |
|
| 77 | 77 | $this->registered = true; |
| 78 | 78 | } |
| 79 | 79 | } |
@@ -31,7 +31,8 @@ |
||
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | private function __clone() |
| 34 | - {} |
|
| 34 | + { |
|
| 35 | +} |
|
| 35 | 36 | |
| 36 | 37 | /** |
| 37 | 38 | * Get or create the singleton alias loader instance. |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public function filterWordPressFooter( $text ) |
| 25 | 25 | { |
| 26 | - if( $this->app->config['remove_wordpress_footer'] )return; |
|
| 26 | + if( $this->app->config[ 'remove_wordpress_footer' ] )return; |
|
| 27 | 27 | return $text; |
| 28 | 28 | } |
| 29 | 29 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | public function registerAssets() |
| 35 | 35 | { |
| 36 | - if( get_current_screen()->id == sprintf( 'toplevel_page_%s', Settings::ID )) { |
|
| 36 | + if( get_current_screen()->id == sprintf( 'toplevel_page_%s', Settings::ID ) ) { |
|
| 37 | 37 | wp_enqueue_script( 'common' ); |
| 38 | 38 | wp_enqueue_script( 'wp-lists' ); |
| 39 | 39 | wp_enqueue_script( 'postbox' ); |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public function removeDashboardWidgets() |
| 66 | 66 | { |
| 67 | - if( !$this->app->config['remove_dashboard_widgets'] )return; |
|
| 67 | + if( !$this->app->config[ 'remove_dashboard_widgets' ] )return; |
|
| 68 | 68 | $widgets = apply_filters( 'pollux/dashoard/widgets', [ |
| 69 | 69 | 'dashboard_primary', |
| 70 | 70 | 'dashboard_quick_press', |
| 71 | - ]); |
|
| 71 | + ] ); |
|
| 72 | 72 | foreach( $widgets as $widget ) { |
| 73 | 73 | remove_meta_box( $widget, 'dashboard', 'normal' ); |
| 74 | 74 | } |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | */ |
| 81 | 81 | public function removeWordPressMenu() |
| 82 | 82 | { |
| 83 | - if( !$this->app->config['remove_wordpress_menu'] )return; |
|
| 83 | + if( !$this->app->config[ 'remove_wordpress_menu' ] )return; |
|
| 84 | 84 | global $wp_admin_bar; |
| 85 | 85 | $wp_admin_bar->remove_menu( 'wp-logo' ); |
| 86 | 86 | } |
@@ -23,7 +23,9 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | public function filterWordPressFooter( $text ) |
| 25 | 25 | { |
| 26 | - if( $this->app->config['remove_wordpress_footer'] )return; |
|
| 26 | + if( $this->app->config['remove_wordpress_footer'] ) { |
|
| 27 | + return; |
|
| 28 | + } |
|
| 27 | 29 | return $text; |
| 28 | 30 | } |
| 29 | 31 | |
@@ -64,7 +66,9 @@ discard block |
||
| 64 | 66 | */ |
| 65 | 67 | public function removeDashboardWidgets() |
| 66 | 68 | { |
| 67 | - if( !$this->app->config['remove_dashboard_widgets'] )return; |
|
| 69 | + if( !$this->app->config['remove_dashboard_widgets'] ) { |
|
| 70 | + return; |
|
| 71 | + } |
|
| 68 | 72 | $widgets = apply_filters( 'pollux/dashoard/widgets', [ |
| 69 | 73 | 'dashboard_primary', |
| 70 | 74 | 'dashboard_quick_press', |
@@ -80,7 +84,9 @@ discard block |
||
| 80 | 84 | */ |
| 81 | 85 | public function removeWordPressMenu() |
| 82 | 86 | { |
| 83 | - if( !$this->app->config['remove_wordpress_menu'] )return; |
|
| 87 | + if( !$this->app->config['remove_wordpress_menu'] ) { |
|
| 88 | + return; |
|
| 89 | + } |
|
| 84 | 90 | global $wp_admin_bar; |
| 85 | 91 | $wp_admin_bar->remove_menu( 'wp-logo' ); |
| 86 | 92 | } |
@@ -16,18 +16,18 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | protected static $instance; |
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * The container's bound services. |
|
| 21 | - * |
|
| 22 | - * @var array |
|
| 23 | - */ |
|
| 19 | + /** |
|
| 20 | + * The container's bound services. |
|
| 21 | + * |
|
| 22 | + * @var array |
|
| 23 | + */ |
|
| 24 | 24 | protected $services = []; |
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * The container's bucket items |
|
| 28 | - * |
|
| 29 | - * @var array |
|
| 30 | - */ |
|
| 26 | + /** |
|
| 27 | + * The container's bucket items |
|
| 28 | + * |
|
| 29 | + * @var array |
|
| 30 | + */ |
|
| 31 | 31 | protected $bucket = []; |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -123,10 +123,10 @@ discard block |
||
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | /** |
| 126 | - * Register a Provider. |
|
| 127 | - * |
|
| 128 | - * @return void |
|
| 129 | - */ |
|
| 126 | + * Register a Provider. |
|
| 127 | + * |
|
| 128 | + * @return void |
|
| 129 | + */ |
|
| 130 | 130 | public function register( $provider ) |
| 131 | 131 | { |
| 132 | 132 | $provider->register( $this ); |
@@ -21,14 +21,14 @@ discard block |
||
| 21 | 21 | * |
| 22 | 22 | * @var array |
| 23 | 23 | */ |
| 24 | - protected $services = []; |
|
| 24 | + protected $services = [ ]; |
|
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * The container's bucket items |
| 28 | 28 | * |
| 29 | 29 | * @var array |
| 30 | 30 | */ |
| 31 | - protected $bucket = []; |
|
| 31 | + protected $bucket = [ ]; |
|
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * Set the globally available instance of the container. |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | */ |
| 38 | 38 | public static function getInstance() |
| 39 | 39 | { |
| 40 | - if( is_null( static::$instance )) { |
|
| 40 | + if( is_null( static::$instance ) ) { |
|
| 41 | 41 | static::$instance = new static; |
| 42 | 42 | } |
| 43 | 43 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function bind( $alias, $concrete ) |
| 56 | 56 | { |
| 57 | - $this->services[$alias] = $concrete; |
|
| 57 | + $this->services[ $alias ] = $concrete; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -68,14 +68,14 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function make( $abstract ) |
| 70 | 70 | { |
| 71 | - $service = isset( $this->services[$abstract] ) |
|
| 72 | - ? $this->services[$abstract] |
|
| 71 | + $service = isset( $this->services[ $abstract ] ) |
|
| 72 | + ? $this->services[ $abstract ] |
|
| 73 | 73 | : $this->addNamespace( $abstract ); |
| 74 | 74 | |
| 75 | - if( is_callable( $service )) { |
|
| 76 | - return call_user_func_array( $service, [$this] ); |
|
| 75 | + if( is_callable( $service ) ) { |
|
| 76 | + return call_user_func_array( $service, [ $this ] ); |
|
| 77 | 77 | } |
| 78 | - if( is_object( $service )) { |
|
| 78 | + if( is_object( $service ) ) { |
|
| 79 | 79 | return $service; |
| 80 | 80 | } |
| 81 | 81 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | */ |
| 93 | 93 | public function singleton( $abstract, $concrete ) |
| 94 | 94 | { |
| 95 | - $this->bind( $abstract, $this->make( $concrete )); |
|
| 95 | + $this->bind( $abstract, $this->make( $concrete ) ); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
@@ -104,8 +104,8 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | public function __get( $item ) |
| 106 | 106 | { |
| 107 | - return isset( $this->bucket[$item] ) |
|
| 108 | - ? $this->bucket[$item] |
|
| 107 | + return isset( $this->bucket[ $item ] ) |
|
| 108 | + ? $this->bucket[ $item ] |
|
| 109 | 109 | : null; |
| 110 | 110 | } |
| 111 | 111 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | public function __set( $item, $value ) |
| 121 | 121 | { |
| 122 | - $this->bucket[$item] = $value; |
|
| 122 | + $this->bucket[ $item ] = $value; |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | /** |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | protected function addNamespace( $abstract ) |
| 143 | 143 | { |
| 144 | - if( strpos( $abstract, __NAMESPACE__ ) === false && !class_exists( $abstract )) { |
|
| 144 | + if( strpos( $abstract, __NAMESPACE__ ) === false && !class_exists( $abstract ) ) { |
|
| 145 | 145 | $abstract = __NAMESPACE__ . "\\$abstract"; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | return $this->notInstantiable( $concrete ); |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - if( is_null(( $constructor = $reflector->getConstructor() ))) { |
|
| 186 | + if( is_null( ( $constructor = $reflector->getConstructor() ) ) ) { |
|
| 187 | 187 | return new $concrete; |
| 188 | 188 | } |
| 189 | 189 | |
@@ -218,11 +218,11 @@ discard block |
||
| 218 | 218 | */ |
| 219 | 219 | protected function resolveDependencies( array $dependencies ) |
| 220 | 220 | { |
| 221 | - $results = []; |
|
| 221 | + $results = [ ]; |
|
| 222 | 222 | |
| 223 | 223 | foreach( $dependencies as $dependency ) { |
| 224 | 224 | // If the class is null, the dependency is a string or some other primitive type |
| 225 | - $results[] = !is_null( $class = $dependency->getClass() ) |
|
| 225 | + $results[ ] = !is_null( $class = $dependency->getClass() ) |
|
| 226 | 226 | ? $this->resolveClass( $dependency ) |
| 227 | 227 | : null; |
| 228 | 228 | } |
@@ -23,8 +23,8 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | public function __construct() |
| 25 | 25 | { |
| 26 | - $this->file = realpath( dirname( dirname( __FILE__ )) . '/pollux.php' ); |
|
| 27 | - $this->gatekeeper = new GateKeeper( plugin_basename( $this->file )); |
|
| 26 | + $this->file = realpath( dirname( dirname( __FILE__ ) ) . '/pollux.php' ); |
|
| 27 | + $this->gatekeeper = new GateKeeper( plugin_basename( $this->file ) ); |
|
| 28 | 28 | |
| 29 | 29 | $data = get_file_data( $this->file, array( |
| 30 | 30 | 'id' => 'Text Domain', |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | { |
| 44 | 44 | Facade::clearResolvedInstances(); |
| 45 | 45 | Facade::setFacadeApplication( $this ); |
| 46 | - $this->config = (new Config( $this ))->get(); |
|
| 46 | + $this->config = ( new Config( $this ) )->get(); |
|
| 47 | 47 | $this->registerAliases(); |
| 48 | 48 | $classNames = array( |
| 49 | 49 | 'MetaBox', 'PostType', 'Taxonomy', 'Settings', |
@@ -60,10 +60,10 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | public function buildClassName( $name, $path = '' ) |
| 62 | 62 | { |
| 63 | - $className = array_map( 'ucfirst', array_map( 'strtolower', preg_split( '/[-_]/', $name ))); |
|
| 63 | + $className = array_map( 'ucfirst', array_map( 'strtolower', preg_split( '/[-_]/', $name ) ) ); |
|
| 64 | 64 | $className = implode( '', $className ); |
| 65 | 65 | return !empty( $path ) |
| 66 | - ? str_replace( '\\\\', '\\', sprintf( '%s\%s', $path, $className )) |
|
| 66 | + ? str_replace( '\\\\', '\\', sprintf( '%s\%s', $path, $className ) ) |
|
| 67 | 67 | : $className; |
| 68 | 68 | } |
| 69 | 69 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | public function buildMethodName( $name, $prefix = 'get' ) |
| 76 | 76 | { |
| 77 | - return lcfirst( $this->buildClassName( $prefix . '-' . $name )); |
|
| 77 | + return lcfirst( $this->buildClassName( $prefix . '-' . $name ) ); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | public function environment( $checkFor = '' ) |
| 85 | 85 | { |
| 86 | 86 | $environment = defined( 'WP_ENV' ) ? WP_ENV : 'production'; |
| 87 | - if( !empty( $checkFor )) { |
|
| 87 | + if( !empty( $checkFor ) ) { |
|
| 88 | 88 | return $environment == $checkFor; |
| 89 | 89 | } |
| 90 | 90 | return $environment; |
@@ -101,10 +101,10 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | $controller = $this->make( 'Controller' ); |
| 103 | 103 | |
| 104 | - add_filter( 'admin_footer_text', array( $controller, 'filterWordPressFooter' )); |
|
| 105 | - add_action( 'admin_enqueue_scripts', array( $controller, 'registerAssets' )); |
|
| 106 | - add_action( 'admin_init', array( $controller, 'removeDashboardWidgets' )); |
|
| 107 | - add_action( 'wp_before_admin_bar_render', array( $controller, 'removeWordPressMenu' )); |
|
| 104 | + add_filter( 'admin_footer_text', array( $controller, 'filterWordPressFooter' ) ); |
|
| 105 | + add_action( 'admin_enqueue_scripts', array( $controller, 'registerAssets' ) ); |
|
| 106 | + add_action( 'admin_init', array( $controller, 'removeDashboardWidgets' ) ); |
|
| 107 | + add_action( 'wp_before_admin_bar_render', array( $controller, 'removeWordPressMenu' ) ); |
|
| 108 | 108 | |
| 109 | 109 | // Disallow indexing of the site on non-production environments |
| 110 | 110 | if( !$this->environment( 'production' ) && !is_admin() ) { |
@@ -153,6 +153,6 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | public function url( $path = '' ) |
| 155 | 155 | { |
| 156 | - return esc_url( plugin_dir_url( $this->file ) . ltrim( trim( $path ), '/' )); |
|
| 156 | + return esc_url( plugin_dir_url( $this->file ) . ltrim( trim( $path ), '/' ) ); |
|
| 157 | 157 | } |
| 158 | 158 | } |
@@ -31,7 +31,8 @@ |
||
| 31 | 31 | 'name' => 'Plugin Name', |
| 32 | 32 | 'version' => 'Version', |
| 33 | 33 | ), 'plugin' ); |
| 34 | - array_walk( $data, function( $value, $key ) { |
|
| 34 | + array_walk( $data, function( $value, $key ) |
|
| 35 | + { |
|
| 35 | 36 | $this->$key = $value; |
| 36 | 37 | }); |
| 37 | 38 | } |
@@ -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 | |
@@ -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 |
@@ -32,14 +32,14 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | $this->normalize(); |
| 34 | 34 | |
| 35 | - add_action( 'admin_menu', [$this, 'addPage'] ); |
|
| 36 | - add_action( 'pollux/settings/init', [$this, 'addSubmitMetaBox'] ); |
|
| 37 | - add_filter( 'pollux/settings/instruction', [$this, 'filterInstruction'], 10, 3 ); |
|
| 38 | - add_filter( 'wp_redirect', [$this, 'filterRedirectOnSave'] ); |
|
| 39 | - add_action( 'current_screen', [$this, 'register'] ); |
|
| 40 | - add_action( 'admin_menu', [$this, 'registerSetting'] ); |
|
| 41 | - add_action( 'pollux/settings/init', [$this, 'reset'] ); |
|
| 42 | - add_action( 'admin_footer-toplevel_page_' . static::ID, [$this, 'renderFooterScript'] ); |
|
| 35 | + add_action( 'admin_menu', [ $this, 'addPage' ] ); |
|
| 36 | + add_action( 'pollux/settings/init', [ $this, 'addSubmitMetaBox' ] ); |
|
| 37 | + add_filter( 'pollux/settings/instruction', [ $this, 'filterInstruction' ], 10, 3 ); |
|
| 38 | + add_filter( 'wp_redirect', [ $this, 'filterRedirectOnSave' ] ); |
|
| 39 | + add_action( 'current_screen', [ $this, 'register' ] ); |
|
| 40 | + add_action( 'admin_menu', [ $this, 'registerSetting' ] ); |
|
| 41 | + add_action( 'pollux/settings/init', [ $this, 'reset' ] ); |
|
| 42 | + add_action( 'admin_footer-toplevel_page_' . static::ID, [ $this, 'renderFooterScript' ] ); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -52,10 +52,10 @@ discard block |
||
| 52 | 52 | __( 'Site Settings', 'pollux' ), |
| 53 | 53 | 'edit_theme_options', |
| 54 | 54 | static::ID, |
| 55 | - [$this, 'renderPage'], |
|
| 55 | + [ $this, 'renderPage' ], |
|
| 56 | 56 | 'dashicons-screenoptions', |
| 57 | 57 | 1313 |
| 58 | - ])); |
|
| 58 | + ] ) ); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -66,11 +66,11 @@ discard block |
||
| 66 | 66 | call_user_func_array( 'add_meta_box', apply_filters( 'pollux/settings/metabox/submit', [ |
| 67 | 67 | 'submitdiv', |
| 68 | 68 | __( 'Save Settings', 'pollux' ), |
| 69 | - [ $this, 'renderSubmitMetaBox'], |
|
| 69 | + [ $this, 'renderSubmitMetaBox' ], |
|
| 70 | 70 | $this->hook, |
| 71 | 71 | 'side', |
| 72 | 72 | 'high', |
| 73 | - ])); |
|
| 73 | + ] ) ); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
@@ -91,19 +91,19 @@ discard block |
||
| 91 | 91 | public function filterRedirectOnSave( $location ) |
| 92 | 92 | { |
| 93 | 93 | if( strpos( $location, 'settings-updated=true' ) === false |
| 94 | - || strpos( $location, sprintf( 'page=%s', static::ID )) === false ) { |
|
| 94 | + || strpos( $location, sprintf( 'page=%s', static::ID ) ) === false ) { |
|
| 95 | 95 | return $location; |
| 96 | 96 | } |
| 97 | - return add_query_arg([ |
|
| 97 | + return add_query_arg( [ |
|
| 98 | 98 | 'page' => static::ID, |
| 99 | 99 | 'settings-updated' => 'true', |
| 100 | - ], admin_url( 'admin.php' )); |
|
| 100 | + ], admin_url( 'admin.php' ) ); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
| 104 | 104 | * @return void |
| 105 | 105 | */ |
| 106 | - public function register( $metaboxes = [] ) |
|
| 106 | + public function register( $metaboxes = [ ] ) |
|
| 107 | 107 | { |
| 108 | 108 | if( get_current_screen()->id != $this->hook )return; |
| 109 | 109 | foreach( parent::register() as $metabox ) { |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | add_screen_option( 'layout_columns', [ |
| 113 | 113 | 'max' => 2, |
| 114 | 114 | 'default' => 2, |
| 115 | - ]); |
|
| 115 | + ] ); |
|
| 116 | 116 | do_action( 'pollux/settings/init' ); |
| 117 | 117 | } |
| 118 | 118 | |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | 'confirm' => __( 'Are you sure want to do this?', 'pollux' ), |
| 134 | 134 | 'hook' => $this->hook, |
| 135 | 135 | 'id' => static::ID, |
| 136 | - ]); |
|
| 136 | + ] ); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | 'columns' => get_current_screen()->get_columns(), |
| 146 | 146 | 'id' => static::ID, |
| 147 | 147 | 'title' => __( 'Site Settings', 'pollux' ), |
| 148 | - ]); |
|
| 148 | + ] ); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
@@ -160,9 +160,9 @@ discard block |
||
| 160 | 160 | ]; |
| 161 | 161 | $this->render( 'settings/submit', [ |
| 162 | 162 | 'reset' => __( 'Reset Settings', 'pollux' ), |
| 163 | - 'reset_url' => esc_url( add_query_arg( $query, admin_url( 'admin.php' ))), |
|
| 163 | + 'reset_url' => esc_url( add_query_arg( $query, admin_url( 'admin.php' ) ) ), |
|
| 164 | 164 | 'submit' => get_submit_button( __( 'Save', 'pollux' ), 'primary', 'submit', false ), |
| 165 | - ]); |
|
| 165 | + ] ); |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | /** |
@@ -173,11 +173,11 @@ discard block |
||
| 173 | 173 | if( filter_input( INPUT_GET, 'page' ) !== static::ID |
| 174 | 174 | || filter_input( INPUT_GET, 'action' ) !== 'reset' |
| 175 | 175 | )return; |
| 176 | - if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook )) { |
|
| 176 | + if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook ) ) { |
|
| 177 | 177 | update_option( static::ID, $this->getDefaults() ); |
| 178 | 178 | return add_settings_error( static::ID, 'reset', __( 'Settings reset to defaults.', 'pollux' ), 'updated' ); |
| 179 | 179 | } |
| 180 | - add_settings_error( static::ID, 'reset', __( 'Failed to reset settings. Please refresh the page and try again.', 'pollux' )); |
|
| 180 | + add_settings_error( static::ID, 'reset', __( 'Failed to reset settings. Please refresh the page and try again.', 'pollux' ) ); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | /** |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | protected function filterArrayByKey( array $array, $key ) |
| 188 | 188 | { |
| 189 | 189 | return array_filter( $array, function( $value ) use( $key ) { |
| 190 | - return !empty( $value[$key] ); |
|
| 190 | + return !empty( $value[ $key ] ); |
|
| 191 | 191 | }); |
| 192 | 192 | } |
| 193 | 193 | |
@@ -200,11 +200,11 @@ discard block |
||
| 200 | 200 | |
| 201 | 201 | array_walk( $metaboxes, function( &$metabox ) { |
| 202 | 202 | $fields = array_map( function( $field ) { |
| 203 | - $field = wp_parse_args( $field, ['std' => ''] ); |
|
| 204 | - return [$field['slug'] => $field['std']]; |
|
| 205 | - }, $this->filterArrayByKey( $metabox['fields'], 'slug' )); |
|
| 203 | + $field = wp_parse_args( $field, [ 'std' => '' ] ); |
|
| 204 | + return [ $field[ 'slug' ] => $field[ 'std' ] ]; |
|
| 205 | + }, $this->filterArrayByKey( $metabox[ 'fields' ], 'slug' ) ); |
|
| 206 | 206 | $metabox = [ |
| 207 | - $metabox['slug'] => call_user_func_array( 'array_merge', $fields ), |
|
| 207 | + $metabox[ 'slug' ] => call_user_func_array( 'array_merge', $fields ), |
|
| 208 | 208 | ]; |
| 209 | 209 | }); |
| 210 | 210 | return call_user_func_array( 'array_merge', $metaboxes ); |
@@ -215,14 +215,14 @@ discard block |
||
| 215 | 215 | */ |
| 216 | 216 | protected function normalize() |
| 217 | 217 | { |
| 218 | - foreach( $this->app->config['settings'] as $id => $metabox ) { |
|
| 218 | + foreach( $this->app->config[ 'settings' ] as $id => $metabox ) { |
|
| 219 | 219 | $defaults = [ |
| 220 | - 'condition' => [], |
|
| 221 | - 'fields' => [], |
|
| 220 | + 'condition' => [ ], |
|
| 221 | + 'fields' => [ ], |
|
| 222 | 222 | 'id' => $id, |
| 223 | 223 | 'slug' => $id, |
| 224 | 224 | ]; |
| 225 | - $this->metaboxes[] = $this->normalizeThis( $metabox, $defaults, $id ); |
|
| 225 | + $this->metaboxes[ ] = $this->normalizeThis( $metabox, $defaults, $id ); |
|
| 226 | 226 | } |
| 227 | 227 | } |
| 228 | 228 | |
@@ -233,10 +233,10 @@ discard block |
||
| 233 | 233 | */ |
| 234 | 234 | protected function normalizeFieldName( $name, array $data, $parentId ) |
| 235 | 235 | { |
| 236 | - if( !empty( $name )) { |
|
| 236 | + if( !empty( $name ) ) { |
|
| 237 | 237 | return $name; |
| 238 | 238 | } |
| 239 | - $name = str_replace( sprintf( '%s-%s-', static::ID, $parentId ), '', $data['id'] ); |
|
| 239 | + $name = str_replace( sprintf( '%s-%s-', static::ID, $parentId ), '', $data[ 'id' ] ); |
|
| 240 | 240 | return sprintf( '%s[%s][%s]', static::ID, $parentId, $name ); |
| 241 | 241 | } |
| 242 | 242 | |
@@ -105,7 +105,9 @@ discard block |
||
| 105 | 105 | */ |
| 106 | 106 | public function register( $metaboxes = [] ) |
| 107 | 107 | { |
| 108 | - if( get_current_screen()->id != $this->hook )return; |
|
| 108 | + if( get_current_screen()->id != $this->hook ) { |
|
| 109 | + return; |
|
| 110 | + } |
|
| 109 | 111 | foreach( parent::register() as $metabox ) { |
| 110 | 112 | new SettingsMetaBox( $metabox ); |
| 111 | 113 | } |
@@ -172,7 +174,9 @@ discard block |
||
| 172 | 174 | { |
| 173 | 175 | if( filter_input( INPUT_GET, 'page' ) !== static::ID |
| 174 | 176 | || filter_input( INPUT_GET, 'action' ) !== 'reset' |
| 175 | - )return; |
|
| 177 | + ) { |
|
| 178 | + return; |
|
| 179 | + } |
|
| 176 | 180 | if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), $this->hook )) { |
| 177 | 181 | update_option( static::ID, $this->getDefaults() ); |
| 178 | 182 | return add_settings_error( static::ID, 'reset', __( 'Settings reset to defaults.', 'pollux' ), 'updated' ); |
@@ -186,7 +190,8 @@ discard block |
||
| 186 | 190 | */ |
| 187 | 191 | protected function filterArrayByKey( array $array, $key ) |
| 188 | 192 | { |
| 189 | - return array_filter( $array, function( $value ) use( $key ) { |
|
| 193 | + return array_filter( $array, function( $value ) use( $key ) |
|
| 194 | + { |
|
| 190 | 195 | return !empty( $value[$key] ); |
| 191 | 196 | }); |
| 192 | 197 | } |
@@ -198,8 +203,10 @@ discard block |
||
| 198 | 203 | { |
| 199 | 204 | $metaboxes = $this->filterArrayByKey( $this->metaboxes, 'slug' ); |
| 200 | 205 | |
| 201 | - array_walk( $metaboxes, function( &$metabox ) { |
|
| 202 | - $fields = array_map( function( $field ) { |
|
| 206 | + array_walk( $metaboxes, function( &$metabox ) |
|
| 207 | + { |
|
| 208 | + $fields = array_map( function( $field ) |
|
| 209 | + { |
|
| 203 | 210 | $field = wp_parse_args( $field, ['std' => ''] ); |
| 204 | 211 | return [$field['slug'] => $field['std']]; |
| 205 | 212 | }, $this->filterArrayByKey( $metabox['fields'], 'slug' )); |