Completed
Pull Request — master (#26)
by Daniel
10:32 queued 08:37
created
acp/menu_module.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
 			'ICON_PICKER'	=> $this->icon->picker(),
113 113
 			'T_PATH'		=> $this->phpbb_root_path,
114 114
 			'UA_MENU_ID'	=> $menu_id,
115
-			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '') . '/',
115
+			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '').'/',
116 116
 		));
117 117
 
118 118
 		$this->tpl_name = 'acp_menu';
Please login to merge, or discard this patch.
services/util.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 */
104 104
 	public function get_default_avatar()
105 105
 	{
106
-		return '<img src="' . $this->get_theme_path() . '/images/no_avatar.gif" alt="" />';
106
+		return '<img src="'.$this->get_theme_path().'/images/no_avatar.gif" alt="" />';
107 107
 	}
108 108
 
109 109
 	/**
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	public function get_theme_path()
114 114
 	{
115 115
 		$web_path = $this->get_web_path();
116
-		return "{$web_path}styles/" . rawurlencode($this->user->style['style_path']) . '/theme';
116
+		return "{$web_path}styles/".rawurlencode($this->user->style['style_path']).'/theme';
117 117
 	}
118 118
 
119 119
 	/**
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 	public function get_web_path()
124 124
 	{
125 125
 		// Determine board url - we may need it later
126
-		$board_url = generate_board_url() . '/';
126
+		$board_url = generate_board_url().'/';
127 127
 
128 128
 		$corrected_path = $this->path_helper->get_web_root_path();
129 129
 		return (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;
Please login to merge, or discard this patch.
services/icon_picker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 				'@blitze_sitemaker/assets/icons/picker.min.js',
51 51
 			),
52 52
 			'css'	=> array(
53
-				defined('IN_ADMIN') ? $this->util->get_web_path() . 'assets/css/font-awesome.min.css' : '',
53
+				defined('IN_ADMIN') ? $this->util->get_web_path().'assets/css/font-awesome.min.css' : '',
54 54
 				'@blitze_sitemaker/vendor/jquery-ui/themes/smoothness/jquery-ui.min.css',
55 55
 				'@blitze_sitemaker/assets/icons/picker.min.css',
56 56
 			)
Please login to merge, or discard this patch.
controller/forum.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,12 +59,12 @@
 block discarded – undo
59 59
 		 * to fix relative paths for forum images
60 60
 		 */
61 61
 		global $phpbb_root_path;
62
-		$phpbb_root_path = generate_board_url() . '/';
62
+		$phpbb_root_path = generate_board_url().'/';
63 63
 
64 64
 		// @codeCoverageIgnoreStart
65 65
 		if (!function_exists('display_forums'))
66 66
 		{
67
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
67
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
68 68
 		}
69 69
 		// @codeCoverageIgnoreEnd
70 70
 
Please login to merge, or discard this patch.
services/blocks/routes.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -175,12 +175,12 @@
 block discarded – undo
175 175
 	{
176 176
 		if ($page_dir)
177 177
 		{
178
-			$route = ltrim(dirname($page_dir) . '/index.php', './');
178
+			$route = ltrim(dirname($page_dir).'/index.php', './');
179 179
 			$parent_route = $this->get_parent_route_info($routes, $route);
180 180
 		}
181
-		else if ($current_route === 'viewtopic.' . $this->php_ext)
181
+		else if ($current_route === 'viewtopic.'.$this->php_ext)
182 182
 		{
183
-			$route = 'viewforum.' . $this->php_ext;
183
+			$route = 'viewforum.'.$this->php_ext;
184 184
 			$parent_route = $this->get_parent_route_info($routes, $route);
185 185
 		}
186 186
 		else
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -177,13 +177,11 @@
 block discarded – undo
177 177
 		{
178 178
 			$route = ltrim(dirname($page_dir) . '/index.php', './');
179 179
 			$parent_route = $this->get_parent_route_info($routes, $route);
180
-		}
181
-		else if ($current_route === 'viewtopic.' . $this->php_ext)
180
+		} else if ($current_route === 'viewtopic.' . $this->php_ext)
182 181
 		{
183 182
 			$route = 'viewforum.' . $this->php_ext;
184 183
 			$parent_route = $this->get_parent_route_info($routes, $route);
185
-		}
186
-		else
184
+		} else
187 185
 		{
188 186
 			$parent_route = $this->get_virtual_parent($routes, $current_route);
189 187
 		}
Please login to merge, or discard this patch.
services/blocks/cfg_handler.php 2 patches
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.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -225,8 +225,7 @@
 block discarded – undo
225 225
 				$this->set_params($field, $vars, $db_settings);
226 226
 				$this->$method($vars, $type, $field, $db_settings);
227 227
 			}
228
-		}
229
-		else
228
+		} else
230 229
 		{
231 230
 			$object = $vars['object'];
232 231
 			$this->set_params($field, $vars, $db_settings);
Please login to merge, or discard this patch.
model/mapper/routes.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,8 +70,8 @@
 block discarded – undo
70 70
 	 */
71 71
 	protected function find_sql(array $sql_where)
72 72
 	{
73
-		return 'SELECT * FROM ' . $this->entity_table .
74
-			((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . '
73
+		return 'SELECT * FROM '.$this->entity_table.
74
+			((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').'
75 75
 			ORDER BY route ASC';
76 76
 	}
77 77
 }
Please login to merge, or discard this patch.
model/mapper/items.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -172,6 +172,6 @@
 block discarded – undo
172 172
 	 */
173 173
 	protected function get_sql_where($menu_id)
174 174
 	{
175
-		return '%smenu_id = ' . (int) $menu_id;
175
+		return '%smenu_id = '.(int) $menu_id;
176 176
 	}
177 177
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,8 +96,7 @@
 block discarded – undo
96 96
 		if ($entity->get_item_id())
97 97
 		{
98 98
 			$item = $this->tree->update_item($entity->get_item_id(), $sql_data);
99
-		}
100
-		else
99
+		} else
101 100
 		{
102 101
 			$item = $this->tree->insert($sql_data);
103 102
 		}
Please login to merge, or discard this patch.
model/entity/block.php 2 patches
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.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -175,8 +175,7 @@
 block discarded – undo
175 175
 		if (!is_array($settings))
176 176
 		{
177 177
 			$this->settings = $settings;
178
-		}
179
-		else if (sizeof($settings))
178
+		} else if (sizeof($settings))
180 179
 		{
181 180
 			$this->settings = json_encode($settings);
182 181
 			$this->hash = md5($this->settings);
Please login to merge, or discard this patch.