codehaiku / subway-2.0

settings-fields/field-subway-is-public-form.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -21,8 +21,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__( 'Check to ignore all private options and make your site return to its original state (public) without uninstalling Subway. All settings here and in the individual posts or pages will be ignored. Uncheck to make your site accessible to members only', '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__('Check to ignore all private options and make your site return to its original state (public) without uninstalling Subway. All settings here and in the individual posts or pages will be ignored. Uncheck to make your site accessible to members only', 'subway') . '</p>';
 
 	return;
 }

classes/subway-auth-redirect.php

Indentation +128 added lines, -128 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,185 +36,185 @@ 
 final class AuthRedirect
 {
 
-    /**
-     * Handles our ajax authentication.
-     *
-     * @return void
-     */
-    public static function handleAuthentication()
-    {
+	/**
+	 * Handles our ajax authentication.
+	 *
+	 * @return void
+	 */
+	public static function handleAuthentication()
+	{
 
-        // Set the header type to json.
-        header('Content-Type: application/json');
+		// Set the header type to json.
+		header('Content-Type: application/json');
 
-        $is_signin = new \WP_Error( 'broke', __( 'Unable to authenticate user', "subway" ) );
+		$is_signin = new \WP_Error( 'broke', __( 'Unable to authenticate user', "subway" ) );
 
-        $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['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 {
+		} else {
 
-            $is_signin = wp_signon();
+			$is_signin = wp_signon();
 
-            $response = array();
+			$response = array();
 
-            if (is_wp_error($is_signin) ) {
+			if (is_wp_error($is_signin) ) {
 
-                $response['type'] = 'error';
+				$response['type'] = 'error';
 
-                $response['message'] = $is_signin->get_error_message();
+				$response['message'] = $is_signin->get_error_message();
 
-            } else {
+			} else {
 
-                $response['type'] = 'success';
+				$response['type'] = 'success';
 
-                $response['message'] = esc_html__(
-                    'You have successfully logged-in. Redirecting you in few seconds...',
-                    'subway'
-                );
+				$response['message'] = esc_html__(
+					'You have successfully logged-in. Redirecting you in few seconds...',
+					'subway'
+				);
 
-            }
-        }
+			}
+		}
 
-        $subway_redirect_url = AuthRedirect::getLoginRedirectUrl('', $is_signin);
+		$subway_redirect_url = AuthRedirect::getLoginRedirectUrl('', $is_signin);
 
-        $response['redirect_url'] = apply_filters(
-            'subway_login_redirect',
-            $subway_redirect_url,
-            $is_signin
-        );
+		$response['redirect_url'] = apply_filters(
+			'subway_login_redirect',
+			$subway_redirect_url,
+			$is_signin
+		);
 
-        echo wp_json_encode($response);
+		echo wp_json_encode($response);
 
-        wp_die();
+		wp_die();
 
-    }
+	}
 
-    /**
-     * Returns the filtered redirect url for the current user.
-     *
-     * @param string $redirect_to The default redirect callback argument.
-     * @param mixed  $user        This holds the meta info of currently logged-in user.
-     *
-     * @return string             The final redirect url.
-     */
-    public static function getLoginRedirectUrl( $redirect_to, $user )
-    {
+	/**
+	 * Returns the filtered redirect url for the current user.
+	 *
+	 * @param string $redirect_to The default redirect callback argument.
+	 * @param mixed  $user        This holds the meta info of currently logged-in user.
+	 *
+	 * @return string             The final redirect url.
+	 */
+	public static function getLoginRedirectUrl( $redirect_to, $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) ) {
+		// Redirect the user to default behaviour.
+		// If there are no redirect type option saved.
+		if (empty($subway_redirect_type) ) {
 
-            return $redirect_to;
+			return $redirect_to;
 
-        }
+		}
 
-        if ('default' === $subway_redirect_type ) {
-            return $redirect_to;
-        }
+		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'));
+			// 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'));
 
-            // Redirect to default WordPress behaviour.
-            // If the user did not select page.
-            if (empty($selected_redirect_page) ) {
+			// Redirect to default WordPress behaviour.
+			// If the user did not select page.
+			if (empty($selected_redirect_page) ) {
 
-                return $redirect_to;
-            }
+				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);
+			// Otherwise, get the permalink of the saved page
+			// and let the user go into that page.
+			return get_permalink($selected_redirect_page);
 
-        } elseif ('custom_url' === $subway_redirect_type ) {
+		} elseif ('custom_url' === $subway_redirect_type ) {
 
-            // Get the custom url saved in the redirect type settings.
-            $entered_custom_url = get_option('subway_redirect_custom_url');
+			// Get the custom url saved in the redirect type settings.
+			$entered_custom_url = get_option('subway_redirect_custom_url');
 
-            // Redirect to default WordPress behaviour
-            // if the user did enter a custom url.
-            if (empty($entered_custom_url) ) {
+			// Redirect to default WordPress behaviour
+			// if the user did enter a custom url.
+			if (empty($entered_custom_url) ) {
 
-                return $redirect_to;
+				return $redirect_to;
 
-            }
+			}
 
-            // Otherwise, get the custom url saved
-            // and let the user go into that page.
-            if (! empty($user->ID) ) {
-                $entered_custom_url = str_replace(
-                    '%user_id%', $user->ID,
-                    $entered_custom_url
-                );
-            }
+			// Otherwise, get the custom url saved
+			// and let the user go into that page.
+			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;
+			return $entered_custom_url;
 
-        }
+		}
 
-        // Otherwise, quit and redirect the user back to default WordPress behaviour.
-        return $redirect_to;
-    }
+		// Otherwise, quit and redirect the user back to default WordPress behaviour.
+		return $redirect_to;
+	}
 
