Completed
Push — develop ( 69e1c6...6a0b8a )
by Daniel
08:16
created
services/form/field/checkbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 	public function get_field_value($name, $default)
18 18
 	{
19 19
 		$default = is_array($default) ? $default : explode("\n", $default);
20
-		$value =  $this->request->variable($name, $default, true);
20
+		$value = $this->request->variable($name, $default, true);
21 21
 
22 22
 		if (empty($value) && $this->request->server('REQUEST_METHOD') !== 'POST')
23 23
 		{
Please login to merge, or discard this patch.
services/topic.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		$l_edited_by = $edit_reason = '';
212 212
 		if (($row['post_edit_count'] && $this->config['display_last_edited']) || $row['post_edit_reason'])
213 213
 		{
214
-			$display_username	= $users_cache[$row['poster_id']]['username_full'];
214
+			$display_username = $users_cache[$row['poster_id']]['username_full'];
215 215
 			$l_edited_by = $this->language->lang('EDITED_TIMES_TOTAL', (int) $row['post_edit_count'], $display_username, $this->user->format_date($row['post_edit_time'], false, true));
216 216
 			$edit_reason = $row['post_edit_reason'];
217 217
 		}
@@ -232,8 +232,8 @@  discard block
 block discarded – undo
232 232
 		$l_deleted_by = $delete_reason = $l_deleted_message = '';
233 233
 		if ($row['post_visibility'] === ITEM_DELETED && $row['post_delete_user'])
234 234
 		{
235
-			$display_postername	= $users_cache[$row['poster_id']]['username_full'];
236
-			$display_username	= $users_cache[$row['post_delete_user']]['username_full'];
235
+			$display_postername = $users_cache[$row['poster_id']]['username_full'];
236
+			$display_username = $users_cache[$row['post_delete_user']]['username_full'];
237 237
 
238 238
 			if ($row['post_delete_reason'])
239 239
 			{
Please login to merge, or discard this patch.
model/entity/type.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -306,11 +306,11 @@
 block discarded – undo
306 306
 		$summary_tags = $this->get_template_tags($summary_tags, $this->summary_tpl, $fields);
307 307
 		$detail_tags = $this->get_template_tags($detail_tags, $this->detail_tpl, $fields);
308 308
 
309
-		$this->summary_tags	= array_intersect_key($field_types, array_flip($summary_tags));
310
-		$this->detail_tags	= array_intersect_key($field_types, array_flip($detail_tags));
309
+		$this->summary_tags = array_intersect_key($field_types, array_flip($summary_tags));
310
+		$this->detail_tags = array_intersect_key($field_types, array_flip($detail_tags));
311 311
 
312
-		$this->content_fields	= $content_fields;
313
-		$this->field_types		= $field_types;
312
+		$this->content_fields = $content_fields;
313
+		$this->field_types = $field_types;
314 314
 	}
315 315
 
316 316
 	/**
Please login to merge, or discard this patch.
blocks/archive.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,8 +94,8 @@
 block discarded – undo
94 94
 			'FROM'		=> array(
95 95
 				TOPICS_TABLE => 't',
96 96
 			),
97
-			'WHERE'		=> 't.forum_id = ' . (int) $settings['forum_id'] . '
98
-				AND t.topic_time <= ' . time() . '
97
+			'WHERE'		=> 't.forum_id = '.(int) $settings['forum_id'].'
98
+				AND t.topic_time <= ' . time().'
99 99
 				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.'),
100 100
 			'GROUP_BY'	=> 'year, month',
101 101
 			'ORDER_BY'	=> 'year DESC',
Please login to merge, or discard this patch.
blocks/recent.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -166,14 +166,14 @@  discard block
 block discarded – undo
166 166
 			$attachments = $this->forum->get_attachments($forum_id);
167 167
 			$topic_tracking_info = $this->forum->get_topic_tracking_info($forum_id);
168 168
 
169
-			$this->fields->prepare_to_show($type, 'block', $this->get_block_fields($entity->get_field_types()), $entity->get_content_fields(), $this->settings['block_tpl'], $block_id . '_block', $this->settings['max_chars']);
169
+			$this->fields->prepare_to_show($type, 'block', $this->get_block_fields($entity->get_field_types()), $entity->get_content_fields(), $this->settings['block_tpl'], $block_id.'_block', $this->settings['max_chars']);
170 170
 
171 171
 			$update_count = array();
172 172
 			$topics_data = array_values($topics_data);
173 173
 			for ($i = 0, $size = sizeof($topics_data); $i < $size; $i++)
174 174
 			{
175 175
 				$topic_data	= $topics_data[$i];
176
-				$post_data	= array_shift($posts_data[$topic_data['topic_id']]);
176
+				$post_data = array_shift($posts_data[$topic_data['topic_id']]);
177 177
 
178 178
 				$tpl_data = $this->fields->show($type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info);
179 179
 				$this->ptemplate->assign_block_vars('topic_row', $tpl_data);
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			POST_STICKY		=> 'CONTENT_STICKY_POSTS',
202 202
 		);
203 203
 
204
-		return (isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_types']] :  $this->language->lang('CONTENT_' . $this->sort_options[$this->settings['sort_key']], $content_langname);
204
+		return (isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_types']] : $this->language->lang('CONTENT_'.$this->sort_options[$this->settings['sort_key']], $content_langname);
205 205
 	}
206 206
 
207 207
 	/**
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 		foreach ($content_types as $value => $title)
252 252
 		{
253 253
 			$selected = ($type == $value) ? ' selected="selected"' : '';
254
-			$html .= '<option value="' . $value . '"' . $selected . ' data-toggle-setting="#fields-col-' . $value . '">' . $title . '</option>';
254
+			$html .= '<option value="'.$value.'"'.$selected.' data-toggle-setting="#fields-col-'.$value.'">'.$title.'</option>';
255 255
 		}
256 256
 
257 257
 		return $html;
Please login to merge, or discard this patch.
controller/ucp_controller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 		catch (\blitze\sitemaker\exception\base $e)
47 47
 		{
48 48
 			$message = $e->get_message($this->language);
49
-			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));
49
+			trigger_error($message.'<br /><br />'.$this->language->lang('RETURN_PAGE', '<a href="'.$base_url.'">', '</a>'));
50 50
 		}
51 51
 	}
52 52
 }
Please login to merge, or discard this patch.
controller/main_controller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -156,15 +156,15 @@
 block discarded – undo
156 156
 	{
157 157
 		if (!$this->user->data['is_bot'] && !$this->request->is_set('page'))
158 158
 		{
159
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
160
-				SET topic_views = topic_views + 1, topic_last_view_time = ' . time() . "
159
+			$sql = 'UPDATE '.TOPICS_TABLE.'
160
+				SET topic_views = topic_views + 1, topic_last_view_time = ' . time()."
161 161
 				WHERE topic_id = $topic_id";
162 162
 			$this->db->sql_query($sql);
163 163
 
164 164
 			// Update the attachment download counts
165 165
 			if (sizeof($update_count))
166 166
 			{
167
-				$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
167
+				$sql = 'UPDATE '.ATTACHMENTS_TABLE.'
168 168
 					SET download_count = download_count + 1
169 169
 					WHERE ' . $this->db->sql_in_set('attach_id', array_unique($update_count));
170 170
 				$this->db->sql_query($sql);
Please login to merge, or discard this patch.
model/mapper/fields.php 1 patch
Spacing   +3 added lines, -3 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 field_order ASC';
31 31
 	}
32 32
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public function get_max_field_id()
37 37
 	{
38
-		$result = $this->db->sql_query('SELECT MAX(' . $this->entity_pkey . ') AS max_id FROM ' . $this->entity_table);
38
+		$result = $this->db->sql_query('SELECT MAX('.$this->entity_pkey.') AS max_id FROM '.$this->entity_table);
39 39
 		$max_id = $this->db->sql_fetchfield('max_id');
40 40
 		$this->db->sql_freeresult($result);
41 41
 
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
@@ -36,8 +36,8 @@
 block discarded – undo
36 36
 	 */
37 37
 	public function create($type)
38 38
 	{
39
-		$mapper_class = 'blitze\\content\\model\\mapper\\' . $type;
40
-		$collection = 'blitze\\content\\model\\collections\\' . $type;
39
+		$mapper_class = 'blitze\\content\\model\\mapper\\'.$type;
40
+		$collection = 'blitze\\content\\model\\collections\\'.$type;
41 41
 
42 42
 		return new $mapper_class($this->db, new $collection, $this, $this->mapper_tables[$type]);
43 43
 	}
Please login to merge, or discard this patch.