@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | * @param array $message |
| 80 | 80 | */ |
| 81 | 81 | public function add_message( $message ) { |
| 82 | - if ( isset( $this->messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) { |
|
| 82 | + if ( isset( $this->messages[$message['key']] ) && ! isset( $message['force'] ) ) { |
|
| 83 | 83 | // Don't replace messages unless required. |
| 84 | 84 | return; |
| 85 | 85 | } |
@@ -88,13 +88,13 @@ discard block |
||
| 88 | 88 | return; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - if ( isset( $this->messages[ $message['key'] ] ) ) { |
|
| 91 | + if ( isset( $this->messages[$message['key']] ) ) { |
|
| 92 | 92 | // Move up and mark as new. |
| 93 | - unset( $this->messages[ $message['key'] ] ); |
|
| 93 | + unset( $this->messages[$message['key']] ); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | $this->fill_message( $message ); |
| 97 | - $this->messages[ $message['key'] ] = $message; |
|
| 97 | + $this->messages[$message['key']] = $message; |
|
| 98 | 98 | |
| 99 | 99 | $this->update_list(); |
| 100 | 100 | |
@@ -122,11 +122,11 @@ discard block |
||
| 122 | 122 | private function clean_messages() { |
| 123 | 123 | $removed = false; |
| 124 | 124 | foreach ( $this->messages as $t => $message ) { |
| 125 | - $read = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' ); |
|
| 126 | - $dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' ); |
|
| 125 | + $read = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' ); |
|
| 126 | + $dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' ); |
|
| 127 | 127 | $expired = $this->is_expired( $message ); |
| 128 | 128 | if ( $read || $expired || $dismissed ) { |
| 129 | - unset( $this->messages[ $t ] ); |
|
| 129 | + unset( $this->messages[$t] ); |
|
| 130 | 130 | $removed = true; |
| 131 | 131 | } |
| 132 | 132 | } |
@@ -139,11 +139,11 @@ discard block |
||
| 139 | 139 | private function filter_messages( &$messages ) { |
| 140 | 140 | $user_id = get_current_user_id(); |
| 141 | 141 | foreach ( $messages as $k => $message ) { |
| 142 | - $dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] ); |
|
| 142 | + $dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] ); |
|
| 143 | 143 | if ( $this->is_expired( $message ) || $dismissed ) { |
| 144 | - unset( $messages[ $k ] ); |
|
| 144 | + unset( $messages[$k] ); |
|
| 145 | 145 | } elseif ( ! $this->is_for_user( $message ) ) { |
| 146 | - unset( $messages[ $k ] ); |
|
| 146 | + unset( $messages[$k] ); |
|
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | $messages = apply_filters( 'frm_filter_inbox', $messages ); |
@@ -176,14 +176,14 @@ discard block |
||
| 176 | 176 | * @param string $key |
| 177 | 177 | */ |
| 178 | 178 | public function mark_read( $key ) { |
| 179 | - if ( ! isset( $this->messages[ $key ] ) ) { |
|
| 179 | + if ( ! isset( $this->messages[$key] ) ) { |
|
| 180 | 180 | return; |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | - if ( ! isset( $this->messages[ $key ]['read'] ) ) { |
|
| 184 | - $this->messages[ $key ]['read'] = array(); |
|
| 183 | + if ( ! isset( $this->messages[$key]['read'] ) ) { |
|
| 184 | + $this->messages[$key]['read'] = array(); |
|
| 185 | 185 | } |
| 186 | - $this->messages[ $key ]['read'][ get_current_user_id() ] = time(); |
|
| 186 | + $this->messages[$key]['read'][get_current_user_id()] = time(); |
|
| 187 | 187 | |
| 188 | 188 | $this->update_list(); |
| 189 | 189 | } |
@@ -194,9 +194,9 @@ discard block |
||
| 194 | 194 | * @since 4.05.02 |
| 195 | 195 | */ |
| 196 | 196 | public function mark_unread( $key ) { |
| 197 | - $is_read = isset( $this->messages[ $key ] ) && isset( $this->messages[ $key ]['read'] ) && isset( $this->messages[ $key ]['read'][ get_current_user_id() ] ); |
|
| 197 | + $is_read = isset( $this->messages[$key] ) && isset( $this->messages[$key]['read'] ) && isset( $this->messages[$key]['read'][get_current_user_id()] ); |
|
| 198 | 198 | if ( $is_read ) { |
| 199 | - unset( $this->messages[ $key ]['read'][ get_current_user_id() ] ); |
|
| 199 | + unset( $this->messages[$key]['read'][get_current_user_id()] ); |
|
| 200 | 200 | $this->update_list(); |
| 201 | 201 | } |
| 202 | 202 | } |
@@ -210,14 +210,14 @@ discard block |
||
| 210 | 210 | return; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - if ( ! isset( $this->messages[ $key ] ) ) { |
|
| 213 | + if ( ! isset( $this->messages[$key] ) ) { |
|
| 214 | 214 | return; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | - if ( ! isset( $this->messages[ $key ]['dismissed'] ) ) { |
|
| 218 | - $this->messages[ $key ]['dismissed'] = array(); |
|
| 217 | + if ( ! isset( $this->messages[$key]['dismissed'] ) ) { |
|
| 218 | + $this->messages[$key]['dismissed'] = array(); |
|
| 219 | 219 | } |
| 220 | - $this->messages[ $key ]['dismissed'][ get_current_user_id() ] = time(); |
|
| 220 | + $this->messages[$key]['dismissed'][get_current_user_id()] = time(); |
|
| 221 | 221 | |
| 222 | 222 | $this->update_list(); |
| 223 | 223 | } |
@@ -229,11 +229,11 @@ discard block |
||
| 229 | 229 | $user_id = get_current_user_id(); |
| 230 | 230 | foreach ( $this->messages as $key => $message ) { |
| 231 | 231 | if ( ! isset( $message['dismissed'] ) ) { |
| 232 | - $this->messages[ $key ]['dismissed'] = array(); |
|
| 232 | + $this->messages[$key]['dismissed'] = array(); |
|
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - if ( ! isset( $message['dismissed'][ $user_id ] ) ) { |
|
| 236 | - $this->messages[ $key ]['dismissed'][ $user_id ] = time(); |
|
| 235 | + if ( ! isset( $message['dismissed'][$user_id] ) ) { |
|
| 236 | + $this->messages[$key]['dismissed'][$user_id] = time(); |
|
| 237 | 237 | } |
| 238 | 238 | } |
| 239 | 239 | $this->update_list(); |
@@ -243,8 +243,8 @@ discard block |
||
| 243 | 243 | $messages = $this->get_messages( 'filter' ); |
| 244 | 244 | $user_id = get_current_user_id(); |
| 245 | 245 | foreach ( $messages as $t => $message ) { |
| 246 | - if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) { |
|
| 247 | - unset( $messages[ $t ] ); |
|
| 246 | + if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) { |
|
| 247 | + unset( $messages[$t] ); |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | return $messages; |
@@ -268,8 +268,8 @@ discard block |
||
| 268 | 268 | * @since 4.05.02 |
| 269 | 269 | */ |
| 270 | 270 | public function remove( $key ) { |
| 271 | - if ( isset( $this->messages[ $key ] ) ) { |
|
| 272 | - unset( $this->messages[ $key ] ); |
|
| 271 | + if ( isset( $this->messages[$key] ) ) { |
|
| 272 | + unset( $this->messages[$key] ); |
|
| 273 | 273 | $this->update_list(); |
| 274 | 274 | } |
| 275 | 275 | } |