codehaiku / subway-2.0

shortcodes/subway-shortcodes.php

Doc Comments +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     /**
      * Class Constructor.
      *
-     * @return void
+     * @return Shortcodes
      */
     private function __construct() 
     {
@@ -53,7 +53,7 @@ 
     /**
      * Instantiate our class.
      * 
-     * @return mixed The instance of this class.
+     * @return Shortcodes|null The instance of this class.
      */
     public static function instance() 
     {

Indentation +107 added lines, -107 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,154 +36,154 @@ 
 final class Shortcodes
 {
 
-    /**
-     * Class Constructor.
-     *
-     * @return void
-     */
-    private function __construct() 
-    {
+	/**
+	 * Class Constructor.
+	 *
+	 * @return void
+	 */
+	private function __construct() 
+	{
         
-        add_action('init', array( $this, 'register'));
+		add_action('init', array( $this, 'register'));
         
-        return $this;
+		return $this;
 
-    }
+	}
 
-    /**
-     * Instantiate our class.
-     * 
-     * @return mixed The instance of this class.
-     */
-    public static function instance() 
-    {
+	/**
+	 * Instantiate our class.
+	 * 
+	 * @return mixed The instance of this class.
+	 */
+	public static function instance() 
+	{
         
-        static $instance = null;
+		static $instance = null;
 
-        if (null === $instance ) {
+		if (null === $instance ) {
 
-            $instance = new Shortcodes();
+			$instance = new Shortcodes();
 
-        }
+		}
 
-        return $instance;
+		return $instance;
 
-    }
+	}
 
-    /**
-     * Instantiate our class.
-     * 
-     * @return void
-     */
-    public function register() 
-    {
+	/**
+	 * Instantiate our class.
+	 * 
+	 * @return void
+	 */
+	public function register() 
+	{
 
-        add_shortcode('subway_login', array( $this, 'loginForm' ));
+		add_shortcode('subway_login', array( $this, 'loginForm' ));
 
-        add_action('login_form_middle', array( $this, 'loginFormAction' ), 10, 2);
+		add_action('login_form_middle', array( $this, 'loginFormAction' ), 10, 2);
 
-        add_action('login_form_middle', array( $this, 'lostPasswordLink' ), 10, 2);
+		add_action('login_form_middle', array( $this, 'lostPasswordLink' ), 10, 2);
 
-        return;
+		return;
 
-    }
+	}
 
-    /**
-     * Displays the login form
-     * 
-     * @return void
-     */
-    public function loginForm() 
-    {
+	/**
+	 * Displays the login form
+	 * 
+	 * @return void
+	 */
+	public function loginForm() 
+	{
         
-        $atts = array();
+		$atts = array();
 
-        echo $this->renderTemplate($atts, 'login-form.php');
+		echo $this->renderTemplate($atts, 'login-form.php');
 
-        return;
-    }
+		return;
+	}
 
-    /**
-     * Include the specific plugin file if there is no template file.
-     * 
-     * @param mixed  $atts The shortcode attribute.
-     * @param string $file The shortcode template file.
-     * 
-     * @return string The html template content.
-     */
-    protected function renderTemplate( $atts, $file = '' ) 
-    {
+	/**
+	 * Include the specific plugin file if there is no template file.
+	 * 
+	 * @param mixed  $atts The shortcode attribute.
+	 * @param string $file The shortcode template file.
+	 * 
+	 * @return string The html template content.
+	 */
+	protected function renderTemplate( $atts, $file = '' ) 
+	{
 
-        ob_start();
+		ob_start();
 
-        if (empty($file) ) {
+		if (empty($file) ) {
             
-            return;
+			return;
 
-        }
+		}
 
-        $template = SUBWAY_DIR_PATH . 'templates/'.$file;
+		$template = SUBWAY_DIR_PATH . 'templates/'.$file;
 
-        if (file_exists($template) ) {
+		if (file_exists($template) ) {
 
-            $theme_template = locate_template(array('gears/shortcodes/'.$file ));
+			$theme_template = locate_template(array('gears/shortcodes/'.$file ));
 
-            if ($theme_template) {
+			if ($theme_template) {
 
-                   $template = $theme_template;
+				   $template = $theme_template;
 
-            }
+			}
 
-            include $template;
+			include $template;
 
-        } else {
+		} else {
 
-            echo sprintf(
-                esc_html_e(
-                    'Subway Error: Unable to find template file in: %1s', 'subway'
-                ), 
-                $template
-            );
+			echo sprintf(
+				esc_html_e(
+					'Subway Error: Unable to find template file in: %1s', 'subway'
+				), 
+				$template
+			);
 
-        }
+		}
 
-        return ob_get_clean();
-    }
+		return ob_get_clean();
+	}
 
-    /**
-     * The action for our login form.
-     * 
-     * @param string $__content The current filtered contents.
-     * 
-     * @return string            The content of our login form action.
-     */
-    public function loginFormAction( $__content ) 
-    {
+	/**
+	 * The action for our login form.
+	 * 
+	 * @param string $__content The current filtered contents.
+	 * 
+	 * @return string            The content of our login form action.
+	 */
+	public function loginFormAction( $__content ) 
+	{
 
-        ob_start();
+		ob_start();
         
-        do_action('login_form');
+		do_action('login_form');
         
-        return $__content . ob_get_clean();
-
-    }
-
-     /**
-     * The action for our 'lost password' link.
-     * 
-     * @param string $content The current filtered contents.
-     * 
-     * @return string          The content of our lost password link.
-     */
-    public function lostPasswordLink( $content ) 
-    {
+		return $__content . ob_get_clean();
+
+	}
+
+	 /**
+	  * The action for our 'lost password' link.
+	  * 
+	  * @param string $content The current filtered contents.
+	  * 
+	  * @return string          The content of our lost password link.
+	  */
+	public function lostPasswordLink( $content ) 
+	{
         
-        return $content . $this->renderTemplate(
-            array(), 
-            'login-form-lost-password.php'
-        );
+		return $content . $this->renderTemplate(
+			array(), 
+			'login-form-lost-password.php'
+		);
 
-    }
+	}
 
 }
 

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -44,7 +44,7 @@ 
     private function __construct() 
     {
         
-        add_action('init', array( $this, 'register'));
+        add_action('init', array($this, 'register'));
         
         return $this;
 
@@ -60,7 +60,7 @@ 
         
         static $instance = null;
 
-        if (null === $instance ) {
+        if (null === $instance) {
 
             $instance = new Shortcodes();
 
@@ -78,11 +78,11 @@ 
     public function register() 
     {
 
-        add_shortcode('subway_login', array( $this, 'loginForm' ));
+        add_shortcode('subway_login', array($this, 'loginForm'));
 
-        add_action('login_form_middle', array( $this, 'loginFormAction' ), 10, 2);
+        add_action('login_form_middle', array($this, 'loginFormAction'), 10, 2);
 
-        add_action('login_form_middle', array( $this, 'lostPasswordLink' ), 10, 2);
+        add_action('login_form_middle', array($this, 'lostPasswordLink'), 10, 2);
 
         return;
 
@@ -111,22 +111,22 @@ 
      * 
      * @return string The html template content.
      */
-    protected function renderTemplate( $atts, $file = '' ) 
+    protected function renderTemplate($atts, $file = '') 
     {
 
         ob_start();
 
-        if (empty($file) ) {
+        if (empty($file)) {
             
             return;
 
         }
 
-        $template = SUBWAY_DIR_PATH . 'templates/'.$file;
+        $template = SUBWAY_DIR_PATH . 'templates/' . $file;
 
-        if (file_exists($template) ) {
+        if (file_exists($template)) {
 
-            $theme_template = locate_template(array('gears/shortcodes/'.$file ));
+            $theme_template = locate_template(array('gears/shortcodes/' . $file));
 
             if ($theme_template) {
 
@@ -157,7 +157,7 @@ 
      * 
      * @return string            The content of our login form action.
      */
-    public function loginFormAction( $__content ) 
+    public function loginFormAction($__content) 
     {
 
         ob_start();
@@ -175,7 +175,7 @@ 
      * 
      * @return string          The content of our lost password link.
      */
-    public function lostPasswordLink( $content ) 
+    public function lostPasswordLink($content) 
     {
         
         return $content . $this->renderTemplate(

i18.php

Indentation +22 added lines, -22 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -44,7 +44,7 @@ 
     public function __construct() 
     {
 
-        add_action('plugins_loaded', array( $this, 'subwayLocalizePlugin' ));
+        add_action('plugins_loaded', array($this, 'subwayLocalizePlugin'));
 
         return;
     }

templates/login-form-lost-password.php

Spacing +3 added lines, -3 removed lines

@@ -17,12 +17,12 @@
  * @link     github.com/codehaiku/subway The Plugin Repository
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 ?>
 <p class="subway-login-lost-password">
-	<a href="<?php echo esc_url( wp_lostpassword_url( $redirect = '' ) ); ?>">
-	 	<?php esc_html_e( 'Forgot Password', 'subway' ); ?>
+	<a href="<?php echo esc_url(wp_lostpassword_url($redirect = '')); ?>">
+	 	<?php esc_html_e('Forgot Password', 'subway'); ?>
 	</a>
 </p>

templates/login-form.php

Spacing +36 added lines, -36 removed lines

@@ -17,17 +17,17 @@ 
  * @link     github.com/codehaiku/subway The Plugin Repository
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
 $args = array(
 	'echo'           => true,
 	'form_id'        => 'loginform',
-	'label_username' => __( 'Username', 'subway' ),
-	'label_password' => __( 'Password', 'subway' ),
-	'label_remember' => __( 'Remember Me', 'subway' ),
-	'label_log_in'   => __( 'Log In', 'subway' ),
+	'label_username' => __('Username', 'subway'),
+	'label_password' => __('Password', 'subway'),
+	'label_remember' => __('Remember Me', 'subway'),
+	'label_log_in'   => __('Log In', 'subway'),
 	'id_username'    => 'user_login',
 	'id_password'    => 'user_pass',
 	'id_remember'    => 'rememberme',
@@ -42,100 +42,100 @@ 
 
 $message_types = array();
 
-$http_request_login = filter_input( INPUT_GET, 'login', FILTER_SANITIZE_SPECIAL_CHARS );
+$http_request_login = filter_input(INPUT_GET, 'login', FILTER_SANITIZE_SPECIAL_CHARS);
 
-$http_request_type = filter_input( INPUT_GET, 'type', FILTER_SANITIZE_SPECIAL_CHARS );
+$http_request_type = filter_input(INPUT_GET, 'type', FILTER_SANITIZE_SPECIAL_CHARS);
 
-$http_request_logout = filter_input( INPUT_GET, 'loggedout', FILTER_SANITIZE_SPECIAL_CHARS );
+$http_request_logout = filter_input(INPUT_GET, 'loggedout', FILTER_SANITIZE_SPECIAL_CHARS);
 
-if ( isset( $http_request_login ) ) {
+if (isset($http_request_login)) {
 
-	if ( 'failed' === $http_request_login ) {
+	if ('failed' === $http_request_login) {
 
-		if ( isset( $http_request_type ) ) {
+		if (isset($http_request_type)) {
 
 			$message_types = array(
 
 				'default' => array(
-						'message' => __( 'There was an error trying to sign-in to your account. Make sure the credentials below are correct.', 'subway' ),
+						'message' => __('There was an error trying to sign-in to your account. Make sure the credentials below are correct.', 'subway'),
 					),
 				'__blank' => array(
-						'message' => __( 'Required: Username and Password cannot be empty.', 'subway' ),
+						'message' => __('Required: Username and Password cannot be empty.', 'subway'),
 					),
 				'__userempty' => array(
-						'message' => __( 'Required: Username cannot be empty.', 'subway' ),
+						'message' => __('Required: Username cannot be empty.', 'subway'),
 					),
 				'__passempty' => array(
-						'message' => __( 'Required: Password cannot be empty.', 'subway' ),
+						'message' => __('Required: Password cannot be empty.', 'subway'),
 					),
 				'fb_invalid_email' => array(
-						'message' => __( 'Facebook email address is invalid or is not yet verified.', 'subway' ),
+						'message' => __('Facebook email address is invalid or is not yet verified.', 'subway'),
 					),
 				'fb_error' => array(
-						'message' => __( 'Facebook Application Error. Misconfigured or App is rejected.', 'subway' ),
+						'message' => __('Facebook Application Error. Misconfigured or App is rejected.', 'subway'),
 					),
 				'app_not_live' => array(
-						'message' => __( 'Unable to fetch your Facebook Profile.', 'subway' ),
+						'message' => __('Unable to fetch your Facebook Profile.', 'subway'),
 					),
 				'gears_username_or_email_exists' => array(
-						'message' => __( 'Username or email address already exists', 'subway' ),
+						'message' => __('Username or email address already exists', 'subway'),
 					),
 				'gp_error_authentication' => array(
-						'message' => __( 'Google Plus Authentication Error. Invalid Client ID or Secret.', 'subway' ),
+						'message' => __('Google Plus Authentication Error. Invalid Client ID or Secret.', 'subway'),
 					),
 			);
 
 			$message = $message_types['default']['message'];
 
-			if ( array_key_exists( $http_request_type, $message_types ) ) {
+			if (array_key_exists($http_request_type, $message_types)) {
 
-				$message = $message_types[ $http_request_type ]['message'];
+				$message = $message_types[$http_request_type]['message'];
 
 			}
 
-			$error_login_message = '<div id="message" class="error">' . esc_html( $message ) . '</div>';
+			$error_login_message = '<div id="message" class="error">' . esc_html($message) . '</div>';
 
 		} else {
 
-			$error_login_message = '<div id="message" class="error">' . esc_html__( 'Error: Invalid username and password combination.', 'subway' ) . '</div>';
+			$error_login_message = '<div id="message" class="error">' . esc_html__('Error: Invalid username and password combination.', 'subway') . '</div>';
 
 		}
 	}
 }
 
-if ( isset( $http_request_logout ) ) {
-	$error_login_message = '<div id="message" class="success">' . esc_html__( 'You have logged out successfully.', 'subway' ) . '</div>';
+if (isset($http_request_logout)) {
+	$error_login_message = '<div id="message" class="success">' . esc_html__('You have logged out successfully.', 'subway') . '</div>';
 }
 
-$http_request_redirected = filter_input( INPUT_GET, '_redirected', FILTER_SANITIZE_SPECIAL_CHARS );
+$http_request_redirected = filter_input(INPUT_GET, '_redirected', FILTER_SANITIZE_SPECIAL_CHARS);
 
-if ( isset( $http_request_redirected ) ) {
-	$error_login_message = '<div id="message" class="success">' . esc_html__( 'Members only page. Please use the login form below to access the page.', 'subway' ) . '</div>';
+if (isset($http_request_redirected)) {
+	$error_login_message = '<div id="message" class="success">' . esc_html__('Members only page. Please use the login form below to access the page.', 'subway') . '</div>';
 }
 
 ?>
-<?php if ( ! is_user_logged_in() ) { ?>
+<?php if ( ! is_user_logged_in()) { ?>
 	<div class="mg-top-35 mg-bottom-35 subway-login-form">
 		<div class="subway-login-form-form">
 			<div class="subway-login-form__actions">
 				<h3>
-					<?php esc_html_e( 'Account Sign-in', 'subway' ); ?>
+					<?php esc_html_e('Account Sign-in', 'subway'); ?>
 				</h3>
-				<?php do_action( 'gears_login_form' ); ?>
+				<?php do_action('gears_login_form'); ?>
 			</div>
 			<div class="subway-login-form-message">
-				<?php echo wp_kses_post( $error_login_message ); ?>
+				<?php echo wp_kses_post($error_login_message); ?>
 			</div>
 			<div class="subway-login-form__form">
-				<?php echo wp_login_form( $args ); ?>
+				<?php echo wp_login_form($args); ?>
 			</div>
 		</div>
 	</div>
 <?php } else { ?>
 	<div class="mg-top-35 mg-bottom-35 subway-login-sucessfull" style="background: #CDDC39; padding: 15px 15px 15px 15px;border-radius: 4px;color: #616161;">
 		<p style="margin-bottom: 0px;">
-			<?php $success_message = apply_filters( 'subway_login_message_success', esc_html__( 'Great! You have succesfully login.', 'subway' ) ); ?>
-			<?php echo esc_html( $success_message ); ?>
+			<?php $success_message = apply_filters('subway_login_message_success', esc_html__('Great! You have succesfully login.', 'subway')); ?>
+			<?php echo esc_html($success_message); ?>
 		</p>
 	</div>
 <?php } ?>

admin-settings.php

Indentation +145 added lines, -145 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,153 +36,153 @@ 
 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_init', array( $this, 'registerSettings' ));
-
-    }
-
-    /**
-     * Display 'Subway' link under 'Settings'
-     *
-     * @return void
-     */
-    public function adminMenu() 
-    {
-
-        add_options_page(
-            'Subway Settings', 'Subway', 'manage_options', 
-            'subway', array( $this, 'optionsPage' )
-        );
-
-        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' 
-        );
-
-        // 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',
-            ),
+		add_action('admin_menu', array( $this, 'adminMenu' ));
+
+		add_action('admin_init', array( $this, 'registerSettings' ));
+
+	}
+
+	/**
+	 * Display 'Subway' link under 'Settings'
+	 *
+	 * @return void
+	 */
+	public function adminMenu() 
+	{
+
+		add_options_page(
+			'Subway Settings', 'Subway', 'manage_options', 
+			'subway', array( $this, 'optionsPage' )
+		);
+
+		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' 
+		);
+
+		// 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',
+			),
     
-            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_public_post',
-                'label' => __('Public Posts IDs', 'subway'),
-                'callback' => 'subway_public_post',
-                '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',
+			),
+			array(
+				'id' => 'subway_public_post',
+				'label' => __('Public Posts IDs', 'subway'),
+				'callback' => 'subway_public_post',
+				'section' => 'subway-settings-section',
+				'group' => 'subway-page-visibility-section',
+			),
     
-            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_wp_admin',
-                'label' => __('Bypassing <em>wp-login.php</em>', 'subway'),
-                'callback' => 'subway_lock_wp_admin',
-                'section' => 'subway-settings-section',
-                'group' => 'subway-redirect-section',
-            ),
-        );
-
-        foreach ( $fields as $field ) {
-
-            add_settings_field(
-                $field['id'], $field['label'], 
-                $field['callback'], $field['section'], 
-                $field['group']
-            );
-
-            register_setting('subway-settings-group', $field['id']);
-
-            $file = str_replace('_', '-', $field['callback']);
-
-            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 Custom URL Settings.
-        register_setting('subway-settings-group', 'subway_redirect_custom_url');
-
-        return;
-    }
-
-    /**
-     * Callback function for the first Section.
-     *
-     * @return void
-     */
-    public function sectionCallback() 
-    {
-        echo esc_html_e(
-            'All settings related to the 
+			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_wp_admin',
+				'label' => __('Bypassing <em>wp-login.php</em>', 'subway'),
+				'callback' => 'subway_lock_wp_admin',
+				'section' => 'subway-settings-section',
+				'group' => 'subway-redirect-section',
+			),
+		);
+
+		foreach ( $fields as $field ) {
+
+			add_settings_field(
+				$field['id'], $field['label'], 
+				$field['callback'], $field['section'], 
+				$field['group']
+			);
+
+			register_setting('subway-settings-group', $field['id']);
+
+			$file = str_replace('_', '-', $field['callback']);
+
+			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 Custom URL Settings.
+		register_setting('subway-settings-group', 'subway_redirect_custom_url');
+
+		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>
@@ -196,7 +196,7 @@ 
         </div>
         
         <?php
-    }
+	}
 
 }
 

Spacing +7 added lines, -7 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,7 +58,7 @@ 
 
         add_options_page(
             'Subway Settings', 'Subway', 'manage_options', 
-            'subway', array( $this, 'optionsPage' )
+            'subway', array($this, 'optionsPage')
         );
 
         return;
@@ -75,13 +75,13 @@ 
         // 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' 
         );
 
         // Register the fields.
@@ -125,7 +125,7 @@ 
             ),
         );
 
-        foreach ( $fields as $field ) {
+        foreach ($fields as $field) {
 
             add_settings_field(
                 $field['id'], $field['label'],