Completed
Pull Request — master (#26)
by Daniel
11:49 queued 09:28
created
services/forum/attachments.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -77,10 +77,10 @@
 block discarded – undo
77 77
 	protected function get_attachment_sql(array $attach_ids, array $allowed_extensions, $exclude_in_message, $order_by)
78 78
 	{
79 79
 		return 'SELECT *
80
-			FROM ' . ATTACHMENTS_TABLE . '
81
-			WHERE ' . $this->db->sql_in_set('post_msg_id', $attach_ids) .
82
-				(($exclude_in_message) ? ' AND in_message = 0' : '') .
83
-				(sizeof($allowed_extensions) ? ' AND ' . $this->db->sql_in_set('extension', $allowed_extensions) : '') . '
80
+			FROM ' . ATTACHMENTS_TABLE.'
81
+			WHERE ' . $this->db->sql_in_set('post_msg_id', $attach_ids).
82
+				(($exclude_in_message) ? ' AND in_message = 0' : '').
83
+				(sizeof($allowed_extensions) ? ' AND '.$this->db->sql_in_set('extension', $allowed_extensions) : '').'
84 84
 			ORDER BY ' . $order_by;
85 85
 	}
86 86
 }
Please login to merge, or discard this patch.
services/users/userlist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,11 +45,11 @@
 block discarded – undo
45 45
 			$curr_key = (int) array_search($settings['current_user'], $userlist);
46 46
 
47 47
 			// Remove the invalid user from the list
48
-			$new_list = str_replace($settings['current_user'] . ',', '', $settings['userlist'] . ',');
48
+			$new_list = str_replace($settings['current_user'].',', '', $settings['userlist'].',');
49 49
 			$new_list = trim($new_list, ',');
50 50
 
51 51
 			$new_userlist = self::_get_userlist($new_list);
52
-			$current_user =& $new_userlist[$curr_key - 1];
52
+			$current_user = & $new_userlist[$curr_key - 1];
53 53
 			$settings['current_user'] = (int) $current_user;
54 54
 			$settings['userlist'] = trim($new_list);
55 55
 			$settings['last_changed'] = 0;
Please login to merge, or discard this patch.
services/users/contacts.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 */
97 97
 	protected function get_email_url(array $row)
98 98
 	{
99
-		return ($this->email_form_allowed) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&u=' . $row['user_id']) : (($this->mailto_allowed) ? 'mailto:' . $row['user_email'] : '');
99
+		return ($this->email_form_allowed) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&u='.$row['user_id']) : (($this->mailto_allowed) ? 'mailto:'.$row['user_email'] : '');
100 100
 	}
101 101
 
102 102
 	/**
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 			$jabber = array(
128 128
 				'ID'		=> 'jabber',
129 129
 				'NAME' 		=> $this->translator->lang('JABBER'),
130
-				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=contact&action=jabber&u=' . $row['user_id']),
130
+				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=contact&action=jabber&u='.$row['user_id']),
131 131
 			);
132 132
 		}
133 133
 
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			$pm = array(
157 157
 				'ID'		=> 'pm',
158 158
 				'NAME' 		=> $this->translator->lang('SEND_PRIVATE_MESSAGE'),
159
-				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&mode=compose&u=' . $row['user_id']),
159
+				'U_CONTACT'	=> append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&mode=compose&u='.$row['user_id']),
160 160
 			);
161 161
 		}
162 162
 
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 	{
220 220
 		if (!function_exists('phpbb_get_banned_user_ids'))
221 221
 		{
222
-			include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
222
+			include($this->phpbb_root_path.'includes/functions_user.'.$this->php_ext);
223 223
 		}
224 224
 
225 225
 		return phpbb_get_banned_user_ids($user_ids, false);
Please login to merge, or discard this patch.
blocks/featured_member.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	private function change_user()
148 148
 	{
149 149
 		$change = false;
150
-		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 ' . self::$rotations[$this->settings['rotation']]))
150
+		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 '.self::$rotations[$this->settings['rotation']]))
151 151
 		{
152 152
 			$this->settings['last_changed'] = time();
153 153
 			$change = true;
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 	 */
163 163
 	private function get_settings(array $bdata)
164 164
 	{
165
-		$cached_settings = $this->cache->get('pt_block_data_' . $bdata['bid']);
165
+		$cached_settings = $this->cache->get('pt_block_data_'.$bdata['bid']);
166 166
 		$settings = ($cached_settings && $cached_settings['hash'] === $bdata['hash']) ? $cached_settings : $bdata['settings'];
167 167
 		$settings['hash'] = $bdata['hash'];
168 168
 
@@ -182,8 +182,8 @@  discard block
 block discarded – undo
182 182
 			$sql_data = array(
183 183
 				'settings'	=> json_encode($settings)
184 184
 			);
185
-			$this->db->sql_query('UPDATE ' . $this->blocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE bid = ' . (int) $bid);
186
-			$this->cache->put('pt_block_data_' . $bid, $this->settings);
185
+			$this->db->sql_query('UPDATE '.$this->blocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE bid = '.(int) $bid);
186
+			$this->cache->put('pt_block_data_'.$bid, $this->settings);
187 187
 		}
188 188
 	}
189 189
 
@@ -235,8 +235,8 @@  discard block
 block discarded – undo
235 235
 		$rotation = $this->settings['rotation'];
236 236
 
237 237
 		$this->ptemplate->assign_vars(array(
238
-			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_' . strtoupper($query_type)) : '',
239
-			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation) . '_MEMBER') : '',
238
+			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_'.strtoupper($query_type)) : '',
239
+			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation).'_MEMBER') : '',
240 240
 		));
