Strategy11 / formidable-forms

classes/views/inbox/list.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 			</h3>
 			<span class="frm_inbox_date">
 				<?php
-				if ( ! isset( $message['read'] ) || ! isset( $message['read'][ $user->ID ] ) ) {
+				if ( ! isset( $message['read'] ) || ! isset( $message['read'][$user->ID] ) ) {
 					$inbox->mark_read( $key );
 					?>
 					<span class="frm_inbox_unread"></span>

classes/models/FrmInbox.php

Doc Comments +4 added lines

@@ -132,6 +132,9 @@ 
 		}
 	}
 
+	/**
+	 * @param boolean $messages
+	 */
 	private function filter_messages( &$messages ) {
 		$user_id = get_current_user_id();
 		foreach ( $messages as $k => $message ) {
@@ -256,6 +259,7 @@ 
 
 	/**
 	 * @since 4.05.02
+	 * @param string $key
 	 */
 	public function remove( $key ) {
 		if ( isset( $this->messages[ $key ] ) ) {

Spacing +27 added lines, -27 removed lines

@@ -75,18 +75,18 @@ 
 	 * @param array $message
 	 */
 	public function add_message( $message ) {
-		if ( isset( $this->messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
+		if ( isset( $this->messages[$message['key']] ) && ! isset( $message['force'] ) ) {
 			// Don't replace messages unless required.
 			return;
 		}
 
-		if ( isset( $this->messages[ $message['key'] ] ) ) {
+		if ( isset( $this->messages[$message['key']] ) ) {
 			// Move up and mark as new.
-			unset( $this->messages[ $message['key'] ] );
+			unset( $this->messages[$message['key']] );
 		}
 
 		$message = $this->fill_message( $message );
-		$this->messages[ $message['key'] ] = array(
+		$this->messages[$message['key']] = array(
 			'created' => $message['time'],
 			'message' => $message['message'],
 			'subject' => $message['subject'],
@@ -118,11 +118,11 @@ 
 	private function clean_messages() {
 		$removed  = false;
 		foreach ( $this->messages as $t => $message ) {
-			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
-			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
+			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
+			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
 			$expired = $this->is_expired( $message );
 			if ( $read || $expired || $dismissed ) {
-				unset( $this->messages[ $t ] );
+				unset( $this->messages[$t] );
 				$removed = true;
 			}
 		}
@@ -135,11 +135,11 @@ 
 	private function filter_messages( &$messages ) {
 		$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 ( $this->is_expired( $message ) || $dismissed ) {
-				unset( $messages[ $k ] );
+				unset( $messages[$k] );
 			} elseif ( ! $this->is_for_user( $message ) ) {
-				unset( $messages[ $k ] );
+				unset( $messages[$k] );
 			}
 		}
 	}
@@ -171,14 +171,14 @@ 
 	 * @param string $key
 	 */
 	public function mark_read( $key ) {
-		if ( ! isset( $this->messages[ $key ] ) ) {
+		if ( ! isset( $this->messages[$key] ) ) {
 			return;
 		}
 
-		if ( ! isset( $this->messages[ $key ]['read'] ) ) {
-			$this->messages[ $key ]['read'] = array();
+		if ( ! isset( $this->messages[$key]['read'] ) ) {
+			$this->messages[$key]['read'] = array();
 		}
-		$this->messages[ $key ]['read'][ get_current_user_id() ] = time();
+		$this->messages[$key]['read'][get_current_user_id()] = time();
 
 		$this->update_list();
 	}
@@ -189,9 +189,9 @@ 
 	 * @since 4.05.02
 	 */
 	public function mark_unread( $key ) {
-		$is_read = isset( $this->messages[ $key ] ) && isset( $this->messages[ $key ]['read'] ) && isset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
+		$is_read = isset( $this->messages[$key] ) && isset( $this->messages[$key]['read'] ) && isset( $this->messages[$key]['read'][get_current_user_id()] );
 		if ( $is_read ) {
-			unset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
+			unset( $this->messages[$key]['read'][get_current_user_id()] );
 			$this->update_list();
 		}
 	}
@@ -205,14 +205,14 @@ 
 			return;
 		}
 
-		if ( ! isset( $this->messages[ $key ] ) ) {
+		if ( ! isset( $this->messages[$key] ) ) {
 			return;
 		}
 
-		if ( ! isset( $this->messages[ $key ]['dismissed'] ) ) {
-			$this->messages[ $key ]['dismissed'] = array();
+		if ( ! isset( $this->messages[$key]['dismissed'] ) ) {
+			$this->messages[$key]['dismissed'] = array();
 		}
-		$this->messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
+		$this->messages[$key]['dismissed'][get_current_user_id()] = time();
 
 		$this->update_list();
 	}
@@ -224,11 +224,11 @@ 
 		$user_id = get_current_user_id();
 		foreach ( $this->messages as $key => $message ) {
 			if ( ! isset( $message['dismissed'] ) ) {
-				$this->messages[ $key ]['dismissed'] = array();
+				$this->messages[$key]['dismissed'] = array();
 			}
 
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
-				$this->messages[ $key ]['dismissed'][ $user_id ] = time();
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
+				$this->messages[$key]['dismissed'][$user_id] = time();
 			}
 		}
 		$this->update_list();
@@ -238,8 +238,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;
@@ -258,8 +258,8 @@ 
 	 * @since 4.05.02
 	 */
 	public function remove( $key ) {
-		if ( isset( $this->messages[ $key ] ) ) {
-			unset( $this->messages[ $key ] );
+		if ( isset( $this->messages[$key] ) ) {
+			unset( $this->messages[$key] );
 			$this->update_list();
 		}
 	}