codehaiku / subway-2.0

subway.php

Spacing +14 added lines, -14 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';
@@ -93,20 +93,20 @@ 
 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);

shortcodes/subway-shortcodes.php

Spacing +20 added lines, -20 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;
 
@@ -93,15 +93,15 @@ 
      * 
      * @return void
      */
-    public function loginForm( $atts )
+    public function loginForm($atts)
     {
-        $atts = shortcode_atts( array(
+        $atts = shortcode_atts(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',
@@ -110,7 +110,7 @@ 
             'value_username' => '',
             'value_remember' => false,
             'redirect'       => home_url(),
-        ), $atts );
+        ), $atts);
 
         return $this->renderTemplate($atts, 'login-form.php');
     }
@@ -123,22 +123,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) {
 
@@ -169,7 +169,7 @@ 
      * 
      * @return string            The content of our login form action.
      */
-    public function loginFormAction( $__content ) 
+    public function loginFormAction($__content) 
     {
 
         ob_start();
@@ -187,7 +187,7 @@ 
      * 
      * @return string          The content of our lost password link.
      */
-    public function lostPasswordLink( $content ) 
+    public function lostPasswordLink($content) 
     {
         
         return $content . $this->renderTemplate(

i18.php

Spacing +3 added lines, -3 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;
     }
@@ -57,7 +57,7 @@ 
     public function subwayLocalizePlugin() 
     {
 
-        load_plugin_textdomain('subway', false, basename( dirname( __FILE__ ) ) . '/languages'  );
+        load_plugin_textdomain('subway', false, basename(dirname(__FILE__)) . '/languages');
 
         return;
 

templates/login-form.php

Spacing +32 added lines, -32 removed lines

@@ -17,7 +17,7 @@ 
  * @link     github.com/codehaiku/subway The Plugin Repository
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -25,100 +25,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( $atts ); ?>
+				<?php echo wp_login_form($atts); ?>
 			</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 logged in.', 'subway' ) ); ?>
-			<?php echo esc_html( $success_message ); ?>
+			<?php $success_message = apply_filters('subway_login_message_success', esc_html__('Great! You have succesfully logged in.', 'subway')); ?>
+			<?php echo esc_html($success_message); ?>
 		</p>
 	</div>
 <?php } ?>

classes/subway-auth-redirect.php

Spacing +14 added lines, -14 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -51,7 +51,7 @@ 
 
         $pwd = filter_input(INPUT_POST, 'pwd', FILTER_SANITIZE_STRING);
 
-        if (empty($log) && empty($pwd) ) {
+        if (empty($log) && empty($pwd)) {
 
             $response['type'] = 'error';
 
@@ -66,7 +66,7 @@ 
 
             $response = array();
 
-            if (is_wp_error($is_signin) ) {
+            if (is_wp_error($is_signin)) {
 
                 $response['type'] = 'error';
 
@@ -105,24 +105,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.
@@ -130,7 +130,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;
             }
@@ -139,14 +139,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;
 
@@ -154,14 +154,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
@@ -183,13 +183,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

Spacing +20 added lines, -20 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;
         }
 
@@ -71,44 +71,44 @@ 
         // 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;
         }
@@ -120,22 +120,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) ) {
+                if ( ! in_array($current_page_id, $excluded_page, true)) {
 
                     wp_safe_redirect(
                         add_query_arg(
-                            array( '_redirected' => 'yes' ),
+                            array('_redirected' => 'yes'),
                             $redirect_page
                         )
                     );