Passed
Push — master ( de9053...dd54b3 )
by Joseph
02:23
created
admin-settings.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 namespace Subway;
21 21
 
22
-if (! defined('ABSPATH') ) {
22
+if ( ! defined('ABSPATH')) {
23 23
     return;
24 24
 }
25 25
 
@@ -42,9 +42,9 @@  discard block
 block discarded – undo
42 42
     public function __construct()
43 43
     {
44 44
 
45
-        add_action('admin_menu', array( $this, 'adminMenu' ));
45
+        add_action('admin_menu', array($this, 'adminMenu'));
46 46
 
47
-        add_action('admin_init', array( $this, 'registerSettings' ));
47
+        add_action('admin_init', array($this, 'registerSettings'));
48 48
 
49 49
     }
50 50
 
@@ -58,10 +58,10 @@  discard block
 block discarded – undo
58 58
 
59 59
         add_options_page(
60 60
             'Subway Settings', 'Subway', 'manage_options',
61
-            'subway', array( $this, 'optionsPage' )
61
+            'subway', array($this, 'optionsPage')
62 62
         );
63 63
 
64
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueueSettingsScripts' ) );
64
+		add_action('admin_enqueue_scripts', array($this, 'enqueueSettingsScripts'));
65 65
 
66 66
         return;
67 67
     }
@@ -77,19 +77,19 @@  discard block
 block discarded – undo
77 77
         // Register our settings section.
78 78
         add_settings_section(
79 79
             'subway-page-visibility-section', __('Pages Visibility', 'subway'),
80
-            array( $this, 'sectionCallback' ), 'subway-settings-section'
80
+            array($this, 'sectionCallback'), 'subway-settings-section'
81 81
         );
82 82
 
83 83
         // Register Redirect Options pages.
84 84
         add_settings_section(
85 85
             'subway-redirect-section', __('Redirect Options', 'subway'),
86
-            array( $this, 'redirectCallback' ), 'subway-settings-section'
86
+            array($this, 'redirectCallback'), 'subway-settings-section'
87 87
         );
88 88
 
89 89
 		$is_public_site = Options::isPublicSite();
90 90
 		$hidden_class = '';
91 91
 
92
-		if ( $is_public_site ) {
92
+		if ($is_public_site) {
93 93
 			$hidden_class = 'hidden';
94 94
 		}
95 95
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
             ),
155 155
         );
156 156
 
