Completed
Push — master ( 0691eb...d055d1 )
by Stephanie
03:44 queued 01:07
created
classes/models/FrmInbox.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -71,18 +71,18 @@  discard block
 block discarded – undo
71 71
 	 * @param array $message
72 72
 	 */
73 73
 	public function add_message( $message ) {
74
-		if ( isset( $this->messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
74
+		if ( isset( $this->messages[$message['key']] ) && ! isset( $message['force'] ) ) {
75 75
 			// Don't replace messages unless required.
76 76
 			return;
77 77
 		}
78 78
 
79
-		if ( isset( $this->messages[ $message['key'] ] ) ) {
79
+		if ( isset( $this->messages[$message['key']] ) ) {
80 80
 			// Move up and mark as new.
81
-			unset( $this->messages[ $message['key'] ] );
81
+			unset( $this->messages[$message['key']] );
82 82
 		}
83 83
 
84 84
 		$message = $this->fill_message( $message );
85
-		$this->messages[ $message['key'] ] = array(
85
+		$this->messages[$message['key']] = array(
86 86
 			'created' => $message['time'],
87 87
 			'message' => $message['message'],
88 88
 			'subject' => $message['subject'],
@@ -112,11 +112,11 @@  discard block
 block discarded – undo
112 112
 	private function clean_messages() {
113 113
 		$removed  = false;
114 114
 		foreach ( $this->messages as $t => $message ) {
115
-			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
116
-			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
115
+			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
116
+			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
117 117
 			$expired = isset( $message['expires'] ) && ! empty( $message['expires'] ) && $message['expires'] < time();
118 118
 			if ( $read || $expired || $dismissed ) {
119
-				unset( $this->messages[ $t ] );
119
+				unset( $this->messages[$t] );
120 120
 				$removed = true;
121 121
 			}
122 122
 		}
@@ -130,14 +130,14 @@  discard block
 block discarded – undo
130 130
 	 * @param string $key
131 131
 	 */
132 132
 	public function mark_read( $key ) {
133
-		if ( ! isset( $this->messages[ $key ] ) ) {
133
+		if ( ! isset( $this->messages[$key] ) ) {
134 134
 			return;
135 135
 		}
136 136
 
137
-		if ( ! isset( $this->messages[ $key ]['read'] ) ) {
138
-			$this->messages[ $key ]['read'] = array();
137
+		if ( ! isset( $this->messages[$key]['read'] ) ) {
138
+			$this->messages[$key]['read'] = array();
139 139
 		}
140
-		$this->messages[ $key ]['read'][ get_current_user_id() ] = time();
140
+		$this->messages[$key]['read'][get_current_user_id()] = time();
141 141
 
142 142
 		$this->update_list();
143 143
 	}
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
 	 * @since 4.05.02
149 149
 	 */
150 150
 	public function mark_unread( $key ) {
151
-		$is_read = isset( $this->messages[ $key ] ) && isset( $this->messages[ $key ]['read'] ) && isset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
151
+		$is_read = isset( $this->messages[$key] ) && isset( $this->messages[$key]['read'] ) && isset( $this->messages[$key]['read'][get_current_user_id()] );
152 152
 		if ( $is_read ) {
153
-			unset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
153
+			unset( $this->messages[$key]['read'][get_current_user_id()] );
154 154
 			$this->update_list();
155 155
 		}
156 156
 	}
@@ -164,14 +164,14 @@  discard block
 block discarded – undo
164 164
 			return;
165 165
 		}
166 166
 
167
-		if ( ! isset( $this->messages[ $key ] ) ) {
167
+		if ( ! isset( $this->messages[$key] ) ) {
168 168
 			return;
169 169
 		}
170 170
 
171
-		if ( ! isset( $this->messages[ $key ]['dismissed'] ) ) {
172
-			$this->messages[ $key ]['dismissed'] = array();
171
+		if ( ! isset( $this->messages[$key]['dismissed'] ) ) {
172
+			$this->messages[$key]['dismissed'] = array();
173 173
 		}
174
-		$this->messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
174
+		$this->messages[$key]['dismissed'][get_current_user_id()] = time();
175 175
 
176 176
 		$this->update_list();
177 177
 	}
@@ -183,11 +183,11 @@  discard block
 block discarded – undo
183 183
 		$user_id = get_current_user_id();
184 184
 		foreach ( $this->messages as $key => $message ) {
185 185
 			if ( ! isset( $message['dismissed'] ) ) {
186
-				$this->messages[ $key ]['dismissed'] = array();
186
+				$this->messages[$key]['dismissed'] = array();
187 187
 			}
188 188
 
189
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
190
-				$this->messages[ $key ]['dismissed'][ $user_id ] = time();
189
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
190
+				$this->messages[$key]['dismissed'][$user_id] = time();
191 191
 			}
192 192
 		}
193 193
 		$this->update_list();
@@ -197,8 +197,8 @@  discard block
 block discarded – undo
197 197
 		$messages = $this->get_messages();
198 198
 		$user_id  = get_current_user_id();
199 199
 		foreach ( $messages as $t => $message ) {
200
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
201
-				unset( $messages[ $t ] );
200
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
201
+				unset( $messages[$t] );
202 202
 			}
203 203
 		}
204 204
 		return $messages;
@@ -217,8 +217,8 @@  discard block
 block discarded – undo
217 217
 	 * @since 4.05.02
218 218
 	 */
219 219
 	public function remove( $key ) {
220
-		if ( isset( $this->messages[ $key ] ) ) {
221
-			unset( $this->messages[ $key ] );
220
+		if ( isset( $this->messages[$key] ) ) {
221
+			unset( $this->messages[$key] );
222 222
 			$this->update_list();
223 223
 		}
224 224
 	}
Please login to merge, or discard this patch.
classes/views/inbox/list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 		$message['icon'] = 'frm_tooltip_icon';
19 19
 	}
20 20
 
21
-	if ( isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user->ID ] ) ) {
21
+	if ( isset( $message['dismissed'] ) && isset( $message['dismissed'][$user->ID] ) ) {
22 22
 		continue;
23 23
 	}
24 24
 	$has_messages = true;
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 			</h3>
34 34
 			<span class="frm_inbox_date">
35 35
 				<?php
36
-				if ( ! isset( $message['read'] ) || ! isset( $message['read'][ $user->ID ] ) ) {
36
+				if ( ! isset( $message['read'] ) || ! isset( $message['read'][$user->ID] ) ) {
37 37
 					$inbox->mark_read( $key );
38 38
 					?>
39 39
 					<span class="frm_inbox_unread"></span>
Please login to merge, or discard this patch.
classes/helpers/FrmStylesHelper.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 				'-' => 'down',
192 192
 				'+' => 'up',
193 193
 			);
194
-			$class = 'frm_arrow' . $arrow[ $icon ];
194
+			$class = 'frm_arrow' . $arrow[$icon];
195 195
 		} else {
196 196
 			//frm_minus1_icon
197 197
 			$key   = str_replace( 'p', '', $key );
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 				'-' => 'minus',
200 200
 				'+' => 'plus',
201 201
 			);
202
-			$class = 'frm_' . $plus[ $icon ];
202
+			$class = 'frm_' . $plus[$icon];
203 203
 		}
204 204
 
205 205
 		if ( $key ) {
@@ -219,8 +219,8 @@  discard block
 block discarded – undo
219 219
 		?>
220 220
 		<div class="btn-group" id="frm_<?php echo esc_attr( $name ); ?>_select">
221 221
 			<button class="multiselect dropdown-toggle btn btn-default" data-toggle="dropdown" type="button">
222
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '+', $type ) ); ?>
223
-				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[ $name ], '-', $type ) ); ?>
222
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '+', $type ) ); ?>
223
+				<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $style->post_content[$name], '-', $type ) ); ?>
224 224
 				<b class="caret"></b>
