Completed
Pull Request — master (#351)
by
unknown
02:37
created
classes/models/FrmInbox.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 			return;
85 85
 		}
86 86
 
87
-		if ( isset( $this->messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
87
+		if ( isset( $this->messages[$message['key']] ) && ! isset( $message['force'] ) ) {
88 88
 			// Don't replace messages unless required.
89 89
 			return;
90 90
 		}
@@ -93,13 +93,13 @@  discard block
 block discarded – undo
93 93
 			return;
94 94
 		}
95 95
 
96
-		if ( isset( $this->messages[ $message['key'] ] ) ) {
96
+		if ( isset( $this->messages[$message['key']] ) ) {
97 97
 			// Move up and mark as new.
98
-			unset( $this->messages[ $message['key'] ] );
98
+			unset( $this->messages[$message['key']] );
99 99
 		}
100 100
 
101 101
 		$this->fill_message( $message );
102
-		$this->messages[ $message['key'] ] = $message;
102
+		$this->messages[$message['key']] = $message;
103 103
 
104 104
 		$this->update_list();
105 105
 
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 	private function clean_messages() {
128 128
 		$removed  = false;
129 129
 		foreach ( $this->messages as $t => $message ) {
130
-			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
131
-			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
130
+			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
131
+			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
132 132
 			$expired = $this->is_expired( $message );
133 133
 			if ( $read || $expired || $dismissed ) {
134
-				unset( $this->messages[ $t ] );
134
+				unset( $this->messages[$t] );
135 135
 				$removed = true;
136 136
 			}
137 137
 		}
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
144 144
 	private function filter_messages( &$messages ) {
145 145
 		$user_id = get_current_user_id();
146 146
 		foreach ( $messages as $k => $message ) {
147
-			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] );
147
+			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] );
148 148
 			if ( empty( $k ) || $this->is_expired( $message ) || $dismissed ) {
149
-				unset( $messages[ $k ] );
149
+				unset( $messages[$k] );
150 150
 			} elseif ( ! $this->is_for_user( $message ) ) {
151
-				unset( $messages[ $k ] );
151
+				unset( $messages[$k] );
152 152
 			}
153 153
 		}
154 154
 		$messages = apply_filters( 'frm_filter_inbox', $messages );
@@ -181,14 +181,14 @@  discard block
 block discarded – undo
181 181
 	 * @param string $key
182 182
 	 */
183 183
 	public function mark_read( $key ) {
184
-		if ( ! $key || ! isset( $this->messages[ $key ] ) ) {
184
+		if ( ! $key || ! isset( $this->messages[$key] ) ) {
185 185
 			return;
186 186
 		}
187 187
 
188
-		if ( ! isset( $this->messages[ $key ]['read'] ) ) {
189
-			$this->messages[ $key ]['read'] = array();
188
+		if ( ! isset( $this->messages[$key]['read'] ) ) {
189
+			$this->messages[$key]['read'] = array();
190 190
 		}
191
-		$this->messages[ $key ]['read'][ get_current_user_id() ] = time();
191
+		$this->messages[$key]['read'][get_current_user_id()] = time();
192 192
 
193 193
 		$this->update_list();
194 194
 	}
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
 	 * @since 4.05.02
200 200
 	 */
201 201
 	public function mark_unread( $key ) {
202
-		$is_read = isset( $this->messages[ $key ] ) && isset( $this->messages[ $key ]['read'] ) && isset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
202
+		$is_read = isset( $this->messages[$key] ) && isset( $this->messages[$key]['read'] ) && isset( $this->messages[$key]['read'][get_current_user_id()] );
203 203
 		if ( $is_read ) {
204
-			unset( $this->messages[ $key ]['read'][ get_current_user_id() ] );
204
+			unset( $this->messages[$key]['read'][get_current_user_id()] );
205 205
 			$this->update_list();
206 206
 		}
207 207
 	}
@@ -215,14 +215,14 @@  discard block
 block discarded – undo
215 215
 			return;
216 216
 		}
217 217
 
218
-		if ( ! isset( $this->messages[ $key ] ) ) {
218
+		if ( ! isset( $this->messages[$key] ) ) {
219 219
 			return;
220 220
 		}
221 221
 
222
-		if ( ! isset( $this->messages[ $key ]['dismissed'] ) ) {
223
-			$this->messages[ $key ]['dismissed'] = array();
222
+		if ( ! isset( $this->messages[$key]['dismissed'] ) ) {
223
+			$this->messages[$key]['dismissed'] = array();
224 224
 		}
225
-		$this->messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
225
+		$this->messages[$key]['dismissed'][get_current_user_id()] = time();
226 226
 
227 227
 		$this->update_list();
228 228
 	}
@@ -234,11 +234,11 @@  discard block
 block discarded – undo
234 234
 		$user_id = get_current_user_id();
235 235
 		foreach ( $this->messages as $key => $message ) {
236 236
 			if ( ! isset( $message['dismissed'] ) ) {
237
-				$this->messages[ $key ]['dismissed'] = array();
237
+				$this->messages[$key]['dismissed'] = array();
238 238
 			}
239 239
 
240
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
241
-				$this->messages[ $key ]['dismissed'][ $user_id ] = time();
240
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
241
+				$this->messages[$key]['dismissed'][$user_id] = time();
242 242
 			}
243 243
 		}
244 244
 		$this->update_list();
@@ -248,8 +248,8 @@  discard block
 block discarded – undo
248 248
 		$messages = $this->get_messages( 'filter' );
249 249
 		$user_id  = get_current_user_id();
250 250
 		foreach ( $messages as $t => $message ) {
251
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
252
-				unset( $messages[ $t ] );
251
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
252
+				unset( $messages[$t] );
253 253
 			}
254 254
 		}
255 255
 		return $messages;
@@ -273,8 +273,8 @@  discard block
 block discarded – undo
273 273
 	 * @since 4.05.02
274 274
 	 */
275 275
 	public function remove( $key ) {
276
-		if ( isset( $this->messages[ $key ] ) ) {
277
-			unset( $this->messages[ $key ] );
276
+		if ( isset( $this->messages[$key] ) ) {
277
+			unset( $this->messages[$key] );
278 278
 			$this->update_list();
279 279
 		}
280 280
 	}
Please login to merge, or discard this patch.