157
-        foreach ( $fields as $field ) {
157
+        foreach ($fields as $field) {
158 158
 
159 159
             add_settings_field(
160 160
                 $field['id'], $field['label'],
@@ -239,8 +239,8 @@  discard block
 block discarded – undo
239 239
 	public function registerSettingsScripts() {
240 240
 
241 241
 		// Registers the Subway settings Javascript.
242
-	    wp_register_script( 'subway-settings-script', plugins_url('/assets/js/settings.js', __FILE__) );
243
-	    wp_register_style( 'subway-settings-style', plugins_url('/assets/css/settings.css', __FILE__) );
242
+	    wp_register_script('subway-settings-script', plugins_url('/assets/js/settings.js', __FILE__));
243
+	    wp_register_style('subway-settings-style', plugins_url('/assets/css/settings.css', __FILE__));
244 244
 	 }
245 245
 
246 246
 	/**
@@ -251,12 +251,12 @@  discard block
 block discarded – undo
251 251
      * @return void
252 252
      * @return void
253 253
      */
254
-	public function enqueueSettingsScripts( $hook ) {
254
+	public function enqueueSettingsScripts($hook) {
255 255
 		// Checks if page hook is Subway settings page.
256
-		if ( 'settings_page_subway' === $hook ) {
256
+		if ('settings_page_subway' === $hook) {
257 257
 			// Enqueues the script only on the Subway Settings page.
258
-			wp_enqueue_script( 'subway-settings-script' );
259
-			wp_enqueue_style( 'subway-settings-style' );
258
+			wp_enqueue_script('subway-settings-script');
259
+			wp_enqueue_style('subway-settings-style');
260 260
 		}
261 261
 	}
262 262
 }
Please login to merge, or discard this patch.
settings-fields/field-subway-login-page-form.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  * @package Subway
11 11
  */
12 12
 
13
-if ( ! defined( 'ABSPATH' ) ) {
13
+if ( ! defined('ABSPATH')) {
14 14
 	return;
15 15
 }
16 16
 
@@ -21,24 +21,24 @@  discard block
 block discarded – undo
21 21
  */
22 22
 function subway_login_page_form() {
23 23
 
24
-	$subway_login_page_id = intval( get_option( 'subway_login_page' ) );
24
+	$subway_login_page_id = intval(get_option('subway_login_page'));
25 25
 
26
-	if ( ! empty( $subway_login_page_id ) ) {
26
+	if ( ! empty($subway_login_page_id)) {
27 27
 
28
-		$login_page_object = get_post( $subway_login_page_id );
28
+		$login_page_object = get_post($subway_login_page_id);
29 29
 
30
-		if ( ! empty( $login_page_object )  && isset( $login_page_object->post_content ) ) {
30
+		if ( ! empty($login_page_object) && isset($login_page_object->post_content)) {
31 31
 
32 32
 			// Automatically prepend the login shortcode if no
33 33
 			// Shortcode exists in the selected login page.
34
-			if ( ! has_shortcode( $login_page_object->post_content, 'subway_login' ) ) {
34
+			if ( ! has_shortcode($login_page_object->post_content, 'subway_login')) {
35 35
 
36 36
 				$new_post_object = array(
37 37
 				  'ID' => $login_page_object->ID,
38
-				  'post_content' => '[subway_login] ' . $login_page_object->post_content,// Prepend Only.
38
+				  'post_content' => '[subway_login] ' . $login_page_object->post_content, // Prepend Only.
39 39
 				 );
40 40
 
41
-				wp_update_post( $new_post_object );
41
+				wp_update_post($new_post_object);
42 42
 			}
43 43
 		}
44 44
 	}
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
46 46
 	wp_dropdown_pages(
47 47
 		array(
48 48
 		'name' => 'subway_login_page',
49
-		'selected' => intval( $subway_login_page_id ),
50
-		'show_option_none' => esc_html__( '---', 'subway' ),
49
+		'selected' => intval($subway_login_page_id),
50
+		'show_option_none' => esc_html__('---', 'subway'),
51 51
 		)
52 52
 	);
53 53
 
54
-	echo '<p class="description">' . sprintf( esc_html__( 'Select a login page and save the changes to make your site private. Selecting "---" (blank) will make your site public. %1$s.', 'subway' ), '<span class="subway-settings-notice">' . esc_html__( 'You need to add "[subway_login]" shortcode in the selected page to show the login form (this will be done automatically after saving)', 'subway' ) ) . '</span></p>';
54
+	echo '<p class="description">' . sprintf(esc_html__('Select a login page and save the changes to make your site private. Selecting "---" (blank) will make your site public. %1$s.', 'subway'), '<span class="subway-settings-notice">' . esc_html__('You need to add "[subway_login]" shortcode in the selected page to show the login form (this will be done automatically after saving)', 'subway')) . '</span></p>';
55 55
 
56 56
 	return;
57 57
 }
Please login to merge, or discard this patch.
settings-fields/field-subway-is-public-form.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  * @package Subway
11 11
  */
12 12
 
13
-if ( ! defined( 'ABSPATH' ) ) {
13
+if ( ! defined('ABSPATH')) {
14 14
 	return;
15 15
 }
16 16
 
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
  */
22 22
 function subway_is_public_form() {
23 23
 
24
-	echo '<label for="subway_is_public"><input ' . checked( 1, get_option( 'subway_is_public' ), false ) . ' value="1" name="subway_is_public" id="subway_is_public" type="checkbox" class="code" /> Check to make all of your posts and pages visible to public.</label>';
25
-	echo '<p class="description">' . esc_html__( 'Check to ignore all private options and make your site return to its original state (public) without uninstalling Subway. All settings here and in the individual posts or pages will be ignored. Uncheck to make your site accessible to members only', 'subway' ) . '</p>';
24
+	echo '<label for="subway_is_public"><input ' . checked(1, get_option('subway_is_public'), false) . ' value="1" name="subway_is_public" id="subway_is_public" type="checkbox" class="code" /> Check to make all of your posts and pages visible to public.</label>';
25
+	echo '<p class="description">' . esc_html__('Check to ignore all private options and make your site return to its original state (public) without uninstalling Subway. All settings here and in the individual posts or pages will be ignored. Uncheck to make your site accessible to members only', 'subway') . '</p>';
26 26
 
27 27
 	return;
28 28
 }
Please login to merge, or discard this patch.
classes/subway-auth-redirect.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 namespace Subway;
21 21
 
22
-if (! defined('ABSPATH') ) {
22
+if ( ! defined('ABSPATH')) {
23 23
     return;
24 24
 }
25 25
 
@@ -47,13 +47,13 @@  discard block
 block discarded – undo
47 47
         // Set the header type to json.
48 48
         header('Content-Type: application/json');
49 49
 
50
-        $is_signin = new \WP_Error( 'broke', __( 'Unable to authenticate user', "subway" ) );
50
+        $is_signin = new \WP_Error('broke', __('Unable to authenticate user', "subway"));
51 51
 
52 52
         $log = filter_input(INPUT_POST, 'log', FILTER_SANITIZE_STRING);
53 53
 
54 54
         $pwd = filter_input(INPUT_POST, 'pwd', FILTER_SANITIZE_STRING);
55 55
 
56
-        if (empty($log) && empty($pwd) ) {
56
+        if (empty($log) && empty($pwd)) {
57 57
 
58 58
             $response['type'] = 'error';
59 59
 
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
             $response = array();
70 70
 
71
-            if (is_wp_error($is_signin) ) {
71
+            if (is_wp_error($is_signin)) {
72 72
 
73 73
                 $response['type'] = 'error';
74 74
 
@@ -108,24 +108,24 @@  discard block
 block discarded – undo
108 108
      *
109 109
      * @return string             The final redirect url.
110 110
      */
111
-    public static function getLoginRedirectUrl( $redirect_to, $user )
111
+    public static function getLoginRedirectUrl($redirect_to, $user)
112 112
     {
113 113
 
114 114
         $subway_redirect_type = get_option('subway_redirect_type');
115 115
 
116 116
         // Redirect the user to default behaviour.
117 117
         // If there are no redirect type option saved.
118
-        if (empty($subway_redirect_type) ) {
118
+        if (empty($subway_redirect_type)) {
119 119
 
120 120
             return $redirect_to;
121 121
 
122 122
         }
123 123
 
124
-        if ('default' === $subway_redirect_type ) {
124
+        if ('default' === $subway_redirect_type) {
125 125
             return $redirect_to;
126 126
         }
127 127
 
128
-        if ('page' === $subway_redirect_type ) {
128
+        if ('page' === $subway_redirect_type) {
129 129
 
130 130
             // Get the page url of the selected page.
131 131
             // If the admin selected 'Custom Page' in the redirect type settings.
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 
134 134
             // Redirect to default WordPress behaviour.
135 135
             // If the user did not select page.
136
-            if (empty($selected_redirect_page) ) {
136
+            if (empty($selected_redirect_page)) {
137 137
 
138 138
                 return $redirect_to;
139 139
             }
@@ -142,14 +142,14 @@  discard block
 block discarded – undo
142 142
             // and let the user go into that page.
143 143
             return get_permalink($selected_redirect_page);
144 144
 
145
-        } elseif ('custom_url' === $subway_redirect_type ) {
145
+        } elseif ('custom_url' === $subway_redirect_type) {
146 146
 
147 147
             // Get the custom url saved in the redirect type settings.
148 148
             $entered_custom_url = get_option('subway_redirect_custom_url');
149 149
 
150 150
             // Redirect to default WordPress behaviour
151 151
             // if the user did enter a custom url.
152
-            if (empty($entered_custom_url) ) {
152
+            if (empty($entered_custom_url)) {
153 153
 
154 154
                 return $redirect_to;
155 155
 
@@ -157,14 +157,14 @@  discard block
 block discarded – undo
157 157
 
158 158
             // Otherwise, get the custom url saved
159 159
             // and let the user go into that page.
160
-            if (! empty($user->ID) ) {
160
+            if ( ! empty($user->ID)) {
161 161
                 $entered_custom_url = str_replace(
162 162
                     '%user_id%', $user->ID,
163 163
                     $entered_custom_url
164 164
                 );
165 165
             }
166 166
 
167
-            if (! empty($user->user_login) ) {
167
+            if ( ! empty($user->user_login)) {
168 168
                 $entered_custom_url = str_replace(
169 169
                     '%user_name%', $user->user_login,
170 170
                     $entered_custom_url
@@ -186,13 +186,13 @@  discard block
 block discarded – undo
186 186
      *
187 187
      * @return string            The final login url.
188 188
      */
189
-    public static function loginUrl( $login_url  )
189
+    public static function loginUrl($login_url)
190 190
     {
191 191
 
192 192
         $subway_login_page = Options::getRedirectPageUrl();
193 193
 
194 194
         // Return the default login url if there is no log-in page defined.
195
-        if (empty($subway_login_page) ) {
195
+        if (empty($subway_login_page)) {
196 196
             return $login_url;
197 197
         }
198 198
 
Please login to merge, or discard this patch.
classes/subway-page-redirect.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 namespace Subway;
21 21
 
22
-if (! defined('ABSPATH') ) {
22
+if ( ! defined('ABSPATH')) {
23 23
     return;
24 24
 }
25 25
 
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 
47 47
         // Additional filter for custom pages, taxonomy, links, parameterized urls, etc.
48 48
         // Callback function/method must return true (boolean) to disable redirect.
49
-        $should_exit = apply_filters( 'subway/classes/subway-page-redirect/index/before-page-redirect', false );
49
+        $should_exit = apply_filters('subway/classes/subway-page-redirect/index/before-page-redirect', false);
50 50
 
51
-        if ( $should_exit ) {
51
+        if ($should_exit) {
52 52
             return;
53 53
         }
54 54
 
55 55
         // Only execute for non logged in users.
56
-        if (is_user_logged_in() ) {
56
+        if (is_user_logged_in()) {
57 57
             return;
58 58
         }
59 59
         
@@ -70,51 +70,51 @@  discard block
 block discarded – undo
70 70
         // Already escaped inside 'subway_get_redirect_page_url'.
71 71
         $redirect_page = Options::getRedirectPageUrl(); // WPCS XSS OK.
72 72
 
73
-        if ( !empty( $current_post ) ) {
74
-		  $is_private = Metabox::isPostPrivate( $current_post->ID );
73
+        if ( ! empty($current_post)) {
74
+		  $is_private = Metabox::isPostPrivate($current_post->ID);
75 75
         }
76 76
 
77 77
         // do_action( 'subway/classes/subway-page-redirect/index/before_page_redirect' );
78 78
 
79 79
         // Turn off if is in 'wc-ajax' (woocommerce)
80
-        if ( function_exists( 'is_ajax') ) {
81
-            if ( is_ajax() ) {
80
+        if (function_exists('is_ajax')) {
81
+            if (is_ajax()) {
82 82
                return;
83 83
             }
84 84
         }
85 85
 
86 86
         // Same for normal ajax requests.
87
-        if ( is_admin() && defined( 'DOING_AJAX' ) && DOING_AJAX  ) {
87
+        if (is_admin() && defined('DOING_AJAX') && DOING_AJAX) {
88 88
             return;
89 89
         }
90 90
 
91 91
         // Exit if site is public.
92
-        if ( Options::isPublicSite() ) {
92
+        if (Options::isPublicSite()) {
93 93
             return;
94 94
         }
95 95
 
96 96
         // Check if redirect page is empty or not.
97
-        if ( empty( $redirect_page ) ) {
97
+        if (empty($redirect_page)) {
98 98
             return;
99 99
         }
100 100
 
101 101
         // Check if buddypress activate page.
102
-        if (function_exists('bp_is_activation_page') ) {
103
-            if (bp_is_activation_page() ) {
102
+        if (function_exists('bp_is_activation_page')) {
103
+            if (bp_is_activation_page()) {
104 104
                 return;
105 105
             }
106 106
         }
107 107
 
108 108
         // Check if buddypress registration page.
109
-        if (function_exists('bp_is_register_page') ) {
110
-            if (bp_is_register_page() ) {
109
+        if (function_exists('bp_is_register_page')) {
110
+            if (bp_is_register_page()) {
111 111
                 return;
112 112
             }
113 113
         }
114 114
 
115 115
         // Assign 0 value to empty $post->ID to prevent exception.
116 116
         // This applies to custom WordPress pages such as BP Members Page and Groups.
117
-        if (empty($current_post) ) {
117
+        if (empty($current_post)) {
118 118
             $current_post = new \stdclass;
119 119
             $current_post->ID = 0;
120 120
         }
@@ -126,22 +126,22 @@  discard block
 block discarded – undo
126 126
         // The ID of the first post object inside the loop is not correct.
127 127
         $blog_id = absint(get_option('page_for_posts'));
128 128
 
129
-        if (is_home() ) {
130
-            if ($blog_id === $login_page_id ) {
129
+        if (is_home()) {
130
+            if ($blog_id === $login_page_id) {
131 131
                 $current_page_id = $blog_id;
132 132
             }
133 133
         }
134 134
 
135 135
         // Only execute the script for non-loggedin visitors.
136
-        if ( ! is_user_logged_in() ) {
136
+        if ( ! is_user_logged_in()) {
137 137
 
138
-            if ($current_page_id !== $login_page_id ) {
138
+            if ($current_page_id !== $login_page_id) {
139 139
 
140
-                if ( ! in_array( $current_page_id, $excluded_page, true ) || in_array( $current_page_id, $excluded_page, true ) && true === $is_private ) {
140
+                if ( ! in_array($current_page_id, $excluded_page, true) || in_array($current_page_id, $excluded_page, true) && true === $is_private) {
141 141
 
142 142
                     wp_safe_redirect(
143 143
                         add_query_arg(
144
-                            array( '_redirected' => 'yes' ),
144
+                            array('_redirected' => 'yes'),
145 145
                             $redirect_page
146 146
                         )
147 147
                     );
Please login to merge, or discard this patch.
classes/subway-enqueue.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 namespace Subway;
21 21
 
22
-if (! defined('ABSPATH') ) {
22
+if ( ! defined('ABSPATH')) {
23 23
     return;
24 24
 }
25 25
 
@@ -51,14 +51,14 @@  discard block
 block discarded – undo
51 51
         wp_enqueue_style('subway-style', SUBWAY_DIR_URL . 'assets/css/subway.css');
52 52
 
53 53
         // Only load the stylesheet and javascript documents inside our sign-in page.
54
-        if ($post_id === $signin_page ) {
54
+        if ($post_id === $signin_page) {
55 55
 
56
-            if (! is_user_logged_in() ) {
56
+            if ( ! is_user_logged_in()) {
57 57
 
58 58
                 wp_enqueue_script(
59 59
                     'subway-script', 
60 60
                     SUBWAY_DIR_URL . 'assets/js/subway.js', 
61
-                    array( 'jquery' )
61
+                    array('jquery')
62 62
                 );
63 63
 
64 64
                 wp_localize_script(
Please login to merge, or discard this patch.
classes/subway-metabox.php 1 patch
Spacing   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
 namespace Subway;
24 24
 
25
-if ( ! defined( 'ABSPATH' ) ) {
25
+if ( ! defined('ABSPATH')) {
26 26
 	return;
27 27
 }
28 28
 
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 	 */
56 56
 	public function __construct() {
57 57
 
58
-		add_action( 'add_meta_boxes', array( $this, 'addMetabox' ) );
59
-		add_action( 'save_post', array( $this, 'saveMetaboxValues' ) );
60
-		add_filter( 'the_content', array( $this, 'showContentToAllowedRoles' ) );
58
+		add_action('add_meta_boxes', array($this, 'addMetabox'));
59
+		add_action('save_post', array($this, 'saveMetaboxValues'));
60
+		add_filter('the_content', array($this, 'showContentToAllowedRoles'));
61 61
 
62 62
 		return $this;
63 63
 	}
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
85 85
 
86 86
 		$post_types = $this->getPostTypes();
87 87
 
88
-		foreach ( $post_types as $post_type => $value ) {
88
+		foreach ($post_types as $post_type => $value) {
89 89
 			add_meta_box(
90 90
 				'subway_visibility_metabox',
91
-				esc_html__( 'Subway: Visibility Option', 'subway' ),
92
-				array( $this, 'visibilityMetabox' ),
91
+				esc_html__('Subway: Visibility Option', 'subway'),
92
+				array($this, 'visibilityMetabox'),
93 93
 				$post_type,
94 94
 				'side',
95 95
 				'high'
@@ -106,65 +106,65 @@  discard block
 block discarded – undo
106 106
 	 * @access public
107 107
 	 * @return void
108 108
 	 */
109
-	public function visibilityMetabox( $post ) {
109
+	public function visibilityMetabox($post) {
110 110
 
111 111
 		$howto = __(
112 112
 			'Choose the accessibility of this page from the options above.',
113 113
 			'subway'
114 114
 		);
115 115
 
116
-		$private_setting_label = __( 'Members Only', 'subway' );
116
+		$private_setting_label = __('Members Only', 'subway');
117 117
 
118
-		$is_post_private         = self::isPostPrivate( $post->ID );
118
+		$is_post_private = self::isPostPrivate($post->ID);
119 119
 
120 120
 		// Make sure the form request comes from WordPress
121
-		wp_nonce_field( basename( __FILE__ ),  'subway_post_visibility_nonce' );
121
+		wp_nonce_field(basename(__FILE__), 'subway_post_visibility_nonce');
122 122
 
123 123
 		// Disable the options (radio) when site is selected as public
124 124
 		?>
125 125
 		<input type="hidden" name="subway-visibility-form-submitted" value="1" />
126 126
 
127
-		<?php if ( ! Options::isPublicSite() ) :  ?>
127
+		<?php if ( ! Options::isPublicSite()) :  ?>
128 128
 		<?php // Site is private. Give them some Beer! ?>
129 129
 			<p>
130 130
 				<label class="subway-visibility-settings-checkbox-label" for="subway-visibility-public">
131
-					<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 ); ?>>
132
-					<?php esc_html_e( 'Public', 'subway' ) ?>
131
+					<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); ?>>
132
+					<?php esc_html_e('Public', 'subway') ?>
133 133
 				</label>
134 134
 			</p>
135 135
 			<p>
136 136
 				<label class="subway-visibility-settings-checkbox-label" for="subway-visibility-private">
137 137
 					<input type="radio" class="subway-visibility-settings-radio" id="subway-visibility-private" name="subway-visibility-settings"
138
-					value="private" <?php echo checked( true, $is_post_private, false ); ?>>
139
-					<?php esc_html_e( 'Members Only', 'subway' ) ?>
138
+					value="private" <?php echo checked(true, $is_post_private, false); ?>>
139
+					<?php esc_html_e('Members Only', 'subway') ?>
140 140
 				 </label>
141 141
 			</p>
142 142
 			<div id="subway-roles-access-visibility-fields" class="hidden">
143 143
 				<dl>
144
-					<?php $post_allowed_user_roles = self::getAllowedUserRoles( $post->ID ); ?>
144
+					<?php $post_allowed_user_roles = self::getAllowedUserRoles($post->ID); ?>
145 145
 					<?php $editable_roles = get_editable_roles(); ?>
146 146
 					<?php // Remove administrator for editable roles. ?>
147
-					<?php unset( $editable_roles['administrator'] ); ?>
148
-					<?php foreach ( $editable_roles as $role_name => $role_info ) { ?>
147
+					<?php unset($editable_roles['administrator']); ?>
148
+					<?php foreach ($editable_roles as $role_name => $role_info) { ?>
149 149
 						<dt>
150
-							<?php $id = 'subway-visibility-settings-user-role-' . esc_html( $role_name ); ?>
151
-							<label for="<?php echo esc_attr( $id ); ?>">
152
-							<?php if ( is_array( $post_allowed_user_roles ) && in_array( $role_name, $post_allowed_user_roles ) ) { ?>
150
+							<?php $id = 'subway-visibility-settings-user-role-' . esc_html($role_name); ?>
151
+							<label for="<?php echo esc_attr($id); ?>">
152
+							<?php if (is_array($post_allowed_user_roles) && in_array($role_name, $post_allowed_user_roles)) { ?>
153 153
 								<?php $checked = 'checked'; ?>
154 154
 							<?php } else { ?>
155
-								<?php if ( false === $post_allowed_user_roles ) { ?>
155
+								<?php if (false === $post_allowed_user_roles) { ?>
156 156
 									<?php $checked = 'checked'; ?>
157 157
 								<?php } else { ?>
158 158
 										<?php $checked = ''; ?>
159 159
 								<?php } ?>
160 160
 							<?php } ?>
161
-							<input <?php echo esc_attr( $checked ); ?> id="<?php echo esc_attr( $id ); ?>" type="checkbox" 
162
-							name="subway-visibility-settings-user-role[]" class="subway-visibility-settings-role-access" value="<?php echo esc_attr( $role_name ); ?>" />
163
-								<?php echo esc_html( $role_info['name'] ); ?>
161
+							<input <?php echo esc_attr($checked); ?> id="<?php echo esc_attr($id); ?>" type="checkbox" 
162
+							name="subway-visibility-settings-user-role[]" class="subway-visibility-settings-role-access" value="<?php echo esc_attr($role_name); ?>" />
163
+								<?php echo esc_html($role_info['name']); ?>
164 164
 							</label>
165 165
 						</dt>
166 166
 					<?php } ?>
167
-					<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>
167
+					<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>
168 168
 				</dl>
169 169
 			</div>
170 170
 			<script>
@@ -181,11 +181,11 @@  discard block
 block discarded – undo
181 181
 					});
182 182
 				});
183 183
 			</script>
184
-			<p class="howto"><?php echo esc_html( $howto ); ?></p>
184
+			<p class="howto"><?php echo esc_html($howto); ?></p>
185 185
 		<?php else : ?>
186 186
 			<?php // Site is public! Explain to them ?>
187 187
 			<p><em>
188
-				<?php esc_html_e( 'You have chosen to make your site public inside Settings > Subway.  Subway visibility options will be turned off.', 'subway' ); ?>
188
+				<?php esc_html_e('You have chosen to make your site public inside Settings > Subway.  Subway visibility options will be turned off.', 'subway'); ?>
189 189
 			</em>
190 190
 			</p>
191 191
 		<?php endif; ?>
@@ -201,15 +201,15 @@  discard block
 block discarded – undo
201 201
 	 * @access public
202 202
 	 * @return boolean false Returns false if nonce is not valid.
203 203
 	 */
204
-	public function saveVisibilityMetabox( $post_id = '' ) {
204
+	public function saveVisibilityMetabox($post_id = '') {
205 205
 
206
-		if ( wp_is_post_autosave( $post_id ) ) {
206
+		if (wp_is_post_autosave($post_id)) {
207 207
 			return;
208 208
 		}
209 209
 
210
-		$is_form_submitted = filter_input( INPUT_POST, 'subway-visibility-form-submitted', FILTER_DEFAULT );
210
+		$is_form_submitted = filter_input(INPUT_POST, 'subway-visibility-form-submitted', FILTER_DEFAULT);
211 211
 
212
-		if ( ! $is_form_submitted ) {
212
+		if ( ! $is_form_submitted) {
213 213
 			return;
214 214
 		}
215 215
 
@@ -224,43 +224,43 @@  discard block
 block discarded – undo
224 224
 			FILTER_SANITIZE_STRING
225 225
 		);
226 226
 
227
-		$post_visibility = filter_input( INPUT_POST,  $visibility_field, FILTER_SANITIZE_STRING );
227
+		$post_visibility = filter_input(INPUT_POST, $visibility_field, FILTER_SANITIZE_STRING);
228 228
 
229
-		$is_valid_visibility_nonce = self::isNonceValid( $visibility_nonce );
229
+		$is_valid_visibility_nonce = self::isNonceValid($visibility_nonce);
230 230
 
231
-		$allowed_roles = filter_input( INPUT_POST, 'subway-visibility-settings-user-role', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY );
231
+		$allowed_roles = filter_input(INPUT_POST, 'subway-visibility-settings-user-role', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
232 232
 
233 233
 		// verify taxonomies meta box nonce
234
-		if ( false === $is_valid_visibility_nonce ) {
234
+		if (false === $is_valid_visibility_nonce) {
235 235
 			return;
236 236
 		}
237
-		if ( empty( $allowed_roles ) ) {
237
+		if (empty($allowed_roles)) {
238 238
 			$allowed_roles = array();
239 239
 		}
240 240
 
241 241
 		// Update user roles.
242
-		update_post_meta( $post_id, 'subway-visibility-settings-allowed-user-roles', $allowed_roles );
242
+		update_post_meta($post_id, 'subway-visibility-settings-allowed-user-roles', $allowed_roles);
243 243
 
244
-		if ( ! empty( $post_visibility ) ) {
245
-			if ( ! empty( $post_id ) ) {
246
-				if ( 'public' === $post_visibility ) {
247
-					if ( ! in_array( $post_id, $public_posts ) ) {
248
-						array_push( $public_posts, $post_id );
244
+		if ( ! empty($post_visibility)) {
245
+			if ( ! empty($post_id)) {
246
+				if ('public' === $post_visibility) {
247
+					if ( ! in_array($post_id, $public_posts)) {
248
+						array_push($public_posts, $post_id);
249 249
 					}
250 250
 				}
251
-				if ( 'private' === $post_visibility ) {
252
-					unset( $public_posts[ array_search( $post_id, $public_posts ) ] );
251
+				if ('private' === $post_visibility) {
252
+					unset($public_posts[array_search($post_id, $public_posts)]);
253 253
 				}
254 254
 			}
255 255
 		}
256 256
 
257
-		if ( ! empty( $post_id ) ) {
258
-			$posts_implode = implode( ', ', $public_posts );
257
+		if ( ! empty($post_id)) {
258
+			$posts_implode = implode(', ', $public_posts);
259 259
 
260
-			if ( 'inherit' !== get_post_status( $post_id ) ) {
260
+			if ('inherit' !== get_post_status($post_id)) {
261 261
 
262
-				if ( true === $is_valid_visibility_nonce ) {
263
-					update_option( 'subway_public_post', $posts_implode );
262
+				if (true === $is_valid_visibility_nonce) {
263
+					update_option('subway_public_post', $posts_implode);
264 264
 					update_post_meta(
265 265
 						$post_id,
266 266
 						self::VISIBILITY_METAKEY,
@@ -280,9 +280,9 @@  discard block
 block discarded – undo
280 280
 	 * @access public
281 281
 	 * @return boolean false Returns false if nonce is not valid.
282 282
 	 */
283
-	public function saveMetaboxValues( $post_id ) {
283
+	public function saveMetaboxValues($post_id) {
284 284
 
285
-		$this->saveVisibilityMetabox( $post_id );
285
+		$this->saveVisibilityMetabox($post_id);
286 286
 		return;
287 287
 	}
288 288
 
@@ -296,16 +296,16 @@  discard block
 block discarded – undo
296 296
 	 * @access public
297 297
 	 * @return void
298 298
 	 */
299
-	public static function getPostTypes( $args = '', $output = '' ) {
299
+	public static function getPostTypes($args = '', $output = '') {
300 300
 
301
-		if ( empty( $args ) ) {
301
+		if (empty($args)) {
302 302
 			$args = array(
303 303
 			'public'   => true,
304 304
 			);
305 305
 			$output = 'names';
306 306
 		}
307 307
 
308
-		$post_types = get_post_types( $args, $output );
308
+		$post_types = get_post_types($args, $output);
309 309
 
310 310
 		return $post_types;
311 311
 	}
@@ -319,9 +319,9 @@  discard block
 block discarded – undo
319 319
 	 * @access public
320 320
 	 * @return boolean true Returns true if nonce is valid.
321 321
 	 */
322
-	public function isNonceValid( $nonce ) {
322
+	public function isNonceValid($nonce) {
323 323
 
324
-		if ( ! isset( $nonce ) || ! wp_verify_nonce( $nonce, basename( __FILE__ ) ) ) {
324
+		if ( ! isset($nonce) || ! wp_verify_nonce($nonce, basename(__FILE__))) {
325 325
 			return;
326 326
 		}
327 327
 
@@ -337,23 +337,23 @@  discard block
 block discarded – undo
337 337
 	 * @access public
338 338
 	 * @return boolean true Returns true if post is private. Otherwise false.
339 339
 	 */
340
-	public static function isPostPrivate( $post_id ) {
340
+	public static function isPostPrivate($post_id) {
341 341
 
342 342
 		$meta_value = '';
343 343
 
344
-		if ( ! empty( $post_id ) ) {
345
-			$meta_value = get_post_meta( $post_id, self::VISIBILITY_METAKEY, true );
344
+		if ( ! empty($post_id)) {
345
+			$meta_value = get_post_meta($post_id, self::VISIBILITY_METAKEY, true);
346 346
 
347 347
 			// New page or old pages that don't have Subway'\ Visibility Options
348
-			if ( empty( $meta_value ) ) {
348
+			if (empty($meta_value)) {
349 349
 				// Get the value from the general settings (Settings > Subway)
350 350
 				$is_site_public = Options::isPublicSite();
351
-				if ( ! $is_site_public ) {
351
+				if ( ! $is_site_public) {
352 352
 					// It's private.
353 353
 					return true;
354 354
 				}
355 355
 			}
356
-			if ( 'private' === $meta_value ) {
356
+			if ('private' === $meta_value) {
357 357
 				return true;
358 358
 			}
359 359
 		}
@@ -370,12 +370,12 @@  discard block
 block discarded – undo
370 370
 	 * @access public
371 371
 	 * @return boolean true Returns true if post is public. Otherwise false.
372 372
 	 */
373
-	public static function isPostPublic( $post_id ) {
373
+	public static function isPostPublic($post_id) {
374 374
 
375 375
 		$public_post = Options::getPublicPostsIdentifiers();
376 376
 
377
-		if ( ! empty( $post_id ) ) {
378
-			if ( ! in_array( $post_id, $public_post, true ) ) {
377
+		if ( ! empty($post_id)) {
378
+			if ( ! in_array($post_id, $public_post, true)) {
379 379
 				return true;
380 380
 			}
381 381
 		}
@@ -389,16 +389,16 @@  discard block
 block discarded – undo
389 389
 	 * @param  integer $post_id The post ID.
390 390
 	 * @return mixed Boolean false if metadata does not exists. Otherwise, return the array value of meta.
391 391
 	 */
392
-	public static function getAllowedUserRoles( $post_id = 0 ) {
392
+	public static function getAllowedUserRoles($post_id = 0) {
393 393
 
394 394
 		$allowed_roles = array();
395 395
 
396
-		if ( ! empty( $post_id ) ) {
396
+		if ( ! empty($post_id)) {
397 397
 
398 398
 			// Check if metadata exists for the following post.
399
-			if ( metadata_exists( 'post', $post_id, 'subway-visibility-settings-allowed-user-roles' ) ) {
400
-				$allowed_roles = get_post_meta( $post_id, 'subway-visibility-settings-allowed-user-roles', true );
401
-				if ( ! is_null( $allowed_roles ) ) {
399
+			if (metadata_exists('post', $post_id, 'subway-visibility-settings-allowed-user-roles')) {
400
+				$allowed_roles = get_post_meta($post_id, 'subway-visibility-settings-allowed-user-roles', true);
401
+				if ( ! is_null($allowed_roles)) {
402 402
 					return $allowed_roles;
403 403
 				}
404 404
 				return false;
@@ -420,38 +420,38 @@  discard block
 block discarded – undo
420 420
 	 * @param  string $content The content of the post.
421 421
 	 * @return string The content of the post.
422 422
 	 */
423
-	public function showContentToAllowedRoles( $content ) {
423
+	public function showContentToAllowedRoles($content) {
424 424
 
425 425
 		$post_id = get_the_ID();
426
-		$allowed_user_roles = self::getAllowedUserRoles( $post_id );
426
+		$allowed_user_roles = self::getAllowedUserRoles($post_id);
427 427
 
428
-		if ( ! is_singular() && is_main_query() ) {
428
+		if ( ! is_singular() && is_main_query()) {
429 429
 			return $content;
430 430
 		}
431 431
 
432
-		if ( is_user_logged_in() ) {
432
+		if (is_user_logged_in()) {
433 433
 
434 434
 			$user = wp_get_current_user();
435 435
 
436
-			if ( ! is_array( $user->roles ) ) {
436
+			if ( ! is_array($user->roles)) {
437 437
 				$user->roles = (array) $user->roles;
438 438
 			}
439 439
 
440
-			$current_user_role = end( $user->roles );
440
+			$current_user_role = end($user->roles);
441 441
 
442
-			$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>';
442
+			$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>';
443 443
 
444 444
 			// Restrict access to non admins only.
445
-			if ( ! current_user_can( 'manage_options' ) ) {
446
-				if ( is_array( $allowed_user_roles ) ) {
447
-					if ( ! in_array( $current_user_role, $allowed_user_roles ) ) {
445
+			if ( ! current_user_can('manage_options')) {
446
+				if (is_array($allowed_user_roles)) {
447
+					if ( ! in_array($current_user_role, $allowed_user_roles)) {
448 448
 						return $no_privilege;
449 449
 					}
450 450
 				}
451 451
 			}
452 452
 
453 453
 			// Return the content if the post is not yet saved.
454
-			if ( false === $allowed_user_roles ) {
454
+			if (false === $allowed_user_roles) {
455 455
 				return $content;
456 456
 			}
457 457
 		}
Please login to merge, or discard this patch.