Completed
Pull Request — master (#26)
by Daniel
21:33 queued 11:11
created
services/blocks/cfg_fields.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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>';
Please login to merge, or discard this patch.
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', 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
 }
Please login to merge, or discard this patch.
blocks/attachments.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
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&amp;p=$post_id") . '#p' . $post_id,
143
+					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&amp;p=$post_id").'#p'.$post_id,
144 144
 				));
145 145
 			}
146 146
 		}
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
model/entity/item.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
blocks/links.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
services/menus/navigation.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
event/startpage.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,13 +120,13 @@
 block discarded – undo
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']);
Please login to merge, or discard this patch.
event/listener.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
 	public function load_permission_language(\phpbb\event\data $event)
69 69
 	{
70 70
 		$permissions = $event['permissions'];
71
-		$permissions['a_sm_settings']	= array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
72
-		$permissions['a_sm_manage_blocks']	= array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
73
-		$permissions['a_sm_manage_menus']	= array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
71
+		$permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
72
+		$permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
73
+		$permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
74 74
 		$event['permissions'] = $permissions;
75 75
 	}
76 76
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function add_viewonline_location(\phpbb\event\data $event)
81 81
 	{
82
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
82
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
83 83
 		{
84 84
 			$event['location'] = $this->translator->lang('FORUM_INDEX');
85 85
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');
Please login to merge, or discard this patch.
acp/settings_module.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 			$this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
142 142
 			$this->config->set('sm_navbar_menu', $this->request->variable('navbar_menu', 0));
143 143
 
144
-			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
144
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
145 145
 		}
146 146
 	}
147 147
 
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	{
154 154
 		$style_prefs = (array) json_decode($this->config_text->get('sm_layout_prefs'), true);
155 155
 
156
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
156
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
157 157
 
158 158
 		$styles = array();
159 159
 		while ($row = $this->db->sql_fetchrow($result))
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 			$path = dirname($path);
232 232
 			$name = basename($path);
233 233
 
234
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
234
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
235 235
 		}
236 236
 		ksort($layouts);
237 237
 
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 			$id = $entity->get_menu_id();
255 255
 			$name = $entity->get_menu_name();
256 256
 			$selected = ($id == $this->config['sm_navbar_menu']) ? ' selected="selected"' : '';
257
-			$options .= '<option value="' . $id . '"' . $selected . '>' . $name . '</option>';
257
+			$options .= '<option value="'.$id.'"'.$selected.'>'.$name.'</option>';
258 258
 		}
259 259
 
260 260
 		return $options;
Please login to merge, or discard this patch.