Completed
Pull Request — master (#26)
by Daniel
14:33 queued 11:46
created
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.
controller/blocks_admin.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,8 +88,7 @@
 block discarded – undo
88 88
 			$return_data = $command->execute($style_id);
89 89
 
90 90
 			$this->action_handler->clear_cache();
91
-		}
92
-		catch (\blitze\sitemaker\exception\base $e)
91
+		} catch (\blitze\sitemaker\exception\base $e)
93 92
 		{
94 93
 			$json_data['message'] = $e->get_message($this->translator);
95 94
 		}
Please login to merge, or discard this patch.
controller/menus_admin.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -63,12 +63,10 @@
 block discarded – undo
63 63
 			$return_data = $command->execute();
64 64
 
65 65
 			$this->action_handler->clear_cache();
66
-		}
67
-		catch (\blitze\sitemaker\exception\base $e)
66
+		} catch (\blitze\sitemaker\exception\base $e)
68 67
 		{
69 68
 			$return_data['message'] = $e->get_message($this->translator);
70
-		}
71
-		catch (\Exception $e)
69
+		} catch (\Exception $e)
72 70
 		{
73 71
 			$return_data['message'] = $this->translator->lang($e->getMessage());
74 72
 		}
Please login to merge, or discard this patch.
blocks/forum_topics.php 2 patches
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&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&t=$topic_id&view=unread") . '#unread',
162
-				'U_LAST_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&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&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&t=$topic_id&view=unread").'#unread',
162
+				'U_LAST_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&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.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -257,8 +257,7 @@  discard block
 block discarded – undo
257 257
 		if ($this->settings['context'] && $this->settings['preview_chars'])
258 258
 		{
259 259
 			$post_data = $this->forum_data->get_post_data($this->settings['context']);
260
-		}
261
-		else
260
+		} else
262 261
 		{
263 262
 			$post_data = array_fill_keys(array_keys($topic_data), array(array('post_text' => '', 'bbcode_uid' => '', 'bbcode_bitfield' => '')));
264 263
 		}
@@ -277,8 +276,7 @@  discard block
 block discarded – undo
277 276
 			$this->fields['user_id'] = 'topic_last_poster_id';
278 277
 
279 278
 			$this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->translator->lang('LAST_POST_BY_AUTHOR'));
280
-		}
281
-		else
279
+		} else
282 280
 		{
283 281
 			$this->fields['time'] = 'topic_time';
284 282
 			$this->fields['user_id'] = 'topic_poster';
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.