codehaiku / subway-2.0

classes/subway-enqueue.php

Indentation +35 added lines, -35 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,50 +36,50 @@ 
 final class Enqueue
 {
 
-    /**
-     * Registers our CSS and Javascript to WordPress Enqueue Handler.
-     *
-     * @return void
-     */
-    public static function registerJs() 
-    {
+	/**
+	 * Registers our CSS and Javascript to WordPress Enqueue Handler.
+	 *
+	 * @return void
+	 */
+	public static function registerJs() 
+	{
 
-        $post_id = absint(get_queried_object_id());
+		$post_id = absint(get_queried_object_id());
 
-        $signin_page = absint(get_option('subway_login_page'));
+		$signin_page = absint(get_option('subway_login_page'));
 
-        // Only load the stylesheet and javascript documents inside our sign-in page.
-        if ($post_id === $signin_page ) {
+		// Only load the stylesheet and javascript documents inside our sign-in page.
+		if ($post_id === $signin_page ) {
 
-            wp_enqueue_style(
-                'subway-style', 
-                SUBWAY_DIR_URL . 'assets/css/subway.css'
-            );
+			wp_enqueue_style(
+				'subway-style', 
+				SUBWAY_DIR_URL . 'assets/css/subway.css'
+			);
 
-            if (! is_user_logged_in() ) {
+			if (! is_user_logged_in() ) {
 
-                wp_enqueue_script(
-                    'subway-script', 
-                    SUBWAY_DIR_URL . 'assets/js/subway.js', 
-                    array( 'jquery' )
-                );
+				wp_enqueue_script(
+					'subway-script', 
+					SUBWAY_DIR_URL . 'assets/js/subway.js', 
+					array( 'jquery' )
+				);
 
-                wp_localize_script(
-                    'subway-script', 'subway_config', array(
-                    'ajax_url' => admin_url('admin-ajax.php'),
-                    'login_http_error' => esc_html__(
-                        'An error occured while 
+				wp_localize_script(
+					'subway-script', 'subway_config', array(
+					'ajax_url' => admin_url('admin-ajax.php'),
+					'login_http_error' => esc_html__(
+						'An error occured while 
                     	transmitting the data. Refresh the page and try again', 
-                        'subway'
-                    ),
-                    )
-                );
+						'subway'
+					),
+					)
+				);
 
-            }
-        }
+			}
+		}
 
-        return;
+		return;
 
-    }
+	}
 
 }

classes/subway-helpers.php

Indentation +10 added lines, -10 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,13 +36,13 @@ 
 final class Helpers
 {
 
-    /**
-     * Exit wrapper.
-     * 
-     * @return void
-     */
-    public static function close() 
-    {
-        exit;
-    }
+	/**
+	 * Exit wrapper.
+	 * 
+	 * @return void
+	 */
+	public static function close() 
+	{
+		exit;
+	}
 }

classes/subway-options.php

Indentation +47 added lines, -47 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,73 +36,73 @@ 
 final class Options
 {
 
-    /**
-     * Get the redirect page url.
-     *
-     * @return mixed The redirect url of our settings. Otherwise, false.
-     */
-    public static function getRedirectPageUrl() 
-    {
+	/**
+	 * Get the redirect page url.
+	 *
+	 * @return mixed The redirect url of our settings. Otherwise, false.
+	 */
+	public static function getRedirectPageUrl() 
+	{
 
-        $selected_login_post_id = intval(get_option('subway_login_page'));
+		$selected_login_post_id = intval(get_option('subway_login_page'));
 
-        if (0 === $selected_login_post_id ) {
+		if (0 === $selected_login_post_id ) {
 
-            return;
+			return;
 
-        }
+		}
 
-        $login_post = get_post($selected_login_post_id);
+		$login_post = get_post($selected_login_post_id);
 
-        if (! empty($login_post) ) {
+		if (! empty($login_post) ) {
 
-            return trailingslashit(get_permalink($login_post->ID));
+			return trailingslashit(get_permalink($login_post->ID));
 
-        }
+		}
 
-        return false;
+		return false;
 
-    }
+	}
 
-    /**
-     * Fetches the public post ids.
-     *
-     * @return array The collection of public 'post' IDs.
-     */
-    public static function getPublicPostsIdentifiers() 
-    {
+	/**
+	 * Fetches the public post ids.
+	 *
+	 * @return array The collection of public 'post' IDs.
+	 */
+	public static function getPublicPostsIdentifiers() 
+	{
 
-        $subway_public_post = get_option('subway_public_post');
+		$subway_public_post = get_option('subway_public_post');
 
-        $excluded_pages_collection = array();
+		$excluded_pages_collection = array();
 
-        if (! empty($subway_public_post) ) {
+		if (! empty($subway_public_post) ) {
 
-            $excluded_pages_collection = explode(',', $subway_public_post);
+			$excluded_pages_collection = explode(',', $subway_public_post);
 
-        }
+		}
 
-        // Should filter it by integer, spaces will be ignored, other strings.
-        // Will be converted to zero '0'.
-        return array_filter(array_map('intval', $excluded_pages_collection));
+		// Should filter it by integer, spaces will be ignored, other strings.
+		// Will be converted to zero '0'.
+		return array_filter(array_map('intval', $excluded_pages_collection));
 
-    }
+	}
 
-    /**
-     * Check if site is public or not.
-     *
-     * @return boolean True on success. Otherwise, false.
-     */
-    public static function isPublicSite() 
-    {
+	/**
+	 * Check if site is public or not.
+	 *
+	 * @return boolean True on success. Otherwise, false.
+	 */
+	public static function isPublicSite() 
+	{
 
-        $subway_public_post = get_option('subway_is_public');
+		$subway_public_post = get_option('subway_is_public');
 
-        if (! empty($subway_public_post) ) {
+		if (! empty($subway_public_post) ) {
 
-            return true;
+			return true;
 
-        }
-        return false;
-    }
+		}
+		return false;
+	}
 }

shortcodes/subway-shortcodes.php

