codehaiku / subway-2.0

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 +296 added lines, -296 removed lines

@@ -21,7 +21,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -37,116 +37,116 @@ 
 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 = __(
-            'Select a radio button to make this post/page public or private',
-            'subway'
-        );
-        $public_label = '<strong>'. __('public', 'subway') .'</strong>';
-        $public_setting_label = __(
-            'Select to make this post ',
-            'subway'
-        ) . $public_label;
-        $private_label = '<strong>'. __('private', 'subway') .'</strong>';
-        $private_setting_label = __(
-            'Select to make this post ',
-            'subway'
-        ) . $private_label;
-        $is_post_public          = self::isPostPublic($post->ID);
-        $is_post_private         = self::isPostPrivate($post->ID);
-        $public_value            = '';
-        $private_value           = '';
-
-        if ($is_post_public ) {
-            $public_value = 'public';
-        }
-        if ($is_post_private ) {
-            $private_value = 'private';
-        }
-
-        // Make sure the form request comes from WordPress
-        wp_nonce_field(
-            basename(__FILE__),
-            'subway_post_visibility_nonce'
-        );
-        ?>
+	/**
+	 * 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 = __(
+			'Select a radio button to make this post/page public or private',
+			'subway'
+		);
+		$public_label = '<strong>'. __('public', 'subway') .'</strong>';
+		$public_setting_label = __(
+			'Select to make this post ',
+			'subway'
+		) . $public_label;
+		$private_label = '<strong>'. __('private', 'subway') .'</strong>';
+		$private_setting_label = __(
+			'Select to make this post ',
+			'subway'
+		) . $private_label;
+		$is_post_public          = self::isPostPublic($post->ID);
+		$is_post_private         = self::isPostPrivate($post->ID);
+		$public_value            = '';
+		$private_value           = '';
+
+		if ($is_post_public ) {
+			$public_value = 'public';
+		}
+		if ($is_post_private ) {
+			$private_value = 'private';
+		}
+
+		// Make sure the form request comes from WordPress
+		wp_nonce_field(
+			basename(__FILE__),
+			'subway_post_visibility_nonce'
+		);
+		?>
 
         <label class="screen-reader-text" for="subway-visibility">
         <?php echo esc_html($setting_label); ?>
@@ -161,13 +161,13 @@ 
             <?php echo checked('public', esc_attr($public_value), false); ?>>
 
             <?php
-                echo wp_kses(
-                    $public_setting_label,
-                    array(
-                    'strong' => array()
-                    )
-                );
-            ?>
+				echo wp_kses(
+					$public_setting_label,
+					array(
+					'strong' => array()
+					)
+				);
+			?>
         </label><br/>
 
         <label class="subway-visibility-settings-checkbox-label"
@@ -179,188 +179,188 @@ 
         <?php echo checked('private', esc_attr($private_value), false); ?>>
 
             <?php
-            echo wp_kses(
-                $private_setting_label,
-                array( 'strong' => array() )
-            );
-            ?>
+			echo wp_kses(
+				$private_setting_label,
+				array( 'strong' => array() )
+			);
+			?>
         </label>
 
         <p class="howto"><?php echo esc_html($howto); ?></p>
 
         <?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);
-            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);
+			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;
+	}
 
 }

Spacing +31 added lines, -31 removed lines

@@ -20,7 +20,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -92,11 +92,11 @@ 
     {
         $post_types = $this->getPostTypes();
 
-        foreach ( $post_types as $post_type => $value ) {
+        foreach ($post_types as $post_type => $value) {
             add_meta_box(
                 'subway_visibility_metabox',
                 esc_html__('Subway: Visibility Option', 'subway'),
-                array( $this, 'visibilityMetabox' ),
+                array($this, 'visibilityMetabox'),
                 $post_type,
                 'side',
                 'low'
@@ -113,18 +113,18 @@ 
      * @access public
      * @return void
      */
