Completed
Pull Request — master (#26)
by Daniel
12:16
created
services/blocks/cfg_handler.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 		// @codeCoverageIgnoreStart
62 62
 		if (!function_exists('build_cfg_template'))
63 63
 		{
64
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
64
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
65 65
 		}
66 66
 		// @codeCoverageIgnoreEnd
67 67
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 		// @codeCoverageIgnoreStart
101 101
 		if (!function_exists('validate_config_vars'))
102 102
 		{
103
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
103
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
104 104
 		}
105 105
 		// @codeCoverageIgnoreEnd
106 106
 
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 		if (empty($vars['object']))
204 204
 		{
205 205
 			$object = $this;
206
-			$method = 'prep_' . $type[0] . '_field_for_display';
206
+			$method = 'prep_'.$type[0].'_field_for_display';
207 207
 
208 208
 			if (is_callable(array($this, $method)))
209 209
 			{
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 		$l_explain = '';
258 258
 		if (!empty($vars['explain']))
259 259
 		{
260
-			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'] . '_EXPLAIN');
260
+			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'].'_EXPLAIN');
261 261
 		}
262 262
 
263 263
 		return $l_explain;
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 	{
358 358
 		$this->prep_checkbox_field_for_display($vars, $type, $field);
359 359
 
360
-		$vars['method'] ='build_multi_select';
360
+		$vars['method'] = 'build_multi_select';
361 361
 	}
362 362
 
363 363
 	/**
Please login to merge, or discard this patch.
model/entity/item.php 1 patch
Spacing   +4 added lines, -4 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);
@@ -185,6 +185,6 @@  discard block
 block discarded – undo
185 185
 	private function is_local($item_url)
186 186
 	{
187 187
 		$host = parse_url($item_url, PHP_URL_HOST);
188
-		return (!$item_url || !empty($host) || substr($item_url, 0, 2) === '//') ? false: true;
188
+		return (!$item_url || !empty($host) || substr($item_url, 0, 2) === '//') ? false : true;
189 189
 	}
190 190
 }
Please login to merge, or discard this patch.
model/entity/block.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
141 141
 	 */
142 142
 	public function set_class($class)
143 143
 	{
144
-		$this->class = ($class) ? ' ' . trim($class) : '';
144
+		$this->class = ($class) ? ' '.trim($class) : '';
145 145
 		return $this;
146 146
 	}
147 147
 
Please login to merge, or discard this patch.
model/mapper_factory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
 	 */
40 40
 	public function create($type)
41 41
 	{
42
-		$mapper_class = 'blitze\\sitemaker\\model\\mapper\\' . $type;
43
-		$collection = 'blitze\\sitemaker\\model\\collections\\' . $type;
42
+		$mapper_class = 'blitze\\sitemaker\\model\\mapper\\'.$type;
43
+		$collection = 'blitze\\sitemaker\\model\\collections\\'.$type;
44 44
 
45 45
 		return new $mapper_class($this->db, new $collection, $this, $this->mapper_tables[$type], $this->config);
46 46
 	}
Please login to merge, or discard this patch.
model/mapper/blocks.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
 	 */
26 26
 	protected function find_sql(array $sql_where)
27 27
 	{
28
-		return 'SELECT * FROM ' . $this->entity_table .
29
-			((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . '
28
+		return 'SELECT * FROM '.$this->entity_table.
29
+			((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').'
30 30
 			ORDER BY position, weight ASC';
31 31
 	}
32 32
 
@@ -40,12 +40,12 @@  discard block
 block discarded – undo
40 40
 		// move blocks up for position
41 41
 		if ($condition instanceof $this->entity_class)
42 42
 		{
43
-			$this->db->sql_query('UPDATE ' . $this->entity_table . '
43
+			$this->db->sql_query('UPDATE '.$this->entity_table.'
44 44
 				SET weight = weight - 1
45
-				WHERE weight > ' . (int) $condition->get_weight() . '
46
-					AND style = ' . (int) $condition->get_style() . '
47
-					AND route_id = ' . (int) $condition->get_route_id() . "
48
-					AND position = '" . $this->db->sql_escape($condition->get_position()) . "'");
45
+				WHERE weight > ' . (int) $condition->get_weight().'
46
+					AND style = ' . (int) $condition->get_style().'
47
+					AND route_id = ' . (int) $condition->get_route_id()."
48
+					AND position = '" . $this->db->sql_escape($condition->get_position())."'");
49 49
 		}
50 50
 	}
51 51
 
@@ -65,10 +65,10 @@  discard block
 block discarded – undo
65 65
 	protected function move_blocks_down(\blitze\sitemaker\model\entity_interface $entity)
66 66
 	{
67 67
 		/** @type \blitze\sitemaker\model\entity\block $entity */
68
-		$sql = 'UPDATE ' . $this->entity_table . '
68
+		$sql = 'UPDATE '.$this->entity_table.'
69 69
 			SET weight = weight + 1
70
-			WHERE weight >= ' . (int) $entity->get_weight() . '
71
-				AND route_id = ' . (int) $entity->get_route_id() . '
70
+			WHERE weight >= ' . (int) $entity->get_weight().'
71
+				AND route_id = ' . (int) $entity->get_route_id().'
72 72
 				AND style = ' . (int) $entity->get_style();
73 73
 		$this->db->sql_query($sql);
74 74
 	}
Please login to merge, or discard this patch.
acp/settings_module.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 			$this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
136 136
 			$this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
137 137
 
138
-			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
138
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
139 139
 		}
140 140
 	}
141 141
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	{
148 148
 		$style_prefs = (array) json_decode($this->config_text->get('sm_layout_prefs'), true);
149 149
 
150
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
150
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
151 151
 
152 152
 		$styles = array();
153 153
 		while ($row = $this->db->sql_fetchrow($result))
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 		foreach ($layouts as $name => $path)
202 202
 		{
203 203
 			$selected = ($path == $pref) ? ' selected="selected"' : '';
204
-			$options .= '<option value="' . $path . '"' . $selected . '>' . $this->translator->lang('LAYOUT_' . strtoupper($name)) . '</option>';
204
+			$options .= '<option value="'.$path.'"'.$selected.'>'.$this->translator->lang('LAYOUT_'.strtoupper($name)).'</option>';
205 205
 		}
206 206
 
207 207
 		return $options;
@@ -215,11 +215,11 @@  discard block
 block discarded – undo
215 215
 	{
216 216
 		$views = array('basic', 'boxed', 'simple');
217 217
 
218
-		$options = '<option value="">' . $this->translator->lang('BLOCK_VIEW_DEFAULT') . '</option>';
218
+		$options = '<option value="">'.$this->translator->lang('BLOCK_VIEW_DEFAULT').'</option>';
219 219
 		foreach ($views as $view)
220 220
 		{
221 221
 			$selected = ($view == $pref) ? ' selected="selected"' : '';
222
-			$options .= '<option value="' . $view . '"' . $selected . '>' . $this->translator->lang('BLOCK_VIEW_' . strtoupper($view)) . '</option>';
222
+			$options .= '<option value="'.$view.'"'.$selected.'>'.$this->translator->lang('BLOCK_VIEW_'.strtoupper($view)).'</option>';
223 223
 		}
224 224
 
225 225
 		return $options;
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 			$path = dirname($path);
262 262
 			$name = basename($path);
263 263
 
264
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
264
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
265 265
 		}
266 266
 		ksort($layouts);
267 267
 
Please login to merge, or discard this patch.
blocks/forum_topics.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	{
109 109
 		$this->set_display_fields();
110 110
 
111
-		$view = 'S_' . strtoupper($this->settings['template']);
111
+		$view = 'S_'.strtoupper($this->settings['template']);
112 112
 		$post_data = $this->get_post_data($topic_data);
113 113
 		$topic_data = array_values($topic_data);
114 114
 
@@ -156,10 +156,10 @@  discard block
 block discarded – undo
156 156
 				'VIEWS'				=> (int) $row['topic_views'],
157 157
 				'S_UNREAD_TOPIC'	=> $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']),
158 158
 
159
-				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id"),
160
-				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"),
161
-				'U_NEW_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;view=unread") . '#unread',
162
-				'U_LAST_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
159
+				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
160
+				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"),
161
+				'U_NEW_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;view=unread").'#unread',
162
+				'U_LAST_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;p=".$row['topic_last_post_id']).'#p'.$row['topic_last_post_id'],
163 163
 			));
164 164
 			unset($topic_data[$i], $post_data[$topic_id]);
165 165
 		}
Please login to merge, or discard this patch.
blocks/stats.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,9 +45,9 @@
 block discarded – undo
45 45
 	public function display(array $settings, $edit_mode = false)
46 46
 	{
47 47
 		$content = '';
48
-		$content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']) . '<br />';
49
-		$content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']) . '<br />';
50
-		$content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']) . '<br />';
48
+		$content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']).'<br />';
49
+		$content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']).'<br />';
50
+		$content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']).'<br />';
51 51
 		$content .= $this->translator->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour']));
52 52
 
53 53
 		$this->template->assign_var('NEWEST_USER', false);
Please login to merge, or discard this patch.
exception/base.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,10 +96,10 @@
 block discarded – undo
96 96
 		foreach ($this->message_full as &$message)
97 97
 		{
98 98
 			// Attempt to translate each portion
99
-			$translated_message = $translator->lang('EXCEPTION_' . $message);
99
+			$translated_message = $translator->lang('EXCEPTION_'.$message);
100 100
 
101 101
 			// Check if translating did anything
102
-			if ($translated_message !== 'EXCEPTION_' . $message)
102
+			if ($translated_message !== 'EXCEPTION_'.$message)
103 103
 			{
104 104
 				// It did, so replace message with the translated version
105 105
 				$message = $translated_message;
Please login to merge, or discard this patch.