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

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;
 

settings-fields/field-subway-redirect-option-form.php

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -26,9 +26,9 @@ 
 		<!-- Page -->
 		<label for="subway_use_page">
 
-			<input <?php checked( 'page', get_option( 'subway_redirect_type' ), true ); ?> value="page" name="subway_redirect_type" id="subway_use_page" type="radio" class="code" />
+			<input <?php checked('page', get_option('subway_redirect_type'), true); ?> value="page" name="subway_redirect_type" id="subway_use_page" type="radio" class="code" />
 
-			<?php esc_html_e( 'Custom Page', 'subway' ); ?>
+			<?php esc_html_e('Custom Page', 'subway'); ?>
 
 		</label>
 
@@ -36,9 +36,9 @@ 
 
 		<label for="subway_use_custom_url">
 
-			<input <?php checked( 'custom_url', get_option( 'subway_redirect_type' ), true ); ?> value="custom_url" name="subway_redirect_type" id="subway_use_custom_url" type="radio" class="code" />
+			<input <?php checked('custom_url', get_option('subway_redirect_type'), true); ?> value="custom_url" name="subway_redirect_type" id="subway_use_custom_url" type="radio" class="code" />
 
-			<?php esc_html_e( 'Custom URL', 'subway' ); ?>
+			<?php esc_html_e('Custom URL', 'subway'); ?>
 
 		</label>
 
@@ -46,9 +46,9 @@ 
 
 		<label for="subway_use_default">
 
-			<input <?php checked( 'default', get_option( 'subway_redirect_type' ), true ); ?> value="default" name="subway_redirect_type" id="subway_use_default" type="radio" class="code" />
+			<input <?php checked('default', get_option('subway_redirect_type'), true); ?> value="default" name="subway_redirect_type" id="subway_use_default" type="radio" class="code" />
 
-			<?php esc_html_e( 'Default Behavior', 'subway' ); ?>
+			<?php esc_html_e('Default Behavior', 'subway'); ?>
 
 		</label>
 
@@ -64,7 +64,7 @@ 
 	<div id="subway_redirect_page_option_section" class="hidden subway-redirect-option-section">
 
 		<label for="subway_redirect_page_id">
-			<?php esc_html_e( 'Select Page' ); ?>
+			<?php esc_html_e('Select Page'); ?>
 		</label>
 
 		<?php
@@ -72,8 +72,8 @@ 
 			wp_dropdown_pages(
 				array(
 						'name' => 'subway_redirect_page_id',
-						'selected' => intval( get_option( 'subway_redirect_page_id' ) ),
-						'show_option_none' => esc_html__( '-', 'subway' ),
+						'selected' => intval(get_option('subway_redirect_page_id')),
+						'show_option_none' => esc_html__('-', 'subway'),
 				)
 			);
 
@@ -81,7 +81,7 @@ 
 
 		<p class="description">
 
-			<?php _e( 'The selected page will be used as the redirect endpoint for all of your users. Selecting blank (-) will redirect the user to the default redirect defined in WordPress or other plugins. Choose "Custom URL" if you want to redirect to a custom URL or domain.', 'subway' ); ?>
+			<?php _e('The selected page will be used as the redirect endpoint for all of your users. Selecting blank (-) will redirect the user to the default redirect defined in WordPress or other plugins. Choose "Custom URL" if you want to redirect to a custom URL or domain.', 'subway'); ?>
 
 		</p>
 
@@ -90,29 +90,29 @@ 
 	<div id="subway_redirect_custom_url_option_section" class="hidden subway-redirect-option-section">
 
 		<label for="subway_redirect_custom_url">
-			<?php esc_attr_e( 'Enter Redirect URL:', 'subway' ); ?>
+			<?php esc_attr_e('Enter Redirect URL:', 'subway'); ?>
 		</label>
 
-		<input value="<?php echo esc_attr( esc_url( get_option( 'subway_redirect_custom_url' ) ) ); ?>" type="text" name="subway_redirect_custom_url" placeholder="<?php esc_attr_e( 'http://', 'subway' ); ?>"
+		<input value="<?php echo esc_attr(esc_url(get_option('subway_redirect_custom_url'))); ?>" type="text" name="subway_redirect_custom_url" placeholder="<?php esc_attr_e('http://', 'subway'); ?>"
 		id="subway_redirect_custom_url" size="75" />
 
 		<p class="description"><br>
 
 		<?php
