codehaiku / subway-2.0

classes/subway-auth-redirect.php

Indentation +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		}
 
 		// Otherwise, return the Subway login page.
-	    return $subway_login_page;
+		return $subway_login_page;
 
 	}
 

Doc Comments -2 removed lines

@@ -78,8 +78,6 @@
 	 * Returns the filtered redirect url for the current user.
 	 *
 	 * @param  string  $redirect_to The default redirect callback argument.
-	 * @param  string  $request     The default redirect request callback argument.
-	 * @param  integer $user        The current user logging in.
 	 * @return string               The final redirect url.
 	 */
 	public static function get_login_redirect_url( $redirect_to ) {

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

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

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