241 241
 	}
242 242
 
Please login to merge, or discard this patch.
blocks/attachments.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
 				$this->ptemplate->assign_block_vars('postrow.attachment', array(
139 139
 					'DISPLAY_ATTACHMENT'	=> $attachment,
140 140
 					'EXTENSION_GROUP'		=> $extensions[$row['extension']]['group_name'],
141
-					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&amp;p=$post_id") . '#p' . $post_id,
141
+					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&amp;p=$post_id").'#p'.$post_id,
142 142
 				));
143 143
 			}
144 144
 		}
Please login to merge, or discard this patch.
blocks/whats_new.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
 			$this->ptemplate->assign_block_vars('topicrow', array(
101 101
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
102
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id"),
102
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
103 103
 			));
104 104
 			unset($topic_data[$i]);
105 105
 		}
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	{
141 141
 		return array(
142 142
 			'WHERE'		=> array(
143
-				't.topic_last_post_time > ' . $this->user->data['user_lastvisit'],
143
+				't.topic_last_post_time > '.$this->user->data['user_lastvisit'],
144 144
 				't.topic_moved_id = 0',
145 145
 			),
146 146
 		);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 				POSTS_TABLE		=> 'p',
157 157
 			),
158 158
 			'WHERE'		=> array(
159
-				't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'],
159
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
160 160
 			),
161 161
 		);
162 162
 	}
Please login to merge, or discard this patch.
blocks/whois.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
 		if (!empty($data['.'][0]['TOTAL_USERS_ONLINE']))
70 70
 		{
71
-			$l_online_users	= $data['.'][0]['TOTAL_USERS_ONLINE'];
71
+			$l_online_users = $data['.'][0]['TOTAL_USERS_ONLINE'];
72 72
 			$online_userlist = $data['.'][0]['LOGGED_IN_USER_LIST'];
73 73
 			$l_online_record = $data['.'][0]['RECORD_USERS'];
74 74
 		}
@@ -105,6 +105,6 @@  discard block
 block discarded – undo
105 105
 	 */
106 106
 	private function get_viewonline_url()
107 107
 	{
108
-		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline." . $this->php_ext) : '';
108
+		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline.".$this->php_ext) : '';
109 109
 	}
110 110
 }
Please login to merge, or discard this patch.
blocks/wordgraph.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
109 109
 			$this->ptemplate->assign_block_vars('wordgraph', array(
110 110
 				'WORD'			=> $this->show_word($word, $words_array[$word], $settings['show_word_count']),
111 111
 				'WORD_SIZE'		=> $settings['min_word_size'] + (($words_array[$word] - $params['min_count']) * $params['size_step']),
112
-				'WORD_COLOR'	=> $r . $g . $b,
113
-				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords=' . urlencode($word)),
112
+				'WORD_COLOR'	=> $r.$g.$b,
113
+				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords='.urlencode($word)),
114 114
 			));
115 115
 		}
116 116
 	}
@@ -187,8 +187,8 @@  discard block
 block discarded – undo
187 187
 				AND m.word_id = l.word_id
188 188
 				AND m.post_id = p.post_id
189 189
 				AND t.topic_id = p.topic_id
190
-				AND t.topic_time <= ' . time() . '
191
-				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.') .
190
+				AND t.topic_time <= ' . time().'
191
+				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.').
192 192
 				$sql_where,
193 193
 			'GROUP_BY'	=> 'l.word_text, l.word_count',
194 194
 			'ORDER_BY'	=> 'l.word_count DESC'
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 		if ($exclude_words)
206 206
 		{
207 207
 			$exclude_words = array_filter(explode(',', str_replace(' ', '', strtolower($exclude_words))));
208
-			$sql_where = (sizeof($exclude_words)) ? ' AND ' . $this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
208
+			$sql_where = (sizeof($exclude_words)) ? ' AND '.$this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
209 209
 		}
210 210
 
211 211
 		return $sql_where;
@@ -219,6 +219,6 @@  discard block
 block discarded – undo
219 219
 	 */
220 220
 	private function show_word($word, $count, $show_count)
221 221
 	{
222
-		return censor_text(($show_count) ? $word . '(' . $count . ')' : $word);
222
+		return censor_text(($show_count) ? $word.'('.$count.')' : $word);
223 223
 	}
224 224
 }
Please login to merge, or discard this patch.
blocks/mybookmarks.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 
108 108
 			$this->ptemplate->assign_block_vars('topicrow', array(
109 109
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
110
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id"),
110
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
111 111
 			));
112 112
 			unset($topic_data[$i]);
113 113
 		}
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 				BOOKMARKS_TABLE		=> 'b',
126 126
 			),
127 127
 			'WHERE'		=> array(
128
-				'b.user_id = ' . $this->user->data['user_id'],
128
+				'b.user_id = '.$this->user->data['user_id'],
129 129
 				'b.topic_id = t.topic_id',
130 130
 			),
131 131
 		);
Please login to merge, or discard this patch.