codehaiku / subway-2.0

subway.php

Spacing +14 added lines, -14 removed lines

@@ -27,13 +27,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
 	 *
@@ -44,10 +44,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>
@@ -56,13 +56,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';
@@ -86,20 +86,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\Page_Redirect', 'index' ) );
+add_action('wp', array('Subway\Page_Redirect', 'index'));
 
 // Redirect (302) invalid login request to the login page.
-add_action( 'wp_ajax_nopriv_subway_logging_in', array( 'Subway\Auth_Redirect', 'handle_authentication' ) );
+add_action('wp_ajax_nopriv_subway_logging_in', array('Subway\Auth_Redirect', 'handle_authentication'));
 
 // Load our JS and CSS files.
-add_action( 'wp_enqueue_scripts', array( 'Subway\Enqueue', 'register_js' ) );
+add_action('wp_enqueue_scripts', array('Subway\Enqueue', 'register_js'));
 
 // Change the default login url to our sign-in page.
-add_filter( 'login_url', array( 'Subway\Auth_Redirect', 'login_url' ), 10, 3 );
+add_filter('login_url', array('Subway\Auth_Redirect', 'login_url'), 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\Auth_Redirect', 'get_login_redirect_url' ), 10, 3 );
+add_filter('login_redirect', array('Subway\Auth_Redirect', 'get_login_redirect_url'), 10, 3);
 
 // Change the default logout url to our sign-in page.
-add_action( 'wp_logout', array( 'Subway\Auth_Redirect', 'logout_url' ), 10, 3 );
+add_action('wp_logout', array('Subway\Auth_Redirect', 'logout_url'), 10, 3);

classes/subway-enqueue.php

Spacing +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace Subway;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -30,22 +30,22 @@ 
 	 */
 	public static function register_js() {
 
-		$post_id = absint( get_queried_object_id() );
+		$post_id = absint(get_queried_object_id());
 
-		$signin_page = absint( get_option( 'subway_login_page' ) );
+		$signin_page = absint(get_option('subway_login_page'));
 
 		// Only load the stylesheet and javascript documents inside our sign-in page.
-		if ( $post_id === $signin_page ) {
+		if ($post_id === $signin_page) {
 
-			wp_enqueue_style( 'subway-style', SUBWAY_DIR_URL . 'assets/css/subway.css' );
+			wp_enqueue_style('subway-style', SUBWAY_DIR_URL . 'assets/css/subway.css');
 
-			if ( ! is_user_logged_in() ) {
+			if ( ! is_user_logged_in()) {
 
-	   			wp_enqueue_script( 'subway-script', SUBWAY_DIR_URL . 'assets/js/subway.js', array( 'jquery' ) );
+	   			wp_enqueue_script('subway-script', SUBWAY_DIR_URL . 'assets/js/subway.js', array('jquery'));
 
-	   			wp_localize_script( 'subway-script', 'subway_config', array(
-	   					'ajax_url' => admin_url( 'admin-ajax.php' ),
-	   					'login_http_error' => esc_html__( 'An error occured while transmitting the data. Refresh the page and try again', 'subway' ),
+	   			wp_localize_script('subway-script', 'subway_config', array(
+	   					'ajax_url' => admin_url('admin-ajax.php'),
+	   					'login_http_error' => esc_html__('An error occured while transmitting the data. Refresh the page and try again', 'subway'),
 	   				)
 	   			);
 

classes/subway-page-redirect.php

Spacing +19 added lines, -19 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace Subway;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 /**
@@ -30,15 +30,15 @@ 
 	public static function index() {
 
 		// Only execute for non logged in users.
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			return;
 		}
 
 		$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::get_public_post_ids();
 
@@ -46,59 +46,59 @@ 
 		$redirect_page = Options::get_redirect_page_url(); // WPCS XSS OK.
 
 		// Exit if site is public.
-		if ( Options::is_public_site() ) {
+		if (Options::is_public_site()) {
 			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;
 		}
 
-		$current_page_id = absint( $current_post->ID );
+		$current_page_id = absint($current_post->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 = absint( get_option( 'page_for_posts' ) );
+		$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
 						)
 					);

classes/subway-auth-redirect.php

Indentation +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
 		}
 
 		// Otherwise, return the Subway login page.
-	    return $subway_login_page;
+		return $subway_login_page;
 
 	}
 

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( $redirect_to = '', $request = '', $user = 1 );
+		$subway_redirect_url = Auth_Redirect::get_login_redirect_url($redirect_to = '', $request = '', $user = 1);
 
-		$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, $request, $user ) {
+	public static function get_login_redirect_url($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;
 
@@ -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( $user->ID ) ) {
-				$entered_custom_url = str_replace( '%user_id%', $user->ID, $entered_custom_url );
+			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;
@@ -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'));
 
 		exit;
 

classes/subway-options.php

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace Subway;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -30,19 +30,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 trailingslashit( get_permalink( $login_post->ID ) );
+			return trailingslashit(get_permalink($login_post->ID));
 
 		}
 
@@ -57,19 +57,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));
 
 	}
 
@@ -80,9 +80,9 @@ 
 	 */
 	public static function is_public_site() {
 
-		$subway_public_post = get_option( 'subway_is_public' );
+		$subway_public_post = get_option('subway_is_public');
 
-		if ( ! empty ( $subway_public_post ) ) {
+		if ( ! empty ($subway_public_post)) {
 
 			return true;
 

i18.php

Spacing +3 added lines, -3 removed lines

@@ -10,14 +10,14 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
 /**
  * Plugin i18n.
  */
-add_action( 'plugins_loaded', 'subway_localize_plugin' );
+add_action('plugins_loaded', 'subway_localize_plugin');
 
 /**
  * Subway l8n callback.
@@ -28,7 +28,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.php

Spacing +36 added lines, -36 removed lines

@@ -10,17 +10,17 @@ 
  * @package Subway
  */
 
-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',
@@ -35,100 +35,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 +23 added lines, -23 removed lines

@@ -12,7 +12,7 @@ 
 
 namespace Subway;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -28,9 +28,9 @@ 
 	 */
 	public function __construct() {
 		
-		add_action( 'admin_menu', array( $this, 'subway_admin_menu' ) );
+		add_action('admin_menu', array($this, 'subway_admin_menu'));
 
-		add_action( 'admin_init', array( $this, 'subway_register_settings' ) );
+		add_action('admin_init', array($this, 'subway_register_settings'));
 
 	}
 
@@ -41,7 +41,7 @@ 
 	 */
 	public function subway_admin_menu() {
 
-		add_options_page( 'Subway Settings', 'Subway', 'manage_options', 'subway', array( $this, 'subway_options_page' ) );
+		add_options_page('Subway Settings', 'Subway', 'manage_options', 'subway', array($this, 'subway_options_page'));
 
 		return;
 	}
@@ -54,18 +54,18 @@ 
 	public function subway_register_settings() {
 
 		// Register our settings section.
-		add_settings_section( 'subway-page-visibility-section', __( 'Pages Visibility', 'subway' ), 
-			array( $this, 'subway_section_cb' ), 'subway-settings-section' );
+		add_settings_section('subway-page-visibility-section', __('Pages Visibility', 'subway'), 
+			array($this, 'subway_section_cb'), 'subway-settings-section');
 
 		// Register Redirect Options pages.
-		add_settings_section( 'subway-redirect-section', __( 'Redirect Options', 'subway' ), 
-			array( $this, 'subway_redirect_cb' ), 'subway-settings-section' );
+		add_settings_section('subway-redirect-section', __('Redirect Options', 'subway'), 
+			array($this, 'subway_redirect_cb'), 'subway-settings-section');
 
 		// Register the fields.
 		$fields = array(
 				array(
 						'id' => 'subway_is_public',
-						'label' => __( 'Public Website', 'subway' ),
+						'label' => __('Public Website', 'subway'),
 						'callback' => 'subway_is_public_form',
 						'section' => 'subway-settings-section',
 						'group' => 'subway-page-visibility-section',
@@ -73,14 +73,14 @@ 
 
 				array(
 						'id' => 'subway_login_page',
-						'label' => __( 'Private Login Page', 'subway' ),
+						'label' => __('Private Login Page', 'subway'),
 						'callback' => 'subway_login_page_form',
 						'section' => 'subway-settings-section',
 						'group' => 'subway-page-visibility-section',
 					),
 				array(
 						'id' => 'subway_public_post',
-						'label' => __( 'Public Posts IDs', 'subway' ),
+						'label' => __('Public Posts IDs', 'subway'),
 						'callback' => 'subway_public_post',
 						'section' => 'subway-settings-section',
 						'group' => 'subway-page-visibility-section',
@@ -88,37 +88,37 @@ 
 
 				array(
 						'id' => 'subway_redirect_type',
-						'label' => __( 'Redirect Type', 'subway' ),
+						'label' => __('Redirect Type', 'subway'),
 						'callback' => 'subway_redirect_option_form',
 						'section' => 'subway-settings-section',
 						'group' => 'subway-redirect-section',
 					),
 				array(
 						'id' => 'subway_redirect_wp_admin',
-						'label' => __( 'Bypassing <em>wp-login.php</em>', 'subway' ),
+						'label' => __('Bypassing <em>wp-login.php</em>', 'subway'),
 						'callback' => 'subway_lock_wp_admin',
 						'section' => 'subway-settings-section',
 						'group' => 'subway-redirect-section',
 					),
 			);
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
-			add_settings_field( $field['id'], $field['label'], $field['callback'], $field['section'], $field['group'] );
+			add_settings_field($field['id'], $field['label'], $field['callback'], $field['section'], $field['group']);
 
-			register_setting( 'subway-settings-group', $field['id'] );
+			register_setting('subway-settings-group', $field['id']);
 
-			$file = str_replace( '_','-', $field['callback'] );
+			$file = str_replace('_', '-', $field['callback']);
 
-			require_once trailingslashit( SUBWAY_DIR_PATH ) . 'settings-fields/field-' . sanitize_title( $file ) . '.php';
+			require_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_setting('subway-settings-group', 'subway_redirect_page_id');
 
 		// Register Redirect Custom URL Settings.
-		register_setting( 'subway-settings-group', 'subway_redirect_custom_url' );
+		register_setting('subway-settings-group', 'subway_redirect_custom_url');
 
 		return;
 	}
@@ -152,11 +152,11 @@ 
 
 		<div class="wrap">
 			<h2>
-				<?php esc_html_e( 'Subway Settings', 'subway' ); ?>
+				<?php esc_html_e('Subway Settings', 'subway'); ?>
 			</h2>
 			<form id="subway-settings-form" action="options.php" method="POST">
-				<?php settings_fields( 'subway-settings-group' ); ?>
-				<?php do_settings_sections( 'subway-settings-section' ); ?>
+				<?php settings_fields('subway-settings-group'); ?>
+				<?php do_settings_sections('subway-settings-section'); ?>
 				<?php submit_button(); ?>
 			</form>
 		</div>

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. Leave blank to make your site public. %1$s.', 'subway' ), '<span style="font-weight: bold; color: #e53935;">' . 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. Leave blank to make your site public. %1$s.', 'subway'), '<span style="font-weight: bold; color: #e53935;">' . 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;
 }