Completed
Pull Request — master (#1517)
by Stephanie
33s
created
classes/models/FrmInbox.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 			return;
106 106
 		}
107 107
 
108
-		if ( isset( self::$messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
108
+		if ( isset( self::$messages[$message['key']] ) && ! isset( $message['force'] ) ) {
109 109
 			// Don't replace messages unless required.
110 110
 			return;
111 111
 		}
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
 			return;
115 115
 		}
116 116
 
117
-		if ( isset( self::$messages[ $message['key'] ] ) ) {
117
+		if ( isset( self::$messages[$message['key']] ) ) {
118 118
 			// Move up and mark as new.
119
-			unset( self::$messages[ $message['key'] ] );
119
+			unset( self::$messages[$message['key']] );
120 120
 		}
121 121
 
122 122
 		$this->fill_message( $message );
123
-		self::$messages[ $message['key'] ] = $message;
123
+		self::$messages[$message['key']] = $message;
124 124
 
125 125
 		$this->update_list();
126 126
 
@@ -157,11 +157,11 @@  discard block
 block discarded – undo
157 157
 	private function clean_messages() {
158 158
 		$removed = false;
159 159
 		foreach ( self::$messages as $t => $message ) {
160
-			$read      = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
161
-			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
160
+			$read      = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
161
+			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
162 162
 			$expired   = $this->is_expired( $message );
163 163
 			if ( $read || $expired || $dismissed ) {
164
-				unset( self::$messages[ $t ] );
164
+				unset( self::$messages[$t] );
165 165
 				$removed = true;
166 166
 			}
167 167
 		}
@@ -177,11 +177,11 @@  discard block
 block discarded – undo
177 177
 	public function filter_messages( &$messages, $type = 'unread' ) {
178 178
 		$user_id = get_current_user_id();
179 179
 		foreach ( $messages as $k => $message ) {
180
-			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] );
180
+			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] );
181 181
 			if ( empty( $k ) || $this->is_expired( $message ) || ( $type === 'dismissed' ) !== $dismissed ) {
182
-				unset( $messages[ $k ] );
182
+				unset( $messages[$k] );
183 183
 			} elseif ( ! $this->is_for_user( $message ) ) {
184
-				unset( $messages[ $k ] );
184
+				unset( $messages[$k] );
185 185
 			}
186 186
 		}
187 187
 		$messages = apply_filters( 'frm_filter_inbox', $messages );
@@ -227,14 +227,14 @@  discard block
 block discarded – undo
227 227
 	 * @return void
228 228
 	 */
