Completed
Push — develop ( 3861a6...5ec043 )
by Daniel
06:44
created
model/entity/type.php 2 patches
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.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -231,8 +231,7 @@  discard block
 block discarded – undo
231 231
 		if ($mode === 'edit')
232 232
 		{
233 233
 			return generate_text_for_edit($this->content_desc, $this->content_desc_uid, $this->content_desc_options);
234
-		}
235
-		else
234
+		} else
236 235
 		{
237 236
 			$parse_flags = ($this->content_desc_bitfield ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
238 237
 			return generate_text_for_display($this->content_desc, $this->content_desc_uid, $this->content_desc_bitfield, $parse_flags);
@@ -250,8 +249,7 @@  discard block
 block discarded – undo
250 249
 		if (!is_array($settings))
251 250
 		{
252 251
 			$this->content_view_settings = $settings;
253
-		}
254
-		else if (sizeof($settings))
252
+		} else if (sizeof($settings))
255 253
 		{
256 254
 			$this->content_view_settings = json_encode($settings);
257 255
 		}
Please login to merge, or discard this patch.
blocks/archive.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
 	 * @param \phpbb\controller\helper				$helper					Helper object
45 45
 	 * @param \phpbb\user							$user					User object
46 46
 	 * @param \blitze\content\services\types		$content_types			Content types object
47
-	*/
47
+	 */
48 48
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\content_visibility $content_visibility, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\user $user, \blitze\content\services\types $content_types, $phpbb_root_path, $php_ext)
49 49
 	{
50 50
 		$this->auth = $auth;
Please login to merge, or discard this 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.
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/entity/field.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -167,8 +167,7 @@  discard block
 block discarded – undo
167 167
 		if ($mode === 'edit')
168 168
 		{
169 169
 			return generate_text_for_edit($this->field_explain, $this->field_exp_uid, $this->field_exp_options);
170
-		}
171
-		else
170
+		} else
172 171
 		{
173 172
 			$parse_flags = ($this->field_exp_bitfield ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
174 173
 			return generate_text_for_display($this->field_explain, $this->field_exp_uid, $this->field_exp_bitfield, $parse_flags);
@@ -185,8 +184,7 @@  discard block
 block discarded – undo
185 184
 		if (!is_array($settings))
186 185
 		{
187 186
 			$this->field_settings = $settings;
188
-		}
189
-		else if (sizeof($settings))
187
+		} else if (sizeof($settings))
190 188
 		{
191 189
 			$this->field_settings = json_encode($settings);
192 190
 		}
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.
services/form/field/telephone.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 	 */
17 17
 	public function display_field($value)
18 18
 	{
19
-		return '<a href="tel:' . $value . '">' . preg_replace("/^1?(\d{3})(\d{3})(\d{4})$/", "$1-$2-$3", $value) . '</a>';
19
+		return '<a href="tel:'.$value.'">'.preg_replace("/^1?(\d{3})(\d{3})(\d{4})$/", "$1-$2-$3", $value).'</a>';
20 20
 	}
21 21
 
22 22
 	/**
Please login to merge, or discard this patch.
services/form/field/choice.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 
52 52
 		$this->ptemplate->assign_vars(array_change_key_case($data, CASE_UPPER));
53 53
 
54
-		return $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field . '_field');
54
+		return $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field.'_field');
55 55
 	}
56 56
 
57 57
 	/**
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		foreach ($data['field_settings']['field_options'] as $value => $label)
71 71
 		{
72 72
 			$this->ptemplate->assign_block_vars('option', array(
73
-				'ID'		=> 'field-'. $name . '-' . $count,
73
+				'ID'		=> 'field-'.$name.'-'.$count,
74 74
 				'LABEL'		=> $this->language->lang($label),
75 75
 				'SELECTED'	=> (in_array($value, $selected, true)) ? true : false,
76 76
 				'VALUE'		=> $value
Please login to merge, or discard this patch.
services/form/field/image.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 		$value = $this->request->variable($name, $value);
20 20
 		$value = $this->get_image_src($value);
21 21
 
22
-		return ($value) ? '[img]' . $value . '[/img]' : '';
22
+		return ($value) ? '[img]'.$value.'[/img]' : '';
23 23
 	}
24 24
 
25 25
 	/**
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 		$data['field_value'] = $this->get_image_src($bbcode_value);
35 35
 
36 36
 		$this->ptemplate->assign_vars(array_change_key_case($data, CASE_UPPER));
37
-		$field = $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field . '_field');
37
+		$field = $this->ptemplate->render_view('blitze/content', "fields/$field.html", $field.'_field');
38 38
 
39 39
 		$data['field_value'] = $bbcode_value;
40 40
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	public function display_field($value)
48 48
 	{
49
-		return ($value) ? '<div class="img-ui">' . $value . '</div>' : '';
49
+		return ($value) ? '<div class="img-ui">'.$value.'</div>' : '';
50 50
 	}
51 51
 
52 52
 	/**
Please login to merge, or discard this patch.