Strategy11 / formidable-forms

classes/models/FrmInbox.php

Spacing +32 added lines, -32 removed lines

@@ -105,7 +105,7 @@ 
 			return;
 		}
 
-		if ( isset( self::$messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
+		if ( isset( self::$messages[$message['key']] ) && ! isset( $message['force'] ) ) {
 			// Don't replace messages unless required.
 			return;
 		}
@@ -114,13 +114,13 @@ 
 			return;
 		}
 
-		if ( isset( self::$messages[ $message['key'] ] ) ) {
+		if ( isset( self::$messages[$message['key']] ) ) {
 			// Move up and mark as new.
-			unset( self::$messages[ $message['key'] ] );
+			unset( self::$messages[$message['key']] );
 		}
 
 		$this->fill_message( $message );
-		self::$messages[ $message['key'] ] = $message;
+		self::$messages[$message['key']] = $message;
 
 		$this->update_list();
 
@@ -157,11 +157,11 @@ 
 	private function clean_messages() {
 		$removed = false;
 		foreach ( self::$messages as $t => $message ) {
-			$read      = ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
-			$dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
+			$read      = ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
+			$dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
 
 			if ( $read || $dismissed || ! $this->within_valid_timeframe( $message ) ) {
-				unset( self::$messages[ $t ] );
+				unset( self::$messages[$t] );
 				$removed = true;
 			}
 		}
@@ -179,11 +179,11 @@ 
 	public function filter_messages( &$messages, $type = 'unread' ) {
 		$user_id = get_current_user_id();
 		foreach ( $messages as $k => $message ) {
-			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] );
+			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] );
 			if ( empty( $k ) || ! $this->within_valid_timeframe( $message ) || ( $type === 'dismissed' ) !== $dismissed ) {
-				unset( $messages[ $k ] );
+				unset( $messages[$k] );
 			} elseif ( ! $this->is_for_user( $message ) ) {
-				unset( $messages[ $k ] );
+				unset( $messages[$k] );
 			}
 		}
 		$messages = apply_filters( 'frm_filter_inbox', $messages );
@@ -257,14 +257,14 @@ 
 	 * @return void
 	 */
 	public function mark_read( $key ) {
-		if ( ! $key || ! isset( self::$messages[ $key ] ) ) {
+		if ( ! $key || ! isset( self::$messages[$key] ) ) {
 			return;
 		}
 
-		if ( ! isset( self::$messages[ $key ]['read'] ) ) {
-			self::$messages[ $key ]['read'] = array();
+		if ( ! isset( self::$messages[$key]['read'] ) ) {
+			self::$messages[$key]['read'] = array();
 		}
-		self::$messages[ $key ]['read'][ get_current_user_id() ] = time();
+		self::$messages[$key]['read'][get_current_user_id()] = time();
 
 		$this->update_list();
 	}
@@ -276,9 +276,9 @@ 
 	 * @return void
 	 */
 	public function mark_unread( $key ) {
-		$is_read = isset( self::$messages[ $key ] ) && isset( self::$messages[ $key ]['read'] ) && isset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
+		$is_read = isset( self::$messages[$key] ) && isset( self::$messages[$key]['read'] ) && isset( self::$messages[$key]['read'][get_current_user_id()] );
 		if ( $is_read ) {
-			unset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
+			unset( self::$messages[$key]['read'][get_current_user_id()] );
 			$this->update_list();
 		}
 	}
@@ -294,14 +294,14 @@ 
 			return;
 		}
 
-		if ( ! isset( self::$messages[ $key ] ) ) {
+		if ( ! isset( self::$messages[$key] ) ) {
 			return;
 		}
 
-		if ( ! isset( self::$messages[ $key ]['dismissed'] ) ) {
-			self::$messages[ $key ]['dismissed'] = array();
+		if ( ! isset( self::$messages[$key]['dismissed'] ) ) {
+			self::$messages[$key]['dismissed'] = array();
 		}
-		self::$messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
+		self::$messages[$key]['dismissed'][get_current_user_id()] = time();
 
 		$this->update_list();
 	}
@@ -315,11 +315,11 @@ 
 		$user_id = get_current_user_id();
 		foreach ( self::$messages as $key => $message ) {
 			if ( ! isset( $message['dismissed'] ) ) {
-				self::$messages[ $key ]['dismissed'] = array();
+				self::$messages[$key]['dismissed'] = array();
 			}
 
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
-				self::$messages[ $key ]['dismissed'][ $user_id ] = time();
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
+				self::$messages[$key]['dismissed'][$user_id] = time();
 			}
 		}
 		$this->update_list();
@@ -329,8 +329,8 @@ 
 		$messages = $this->get_messages( 'filter' );
 		$user_id  = get_current_user_id();
 		foreach ( $messages as $t => $message ) {
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
-				unset( $messages[ $t ] );
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
+				unset( $messages[$t] );
 			}
 		}
 		return $messages;
@@ -369,8 +369,8 @@ 
 	 * @return void
 	 */
 	public function remove( $key ) {
-		if ( isset( self::$messages[ $key ] ) ) {
-			unset( self::$messages[ $key ] );
+		if ( isset( self::$messages[$key] ) ) {
+			unset( self::$messages[$key] );
 			$this->update_list();
 		}
 	}
@@ -416,7 +416,7 @@ 
 			 * @param array $matches The regex results for a single match.
 			 * @return string
 			 */
-			function ( $matches ) {
+			function( $matches ) {
 				$url   = $matches[2];
 				$parts = parse_url( $url );
 
@@ -479,8 +479,8 @@ 
 		$inbox = new self();
 		return array_filter(
 			$inbox->get_messages( 'filter' ),
-			function ( $message ) use ( $key ) {
-				return ! empty( $message[ $key ] );
+			function( $message ) use ( $key ) {
+				return ! empty( $message[$key] );
 			}
 		);
 	}
@@ -526,8 +526,8 @@ 
 
 		return array_reduce(
 			$keys_to_return,
-			function ( $total, $key ) use ( $message ) {
-				$total[ $key ] = $message[ $key ] ?? '';
+			function( $total, $key ) use ( $message ) {
+				$total[$key] = $message[$key] ?? '';
 				return $total;
 			},
 			array()