Completed
Pull Request — master (#1517)
by Stephanie
01:09
created
stripe/controllers/FrmStrpLiteAppController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -148,13 +148,13 @@  discard block
 block discarded – undo
148 148
 
149 149
 		$is_setup_intent = 0 === strpos( $intent->id, 'seti_' );
150 150
 		if ( $is_setup_intent ) {
151
-			$errors[ 'field' . $cc_field_id ] = is_object( $intent->last_setup_error ) ? $intent->last_setup_error->message : '';
151
+			$errors['field' . $cc_field_id] = is_object( $intent->last_setup_error ) ? $intent->last_setup_error->message : '';
152 152
 		} else {
153
-			$errors[ 'field' . $cc_field_id ] = is_object( $intent->last_payment_error ) ? $intent->last_payment_error->message : '';
153
+			$errors['field' . $cc_field_id] = is_object( $intent->last_payment_error ) ? $intent->last_payment_error->message : '';
154 154
 		}
155 155
 
156
-		if ( ! $errors[ 'field' . $cc_field_id ] ) {
157
-			$errors[ 'field' . $cc_field_id ] = 'Payment was not successfully processed.';
156
+		if ( ! $errors['field' . $cc_field_id] ) {
157
+			$errors['field' . $cc_field_id] = 'Payment was not successfully processed.';
158 158
 		}
159 159
 
160 160
 		global $frm_vars;
@@ -182,10 +182,10 @@  discard block
 block discarded – undo
182 182
 		$save_draft = ! empty( $form->options['save_draft'] );
183 183
 
184 184
 		global $frm_vars;
185
-		$frm_vars['created_entries'][ $form_id ]['errors'] = $errors;
185
+		$frm_vars['created_entries'][$form_id]['errors'] = $errors;
186 186
 
187 187
 		// Set to true to get FrmProFieldsHelper::get_page_with_error() run.
188
-		$_POST[ 'frm_page_order_' . $form_id ] = true;
188
+		$_POST['frm_page_order_' . $form_id] = true;
189 189
 
190 190
 		if ( ! $save_draft ) {
191 191
 			// If draft saving is not on, delete the entry.
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 		}
195 195
 
196 196
 		// If draft saving is on, load the draft entry.
197
-		$frm_vars['created_entries'][ $form_id ]['entry_id'] = $entry_id;
197
+		$frm_vars['created_entries'][$form_id]['entry_id'] = $entry_id;
198 198
 		add_action(
199 199
 			'frm_filter_final_form',
200 200
 			/**
Please login to merge, or discard this patch.
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/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.