codehaiku / subway-2.0

shortcodes/subway-shortcodes.php

Indentation +7 added lines, -7 removed lines

@@ -61,19 +61,19 @@
 
 			if ( $theme_template = locate_template( array('gears/shortcodes/'.$file ) ) ) {
 
-	        	$template = $theme_template;
+				$template = $theme_template;
 
-	    	}
+			}
 
-	    	include $template;
+			include $template;
 
-    	} else {
+		} else {
 
-	    	echo sprintf( __( 'Subway Error: Unable to find template file in: %1s', 'subway' ), $template );
+			echo sprintf( __( 'Subway Error: Unable to find template file in: %1s', 'subway' ), $template );
 
-	    }
+		}
 
-	    return ob_get_clean();
+		return ob_get_clean();
 	}
 
 	public function __action_lost_password_link( $content ) {

Spacing +14 added lines, -14 removed lines

@@ -5,7 +5,7 @@ 
 
 	private function __construct() {
 		
-		add_action( 'init', array( $this, 'register') );
+		add_action('init', array($this, 'register'));
 		
 		return $this;
 
@@ -15,7 +15,7 @@ 
 		
 		static $instance = null;
 
-		if ( null === $instance ) {
+		if (null === $instance) {
 
 			$instance = new Shortcodes();
 
@@ -28,9 +28,9 @@ 
 
 	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, '__action_lost_password_link' ) );
+		add_action('login_form_middle', array($this, '__action_lost_password_link'));
 
 		return null;
 
@@ -40,26 +40,26 @@ 
 		
 		$atts = array();
 
-		echo $this->get_template_file( $atts, $file = 'login-form.php', $content = null );
+		echo $this->get_template_file($atts, $file = 'login-form.php', $content = 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;
 
@@ -69,18 +69,18 @@ 
 
     	} else {
 
-	    	echo sprintf( __( 'Subway Error: Unable to find template file in: %1s', 'subway' ), $template );
+	    	echo sprintf(__('Subway Error: Unable to find template file in: %1s', 'subway'), $template);
 
 	    }
 
 	    return ob_get_clean();
 	}
 
-	public function __action_lost_password_link( $content ) {
+	public function __action_lost_password_link($content) {
 		
-		return $this->get_template_file( $params = array(), 
+		return $this->get_template_file($params = array(), 
 				$file = 'login-form-lost-password.php', 
-				$content = null );
+				$content = null);
 	}
 
 }

classes/subway-page-redirect.php

Indentation +9 added lines, -9 removed lines

@@ -6,13 +6,13 @@ 
 
 	public static function index() {
         
-        global $post;
+		global $post;
 
-        if ( '' == session_id() || ! isset( $_SESSION ) ) {
+		if ( '' == session_id() || ! isset( $_SESSION ) ) {
 
-            session_start();
+			session_start();
 
-        }
+		}
 
 		$post_copy = &$post;
 
@@ -80,11 +80,11 @@ 
 					$_SESSION['redirected'] = true;
 
 					wp_safe_redirect( 
-                        add_query_arg( 
-                            array( '_redirected' => 'yes' ), 
-                            $redirect_page 
-                        ) 
-                    );
+						add_query_arg( 
+							array( '_redirected' => 'yes' ), 
+							$redirect_page 
+						) 
+					);
 
 					die();
 

Spacing +18 added lines, -18 removed lines

@@ -8,7 +8,7 @@ 
         
         global $post;
 
-        if ( '' == session_id() || ! isset( $_SESSION ) ) {
+        if ('' == session_id() || ! isset($_SESSION)) {
 
             session_start();
 
@@ -16,7 +16,7 @@ 
 
 		$post_copy = &$post;
 
-		$login_page_id = intval( get_option( 'subway_login_page' ) );
+		$login_page_id = intval(get_option('subway_login_page'));
 
 		$excluded_page = Options::get_public_post_ids();
 
@@ -24,64 +24,64 @@ 
 		$redirect_page = Options::get_redirect_page_url();
 
 		// 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( $post_copy ) ) {
+		if (empty($post_copy)) {
 			$post_copy = new \stdclass;
 			$post_copy->ID = 0;
 		}
 
-		$current_page_id = intval( $post_copy->ID );
+		$current_page_id = intval($post_copy->ID);
 
 		// Check if $current_page_id && $selected_blog_id is equal to each other.
 		// If that is the case, 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 = intval( get_option( 'page_for_posts' ) );
+		$blog_id = intval(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;
 			}
 		}
 
-		if ( isset( $_SESSION['redirected'] ) ) {
+		if (isset($_SESSION['redirected'])) {
 
-			unset( $_SESSION['redirected'] );
+			unset($_SESSION['redirected']);
 
 			return;
 
 		}
 
 		// 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)) {
 
 					$_SESSION['redirected'] = true;
 
 					wp_safe_redirect( 
                         add_query_arg( 
-                            array( '_redirected' => 'yes' ), 
+                            array('_redirected' => 'yes'), 
                             $redirect_page 
                         ) 
                     );

classes/subway-wp-admin-redirect.php

Spacing +57 added lines, -57 removed lines

@@ -6,78 +6,78 @@ 
 	public static function index() {
 
 		// Only run this function when on wp-login.php.
-		if ( ! in_array( $GLOBALS['pagenow'], array( 'wp-login.php' ), true ) ) {
+		if ( ! in_array($GLOBALS['pagenow'], array('wp-login.php'), true)) {
 			return;
 		}
 
 		// Has any errors?
-		$has_error = filter_input( INPUT_GET, 'error', FILTER_SANITIZE_STRING );
+		$has_error = filter_input(INPUT_GET, 'error', FILTER_SANITIZE_STRING);
 
 		// Error Types.
-		$has_type = filter_input( INPUT_GET, 'type', FILTER_SANITIZE_STRING );
+		$has_type = filter_input(INPUT_GET, 'type', FILTER_SANITIZE_STRING);
 
 		// Set the default to our login page.
 		$redirect_page = Options::get_redirect_page_url();
 
-		if ( $has_error && $has_type ) {
+		if ($has_error && $has_type) {
 
-			$redirect_to = add_query_arg( array(
+			$redirect_to = add_query_arg(array(
 				'login' => 'failed',
 				'type' => $has_type,
-			), $redirect_page );
+			), $redirect_page);
 
-			wp_safe_redirect( esc_url_raw( $redirect_to ) );
+			wp_safe_redirect(esc_url_raw($redirect_to));
 
 			die();
 
 		}
 
 		// Bypass wp-login.php?action=* link.
-		if ( filter_input( INPUT_GET, 'action', FILTER_SANITIZE_STRING ) ) {
+		if (filter_input(INPUT_GET, 'action', FILTER_SANITIZE_STRING)) {
 			return;
 		}
 
 		// Bypass no redirect action
-		if ( filter_input( INPUT_GET, 'no_redirect', FILTER_VALIDATE_BOOLEAN ) ) {
+		if (filter_input(INPUT_GET, 'no_redirect', FILTER_VALIDATE_BOOLEAN)) {
 			return;
 		}
 
 		// Do not redirect if BuddyPress activation 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;
 			}
 		}
 
 		// Do not redirect 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;
 			}
 		}
 
 		// Holds the curret URI string for checking.
-		$curr_paged = basename( $_SERVER['REQUEST_URI'] );
+		$curr_paged = basename($_SERVER['REQUEST_URI']);
 
-		if ( empty( $redirect_page ) ) {
+		if (empty($redirect_page)) {
 			return;
 		}
 
 		// If user visits wp-admin or wp-login.php, redirect them.
-		if ( strstr( $curr_paged, 'wp-login.php' ) ) {
+		if (strstr($curr_paged, 'wp-login.php')) {
 
 			// Do not redirect interim login.
-			if ( isset( $_GET['interim-login'] ) ) {
+			if (isset($_GET['interim-login'])) {
 				return;
 			}
 
 			// Check if there is an action present.
 			// The action might represent user trying to log out.
-			if ( isset( $_GET['action'] ) ) {
+			if (isset($_GET['action'])) {
 
 				$action = $_GET['action'];
 
-				if ( 'logout' === $action ) {
+				if ('logout' === $action) {
 
 					return;
 
@@ -85,46 +85,46 @@ 
 			}
 
 			// Only redirect if there are no incoming post data.
-			if ( empty( $_POST ) ) {
-				wp_safe_redirect( $redirect_page );
+			if (empty($_POST)) {
+				wp_safe_redirect($redirect_page);
 			}
 
 			// Redirect to error page if user left username and password blank.
-			if ( ! empty( $_POST ) ) {
+			if ( ! empty($_POST)) {
 
-				if ( empty( $_POST['log'] ) && empty( $_POST['pwd'] ) ) {
-					$redirect_to = add_query_arg( array(
+				if (empty($_POST['log']) && empty($_POST['pwd'])) {
+					$redirect_to = add_query_arg(array(
 						'login' => 'failed',
 						'type' => '__blank',
-					), $redirect_page );
+					), $redirect_page);
 
-					wp_safe_redirect( esc_url_raw( $redirect_to ) );
+					wp_safe_redirect(esc_url_raw($redirect_to));
 
-				} elseif ( empty( $_POST['log'] ) && ! empty( $_POST['pwd'] ) && ! empty( $_POST['redirect_to'] ) ) {
+				} elseif (empty($_POST['log']) && ! empty($_POST['pwd']) && ! empty($_POST['redirect_to'])) {
 					// Username empty.
-					$redirect_to = add_query_arg( array(
+					$redirect_to = add_query_arg(array(
 						'login' => 'failed',
 						'type' => '__userempty',
-					), $redirect_page );
+					), $redirect_page);
 
-					wp_safe_redirect( esc_url_raw( $redirect_to ) );
-				} elseif ( ! empty( $_POST['log'] ) && empty( $_POST['pwd'] ) && ! empty( $_POST['redirect_to'] ) ) {
+					wp_safe_redirect(esc_url_raw($redirect_to));
+				} elseif ( ! empty($_POST['log']) && empty($_POST['pwd']) && ! empty($_POST['redirect_to'])) {
 					// Password empty.
-					$redirect_to = add_query_arg( array(
+					$redirect_to = add_query_arg(array(
 						'login' => 'failed',
 						'type' => '__passempty',
-					), $redirect_page );
+					), $redirect_page);
 
-					wp_safe_redirect( esc_url_raw( $redirect_to ) );
+					wp_safe_redirect(esc_url_raw($redirect_to));
 				} else {
 
 					// Generic.
-					$redirect_to = add_query_arg( array(
+					$redirect_to = add_query_arg(array(
 						'login' => 'failed',
 						'type' => 'default',
-					), $redirect_page );
+					), $redirect_page);
 
-					wp_safe_redirect( esc_url_raw( $redirect_to ) );
+					wp_safe_redirect(esc_url_raw($redirect_to));
 				}
 			}
 		}
@@ -139,31 +139,31 @@ 
 
 		$custom_sign_in_page_url = Options::get_redirect_page_url();
 
-		if ( ! empty( $custom_sign_in_page_url ) ) {
+		if ( ! empty($custom_sign_in_page_url)) {
 
 			$sign_in_page = $custom_sign_in_page_url;
 
 		}
 
 		// Check that were not on the default login page.
-		if ( ! empty( $sign_in_page ) && ! strstr( $sign_in_page,'wp-login' ) && ! strstr( $sign_in_page,'wp-admin' ) && null !== $user ) {
+		if ( ! empty($sign_in_page) && ! strstr($sign_in_page, 'wp-login') && ! strstr($sign_in_page, 'wp-admin') && null !== $user) {
 
 			// make sure we don't already have a failed login attempt.
-			if ( ! strstr( $sign_in_page, '?login=failed' ) ) {
+			if ( ! strstr($sign_in_page, '?login=failed')) {
 
 				// Redirect to the login page and append a querystring of login failed.
-				$permalink = add_query_arg( array(
+				$permalink = add_query_arg(array(
 					'login' => 'failed',
 					'type' => 'default',
-				), $custom_sign_in_page_url );
+				), $custom_sign_in_page_url);
 
-				wp_safe_redirect( esc_url_raw( $permalink ) );
+				wp_safe_redirect(esc_url_raw($permalink));
 
 				die();
 
 			} else {
 
-				wp_safe_redirect( $sign_in_page );
+				wp_safe_redirect($sign_in_page);
 
 				die();
 			}
@@ -174,42 +174,42 @@ 
 		return;
 	}
 
-	public static function authentication_200( $redirect_to, $request, $user ) {
+	public static function authentication_200($redirect_to, $request, $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 ) ) {
+		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;
 
@@ -218,9 +218,9 @@ 
 			// Otherwise, get the custom url saved and let the user go into that page.
 			$current_user = wp_get_current_user();
 
-			$entered_custom_url = str_replace( '%user_id%', $user->ID, $entered_custom_url );
+			$entered_custom_url = str_replace('%user_id%', $user->ID, $entered_custom_url);
 
-			$entered_custom_url = str_replace( '%user_name%', $user->user_login, $entered_custom_url );
+			$entered_custom_url = str_replace('%user_name%', $user->user_login, $entered_custom_url);
 
 			return $entered_custom_url;
 

classes/subway-options.php

Spacing +9 added lines, -9 removed lines

@@ -5,19 +5,19 @@ 
 
 	public static function get_redirect_page_url() {
 
-		$selected_login_post_id = intval( get_option( 'subway_login_page' ) );
+		$selected_login_post_id = intval(get_option('subway_login_page'));
 
-		if ( 0 === $selected_login_post_id ) {
+		if (0 === $selected_login_post_id) {
 
 			return;
 
 		}
 
-		$login_post = get_post( $selected_login_post_id );
+		$login_post = get_post($selected_login_post_id);
 
-		if ( ! empty( $login_post ) ) {
+		if ( ! empty($login_post)) {
 
-			return get_permalink( $login_post->ID );
+			return get_permalink($login_post->ID);
 
 		}
 
@@ -27,19 +27,19 @@ 
 
 	public static function get_public_post_ids() {
 
-		$subway_public_post = get_option( 'subway_public_post' );
+		$subway_public_post = get_option('subway_public_post');
 
 		$excluded_pages_collection = array();
 
-		if ( ! empty( $subway_public_post ) ) {
+		if ( ! empty($subway_public_post)) {
 
-			$excluded_pages_collection = explode( ',', $subway_public_post );
+			$excluded_pages_collection = explode(',', $subway_public_post);
 
 		}
 
 		// Should filter it by integer, spaces will be ignored, other strings.
 		// Will be converted to zero '0'.
-		return array_filter( array_map( 'intval', $excluded_pages_collection ) );
+		return array_filter(array_map('intval', $excluded_pages_collection));
 		
 	}
 }

subway.php

Spacing +10 added lines, -10 removed lines

@@ -16,24 +16,24 @@ 
  * @package subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit();
 }
 
-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');
 	function subway_admin_notice() { ?>
 		<div class="notice notice-error is-dismissible">
-	        <p><strong><?php _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' ); ?></strong></p>
+	        <p><strong><?php _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'); ?></strong></p>
 	    </div>
 	<?php } 
 	return;
 }
 // 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__)));
 
 // Include Subway i18n.
 require_once SUBWAY_DIR_PATH . 'i18.php';
@@ -54,14 +54,14 @@ 
 require_once SUBWAY_DIR_PATH . 'shortcodes/subway-shortcodes.php';
 
 // Redirect (302) all front-end request to the login page.
-add_action( 'wp', array( 'Subway\Page_Redirect', 'index') );
+add_action('wp', array('Subway\Page_Redirect', 'index'));
 
 // Redirect the user when he/she visit wp-admin or wp-login.php.
-add_action( 'init', array( 'Subway\Admin_Redirect', 'index' ) );
+add_action('init', array('Subway\Admin_Redirect', 'index'));
 
 // Redirect (302) invalid login request to the login page.
-add_action( 'wp_login_failed', array('Subway\Admin_Redirect', 'authentication_fail') );
+add_action('wp_login_failed', array('Subway\Admin_Redirect', 'authentication_fail'));
 
 // Redirect the user after successful logged in; Priority = 10; Accepted Params Number = 3'
-add_filter( 'login_redirect', array('Subway\Admin_Redirect', 'authentication_200'), 10, 3 );
+add_filter('login_redirect', array('Subway\Admin_Redirect', 'authentication_200'), 10, 3);
 

i18.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 /**
  * Plugin i18n.
  */
-add_action( 'plugins_loaded', 'subway_localize_plugin' );
+add_action('plugins_loaded', 'subway_localize_plugin');
 
 /**
  * Subway l10n callback.
@@ -13,7 +13,7 @@ 
 
 	$rel_path = SUBWAY_DIR_PATH . 'languages';
 
-	load_plugin_textdomain( 'subway', false, $rel_path );
+	load_plugin_textdomain('subway', false, $rel_path);
 
 	return;
 }

templates/login-form-lost-password.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@
 <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>
\ No newline at end of file

templates/login-form.php

Spacing +27 added lines, -27 removed lines

@@ -3,10 +3,10 @@ 
 $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',
@@ -22,87 +22,87 @@ 
 $message_types = array();
 
 // add_filter('login_form_middle', 'subway_integrate_login_form_filter');
-if ( isset( $_GET['login'] ) ) {
+if (isset($_GET['login'])) {
 
-	if ( 'failed' === $_GET['login'] ) {
+	if ('failed' === $_GET['login']) {
 
-		if ( isset( $_GET['type'] ) ) {
+		if (isset($_GET['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( $_GET['type'], $message_types ) ) {
+			if (array_key_exists($_GET['type'], $message_types)) {
 
-				$message = $message_types[ $_GET['type'] ]['message'];
+				$message = $message_types[$_GET['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">'.__( 'Error: Invalid username and password combination.', 'subway' ).'</div>';
+			$error_login_message = '<div id="message" class="error">' . __('Error: Invalid username and password combination.', 'subway') . '</div>';
 
 		}
 	}
 }
 
-if ( isset( $_GET['_redirected'] ) ) {
-	$error_login_message = '<div id="message" class="success">' .__( 'Oops! Looks like you need to login in order to view the page.', 'subway' ) . '</div>';
+if (isset($_GET['_redirected'])) {
+	$error_login_message = '<div id="message" class="success">' . __('Oops! Looks like you need to login in order to view 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 _e( 'Account Sign-in', 'subway' ); ?>
+					<?php _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 $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 echo esc_html__( apply_filters( 'subway_login_message', 'Great! You have succesfully login.' ), 'subway' ); ?>
+			<?php echo esc_html__(apply_filters('subway_login_message', 'Great! You have succesfully login.'), 'subway'); ?>
 		</p>
 	</div>
 <?php } ?>

admin-settings.php

Spacing +44 added lines, -44 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-add_action( 'admin_init', 'subway_admin_settings_index' );
+add_action('admin_init', 'subway_admin_settings_index');
 
 /**
  * Register all the settings inside 'Reading' section
@@ -12,7 +12,7 @@ 
 	// Add new 'Pages Visibility Settings'.
 	add_settings_section(
 		'subway_setting_section',
-		__( 'Pages Visibility Settings', 'subway' ),
+		__('Pages Visibility Settings', 'subway'),
 		'subway_setting_section_callback_function',
 		'reading'
 	);
@@ -20,7 +20,7 @@ 
 	// WP Options 'subway_public_post'.
 	add_settings_field(
 		'subway_public_post',
-		__( 'Public Posts IDs', 'subway' ),
+		__('Public Posts IDs', 'subway'),
 		'subway_setting_callback_function',
 		'reading',
 		'subway_setting_section'
@@ -29,7 +29,7 @@ 
 	// WP Options 'subway_is_public'.
 	add_settings_field(
 		'subway_is_public',
-		__( 'Public Website', 'subway' ),
+		__('Public Website', 'subway'),
 		'subway_is_public_form',
 		'reading',
 		'subway_setting_section'
@@ -38,7 +38,7 @@ 
 	// WP Options 'subway_login_page'.
 	add_settings_field(
 		'subway_login_page',
-		__( 'Login Page', 'subway' ),
+		__('Login Page', 'subway'),
 		'subway_login_page_form',
 		'reading',
 		'subway_setting_section'
@@ -47,7 +47,7 @@ 
 	// WP Options 'subway_redirect_type'.
 	add_settings_field(
 		'subway_redirect_type',
-		__( 'Redirect Type', 'subway' ),
+		__('Redirect Type', 'subway'),
 		'subway_redirect_option_form',
 		'reading',
 		'subway_setting_section'
@@ -56,20 +56,20 @@ 
 	// WP Options 'subway_bypassing_info'.
 	add_settings_field(
 		'subway_bypassing_info',
-		__( 'Bypassing Redirect', 'subway' ),
+		__('Bypassing Redirect', 'subway'),
 		'subway_bypassing_option_form',
 		'reading',
 		'subway_setting_section'
 	);
 
 	// Register all the callback settings id.
-	register_setting( 'reading', 'subway_public_post' );
-	register_setting( 'reading', 'subway_is_public' );
-	register_setting( 'reading', 'subway_login_page' );
-	register_setting( 'reading', 'subway_redirect_type' );
+	register_setting('reading', 'subway_public_post');
+	register_setting('reading', 'subway_is_public');
+	register_setting('reading', 'subway_login_page');
+	register_setting('reading', 'subway_redirect_type');
 
-	register_setting( 'reading', 'subway_redirect_page_id' );
-	register_setting( 'reading', 'subway_redirect_custom_url' );
+	register_setting('reading', 'subway_redirect_page_id');
+	register_setting('reading', 'subway_redirect_custom_url');
 
 }
 
@@ -92,9 +92,9 @@ 
  */
 function subway_setting_callback_function() {
 
-	echo '<textarea id="subway_public_post" name="subway_public_post" rows="5" cols="95">' . esc_attr( trim( get_option( 'subway_public_post' ) ) ) . '</textarea>';
+	echo '<textarea id="subway_public_post" name="subway_public_post" rows="5" cols="95">' . 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),  \nfor example: 143,123,213. Alternatively, you can enable public viewing of all of your pages and posts by checking the option below.", 'subway' ) ) . '</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),  \nfor example: 143,123,213. Alternatively, you can enable public viewing of all of your pages and posts by checking the option below.", 'subway')) . '</p>';
 
 	return;
 }
@@ -106,8 +106,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__( 'Pages like user profile, members, and groups are still only available to the rightful owner of the profile.', '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__('Pages like user profile, members, and groups are still only available to the rightful owner of the profile.', 'subway') . '</p>';
 
 	return;
 }
@@ -119,24 +119,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);
 			}
 		}
 	}
@@ -144,12 +144,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 page to use as a login page for your website. Select a login page and save the changes to make your site private. Leave blank to make your site public. %1$s.', 'subway' ), '<span style="font-weight: bold; color: #ad4a4a;">' . esc_html__( 'You need to add "[subway_login]" shortcode in the selected page to show the login form (this is automatic)', 'subway' ) ) . '</span></p>';
+	echo '<p class="description">' . sprintf(esc_html__('Select a page to use as a login page for your website. Select a login page and save the changes to make your site private. Leave blank to make your site public. %1$s.', 'subway'), '<span style="font-weight: bold; color: #ad4a4a;">' . esc_html__('You need to add "[subway_login]" shortcode in the selected page to show the login form (this is automatic)', 'subway')) . '</span></p>';
 
 	return;
 }
@@ -169,7 +169,7 @@ 
 		and go directly to your website's wp-login URL (http://yoursiteurl.com/wp-login.php): 
 		<br><br> <strong>%s</strong>", 'subway'
 		),
-		site_url( 'wp-login.php?no_redirect=true' )
+		site_url('wp-login.php?no_redirect=true')
 	);
 
 	echo '</p>';
@@ -200,9 +200,9 @@ 
 		<!-- Page -->
 		<label for="subway_use_page">
 			
-			<input <?php checked( 'page', get_option( 'subway_redirect_type' ), true ); ?> value="page" name="subway_redirect_type" id="subway_use_page" type="radio" class="code" /> 
+			<input <?php checked('page', get_option('subway_redirect_type'), true); ?> value="page" name="subway_redirect_type" id="subway_use_page" type="radio" class="code" /> 
 			
-			<?php esc_html_e( 'Custom Page', 'subway' ); ?>
+			<?php esc_html_e('Custom Page', 'subway'); ?>
 
 		</label>
 
@@ -212,9 +212,9 @@ 
 
 		<label for="subway_use_custom_url">
 			
-			<input <?php checked( 'custom_url', get_option( 'subway_redirect_type' ), true ); ?> value="custom_url" name="subway_redirect_type" id="subway_use_custom_url" type="radio" class="code" /> 
+			<input <?php checked('custom_url', get_option('subway_redirect_type'), true); ?> value="custom_url" name="subway_redirect_type" id="subway_use_custom_url" type="radio" class="code" /> 
 			
-			<?php esc_html_e( 'Custom URL', 'subway' ); ?>
+			<?php esc_html_e('Custom URL', 'subway'); ?>
 
 		</label>
 
@@ -224,9 +224,9 @@ 
 
 		<label for="subway_use_default">
 			
-			<input <?php checked( 'default', get_option( 'subway_redirect_type' ), true ); ?> value="default" name="subway_redirect_type" id="subway_use_default" type="radio" class="code" /> 
+			<input <?php checked('default', get_option('subway_redirect_type'), true); ?> value="default" name="subway_redirect_type" id="subway_use_default" type="radio" class="code" /> 
 			
-			<?php esc_html_e( 'Default Behavior', 'subway' ); ?>
+			<?php esc_html_e('Default Behavior', 'subway'); ?>
 
 		</label>
 
@@ -242,7 +242,7 @@ 
 	<div id="subway_redirect_page_option_section" class="hidden subway-redirect-option-section">
 		
 		<label for="subway_redirect_page_id">
-			<?php esc_html_e( 'Select Page' ); ?>
+			<?php esc_html_e('Select Page'); ?>
 		</label>
 
 		<?php
@@ -250,8 +250,8 @@ 
 			wp_dropdown_pages(
 				array(
 						'name' => 'subway_redirect_page_id',
-						'selected' => intval( get_option( 'subway_redirect_page_id' ) ),
-						'show_option_none' => esc_html__( '-', 'subway' ),
+						'selected' => intval(get_option('subway_redirect_page_id')),
+						'show_option_none' => esc_html__('-', 'subway'),
 				)
 			);
 
@@ -259,7 +259,7 @@ 
 
 		<p class="description">
 			
-			<?php _e( 'The selected page will be used as the redirect endpoint for all of your users. Selecting blank (-) will redirect the user to the default redirect defined in WordPress or other plugins. Choose "Custom URL" if you want to redirect to a custom URL or domain.', 'subway' ); ?>
+			<?php _e('The selected page will be used as the redirect endpoint for all of your users. Selecting blank (-) will redirect the user to the default redirect defined in WordPress or other plugins. Choose "Custom URL" if you want to redirect to a custom URL or domain.', 'subway'); ?>
 
 		</p>
 
@@ -268,29 +268,29 @@ 
 	<div id="subway_redirect_custom_url_option_section" class="hidden subway-redirect-option-section">
 		
 		<label for="subway_redirect_custom_url">
-			<?php esc_attr_e( 'Enter Redirect URL:', 'subway' ); ?>
+			<?php esc_attr_e('Enter Redirect URL:', 'subway'); ?>
 		</label>
 
-		<input value="<?php echo esc_attr( esc_url( get_option( 'subway_redirect_custom_url' ) ) ); ?>" type="text" name="subway_redirect_custom_url" placeholder="<?php esc_attr_e( 'http://', 'subway' ); ?>" 
+		<input value="<?php echo esc_attr(esc_url(get_option('subway_redirect_custom_url'))); ?>" type="text" name="subway_redirect_custom_url" placeholder="<?php esc_attr_e('http://', 'subway'); ?>" 
 		id="subway_redirect_custom_url" size="75" />
 
 		<p class="description"><br>
 
 		<?php
-			echo sprintf( __( 'When entering a custom domain, you can use a variable string such us: %1$s and %2$s. For example, http://yoursiteurl.com/members/<strong>%2$s</strong> will translate to http://yoursiteurl/members/<strong>admin</strong> where "admin" is equal to the %2$s variable; http://yoursiteurl.com/users/<strong>%1$s</strong> will translate to http://yoursiteurl.com/users/<strong>4</strong> where "4" is equal to the %1$s. Both variables refer to the current user that is logged-in.', 'subway' ), '%user_id%', '%user_name%' );
+			echo sprintf(__('When entering a custom domain, you can use a variable string such us: %1$s and %2$s. For example, http://yoursiteurl.com/members/<strong>%2$s</strong> will translate to http://yoursiteurl/members/<strong>admin</strong> where "admin" is equal to the %2$s variable; http://yoursiteurl.com/users/<strong>%1$s</strong> will translate to http://yoursiteurl.com/users/<strong>4</strong> where "4" is equal to the %1$s. Both variables refer to the current user that is logged-in.', 'subway'), '%user_id%', '%user_name%');
 		?>
 
 		</p><br>
 
 		<p class="description">
 
-			<?php esc_attr_e( 'Leave empty to use existing WordPress or other 3rd party plugin redirect option.', 'subway' ); ?>
+			<?php esc_attr_e('Leave empty to use existing WordPress or other 3rd party plugin redirect option.', 'subway'); ?>
 
 		</p><br>
 
 		<p class="description">
 
-			<?php esc_html_e( 'Warning: External URLs are not supported by WordPress Function (wp_safe_redirect) and will be redirected back to default WordPress behavior.', 'subway' ); ?>
+			<?php esc_html_e('Warning: External URLs are not supported by WordPress Function (wp_safe_redirect) and will be redirected back to default WordPress behavior.', 'subway'); ?>
 
 		</p> 
 
@@ -300,7 +300,7 @@ 
 	<div id="subway_redirect_default_option_section" class="hidden subway-redirect-option-section">
 		<p>
 			<?php
-				esc_html_e( "By choosing the default behavior, the redirect type will be set to the default WordPress' behavior. For example, if you have plugins like Peter's Login Redirect. This option will disable Subway's redirect and use the Peter's Login Redirect Instead.", 'subway' );
+				esc_html_e("By choosing the default behavior, the redirect type will be set to the default WordPress' behavior. For example, if you have plugins like Peter's Login Redirect. This option will disable Subway's redirect and use the Peter's Login Redirect Instead.", 'subway');
 			?>
 		</p>
 	</div>