-			echo sprintf( __( 'When entering a custom domain, you can use a variable string such us: %1$s and %2$s. For example, http://yoursiteurl.com/members/<strong>%2$s</strong> will translate to http://yoursiteurl/members/<strong>admin</strong> where "admin" is equal to the %2$s variable; http://yoursiteurl.com/users/<strong>%1$s</strong> will translate to http://yoursiteurl.com/users/<strong>4</strong> where "4" is equal to the %1$s. Both variables refer to the current user that is logged-in.', 'subway' ), '%user_id%', '%user_name%' );
+			echo sprintf(__('When entering a custom domain, you can use a variable string such us: %1$s and %2$s. For example, http://yoursiteurl.com/members/<strong>%2$s</strong> will translate to http://yoursiteurl/members/<strong>admin</strong> where "admin" is equal to the %2$s variable; http://yoursiteurl.com/users/<strong>%1$s</strong> will translate to http://yoursiteurl.com/users/<strong>4</strong> where "4" is equal to the %1$s. Both variables refer to the current user that is logged-in.', 'subway'), '%user_id%', '%user_name%');
 		?>
 
 		</p><br>
 
 		<p class="description">
 
-			<?php esc_attr_e( 'Leave empty to use existing WordPress or other 3rd party plugin redirect option.', 'subway' ); ?>
+			<?php esc_attr_e('Leave empty to use existing WordPress or other 3rd party plugin redirect option.', 'subway'); ?>
 
 		</p><br>
 
 		<p class="description">
 
-			<?php esc_html_e( 'Warning: External URLs are not supported by WordPress Function (wp_safe_redirect) and will be redirected back to default WordPress behavior.', 'subway' ); ?>
+			<?php esc_html_e('Warning: External URLs are not supported by WordPress Function (wp_safe_redirect) and will be redirected back to default WordPress behavior.', 'subway'); ?>
 
 		</p>
 
@@ -122,7 +122,7 @@ 
 	<div id="subway_redirect_default_option_section" class="hidden subway-redirect-option-section">
 		<p>
 			<?php
-				esc_html_e( "By choosing the default behavior, the redirect type will be set to the default WordPress' behavior. For example, if you have plugins like Peter's Login Redirect. This option will disable Subway's redirect and use the Peter's Login Redirect Instead.", 'subway' );
+				esc_html_e("By choosing the default behavior, the redirect type will be set to the default WordPress' behavior. For example, if you have plugins like Peter's Login Redirect. This option will disable Subway's redirect and use the Peter's Login Redirect Instead.", 'subway');
 			?>
 		</p>
 	</div>

settings-fields/field-subway-public-post.php

Spacing +4 added lines, -4 removed lines

