codehaiku / subway-2.0

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

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

Indentation +147 added lines, -147 removed lines

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

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. Selecting "---" (blank) will 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. Selecting "---" (blank) will 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-is-public-form.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -21,8 +21,8 @@ 
  */
 function subway_is_public_form() {
 
-	echo '<label for="subway_is_public"><input ' . checked( 1, get_option( 'subway_is_public' ), false ) . ' value="1" name="subway_is_public" id="subway_is_public" type="checkbox" class="code" /> Check to make all of your posts and pages visible to public.</label>';
-	echo '<p class="description">' . esc_html__( 'Check to ignore all private options and make your site return to its original state (public) without uninstalling Subway. All settings here and in the individual posts or pages will be ignored. Uncheck to make your site accessible to members only', 'subway' ) . '</p>';
+	echo '<label for="subway_is_public"><input ' . checked(1, get_option('subway_is_public'), false) . ' value="1" name="subway_is_public" id="subway_is_public" type="checkbox" class="code" /> Check to make all of your posts and pages visible to public.</label>';
+	echo '<p class="description">' . esc_html__('Check to ignore all private options and make your site return to its original state (public) without uninstalling Subway. All settings here and in the individual posts or pages will be ignored. Uncheck to make your site accessible to members only', 'subway') . '</p>';
 
 	return;
 }

classes/subway-auth-redirect.php

Indentation +128 added lines, -128 removed lines

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

Spacing +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -47,13 +47,13 @@ 
         // Set the header type to json.
         header('Content-Type: application/json');
 
-        $is_signin = new \WP_Error( 'broke', __( 'Unable to authenticate user', "subway" ) );
+        $is_signin = new \WP_Error('broke', __('Unable to authenticate user', "subway"));
 
         $log = filter_input(INPUT_POST, 'log', FILTER_SANITIZE_STRING);
 
         $pwd = filter_input(INPUT_POST, 'pwd', FILTER_SANITIZE_STRING);
 
-        if (empty($log) && empty($pwd) ) {
+        if (empty($log) && empty($pwd)) {
 
             $response['type'] = 'error';
 
@@ -68,7 +68,7 @@ 
 
             $response = array();
 
-            if (is_wp_error($is_signin) ) {
+            if (is_wp_error($is_signin)) {
 
                 $response['type'] = 'error';
 
@@ -108,24 +108,24 @@ 
      *
      * @return string             The final redirect url.
      */
-    public static function getLoginRedirectUrl( $redirect_to, $user )
+    public static function getLoginRedirectUrl($redirect_to, $user)
     {
 
         $subway_redirect_type = get_option('subway_redirect_type');
 
         // Redirect the user to default behaviour.
         // If there are no redirect type option saved.
-        if (empty($subway_redirect_type) ) {
+        if (empty($subway_redirect_type)) {
 
             return $redirect_to;
 
         }
 
-        if ('default' === $subway_redirect_type ) {
+        if ('default' === $subway_redirect_type) {
             return $redirect_to;
         }
 
-        if ('page' === $subway_redirect_type ) {
+        if ('page' === $subway_redirect_type) {
 
             // Get the page url of the selected page.
             // If the admin selected 'Custom Page' in the redirect type settings.
@@ -133,7 +133,7 @@ 
 
             // Redirect to default WordPress behaviour.
             // If the user did not select page.
-            if (empty($selected_redirect_page) ) {
+            if (empty($selected_redirect_page)) {
 
                 return $redirect_to;
             }
@@ -142,14 +142,14 @@ 
             // and let the user go into that page.
             return get_permalink($selected_redirect_page);
 
-        } elseif ('custom_url' === $subway_redirect_type ) {
+        } elseif ('custom_url' === $subway_redirect_type) {
 
             // Get the custom url saved in the redirect type settings.
             $entered_custom_url = get_option('subway_redirect_custom_url');
 
             // Redirect to default WordPress behaviour
             // if the user did enter a custom url.
-            if (empty($entered_custom_url) ) {
+            if (empty($entered_custom_url)) {
 
                 return $redirect_to;
 
@@ -157,14 +157,14 @@ 
 
             // Otherwise, get the custom url saved
             // and let the user go into that page.
-            if (! empty($user->ID) ) {
+            if ( ! empty($user->ID)) {
                 $entered_custom_url = str_replace(
                     '%user_id%', $user->ID,
                     $entered_custom_url
                 );
             }
 
-            if (! empty($user->user_login) ) {
+            if ( ! empty($user->user_login)) {
                 $entered_custom_url = str_replace(
                     '%user_name%', $user->user_login,
                     $entered_custom_url
@@ -186,13 +186,13 @@ 
      *
      * @return string            The final login url.
      */
-    public static function loginUrl( $login_url  )
+    public static function loginUrl($login_url)
     {
 
         $subway_login_page = Options::getRedirectPageUrl();
 
         // Return the default login url if there is no log-in page defined.
-        if (empty($subway_login_page) ) {
+        if (empty($subway_login_page)) {
             return $login_url;
         }
 

classes/subway-page-redirect.php

Indentation +108 added lines, -108 removed lines

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

Spacing +22 added lines, -22 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;
         }
         
@@ -70,51 +70,51 @@ 
         // Already escaped inside 'subway_get_redirect_page_url'.
         $redirect_page = Options::getRedirectPageUrl(); // WPCS XSS OK.
 
-        if ( !empty( $current_post ) ) {
-		  $is_private = Metabox::isPostPrivate( $current_post->ID );
+        if ( ! empty($current_post)) {
+		  $is_private = Metabox::isPostPrivate($current_post->ID);
         }
 
         // do_action( 'subway/classes/subway-page-redirect/index/before_page_redirect' );
 
         // Turn off if is in 'wc-ajax' (woocommerce)
-        if ( function_exists( 'is_ajax') ) {
-            if ( is_ajax() ) {
+        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;
         }
@@ -126,22 +126,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
                         )
                     );