Doc Comments +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
     /**
      * Class Constructor.
      *
-     * @return void
+     * @return Shortcodes
      */
     private function __construct() 
     {
@@ -53,7 +53,7 @@ 
     /**
      * Instantiate our class.
      * 
-     * @return mixed The instance of this class.
+     * @return Shortcodes|null The instance of this class.
      */
     public static function instance() 
     {
@@ -91,7 +91,7 @@ 
     /**
      * Displays the login form
      * 
-     * @return void
+     * @return null|string
      */
     public function loginForm( $atts )
     {

Indentation +137 added lines, -137 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,166 +36,166 @@ 
 final class Shortcodes
 {
 
-    /**
-     * Class Constructor.
-     *
-     * @return void
-     */
-    private function __construct() 
-    {
+	/**
+	 * Class Constructor.
+	 *
+	 * @return void
+	 */
+	private function __construct() 
+	{
         
-        add_action('init', array( $this, 'register'));
+		add_action('init', array( $this, 'register'));
         
-        return $this;
+		return $this;
 
-    }
+	}
 
-    /**
-     * Instantiate our class.
-     * 
-     * @return mixed The instance of this class.
-     */
-    public static function instance() 
-    {
+	/**
+	 * Instantiate our class.
+	 * 
+	 * @return mixed The instance of this class.
+	 */
+	public static function instance() 
+	{
         
-        static $instance = null;
-
-        if (null === $instance ) {
-
-            $instance = new Shortcodes();
-
-        }
-
-        return $instance;
-
-    }
-
-    /**
-     * Instantiate our class.
-     * 
-     * @return void
-     */
-    public function register() 
-    {
-
-        add_shortcode('subway_login', array( $this, 'loginForm' ));
-
-        add_action('login_form_middle', array( $this, 'loginFormAction' ), 10, 2);
-
-        add_action('login_form_middle', array( $this, 'lostPasswordLink' ), 10, 2);
-
-        return;
-
-    }
-
-    /**
-     * Displays the login form
-     * 
-     * @return void
-     */
-    public function loginForm( $atts )
-    {
-        $atts = shortcode_atts( array(
-            'echo'           => true,
-            'form_id'        => 'loginform',
-            'label_username' => __( 'Username', 'subway' ),
-            'label_password' => __( 'Password', 'subway' ),
-            'label_remember' => __( 'Remember Me', 'subway' ),
-            'label_log_in'   => __( 'Log In', 'subway' ),
-            'id_username'    => 'user_login',
-            'id_password'    => 'user_pass',
-            'id_remember'    => 'rememberme',
-            'id_submit'      => 'wp-submit',
-            'remember'       => true,
-            'value_username' => '',
-            'value_remember' => false,
-            'redirect'       => home_url(),
-        ), $atts );
-
-        return $this->renderTemplate($atts, 'login-form.php');
-    }
-
-    /**
-     * Include the specific plugin file if there is no template file.
-     * 
-     * @param mixed  $atts The shortcode attribute.
-     * @param string $file The shortcode template file.
-     * 
-     * @return string The html template content.
-     */
-    protected function renderTemplate( $atts, $file = '' ) 
-    {
-
-        ob_start();
-
-        if (empty($file) ) {
+		static $instance = null;
+
+		if (null === $instance ) {
+
+			$instance = new Shortcodes();
+
+		}
+
+		return $instance;
+
+	}
+
+	/**
+	 * Instantiate our class.
+	 * 
+	 * @return void
+	 */
+	public function register() 
+	{
+
+		add_shortcode('subway_login', array( $this, 'loginForm' ));
+
+		add_action('login_form_middle', array( $this, 'loginFormAction' ), 10, 2);
+
+		add_action('login_form_middle', array( $this, 'lostPasswordLink' ), 10, 2);
+
+		return;
+
+	}
+
+	/**
+	 * Displays the login form
+	 * 
+	 * @return void
+	 */
+	public function loginForm( $atts )
+	{
+		$atts = shortcode_atts( array(
+			'echo'           => true,
+			'form_id'        => 'loginform',
+			'label_username' => __( 'Username', 'subway' ),
+			'label_password' => __( 'Password', 'subway' ),
+			'label_remember' => __( 'Remember Me', 'subway' ),
+			'label_log_in'   => __( 'Log In', 'subway' ),
+			'id_username'    => 'user_login',
+			'id_password'    => 'user_pass',
+			'id_remember'    => 'rememberme',
+			'id_submit'      => 'wp-submit',
+			'remember'       => true,
+			'value_username' => '',
+			'value_remember' => false,
+			'redirect'       => home_url(),
+		), $atts );
+
+		return $this->renderTemplate($atts, 'login-form.php');
+	}
+
+	/**
+	 * Include the specific plugin file if there is no template file.
+	 * 
+	 * @param mixed  $atts The shortcode attribute.
+	 * @param string $file The shortcode template file.
+	 * 
+	 * @return string The html template content.
+	 */
+	protected function renderTemplate( $atts, $file = '' ) 
+	{
+
+		ob_start();
+
+		if (empty($file) ) {
             
-            return;
+			return;
 
-        }
+		}
 
-        $template = SUBWAY_DIR_PATH . 'templates/'.$file;
+		$template = SUBWAY_DIR_PATH . 'templates/'.$file;
 
-        if (file_exists($template) ) {
+		if (file_exists($template) ) {
 
-            $theme_template = locate_template(array('gears/shortcodes/'.$file ));
+			$theme_template = locate_template(array('gears/shortcodes/'.$file ));
 
-            if ($theme_template) {
+			if ($theme_template) {
 
-                   $template = $theme_template;
+				   $template = $theme_template;
 
-            }
+			}
 
-            include $template;
+			include $template;
 
-        } else {
+		} else {
 
-            echo sprintf(
-                esc_html_e(
-                    'Subway Error: Unable to find template file in: %1s', 'subway'
-                ), 
-                $template
-            );
+			echo sprintf(
+				esc_html_e(
+					'Subway Error: Unable to find template file in: %1s', 'subway'
+				), 
+				$template
+			);
 
-        }
+		}
 
-        return ob_get_clean();
-    }
+		return ob_get_clean();
+	}
 
-    /**
-     * The action for our login form.
-     * 
-     * @param string $__content The current filtered contents.
-     * 
-     * @return string            The content of our login form action.
-     */
-    public function loginFormAction( $__content ) 
-    {
+	/**
+	 * The action for our login form.
+	 * 
+	 * @param string $__content The current filtered contents.
+	 * 
+	 * @return string            The content of our login form action.
+	 */
+	public function loginFormAction( $__content ) 
+	{
 
-        ob_start();
+		ob_start();
         
-        do_action('login_form');
+		do_action('login_form');
         
-        return $__content . ob_get_clean();
-
-    }
-
-     /**
-     * The action for our 'lost password' link.
-     * 
-     * @param string $content The current filtered contents.
-     * 
-     * @return string          The content of our lost password link.
-     */
-    public function lostPasswordLink( $content ) 
-    {
+		return $__content . ob_get_clean();
+
+	}
+
+	 /**
+	  * The action for our 'lost password' link.
+	  * 
+	  * @param string $content The current filtered contents.
+	  * 
+	  * @return string          The content of our lost password link.
+	  */
+	public function lostPasswordLink( $content ) 
+	{
         
-        return $content . $this->renderTemplate(
-            array(), 
-            'login-form-lost-password.php'
-        );
+		return $content . $this->renderTemplate(
+			array(), 
+			'login-form-lost-password.php'
+		);
 
-    }
+	}
 
 }
 

i18.php

Indentation +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,32 +36,32 @@ 
 final class I18
 {
 
-    /**
-     * Class Constructor.
-     *
-     * @return void
-     */
-    public function __construct() 
-    {
+	/**
+	 * Class Constructor.
+	 *
+	 * @return void
+	 */
+	public function __construct() 
+	{
 
-        add_action('plugins_loaded', array( $this, 'subwayLocalizePlugin' ));
+		add_action('plugins_loaded', array( $this, 'subwayLocalizePlugin' ));
 
-        return;
-    }
+		return;
+	}
 
-    /**
-     * Subway l8n callback.
-     *
-     * @return void
-     */
-    public function subwayLocalizePlugin() 
-    {
+	/**
+	 * Subway l8n callback.
+	 *
+	 * @return void
+	 */
+	public function subwayLocalizePlugin() 
+	{
 
-        load_plugin_textdomain('subway', false, basename( dirname( __FILE__ ) ) . '/languages'  );
+		load_plugin_textdomain('subway', false, basename( dirname( __FILE__ ) ) . '/languages'  );
 
-        return;
+		return;
 
-    }
+	}
 
 }
 

classes/subway-metabox.php

Doc Comments +3 added lines, -3 removed lines

@@ -198,7 +198,7 @@ 
      *
      * @since  2.0.9
      * @access public
-     * @return boolean false Returns false if nonce is not valid.
+     * @return boolean|null false Returns false if nonce is not valid.
      */
     public function saveVisibilityMetabox( $post_id = '' )
     {
@@ -268,7 +268,7 @@ 
      *
      * @since  2.0.9
      * @access public
-     * @return boolean false Returns false if nonce is not valid.
+     * @return boolean|null false Returns false if nonce is not valid.
      */
     public function saveMetaboxValues( $post_id )
     {
@@ -307,7 +307,7 @@ 
      *
      * @since  2.0.9
      * @access public
-     * @return boolean true Returns true if nonce is valid.
+     * @return null|boolean true Returns true if nonce is valid.
      */
     public function isNonceValid( $nonce )
     {

Indentation +273 added lines, -273 removed lines

@@ -21,7 +21,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -37,99 +37,99 @@ 
 final class Metabox
 {
 
-    /**
-     * Subway visibility meta value,
-     *
-     * @since 2.0.9
-     * @const string VISIBILITY_METAKEY
-     */
-    const VISIBILITY_METAKEY = 'subway_visibility_meta_key';
-
-    /**
-     * Registers and update metabox with its intended method below.
-     *
-     * @since  2.0.9
-     * @return void
-     */
-    public function __construct()
-    {
-        add_action(
-            'add_meta_boxes',
-            array(
-            $this,
-            'addMetabox'
-            )
-        );
-        add_action(
-            'save_post',
-            array(
-            $this,
-            'saveMetaboxValues'
-            )
-        );
-    }
-
-    /**
-     * Initialize metabox
-     *
-     * @since  2.0.9
-     * @access public
-     * @return void
-     */
-    public static function initMetabox()
-    {
-        new Metabox();
-    }
-
-    /**
-     * Initialize metabox
-     *
-     * @since  2.0.9
-     * @access public
-     * @return void
-     */
-    public function addMetabox()
-    {
-        $post_types = $this->getPostTypes();
-
-        foreach ( $post_types as $post_type => $value ) {
-            add_meta_box(
-                'subway_visibility_metabox',
-                esc_html__('Subway: Visibility Option', 'subway'),
-                array( $this, 'visibilityMetabox' ),
-                $post_type,
-                'side',
-                'low'
-            );
-        }
-    }
-
-    /**
-     * This method displays the Subway Visibility checkbox.
-     *
-     * @param object $post Contains data from the current post.
-     *
-     * @since  2.0.9
-     * @access public
-     * @return void
-     */
-    public function visibilityMetabox( $post )
-    {
-        $howto = __(
-            'Choose the accessibility of this page from the options above.',
-            'subway'
-        );
+	/**
+	 * Subway visibility meta value,
+	 *
+	 * @since 2.0.9
+	 * @const string VISIBILITY_METAKEY
+	 */
+	const VISIBILITY_METAKEY = 'subway_visibility_meta_key';
+
+	/**
+	 * Registers and update metabox with its intended method below.
+	 *
+	 * @since  2.0.9
+	 * @return void
+	 */
+	public function __construct()
+	{
+		add_action(
+			'add_meta_boxes',
+			array(
+			$this,
+			'addMetabox'
+			)
+		);
+		add_action(
+			'save_post',
+			array(
+			$this,
+			'saveMetaboxValues'
+			)
+		);
+	}
+
+	/**
+	 * Initialize metabox
+	 *
+	 * @since  2.0.9
+	 * @access public
+	 * @return void
+	 */
+	public static function initMetabox()
+	{
+		new Metabox();
+	}
+
+	/**
+	 * Initialize metabox
+	 *
+	 * @since  2.0.9
+	 * @access public
+	 * @return void
+	 */
+	public function addMetabox()
+	{
+		$post_types = $this->getPostTypes();
+
+		foreach ( $post_types as $post_type => $value ) {
+			add_meta_box(
+				'subway_visibility_metabox',
+				esc_html__('Subway: Visibility Option', 'subway'),
+				array( $this, 'visibilityMetabox' ),
+				$post_type,
+				'side',
+				'low'
+			);
+		}
+	}
+
+	/**
+	 * This method displays the Subway Visibility checkbox.
+	 *
+	 * @param object $post Contains data from the current post.
+	 *
+	 * @since  2.0.9
+	 * @access public
+	 * @return void
+	 */
+	public function visibilityMetabox( $post )
+	{
+		$howto = __(
+			'Choose the accessibility of this page from the options above.',
+			'subway'
+		);
       
-        $private_setting_label = __( 'Members Only', 'subway'  );
+		$private_setting_label = __( 'Members Only', 'subway'  );
 
-        $is_post_public          = self::isPostPublic($post->ID);
-        $is_post_private         = self::isPostPrivate($post->ID);
+		$is_post_public          = self::isPostPublic($post->ID);
+		$is_post_private         = self::isPostPrivate($post->ID);
 
-        // Make sure the form request comes from WordPress
-        wp_nonce_field(  basename(__FILE__),  'subway_post_visibility_nonce' );
+		// Make sure the form request comes from WordPress
+		wp_nonce_field(  basename(__FILE__),  'subway_post_visibility_nonce' );
 
-        // Disable the options (radio) when site is selected as public
-        ?>
+		// Disable the options (radio) when site is selected as public
+		?>
         
         <?php if ( ! Options::isPublicSite() ):  ?>
         <?php // Site is private. Give them some Beer! ?>
@@ -155,188 +155,188 @@ 
             </p>
         <?php endif; ?>
         <?php
-    }
-
-    /**
-     * This method verify if nonce is valid then updates a post_meta.
-     *
-     * @param integer $post_id Contains ID of the current post.
-     *
-     * @since  2.0.9
-     * @access public
-     * @return boolean false Returns false if nonce is not valid.
-     */
-    public function saveVisibilityMetabox( $post_id = '' )
-    {
-
-        $public_posts     = Options::getPublicPostsIdentifiers();
-
-        $posts_implode    = '';
-
-        $visibility_field = 'subway-visibility-settings';
-
-        $visibility_nonce = filter_input(
-            INPUT_POST,
-            'subway_post_visibility_nonce',
-            FILTER_SANITIZE_STRING
-        );
-
-        $post_visibility = filter_input(
-            INPUT_POST,
-            $visibility_field,
-            FILTER_SANITIZE_STRING
-        );
-
-        $is_valid_visibility_nonce = self::isNonceValid(
-            $visibility_nonce
-        );
-
-        // verify taxonomies meta box nonce
-        if (false === $is_valid_visibility_nonce ) {
-            return;
-        }
-
-        if (! empty($post_visibility) ) {
-            if (! empty($post_id) ) {
-                if ('public' === $post_visibility ) {
-                    if (! in_array($post_id, $public_posts) ) {
-                        array_push($public_posts, $post_id);
-                    }
-                }
-                if ('private' === $post_visibility ) {
-                    unset($public_posts[ array_search($post_id, $public_posts) ]);
-                }
-            }
-        }
-
-        if (! empty($post_id) ) {
-            $posts_implode = implode(", ", $public_posts);
-
-            if ('inherit' !== get_post_status($post_id) ) {
-
-                if (true === $is_valid_visibility_nonce ) {
-                    update_option('subway_public_post', $posts_implode);
-                    update_post_meta(
-                        $post_id,
-                        self::VISIBILITY_METAKEY,
-                        $post_visibility
-                    );
-                }
-
-            }
-        }
-    }
-
-    /**
-     * This method runs the methods that handles the update for a post_meta.
-     *
-     * @param integer $post_id Contains ID of the current post.
-     *
-     * @since  2.0.9
-     * @access public
-     * @return boolean false Returns false if nonce is not valid.
-     */
-    public function saveMetaboxValues( $post_id )
-    {
-        $this->saveVisibilityMetabox($post_id);
-        return;
-    }
-
-    /**
-     * Initialize metabox arguments.
-     *
-     * @param array  $args   The arguments for the get_post_types().
-     * @param string $output Your desired output for the data.
-     *
-     * @since  2.0.9
-     * @access public
-     * @return void
-     */
-    public static function getPostTypes( $args = '', $output = '' )
-    {
-        if (empty($args) ) {
-            $args = array(
-            'public'   => true,
-            );
-            $output = 'names';
-        }
-
-        $post_types = get_post_types($args, $output);
-
-        return $post_types;
-    }
-
-    /**
-     * This method verify if nonce is valid.
-     *
-     * @param mixed $nonce the name of a metabox nonce.
-     *
-     * @since  2.0.9
-     * @access public
-     * @return boolean true Returns true if nonce is valid.
-     */
-    public function isNonceValid( $nonce )
-    {
-        if (!isset($nonce) || !wp_verify_nonce($nonce, basename(__FILE__)) ) {
-            return;
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks if a post is set to private.
-     *
-     * @param integer $post_id Contains ID of the current post.
-     *
-     * @since  2.0.9
-     * @access public
-     * @return boolean true Returns true if post is private. Otherwise false.
-     */
-    public static function isPostPrivate( $post_id )
-    {
-        $meta_value = '';
-
-        if ( ! empty( $post_id ) ) {
-            $meta_value = get_post_meta($post_id, self::VISIBILITY_METAKEY, true);
-
-            // New page or old pages that don't have Subway'\ Visibility Options
-            if ( empty ( $meta_value ) ) {
-                // Get the value from the general settings (Settings > Subway)
-                $is_site_public = Options::isPublicSite();
-                if ( ! $is_site_public ) {
-                    // It's private.
-                    return true;
-                }
-            }
-            if ('private' === $meta_value ) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if a post is set to public.
-     *
-     * @param integer $post_id Contains ID of the current post.
-     *
-     * @since  2.0.9
-     * @access public
-     * @return boolean true Returns true if post is public. Otherwise false.
-     */
-    public static function isPostPublic( $post_id )
-    {
-        $public_post = Options::getPublicPostsIdentifiers();
-
-        if (! empty($post_id) ) {
-            if (! in_array($post_id, $public_post, true) ) {
-                return true;
-            }
-        }
-
-        return false;
-    }
+	}
+
+	/**
+	 * This method verify if nonce is valid then updates a post_meta.
+	 *
+	 * @param integer $post_id Contains ID of the current post.
+	 *
+	 * @since  2.0.9
+	 * @access public
+	 * @return boolean false Returns false if nonce is not valid.
+	 */
+	public function saveVisibilityMetabox( $post_id = '' )
+	{
+
+		$public_posts     = Options::getPublicPostsIdentifiers();
+
+		$posts_implode    = '';
+
+		$visibility_field = 'subway-visibility-settings';
+
+		$visibility_nonce = filter_input(
+			INPUT_POST,
+			'subway_post_visibility_nonce',
+			FILTER_SANITIZE_STRING
+		);
+
+		$post_visibility = filter_input(
+			INPUT_POST,
+			$visibility_field,
+			FILTER_SANITIZE_STRING
+		);
+
+		$is_valid_visibility_nonce = self::isNonceValid(
+			$visibility_nonce
+		);
+
+		// verify taxonomies meta box nonce
+		if (false === $is_valid_visibility_nonce ) {
+			return;
+		}
+
+		if (! empty($post_visibility) ) {
+			if (! empty($post_id) ) {
+				if ('public' === $post_visibility ) {
+					if (! in_array($post_id, $public_posts) ) {
+						array_push($public_posts, $post_id);
+					}
+				}
+				if ('private' === $post_visibility ) {
+					unset($public_posts[ array_search($post_id, $public_posts) ]);
+				}
+			}
+		}
+
+		if (! empty($post_id) ) {
+			$posts_implode = implode(", ", $public_posts);
+
+			if ('inherit' !== get_post_status($post_id) ) {
+
+				if (true === $is_valid_visibility_nonce ) {
+					update_option('subway_public_post', $posts_implode);
+					update_post_meta(
+						$post_id,
+						self::VISIBILITY_METAKEY,
+						$post_visibility
+					);
+				}
+
+			}
+		}
+	}
+
+	/**
+	 * This method runs the methods that handles the update for a post_meta.
+	 *
+	 * @param integer $post_id Contains ID of the current post.
+	 *
+	 * @since  2.0.9
+	 * @access public
+	 * @return boolean false Returns false if nonce is not valid.
+	 */
+	public function saveMetaboxValues( $post_id )
+	{
+		$this->saveVisibilityMetabox($post_id);
+		return;
+	}
+
+	/**
+	 * Initialize metabox arguments.
+	 *
+	 * @param array  $args   The arguments for the get_post_types().
+	 * @param string $output Your desired output for the data.
+	 *
+	 * @since  2.0.9
+	 * @access public
+	 * @return void
+	 */
+	public static function getPostTypes( $args = '', $output = '' )
+	{
+		if (empty($args) ) {
+			$args = array(
+			'public'   => true,
+			);
+			$output = 'names';
+		}
+
+		$post_types = get_post_types($args, $output);
+
+		return $post_types;
+	}
+
+	/**
+	 * This method verify if nonce is valid.
+	 *
+	 * @param mixed $nonce the name of a metabox nonce.
+	 *
+	 * @since  2.0.9
+	 * @access public
+	 * @return boolean true Returns true if nonce is valid.
+	 */
+	public function isNonceValid( $nonce )
+	{
+		if (!isset($nonce) || !wp_verify_nonce($nonce, basename(__FILE__)) ) {
+			return;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Checks if a post is set to private.
+	 *
+	 * @param integer $post_id Contains ID of the current post.
+	 *
+	 * @since  2.0.9
+	 * @access public
+	 * @return boolean true Returns true if post is private. Otherwise false.
+	 */
+	public static function isPostPrivate( $post_id )
+	{
+		$meta_value = '';
+
+		if ( ! empty( $post_id ) ) {
+			$meta_value = get_post_meta($post_id, self::VISIBILITY_METAKEY, true);
+
+			// New page or old pages that don't have Subway'\ Visibility Options
+			if ( empty ( $meta_value ) ) {
+				// Get the value from the general settings (Settings > Subway)
+				$is_site_public = Options::isPublicSite();
+				if ( ! $is_site_public ) {
+					// It's private.
+					return true;
+				}
+			}
+			if ('private' === $meta_value ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks if a post is set to public.
+	 *
+	 * @param integer $post_id Contains ID of the current post.
+	 *
+	 * @since  2.0.9
+	 * @access public
+	 * @return boolean true Returns true if post is public. Otherwise false.
+	 */
+	public static function isPostPublic( $post_id )
+	{
+		$public_post = Options::getPublicPostsIdentifiers();
+
+		if (! empty($post_id) ) {
+			if (! in_array($post_id, $public_post, true) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
 
 }

admin-settings.php

Indentation +147 added lines, -147 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,55 +36,55 @@ 
 final class AdminSettings
 {
 
-    /**
-     * Our class constructor
-     */
-    public function __construct()
-    {
+	/**
+	 * Our class constructor
+	 */
+	public function __construct()
+	{
 
-        add_action('admin_menu', array( $this, 'adminMenu' ));
+		add_action('admin_menu', array( $this, 'adminMenu' ));
 
-        add_action('admin_init', array( $this, 'registerSettings' ));
+		add_action('admin_init', array( $this, 'registerSettings' ));
 
-    }
+	}
 
-    /**
-     * Display 'Subway' link under 'Settings'
-     *
-     * @return void
-     */
-    public function adminMenu()
-    {
+	/**
+	 * Display 'Subway' link under 'Settings'
+	 *
+	 * @return void
+	 */
+	public function adminMenu()
+	{
 
-        add_options_page(
-            'Subway Settings', 'Subway', 'manage_options',
-            'subway', array( $this, 'optionsPage' )
-        );
+		add_options_page(
+			'Subway Settings', 'Subway', 'manage_options',
+			'subway', array( $this, 'optionsPage' )
+		);
 
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueueSettingsScripts' ) );
 
-        return;
-    }
-
-    /**
-     * Registers all settings related to Subway.
-     *
-     * @return void
-     */
-    public function registerSettings()
-    {
-
-        // Register our settings section.
-        add_settings_section(
-            'subway-page-visibility-section', __('Pages Visibility', 'subway'),
-            array( $this, 'sectionCallback' ), 'subway-settings-section'
-        );
-
-        // Register Redirect Options pages.
-        add_settings_section(
-            'subway-redirect-section', __('Redirect Options', 'subway'),
-            array( $this, 'redirectCallback' ), 'subway-settings-section'
-        );
+		return;
+	}
+
+	/**
+	 * Registers all settings related to Subway.
+	 *
+	 * @return void
+	 */
+	public function registerSettings()
+	{
+
+		// Register our settings section.
+		add_settings_section(
+			'subway-page-visibility-section', __('Pages Visibility', 'subway'),
+			array( $this, 'sectionCallback' ), 'subway-settings-section'
+		);
+
+		// Register Redirect Options pages.
+		add_settings_section(
+			'subway-redirect-section', __('Redirect Options', 'subway'),
+			array( $this, 'redirectCallback' ), 'subway-settings-section'
+		);
 
 		$is_public_site = Options::isPublicSite();
 		$hidden_class = '';
@@ -93,127 +93,127 @@ 
 			$hidden_class = 'hidden';
 		}
 
-        // Register the fields.
-        $fields = array(
+		// Register the fields.
+		$fields = array(
           
-            array(
-                'id' => 'subway_login_page',
-                'label' => __('Login Page', 'subway'),
-                'callback' => 'subway_login_page_form',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-page-visibility-section',
+			array(
+				'id' => 'subway_login_page',
+				'label' => __('Login Page', 'subway'),
+				'callback' => 'subway_login_page_form',
+				'section' => 'subway-settings-section',
+				'group' => 'subway-page-visibility-section',
 				'args'  => array(
 					'label_for' => 'subway_login_page',
 					'class'     => 'subway_login_page-option',
 				),
-            ),
-            array(
-                'id' => 'subway_public_post_deprecated',
-                'label' => __('Public Posts IDs', 'subway'),
-                'callback' => 'subway_public_post',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-page-visibility-section',
+			),
+			array(
+				'id' => 'subway_public_post_deprecated',
+				'label' => __('Public Posts IDs', 'subway'),
+				'callback' => 'subway_public_post',
+				'section' => 'subway-settings-section',
+				'group' => 'subway-page-visibility-section',
 				'args'  => array(
 					'label_for' => 'subway_public_post_deprecated',
 					'class'     => 'subway_public_post_deprecated-option ' . $hidden_class,
 				),
-            ),
-            array(
-                'id' => 'subway_is_public',
-                'label' => __('Public Website', 'subway'),
-                'callback' => 'subway_is_public_form',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-page-visibility-section',
-                'args'  => array(
-                    'label_for' => 'subway_is_public',
-                    'class'     => 'subway_is_public-option',
-                ),
-            ),
-
-            array(
-                'id' => 'subway_redirect_type',
-                'label' => __('Redirect Type', 'subway'),
-                'callback' => 'subway_redirect_option_form',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-redirect-section',
+			),
+			array(
+				'id' => 'subway_is_public',
+				'label' => __('Public Website', 'subway'),
+				'callback' => 'subway_is_public_form',
+				'section' => 'subway-settings-section',
+				'group' => 'subway-page-visibility-section',
+				'args'  => array(
+					'label_for' => 'subway_is_public',
+					'class'     => 'subway_is_public-option',
+				),
+			),
+
+			array(
+				'id' => 'subway_redirect_type',
+				'label' => __('Redirect Type', 'subway'),
+				'callback' => 'subway_redirect_option_form',
+				'section' => 'subway-settings-section',
+				'group' => 'subway-redirect-section',
 				'args'  => array(
 					'label_for' => 'subway_redirect_type',
 					'class'     => 'subway_redirect_type-option ' . $hidden_class,
 				),
-            ),
-            array(
-                'id' => 'subway_redirect_wp_admin',
-                'label' => __('WP Login Link', 'subway'),
-                'callback' => 'subway_lock_wp_admin',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-redirect-section',
+			),
+			array(
+				'id' => 'subway_redirect_wp_admin',
+				'label' => __('WP Login Link', 'subway'),
+				'callback' => 'subway_lock_wp_admin',
+				'section' => 'subway-settings-section',
+				'group' => 'subway-redirect-section',
 				'args'  => array(
 					'label_for' => 'subway_redirect_wp_admin',
 					'class'     => 'subway_redirect_wp_admin-option ' . $hidden_class,
 				),
-            ),
-        );
+			),
+		);
 
-        foreach ( $fields as $field ) {
+		foreach ( $fields as $field ) {
 
-            add_settings_field(
-                $field['id'], $field['label'],
-                $field['callback'], $field['section'],
-                $field['group'], $field['args']
-            );
+			add_settings_field(
+				$field['id'], $field['label'],
+				$field['callback'], $field['section'],
+				$field['group'], $field['args']
+			);
 
-            register_setting('subway-settings-group', $field['id']);
+			register_setting('subway-settings-group', $field['id']);
 
-            $file = str_replace('_', '-', $field['callback']);
+			$file = str_replace('_', '-', $field['callback']);
 
-            include_once trailingslashit(SUBWAY_DIR_PATH) .
-            'settings-fields/field-' . sanitize_title($file) . '.php';
+			include_once trailingslashit(SUBWAY_DIR_PATH) .
+			'settings-fields/field-' . sanitize_title($file) . '.php';
 
-        }
+		}
 
-        // Register Redirect Page ID Settings.
-        register_setting('subway-settings-group', 'subway_redirect_page_id');
+		// Register Redirect Page ID Settings.
+		register_setting('subway-settings-group', 'subway_redirect_page_id');
 
-        // Register Redirect Custom URL Settings.
-        register_setting('subway-settings-group', 'subway_redirect_custom_url');
+		// Register Redirect Custom URL Settings.
+		register_setting('subway-settings-group', 'subway_redirect_custom_url');
 
 		$this->registerSettingsScripts();
 
-        return;
-    }
-
-    /**
-     * Callback function for the first Section.
-     *
-     * @return void
-     */
-    public function sectionCallback()
-    {
-        echo esc_html_e(
-            'All settings related to the
+		return;
+	}
+
+	/**
+	 * Callback function for the first Section.
+	 *
+	 * @return void
+	 */
+	public function sectionCallback()
+	{
+		echo esc_html_e(
+			'All settings related to the
         	visibility of your site and pages.', 'subway'
-        );
-        return;
-    }
-
-    /**
-     * Callback function for the second Section.
-     *
-     * @return void
-     */
-    public function redirectCallback()
-    {
-        return;
-    }
-
-    /**
-     * Renders the 'wrapper' for our options pages.
-     *
-     * @return void
-     */
-    public function optionsPage()
-    {
-        ?>
+		);
+		return;
+	}
+
+	/**
+	 * Callback function for the second Section.
+	 *
+	 * @return void
+	 */
+	public function redirectCallback()
+	{
+		return;
+	}
+
+	/**
+	 * Renders the 'wrapper' for our options pages.
+	 *
+	 * @return void
+	 */
+	public function optionsPage()
+	{
+		?>
 
         <div class="wrap">
             <h2>
@@ -227,30 +227,30 @@ 
         </div>
 
         <?php
-    }
+	}
 
 	/**
-     * Registers the scipts for the Subway settings page.
-     *
+	 * Registers the scipts for the Subway settings page.
+	 *
 	 * @since  2.0.9
-     * @access public
-     * @return void
-     */
+	 * @access public
+	 * @return void
+	 */
 	public function registerSettingsScripts() {
 
 		// Registers the Subway settings Javascript.
-	    wp_register_script( 'subway-settings-script', plugins_url('/assets/js/settings.js', __FILE__) );
-	    wp_register_style( 'subway-settings-style', plugins_url('/assets/css/settings.css', __FILE__) );
+		wp_register_script( 'subway-settings-script', plugins_url('/assets/js/settings.js', __FILE__) );
+		wp_register_style( 'subway-settings-style', plugins_url('/assets/css/settings.css', __FILE__) );
 	 }
 
 	/**
-     * Loads the scipts for the Subway settings page.
+	 * Loads the scipts for the Subway settings page.
 	 *
 	 * @since  2.0.9
-     * @access public
-     * @return void
-     * @return void
-     */
+	 * @access public
+	 * @return void
+	 * @return void
+	 */
 	public function enqueueSettingsScripts( $hook ) {
 		// Checks if page hook is Subway settings page.
 		if ( 'settings_page_subway' === $hook ) {

classes/subway-auth-redirect.php

Indentation +128 added lines, -128 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,185 +36,185 @@ 
 final class AuthRedirect
 {
 
-    /**
-     * Handles our ajax authentication.
-     *
-     * @return void
-     */
-    public static function handleAuthentication()
-    {
+	/**
+	 * Handles our ajax authentication.
+	 *
+	 * @return void
+	 */
+	public static function handleAuthentication()
+	{
 
-        // Set the header type to json.
-        header('Content-Type: application/json');
+		// Set the header type to json.
+		header('Content-Type: application/json');
 
-        $is_signin = new \WP_Error( 'broke', __( 'Unable to authenticate user', "subway" ) );
+		$is_signin = new \WP_Error( 'broke', __( 'Unable to authenticate user', "subway" ) );
 
-        $log = filter_input(INPUT_POST, 'log', FILTER_SANITIZE_STRING);
+		$log = filter_input(INPUT_POST, 'log', FILTER_SANITIZE_STRING);
 
-        $pwd = filter_input(INPUT_POST, 'pwd', FILTER_SANITIZE_STRING);
+		$pwd = filter_input(INPUT_POST, 'pwd', FILTER_SANITIZE_STRING);
 
-        if (empty($log) && empty($pwd) ) {
+		if (empty($log) && empty($pwd) ) {
 
-            $response['type'] = 'error';
+			$response['type'] = 'error';
 
-            $response['message'] = esc_html__(
-                'Username and Password cannot be empty.',
-                'subway'
-            );
+			$response['message'] = esc_html__(
+				'Username and Password cannot be empty.',
+				'subway'
+			);
 
-        } else {
+		} else {
 
-            $is_signin = wp_signon();
+			$is_signin = wp_signon();
 
-            $response = array();
+			$response = array();
 
-            if (is_wp_error($is_signin) ) {
+			if (is_wp_error($is_signin) ) {
 
-                $response['type'] = 'error';
+				$response['type'] = 'error';
 
-                $response['message'] = $is_signin->get_error_message();
+				$response['message'] = $is_signin->get_error_message();
 
-            } else {
+			} else {
 
-                $response['type'] = 'success';
+				$response['type'] = 'success';
 
-                $response['message'] = esc_html__(
-                    'You have successfully logged-in. Redirecting you in few seconds...',
-                    'subway'
-                );
+				$response['message'] = esc_html__(
+					'You have successfully logged-in. Redirecting you in few seconds...',
+					'subway'
+				);
 
-            }
-        }
+			}
+		}
 
-        $subway_redirect_url = AuthRedirect::getLoginRedirectUrl('', $is_signin);
+		$subway_redirect_url = AuthRedirect::getLoginRedirectUrl('', $is_signin);
 
-        $response['redirect_url'] = apply_filters(
-            'subway_login_redirect',
-            $subway_redirect_url,
-            $is_signin
-        );
+		$response['redirect_url'] = apply_filters(
+			'subway_login_redirect',
+			$subway_redirect_url,
+			$is_signin
+		);
 
-        echo wp_json_encode($response);
+		echo wp_json_encode($response);
 
-        wp_die();
+		wp_die();
 
-    }
+	}
 
-    /**
-     * Returns the filtered redirect url for the current user.
-     *
-     * @param string $redirect_to The default redirect callback argument.
-     * @param mixed  $user        This holds the meta info of currently logged-in user.
-     *
-     * @return string             The final redirect url.
-     */
-    public static function getLoginRedirectUrl( $redirect_to, $user )
-    {
+	/**
+	 * Returns the filtered redirect url for the current user.
+	 *
+	 * @param string $redirect_to The default redirect callback argument.
+	 * @param mixed  $user        This holds the meta info of currently logged-in user.
+	 *
+	 * @return string             The final redirect url.
+	 */
+	public static function getLoginRedirectUrl( $redirect_to, $user )
+	{
 
-        $subway_redirect_type = get_option('subway_redirect_type');
+		$subway_redirect_type = get_option('subway_redirect_type');
 
-        // Redirect the user to default behaviour.
-        // If there are no redirect type option saved.
-        if (empty($subway_redirect_type) ) {
+		// Redirect the user to default behaviour.
+		// If there are no redirect type option saved.
+		if (empty($subway_redirect_type) ) {
 
-            return $redirect_to;
+			return $redirect_to;
 
-        }
+		}
 
-        if ('default' === $subway_redirect_type ) {
-            return $redirect_to;
-        }
+		if ('default' === $subway_redirect_type ) {
+			return $redirect_to;
+		}
 
-        if ('page' === $subway_redirect_type ) {
+		if ('page' === $subway_redirect_type ) {
 
-            // Get the page url of the selected page.
-            // If the admin selected 'Custom Page' in the redirect type settings.
-            $selected_redirect_page = intval(get_option('subway_redirect_page_id'));
+			// Get the page url of the selected page.
+			// If the admin selected 'Custom Page' in the redirect type settings.
+			$selected_redirect_page = intval(get_option('subway_redirect_page_id'));
 
-            // Redirect to default WordPress behaviour.
-            // If the user did not select page.
-            if (empty($selected_redirect_page) ) {
+			// Redirect to default WordPress behaviour.
+			// If the user did not select page.
+			if (empty($selected_redirect_page) ) {
 
-                return $redirect_to;
-            }
+				return $redirect_to;
+			}
 
-            // Otherwise, get the permalink of the saved page
-            // and let the user go into that page.
-            return get_permalink($selected_redirect_page);
+			// Otherwise, get the permalink of the saved page
+			// and let the user go into that page.
+			return get_permalink($selected_redirect_page);
 
-        } elseif ('custom_url' === $subway_redirect_type ) {
+		} elseif ('custom_url' === $subway_redirect_type ) {
 
-            // Get the custom url saved in the redirect type settings.
-            $entered_custom_url = get_option('subway_redirect_custom_url');
+			// Get the custom url saved in the redirect type settings.
+			$entered_custom_url = get_option('subway_redirect_custom_url');
 
-            // Redirect to default WordPress behaviour
-            // if the user did enter a custom url.
-            if (empty($entered_custom_url) ) {
+			// Redirect to default WordPress behaviour
+			// if the user did enter a custom url.
+			if (empty($entered_custom_url) ) {
 
-                return $redirect_to;
+				return $redirect_to;
 
-            }
+			}
 
-            // Otherwise, get the custom url saved
-            // and let the user go into that page.
-            if (! empty($user->ID) ) {
-                $entered_custom_url = str_replace(
-                    '%user_id%', $user->ID,
-                    $entered_custom_url
-                );
-            }
+			// Otherwise, get the custom url saved
+			// and let the user go into that page.
+			if (! empty($user->ID) ) {
+				$entered_custom_url = str_replace(
+					'%user_id%', $user->ID,
+					$entered_custom_url
+				);
+			}
 
-            if (! empty($user->user_login) ) {
-                $entered_custom_url = str_replace(
-                    '%user_name%', $user->user_login,
-                    $entered_custom_url
-                );
-            }
+			if (! empty($user->user_login) ) {
+				$entered_custom_url = str_replace(
+					'%user_name%', $user->user_login,
+					$entered_custom_url
+				);
+			}
 
-            return $entered_custom_url;
+			return $entered_custom_url;
 
-        }
+		}
 
-        // Otherwise, quit and redirect the user back to default WordPress behaviour.
-        return $redirect_to;
-    }
+		// Otherwise, quit and redirect the user back to default WordPress behaviour.
+		return $redirect_to;
+	}
 
-    /**
-     * Callback function for the 'login_url' filter defined in Subway.php
-     *
-     * @param string $login_url The login url.
-     *
-     * @return string            The final login url.
-     */
-    public static function loginUrl( $login_url  )
-    {
+	/**
+	 * Callback function for the 'login_url' filter defined in Subway.php
+	 *
+	 * @param string $login_url The login url.
+	 *
+	 * @return string            The final login url.
+	 */
+	public static function loginUrl( $login_url  )
+	{
 
-        $subway_login_page = Options::getRedirectPageUrl();
+		$subway_login_page = Options::getRedirectPageUrl();
 
-        // Return the default login url if there is no log-in page defined.
-        if (empty($subway_login_page) ) {
-            return $login_url;
-        }
+		// Return the default login url if there is no log-in page defined.
+		if (empty($subway_login_page) ) {
+			return $login_url;
+		}
 
-        // Otherwise, return the Subway login page.
-        return $subway_login_page;
+		// Otherwise, return the Subway login page.
+		return $subway_login_page;
 
-    }
+	}
 
-    /**
-     * The callback function for our logout filter.
-     *
-     * @return void
-     */
-    public static function logoutUrl()
-    {
+	/**
+	 * The callback function for our logout filter.
+	 *
+	 * @return void
+	 */
+	public static function logoutUrl()
+	{
 
-        $subway_login_page = Options::getRedirectPageUrl();
+		$subway_login_page = Options::getRedirectPageUrl();
 
-        wp_safe_redirect(esc_url($subway_login_page . '?loggedout=true'));
+		wp_safe_redirect(esc_url($subway_login_page . '?loggedout=true'));
 
-        Helpers::close();
+		Helpers::close();
 
-    }
+	}
 
 }

classes/subway-page-redirect.php

Indentation +108 added lines, -108 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,120 +36,120 @@ 
 final class PageRedirect
 {
 
-    /**
-     * Redirects pages into our login page.
-     *
-     * @return void.
-     */
-    public static function index()
-    {
-
-        // Additional filter for custom pages, taxonomy, links, parameterized urls, etc.
-        // Callback function/method must return true (boolean) to disable redirect.
-        $should_exit = apply_filters( 'subway/classes/subway-page-redirect/index/before-page-redirect', false );
-
-        if ( $should_exit ) {
-            return;
-        }
-
-        // Only execute for non logged in users.
-        if (is_user_logged_in() ) {
-            return;
-        }
+	/**
+	 * Redirects pages into our login page.
+	 *
+	 * @return void.
+	 */
+	public static function index()
+	{
+
+		// Additional filter for custom pages, taxonomy, links, parameterized urls, etc.
+		// Callback function/method must return true (boolean) to disable redirect.
+		$should_exit = apply_filters( 'subway/classes/subway-page-redirect/index/before-page-redirect', false );
+
+		if ( $should_exit ) {
+			return;
+		}
+
+		// Only execute for non logged in users.
+		if (is_user_logged_in() ) {
+			return;
+		}
         
-        $is_private = false;
+		$is_private = false;
 
-        $queried_id = get_queried_object_id();
+		$queried_id = get_queried_object_id();
 
-        $current_post = get_post(absint($queried_id));
+		$current_post = get_post(absint($queried_id));
 
-        $login_page_id = absint(get_option('subway_login_page'));
+		$login_page_id = absint(get_option('subway_login_page'));
 
-        $excluded_page = Options::getPublicPostsIdentifiers();
+		$excluded_page = Options::getPublicPostsIdentifiers();
 
-        // Already escaped inside 'subway_get_redirect_page_url'.
-        $redirect_page = Options::getRedirectPageUrl(); // WPCS XSS OK.
+		// Already escaped inside 'subway_get_redirect_page_url'.
+		$redirect_page = Options::getRedirectPageUrl(); // WPCS XSS OK.
 
-        if ( !empty( $current_post ) ) {
+		if ( !empty( $current_post ) ) {
 		  $is_private = Metabox::isPostPrivate( $current_post->ID );
-        }
-
-        // do_action( 'subway/classes/subway-page-redirect/index/before_page_redirect' );
-
-        // Turn off if is in 'wc-ajax' (woocommerce)
-        if ( function_exists( 'is_ajax') ) {
-            if ( is_ajax() ) {
-               return;
-            }
-        }
-
-        // Same for normal ajax requests.
-        if ( is_admin() && defined( 'DOING_AJAX' ) && DOING_AJAX  ) {
-            return;
-        }
-
-        // Exit if site is public.
-        if ( Options::isPublicSite() ) {
-            return;
-        }
-
-        // Check if redirect page is empty or not.
-        if ( empty( $redirect_page ) ) {
-            return;
-        }
-
-        // Check if buddypress activate page.
-        if (function_exists('bp_is_activation_page') ) {
-            if (bp_is_activation_page() ) {
-                return;
-            }
-        }
-
-        // Check if buddypress registration page.
-        if (function_exists('bp_is_register_page') ) {
-            if (bp_is_register_page() ) {
-                return;
-            }
-        }
-
-        // Assign 0 value to empty $post->ID to prevent exception.
-        // This applies to custom WordPress pages such as BP Members Page and Groups.
-        if (empty($current_post) ) {
-            $current_post = new \stdclass;
-            $current_post->ID = 0;
-        }
-
-        $current_page_id = absint($current_post->ID);
-
-        // Check if $current_page_id && $selected_blog_id is equal to each other.
-        // Get the page ID instead of global $post->ID that the query returns.
-        // The ID of the first post object inside the loop is not correct.
-        $blog_id = absint(get_option('page_for_posts'));
-
-        if (is_home() ) {
-            if ($blog_id === $login_page_id ) {
-                $current_page_id = $blog_id;
-            }
-        }
-
-        // Only execute the script for non-loggedin visitors.
-        if ( ! is_user_logged_in() ) {
-
-            if ($current_page_id !== $login_page_id ) {
-
-                if ( ! in_array( $current_page_id, $excluded_page, true ) || in_array( $current_page_id, $excluded_page, true ) && true === $is_private ) {
-
-                    wp_safe_redirect(
-                        add_query_arg(
-                            array( '_redirected' => 'yes' ),
-                            $redirect_page
-                        )
-                    );
-
-                    Helpers::close();
-                }
-            }
-        }
-    }
+		}
+
+		// do_action( 'subway/classes/subway-page-redirect/index/before_page_redirect' );
+
+		// Turn off if is in 'wc-ajax' (woocommerce)
+		if ( function_exists( 'is_ajax') ) {
+			if ( is_ajax() ) {
+			   return;
+			}
+		}
+
+		// Same for normal ajax requests.
+		if ( is_admin() && defined( 'DOING_AJAX' ) && DOING_AJAX  ) {
+			return;
+		}
+
+		// Exit if site is public.
+		if ( Options::isPublicSite() ) {
+			return;
+		}
+
+		// Check if redirect page is empty or not.
+		if ( empty( $redirect_page ) ) {
+			return;
+		}
+
+		// Check if buddypress activate page.
+		if (function_exists('bp_is_activation_page') ) {
+			if (bp_is_activation_page() ) {
+				return;
+			}
+		}
+
+		// Check if buddypress registration page.
+		if (function_exists('bp_is_register_page') ) {
+			if (bp_is_register_page() ) {
+				return;
+			}
+		}
+
+		// Assign 0 value to empty $post->ID to prevent exception.
+		// This applies to custom WordPress pages such as BP Members Page and Groups.
+		if (empty($current_post) ) {
+			$current_post = new \stdclass;
+			$current_post->ID = 0;
+		}
+
+		$current_page_id = absint($current_post->ID);
+
+		// Check if $current_page_id && $selected_blog_id is equal to each other.
+		// Get the page ID instead of global $post->ID that the query returns.
+		// The ID of the first post object inside the loop is not correct.
+		$blog_id = absint(get_option('page_for_posts'));
+
+		if (is_home() ) {
+			if ($blog_id === $login_page_id ) {
+				$current_page_id = $blog_id;
+			}
+		}
+
+		// Only execute the script for non-loggedin visitors.
+		if ( ! is_user_logged_in() ) {
+
+			if ($current_page_id !== $login_page_id ) {
+
+				if ( ! in_array( $current_page_id, $excluded_page, true ) || in_array( $current_page_id, $excluded_page, true ) && true === $is_private ) {
+
+					wp_safe_redirect(
+						add_query_arg(
+							array( '_redirected' => 'yes' ),
+							$redirect_page
+						)
+					);
+
+					Helpers::close();
+				}
+			}
+		}
+	}
 
 }