@@ -10,16 +10,16 @@
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
 function subway_public_post() {
 
-	echo '<textarea id="subway_public_post" name="subway_public_post_deprecated" rows="5" cols="95" readonly="readonly">' . esc_attr( trim( get_option( 'subway_public_post' ) ) ) . '</textarea>';
+	echo '<textarea id="subway_public_post" name="subway_public_post_deprecated" rows="5" cols="95" readonly="readonly">' . esc_attr(trim(get_option('subway_public_post'))) . '</textarea>';
 
-	echo '<p class="description">' . nl2br( esc_html( "Enter the IDs of posts and pages that you wanted to show in public. You need to separate it by ',' (comma),  for example: 143,123,213. Alternatively, you can enable public viewing of all of your pages and posts by checking the 'Public Website' option above.", 'subway' ) );
-	echo '<span class="subway-settings-notice">' . nl2br( esc_html( ' This setting is now disabled on Subway 2.0.9 and future versions. To make your post/page private, go to your individual post/page and check the "Subway: Visibility Option" checkbox.', 'subway' ) ) . '</span>' . '</p>';
+	echo '<p class="description">' . nl2br(esc_html("Enter the IDs of posts and pages that you wanted to show in public. You need to separate it by ',' (comma),  for example: 143,123,213. Alternatively, you can enable public viewing of all of your pages and posts by checking the 'Public Website' option above.", 'subway'));
+	echo '<span class="subway-settings-notice">' . nl2br(esc_html(' This setting is now disabled on Subway 2.0.9 and future versions. To make your post/page private, go to your individual post/page and check the "Subway: Visibility Option" checkbox.', 'subway')) . '</span>' . '</p>';
 
 	return;
 

subway.php

Spacing +15 added lines, -15 removed lines

@@ -31,13 +31,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
 	 *
@@ -48,10 +48,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>
@@ -60,13 +60,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';
@@ -96,23 +96,23 @@ 
 require_once SUBWAY_DIR_PATH . 'shortcodes/subway-shortcodes.php';
 
 // Redirect (302) all front-end request to the login page.
-add_action( 'wp', array( 'Subway\PageRedirect', 'index' ) );
+add_action('wp', array('Subway\PageRedirect', 'index'));
 
 // Redirect (302) invalid login request to the login page.
-add_action( 'wp_ajax_nopriv_subway_logging_in', array( 'Subway\AuthRedirect', 'handleAuthentication' ) );
+add_action('wp_ajax_nopriv_subway_logging_in', array('Subway\AuthRedirect', 'handleAuthentication'));
 
 // Load our JS and CSS files.
-add_action( 'wp_enqueue_scripts', array( 'Subway\Enqueue', 'registerJs' ) );
+add_action('wp_enqueue_scripts', array('Subway\Enqueue', 'registerJs'));
 
 // Change the default login url to our sign-in page.
-add_filter( 'login_url', array( 'Subway\AuthRedirect', 'loginUrl' ), 10, 3 );
+add_filter('login_url', array('Subway\AuthRedirect', 'loginUrl'), 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\AuthRedirect', 'getLoginRedirectUrl' ), 10, 3 );
+add_filter('login_redirect', array('Subway\AuthRedirect', 'getLoginRedirectUrl'), 10, 3);
 
 // Change the default logout url to our sign-in page.
-add_action( 'wp_logout', array( 'Subway\AuthRedirect', 'logoutUrl' ), 10, 3 );
+add_action('wp_logout', array('Subway\AuthRedirect', 'logoutUrl'), 10, 3);
 
 // Adds the Subvway metabox.
-add_action( 'plugins_loaded', array( 'Subway\Metabox', 'initMetabox' ) );
+add_action('plugins_loaded', array('Subway\Metabox', 'initMetabox'));

admin-settings.php

Spacing +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 
 namespace Subway;
 
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
@@ -42,9 +42,9 @@ 
     public function __construct()
     {
 
-        add_action('admin_menu', array( $this, 'adminMenu' ));
+        add_action('admin_menu', array($this, 'adminMenu'));
 
-        add_action('admin_init', array( $this, 'registerSettings' ));
+        add_action('admin_init', array($this, 'registerSettings'));
 
     }
 
@@ -58,10 +58,10 @@ 
 
         add_options_page(
             'Subway Settings', 'Subway', 'manage_options',
-            'subway', array( $this, 'optionsPage' )
+            'subway', array($this, 'optionsPage')
         );
 
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueueSettingsScripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'enqueueSettingsScripts'));
 
         return;
     }
@@ -77,19 +77,19 @@ 
         // Register our settings section.
         add_settings_section(
             'subway-page-visibility-section', __('Pages Visibility', 'subway'),
-            array( $this, 'sectionCallback' ), 'subway-settings-section'
+            array($this, 'sectionCallback'), 'subway-settings-section'
         );
 
         // Register Redirect Options pages.
         add_settings_section(
             'subway-redirect-section', __('Redirect Options', 'subway'),
-            array( $this, 'redirectCallback' ), 'subway-settings-section'
+            array($this, 'redirectCallback'), 'subway-settings-section'
         );
 
 		$is_public_site = Options::isPublicSite();
 		$hidden_class = '';
 
-		if ( $is_public_site ) {
+		if ($is_public_site) {
 			$hidden_class = 'hidden';
 		}
 
@@ -154,7 +154,7 @@ 
             ),
         );
 
-        foreach ( $fields as $field ) {
+        foreach ($fields as $field) {
 
             add_settings_field(
                 $field['id'], $field['label'],
@@ -239,8 +239,8 @@ 
 	public function registerSettingsScripts() {
 
 		// Registers the Subway settings Javascript.
-	    wp_register_script( 'subway-settings-script', plugins_url('/assets/js/settings.js', __FILE__) );
-	    wp_register_style( 'subway-settings-style', plugins_url('/assets/css/settings.css', __FILE__) );
+	    wp_register_script('subway-settings-script', plugins_url('/assets/js/settings.js', __FILE__));
+	    wp_register_style('subway-settings-style', plugins_url('/assets/css/settings.css', __FILE__));
 	 }
 
 	/**
@@ -251,12 +251,12 @@ 
      * @return void
      * @return void
      */
-	public function enqueueSettingsScripts( $hook ) {
+	public function enqueueSettingsScripts($hook) {
 		// Checks if page hook is Subway settings page.
-		if ( 'settings_page_subway' === $hook ) {
+		if ('settings_page_subway' === $hook) {
 			// Enqueues the script only on the Subway Settings page.
-			wp_enqueue_script( 'subway-settings-script' );
-			wp_enqueue_style( 'subway-settings-style' );
+			wp_enqueue_script('subway-settings-script');
+			wp_enqueue_style('subway-settings-style');
 		}
 	}
 }