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;
+	}
 
 }

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();
+				}
+			}
+		}
+	}
 
 }

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 ) {