@@ -69,8 +69,7 @@ |
||
| 69 | 69 | $l_online_users = $data['.'][0]['TOTAL_USERS_ONLINE']; |
| 70 | 70 | $online_userlist = $data['.'][0]['LOGGED_IN_USER_LIST']; |
| 71 | 71 | $l_online_record = $data['.'][0]['RECORD_USERS']; |
| 72 | - } |
|
| 73 | - else |
|
| 72 | + } else |
|
| 74 | 73 | { |
| 75 | 74 | $item_id = 0; |
| 76 | 75 | $item = 'forum'; |
@@ -260,8 +260,7 @@ |
||
| 260 | 260 | 'depth' => $new_parent['depth'] + 1, |
| 261 | 261 | 'right_id' => --$new_parent['right_id'], |
| 262 | 262 | ); |
| 263 | - } |
|
| 264 | - else |
|
| 263 | + } else |
|
| 265 | 264 | { |
| 266 | 265 | return array( |
| 267 | 266 | 'depth' => 0, |
@@ -232,8 +232,7 @@ |
||
| 232 | 232 | if (sizeof($post_ids)) |
| 233 | 233 | { |
| 234 | 234 | $sql_where[] = $this->db->sql_in_set('p.post_id', $post_ids); |
| 235 | - } |
|
| 236 | - else if (sizeof($this->store['topic'])) |
|
| 235 | + } else if (sizeof($this->store['topic'])) |
|
| 237 | 236 | { |
| 238 | 237 | $this->_limit_posts_by_topic($sql_where, $topic_first_or_last_post); |
| 239 | 238 | } |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | $this->store['topic'][$row['topic_id']] = $row; |
| 90 | 90 | |
| 91 | 91 | $this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id']; |
| 92 | - $this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time']; |
|
| 92 | + $this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time']; |
|
| 93 | 93 | $this->store['post_ids']['first'][] = $row['topic_first_post_id']; |
| 94 | 94 | $this->store['post_ids']['last'][] = $row['topic_last_post_id']; |
| 95 | 95 | $this->store['poster_ids'][] = $row['topic_poster']; |
@@ -40,8 +40,7 @@ |
||
| 40 | 40 | if ($this->can_track_by_lastread()) |
| 41 | 41 | { |
| 42 | 42 | $info = $this->build_tracking_info('get_topic_tracking', $forums, $topics); |
| 43 | - } |
|
| 44 | - else if ($this->can_track_anonymous()) |
|
| 43 | + } else if ($this->can_track_anonymous()) |
|
| 45 | 44 | { |
| 46 | 45 | $info = $this->build_tracking_info('get_complete_topic_tracking', $forums, $topics); |
| 47 | 46 | } |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | |
| 35 | 35 | if (isset($allowed_fields[$field])) |
| 36 | 36 | { |
| 37 | - $mutator = 'set_' . $field; |
|
| 37 | + $mutator = 'set_'.$field; |
|
| 38 | 38 | $entity->$mutator($allowed_fields[$field]); |
| 39 | 39 | $entity = $block_mapper->save($entity); |
| 40 | 40 | } |
@@ -77,10 +77,10 @@ |
||
| 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 | } |
@@ -191,7 +191,7 @@ |
||
| 191 | 191 | |
| 192 | 192 | return $this; |
| 193 | 193 | } |
| 194 | - */ |
|
| 194 | + */ |
|
| 195 | 195 | |
| 196 | 196 | /** |
| 197 | 197 | * Fetch Topic Tracking Info |
@@ -202,12 +202,12 @@ discard block |
||
| 202 | 202 | $this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time'; |
| 203 | 203 | $this->store['sql_array']['LEFT_JOIN'][] = array( |
| 204 | 204 | 'FROM' => array(TOPICS_TRACK_TABLE => 'tt'), |
| 205 | - 'ON' => 'tt.user_id = ' . $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id' |
|
| 205 | + 'ON' => 'tt.user_id = '.$this->user->data['user_id'].' AND t.topic_id = tt.topic_id' |
|
| 206 | 206 | ); |
| 207 | 207 | |
| 208 | 208 | $this->store['sql_array']['LEFT_JOIN'][] = array( |
| 209 | 209 | 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), |
| 210 | - 'ON' => 'ft.user_id = ' . $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id' |
|
| 210 | + 'ON' => 'ft.user_id = '.$this->user->data['user_id'].' AND t.forum_id = ft.forum_id' |
|
| 211 | 211 | ); |
| 212 | 212 | } |
| 213 | 213 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | { |
| 227 | 227 | if ($unix_start_time && $unix_stop_time) |
| 228 | 228 | { |
| 229 | - $this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time"; |
|
| 229 | + $this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time"; |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | return $this; |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | */ |
| 259 | 259 | public function set_sorting($sort_key, $sort_dir = 'DESC') |
| 260 | 260 | { |
| 261 | - $this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir; |
|
| 261 | + $this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir; |
|
| 262 | 262 | |
| 263 | 263 | return $this; |
| 264 | 264 | } |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | { |
| 320 | 320 | if (!empty($column_id)) |
| 321 | 321 | { |
| 322 | - $this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id; |
|
| 322 | + $this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id; |
|
| 323 | 323 | } |
| 324 | 324 | } |
| 325 | 325 | |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | { |
| 331 | 331 | if ($check_visibility) |
| 332 | 332 | { |
| 333 | - $this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . time(); |
|
| 333 | + $this->store['sql_array']['WHERE'][] = 't.topic_time <= '.time(); |
|
| 334 | 334 | $this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.'); |
| 335 | 335 | } |
| 336 | 336 | } |
@@ -96,7 +96,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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); |
@@ -147,7 +147,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | |
@@ -130,8 +130,7 @@ |
||
| 130 | 130 | if (isset($sort_keys[$this->settings['qtype']])) |
| 131 | 131 | { |
| 132 | 132 | return $this->user_data->query($sql_where, $sort_keys[$this->settings['qtype']], 1); |
| 133 | - } |
|
| 134 | - else |
|
| 133 | + } else |
|
| 135 | 134 | { |
| 136 | 135 | $user_id = (int) userlist::get_user_id($this->settings, $change_user); |
| 137 | 136 | $data = $this->user_data->get_users(array($user_id), $sql_where); |