codehaiku / subway-2.0

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

Spacing +79 added lines, -79 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,64 +106,64 @@ 
 	 * @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
 		?>
 		
-		<?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>
@@ -180,11 +180,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. Make your site private so that you can select visibility options.', 'subway' ); ?>
+				<?php esc_html_e('You have chosen to make your site public inside Settings > Subway. Make your site private so that you can select visibility options.', 'subway'); ?>
 			</em>
 			</p>
 		<?php endif; ?>
@@ -200,7 +200,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();
 
@@ -214,7 +214,7 @@ 
 		);
 
 		$post_visibility = filter_input(
-			INPUT_POST,  $visibility_field,
+			INPUT_POST, $visibility_field,
 			FILTER_SANITIZE_STRING
 		);
 
@@ -222,39 +222,39 @@ 
 			$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,
@@ -274,9 +274,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;
 	}
 
@@ -290,16 +290,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;
 	}
@@ -313,9 +313,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;
 		}
 
@@ -331,23 +331,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;
 			}
 		}
@@ -364,12 +364,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;
 			}
 		}
@@ -383,14 +383,14 @@ 
 	 * @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 ( 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 ) ) {
+		if ( ! empty($post_id)) {
+			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)) {
 					return $allowed_roles;
 				} else {
 					return false;
@@ -409,38 +409,38 @@ 
 	 * @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()) {
 
 			$user = wp_get_current_user();
 
-			if ( ! is_array( $user->roles ) ) {
+			if ( ! is_array($user->roles)) {
 				$user->roles = (array) $user->roles;
 			}
 
-			$current_user_role = end( $user->roles );
+			$current_user_role = end($user->roles);
 
-			$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 ( is_array( $allowed_user_roles ) ) {
-					if ( ! in_array( $current_user_role, $allowed_user_roles ) ) {
+			if ( ! current_user_can('manage_options')) {
+				if (is_array($allowed_user_roles)) {
+					if ( ! in_array($current_user_role, $allowed_user_roles)) {
 						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;
 			}
 		}

Braces +5 added lines, -2 removed lines

@@ -181,10 +181,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. Make your site private so that you can select visibility options.', 'subway' ); ?>
+				<?php esc_html_e( 'You have chosen to make your site public inside Settings > Subway. Make your site private so that you can select visibility options.', 'subway' );
+}
+?>
 			</em>
 			</p>
 		<?php endif; ?>

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(