codehaiku / subway-2.0

shortcodes/subway-shortcodes.php

Indentation +7 added lines, -7 removed lines

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

Spacing +17 added lines, -17 removed lines

@@ -11,7 +11,7 @@ 
  */
 namespace Subway;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -19,7 +19,7 @@ 
 
 	private function __construct() {
 		
-		add_action( 'init', array( $this, 'register') );
+		add_action('init', array($this, 'register'));
 		
 		return $this;
 
@@ -29,7 +29,7 @@ 
 		
 		static $instance = null;
 
-		if ( null === $instance ) {
+		if (null === $instance) {
 
 			$instance = new Shortcodes();
 
@@ -42,11 +42,11 @@ 
 
 	function register() {
 
-		add_shortcode( 'subway_login', array( $this, 'wp_login' ) );
+		add_shortcode('subway_login', array($this, 'wp_login'));
 
-		add_action( 'login_form_middle', array( $this, 'login_form_action' ), 10, 2 );
+		add_action('login_form_middle', array($this, 'login_form_action'), 10, 2);
 
-		add_action( 'login_form_middle', array( $this, '__action_lost_password_link' ), 10, 2 );
+		add_action('login_form_middle', array($this, '__action_lost_password_link'), 10, 2);
 
 		return null;
 
@@ -56,26 +56,26 @@ 
 		
 		$atts = array();
 
-		echo $this->get_template_file( $atts, $file = 'login-form.php', $content = null );
+		echo $this->get_template_file($atts, $file = 'login-form.php', $content = null);
 
 		return;
 	}
 
-	protected function get_template_file( $atts, $file = '', $content = null ) {
+	protected function get_template_file($atts, $file = '', $content = null) {
 
 		ob_start();
 
-		if ( empty( $file ) ) {
+		if (empty($file)) {
 			
 			return;
 
 		}
 
-		$template = SUBWAY_DIR_PATH . 'templates/'.$file;
+		$template = SUBWAY_DIR_PATH . 'templates/' . $file;
 
-		if ( file_exists( $template ) ) {
+		if (file_exists($template)) {
 
-			if ( $theme_template = locate_template( array('gears/shortcodes/'.$file ) ) ) {
+			if ($theme_template = locate_template(array('gears/shortcodes/' . $file))) {
 
 	        	$template = $theme_template;
 
@@ -85,26 +85,26 @@ 
 
     	} else {
 
-	    	echo sprintf( esc_html_e( 'Subway Error: Unable to find template file in: %1s', 'subway' ), $template );
+	    	echo sprintf(esc_html_e('Subway Error: Unable to find template file in: %1s', 'subway'), $template);
 
 	    }
 
 	    return ob_get_clean();
 	}
 
-	public function login_form_action( $__content ) {
+	public function login_form_action($__content) {
 
 		ob_start();
 		
-		do_action( 'login_form' );
+		do_action('login_form');
 		
 		return $__content . ob_get_clean();
 
 	}
 
-	public function __action_lost_password_link( $__content ) {
+	public function __action_lost_password_link($__content) {
 		
-		return $__content . $this->get_template_file( $params = array(),  $file = 'login-form-lost-password.php',  $content = null );
+		return $__content . $this->get_template_file($params = array(), $file = 'login-form-lost-password.php', $content = null);
 
 	}
 

classes/subway-enqueue.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
  */
 namespace Subway;
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
    return;
 }
 
@@ -19,13 +19,13 @@ 
 	
 	public static function register_js() {
 
-   		wp_enqueue_style( 'subway-style', SUBWAY_DIR_URL . 'assets/css/subway.css' );
+   		wp_enqueue_style('subway-style', SUBWAY_DIR_URL . 'assets/css/subway.css');
 
-   		wp_enqueue_script( 'subway-script', SUBWAY_DIR_URL . 'assets/js/subway.js', array('jquery') );
+   		wp_enqueue_script('subway-script', SUBWAY_DIR_URL . 'assets/js/subway.js', array('jquery'));
 
-   		wp_localize_script( 'subway-script', 'subway_config', array( 
-   				'ajax_url' => admin_url( 'admin-ajax.php' ),
-   				'login_http_error' => esc_html__( 'An error occured while transmitting the data. Refresh the page and try again', 'subway' )
+   		wp_localize_script('subway-script', 'subway_config', array( 
+   				'ajax_url' => admin_url('admin-ajax.php'),
+   				'login_http_error' => esc_html__('An error occured while transmitting the data. Refresh the page and try again', 'subway')
    			)
    		);
 

i18.php

Spacing +3 added lines, -3 removed lines

@@ -10,14 +10,14 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
 /**
  * Plugin i18n.
  */
-add_action( 'plugins_loaded', 'subway_localize_plugin' );
+add_action('plugins_loaded', 'subway_localize_plugin');
 
 /**
  * Subway l10n callback.
@@ -28,7 +28,7 @@ 
 
 	$rel_path = SUBWAY_DIR_PATH . 'languages';
 
-	load_plugin_textdomain( 'subway', false, $rel_path );
+	load_plugin_textdomain('subway', false, $rel_path);
 
 	return;
 }
\ No newline at end of file

templates/login-form-lost-password.php

Spacing +3 added lines, -3 removed lines

@@ -10,12 +10,12 @@
  * @package Subway
  */
 
-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>

admin-settings.php

Indentation +52 added lines, -52 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-    return;
+	return;
 }
 
 add_action( 'admin_menu', 'subway_admin_menu' );
@@ -24,9 +24,9 @@ 
  */
 function subway_admin_menu() {
     
-    add_options_page( 'Subway Settings', 'Subway', 'manage_options', 'subway', 'subway_options_page' );
+	add_options_page( 'Subway Settings', 'Subway', 'manage_options', 'subway', 'subway_options_page' );
 
-    return;
+	return;
 }
 
 
@@ -35,64 +35,64 @@ 
 	// Register our settings section.
 	add_settings_section( 'subway-page-visibility-section', __( 'Pages Visibility', 'subway' ), 'subway_section_cb', 'subway-settings-section' );
 
-    // Register Redirect Options pages.
+	// Register Redirect Options pages.
 	add_settings_section( 'subway-redirect-section', __( 'Redirect Options', 'subway' ), 'subway_redirect_cb', 'subway-settings-section' );
 
 	// Register the fields.
-    $fields = array(
-    		array(
-    				'id' => 'subway_is_public',
-    				'label' => __( 'Public Website', 'subway' ),
-    				'callback' => 'subway_is_public_form',
-    				'section' => 'subway-settings-section',
-    				'group' => 'subway-page-visibility-section'
-    			),
+	$fields = array(
+			array(
+					'id' => 'subway_is_public',
+					'label' => __( 'Public Website', 'subway' ),
+					'callback' => 'subway_is_public_form',
+					'section' => 'subway-settings-section',
+					'group' => 'subway-page-visibility-section'
+				),
     		
-    		array(
-    				'id' => 'subway_login_page',
-    				'label' => __( 'Private Login Page', 'subway' ),
-    				'callback' => 'subway_login_page_form',
-    				'section' => 'subway-settings-section',
-    				'group' => 'subway-page-visibility-section'
-    			),
-    		array(
-    				'id' => 'subway_public_post',
-    				'label' => __( 'Public Posts IDs', 'subway' ),
-    				'callback' => 'subway_public_post',
-    				'section' => 'subway-settings-section',
-    				'group' => 'subway-page-visibility-section'
-    			),
+			array(
+					'id' => 'subway_login_page',
+					'label' => __( 'Private Login Page', 'subway' ),
+					'callback' => 'subway_login_page_form',
+					'section' => 'subway-settings-section',
+					'group' => 'subway-page-visibility-section'
+				),
+			array(
+					'id' => 'subway_public_post',
+					'label' => __( 'Public Posts IDs', 'subway' ),
+					'callback' => 'subway_public_post',
+					'section' => 'subway-settings-section',
+					'group' => 'subway-page-visibility-section'
+				),
     	
-    		array(
-    				'id' => 'subway_redirect_type',
-    				'label' => __( 'Redirect Type', 'subway' ),
-    				'callback' => 'subway_redirect_option_form',
-    				'section' => 'subway-settings-section',
-    				'group' => 'subway-redirect-section'
-    			),
-    		array(
-    				'id' => 'subway_redirect_wp_admin',
-    				'label' => __( 'Block <em>wp-admin</em> Access', 'subway' ),
-    				'callback' => 'subway_lock_wp_admin',
-    				'section' => 'subway-settings-section',
-    				'group' => 'subway-redirect-section'
-    			),
-    	);
-
-    foreach( $fields as $field ) {
-
-    	add_settings_field( $field['id'], $field['label'], $field['callback'], $field['section'], $field['group'] );
-    	register_setting( 'subway-settings-group', $field['id'] );
-    	require_once trailingslashit( SUBWAY_DIR_PATH ) . 'settings-fields/field-' . sanitize_title( str_replace('_','-', $field['callback']) ) . '.php';
-    }
-
-    // Register Redirect Page ID Settings.
+			array(
+					'id' => 'subway_redirect_type',
+					'label' => __( 'Redirect Type', 'subway' ),
+					'callback' => 'subway_redirect_option_form',
+					'section' => 'subway-settings-section',
+					'group' => 'subway-redirect-section'
+				),
+			array(
+					'id' => 'subway_redirect_wp_admin',
+					'label' => __( 'Block <em>wp-admin</em> Access', 'subway' ),
+					'callback' => 'subway_lock_wp_admin',
+					'section' => 'subway-settings-section',
+					'group' => 'subway-redirect-section'
+				),
+		);
+
+	foreach( $fields as $field ) {
+
+		add_settings_field( $field['id'], $field['label'], $field['callback'], $field['section'], $field['group'] );
+		register_setting( 'subway-settings-group', $field['id'] );
+		require_once trailingslashit( SUBWAY_DIR_PATH ) . 'settings-fields/field-' . sanitize_title( str_replace('_','-', $field['callback']) ) . '.php';
+	}
+
+	// Register Redirect Page ID Settings.
 	register_setting( 'subway-settings-group', 'subway_redirect_page_id' );
 
-    // Register Redirect Custom URL Settings.
+	// Register Redirect Custom URL Settings.
 	register_setting( 'subway-settings-group', 'subway_redirect_custom_url' );
 
-    return;
+	return;
 }
 
 function subway_section_cb() {

Spacing +19 added lines, -19 removed lines

@@ -10,13 +10,13 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     return;
 }
 
-add_action( 'admin_menu', 'subway_admin_menu' );
+add_action('admin_menu', 'subway_admin_menu');
 
-add_action( 'admin_init', 'subway_register_settings' );
+add_action('admin_init', 'subway_register_settings');
 
 /**
  * Display 'Subway' link under 'Settings'
@@ -24,7 +24,7 @@ 
  */
 function subway_admin_menu() {
     
-    add_options_page( 'Subway Settings', 'Subway', 'manage_options', 'subway', 'subway_options_page' );
+    add_options_page('Subway Settings', 'Subway', 'manage_options', 'subway', 'subway_options_page');
 
     return;
 }
@@ -33,16 +33,16 @@ 
 function subway_register_settings() {
 
 	// Register our settings section.
-	add_settings_section( 'subway-page-visibility-section', __( 'Pages Visibility', 'subway' ), 'subway_section_cb', 'subway-settings-section' );
+	add_settings_section('subway-page-visibility-section', __('Pages Visibility', 'subway'), 'subway_section_cb', 'subway-settings-section');
 
     // Register Redirect Options pages.
-	add_settings_section( 'subway-redirect-section', __( 'Redirect Options', 'subway' ), 'subway_redirect_cb', 'subway-settings-section' );
+	add_settings_section('subway-redirect-section', __('Redirect Options', 'subway'), 'subway_redirect_cb', 'subway-settings-section');
 
 	// Register the fields.
     $fields = array(
     		array(
     				'id' => 'subway_is_public',
-    				'label' => __( 'Public Website', 'subway' ),
+    				'label' => __('Public Website', 'subway'),
     				'callback' => 'subway_is_public_form',
     				'section' => 'subway-settings-section',
     				'group' => 'subway-page-visibility-section'
@@ -50,14 +50,14 @@ 
     		
     		array(
     				'id' => 'subway_login_page',
-    				'label' => __( 'Private Login Page', 'subway' ),
+    				'label' => __('Private Login Page', 'subway'),
     				'callback' => 'subway_login_page_form',
     				'section' => 'subway-settings-section',
     				'group' => 'subway-page-visibility-section'
     			),
     		array(
     				'id' => 'subway_public_post',
-    				'label' => __( 'Public Posts IDs', 'subway' ),
+    				'label' => __('Public Posts IDs', 'subway'),
     				'callback' => 'subway_public_post',
     				'section' => 'subway-settings-section',
     				'group' => 'subway-page-visibility-section'
@@ -65,32 +65,32 @@ 
     	
     		array(
     				'id' => 'subway_redirect_type',
-    				'label' => __( 'Redirect Type', 'subway' ),
+    				'label' => __('Redirect Type', 'subway'),
     				'callback' => 'subway_redirect_option_form',
     				'section' => 'subway-settings-section',
     				'group' => 'subway-redirect-section'
     			),
     		array(
     				'id' => 'subway_redirect_wp_admin',
-    				'label' => __( 'Block <em>wp-admin</em> Access', 'subway' ),
+    				'label' => __('Block <em>wp-admin</em> Access', 'subway'),
     				'callback' => 'subway_lock_wp_admin',
     				'section' => 'subway-settings-section',
     				'group' => 'subway-redirect-section'
     			),
     	);
 
-    foreach( $fields as $field ) {
+    foreach ($fields as $field) {
 
-    	add_settings_field( $field['id'], $field['label'], $field['callback'], $field['section'], $field['group'] );
-    	register_setting( 'subway-settings-group', $field['id'] );
-    	require_once trailingslashit( SUBWAY_DIR_PATH ) . 'settings-fields/field-' . sanitize_title( str_replace('_','-', $field['callback']) ) . '.php';
+    	add_settings_field($field['id'], $field['label'], $field['callback'], $field['section'], $field['group']);
+    	register_setting('subway-settings-group', $field['id']);
+    	require_once trailingslashit(SUBWAY_DIR_PATH) . 'settings-fields/field-' . sanitize_title(str_replace('_', '-', $field['callback'])) . '.php';
     }
 
     // Register Redirect Page ID Settings.
-	register_setting( 'subway-settings-group', 'subway_redirect_page_id' );
+	register_setting('subway-settings-group', 'subway_redirect_page_id');
 
     // Register Redirect Custom URL Settings.
-	register_setting( 'subway-settings-group', 'subway_redirect_custom_url' );
+	register_setting('subway-settings-group', 'subway_redirect_custom_url');
 
     return;
 }
@@ -110,8 +110,8 @@ 
         	<?php esc_html_e('Subway Settings', 'subway'); ?>
         </h2>
         <form id="subway-settings-form" action="options.php" method="POST">
-            <?php settings_fields( 'subway-settings-group' ); ?>
-            <?php do_settings_sections( 'subway-settings-section' ); ?>
+            <?php settings_fields('subway-settings-group'); ?>
+            <?php do_settings_sections('subway-settings-section'); ?>
             <?php submit_button(); ?>
         </form>
     </div>

settings-fields/field-subway-login-page-form.php

Spacing +11 added lines, -11 removed lines

@@ -10,7 +10,7 @@ 
  * @package Subway
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	return;
 }
 
@@ -21,24 +21,24 @@ 
  */
 function subway_login_page_form() {
 
-	$subway_login_page_id = intval( get_option( 'subway_login_page' ) );
+	$subway_login_page_id = intval(get_option('subway_login_page'));
 
-	if ( ! empty( $subway_login_page_id ) ) {
+	if ( ! empty($subway_login_page_id)) {
 
-		$login_page_object = get_post( $subway_login_page_id );
+		$login_page_object = get_post($subway_login_page_id);
 
-		if ( ! empty( $login_page_object )  && isset( $login_page_object->post_content ) ) {
+		if ( ! empty($login_page_object) && isset($login_page_object->post_content)) {
 
 			// Automatically prepend the login shortcode if no
 			// Shortcode exists in the selected login page.
-			if ( ! has_shortcode( $login_page_object->post_content, 'subway_login' ) ) {
+			if ( ! has_shortcode($login_page_object->post_content, 'subway_login')) {
 
 				$new_post_object = array(
 				  'ID' => $login_page_object->ID,
-				  'post_content' => '[subway_login] ' . $login_page_object->post_content,// Prepend Only.
+				  'post_content' => '[subway_login] ' . $login_page_object->post_content, // Prepend Only.
 				 );
 
-				wp_update_post( $new_post_object );
+				wp_update_post($new_post_object);
 			}
 		}
 	}
@@ -46,12 +46,12 @@ 
 	wp_dropdown_pages(
 		array(
 		'name' => 'subway_login_page',
-		'selected' => intval( $subway_login_page_id ),
-		'show_option_none' => esc_html__( '---', 'subway' ),
+		'selected' => intval($subway_login_page_id),
+		'show_option_none' => esc_html__('---', 'subway'),
 		)
 	);
 
-	echo '<p class="description">' . sprintf( esc_html__( 'Select a login page and save the changes to make your site private. Leave blank to make your site public. %1$s.', 'subway' ), '<span style="font-weight: bold; color: #ad4a4a;">' . esc_html__( 'You need to add "[subway_login]" shortcode in the selected page to show the login form (this is done automatically)', 'subway' ) ) . '</span></p>';
+	echo '<p class="description">' . sprintf(esc_html__('Select a login page and save the changes to make your site private. Leave blank to make your site public. %1$s.', 'subway'), '<span style="font-weight: bold; color: #ad4a4a;">' . esc_html__('You need to add "[subway_login]" shortcode in the selected page to show the login form (this is done automatically)', 'subway')) . '</span></p>';
 
 	return;
 }