-    /**
-     * Callback function for the 'login_url' filter defined in Subway.php
-     *
-     * @param string $login_url The login url.
-     *
-     * @return string            The final login url.
-     */
-    public static function loginUrl( $login_url  )
-    {
+	/**
+	 * Callback function for the 'login_url' filter defined in Subway.php
+	 *
+	 * @param string $login_url The login url.
+	 *
+	 * @return string            The final login url.
+	 */
+	public static function loginUrl( $login_url  )
+	{
 
-        $subway_login_page = Options::getRedirectPageUrl();
+		$subway_login_page = Options::getRedirectPageUrl();
 
-        // Return the default login url if there is no log-in page defined.
-        if (empty($subway_login_page) ) {
-            return $login_url;
-        }
+		// Return the default login url if there is no log-in page defined.
+		if (empty($subway_login_page) ) {
+			return $login_url;
+		}
 
-        // Otherwise, return the Subway login page.
-        return $subway_login_page;
+		// Otherwise, return the Subway login page.
+		return $subway_login_page;
 
-    }
+	}
 
-    /**
-     * The callback function for our logout filter.
-     *
-     * @return void
-     */
-    public static function logoutUrl()
-    {
+	/**
+	 * The callback function for our logout filter.
+	 *
+	 * @return void
+	 */
+	public static function logoutUrl()
+	{
 
-        $subway_login_page = Options::getRedirectPageUrl();
+		$subway_login_page = Options::getRedirectPageUrl();
 
-        wp_safe_redirect(esc_url($subway_login_page . '?loggedout=true'));
+		wp_safe_redirect(esc_url($subway_login_page . '?loggedout=true'));
 
-        Helpers::close();
+		Helpers::close();
 
-    }
+	}
 
 }

Spacing +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -47,13 +47,13 @@ 
         // Set the header type to json.
         header('Content-Type: application/json');
 