229 229
 	public function mark_read( $key ) {
230
-		if ( ! $key || ! isset( self::$messages[ $key ] ) ) {
230
+		if ( ! $key || ! isset( self::$messages[$key] ) ) {
231 231
 			return;
232 232
 		}
233 233
 
234
-		if ( ! isset( self::$messages[ $key ]['read'] ) ) {
235
-			self::$messages[ $key ]['read'] = array();
234
+		if ( ! isset( self::$messages[$key]['read'] ) ) {
235
+			self::$messages[$key]['read'] = array();
236 236
 		}
237
-		self::$messages[ $key ]['read'][ get_current_user_id() ] = time();
237
+		self::$messages[$key]['read'][get_current_user_id()] = time();
238 238
 
239 239
 		$this->update_list();
240 240
 	}
@@ -247,9 +247,9 @@  discard block
 block discarded – undo
247 247
 	 * @return void
248 248
 	 */
249 249
 	public function mark_unread( $key ) {
250
-		$is_read = isset( self::$messages[ $key ] ) && isset( self::$messages[ $key ]['read'] ) && isset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
250
+		$is_read = isset( self::$messages[$key] ) && isset( self::$messages[$key]['read'] ) && isset( self::$messages[$key]['read'][get_current_user_id()] );
251 251
 		if ( $is_read ) {
252
-			unset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
252
+			unset( self::$messages[$key]['read'][get_current_user_id()] );
253 253
 			$this->update_list();
254 254
 		}
255 255
 	}
@@ -265,14 +265,14 @@  discard block
 block discarded – undo
265 265
 			return;
266 266
 		}
267 267
 
268
-		if ( ! isset( self::$messages[ $key ] ) ) {
268
+		if ( ! isset( self::$messages[$key] ) ) {
269 269
 			return;
270 270
 		}
271 271
 
272
-		if ( ! isset( self::$messages[ $key ]['dismissed'] ) ) {
273
-			self::$messages[ $key ]['dismissed'] = array();
272
+		if ( ! isset( self::$messages[$key]['dismissed'] ) ) {
273
+			self::$messages[$key]['dismissed'] = array();
274 274
 		}
275
-		self::$messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
275
+		self::$messages[$key]['dismissed'][get_current_user_id()] = time();
276 276
 
277 277
 		$this->update_list();
278 278
 	}
@@ -286,11 +286,11 @@  discard block
 block discarded – undo
286 286
 		$user_id = get_current_user_id();
287 287
 		foreach ( self::$messages as $key => $message ) {
288 288
 			if ( ! isset( $message['dismissed'] ) ) {
289
-				self::$messages[ $key ]['dismissed'] = array();
289
+				self::$messages[$key]['dismissed'] = array();
290 290
 			}
291 291
 
292
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
293
-				self::$messages[ $key ]['dismissed'][ $user_id ] = time();
292
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
293
+				self::$messages[$key]['dismissed'][$user_id] = time();
294 294
 			}
295 295
 		}
296 296
 		$this->update_list();
@@ -300,8 +300,8 @@  discard block
 block discarded – undo
300 300
 		$messages = $this->get_messages( 'filter' );
301 301
 		$user_id  = get_current_user_id();
302 302
 		foreach ( $messages as $t => $message ) {
303
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
304
-				unset( $messages[ $t ] );
303
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
304
+				unset( $messages[$t] );
305 305
 			}
306 306
 		}
307 307
 		return $messages;
@@ -329,8 +329,8 @@  discard block
 block discarded – undo
329 329
 	 * @return void
330 330
 	 */
331 331
 	public function remove( $key ) {
332
-		if ( isset( self::$messages[ $key ] ) ) {
333
-			unset( self::$messages[ $key ] );
332
+		if ( isset( self::$messages[$key] ) ) {
333
+			unset( self::$messages[$key] );
334 334
 			$this->update_list();
335 335
 		}
336 336
 	}
Please login to merge, or discard this patch.
classes/controllers/FrmDashboardController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -398,12 +398,12 @@  discard block
 block discarded – undo
398 398
 		if ( $form_id ) {
399 399
 			self::get_columns_for_form( $form_id, $columns );
400 400
 		} else {
401
-			$columns[ $form_id . '_form_id' ] = __( 'Form', 'formidable' );
402
-			$columns[ $form_id . '_name' ]    = __( 'Name', 'formidable' );
403
-			$columns[ $form_id . '_user_id' ] = __( 'Author', 'formidable' );
401
+			$columns[$form_id . '_form_id'] = __( 'Form', 'formidable' );
402
+			$columns[$form_id . '_name']    = __( 'Name', 'formidable' );
403
+			$columns[$form_id . '_user_id'] = __( 'Author', 'formidable' );
404 404
 		}
405 405
 
406
-		$columns[ $form_id . '_created_at' ] = __( 'Created on', 'formidable' );
406
+		$columns[$form_id . '_created_at'] = __( 'Created on', 'formidable' );
407 407
 
408 408
 		return $columns;
409 409
 	}
@@ -486,7 +486,7 @@  discard block
 block discarded – undo
