codehaiku / subway-2.0

classes/subway-auth-redirect.php

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace Subway;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -31,17 +31,17 @@ 
 	public static function handle_authentication() {
 
 		// Set the header type to json.
-		header( 'Content-Type: application/json' );
+		header('Content-Type: application/json');
 
-		$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['message'] = esc_html__( 'Username and Password cannot be empty.', 'subway' );
+			$response['message'] = esc_html__('Username and Password cannot be empty.', 'subway');
 
 		} else {
 
@@ -49,7 +49,7 @@ 
 
 			$response = array();
 
-			if ( is_wp_error( $is_signin ) ) {
+			if (is_wp_error($is_signin)) {
 
 				$response['type'] = 'error';
 
@@ -59,16 +59,16 @@ 
 
 				$response['type'] = 'success';
 
-				$response['message'] = esc_html__( 'You have successfully logged-in. Redirecting you in few seconds...' );
+				$response['message'] = esc_html__('You have successfully logged-in. Redirecting you in few seconds...');
 
 			}
 		}
 		
-		$subway_redirect_url = Auth_Redirect::get_login_redirect_url( '', '' );
+		$subway_redirect_url = Auth_Redirect::get_login_redirect_url('', '');
 
-		$response['redirect_url'] = apply_filters( 'subway_login_redirect', $subway_redirect_url );
+		$response['redirect_url'] = apply_filters('subway_login_redirect', $subway_redirect_url);
 
-		echo wp_json_encode( $response );
+		echo wp_json_encode($response);
 
 		wp_die();
 
@@ -82,42 +82,42 @@ 
 	 * @param  integer $user        The current user logging in.
 	 * @return string               The final redirect url.
 	 */
-	public static function get_login_redirect_url( $redirect_to ) {
+	public static function get_login_redirect_url($redirect_to) {
 
-		$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 ) ) {
+		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.
-			$selected_redirect_page = intval( get_option( 'subway_redirect_page_id' ) );
+			$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 ) ) {
+			if (empty($selected_redirect_page)) {
 
 				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 );
+			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' );
+			$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;
 
@@ -126,12 +126,12 @@ 
 			// Otherwise, get the custom url saved and let the user go into that page.
 			$current_user = wp_get_current_user();
 
-			if ( ! empty( $current_user->ID ) ) {
-				$entered_custom_url = str_replace( '%user_id%', $current_user->ID, $entered_custom_url );
+			if ( ! empty($current_user->ID)) {
+				$entered_custom_url = str_replace('%user_id%', $current_user->ID, $entered_custom_url);
 			}
 
-			if ( ! empty( $current_user->user_login ) ) {
-				$entered_custom_url = str_replace( '%user_name%', $current_user->user_login, $entered_custom_url );
+			if ( ! empty($current_user->user_login)) {
+				$entered_custom_url = str_replace('%user_name%', $current_user->user_login, $entered_custom_url);
 			}
 
 			return $entered_custom_url;
@@ -148,12 +148,12 @@ 
 	 * @param  string $login_url    The login url.
 	 * @return string               The final login url.
 	 */
-	public static function login_url( $login_url  ) {
+	public static function login_url($login_url) {
 
 		$subway_login_page = Options::get_redirect_page_url();
 
 		// 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;
 		}
 
@@ -171,7 +171,7 @@ 
 
 		$subway_login_page = Options::get_redirect_page_url();
 
-		wp_safe_redirect( esc_url( $subway_login_page . '?loggedout=true' ) );
+		wp_safe_redirect(esc_url($subway_login_page . '?loggedout=true'));
 
 		Helpers::close();
 

shortcodes/subway-shortcodes.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

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

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'],