-        $is_signin = new \WP_Error( 'broke', __( 'Unable to authenticate user', "subway" ) );
+        $is_signin = new \WP_Error('broke', __('Unable to authenticate user', "subway"));
 
         $log = filter_input(INPUT_POST, 'log', 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';
 
@@ -68,7 +68,7 @@ 
 
             $response = array();
 
-            if (is_wp_error($is_signin) ) {
+            if (is_wp_error($is_signin)) {
 
                 $response['type'] = 'error';
 
@@ -108,24 +108,24 @@ 
      *
      * @return string             The final redirect url.
      */
-    public static function getLoginRedirectUrl( $redirect_to, $user )
+    public static function getLoginRedirectUrl($redirect_to, $user)
     {
 
         $subway_redirect_type = get_option('subway_redirect_type');
 
         // Redirect the user to default behaviour.
         // If there are no redirect type option saved.
-        if (empty($subway_redirect_type) ) {
+        if (empty($subway_redirect_type)) {
 
             return $redirect_to;
 
         }
 
-        if ('default' === $subway_redirect_type ) {
+        if ('default' === $subway_redirect_type) {
             return $redirect_to;
         }
 
-        if ('page' === $subway_redirect_type ) {
+        if ('page' === $subway_redirect_type) {
 
             // Get the page url of the selected page.
             // If the admin selected 'Custom Page' in the redirect type settings.
@@ -133,7 +133,7 @@ 
 
             // Redirect to default WordPress behaviour.
             // If the user did not select page.
-            if (empty($selected_redirect_page) ) {
+            if (empty($selected_redirect_page)) {
 
                 return $redirect_to;
             }
@@ -142,14 +142,14 @@ 
             // and let the user go into that page.
             return get_permalink($selected_redirect_page);
 
-        } elseif ('custom_url' === $subway_redirect_type ) {
+        } elseif ('custom_url' === $subway_redirect_type) {
 
             // Get the custom url saved in the redirect type settings.
             $entered_custom_url = get_option('subway_redirect_custom_url');
 
             // Redirect to default WordPress behaviour
             // if the user did enter a custom url.
-            if (empty($entered_custom_url) ) {
+            if (empty($entered_custom_url)) {
 
                 return $redirect_to;
 
@@ -157,14 +157,14 @@ 
 
             // Otherwise, get the custom url saved
             // and let the user go into that page.
-            if (! empty($user->ID) ) {
+            if ( ! empty($user->ID)) {
                 $entered_custom_url = str_replace(
                     '%user_id%', $user->ID,
                     $entered_custom_url
                 );
             }
 
-            if (! empty($user->user_login) ) {
+            if ( ! empty($user->user_login)) {
                 $entered_custom_url = str_replace(
                     '%user_name%', $user->user_login,
                     $entered_custom_url
@@ -186,13 +186,13 @@ 
      *
      * @return string            The final login url.
      */
-    public static function loginUrl( $login_url  )
+    public static function loginUrl($login_url)
     {
 
         $subway_login_page = Options::getRedirectPageUrl();
 
         // Return the default login url if there is no log-in page defined.
-        if (empty($subway_login_page) ) {
+        if (empty($subway_login_page)) {
             return $login_url;
         }
 

classes/subway-page-redirect.php

Indentation +108 added lines, -108 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,120 +36,120 @@ 
 final class PageRedirect
 {
 
-    /**
-     * Redirects pages into our login page.
-     *
-     * @return void.
-     */
-    public static function index()
-    {
-
-        // Additional filter for custom pages, taxonomy, links, parameterized urls, etc.
-        // Callback function/method must return true (boolean) to disable redirect.
-        $should_exit = apply_filters( 'subway/classes/subway-page-redirect/index/before-page-redirect', false );
-
-        if ( $should_exit ) {
-            return;
-        }
-
-        // Only execute for non logged in users.
-        if (is_user_logged_in() ) {
-            return;
-        }
+	/**
+	 * Redirects pages into our login page.
+	 *
+	 * @return void.
+	 */
+	public static function index()
+	{
+
+		// Additional filter for custom pages, taxonomy, links, parameterized urls, etc.
+		// Callback function/method must return true (boolean) to disable redirect.
+		$should_exit = apply_filters( 'subway/classes/subway-page-redirect/index/before-page-redirect', false );
+
+		if ( $should_exit ) {
+			return;
+		}
+
+		// Only execute for non logged in users.
+		if (is_user_logged_in() ) {
+			return;
+		}
         
-        $is_private = false;
+		$is_private = false;
 
-        $queried_id = get_queried_object_id();
+		$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::getPublicPostsIdentifiers();
+		$excluded_page = Options::getPublicPostsIdentifiers();
 
-        // Already escaped inside 'subway_get_redirect_page_url'.
-        $redirect_page = Options::getRedirectPageUrl(); // WPCS XSS OK.
+		// Already escaped inside 'subway_get_redirect_page_url'.
+		$redirect_page = Options::getRedirectPageUrl(); // WPCS XSS OK.
 
-        if ( !empty( $current_post ) ) {
+		if ( !empty( $current_post ) ) {
 		  $is_private = Metabox::isPostPrivate( $current_post->ID );
-        }
-
-        // do_action( 'subway/classes/subway-page-redirect/index/before_page_redirect' );
-
-        // Turn off if is in 'wc-ajax' (woocommerce)
-        if ( function_exists( 'is_ajax') ) {
-            if ( is_ajax() ) {
-               return;
-            }
-        }
-
-        // Same for normal ajax requests.
-        if ( is_admin() && defined( 'DOING_AJAX' ) && DOING_AJAX  ) {
-            return;
-        }
-
-        // Exit if site is public.
-        if ( Options::isPublicSite() ) {
-            return;
-        }
-
-        // Check if redirect page is empty or not.
-        if ( empty( $redirect_page ) ) {
-            return;
-        }
-
-        // Check if buddypress activate 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() ) {
-                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) ) {
-            $current_post = new \stdclass;
-            $current_post->ID = 0;
-        }
-
-        $current_page_id = absint($current_post->ID);
-
-        // Check if $current_page_id && $selected_blog_id is equal to each other.
-        // 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'));
-
-        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 ($current_page_id !== $login_page_id ) {
-
-                if ( ! in_array( $current_page_id, $excluded_page, true ) || in_array( $current_page_id, $excluded_page, true ) && true === $is_private ) {
-
-                    wp_safe_redirect(
-                        add_query_arg(
-                            array( '_redirected' => 'yes' ),
-                            $redirect_page
-                        )
-                    );
-
-                    Helpers::close();
-                }
-            }
-        }
-    }
+		}
+
+		// do_action( 'subway/classes/subway-page-redirect/index/before_page_redirect' );
+
+		// Turn off if is in 'wc-ajax' (woocommerce)
+		if ( function_exists( 'is_ajax') ) {
+			if ( is_ajax() ) {
+			   return;
+			}
+		}
+
+		// Same for normal ajax requests.
+		if ( is_admin() && defined( 'DOING_AJAX' ) && DOING_AJAX  ) {
+			return;
+		}
+
+		// Exit if site is public.
+		if ( Options::isPublicSite() ) {
+			return;
+		}
+
+		// Check if redirect page is empty or not.
+		if ( empty( $redirect_page ) ) {
+			return;
+		}
+
+		// Check if buddypress activate 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() ) {
+				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) ) {
+			$current_post = new \stdclass;
+			$current_post->ID = 0;
+		}
+
+		$current_page_id = absint($current_post->ID);
+
+		// Check if $current_page_id && $selected_blog_id is equal to each other.
+		// 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'));
+
+		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 ($current_page_id !== $login_page_id ) {
+
+				if ( ! in_array( $current_page_id, $excluded_page, true ) || in_array( $current_page_id, $excluded_page, true ) && true === $is_private ) {
+
+					wp_safe_redirect(
+						add_query_arg(
+							array( '_redirected' => 'yes' ),
+							$redirect_page
+						)
+					);
+
+					Helpers::close();
+				}
+			}
+		}
+	}
 
 }

Spacing +22 added lines, -22 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -46,14 +46,14 @@ 
 
         // Additional filter for custom pages, taxonomy, links, parameterized urls, etc.
         // Callback function/method must return true (boolean) to disable redirect.
-        $should_exit = apply_filters( 'subway/classes/subway-page-redirect/index/before-page-redirect', false );
+        $should_exit = apply_filters('subway/classes/subway-page-redirect/index/before-page-redirect', false);
 
-        if ( $should_exit ) {
+        if ($should_exit) {
             return;
         }
 
         // Only execute for non logged in users.
-        if (is_user_logged_in() ) {
+        if (is_user_logged_in()) {
             return;
         }
         
@@ -70,51 +70,51 @@ 
         // Already escaped inside 'subway_get_redirect_page_url'.
         $redirect_page = Options::getRedirectPageUrl(); // WPCS XSS OK.
 
-        if ( !empty( $current_post ) ) {
-		  $is_private = Metabox::isPostPrivate( $current_post->ID );
+        if ( ! empty($current_post)) {
+		  $is_private = Metabox::isPostPrivate($current_post->ID);
         }
 
         // do_action( 'subway/classes/subway-page-redirect/index/before_page_redirect' );
 
         // Turn off if is in 'wc-ajax' (woocommerce)
-        if ( function_exists( 'is_ajax') ) {
-            if ( is_ajax() ) {
+        if (function_exists('is_ajax')) {
+            if (is_ajax()) {
                return;
             }
         }
 
         // Same for normal ajax requests.
-        if ( is_admin() && defined( 'DOING_AJAX' ) && DOING_AJAX  ) {
+        if (is_admin() && defined('DOING_AJAX') && DOING_AJAX) {
             return;
         }
 
         // Exit if site is public.
-        if ( Options::isPublicSite() ) {
+        if (Options::isPublicSite()) {
             return;
         }
 
         // Check if redirect page is empty or not.
-        if ( empty( $redirect_page ) ) {
+        if (empty($redirect_page)) {
             return;
         }
 
         // Check if buddypress activate page.
-        if (function_exists('bp_is_activation_page') ) {
-            if (bp_is_activation_page() ) {
+        if (function_exists('bp_is_activation_page')) {
+            if (bp_is_activation_page()) {
                 return;
             }
         }
 
         // Check if buddypress registration page.
-        if (function_exists('bp_is_register_page') ) {
-            if (bp_is_register_page() ) {
+        if (function_exists('bp_is_register_page')) {
+            if (bp_is_register_page()) {
                 return;
             }
         }
 
         // Assign 0 value to empty $post->ID to prevent exception.
         // This applies to custom WordPress pages such as BP Members Page and Groups.
-        if (empty($current_post) ) {
+        if (empty($current_post)) {
             $current_post = new \stdclass;
             $current_post->ID = 0;
         }
@@ -126,22 +126,22 @@ 
         // The ID of the first post object inside the loop is not correct.
         $blog_id = absint(get_option('page_for_posts'));
 
-        if (is_home() ) {
-            if ($blog_id === $login_page_id ) {
+        if (is_home()) {
+            if ($blog_id === $login_page_id) {
                 $current_page_id = $blog_id;
             }
         }
 
         // Only execute the script for non-loggedin visitors.
-        if ( ! is_user_logged_in() ) {
+        if ( ! is_user_logged_in()) {
 
-            if ($current_page_id !== $login_page_id ) {
+            if ($current_page_id !== $login_page_id) {
 
-                if ( ! in_array( $current_page_id, $excluded_page, true ) || in_array( $current_page_id, $excluded_page, true ) && true === $is_private ) {
+                if ( ! in_array($current_page_id, $excluded_page, true) || in_array($current_page_id, $excluded_page, true) && true === $is_private) {
 
                     wp_safe_redirect(
                         add_query_arg(
-                            array( '_redirected' => 'yes' ),
+                            array('_redirected' => 'yes'),
                             $redirect_page
                         )
                     );

classes/subway-metabox.php

Doc Comments +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 	 * Registers and update metabox with its intended method below.
 	 *
 	 * @since  2.0.9
-	 * @return void
+	 * @return Metabox
 	 */
 	public function __construct() {
 
@@ -198,7 +198,7 @@ 
 	 *
 	 * @since  2.0.9
 	 * @access public
-	 * @return boolean false Returns false if nonce is not valid.
+	 * @return boolean|null false Returns false if nonce is not valid.
 	 */
 	public function saveVisibilityMetabox( $post_id = '' ) {
 
@@ -272,7 +272,7 @@ 
 	 *
 	 * @since  2.0.9
 	 * @access public
-	 * @return boolean false Returns false if nonce is not valid.
+	 * @return boolean|null false Returns false if nonce is not valid.
 	 */
 	public function saveMetaboxValues( $post_id ) {
 
@@ -311,7 +311,7 @@ 
 	 *
 	 * @since  2.0.9
 	 * @access public
-	 * @return boolean true Returns true if nonce is valid.
+	 * @return null|boolean true Returns true if nonce is valid.
 	 */
 	public function isNonceValid( $nonce ) {
 

Braces +5 added lines, -2 removed lines

@@ -182,10 +182,13 @@
 				});
 			</script>
 			<p class="howto"><?php echo esc_html( $howto ); ?></p>
-		<?php else : ?>
+		<?php else {
+	: ?>
 			<?php // Site is public! Explain to them ?>
 			<p><em>
-				<?php esc_html_e( 'You have chosen to make your site public inside Settings > Subway.  Subway visibility options will be turned off.', 'subway' ); ?>
+				<?php esc_html_e( 'You have chosen to make your site public inside Settings > Subway.  Subway visibility options will be turned off.', 'subway' );
+}
+?>
 			</em>
 			</p>
 		<?php endif; ?>

Spacing +89 added lines, -89 removed lines

@@ -22,7 +22,7 @@ 
 
 namespace Subway;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -55,9 +55,9 @@ 
 	 */
 	public function __construct() {
 
-		add_action( 'add_meta_boxes', array( $this, 'addMetabox' ) );
-		add_action( 'save_post', array( $this, 'saveMetaboxValues' ) );
-		add_filter( 'the_content', array( $this, 'showContentToAllowedRoles' ) );
+		add_action('add_meta_boxes', array($this, 'addMetabox'));
+		add_action('save_post', array($this, 'saveMetaboxValues'));
+		add_filter('the_content', array($this, 'showContentToAllowedRoles'));
 
 		return $this;
 	}
@@ -85,11 +85,11 @@ 
 
 		$post_types = $this->getPostTypes();
 
-		foreach ( $post_types as $post_type => $value ) {
+		foreach ($post_types as $post_type => $value) {
 			add_meta_box(
 				'subway_visibility_metabox',
-				esc_html__( 'Subway: Visibility Option', 'subway' ),
-				array( $this, 'visibilityMetabox' ),
+				esc_html__('Subway: Visibility Option', 'subway'),
+				array($this, 'visibilityMetabox'),
 				$post_type,
 				'side',
 				'high'
@@ -106,65 +106,65 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function visibilityMetabox( $post ) {
+	public function visibilityMetabox($post) {
 
 		$howto = __(
 			'Choose the accessibility of this page from the options above.',
 			'subway'
 		);
 
-		$private_setting_label = __( 'Members Only', 'subway' );
+		$private_setting_label = __('Members Only', 'subway');
 
-		$is_post_private         = self::isPostPrivate( $post->ID );
+		$is_post_private = self::isPostPrivate($post->ID);
 
 		// Make sure the form request comes from WordPress
-		wp_nonce_field( basename( __FILE__ ),  'subway_post_visibility_nonce' );
+		wp_nonce_field(basename(__FILE__), 'subway_post_visibility_nonce');
 
 		// Disable the options (radio) when site is selected as public
 		?>
 		<input type="hidden" name="subway-visibility-form-submitted" value="1" />
 
-		<?php if ( ! Options::isPublicSite() ) :  ?>
+		<?php if ( ! Options::isPublicSite()) :  ?>
 		<?php // Site is private. Give them some Beer! ?>
 			<p>
 				<label class="subway-visibility-settings-checkbox-label" for="subway-visibility-public">
-					<input type="radio" class="subway-visibility-settings-radio" id="subway-visibility-public" name="subway-visibility-settings" value="public" <?php echo checked( false, $is_post_private, false ); ?>>
-					<?php esc_html_e( 'Public', 'subway' ) ?>
+					<input type="radio" class="subway-visibility-settings-radio" id="subway-visibility-public" name="subway-visibility-settings" value="public" <?php echo checked(false, $is_post_private, false); ?>>
+					<?php esc_html_e('Public', 'subway') ?>
 				</label>
 			</p>
 			<p>
 				<label class="subway-visibility-settings-checkbox-label" for="subway-visibility-private">
 					<input type="radio" class="subway-visibility-settings-radio" id="subway-visibility-private" name="subway-visibility-settings"
-					value="private" <?php echo checked( true, $is_post_private, false ); ?>>
-					<?php esc_html_e( 'Members Only', 'subway' ) ?>
+					value="private" <?php echo checked(true, $is_post_private, false); ?>>
+					<?php esc_html_e('Members Only', 'subway') ?>
 				 </label>
 			</p>
 			<div id="subway-roles-access-visibility-fields" class="hidden">
 				<dl>
-					<?php $post_allowed_user_roles = self::getAllowedUserRoles( $post->ID ); ?>
+					<?php $post_allowed_user_roles = self::getAllowedUserRoles($post->ID); ?>
 					<?php $editable_roles = get_editable_roles(); ?>
 					<?php // Remove administrator for editable roles. ?>
-					<?php unset( $editable_roles['administrator'] ); ?>
-					<?php foreach ( $editable_roles as $role_name => $role_info ) { ?>
+					<?php unset($editable_roles['administrator']); ?>
+					<?php foreach ($editable_roles as $role_name => $role_info) { ?>
 						<dt>
-							<?php $id = 'subway-visibility-settings-user-role-' . esc_html( $role_name ); ?>
-							<label for="<?php echo esc_attr( $id ); ?>">
-							<?php if ( is_array( $post_allowed_user_roles ) && in_array( $role_name, $post_allowed_user_roles ) ) { ?>
+							<?php $id = 'subway-visibility-settings-user-role-' . esc_html($role_name); ?>
+							<label for="<?php echo esc_attr($id); ?>">
+							<?php if (is_array($post_allowed_user_roles) && in_array($role_name, $post_allowed_user_roles)) { ?>
 								<?php $checked = 'checked'; ?>
 							<?php } else { ?>
-								<?php if ( false === $post_allowed_user_roles ) { ?>
+								<?php if (false === $post_allowed_user_roles) { ?>
 									<?php $checked = 'checked'; ?>
 								<?php } else { ?>
 										<?php $checked = ''; ?>
 								<?php } ?>
 							<?php } ?>
-							<input <?php echo esc_attr( $checked ); ?> id="<?php echo esc_attr( $id ); ?>" type="checkbox" 
-							name="subway-visibility-settings-user-role[]" class="subway-visibility-settings-role-access" value="<?php echo esc_attr( $role_name ); ?>" />
-								<?php echo esc_html( $role_info['name'] ); ?>
+							<input <?php echo esc_attr($checked); ?> id="<?php echo esc_attr($id); ?>" type="checkbox" 
+							name="subway-visibility-settings-user-role[]" class="subway-visibility-settings-role-access" value="<?php echo esc_attr($role_name); ?>" />
+								<?php echo esc_html($role_info['name']); ?>
 							</label>
 						</dt>
 					<?php } ?>
-					<p class="howto"><?php echo esc_html_e( 'Uncheck the user roles that you do not want to have access to this content','subway' ); ?></p>
+					<p class="howto"><?php echo esc_html_e('Uncheck the user roles that you do not want to have access to this content', 'subway'); ?></p>
 				</dl>
 			</div>
 			<script>
@@ -181,11 +181,11 @@ 
 					});
 				});
 			</script>
-			<p class="howto"><?php echo esc_html( $howto ); ?></p>
+			<p class="howto"><?php echo esc_html($howto); ?></p>
 		<?php else : ?>
 			<?php // Site is public! Explain to them ?>
 			<p><em>
-				<?php esc_html_e( 'You have chosen to make your site public inside Settings > Subway.  Subway visibility options will be turned off.', 'subway' ); ?>
+				<?php esc_html_e('You have chosen to make your site public inside Settings > Subway.  Subway visibility options will be turned off.', 'subway'); ?>
 			</em>
 			</p>
 		<?php endif; ?>
@@ -201,15 +201,15 @@ 
 	 * @access public
 	 * @return boolean false Returns false if nonce is not valid.
 	 */
-	public function saveVisibilityMetabox( $post_id = '' ) {
+	public function saveVisibilityMetabox($post_id = '') {
 
-		if ( wp_is_post_autosave( $post_id ) ) {
+		if (wp_is_post_autosave($post_id)) {
 			return;
 		}
 
-		$is_form_submitted = filter_input( INPUT_POST, 'subway-visibility-form-submitted', FILTER_DEFAULT );
+		$is_form_submitted = filter_input(INPUT_POST, 'subway-visibility-form-submitted', FILTER_DEFAULT);
 
-		if ( ! $is_form_submitted ) {
+		if ( ! $is_form_submitted) {
 			return;
 		}
 
@@ -224,45 +224,45 @@ 
 			FILTER_SANITIZE_STRING
 		);
 
-		$post_visibility = filter_input( INPUT_POST,  $visibility_field, FILTER_SANITIZE_STRING );
+		$post_visibility = filter_input(INPUT_POST, $visibility_field, FILTER_SANITIZE_STRING);
 
-		$is_valid_visibility_nonce = self::isNonceValid( $visibility_nonce );
+		$is_valid_visibility_nonce = self::isNonceValid($visibility_nonce);
 
-		$allowed_roles = filter_input( INPUT_POST, 'subway-visibility-settings-user-role', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
+		$allowed_roles = filter_input(INPUT_POST, 'subway-visibility-settings-user-role', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
 
 		// verify taxonomies meta box nonce
-		if ( false === $is_valid_visibility_nonce ) {
+		if (false === $is_valid_visibility_nonce) {
 			return;
 		}
-		if ( empty( $allowed_roles ) ) {
+		if (empty($allowed_roles)) {
 			$allowed_roles = array();
 		}
 
 		// Update user roles.
-		update_post_meta( $post_id, 'subway-visibility-settings-allowed-user-roles', $allowed_roles );
+		update_post_meta($post_id, 'subway-visibility-settings-allowed-user-roles', $allowed_roles);
 
-		if ( ! empty( $post_visibility ) ) {
-			if ( ! empty( $post_id ) ) {
-				if ( 'public' === $post_visibility ) {
-					if ( ! in_array( $post_id, $public_posts ) ) {
-						array_push( $public_posts, $post_id );
+		if ( ! empty($post_visibility)) {
+			if ( ! empty($post_id)) {
+				if ('public' === $post_visibility) {
+					if ( ! in_array($post_id, $public_posts)) {
+						array_push($public_posts, $post_id);
 					}
 				}
-				if ( 'private' === $post_visibility ) {
-					if ( in_array( $post_id, $public_posts ) ) {
-						unset( $public_posts[ array_search( $post_id, $public_posts ) ] );
+				if ('private' === $post_visibility) {
+					if (in_array($post_id, $public_posts)) {
+						unset($public_posts[array_search($post_id, $public_posts)]);
 					}
 				}
 			}
 		}
 
-		if ( ! empty( $post_id ) ) {
-			$posts_implode = implode( ', ', $public_posts );
+		if ( ! empty($post_id)) {
+			$posts_implode = implode(', ', $public_posts);
 
-			if ( 'inherit' !== get_post_status( $post_id ) ) {
+			if ('inherit' !== get_post_status($post_id)) {
 
-				if ( true === $is_valid_visibility_nonce ) {
-					update_option( 'subway_public_post', $posts_implode );
+				if (true === $is_valid_visibility_nonce) {
+					update_option('subway_public_post', $posts_implode);
 					update_post_meta(
 						$post_id,
 						self::VISIBILITY_METAKEY,
@@ -282,9 +282,9 @@ 
 	 * @access public
 	 * @return boolean false Returns false if nonce is not valid.
 	 */
-	public function saveMetaboxValues( $post_id ) {
+	public function saveMetaboxValues($post_id) {
 
-		$this->saveVisibilityMetabox( $post_id );
+		$this->saveVisibilityMetabox($post_id);
 		return;
 	}
 
@@ -298,16 +298,16 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public static function getPostTypes( $args = '', $output = '' ) {
+	public static function getPostTypes($args = '', $output = '') {
 
-		if ( empty( $args ) ) {
+		if (empty($args)) {
 			$args = array(
 			'public'   => true,
 			);
 			$output = 'names';
 		}
 
-		$post_types = get_post_types( $args, $output );
+		$post_types = get_post_types($args, $output);
 
 		return $post_types;
 	}
@@ -321,9 +321,9 @@ 
 	 * @access public
 	 * @return boolean true Returns true if nonce is valid.
 	 */
-	public function isNonceValid( $nonce ) {
+	public function isNonceValid($nonce) {
 
-		if ( ! isset( $nonce ) || ! wp_verify_nonce( $nonce, basename( __FILE__ ) ) ) {
+		if ( ! isset($nonce) || ! wp_verify_nonce($nonce, basename(__FILE__))) {
 			return;
 		}
 
@@ -339,23 +339,23 @@ 
 	 * @access public
 	 * @return boolean true Returns true if post is private. Otherwise false.
 	 */
-	public static function isPostPrivate( $post_id ) {
+	public static function isPostPrivate($post_id) {
 
 		$meta_value = '';
 
-		if ( ! empty( $post_id ) ) {
-			$meta_value = get_post_meta( $post_id, self::VISIBILITY_METAKEY, true );
+		if ( ! empty($post_id)) {
+			$meta_value = get_post_meta($post_id, self::VISIBILITY_METAKEY, true);
 
 			// New page or old pages that don't have Subway'\ Visibility Options
-			if ( empty( $meta_value ) ) {
+			if (empty($meta_value)) {
 				// Get the value from the general settings (Settings > Subway)
 				$is_site_public = Options::isPublicSite();
-				if ( ! $is_site_public ) {
+				if ( ! $is_site_public) {
 					// It's private.
 					return true;
 				}
 			}
-			if ( 'private' === $meta_value ) {
+			if ('private' === $meta_value) {
 				return true;
 			}
 		}
@@ -372,12 +372,12 @@ 
 	 * @access public
 	 * @return boolean true Returns true if post is public. Otherwise false.
 	 */
-	public static function isPostPublic( $post_id ) {
+	public static function isPostPublic($post_id) {
 
 		$public_post = Options::getPublicPostsIdentifiers();
 
-		if ( ! empty( $post_id ) ) {
-			if ( ! in_array( $post_id, $public_post, true ) ) {
+		if ( ! empty($post_id)) {
+			if ( ! in_array($post_id, $public_post, true)) {
 				return true;
 			}
 		}
@@ -391,17 +391,17 @@ 
 	 * @param  integer $post_id The post ID.
 	 * @return mixed Boolean false if metadata does not exists. Otherwise, return the array value of meta.
 	 */
-	public static function getAllowedUserRoles( $post_id = 0 ) {
+	public static function getAllowedUserRoles($post_id = 0) {
 
 		$allowed_roles = array();
 
-		if ( ! empty( $post_id ) ) {
+		if ( ! empty($post_id)) {
 
 			// Check if metadata exists for the following post.
-			if ( metadata_exists( 'post', $post_id, 'subway-visibility-settings-allowed-user-roles' ) ) {
+			if (metadata_exists('post', $post_id, 'subway-visibility-settings-allowed-user-roles')) {
 
-				$allowed_roles = get_post_meta( $post_id, 'subway-visibility-settings-allowed-user-roles', true );
-				if ( ! is_null( $allowed_roles ) ) {
+				$allowed_roles = get_post_meta($post_id, 'subway-visibility-settings-allowed-user-roles', true);
+				if ( ! is_null($allowed_roles)) {
 					return $allowed_roles;
 				}
 				return false;
@@ -423,28 +423,28 @@ 
 	 * @param  string $content The content of the post.
 	 * @return string The content of the post.
 	 */
-	public function showContentToAllowedRoles( $content ) {
+	public function showContentToAllowedRoles($content) {
 
 		$post_id = get_the_ID();
-		$allowed_user_roles = self::getAllowedUserRoles( $post_id );
+		$allowed_user_roles = self::getAllowedUserRoles($post_id);
 
-		if ( ! is_singular() && is_main_query() ) {
+		if ( ! is_singular() && is_main_query()) {
 			return $content;
 		}
 
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 
-			$no_privilege = '<div class="subway-role-not-allowed"><p>' . apply_filters( 'subway-content-restricted-to-role', esc_html__( 'You do not have the right privilege or role to view this page.', 'subway' ) ) . '</p></div>';
+			$no_privilege = '<div class="subway-role-not-allowed"><p>' . apply_filters('subway-content-restricted-to-role', esc_html__('You do not have the right privilege or role to view this page.', 'subway')) . '</p></div>';
 
 			// Restrict access to non admins only.
-			if ( ! current_user_can( 'manage_options' ) ) {
-				if ( ! self::currentUserCanViewPage( $post_id ) ) {
+			if ( ! current_user_can('manage_options')) {
+				if ( ! self::currentUserCanViewPage($post_id)) {
 					return $no_privilege;
 				}	
 			}
 
 			// Return the content if the post is not yet saved.
-			if ( false === $allowed_user_roles ) {
+			if (false === $allowed_user_roles) {
 				return $content;
 			}
 		}
@@ -458,30 +458,30 @@ 
 	 * 
 	 * @return boolean True on success. Otherwise, false.
 	 */
-	public function currentUserCanViewPage( $post_id = 0 ) {
+	public function currentUserCanViewPage($post_id = 0) {
 
-		$allowed_roles = self::getAllowedUserRoles( $post_id );
+		$allowed_roles = self::getAllowedUserRoles($post_id);
 		
 		// if $allowed_roles is not set, it means meta data is not yet available.
 		// Post roles are checked but are not yet save. So allow viewing.
-		if ( ! $allowed_roles ) {
+		if ( ! $allowed_roles) {
 			return true;
 		}
 
 		// Only check for logged-in users.
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			
 			$can_view = false;
 
 			$user = wp_get_current_user();
 
-			if ( ! is_array( $user->roles ) ) {
+			if ( ! is_array($user->roles)) {
 				$user->roles = (array) $user->roles;
 			}
 
-			if ( ! empty( $user->roles ) && is_array( $user->roles ) ) {
-				foreach( $user->roles as $current_user_role ) {
-					if ( in_array( $current_user_role, $allowed_roles ) ) {
+			if ( ! empty($user->roles) && is_array($user->roles)) {
+				foreach ($user->roles as $current_user_role) {
+					if (in_array($current_user_role, $allowed_roles)) {
 						$can_view = true;
 					}
 				}

classes/subway-enqueue.php

Indentation +32 added lines, -32 removed lines

@@ -20,7 +20,7 @@ 
 namespace Subway;
 
 if (! defined('ABSPATH') ) {
-    return;
+	return;
 }
 
 /**
@@ -36,47 +36,47 @@ 
 final class Enqueue
 {
 
-    /**
-     * Registers our CSS and Javascript to WordPress Enqueue Handler.
-     *
-     * @return void
-     */
-    public static function registerJs() 
-    {
+	/**
+	 * Registers our CSS and Javascript to WordPress Enqueue Handler.
+	 *
+	 * @return void
+	 */
+	public static function registerJs() 
+	{
 
-        $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'));
 
-        wp_enqueue_style('subway-style', SUBWAY_DIR_URL . 'assets/css/subway.css');
+		wp_enqueue_style('subway-style', SUBWAY_DIR_URL . 'assets/css/subway.css');
 
-        // Only load the stylesheet and javascript documents inside our sign-in page.
-        if ($post_id === $signin_page ) {
+		// Only load the stylesheet and javascript documents inside our sign-in page.
+		if ($post_id === $signin_page ) {
 
-            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 
+				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'
-                    ),
-                    )
-                );
+						'subway'
+					),
+					)
+				);
 
-            }
-        }
+			}
+		}
 
-        return;
+		return;
 
-    }
+	}
 
 }

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -51,14 +51,14 @@ 
         wp_enqueue_style('subway-style', SUBWAY_DIR_URL . 'assets/css/subway.css');
 
         // Only load the stylesheet and javascript documents inside our sign-in page.
-        if ($post_id === $signin_page ) {
+        if ($post_id === $signin_page) {
 
-            if (! is_user_logged_in() ) {
+            if ( ! is_user_logged_in()) {
 
                 wp_enqueue_script(
                     'subway-script', 
                     SUBWAY_DIR_URL . 'assets/js/subway.js', 
-                    array( 'jquery' )
+                    array('jquery')
                 );
 
                 wp_localize_script(

templates/login-form.php

Spacing +32 added lines, -32 removed lines

@@ -17,7 +17,7 @@ 
  * @link     github.com/codehaiku/subway The Plugin Repository
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -25,100 +25,100 @@ 
 
 $message_types = array();
 
-$http_request_login = filter_input( INPUT_GET, 'login', FILTER_SANITIZE_SPECIAL_CHARS );
+$http_request_login = filter_input(INPUT_GET, 'login', FILTER_SANITIZE_SPECIAL_CHARS);
 
-$http_request_type = filter_input( INPUT_GET, 'type', FILTER_SANITIZE_SPECIAL_CHARS );
+$http_request_type = filter_input(INPUT_GET, 'type', FILTER_SANITIZE_SPECIAL_CHARS);
 
-$http_request_logout = filter_input( INPUT_GET, 'loggedout', FILTER_SANITIZE_SPECIAL_CHARS );
+$http_request_logout = filter_input(INPUT_GET, 'loggedout', FILTER_SANITIZE_SPECIAL_CHARS);
 
-if ( isset( $http_request_login ) ) {
+if (isset($http_request_login)) {
 
-	if ( 'failed' === $http_request_login ) {
+	if ('failed' === $http_request_login) {
 
-		if ( isset( $http_request_type ) ) {
+		if (isset($http_request_type)) {
 
 			$message_types = array(
 
 				'default' => array(
-						'message' => __( 'There was an error trying to sign-in to your account. Make sure the credentials below are correct.', 'subway' ),
+						'message' => __('There was an error trying to sign-in to your account. Make sure the credentials below are correct.', 'subway'),
 					),
 				'__blank' => array(
-						'message' => __( 'Required: Username and Password cannot be empty.', 'subway' ),
+						'message' => __('Required: Username and Password cannot be empty.', 'subway'),
 					),
 				'__userempty' => array(
-						'message' => __( 'Required: Username cannot be empty.', 'subway' ),
+						'message' => __('Required: Username cannot be empty.', 'subway'),
 					),
 				'__passempty' => array(
-						'message' => __( 'Required: Password cannot be empty.', 'subway' ),
+						'message' => __('Required: Password cannot be empty.', 'subway'),
 					),
 				'fb_invalid_email' => array(
-						'message' => __( 'Facebook email address is invalid or is not yet verified.', 'subway' ),
+						'message' => __('Facebook email address is invalid or is not yet verified.', 'subway'),
 					),
 				'fb_error' => array(
-						'message' => __( 'Facebook Application Error. Misconfigured or App is rejected.', 'subway' ),
+						'message' => __('Facebook Application Error. Misconfigured or App is rejected.', 'subway'),
 					),
 				'app_not_live' => array(
-						'message' => __( 'Unable to fetch your Facebook Profile.', 'subway' ),
+						'message' => __('Unable to fetch your Facebook Profile.', 'subway'),
 					),
 				'gears_username_or_email_exists' => array(
-						'message' => __( 'Username or email address already exists', 'subway' ),
+						'message' => __('Username or email address already exists', 'subway'),
 					),
 				'gp_error_authentication' => array(
-						'message' => __( 'Google Plus Authentication Error. Invalid Client ID or Secret.', 'subway' ),
+						'message' => __('Google Plus Authentication Error. Invalid Client ID or Secret.', 'subway'),
 					),
 			);
 
 			$message = $message_types['default']['message'];
 
-			if ( array_key_exists( $http_request_type, $message_types ) ) {
+			if (array_key_exists($http_request_type, $message_types)) {
 
-				$message = $message_types[ $http_request_type ]['message'];
+				$message = $message_types[$http_request_type]['message'];
 
 			}
 
-			$error_login_message = '<div id="message" class="error">' . esc_html( $message ) . '</div>';
+			$error_login_message = '<div id="message" class="error">' . esc_html($message) . '</div>';
 
 		} else {
 
-			$error_login_message = '<div id="message" class="error">' . esc_html__( 'Error: Invalid username and password combination.', 'subway' ) . '</div>';
+			$error_login_message = '<div id="message" class="error">' . esc_html__('Error: Invalid username and password combination.', 'subway') . '</div>';
 
 		}
 	}
 }
 
-if ( isset( $http_request_logout ) ) {
-	$error_login_message = '<div id="message" class="success">' . esc_html__( 'You have logged out successfully.', 'subway' ) . '</div>';
+if (isset($http_request_logout)) {
+	$error_login_message = '<div id="message" class="success">' . esc_html__('You have logged out successfully.', 'subway') . '</div>';
 }
 
-$http_request_redirected = filter_input( INPUT_GET, '_redirected', FILTER_SANITIZE_SPECIAL_CHARS );
+$http_request_redirected = filter_input(INPUT_GET, '_redirected', FILTER_SANITIZE_SPECIAL_CHARS);
 
-if ( isset( $http_request_redirected ) ) {
-	$error_login_message = '<div id="message" class="success">' . esc_html__( 'Members only page. Please use the login form below to access the page.', 'subway' ) . '</div>';
+if (isset($http_request_redirected)) {
+	$error_login_message = '<div id="message" class="success">' . esc_html__('Members only page. Please use the login form below to access the page.', 'subway') . '</div>';
 }
 
 ?>
-<?php if ( ! is_user_logged_in() ) { ?>
+<?php if ( ! is_user_logged_in()) { ?>
 	<div class="mg-top-35 mg-bottom-35 subway-login-form">
 		<div class="subway-login-form-form">
 			<div class="subway-login-form__actions">
 				<h3>
-					<?php esc_html_e( 'Account Sign-in', 'subway' ); ?>
+					<?php esc_html_e('Account Sign-in', 'subway'); ?>
 				</h3>
-				<?php do_action( 'gears_login_form' ); ?>
+				<?php do_action('gears_login_form'); ?>
 			</div>
 			<div class="subway-login-form-message">
-				<?php echo wp_kses_post( $error_login_message ); ?>
+				<?php echo wp_kses_post($error_login_message); ?>
 			</div>
 			<div class="subway-login-form__form">
-				<?php echo wp_login_form( $atts ); ?>
+				<?php echo wp_login_form($atts); ?>
 			</div>
 		</div>
 	</div>
 <?php } else { ?>
 	<div class="mg-top-35 mg-bottom-35 subway-login-sucessfull">
 		<p style="margin-bottom: 0px;">
-			<?php $success_message = apply_filters( 'subway_login_message_success', esc_html__( 'You are currently logged-in.', 'subway' ) ); ?>
-			<?php echo esc_html( $success_message ); ?>
+			<?php $success_message = apply_filters('subway_login_message_success', esc_html__('You are currently logged-in.', 'subway')); ?>
+			<?php echo esc_html($success_message); ?>
 			
 		</p>
 	</div>

settings-fields/field-subway-lock-wp-admin.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -18,8 +18,8 @@ 
 
 	<p class="description">
 		<?php
-			echo sprintf( __( "In case you were locked out. Use the link below to bypass the log-in page and go directly
-			to your website's wp-login URL (http://yoursiteurl.com/wp-login.php): <strong class='subway-settings-text-notice'>%s</strong>", 'subway' ), site_url( 'wp-login.php?no_redirect=true' ) ); 
+			echo sprintf(__("In case you were locked out. Use the link below to bypass the log-in page and go directly
+			to your website's wp-login URL (http://yoursiteurl.com/wp-login.php): <strong class='subway-settings-text-notice'>%s</strong>", 'subway'), site_url('wp-login.php?no_redirect=true')); 
 		?>
 	</p>
 <?php