Strategy11 /
formidable-forms
@@ -71,18 +71,18 @@ discard block |
||
| 71 | 71 | * @param array $message |
| 72 | 72 | */ |
| 73 | 73 | public function add_message( $message ) { |
| 74 | - if ( isset( $this->messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) { |
|
| 74 | + if ( isset( $this->messages[$message['key']] ) && ! isset( $message['force'] ) ) { |
|
| 75 | 75 | // Don't replace messages unless required. |
| 76 | 76 | return; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - if ( isset( $this->messages[ $message['key'] ] ) ) { |
|
| 79 | + if ( isset( $this->messages[$message['key']] ) ) { |
|
| 80 | 80 | // Move up and mark as new. |
| 81 | - unset( $this->messages[ $message['key'] ] ); |
|
| 81 | + unset( $this->messages[$message['key']] ); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $message = $this->fill_message( $message ); |
| 85 | - $this->messages[ $message['key'] ] = array( |
|
| 85 | + $this->messages[$message['key']] = array( |
|
| 86 | 86 | 'created' => $message['time'], |
| 87 | 87 | 'message' => $message['message'], |
| 88 | 88 | 'subject' => $message['subject'], |
@@ -112,11 +112,11 @@ discard block |
||
| 112 | 112 | private function clean_messages() { |
| 113 | 113 | $removed = false; |
| 114 | 114 | foreach ( $this->messages as $t => $message ) { |
| 115 | - $read = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' ); |
|
| 116 | - $dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' ); |
|
| 115 | + $read = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' ); |
|
| 116 | + $dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' ); |
|
| 117 | 117 | $expired = isset( $message['expires'] ) && ! empty( $message['expires'] ) && $message['expires'] < time(); |
| 118 | 118 | if ( $read || $expired || $dismissed ) { |
| 119 | - unset( $this->messages[ $t ] ); |
|
| 119 | + unset( $this->messages[$t] ); |
|
| 120 | 120 | $removed = true; |
| 121 | 121 | } |
| 122 | 122 | } |
@@ -130,14 +130,14 @@ discard block |
||
| 130 | 130 | * @param string $key |
| 131 | 131 | */ |
| 132 | 132 | public function mark_read( $key ) { |
| 133 | - if ( ! isset( $this->messages[ $key ] ) ) { |
|
| 133 | + if ( ! isset( $this->messages[$key] ) ) { |
|
| 134 | 134 | return; |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - if ( ! isset( $this->messages[ $key ]['read'] ) ) { |
|
| 138 | - $this->messages[ $key ]['read'] = array(); |
|
| 137 | + if ( ! isset( $this->messages[$key]['read'] ) ) { |
|
| 138 | + $this->messages[$key]['read'] = array(); |
|
| 139 | 139 | } |
| 140 | - $this->messages[ $key ]['read'][ get_current_user_id() ] = time(); |
|
| 140 | + $this->messages[$key]['read'][get_current_user_id()] = time(); |
|
| 141 | 141 | |
| 142 | 142 | $this->update_list(); |
| 143 | 143 | } |
@@ -146,14 +146,14 @@ discard block |
||
| 146 | 146 | * @param string $key |
| 147 | 147 | */ |
| 148 | 148 | public function dismiss( $key ) { |
| 149 | - if ( ! isset( $this->messages[ $key ] ) ) { |
|
| 149 | + if ( ! isset( $this->messages[$key] ) ) { |
|
| 150 | 150 | return; |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - if ( ! isset( $this->messages[ $key ]['dismissed'] ) ) { |
|
| 154 | - $this->messages[ $key ]['dismissed'] = array(); |
|
| 153 | + if ( ! isset( $this->messages[$key]['dismissed'] ) ) { |
|
| 154 | + $this->messages[$key]['dismissed'] = array(); |
|
| 155 | 155 | } |
| 156 | - $this->messages[ $key ]['dismissed'][ get_current_user_id() ] = time(); |
|
| 156 | + $this->messages[$key]['dismissed'][get_current_user_id()] = time(); |
|
| 157 | 157 | |
| 158 | 158 | $this->update_list(); |
| 159 | 159 | } |
@@ -166,8 +166,8 @@ discard block |
||
| 166 | 166 | $messages = $this->get_messages(); |
| 167 | 167 | $user_id = get_current_user_id(); |
| 168 | 168 | foreach ( $messages as $t => $message ) { |
| 169 | - if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) { |
|
| 170 | - unset( $messages[ $t ] ); |
|
| 169 | + if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) { |
|
| 170 | + unset( $messages[$t] ); |
|
| 171 | 171 | } |
| 172 | 172 | } |
| 173 | 173 | return $messages; |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | * @since 4.05 |
| 23 | 23 | */ |
| 24 | 24 | private static function get_notice_count() { |
| 25 | - $inbox = new FrmInbox(); |
|
| 25 | + $inbox = new FrmInbox(); |
|
| 26 | 26 | return $inbox->unread_html(); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | $message['icon'] = 'frm_tooltip_icon'; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - if ( isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user->ID ] ) ) { |
|
| 40 | + if ( isset( $message['dismissed'] ) && isset( $message['dismissed'][$user->ID] ) ) { |
|
| 41 | 41 | continue; |
| 42 | 42 | } |
| 43 | 43 | ?> |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | </h3> |
| 52 | 52 | <span class="frm_inbox_date"> |
| 53 | 53 | <?php |
| 54 | - if ( ! isset( $message['read'] ) || ! isset( $message['read'][ $user->ID ] ) ) { |
|
| 54 | + if ( ! isset( $message['read'] ) || ! isset( $message['read'][$user->ID] ) ) { |
|
| 55 | 55 | $inbox->mark_read( $key ); |
| 56 | 56 | ?> |
| 57 | 57 | <span class="frm_inbox_unread"></span> |