-    public function visibilityMetabox( $post )
+    public function visibilityMetabox($post)
     {
         $howto = __(
             'Select a radio button to make this post/page public or private',
             'subway'
         );
-        $public_label = '<strong>'. __('public', 'subway') .'</strong>';
+        $public_label = '<strong>' . __('public', 'subway') . '</strong>';
         $public_setting_label = __(
             'Select to make this post ',
             'subway'
         ) . $public_label;
-        $private_label = '<strong>'. __('private', 'subway') .'</strong>';
+        $private_label = '<strong>' . __('private', 'subway') . '</strong>';
         $private_setting_label = __(
             'Select to make this post ',
             'subway'
@@ -134,10 +134,10 @@ 
         $public_value            = '';
         $private_value           = '';
 
-        if ($is_post_public ) {
+        if ($is_post_public) {
             $public_value = 'public';
         }
-        if ($is_post_private ) {
+        if ($is_post_private) {
             $private_value = 'private';
         }
 
@@ -181,7 +181,7 @@ 
             <?php
             echo wp_kses(
                 $private_setting_label,
-                array( 'strong' => array() )
+                array('strong' => array())
             );
             ?>
         </label>
@@ -200,7 +200,7 @@ 
      * @access public
      * @return boolean false Returns false if nonce is not valid.
      */
-    public function saveVisibilityMetabox( $post_id = '' )
+    public function saveVisibilityMetabox($post_id = '')
     {
 
         $public_posts     = Options::getPublicPostsIdentifiers();
@@ -226,29 +226,29 @@ 
         );
 
         // verify taxonomies meta box nonce
-        if (false === $is_valid_visibility_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) ) {
+        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 ('private' === $post_visibility) {
+                    unset($public_posts[array_search($post_id, $public_posts)]);
                 }
             }
         }
 
-        if (! empty($post_id) ) {
+        if ( ! empty($post_id)) {
             $posts_implode = implode(", ", $public_posts);
 
-            if ('inherit' !== get_post_status($post_id) ) {
+            if ('inherit' !== get_post_status($post_id)) {
 
-                if (true === $is_valid_visibility_nonce ) {
+                if (true === $is_valid_visibility_nonce) {
                     update_option('subway_public_post', $posts_implode);
                     update_post_meta(
                         $post_id,
@@ -270,7 +270,7 @@ 
      * @access public
      * @return boolean false Returns false if nonce is not valid.
      */
-    public function saveMetaboxValues( $post_id )
+    public function saveMetaboxValues($post_id)
     {
         $this->saveVisibilityMetabox($post_id);
         return;
@@ -286,9 +286,9 @@ 
      * @access public
      * @return void
      */
-    public static function getPostTypes( $args = '', $output = '' )
+    public static function getPostTypes($args = '', $output = '')
     {
-        if (empty($args) ) {
+        if (empty($args)) {
             $args = array(
             'public'   => true,
             );
@@ -309,9 +309,9 @@ 
      * @access public
      * @return boolean true Returns true if nonce is valid.
      */
-    public function isNonceValid( $nonce )
+    public function isNonceValid($nonce)
     {
-        if (!isset($nonce) || !wp_verify_nonce($nonce, basename(__FILE__)) ) {
+        if ( ! isset($nonce) || ! wp_verify_nonce($nonce, basename(__FILE__))) {
             return;
         }
 
@@ -327,13 +327,13 @@ 
      * @access public
      * @return boolean true Returns true if post is private. Otherwise false.
      */
-    public static function isPostPrivate( $post_id )
+    public static function isPostPrivate($post_id)
     {
         $meta_value = '';
 
-        if (! empty($post_id) ) {
+        if ( ! empty($post_id)) {
             $meta_value = get_post_meta($post_id, self::VISIBILITY_METAKEY, true);
-            if ('private' === $meta_value ) {
+            if ('private' === $meta_value) {
                 return true;
             }
         }
@@ -350,12 +350,12 @@ 
      * @access public
      * @return boolean true Returns true if post is public. Otherwise false.
      */
-    public static function isPostPublic( $post_id )
+    public static function isPostPublic($post_id)
     {
         $public_post = Options::getPublicPostsIdentifiers();
 
-        if (! empty($post_id) ) {
-            if (! in_array($post_id, $public_post, true) ) {
+        if ( ! empty($post_id)) {
+            if ( ! in_array($post_id, $public_post, true)) {
                 return true;
             }
         }

classes/subway-page-redirect.php

Indentation +101 added lines, -101 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,116 +36,116 @@ 
 final class PageRedirect
 {
 
-    /**
-     * Redirects pages into our login page.
-     *
-     * @return void.
-     */
-    public static function index()
-    {
+	/**
+	 * 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 );
+		// 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;
-        }
+		if ( $should_exit ) {
+			return;
+		}
 
-        // Only execute for non logged in users.
-        if (is_user_logged_in() ) {
-            return;
-        }
+		// Only execute for non logged in users.
+		if (is_user_logged_in() ) {
+			return;
+		}
 
-        $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.
 
 		$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();
+				}
+			}
+		}
+	}
 
 }

Spacing +21 added lines, -21 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -46,14 +46,14 @@ 
 
         // 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 );
+        $should_exit = apply_filters('subway/classes/subway-page-redirect/index/before-page-redirect', false);
 
-        if ( $should_exit ) {
+        if ($should_exit) {
             return;
         }
 
         // Only execute for non logged in users.
-        if (is_user_logged_in() ) {
+        if (is_user_logged_in()) {
             return;
         }
 
@@ -68,49 +68,49 @@ 
         // Already escaped inside 'subway_get_redirect_page_url'.
         $redirect_page = Options::getRedirectPageUrl(); // WPCS XSS OK.
 
-		$is_private = Metabox::isPostPrivate( $current_post->ID );
+		$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() ) {
+        if (function_exists('is_ajax')) {
+            if (is_ajax()) {
                return;
             }
         }
 
         // Same for normal ajax requests.
-        if ( is_admin() && defined( 'DOING_AJAX' ) && DOING_AJAX  ) {
+        if (is_admin() && defined('DOING_AJAX') && DOING_AJAX) {
             return;
         }
 
         // Exit if site is public.
-        if ( Options::isPublicSite() ) {
+        if (Options::isPublicSite()) {
             return;
         }
 
         // Check if redirect page is empty or not.
-        if ( empty( $redirect_page ) ) {
+        if (empty($redirect_page)) {
             return;
         }
 
         // Check if buddypress activate page.
-        if (function_exists('bp_is_activation_page') ) {
-            if (bp_is_activation_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() ) {
+        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) ) {
+        if (empty($current_post)) {
             $current_post = new \stdclass;
             $current_post->ID = 0;
         }
@@ -122,22 +122,22 @@ 
         // 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 ) {
+        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 ( ! is_user_logged_in()) {
 
-            if ($current_page_id !== $login_page_id ) {
+            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 ) {
+                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' ),
+                            array('_redirected' => 'yes'),
                             $redirect_page
                         )
                     );

settings-fields/field-subway-lock-wp-admin.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -18,8 +18,8 @@ 
 
 	<p class="description">
 		<?php
-			echo sprintf( __( "In case, you were locked out. Use the link below to bypass the log-in page and go directly
-			to your website's wp-login URL (http://yoursiteurl.com/wp-login.php): <strong class='subway-settings-text-notice'>%s</strong>", 'subway' ), site_url( 'wp-login.php?no_redirect=true' ) ); 
+			echo sprintf(__("In case, you were locked out. Use the link below to bypass the log-in page and go directly
+			to your website's wp-login URL (http://yoursiteurl.com/wp-login.php): <strong class='subway-settings-text-notice'>%s</strong>", 'subway'), site_url('wp-login.php?no_redirect=true')); 
 		?>
 	</p>
 <?php

settings-fields/field-subway-redirect-option-form.php

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -26,9 +26,9 @@ 
 		<!-- Page -->
 		<label for="subway_use_page">
 
-			<input <?php checked( 'page', get_option( 'subway_redirect_type' ), true ); ?> value="page" name="subway_redirect_type" id="subway_use_page" type="radio" class="code" />
+			<input <?php checked('page', get_option('subway_redirect_type'), true); ?> value="page" name="subway_redirect_type" id="subway_use_page" type="radio" class="code" />
 
-			<?php esc_html_e( 'Custom Page', 'subway' ); ?>
+			<?php esc_html_e('Custom Page', 'subway'); ?>
 
 		</label>
 
@@ -36,9 +36,9 @@ 
 
 		<label for="subway_use_custom_url">
 
-			<input <?php checked( 'custom_url', get_option( 'subway_redirect_type' ), true ); ?> value="custom_url" name="subway_redirect_type" id="subway_use_custom_url" type="radio" class="code" />
+			<input <?php checked('custom_url', get_option('subway_redirect_type'), true); ?> value="custom_url" name="subway_redirect_type" id="subway_use_custom_url" type="radio" class="code" />
 
-			<?php esc_html_e( 'Custom URL', 'subway' ); ?>
+			<?php esc_html_e('Custom URL', 'subway'); ?>
 
 		</label>
 
@@ -46,9 +46,9 @@ 
 
 		<label for="subway_use_default">
 
-			<input <?php checked( 'default', get_option( 'subway_redirect_type' ), true ); ?> value="default" name="subway_redirect_type" id="subway_use_default" type="radio" class="code" />
+			<input <?php checked('default', get_option('subway_redirect_type'), true); ?> value="default" name="subway_redirect_type" id="subway_use_default" type="radio" class="code" />
 
-			<?php esc_html_e( 'Default Behavior', 'subway' ); ?>
+			<?php esc_html_e('Default Behavior', 'subway'); ?>
 
 		</label>
 
@@ -64,7 +64,7 @@ 
 	<div id="subway_redirect_page_option_section" class="hidden subway-redirect-option-section">
 
 		<label for="subway_redirect_page_id">
-			<?php esc_html_e( 'Select Page' ); ?>
+			<?php esc_html_e('Select Page'); ?>
 		</label>
 
 		<?php
@@ -72,8 +72,8 @@ 
 			wp_dropdown_pages(
 				array(
 						'name' => 'subway_redirect_page_id',
-						'selected' => intval( get_option( 'subway_redirect_page_id' ) ),
-						'show_option_none' => esc_html__( '-', 'subway' ),
+						'selected' => intval(get_option('subway_redirect_page_id')),
+						'show_option_none' => esc_html__('-', 'subway'),
 				)
 			);
 
@@ -81,7 +81,7 @@ 
 
 		<p class="description">
 
-			<?php _e( 'The selected page will be used as the redirect endpoint for all of your users. Selecting blank (-) will redirect the user to the default redirect defined in WordPress or other plugins. Choose "Custom URL" if you want to redirect to a custom URL or domain.', 'subway' ); ?>
+			<?php _e('The selected page will be used as the redirect endpoint for all of your users. Selecting blank (-) will redirect the user to the default redirect defined in WordPress or other plugins. Choose "Custom URL" if you want to redirect to a custom URL or domain.', 'subway'); ?>
 
 		</p>
 
@@ -90,29 +90,29 @@ 
 	<div id="subway_redirect_custom_url_option_section" class="hidden subway-redirect-option-section">
 
 		<label for="subway_redirect_custom_url">
-			<?php esc_attr_e( 'Enter Redirect URL:', 'subway' ); ?>
+			<?php esc_attr_e('Enter Redirect URL:', 'subway'); ?>
 		</label>
 
-		<input value="<?php echo esc_attr( esc_url( get_option( 'subway_redirect_custom_url' ) ) ); ?>" type="text" name="subway_redirect_custom_url" placeholder="<?php esc_attr_e( 'http://', 'subway' ); ?>"
+		<input value="<?php echo esc_attr(esc_url(get_option('subway_redirect_custom_url'))); ?>" type="text" name="subway_redirect_custom_url" placeholder="<?php esc_attr_e('http://', 'subway'); ?>"
 		id="subway_redirect_custom_url" size="75" />
 
 		<p class="description"><br>
 
 		<?php
-			echo sprintf( __( 'When entering a custom domain, you can use a variable string such us: %1$s and %2$s. For example, http://yoursiteurl.com/members/<strong>%2$s</strong> will translate to http://yoursiteurl/members/<strong>admin</strong> where "admin" is equal to the %2$s variable; http://yoursiteurl.com/users/<strong>%1$s</strong> will translate to http://yoursiteurl.com/users/<strong>4</strong> where "4" is equal to the %1$s. Both variables refer to the current user that is logged-in.', 'subway' ), '%user_id%', '%user_name%' );
+			echo sprintf(__('When entering a custom domain, you can use a variable string such us: %1$s and %2$s. For example, http://yoursiteurl.com/members/<strong>%2$s</strong> will translate to http://yoursiteurl/members/<strong>admin</strong> where "admin" is equal to the %2$s variable; http://yoursiteurl.com/users/<strong>%1$s</strong> will translate to http://yoursiteurl.com/users/<strong>4</strong> where "4" is equal to the %1$s. Both variables refer to the current user that is logged-in.', 'subway'), '%user_id%', '%user_name%');
 		?>
 
 		</p><br>
 
 		<p class="description">
 
-			<?php esc_attr_e( 'Leave empty to use existing WordPress or other 3rd party plugin redirect option.', 'subway' ); ?>
+			<?php esc_attr_e('Leave empty to use existing WordPress or other 3rd party plugin redirect option.', 'subway'); ?>
 
 		</p><br>
 
 		<p class="description">
 
-			<?php esc_html_e( 'Warning: External URLs are not supported by WordPress Function (wp_safe_redirect) and will be redirected back to default WordPress behavior.', 'subway' ); ?>
+			<?php esc_html_e('Warning: External URLs are not supported by WordPress Function (wp_safe_redirect) and will be redirected back to default WordPress behavior.', 'subway'); ?>
 
 		</p>
 
@@ -122,7 +122,7 @@ 
 	<div id="subway_redirect_default_option_section" class="hidden subway-redirect-option-section">
 		<p>
 			<?php
-				esc_html_e( "By choosing the default behavior, the redirect type will be set to the default WordPress' behavior. For example, if you have plugins like Peter's Login Redirect. This option will disable Subway's redirect and use the Peter's Login Redirect Instead.", 'subway' );
+				esc_html_e("By choosing the default behavior, the redirect type will be set to the default WordPress' behavior. For example, if you have plugins like Peter's Login Redirect. This option will disable Subway's redirect and use the Peter's Login Redirect Instead.", 'subway');
 			?>
 		</p>
 	</div>

settings-fields/field-subway-login-page-form.php

Spacing +11 added lines, -11 removed lines

@@ -10,7 +10,7 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -21,24 +21,24 @@ 
  */
 function subway_login_page_form() {
 
-	$subway_login_page_id = intval( get_option( 'subway_login_page' ) );
+	$subway_login_page_id = intval(get_option('subway_login_page'));
 
-	if ( ! empty( $subway_login_page_id ) ) {
+	if ( ! empty($subway_login_page_id)) {
 
-		$login_page_object = get_post( $subway_login_page_id );
+		$login_page_object = get_post($subway_login_page_id);
 
-		if ( ! empty( $login_page_object )  && isset( $login_page_object->post_content ) ) {
+		if ( ! empty($login_page_object) && isset($login_page_object->post_content)) {
 
 			// Automatically prepend the login shortcode if no
 			// Shortcode exists in the selected login page.
-			if ( ! has_shortcode( $login_page_object->post_content, 'subway_login' ) ) {
+			if ( ! has_shortcode($login_page_object->post_content, 'subway_login')) {
 
 				$new_post_object = array(
 				  'ID' => $login_page_object->ID,
-				  'post_content' => '[subway_login] ' . $login_page_object->post_content,// Prepend Only.
+				  'post_content' => '[subway_login] ' . $login_page_object->post_content, // Prepend Only.
 				 );
 
-				wp_update_post( $new_post_object );
+				wp_update_post($new_post_object);
 			}
 		}
 	}
@@ -46,12 +46,12 @@ 
 	wp_dropdown_pages(
 		array(
 		'name' => 'subway_login_page',
-		'selected' => intval( $subway_login_page_id ),
-		'show_option_none' => esc_html__( '---', 'subway' ),
+		'selected' => intval($subway_login_page_id),
+		'show_option_none' => esc_html__('---', 'subway'),
 		)
 	);
 
-	echo '<p class="description">' . sprintf( esc_html__( 'Select a login page and save the changes to make your site private. Leave blank to make your site public. %1$s.', 'subway' ), '<span class="subway-settings-notice">' . esc_html__( 'You need to add "[subway_login]" shortcode in the selected page to show the login form (this will be done automatically after saving)', 'subway' ) ) . '</span></p>';
+	echo '<p class="description">' . sprintf(esc_html__('Select a login page and save the changes to make your site private. Leave blank to make your site public. %1$s.', 'subway'), '<span class="subway-settings-notice">' . esc_html__('You need to add "[subway_login]" shortcode in the selected page to show the login form (this will be done automatically after saving)', 'subway')) . '</span></p>';
 
 	return;
 }

settings-fields/field-subway-public-post.php

Spacing +4 added lines, -4 removed lines

@@ -10,16 +10,16 @@
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
 function subway_public_post() {
 
-	echo '<textarea id="subway_public_post" name="subway_public_post_deprecated" rows="5" cols="95" readonly="readonly">' . esc_attr( trim( get_option( 'subway_public_post' ) ) ) . '</textarea>';
+	echo '<textarea id="subway_public_post" name="subway_public_post_deprecated" rows="5" cols="95" readonly="readonly">' . esc_attr(trim(get_option('subway_public_post'))) . '</textarea>';
 
-	echo '<p class="description">' . nl2br( esc_html( "Enter the IDs of posts and pages that you wanted to show in public. You need to separate it by ',' (comma),  for example: 143,123,213. Alternatively, you can enable public viewing of all of your pages and posts by checking the 'Public Website' option above.", 'subway' ) );
-	echo '<span class="subway-settings-notice">' . nl2br( esc_html( ' This setting is now disabled on Subway 2.0.9 and future versions. To make your post/page private, go to your individual post/page and check the "Subway: Visibility Option" checkbox.', 'subway' ) ) . '</span>' . '</p>';
+	echo '<p class="description">' . nl2br(esc_html("Enter the IDs of posts and pages that you wanted to show in public. You need to separate it by ',' (comma),  for example: 143,123,213. Alternatively, you can enable public viewing of all of your pages and posts by checking the 'Public Website' option above.", 'subway'));
+	echo '<span class="subway-settings-notice">' . nl2br(esc_html(' This setting is now disabled on Subway 2.0.9 and future versions. To make your post/page private, go to your individual post/page and check the "Subway: Visibility Option" checkbox.', 'subway')) . '</span>' . '</p>';
 
 	return;
 

subway.php

Spacing +15 added lines, -15 removed lines

@@ -31,13 +31,13 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
 // Terminate Subway for PHP version 5.3.0 and below.
-if ( version_compare( PHP_VERSION, '5.3.0', '<' ) ) {
-	add_action( 'admin_notices', 'subway_admin_notice' );
+if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+	add_action('admin_notices', 'subway_admin_notice');
 	/**
 	 * Displays admin notifications if the installed PHP version is less than 5.3.0
 	 *
@@ -48,10 +48,10 @@ 
 		<div class="notice notice-error is-dismissible">
 	        <p>
 	        	<strong>
-	        		<?php esc_html_e( 'Notice: Subway uses PHP Class Namespaces
+	        		<?php esc_html_e('Notice: Subway uses PHP Class Namespaces
 	        		which is only available in servers with PHP 5.3.0 version and above.
 	        		Update your server\'s PHP version. You can deactivate
-	        		Subway in the meantime.', 'subway' ); ?>
+	        		Subway in the meantime.', 'subway'); ?>
 	        	</strong>
 	        </p>
 	    </div>
@@ -60,13 +60,13 @@ 
 }
 
 // Define Subway Plugin Version.
-define( 'SUBWAY_VERSION', '2.0' );
+define('SUBWAY_VERSION', '2.0');
 
 // Define Subway Directory Path.
-define( 'SUBWAY_DIR_PATH', trailingslashit( plugin_dir_path( __FILE__ ) ) );
+define('SUBWAY_DIR_PATH', trailingslashit(plugin_dir_path(__FILE__)));
 
 // Define Subway URL Path.
-define( 'SUBWAY_DIR_URL', trailingslashit( plugin_dir_url( __FILE__ ) ) );
+define('SUBWAY_DIR_URL', trailingslashit(plugin_dir_url(__FILE__)));
 
 // Include Subway i18n.
 require_once SUBWAY_DIR_PATH . 'i18.php';
@@ -96,23 +96,23 @@ 
 require_once SUBWAY_DIR_PATH . 'shortcodes/subway-shortcodes.php';
 
 // Redirect (302) all front-end request to the login page.
-add_action( 'wp', array( 'Subway\PageRedirect', 'index' ) );
+add_action('wp', array('Subway\PageRedirect', 'index'));
 
 // Redirect (302) invalid login request to the login page.
-add_action( 'wp_ajax_nopriv_subway_logging_in', array( 'Subway\AuthRedirect', 'handleAuthentication' ) );
+add_action('wp_ajax_nopriv_subway_logging_in', array('Subway\AuthRedirect', 'handleAuthentication'));
 
 // Load our JS and CSS files.
-add_action( 'wp_enqueue_scripts', array( 'Subway\Enqueue', 'registerJs' ) );
+add_action('wp_enqueue_scripts', array('Subway\Enqueue', 'registerJs'));
 
 // Change the default login url to our sign-in page.
-add_filter( 'login_url', array( 'Subway\AuthRedirect', 'loginUrl' ), 10, 3 );
+add_filter('login_url', array('Subway\AuthRedirect', 'loginUrl'), 10, 3);
 
 // Redirect the user after successful logged in to the right page.
 // Does not trigger when using ajax form. Only on default wp-login.php and wp_login_form().
-add_filter( 'login_redirect', array( 'Subway\AuthRedirect', 'getLoginRedirectUrl' ), 10, 3 );
+add_filter('login_redirect', array('Subway\AuthRedirect', 'getLoginRedirectUrl'), 10, 3);
 
 // Change the default logout url to our sign-in page.
-add_action( 'wp_logout', array( 'Subway\AuthRedirect', 'logoutUrl' ), 10, 3 );
+add_action('wp_logout', array('Subway\AuthRedirect', 'logoutUrl'), 10, 3);
 
 // Adds the Subvway metabox.
-add_action( 'plugins_loaded', array( 'Subway\Metabox', 'initMetabox' ) );
+add_action('plugins_loaded', array('Subway\Metabox', 'initMetabox'));

admin-settings.php

Indentation +144 added lines, -144 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(
-            array(
-                'id' => 'subway_is_public',
-                'label' => __('Public Website', 'subway'),
-                'callback' => 'subway_is_public_form',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-page-visibility-section',
+		// Register the fields.
+		$fields = array(
+			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_login_page',
-                'label' => __('Private Login Page', 'subway'),
-                'callback' => 'subway_login_page_form',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-page-visibility-section',
+			),
+
+			array(
+				'id' => 'subway_login_page',
+				'label' => __('Private 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_redirect_type',
-                'label' => __('Redirect Type', 'subway'),
-                'callback' => 'subway_redirect_option_form',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-redirect-section',
+			),
+
+			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' => __('Bypassing <em>wp-login.php</em>', 'subway'),
-                'callback' => 'subway_lock_wp_admin',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-redirect-section',
+			),
+			array(
+				'id' => 'subway_redirect_wp_admin',
+				'label' => __('Bypassing <em>wp-login.php</em>', '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 ) {

Spacing +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -42,9 +42,9 @@ 
     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'));
 
     }
 
@@ -58,10 +58,10 @@ 
 
         add_options_page(
             'Subway Settings', 'Subway', 'manage_options',
-            'subway', array( $this, 'optionsPage' )
+            'subway', array($this, 'optionsPage')
         );
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueueSettingsScripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'enqueueSettingsScripts'));
 
         return;
     }
@@ -77,19 +77,19 @@ 
         // Register our settings section.
         add_settings_section(
             'subway-page-visibility-section', __('Pages Visibility', 'subway'),
-            array( $this, 'sectionCallback' ), 'subway-settings-section'
+            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'
+            array($this, 'redirectCallback'), 'subway-settings-section'
         );
 
 		$is_public_site = Options::isPublicSite();
 		$hidden_class = '';
 
-		if ( $is_public_site ) {
+		if ($is_public_site) {
 			$hidden_class = 'hidden';
 		}
 
@@ -154,7 +154,7 @@ 
             ),
         );
 
-        foreach ( $fields as $field ) {
+        foreach ($fields as $field) {
 
             add_settings_field(
                 $field['id'], $field['label'],
@@ -239,8 +239,8 @@ 
 	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__));
 	 }
 
 	/**
@@ -251,12 +251,12 @@ 
      * @return void
      * @return void
      */
-	public function enqueueSettingsScripts( $hook ) {
+	public function enqueueSettingsScripts($hook) {
 		// Checks if page hook is Subway settings page.
-		if ( 'settings_page_subway' === $hook ) {
+		if ('settings_page_subway' === $hook) {
 			// Enqueues the script only on the Subway Settings page.
-			wp_enqueue_script( 'subway-settings-script' );
-			wp_enqueue_style( 'subway-settings-style' );
+			wp_enqueue_script('subway-settings-script');
+			wp_enqueue_style('subway-settings-style');
 		}
 	}
 }