codehaiku / subway-2.0

classes/subway-auth-redirect.php

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 ) {

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 +17 added lines, -17 removed lines

@@ -11,7 +11,7 @@ 
  */
 namespace Subway;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -19,7 +19,7 @@ 
 
 	private function __construct() {
 		
-		add_action( 'init', array( $this, 'register') );
+		add_action('init', array($this, 'register'));
 		
 		return $this;
 
@@ -29,7 +29,7 @@ 
 		
 		static $instance = null;
 
-		if ( null === $instance ) {
+		if (null === $instance) {
 
 			$instance = new Shortcodes();
 
@@ -42,11 +42,11 @@ 
 
 	function register() {
 
-		add_shortcode( 'subway_login', array( $this, 'wp_login' ) );
+		add_shortcode('subway_login', array($this, 'wp_login'));
 
-		add_action( 'login_form_middle', array( $this, 'login_form_action' ), 10, 2 );
+		add_action('login_form_middle', array($this, 'login_form_action'), 10, 2);
 
-		add_action( 'login_form_middle', array( $this, '__action_lost_password_link' ), 10, 2 );
+		add_action('login_form_middle', array($this, '__action_lost_password_link'), 10, 2);
 
 		return null;
 
@@ -56,26 +56,26 @@ 
 		
 		$atts = array();
 
-		echo $this->get_template_file( $atts, 'login-form.php', null );
+		echo $this->get_template_file($atts, 'login-form.php', null);
 
 		return;
 	}
 
-	protected function get_template_file( $atts, $file = '', $content = null ) {
+	protected function get_template_file($atts, $file = '', $content = null) {
 
 		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)) {
 
-			if ( $theme_template = locate_template( array('gears/shortcodes/'.$file ) ) ) {
+			if ($theme_template = locate_template(array('gears/shortcodes/' . $file))) {
 
 	        	$template = $theme_template;
 
@@ -85,26 +85,26 @@ 
 
     	} 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();
 	}
 
-	public function login_form_action( $__content ) {
+	public function login_form_action($__content) {
 
 		ob_start();
 		
-		do_action( 'login_form' );
+		do_action('login_form');
 		
 		return $__content . ob_get_clean();
 
 	}
 
-	public function __action_lost_password_link( $__content ) {
+	public function __action_lost_password_link($__content) {
 		
-		return $__content . $this->get_template_file( array(), 'login-form-lost-password.php', null );
+		return $__content . $this->get_template_file(array(), 'login-form-lost-password.php', null);
 
 	}