codehaiku / subway-2.0

classes/subway-metabox.php

Spacing +88 added lines, -88 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,43 +224,43 @@ 
 			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 ) {
-					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 ) ) {
-			$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,
@@ -280,9 +280,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;
 	}
 
@@ -296,16 +296,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;
 	}
@@ -319,9 +319,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;
 		}
 
@@ -337,23 +337,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;
 			}
 		}
@@ -370,12 +370,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;
 			}
 		}
@@ -389,17 +389,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;
@@ -421,28 +421,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;
 			}
 		}
@@ -456,30 +456,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;
 					}
 				}

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>