codehaiku / subway-2.0

templates/login-form-lost-password.php

Spacing +3 added lines, -3 removed lines

@@ -17,12 +17,12 @@
  * @link     github.com/codehaiku/subway The Plugin Repository
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 ?>
 <p class="subway-login-lost-password">
-	<a href="<?php echo esc_url( wp_lostpassword_url( $redirect = '' ) ); ?>">
-	 	<?php esc_html_e( 'Forgot Password', 'subway' ); ?>
+	<a href="<?php echo esc_url(wp_lostpassword_url($redirect = '')); ?>">
+	 	<?php esc_html_e('Forgot Password', 'subway'); ?>
 	</a>
 </p>

classes/subway-enqueue.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -49,19 +49,19 @@ 
         $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'
             );
 
-            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(

classes/subway-helpers.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 

classes/subway-options.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -46,7 +46,7 @@ 
 
         $selected_login_post_id = intval(get_option('subway_login_page'));
 
-        if (0 === $selected_login_post_id ) {
+        if (0 === $selected_login_post_id) {
 
             return;
 
@@ -54,7 +54,7 @@ 
 
         $login_post = get_post($selected_login_post_id);
 
-        if (! empty($login_post) ) {
+        if ( ! empty($login_post)) {
 
             return trailingslashit(get_permalink($login_post->ID));
 
@@ -76,7 +76,7 @@ 
 
         $excluded_pages_collection = array();
 
-        if (! empty($subway_public_post) ) {
+        if ( ! empty($subway_public_post)) {
 
             $excluded_pages_collection = explode(',', $subway_public_post);
 
@@ -98,7 +98,7 @@ 
 
         $subway_public_post = get_option('subway_is_public');
 
-        if (! empty($subway_public_post) ) {
+        if ( ! empty($subway_public_post)) {
 
             return true;
 

shortcodes/subway-shortcodes.php

Doc Comments +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
     /**
      * Class Constructor.
      *
-     * @return void
+     * @return Shortcodes
      */
     private function __construct() 
     {
@@ -53,7 +53,7 @@ 
     /**
      * Instantiate our class.
      * 
-     * @return mixed The instance of this class.
+     * @return Shortcodes|null The instance of this class.
      */
     public static function instance() 
     {
@@ -91,7 +91,7 @@ 
     /**
      * Displays the login form
      * 
-     * @return void
+     * @return null|string
      */
     public function loginForm( $atts )
     {

Spacing +20 added lines, -20 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -44,7 +44,7 @@ 
     private function __construct() 
     {
         
-        add_action('init', array( $this, 'register'));
+        add_action('init', array($this, 'register'));
         
         return $this;
 
@@ -60,7 +60,7 @@ 
         
         static $instance = null;
 
-        if (null === $instance ) {
+        if (null === $instance) {
 
             $instance = new Shortcodes();
 
@@ -78,11 +78,11 @@ 
     public function register() 
     {
 
-        add_shortcode('subway_login', array( $this, 'loginForm' ));
+        add_shortcode('subway_login', array($this, 'loginForm'));
 
-        add_action('login_form_middle', array( $this, 'loginFormAction' ), 10, 2);
+        add_action('login_form_middle', array($this, 'loginFormAction'), 10, 2);
 
-        add_action('login_form_middle', array( $this, 'lostPasswordLink' ), 10, 2);
+        add_action('login_form_middle', array($this, 'lostPasswordLink'), 10, 2);
 
         return;
 
@@ -93,15 +93,15 @@ 
      * 
      * @return void
      */
-    public function loginForm( $atts )
+    public function loginForm($atts)
     {
-        $atts = shortcode_atts( array(
+        $atts = shortcode_atts(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',
@@ -110,7 +110,7 @@ 
             'value_username' => '',
             'value_remember' => false,
             'redirect'       => home_url(),
-        ), $atts );
+        ), $atts);
 
         return $this->renderTemplate($atts, 'login-form.php');
     }
@@ -123,22 +123,22 @@ 
      * 
      * @return string The html template content.
      */
-    protected function renderTemplate( $atts, $file = '' ) 
+    protected function renderTemplate($atts, $file = '') 
     {
 
         ob_start();
 
-        if (empty($file) ) {
+        if (empty($file)) {
             
             return;
 
         }
 
-        $template = SUBWAY_DIR_PATH . 'templates/'.$file;
+        $template = SUBWAY_DIR_PATH . 'templates/' . $file;
 
-        if (file_exists($template) ) {
+        if (file_exists($template)) {
 
-            $theme_template = locate_template(array('gears/shortcodes/'.$file ));
+            $theme_template = locate_template(array('gears/shortcodes/' . $file));
 
             if ($theme_template) {
 
@@ -169,7 +169,7 @@ 
      * 
      * @return string            The content of our login form action.
      */
-    public function loginFormAction( $__content ) 
+    public function loginFormAction($__content) 
     {
 
         ob_start();
@@ -187,7 +187,7 @@ 
      * 
      * @return string          The content of our lost password link.
      */
-    public function lostPasswordLink( $content ) 
+    public function lostPasswordLink($content) 
     {
         
         return $content . $this->renderTemplate(

i18.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -44,7 +44,7 @@ 
     public function __construct() 
     {
 
-        add_action('plugins_loaded', array( $this, 'subwayLocalizePlugin' ));
+        add_action('plugins_loaded', array($this, 'subwayLocalizePlugin'));
 
         return;
     }
@@ -57,7 +57,7 @@ 
     public function subwayLocalizePlugin() 
     {
 
-        load_plugin_textdomain('subway', false, basename( dirname( __FILE__ ) ) . '/languages'  );
+        load_plugin_textdomain('subway', false, basename(dirname(__FILE__)) . '/languages');
 
         return;
 

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" 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 logged in.', 'subway' ) ); ?>
-			<?php echo esc_html( $success_message ); ?>
+			<?php $success_message = apply_filters('subway_login_message_success', esc_html__('Great! You have succesfully logged in.', 'subway')); ?>
+			<?php echo esc_html($success_message); ?>
 		</p>
 	</div>
 <?php } ?>

classes/subway-metabox.php

Doc Comments +3 added lines, -3 removed lines

@@ -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 = '' )
     {
@@ -268,7 +268,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 )
     {
@@ -307,7 +307,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 )
     {

Spacing +35 added lines, -35 removed lines

@@ -20,7 +20,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -92,11 +92,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' ),
+                array($this, 'visibilityMetabox'),
                 $post_type,
                 'side',
                 'low'
@@ -113,37 +113,37 @@ 
      * @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_public          = self::isPostPublic($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
         ?>
         
-        <?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>
             <p class="howto"><?php echo esc_html($howto); ?></p>
@@ -166,7 +166,7 @@ 
      * @access public
      * @return boolean false Returns false if nonce is not valid.
      */
-    public function saveVisibilityMetabox( $post_id = '' )
+    public function saveVisibilityMetabox($post_id = '')
     {
 
         $public_posts     = Options::getPublicPostsIdentifiers();
@@ -192,29 +192,29 @@ 
         );
 
         // verify taxonomies meta box nonce
-        if (false === $is_valid_visibility_nonce ) {
+        if (false === $is_valid_visibility_nonce) {
             return;
         }
 
-        if (! empty($post_visibility) ) {
-            if (! empty($post_id) ) {
-                if ('public' === $post_visibility ) {
-                    if (! in_array($post_id, $public_posts) ) {
+        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 ) {
-                    unset($public_posts[ array_search($post_id, $public_posts) ]);
+                if ('private' === $post_visibility) {
+                    unset($public_posts[array_search($post_id, $public_posts)]);
                 }
             }
         }
 
-        if (! empty($post_id) ) {
+        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 ) {
+                if (true === $is_valid_visibility_nonce) {
                     update_option('subway_public_post', $posts_implode);
                     update_post_meta(
                         $post_id,
@@ -236,7 +236,7 @@ 
      * @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);
         return;
@@ -252,9 +252,9 @@ 
      * @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,
             );
@@ -275,9 +275,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;
         }
 
@@ -293,23 +293,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 ) ) {
+        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;
             }
         }
@@ -326,12 +326,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;
             }
         }

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