@@ -46,7 +46,7 @@ |
||
| 46 | 46 | */ |
| 47 | 47 | public function create($action) |
| 48 | 48 | { |
| 49 | - $action_class = 'blitze\\sitemaker\\services\\menus\\action\\' . $action; |
|
| 49 | + $action_class = 'blitze\\sitemaker\\services\\menus\\action\\'.$action; |
|
| 50 | 50 | |
| 51 | 51 | if (!class_exists($action_class)) |
| 52 | 52 | { |
@@ -14,12 +14,12 @@ |
||
| 14 | 14 | class nestedset extends builder |
| 15 | 15 | { |
| 16 | 16 | /** |
| 17 | - * Construct |
|
| 18 | - * |
|
| 19 | - * @param \phpbb\db\driver\driver_interface $db Database connection |
|
| 20 | - * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around |
|
| 21 | - * @param string $table_name Table name |
|
| 22 | - */ |
|
| 17 | + * Construct |
|
| 18 | + * |
|
| 19 | + * @param \phpbb\db\driver\driver_interface $db Database connection |
|
| 20 | + * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around |
|
| 21 | + * @param string $table_name Table name |
|
| 22 | + */ |
|
| 23 | 23 | public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name) |
| 24 | 24 | { |
| 25 | 25 | parent::__construct( |
@@ -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 | } |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | |
| 55 | 55 | if (!class_exists('acp_forums')) |
| 56 | 56 | { |
| 57 | - include($this->phpbb_root_path . 'includes/acp/acp_forums.' . $this->php_ext); |
|
| 57 | + include($this->phpbb_root_path.'includes/acp/acp_forums.'.$this->php_ext); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | $translator->add_lang('acp/forums'); |
@@ -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 | } |
@@ -45,11 +45,11 @@ |
||
| 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; |
@@ -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); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | public function get_users_groups() |
| 41 | 41 | { |
| 42 | 42 | $sql = 'SELECT group_id |
| 43 | - FROM ' . USER_GROUP_TABLE . ' |
|
| 43 | + FROM ' . USER_GROUP_TABLE.' |
|
| 44 | 44 | WHERE user_id = ' . (int) $this->user->data['user_id']; |
| 45 | 45 | $result = $this->db->sql_query($sql); |
| 46 | 46 | |
@@ -83,13 +83,13 @@ discard block |
||
| 83 | 83 | $sql = $this->_get_group_sql($mode); |
| 84 | 84 | $result = $this->db->sql_query($sql); |
| 85 | 85 | |
| 86 | - $options = '<option value="0">' . $this->translator->lang('ALL') . '</option>'; |
|
| 86 | + $options = '<option value="0">'.$this->translator->lang('ALL').'</option>'; |
|
| 87 | 87 | while ($row = $this->db->sql_fetchrow($result)) |
| 88 | 88 | { |
| 89 | 89 | $group_name = $this->_get_group_name($row); |
| 90 | 90 | $group_class = $this->_get_group_class($row['group_type']); |
| 91 | 91 | $selected_option = $this->_get_selected_option($row['group_id'], $selected); |
| 92 | - $options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>'; |
|
| 92 | + $options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>'; |
|
| 93 | 93 | } |
| 94 | 94 | $this->db->sql_freeresult($result); |
| 95 | 95 | |
@@ -103,8 +103,8 @@ discard block |
||
| 103 | 103 | private function _get_group_sql($mode) |
| 104 | 104 | { |
| 105 | 105 | return 'SELECT group_id, group_name, group_type |
| 106 | - FROM ' . GROUPS_TABLE . |
|
| 107 | - (($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . ' |
|
| 106 | + FROM ' . GROUPS_TABLE. |
|
| 107 | + (($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').' |
|
| 108 | 108 | ORDER BY group_type DESC, group_name ASC'; |
| 109 | 109 | } |
| 110 | 110 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | private function _get_group_name(array $row) |
| 116 | 116 | { |
| 117 | - return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_' . $row['group_name']) : ucfirst($row['group_name']); |
|
| 117 | + return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_'.$row['group_name']) : ucfirst($row['group_name']); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
@@ -138,7 +138,7 @@ |
||
| 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&p=$post_id") . '#p' . $post_id, |
|
| 141 | + 'U_VIEWTOPIC' => append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id").'#p'.$post_id, |
|
| 142 | 142 | )); |
| 143 | 143 | } |
| 144 | 144 | } |