Completed
Pull Request — master (#165)
by Stephanie
02:18
created
classes/views/frm-settings/inbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 			</h3>
15 15
 			<span class="frm_inbox_date">
16 16
 				<?php
17
-				if ( ! isset( $message['read'] ) || ! isset( $message['read'][ get_current_user_id() ] ) ) {
17
+				if ( ! isset( $message['read'] ) || ! isset( $message['read'][get_current_user_id()] ) ) {
18 18
 					$inbox->mark_read( $key );
19 19
 					?>
20 20
 					<span class="frm_inbox_unread"></span>
Please login to merge, or discard this patch.
classes/controllers/FrmAppController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	private static function get_notice_count() {
25 25
 		FrmFormMigratorsHelper::maybe_add_to_inbox();
26 26
 
27
-		$inbox  = new FrmInbox();
27
+		$inbox = new FrmInbox();
28 28
 		return $inbox->unread_html();
29 29
 	}
30 30
 
Please login to merge, or discard this patch.
classes/models/FrmInbox.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -73,15 +73,15 @@  discard block
 block discarded – undo
73 73
 	public function add_message( $message ) {
74 74
 		$time = isset( $message['time'] ) ? $message['time'] : time();
75 75
 
76
-		if ( isset( $this->messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
76
+		if ( isset( $this->messages[$message['key']] ) && ! isset( $message['force'] ) ) {
77 77
 			// Don't replace messages unless required.
78 78
 			return;
79 79
 		} else {
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
-		$this->messages[ $message['key'] ] = array(
84
+		$this->messages[$message['key']] = array(
85 85
 			'created' => $time,
86 86
 			'message' => $message['message'],
87 87
 			'subject' => $message['subject'],
@@ -98,10 +98,10 @@  discard block
 block discarded – undo
98 98
 	private function clean_messages() {
99 99
 		$removed  = false;
100 100
 		foreach ( $this->messages as $t => $message ) {
101
-			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
101
+			$read    = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
102 102
 			$expired = isset( $message['expires'] ) && ! empty( $message['expires'] ) && $message['expires'] < time();
103 103
 			if ( $read || $expired ) {
104
-				unset( $this->messages[ $t ] );
104
+				unset( $this->messages[$t] );
105 105
 				$removed = true;
106 106
 			}
107 107
 		}
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
115 115
 	 * @param string $key in time format.
116 116
 	 */
117 117
 	public function mark_read( $key ) {
118
-		if ( ! isset( $this->messages[ $key ] ) ) {
118
+		if ( ! isset( $this->messages[$key] ) ) {
119 119
 			return;
120 120
 		}
121 121
 
122
-		if ( ! isset( $this->messages[ $key ]['read'] ) ) {
123
-			$this->messages[ $key ]['read'] = array();
122
+		if ( ! isset( $this->messages[$key]['read'] ) ) {
123
+			$this->messages[$key]['read'] = array();
124 124
 		}
125
-		$this->messages[ $key ]['read'][ get_current_user_id() ] = time();
125
+		$this->messages[$key]['read'][get_current_user_id()] = time();
126 126
 
127 127
 		$this->update_list();
128 128
 	}
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
 		$messages = $this->get_messages();
136 136
 		$user_id  = get_current_user_id();
137 137
 		foreach ( $messages as $t => $message ) {
138
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
139
-				unset( $messages[ $t ] );
138
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
139
+				unset( $messages[$t] );
140 140
 			}
141 141
 		}
142 142
 		return $messages;
Please login to merge, or discard this patch.