486 486
 		foreach ( $data as $key => $messages ) {
487 487
 			if ( in_array( $key, array( 'unread', 'dismissed' ), true ) ) {
488 488
 				foreach ( $messages as $key_msg => $message ) {
489
-					$data[ $key ][ $key_msg ]['cta'] = self::inbox_clean_messages_cta( $message['cta'] );
489
+					$data[$key][$key_msg]['cta'] = self::inbox_clean_messages_cta( $message['cta'] );
490 490
 				}
491 491
 			}
492 492
 		}
@@ -565,11 +565,11 @@  discard block
 block discarded – undo
565 565
 	 */
566 566
 	private static function get_dashboard_options( $option_name = null ) {
567 567
 		$options = get_option( self::OPTION_META_NAME, array() );
568
-		if ( null !== $option_name && ! isset( $options[ $option_name ] ) ) {
568
+		if ( null !== $option_name && ! isset( $options[$option_name] ) ) {
569 569
 			return array();
570 570
 		}
571 571
 		if ( null !== $option_name ) {
572
-			return $options[ $option_name ];
572
+			return $options[$option_name];
573 573
 		}
574 574
 		return $options;
575 575
 	}
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 	 */
585 585
 	private static function update_dashboard_options( $data, $option_name ) {
586 586
 		$options                 = self::get_dashboard_options();
587
-		$options[ $option_name ] = $data;
587
+		$options[$option_name] = $data;
588 588
 		update_option( self::OPTION_META_NAME, $options, 'no' );
589 589
 	}
590 590
 
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldType.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
 		$field_val = '';
150 150
 		if ( is_object( $this->field ) ) {
151 151
 			$field_val = $this->field->{$column};
152
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
153
-			$field_val = $this->field[ $column ];
152
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
153
+			$field_val = $this->field[$column];
154 154
 		}
155 155
 
156 156
 		return $field_val;
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 		if ( is_object( $this->field ) ) {
165 165
 			$this->field->{$column} = $value;
166 166
 		} elseif ( is_array( $this->field ) ) {
167
-			$this->field[ $column ] = $value;
167
+			$this->field[$column] = $value;
168 168
 		}
169 169
 	}
170 170
 
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
 			printf(
557 557
 				/* translators: %s: Field type */
558 558
 				esc_html__( '%s Options', 'formidable' ),
559
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
559
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
560 560
 			);
561 561
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
562 562
 			?>
@@ -664,8 +664,8 @@  discard block
 block discarded – undo
664 664
 
665 665
 		$fields = array_merge( $fields, $pro_fields );
666 666
 
