@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | return; |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - if ( isset( self::$messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) { |
|
| 109 | + if ( isset( self::$messages[$message['key']] ) && ! isset( $message['force'] ) ) { |
|
| 110 | 110 | // Don't replace messages unless required. |
| 111 | 111 | return; |
| 112 | 112 | } |
@@ -115,13 +115,13 @@ discard block |
||
| 115 | 115 | return; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - if ( isset( self::$messages[ $message['key'] ] ) ) { |
|
| 118 | + if ( isset( self::$messages[$message['key']] ) ) { |
|
| 119 | 119 | // Move up and mark as new. |
| 120 | - unset( self::$messages[ $message['key'] ] ); |
|
| 120 | + unset( self::$messages[$message['key']] ); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | $this->fill_message( $message ); |
| 124 | - self::$messages[ $message['key'] ] = $message; |
|
| 124 | + self::$messages[$message['key']] = $message; |
|
| 125 | 125 | |
| 126 | 126 | $this->update_list(); |
| 127 | 127 | |
@@ -158,13 +158,13 @@ discard block |
||
| 158 | 158 | private function clean_messages() { |
| 159 | 159 | $removed = false; |
| 160 | 160 | foreach ( self::$messages as $t => $message ) { |
| 161 | - $read = ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' ); |
|
| 162 | - $dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' ); |
|
| 161 | + $read = ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' ); |
|
| 162 | + $dismissed = ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' ); |
|
| 163 | 163 | $started = $this->has_started( $message ); |
| 164 | 164 | $expired = $this->is_expired( $message ); |
| 165 | 165 | |
| 166 | 166 | if ( $read || $expired || $dismissed || ! $started ) { |
| 167 | - unset( self::$messages[ $t ] ); |
|
| 167 | + unset( self::$messages[$t] ); |
|
| 168 | 168 | $removed = true; |
| 169 | 169 | } |
| 170 | 170 | } |
@@ -182,11 +182,11 @@ discard block |
||
| 182 | 182 | public function filter_messages( &$messages, $type = 'unread' ) { |
| 183 | 183 | $user_id = get_current_user_id(); |
| 184 | 184 | foreach ( $messages as $k => $message ) { |
| 185 | - $dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] ); |
|
| 185 | + $dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] ); |
|
| 186 | 186 | if ( empty( $k ) || $this->is_expired( $message ) || ( $type === 'dismissed' ) !== $dismissed || ! $this->has_started( $message ) ) { |
| 187 | - unset( $messages[ $k ] ); |
|
| 187 | + unset( $messages[$k] ); |
|
| 188 | 188 | } elseif ( ! $this->is_for_user( $message ) ) { |
| 189 | - unset( $messages[ $k ] ); |
|
| 189 | + unset( $messages[$k] ); |
|
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | 192 | $messages = apply_filters( 'frm_filter_inbox', $messages ); |
@@ -248,14 +248,14 @@ discard block |
||
| 248 | 248 | * @return void |
| 249 | 249 | */ |
| 250 | 250 | public function mark_read( $key ) { |
| 251 | - if ( ! $key || ! isset( self::$messages[ $key ] ) ) { |
|
| 251 | + if ( ! $key || ! isset( self::$messages[$key] ) ) { |
|
| 252 | 252 | return; |
| 253 | 253 | } |
| 254 | 254 | |
| 255 | - if ( ! isset( self::$messages[ $key ]['read'] ) ) { |
|
| 256 | - self::$messages[ $key ]['read'] = array(); |
|
| 255 | + if ( ! isset( self::$messages[$key]['read'] ) ) { |
|
| 256 | + self::$messages[$key]['read'] = array(); |
|
| 257 | 257 | } |
| 258 | - self::$messages[ $key ]['read'][ get_current_user_id() ] = time(); |
|
| 258 | + self::$messages[$key]['read'][get_current_user_id()] = time(); |
|
| 259 | 259 | |
| 260 | 260 | $this->update_list(); |
| 261 | 261 | } |
@@ -267,9 +267,9 @@ discard block |
||
| 267 | 267 | * @return void |
| 268 | 268 | */ |
| 269 | 269 | public function mark_unread( $key ) { |
| 270 | - $is_read = isset( self::$messages[ $key ] ) && isset( self::$messages[ $key ]['read'] ) && isset( self::$messages[ $key ]['read'][ get_current_user_id() ] ); |
|
| 270 | + $is_read = isset( self::$messages[$key] ) && isset( self::$messages[$key]['read'] ) && isset( self::$messages[$key]['read'][get_current_user_id()] ); |
|
| 271 | 271 | if ( $is_read ) { |
| 272 | - unset( self::$messages[ $key ]['read'][ get_current_user_id() ] ); |
|
| 272 | + unset( self::$messages[$key]['read'][get_current_user_id()] ); |
|
| 273 | 273 | $this->update_list(); |
| 274 | 274 | } |
| 275 | 275 | } |
@@ -285,14 +285,14 @@ discard block |
||
| 285 | 285 | return; |
| 286 | 286 | } |
| 287 | 287 | |
| 288 | - if ( ! isset( self::$messages[ $key ] ) ) { |
|
| 288 | + if ( ! isset( self::$messages[$key] ) ) { |
|
| 289 | 289 | return; |
| 290 | 290 | } |
| 291 | 291 | |
| 292 | - if ( ! isset( self::$messages[ $key ]['dismissed'] ) ) { |
|
| 293 | - self::$messages[ $key ]['dismissed'] = array(); |
|
| 292 | + if ( ! isset( self::$messages[$key]['dismissed'] ) ) { |
|
| 293 | + self::$messages[$key]['dismissed'] = array(); |
|
| 294 | 294 | } |
| 295 | - self::$messages[ $key ]['dismissed'][ get_current_user_id() ] = time(); |
|
| 295 | + self::$messages[$key]['dismissed'][get_current_user_id()] = time(); |
|
| 296 | 296 | |
| 297 | 297 | $this->update_list(); |
| 298 | 298 | } |
@@ -306,11 +306,11 @@ discard block |
||
| 306 | 306 | $user_id = get_current_user_id(); |
| 307 | 307 | foreach ( self::$messages as $key => $message ) { |
| 308 | 308 | if ( ! isset( $message['dismissed'] ) ) { |
| 309 | - self::$messages[ $key ]['dismissed'] = array(); |
|
| 309 | + self::$messages[$key]['dismissed'] = array(); |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | - if ( ! isset( $message['dismissed'][ $user_id ] ) ) { |
|
| 313 | - self::$messages[ $key ]['dismissed'][ $user_id ] = time(); |
|
| 312 | + if ( ! isset( $message['dismissed'][$user_id] ) ) { |
|
| 313 | + self::$messages[$key]['dismissed'][$user_id] = time(); |
|
| 314 | 314 | } |
| 315 | 315 | } |
| 316 | 316 | $this->update_list(); |
@@ -320,8 +320,8 @@ discard block |
||
| 320 | 320 | $messages = $this->get_messages( 'filter' ); |
| 321 | 321 | $user_id = get_current_user_id(); |
| 322 | 322 | foreach ( $messages as $t => $message ) { |
| 323 | - if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) { |
|
| 324 | - unset( $messages[ $t ] ); |
|
| 323 | + if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) { |
|
| 324 | + unset( $messages[$t] ); |
|
| 325 | 325 | } |
| 326 | 326 | } |
| 327 | 327 | return $messages; |
@@ -360,8 +360,8 @@ discard block |
||
| 360 | 360 | * @return void |
| 361 | 361 | */ |
| 362 | 362 | public function remove( $key ) { |
| 363 | - if ( isset( self::$messages[ $key ] ) ) { |
|
| 364 | - unset( self::$messages[ $key ] ); |
|
| 363 | + if ( isset( self::$messages[$key] ) ) { |
|
| 364 | + unset( self::$messages[$key] ); |
|
| 365 | 365 | $this->update_list(); |
| 366 | 366 | } |
| 367 | 367 | } |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | * @param array $matches The regex results for a single match. |
| 408 | 408 | * @return string |
| 409 | 409 | */ |
| 410 | - function ( $matches ) { |
|
| 410 | + function( $matches ) { |
|
| 411 | 411 | $url = $matches[2]; |
| 412 | 412 | $parts = parse_url( $url ); |
| 413 | 413 | |
@@ -470,8 +470,8 @@ discard block |
||
| 470 | 470 | $inbox = new self(); |
| 471 | 471 | return array_filter( |
| 472 | 472 | $inbox->get_messages( 'filter' ), |
| 473 | - function ( $message ) use ( $key ) { |
|
| 474 | - return ! empty( $message[ $key ] ); |
|
| 473 | + function( $message ) use ( $key ) { |
|
| 474 | + return ! empty( $message[$key] ); |
|
| 475 | 475 | } |
| 476 | 476 | ); |
| 477 | 477 | } |
@@ -517,8 +517,8 @@ discard block |
||
| 517 | 517 | |
| 518 | 518 | return array_reduce( |
| 519 | 519 | $keys_to_return, |
| 520 | - function ( $total, $key ) use ( $message ) { |
|
| 521 | - $total[ $key ] = $message[ $key ] ?? ''; |
|
| 520 | + function( $total, $key ) use ( $message ) { |
|
| 521 | + $total[$key] = $message[$key] ?? ''; |
|
| 522 | 522 | return $total; |
| 523 | 523 | }, |
| 524 | 524 | array() |