@@ -64,13 +64,13 @@ discard block |
||
64 | 64 | 'USER_POSTS' => $this->user->data['user_posts'], |
65 | 65 | 'NEW_POSTS' => $this->get_new_posts_count(), |
66 | 66 | |
67 | - 'U_PROFILE' => append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&u=' . $this->user->data['user_id']), |
|
68 | - 'U_SEARCH_NEW' => append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'), |
|
69 | - 'U_SEARCH_SELF' => append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'), |
|
70 | - 'U_PRIVATE_MSG' => append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&folder=inbox'), |
|
71 | - 'U_LOGOUT' => append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id), |
|
72 | - 'U_MCP' => ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : '', |
|
73 | - 'U_ACP' => ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path . 'adm/index.' . $this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '') |
|
67 | + 'U_PROFILE' => append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&u='.$this->user->data['user_id']), |
|
68 | + 'U_SEARCH_NEW' => append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'), |
|
69 | + 'U_SEARCH_SELF' => append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'), |
|
70 | + 'U_PRIVATE_MSG' => append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&folder=inbox'), |
|
71 | + 'U_LOGOUT' => append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id), |
|
72 | + 'U_MCP' => ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : '', |
|
73 | + 'U_ACP' => ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path.'adm/index.'.$this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '') |
|
74 | 74 | ); |
75 | 75 | |
76 | 76 | $content = $this->ptemplate->render_view('blitze/sitemaker', 'blocks/member_menu.html', 'member_menu_block'); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | POSTS_TABLE => 'p', |
93 | 93 | ), |
94 | 94 | 'WHERE' => array( |
95 | - 't.topic_id = p.topic_id AND p.post_time > ' . (int) $this->user->data['user_lastvisit'], |
|
95 | + 't.topic_id = p.topic_id AND p.post_time > '.(int) $this->user->data['user_lastvisit'], |
|
96 | 96 | ), |
97 | 97 | ); |
98 | 98 |
@@ -109,8 +109,8 @@ discard block |
||
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 |
||
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 |
||
205 | 205 | if ($exclude_words) |
206 | 206 | { |
207 | 207 | $exclude_words = array_filter(explode(',', str_replace(' ', '', $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 |
||
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 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | private function get_user_data($change_user) |
142 | 142 | { |
143 | 143 | $sql_array = $this->get_sql_array(); |
144 | - $method = 'query_' . $this->settings['qtype']; |
|
144 | + $method = 'query_'.$this->settings['qtype']; |
|
145 | 145 | |
146 | 146 | if (is_callable(array($this, $method))) |
147 | 147 | { |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | */ |
179 | 179 | private function query_featured(array &$sql_array, $change_user) |
180 | 180 | { |
181 | - $sql_array['WHERE'] .= ' AND user_id = ' . userlist::get_user_id($this->settings, $change_user); |
|
181 | + $sql_array['WHERE'] .= ' AND user_id = '.userlist::get_user_id($this->settings, $change_user); |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | /** |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | */ |
187 | 187 | private function query_recent(array &$sql_array) |
188 | 188 | { |
189 | - $sql_array['WHERE'] = 'user_id = ' . (int) $this->config['newest_user_id']; |
|
189 | + $sql_array['WHERE'] = 'user_id = '.(int) $this->config['newest_user_id']; |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | /** |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | private function change_user() |
214 | 214 | { |
215 | 215 | $change = false; |
216 | - if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 ' . self::$rotations[$this->settings['rotation']])) |
|
216 | + if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 '.self::$rotations[$this->settings['rotation']])) |
|
217 | 217 | { |
218 | 218 | $this->settings['last_changed'] = time(); |
219 | 219 | $change = true; |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | $rotation = $this->settings['rotation']; |
231 | 231 | |
232 | 232 | $this->ptemplate->assign_vars(array( |
233 | - 'QTYPE_EXPLAIN' => ($query_type == 'posts' || $query_type == 'recent') ? $this->user->lang('QTYPE_' . strtoupper($query_type)) : '', |
|
234 | - 'TITLE_EXPLAIN' => ($rotation != 'pageload') ? $this->user->lang(strtoupper($rotation) . '_MEMBER') : '', |
|
233 | + 'QTYPE_EXPLAIN' => ($query_type == 'posts' || $query_type == 'recent') ? $this->user->lang('QTYPE_'.strtoupper($query_type)) : '', |
|
234 | + 'TITLE_EXPLAIN' => ($rotation != 'pageload') ? $this->user->lang(strtoupper($rotation).'_MEMBER') : '', |
|
235 | 235 | )); |
236 | 236 | } |
237 | 237 | |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | */ |
242 | 242 | private function get_settings(array $bdata) |
243 | 243 | { |
244 | - $cached_settings = $this->cache->get('pt_block_data_' . $bdata['bid']); |
|
244 | + $cached_settings = $this->cache->get('pt_block_data_'.$bdata['bid']); |
|
245 | 245 | $settings = ($cached_settings && $cached_settings['hash'] === $bdata['hash']) ? $cached_settings : $bdata['settings']; |
246 | 246 | $settings['hash'] = $bdata['hash']; |
247 | 247 | |
@@ -261,8 +261,8 @@ discard block |
||
261 | 261 | $sql_data = array( |
262 | 262 | 'settings' => json_encode($settings) |
263 | 263 | ); |
264 | - $this->db->sql_query('UPDATE ' . $this->blocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE bid = ' . (int) $bid); |
|
265 | - $this->cache->put('pt_block_data_' . $bid, $this->settings); |
|
264 | + $this->db->sql_query('UPDATE '.$this->blocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE bid = '.(int) $bid); |
|
265 | + $this->cache->put('pt_block_data_'.$bid, $this->settings); |
|
266 | 266 | } |
267 | 267 | } |
268 | 268 | |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | 'RANK_TITLE' => $rank['title'], |
316 | 316 | 'RANK_IMG' => $rank['img'], |
317 | 317 | 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), |
318 | - 'U_SEARCH_USER' => append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id={$row['user_id']}&sr=posts"), |
|
318 | + 'U_SEARCH_USER' => append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id={$row['user_id']}&sr=posts"), |
|
319 | 319 | )); |
320 | 320 | |
321 | 321 | return $tpl_data; |
@@ -146,8 +146,7 @@ |
||
146 | 146 | if (is_callable(array($this, $method))) |
147 | 147 | { |
148 | 148 | call_user_func_array(array($this, $method), array(&$sql_array, $change_user)); |
149 | - } |
|
150 | - else |
|
149 | + } else |
|
151 | 150 | { |
152 | 151 | return array(); |
153 | 152 | } |