667
-		if ( isset( $fields[ $this->type ] ) ) {
668
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
667
+		if ( isset( $fields[$this->type] ) ) {
668
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
669 669
 		}
670 670
 
671 671
 		return $name;
@@ -682,7 +682,7 @@  discard block
 block discarded – undo
682 682
 	 * @return array
683 683
 	 */
684 684
 	public function get_default_field_options() {
685
-		$opts        = array(
685
+		$opts = array(
686 686
 			'size'               => '',
687 687
 			'max'                => '',
688 688
 			'label'              => '',
@@ -1078,7 +1078,7 @@  discard block
 block discarded – undo
1078 1078
 			}
1079 1079
 		} else {
1080 1080
 			$args['save_array'] = $this->is_readonly_array();
1081
-			$hidden             .= $this->show_single_hidden( $selected_value, $args );
1081
+			$hidden .= $this->show_single_hidden( $selected_value, $args );
1082 1082
 		}
1083 1083
 
1084 1084
 		return $hidden;
@@ -1087,7 +1087,7 @@  discard block
 block discarded – undo
1087 1087
 	protected function show_single_hidden( $selected, $args ) {
1088 1088
 		if ( $args['save_array'] ) {
1089 1089
 			$args['field_name'] .= '[]';
1090
-			$id                 = '';
1090
+			$id = '';
1091 1091
 		} else {
1092 1092
 			$id = ' id="' . esc_attr( $args['html_id'] ) . '"';
1093 1093
 		}
@@ -1103,8 +1103,8 @@  discard block
 block discarded – undo
1103 1103
 		$selected = $values['field_value'];
1104 1104
 
1105 1105
 		if ( isset( $values['combo_name'] ) ) {
1106
-			$options  = $options[ $values['combo_name'] ];
1107
-			$selected = ( is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ) ? $selected[ $values['combo_name'] ] : '';
1106
+			$options  = $options[$values['combo_name']];
1107
+			$selected = ( is_array( $selected ) && isset( $selected[$values['combo_name']] ) ) ? $selected[$values['combo_name']] : '';
1108 1108
 		}
1109 1109
 
1110 1110
 		$input = $this->select_tag( $values );
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
 	}
1156 1156
 
1157 1157
 	protected function fill_display_field_values( $args = array() ) {
1158
-		$defaults        = array(
1158
+		$defaults = array(
1159 1159
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1160 1160
 			'field_id'      => $this->get_field_column( 'id' ),
1161 1161
 			'field_plus_id' => '',
@@ -1208,7 +1208,7 @@  discard block
 block discarded – undo
1208 1208
 			}
1209 1209
 		}
1210 1210
 
1211
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1211
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1212 1212
 			if ( $error_comes_first ) {
1213 1213
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1214 1214
 			} else {
@@ -1287,11 +1287,11 @@  discard block
 block discarded – undo
1287 1287
 
1288 1288
 		$field_id = $this->get_field_column( 'id' );
1289 1289
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1290
-			$frm_validated_unique_values[ $field_id ] = array();
1290
+			$frm_validated_unique_values[$field_id] = array();
1291 1291
 			return false;
1292 1292
 		}
1293 1293
 
1294
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1294
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1295 1295
 		return $already_validated_this_value;
1296 1296
 	}
1297 1297
 
@@ -1316,7 +1316,7 @@  discard block
 block discarded – undo
1316 1316
 	private function value_validated_as_unique( $value ) {
1317 1317
 		global $frm_validated_unique_values;
1318 1318
 		$field_id                                   = $this->get_field_column( 'id' );
1319
-		$frm_validated_unique_values[ $field_id ][] = $value;
1319
+		$frm_validated_unique_values[$field_id][] = $value;
1320 1320
 	}
1321 1321
 
1322 1322
 	public function get_value_to_save( $value, $atts ) {
@@ -1353,8 +1353,8 @@  discard block
 block discarded – undo
1353 1353
 		$value = $this->prepare_display_value( $value, $atts );
1354 1354
 
1355 1355
 		if ( is_array( $value ) ) {
1356
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
1357
-				$value = $value[ $atts['show'] ];
1356
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
1357
+				$value = $value[$atts['show']];
1358 1358
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
1359 1359
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1360 1360
 				$value = implode( $sep, $value );
@@ -1484,8 +1484,8 @@  discard block
 block discarded – undo
1484 1484
 		$saved_entries = $atts['ids'];
1485 1485
 		$new_value     = array();
1486 1486
 		foreach ( (array) $value as $old_child_id ) {
1487
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1488
-				$new_value[] = $saved_entries[ $old_child_id ];
1487
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1488
+				$new_value[] = $saved_entries[$old_child_id];
1489 1489
 			}
1490 1490
 		}
1491 1491
 
Please login to merge, or discard this patch.
classes/models/FrmYoutubeFeedApi.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,8 +40,8 @@
 block discarded – undo
40 40
 	 */
41 41
 	public function get_video( $type = 'welcome' ) {
42 42
 		$videos = $this->get_api_info();
43
-		if ( isset( $videos[ $type ] ) ) {
44
-			return $videos[ $type ];
43
+		if ( isset( $videos[$type] ) ) {
44
+			return $videos[$type];
45 45
 		}
46 46
 		return array();
47 47
 	}
Please login to merge, or discard this patch.