225 225
 			</button>
226 226
 			<ul class="multiselect-container frm-dropdown-menu">
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 					<li <?php echo ( $style->post_content['collapse_icon'] == $key ) ? 'class="active"' : ''; ?>>
229 229
 						<a href="javascript:void(0);">
230 230
 							<label>
231
-								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[ $name ], $key ); ?>/>
231
+								<input type="radio" value="<?php echo esc_attr( $key ); ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $name ) ); ?>" <?php checked( $style->post_content[$name], $key ); ?>/>
232 232
 								<span>
233 233
 									<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $key, '+', $type ) ); ?>
234 234
 									<?php FrmAppHelper::icon_by_class( 'frmfont ' . self::icon_key_to_class( $key, '-', $type ) ); ?>
@@ -310,15 +310,15 @@  discard block
 block discarded – undo
310 310
 		$vars   = array_diff( $vars, $remove );
311 311
 
312 312
 		foreach ( $vars as $var ) {
313
-			if ( ! isset( $settings[ $var ] ) ) {
313
+			if ( ! isset( $settings[$var] ) ) {
314 314
 				continue;
315 315
 			}
316
-			if ( ! isset( $defaults[ $var ] ) ) {
317
-				$defaults[ $var ] = '';
316
+			if ( ! isset( $defaults[$var] ) ) {
317
+				$defaults[$var] = '';
318 318
 			}
319
-			$show = empty( $defaults ) || ( $settings[ $var ] !== '' && $settings[ $var ] !== $defaults[ $var ] );
319
+			$show = empty( $defaults ) || ( $settings[$var] !== '' && $settings[$var] !== $defaults[$var] );
320 320
 			if ( $show ) {
321
-				echo '--' . esc_html( str_replace( '_', '-', $var ) ) . ':' . ( $var === 'font' ? FrmAppHelper::kses( $settings[ $var ] ) : esc_html( $settings[ $var ] ) ) . ';'; // WPCS: XSS ok.
321
+				echo '--' . esc_html( str_replace( '_', '-', $var ) ) . ':' . ( $var === 'font' ? FrmAppHelper::kses( $settings[$var] ) : esc_html( $settings[$var] ) ) . ';'; // WPCS: XSS ok.
322 322
 			}
323 323
 		}
324 324
 	}
@@ -358,14 +358,14 @@  discard block
 block discarded – undo
358 358
 			$settings['style_class'] = 'frm_style_' . $style->post_name . '.';
359 359
 		}
