pryley / site-reviews

plugin/Handlers/EnqueuePublicAssets.php

Spacing +36 added lines, -36 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function enqueueAssets()
     {
-        if (apply_filters('site-reviews/assets/css', true)) {
+        if( apply_filters( 'site-reviews/assets/css', true ) ) {
             wp_enqueue_style(
                 Application::ID,
                 $this->getStylesheet(),
@@ -34,14 +34,14 @@ 
                 glsr()->version
             );
         }
-        if (apply_filters('site-reviews/assets/js', true)) {
-            $dependencies = apply_filters('site-reviews/assets/polyfill', true)
+        if( apply_filters( 'site-reviews/assets/js', true ) ) {
+            $dependencies = apply_filters( 'site-reviews/assets/polyfill', true )
                 ? [Application::ID.'/polyfill']
                 : [];
-            $dependencies = apply_filters('site-reviews/enqueue/public/dependencies', $dependencies);
+            $dependencies = apply_filters( 'site-reviews/enqueue/public/dependencies', $dependencies );
             wp_enqueue_script(
                 Application::ID,
-                glsr()->url('assets/scripts/'.Application::ID.'.js'),
+                glsr()->url( 'assets/scripts/'.Application::ID.'.js' ),
                 $dependencies,
                 glsr()->version,
                 true
@@ -54,13 +54,13 @@ 
      */
     public function enqueuePolyfillService()
     {
-        if (!apply_filters('site-reviews/assets/polyfill', true)) {
+        if( !apply_filters( 'site-reviews/assets/polyfill', true ) ) {
             return;
         }
-        wp_enqueue_script(Application::ID.'/polyfill', add_query_arg([
+        wp_enqueue_script( Application::ID.'/polyfill', add_query_arg( [
             'features' => 'Array.prototype.findIndex,CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event,XMLHttpRequest,MutationObserver',
             'flags' => 'gated',
-        ], 'https://polyfill.io/v3/polyfill.min.js'));
+        ], 'https://polyfill.io/v3/polyfill.min.js' ) );
     }
 
     /**
@@ -71,14 +71,14 @@ 
         // wpforms-recaptcha
         // google-recaptcha
         // nf-google-recaptcha
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return;
         }
-        $language = apply_filters('site-reviews/recaptcha/language', get_locale());
-        wp_enqueue_script(Application::ID.'/google-recaptcha', add_query_arg([
+        $language = apply_filters( 'site-reviews/recaptcha/language', get_locale() );
+        wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg( [
             'hl' => $language,
             'render' => 'explicit',
-        ], 'https://www.google.com/recaptcha/api.js'));
+        ], 'https://www.google.com/recaptcha/api.js' ) );
     }
 
     /**
@@ -89,13 +89,13 @@ 
         $variables = [
             'action' => Application::PREFIX.'action',
             'ajaxpagination' => $this->getFixedSelectorsForPagination(),
-            'ajaxurl' => admin_url('admin-ajax.php'),
+            'ajaxurl' => admin_url( 'admin-ajax.php' ),
             'nameprefix' => Application::ID,
-            'validationconfig' => glsr(Style::class)->validation,
-            'validationstrings' => glsr(ValidationStringsDefaults::class)->defaults(),
+            'validationconfig' => glsr( Style::class )->validation,
+            'validationstrings' => glsr( ValidationStringsDefaults::class )->defaults(),
         ];
-        $variables = apply_filters('site-reviews/enqueue/public/localize', $variables);
-        wp_add_inline_script(Application::ID, $this->buildInlineScript($variables), 'before');
+        $variables = apply_filters( 'site-reviews/enqueue/public/localize', $variables );
+        wp_add_inline_script( Application::ID, $this->buildInlineScript( $variables ), 'before' );
     }
 
     /**
@@ -103,35 +103,35 @@ 
      */
     public function inlineStyles()
     {
-        $inlineStylesheetPath = glsr()->path('assets/styles/inline-styles.css');
-        if (!apply_filters('site-reviews/assets/css', true)) {
+        $inlineStylesheetPath = glsr()->path( 'assets/styles/inline-styles.css' );
+        if( !apply_filters( 'site-reviews/assets/css', true ) ) {
             return;
         }
-        if (!file_exists($inlineStylesheetPath)) {
-            glsr_log()->error('Inline stylesheet is missing: '.$inlineStylesheetPath);
+        if( !file_exists( $inlineStylesheetPath ) ) {
+            glsr_log()->error( 'Inline stylesheet is missing: '.$inlineStylesheetPath );
             return;
         }
-        $inlineStylesheetValues = glsr()->config('inline-styles');
+        $inlineStylesheetValues = glsr()->config( 'inline-styles' );
         $stylesheet = str_replace(
-            array_keys($inlineStylesheetValues),
-            array_values($inlineStylesheetValues),
-            file_get_contents($inlineStylesheetPath)
+            array_keys( $inlineStylesheetValues ),
+            array_values( $inlineStylesheetValues ),
+            file_get_contents( $inlineStylesheetPath )
         );
-        wp_add_inline_style(Application::ID, $stylesheet);
+        wp_add_inline_style( Application::ID, $stylesheet );
     }
 
     /**
      * @return string
      */
-    protected function buildInlineScript(array $variables)
+    protected function buildInlineScript( array $variables )
     {
         $script = 'window.hasOwnProperty("GLSR")||(window.GLSR={});';
-        foreach ($variables as $key => $value) {
-            $script.= sprintf('GLSR.%s=%s;', $key, json_encode($value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+        foreach( $variables as $key => $value ) {
+            $script .= sprintf( 'GLSR.%s=%s;', $key, json_encode( $value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ) );
         }
         $pattern = '/\"([^ \-\"]+)\"(:[{\[\"])/'; // removes unnecessary quotes surrounding object keys
-        $optimizedScript = preg_replace($pattern, '$1$2', $script);
-        return apply_filters('site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables);
+        $optimizedScript = preg_replace( $pattern, '$1$2', $script );
+        return apply_filters( 'site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables );
     }
 
     /**
@@ -140,7 +140,7 @@ 
     protected function getFixedSelectorsForPagination()
     {
         $selectors = ['#wpadminbar', '.site-navigation-fixed'];
-        return apply_filters('site-reviews/enqueue/public/localize/ajax-pagination', $selectors);
+        return apply_filters( 'site-reviews/enqueue/public/localize/ajax-pagination', $selectors );
     }
 
     /**
@@ -148,9 +148,9 @@ 
      */
     protected function getStylesheet()
     {
-        $currentStyle = glsr(Style::class)->style;
-        return file_exists(glsr()->path('assets/styles/custom/'.$currentStyle.'.css'))
-            ? glsr()->url('assets/styles/custom/'.$currentStyle.'.css')
-            : glsr()->url('assets/styles/'.Application::ID.'.css');
+        $currentStyle = glsr( Style::class )->style;
+        return file_exists( glsr()->path( 'assets/styles/custom/'.$currentStyle.'.css' ) )
+            ? glsr()->url( 'assets/styles/custom/'.$currentStyle.'.css' )
+            : glsr()->url( 'assets/styles/'.Application::ID.'.css' );
     }
 }

plugin/Controllers/SettingsController.php

Spacing +47 added lines, -47 removed lines

@@ -14,17 +14,17 @@ 
      * @return array
      * @callback register_setting
      */
-    public function callbackRegisterSettings($input)
+    public function callbackRegisterSettings( $input )
     {
-        $settings = Arr::consolidateArray($input);
-        if (1 === count($settings) && array_key_exists('settings', $settings)) {
-            $options = array_replace_recursive(glsr(OptionManager::class)->all(), $input);
-            $options = $this->sanitizeGeneral($input, $options);
-            $options = $this->sanitizeSubmissions($input, $options);
-            $options = $this->sanitizeTranslations($input, $options);
-            $options = apply_filters('site-reviews/settings/callback', $options, $settings);
-            if (filter_input(INPUT_POST, 'option_page') == Application::ID.'-settings') {
-                glsr(Notice::class)->addSuccess(__('Settings updated.', 'site-reviews'));
+        $settings = Arr::consolidateArray( $input );
+        if( 1 === count( $settings ) && array_key_exists( 'settings', $settings ) ) {
+            $options = array_replace_recursive( glsr( OptionManager::class )->all(), $input );
+            $options = $this->sanitizeGeneral( $input, $options );
+            $options = $this->sanitizeSubmissions( $input, $options );
+            $options = $this->sanitizeTranslations( $input, $options );
+            $options = apply_filters( 'site-reviews/settings/callback', $options, $settings );
+            if( filter_input( INPUT_POST, 'option_page' ) == Application::ID.'-settings' ) {
+                glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) );
             }
             return $options;
         }
@@ -37,63 +37,63 @@ 
      */
     public function registerSettings()
     {
-        register_setting(Application::ID.'-settings', OptionManager::databaseKey(), [
+        register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [
             'sanitize_callback' => [$this, 'callbackRegisterSettings'],
-        ]);
+        ] );
     }
 
     /**
      * @return array
      */
-    protected function sanitizeGeneral(array $input, array $options)
+    protected function sanitizeGeneral( array $input, array $options )
     {
         $key = 'settings.general';
-        $inputForm = Arr::get($input, $key);
-        if (!$this->hasMultilingualIntegration(Arr::get($inputForm, 'multilingual'))) {
-            $options = Arr::set($options, $key.'.multilingual', '');
+        $inputForm = Arr::get( $input, $key );
+        if( !$this->hasMultilingualIntegration( Arr::get( $inputForm, 'multilingual' ) ) ) {
+            $options = Arr::set( $options, $key.'.multilingual', '' );
         }
-        if ('' == trim(Arr::get($inputForm, 'notification_message'))) {
-            $defaultValue = Arr::get(glsr()->defaults, $key.'.notification_message');
-            $options = Arr::set($options, $key.'.notification_message', $defaultValue);
+        if( '' == trim( Arr::get( $inputForm, 'notification_message' ) ) ) {
+            $defaultValue = Arr::get( glsr()->defaults, $key.'.notification_message' );
+            $options = Arr::set( $options, $key.'.notification_message', $defaultValue );
         }
-        $defaultValue = Arr::get($inputForm, 'notifications', []);
-        $options = Arr::set($options, $key.'.notifications', $defaultValue);
+        $defaultValue = Arr::get( $inputForm, 'notifications', [] );
+        $options = Arr::set( $options, $key.'.notifications', $defaultValue );
         return $options;
     }
 
     /**
      * @return array
      */
-    protected function sanitizeSubmissions(array $input, array $options)
+    protected function sanitizeSubmissions( array $input, array $options )
     {
         $key = 'settings.submissions';
-        $inputForm = Arr::get($input, $key);
+        $inputForm = Arr::get( $input, $key );
         $defaultValue = isset($inputForm['required'])
             ? $inputForm['required']
             : [];
-        $options = Arr::set($options, $key.'.required', $defaultValue);
+        $options = Arr::set( $options, $key.'.required', $defaultValue );
         return $options;
     }
 
     /**
      * @return array
      */
-    protected function sanitizeTranslations(array $input, array $options)
+    protected function sanitizeTranslations( array $input, array $options )
     {
         $key = 'settings.strings';
-        $inputForm = Arr::consolidateArray(Arr::get($input, $key));
-        if (!empty($inputForm)) {
-            $options = Arr::set($options, $key, array_values(array_filter($inputForm)));
+        $inputForm = Arr::consolidateArray( Arr::get( $input, $key ) );
+        if( !empty($inputForm) ) {
+            $options = Arr::set( $options, $key, array_values( array_filter( $inputForm ) ) );
             $allowedTags = [
                 'a' => ['class' => [], 'href' => [], 'target' => []],
                 'span' => ['class' => []],
             ];
-            array_walk($options['settings']['strings'], function (&$string) use ($allowedTags) {
-                if (isset($string['s2'])) {
-                    $string['s2'] = wp_kses($string['s2'], $allowedTags);
+            array_walk( $options['settings']['strings'], function( &$string ) use ($allowedTags) {
+                if( isset($string['s2']) ) {
+                    $string['s2'] = wp_kses( $string['s2'], $allowedTags );
                 }
-                if (isset($string['p2'])) {
-                    $string['p2'] = wp_kses($string['p2'], $allowedTags);
+                if( isset($string['p2']) ) {
+                    $string['p2'] = wp_kses( $string['p2'], $allowedTags );
                 }
             });
         }
@@ -103,24 +103,24 @@ 
     /**
      * @return bool
      */
-    protected function hasMultilingualIntegration($integration)
+    protected function hasMultilingualIntegration( $integration )
     {
-        if (!in_array($integration, ['polylang', 'wpml'])) {
+        if( !in_array( $integration, ['polylang', 'wpml'] ) ) {
             return false;
         }
-        $integrationClass = 'GeminiLabs\SiteReviews\Modules\\'.ucfirst($integration);
-        if (!glsr($integrationClass)->isActive()) {
-            glsr(Notice::class)->addError(sprintf(
-                __('Please install/activate the %s plugin to enable integration.', 'site-reviews'),
-                constant($integrationClass.'::PLUGIN_NAME')
-            ));
+        $integrationClass = 'GeminiLabs\SiteReviews\Modules\\'.ucfirst( $integration );
+        if( !glsr( $integrationClass )->isActive() ) {
+            glsr( Notice::class )->addError( sprintf(
+                __( 'Please install/activate the %s plugin to enable integration.', 'site-reviews' ),
+                constant( $integrationClass.'::PLUGIN_NAME' )
+            ) );
             return false;
-        } elseif (!glsr($integrationClass)->isSupported()) {
-            glsr(Notice::class)->addError(sprintf(
-                __('Please update the %s plugin to v%s or greater to enable integration.', 'site-reviews'),
-                constant($integrationClass.'::PLUGIN_NAME'),
-                constant($integrationClass.'::SUPPORTED_VERSION')
-            ));
+        } elseif( !glsr( $integrationClass )->isSupported() ) {
+            glsr( Notice::class )->addError( sprintf(
+                __( 'Please update the %s plugin to v%s or greater to enable integration.', 'site-reviews' ),
+                constant( $integrationClass.'::PLUGIN_NAME' ),
+                constant( $integrationClass.'::SUPPORTED_VERSION' )
+            ) );
             return false;
         }
         return true;