@@ -34,11 +34,11 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function build_select($option_ary, $selected_item, $key) |
36 | 36 | { |
37 | - $html = '<select id="' . $key . '" name="config[' . $key . ']">'; |
|
37 | + $html = '<select id="'.$key.'" name="config['.$key.']">'; |
|
38 | 38 | foreach ($option_ary as $value => $title) |
39 | 39 | { |
40 | 40 | $selected = ($value == $selected_item) ? ' selected="selected"' : ''; |
41 | - $html .= '<option value="' . $value . '"' . $selected . '>' . $this->translator->lang($title) . '</option>'; |
|
41 | + $html .= '<option value="'.$value.'"'.$selected.'>'.$this->translator->lang($title).'</option>'; |
|
42 | 42 | } |
43 | 43 | $html .= '</select>'; |
44 | 44 | |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | { |
58 | 58 | $selected_items = $this->ensure_array($selected_items); |
59 | 59 | |
60 | - $html = '<select id="' . $field . '" name="config[' . $field . '][]" multiple="multiple">'; |
|
60 | + $html = '<select id="'.$field.'" name="config['.$field.'][]" multiple="multiple">'; |
|
61 | 61 | foreach ($option_ary as $value => $title) |
62 | 62 | { |
63 | 63 | $selected = $this->get_selected_option($value, $selected_items); |
64 | - $html .= '<option value="' . $value . '"' . $selected . '>' . $this->translator->lang($title) . '</option>'; |
|
64 | + $html .= '<option value="'.$value.'"'.$selected.'>'.$this->translator->lang($title).'</option>'; |
|
65 | 65 | } |
66 | 66 | $html .= '</select>'; |
67 | 67 | |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | foreach ($option_ary as $value => $title) |
121 | 121 | { |
122 | 122 | $selected = $this->get_selected_option($value, $selected_item, 'checked'); |
123 | - $html .= '<label><input type="radio" name="config[' . $key . ']" value="' . $value . '"' . $selected . ' class="radio" /> ' . $this->translator->lang($title) . '</label><br />'; |
|
123 | + $html .= '<label><input type="radio" name="config['.$key.']" value="'.$value.'"'.$selected.' class="radio" /> '.$this->translator->lang($title).'</label><br />'; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | return $html; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | */ |
164 | 164 | protected function get_selected_option($needle, array $haystack, $type = 'selected') |
165 | 165 | { |
166 | - return (in_array($needle, $haystack)) ? ' ' . $type . '="' . $type . '"' : ''; |
|
166 | + return (in_array($needle, $haystack)) ? ' '.$type.'="'.$type.'"' : ''; |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | /** |
@@ -177,12 +177,12 @@ discard block |
||
177 | 177 | */ |
178 | 178 | protected function get_checkbox_column(array $row, array $selected_items, $field, $column_class, $column_count, &$index) |
179 | 179 | { |
180 | - $column = '<div class="' . $column_class . $field . '-checkbox" id="' . $field . '-col-' . $column_count . '">'; |
|
180 | + $column = '<div class="'.$column_class.$field.'-checkbox" id="'.$field.'-col-'.$column_count.'">'; |
|
181 | 181 | foreach ($row as $value => $title) |
182 | 182 | { |
183 | 183 | $title = $this->translator->lang($title); |
184 | 184 | $selected = $this->get_selected_option($value, $selected_items, 'checked'); |
185 | - $column .= '<label><input type="checkbox" name="config[' . $field . '][' . $index . ']" value="' . $value . '"' . $selected . ' class="checkbox" /> ' . $title . '</label><br />'; |
|
185 | + $column .= '<label><input type="checkbox" name="config['.$field.']['.$index.']" value="'.$value.'"'.$selected.' class="checkbox" /> '.$title.'</label><br />'; |
|
186 | 186 | $index++; |
187 | 187 | } |
188 | 188 | $column .= '</div>'; |
@@ -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', array_map('intval', $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', array_map('intval', $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 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $this->ptemplate->assign_block_vars('postrow.attachment', array( |
141 | 141 | 'DISPLAY_ATTACHMENT' => $attachment, |
142 | 142 | 'EXTENSION_GROUP' => $extensions[$row['extension']]['group_name'], |
143 | - 'U_VIEWTOPIC' => append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id") . '#p' . $post_id, |
|
143 | + 'U_VIEWTOPIC' => append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id").'#p'.$post_id, |
|
144 | 144 | )); |
145 | 145 | } |
146 | 146 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | private function get_posts_data() |
153 | 153 | { |
154 | 154 | $topic_ids = $post_ids = array(); |
155 | - ${$this->settings['ids_type'] . '_ids'} = array_filter(explode(',', $this->settings['ids'])); |
|
155 | + ${$this->settings['ids_type'].'_ids'} = array_filter(explode(',', $this->settings['ids'])); |
|
156 | 156 | $range_info = $this->date_range->get($this->settings['date_range']); |
157 | 157 | |
158 | 158 | $sql_array = $this->forum_data->query(false) |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | ->get_sql_array(); |
165 | 165 | |
166 | 166 | $sql_array['SELECT'] = ''; |
167 | - $sql_array['WHERE'] .= ' AND p.topic_id = t.topic_id AND p.post_attachment <> 0' . (($this->settings['first_only']) ? ' AND p.post_id = t.topic_first_post_id' : ''); |
|
167 | + $sql_array['WHERE'] .= ' AND p.topic_id = t.topic_id AND p.post_attachment <> 0'.(($this->settings['first_only']) ? ' AND p.post_id = t.topic_first_post_id' : ''); |
|
168 | 168 | |
169 | 169 | return $this->forum_data->get_post_data(false, $post_ids, $this->settings['limit'], 0, $sql_array); |
170 | 170 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | */ |
137 | 137 | public function set_item_icon($icon) |
138 | 138 | { |
139 | - $this->item_icon = ($icon) ? trim($icon) . ' ' : ''; |
|
139 | + $this->item_icon = ($icon) ? trim($icon).' ' : ''; |
|
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | // add leading / for local paths, except leading hashtags |
154 | 154 | if ($this->is_local($this->item_url) && $this->item_url[0] !== '#') |
155 | 155 | { |
156 | - $this->item_url = '/' . ltrim($this->item_url, './'); |
|
156 | + $this->item_url = '/'.ltrim($this->item_url, './'); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | return $this; |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | |
169 | 169 | if ($this->is_local($item_url) && $item_url[0] === '/') |
170 | 170 | { |
171 | - $item_url = $this->board_url . $item_url; |
|
171 | + $item_url = $this->board_url.$item_url; |
|
172 | 172 | if ($this->mod_rewrite_enabled) |
173 | 173 | { |
174 | 174 | $item_url = str_replace('app.php/', '', $item_url); |
@@ -72,7 +72,7 @@ |
||
72 | 72 | |
73 | 73 | return array( |
74 | 74 | 'title' => $this->title, |
75 | - 'content' => $this->ptemplate->render_view('blitze/sitemaker', 'blocks/' . $this->tpl_name . '.html', $this->tpl_name . '_block'), |
|
75 | + 'content' => $this->ptemplate->render_view('blitze/sitemaker', 'blocks/'.$this->tpl_name.'.html', $this->tpl_name.'_block'), |
|
76 | 76 | ); |
77 | 77 | } |
78 | 78 |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | { |
139 | 139 | $row['is_navigable'] = $this->is_navigable($row); |
140 | 140 | $row['is_expandable'] = ($row['is_navigable'] && !$row['item_target']) ? true : false; |
141 | - $row['url_path'] = str_replace('/index.' . $this->php_ext, '/', $row['url_path']); |
|
141 | + $row['url_path'] = str_replace('/index.'.$this->php_ext, '/', $row['url_path']); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | /** |
@@ -177,8 +177,8 @@ discard block |
||
177 | 177 | { |
178 | 178 | sort($row['url_query']); |
179 | 179 | |
180 | - $row['url_path'] = ($row['url_path'] === '/') ? '/index.' . $this->php_ext : $row['url_path']; |
|
180 | + $row['url_path'] = ($row['url_path'] === '/') ? '/index.'.$this->php_ext : $row['url_path']; |
|
181 | 181 | |
182 | - return $row['url_path'] . ((sizeof($row['url_query'])) ? '?' . join('&', $row['url_query']) : ''); |
|
182 | + return $row['url_path'].((sizeof($row['url_query'])) ? '?'.join('&', $row['url_query']) : ''); |
|
183 | 183 | } |
184 | 184 | } |
@@ -120,13 +120,13 @@ |
||
120 | 120 | */ |
121 | 121 | public function set_startpage() |
122 | 122 | { |
123 | - if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false) |
|
123 | + if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false) |
|
124 | 124 | { |
125 | 125 | $method = $this->config['sitemaker_startpage_method']; |
126 | 126 | $this->is_startpage = true; |
127 | 127 | |
128 | 128 | $controller_dir = explode('\\', get_class($controller_object)); |
129 | - $controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles'; |
|
129 | + $controller_style_dir = 'ext/'.$controller_dir[0].'/'.$controller_dir[1].'/styles'; |
|
130 | 130 | $this->template->set_style(array($controller_style_dir, 'styles')); |
131 | 131 | |
132 | 132 | $arguments = explode('/', $this->config['sitemaker_startpage_params']); |
@@ -105,6 +105,6 @@ |
||
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 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | if (sizeof($query_ids)) |
85 | 85 | { |
86 | - $sql_where .= (($sql_where) ? ' AND ' : '') . $this->db->sql_in_set('user_id', $query_ids); |
|
86 | + $sql_where .= (($sql_where) ? ' AND ' : '').$this->db->sql_in_set('user_id', $query_ids); |
|
87 | 87 | $this->query($sql_where); |
88 | 88 | } |
89 | 89 | |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | public function get_profile_fields() |
161 | 161 | { |
162 | 162 | $sql = 'SELECT l.lang_name, f.field_ident |
163 | - FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f |
|
164 | - WHERE l.lang_id = ' . (int) $this->user->get_iso_lang_id() . ' |
|
163 | + FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f |
|
164 | + WHERE l.lang_id = ' . (int) $this->user->get_iso_lang_id().' |
|
165 | 165 | AND f.field_active = 1 |
166 | 166 | AND f.field_no_view = 0 |
167 | 167 | AND f.field_hide = 0 |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | */ |
220 | 220 | protected function get_search_url($user_id) |
221 | 221 | { |
222 | - return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id=$user_id&sr=posts") : ''; |
|
222 | + return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id=$user_id&sr=posts") : ''; |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | /** |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | { |
231 | 231 | if (!function_exists('phpbb_get_user_rank')) |
232 | 232 | { |
233 | - include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); |
|
233 | + include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | $user_rank_data = phpbb_get_user_rank($row, $row['user_posts']); |
@@ -304,8 +304,8 @@ discard block |
||
304 | 304 | protected function get_sql_statement($sql_where = '', $order_by = '') |
305 | 305 | { |
306 | 306 | return 'SELECT user_id, username, user_type, user_colour, user_avatar, user_avatar_type, user_avatar_height, user_avatar_width, user_regdate, user_lastvisit, user_birthday, user_posts, user_rank, user_email, user_allow_viewemail, user_allow_pm, user_jabber, user_inactive_reason |
307 | - FROM ' . USERS_TABLE . |
|
308 | - (($sql_where) ? ' WHERE ' . $sql_where : '') . |
|
309 | - (($order_by) ? ' ORDER BY ' . $order_by : ''); |
|
307 | + FROM ' . USERS_TABLE. |
|
308 | + (($sql_where) ? ' WHERE '.$sql_where : ''). |
|
309 | + (($order_by) ? ' ORDER BY '.$order_by : ''); |
|
310 | 310 | } |
311 | 311 | } |