360 360
 
361
-		$settings['style_class']   .= 'with_frm_style';
361
+		$settings['style_class'] .= 'with_frm_style';
362 362
 		$settings['font']          = stripslashes( $settings['font'] );
363 363
 		$settings['change_margin'] = self::description_margin_for_screensize( $settings['width'] );
364 364
 
365 365
 		$checkbox_opts = array( 'important_style', 'auto_width', 'submit_style', 'collapse_icon', 'center_form' );
366 366
 		foreach ( $checkbox_opts as $opt ) {
367
-			if ( ! isset( $settings[ $opt ] ) ) {
368
-				$settings[ $opt ] = 0;
367
+			if ( ! isset( $settings[$opt] ) ) {
368
+				$settings[$opt] = 0;
369 369
 			}
370 370
 		}
371 371
 
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
 				$css = '';
390 390
 			}
391 391
 			foreach ( $opts as $opt ) {
392
-				self::get_color_output( $css, $settings[ $opt ] );
392
+				self::get_color_output( $css, $settings[$opt] );
393 393
 			}
394 394
 		}
395 395
 	}
Please login to merge, or discard this patch.
classes/controllers/FrmInboxController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	private static function get_notice_count() {
20 20
 		FrmFormMigratorsHelper::maybe_add_to_inbox();
21 21
 
22
-		$inbox  = new FrmInbox();
22
+		$inbox = new FrmInbox();
23 23
 		return $inbox->unread_html();
24 24
 	}
25 25
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 		$user_id      = get_current_user_id();
31 31
 		$has_messages = false;
32 32
 		foreach ( $atts['messages'] as $key => $message ) {
33
-			if ( isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] ) ) {
33
+			if ( isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] ) ) {
34 34
 				continue;
35 35
 			}
36 36
 			$has_messages = true;
Please login to merge, or discard this patch.