Completed
Push — develop ( c5a37f...226ad1 )
by Daniel
06:54
created
services/views/driver/base_view.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 		$update_count = array();
135 135
 		foreach ($posts_data as $topic_id => $posts)
136 136
 		{
137
-			$post_data	= array_shift($posts);
138
-			$topic_data	= $topics_data[$topic_id];
137
+			$post_data = array_shift($posts);
138
+			$topic_data = $topics_data[$topic_id];
139 139
 
140 140
 			$this->template->assign_block_vars('topicrow', array_merge(
141 141
 				$this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info),
@@ -244,8 +244,8 @@  discard block
 block discarded – undo
244 244
 		$this->pagination->generate_template_pagination(
245 245
 			array(
246 246
 				'routes' => array(
247
-					'blitze_content_' . $route_type,
248
-					'blitze_content_' . $route_type . '_page',
247
+					'blitze_content_'.$route_type,
248
+					'blitze_content_'.$route_type.'_page',
249 249
 				),
250 250
 				'params' => $params,
251 251
 			),
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 				->fetch_forum($topic_data['forum_id'])
337 337
 				->fetch_topic_poster($topic_data['topic_poster'])
338 338
 				->fetch_custom(array(
339
-					'WHERE' => array('t.topic_id <> ' . (int) $topic_data['topic_id'])
339
+					'WHERE' => array('t.topic_id <> '.(int) $topic_data['topic_id'])
340 340
 				))->build(true, true, false);
341 341
 
342 342
 			$topics_data = $this->forum->get_topic_data(5);
Please login to merge, or discard this patch.
services/views/driver/portal.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,8 +136,7 @@
 block discarded – undo
136 136
 		if (sizeof(array_keys($filters)) > 1)
137 137
 		{
138 138
 			return array('filters' => $filters);
139
-		}
140
-		else
139
+		} else
141 140
 		{
142 141
 			$key = key($filters);
143 142
 			return array(
Please login to merge, or discard this patch.
services/actions/topic/index.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 	 */
91 91
 	public function execute($u_action, $mode = '')
92 92
 	{
93
-		include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
93
+		include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
94 94
 
95 95
 		$this->language->add_lang('viewforum');
96 96
 		$this->language->add_lang('manager', 'blitze/content');
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
 			$filter_topic_status = $this->apply_status_filter($sql_where_array);
107 107
 			$filter_content_type = $this->apply_content_type_filter();
108 108
 
109
-			$callable = 'init_' . $mode . '_mode';
110
-			$this->base_url = $u_action . (sizeof($this->params) ? '&amp;' : '');
109
+			$callable = 'init_'.$mode.'_mode';
110
+			$this->base_url = $u_action.(sizeof($this->params) ? '&amp;' : '');
111 111
 			$this->$callable($content_types, $sql_where_array);
112 112
 
113 113
 			$this->forum->query(true, false)
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 		$topic_tracking_info = $this->forum->get_topic_tracking_info();
139 139
 
140 140
 		$topics_data = array_values($topics_data);
141
-		$base_url = $u_action . http_build_query($this->params);
141
+		$base_url = $u_action.http_build_query($this->params);
142 142
 
143 143
 		for ($i = 0, $size = sizeof($topics_data); $i < $size; $i++)
144 144
 		{
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 	{
173 173
 		return array(
174 174
 			'ATTACH_ICON_IMG'	=> $this->get_attachment_icon($row),
175
-			'U_REVIEW_TOPIC'	=> $u_action . "&amp;do=view&amp;type=$content_type&amp;t=" . $row['topic_id'],
175
+			'U_REVIEW_TOPIC'	=> $u_action."&amp;do=view&amp;type=$content_type&amp;t=".$row['topic_id'],
176 176
 			'U_DELETE'			=> $this->get_delete_url($mode, $u_action, $row, $post_row),
177 177
 		);
178 178
 	}
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 			'S_CAN_MAKE_NORMAL'		=> ($s_can_make_sticky || $s_can_make_announce),
199 199
 			'S_CAN_MAKE_STICKY'		=> $s_can_make_sticky,
200 200
 			'S_CAN_MAKE_ANNOUNCE'	=> $s_can_make_announce,
201
-			'U_MCP_ACTION'			=> $this->base_url . '&amp;do=moderate&amp;redirect=' . $this->get_redirect_url($this->base_url),
201
+			'U_MCP_ACTION'			=> $this->base_url.'&amp;do=moderate&amp;redirect='.$this->get_redirect_url($this->base_url),
202 202
 		));
203 203
 	}
204 204
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 	 */
209 209
 	protected function init_ucp_mode(array $content_types, array &$sql_where_array)
210 210
 	{
211
-		$sql_where_array[] =  't.topic_poster = ' . (int) $this->user->data['user_id'];
211
+		$sql_where_array[] = 't.topic_poster = '.(int) $this->user->data['user_id'];
212 212
 
213 213
 		// list all content types that the user can post in
214 214
 		$postable_forums = array_intersect_key($this->content_forums, $this->auth->acl_getf('f_post', true));
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 			$this->template->assign_block_vars('postable', array(
221 221
 				'TYPE'		=> $entity->get_content_langname(),
222 222
 				'COLOUR'	=> $entity->get_content_colour(),
223
-				'U_POST'	=> append_sid("{$this->phpbb_root_path}posting." . $this->php_ext, 'mode=post&amp;f=' . $entity->get_forum_id()),
223
+				'U_POST'	=> append_sid("{$this->phpbb_root_path}posting.".$this->php_ext, 'mode=post&amp;f='.$entity->get_forum_id()),
224 224
 			));
225 225
 		}
226 226
 	}
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 			'CONTENT_TYPE'			=> $entity->get_content_langname(),
239 239
 			'CONTENT_TYPE_COLOR'	=> $entity->get_content_colour(),
240 240
 			'S_COMMENTS'			=> $entity->get_allow_comments(),
241
-			'U_CONTENT_TYPE'		=> $base_url . "&amp;type=$type",
241
+			'U_CONTENT_TYPE'		=> $base_url."&amp;type=$type",
242 242
 		);
243 243
 	}
244 244
 
@@ -288,8 +288,8 @@  discard block
 block discarded – undo
288 288
 		}
289 289
 
290 290
 		return array(
291
-			'TOPIC_STATUS'		=> $this->language->lang('TOPIC_' . strtoupper($topic_status)),
292
-			'U_TOPIC_STATUS'	=> $base_url . "&amp;status=$topic_status",
291
+			'TOPIC_STATUS'		=> $this->language->lang('TOPIC_'.strtoupper($topic_status)),
292
+			'U_TOPIC_STATUS'	=> $base_url."&amp;status=$topic_status",
293 293
 		);
294 294
 	}
295 295
 
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		if ($mode === 'mcp')
317 317
 		{
318 318
 			$u_mcp_queue = $this->get_mcp_queue_url($topic_unapproved, $posts_unapproved, $topic_id);
319
-			$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode=deleted_topics&amp;t=' . $topic_id, true, $this->user->session_id) : $u_mcp_queue;
319
+			$u_mcp_queue = (!$u_mcp_queue && $topic_deleted) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode=deleted_topics&amp;t='.$topic_id, true, $this->user->session_id) : $u_mcp_queue;
320 320
 		}
321 321
 
322 322
 		return array(
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 	 */
333 333
 	protected function get_mcp_queue_url($topic_unapproved, $posts_unapproved, $topic_id)
334 334
 	{
335
-		return ($topic_unapproved || $posts_unapproved) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&amp;t=$topic_id", true, $this->user->session_id) : '';
335
+		return ($topic_unapproved || $posts_unapproved) ? append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'i=queue&amp;mode='.(($topic_unapproved) ? 'approve_details' : 'unapproved_posts')."&amp;t=$topic_id", true, $this->user->session_id) : '';
336 336
 	}
337 337
 
338 338
 	/**
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 			if ($mode === 'mcp')
350 350
 			{
351 351
 				$redirect_url = $this->get_redirect_url($u_action);
352
-				$u_delete = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&amp;action=delete_topic&amp;t=' . $row['topic_id'] . '&amp;redirect=' . $redirect_url, true, $this->user->session_id);
352
+				$u_delete = append_sid("{$this->phpbb_root_path}mcp.$this->php_ext", 'quickmod=1&amp;action=delete_topic&amp;t='.$row['topic_id'].'&amp;redirect='.$redirect_url, true, $this->user->session_id);
353 353
 			}
354 354
 		}
355 355
 
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
 	 */
363 363
 	protected function get_redirect_url($base_url)
364 364
 	{
365
-		$base_url .= (sizeof($this->params)) ? '&' . http_build_query($this->params) : '';
365
+		$base_url .= (sizeof($this->params)) ? '&'.http_build_query($this->params) : '';
366 366
 		return urlencode(str_replace('&amp;', '&', $base_url));
367 367
 	}
368 368
 
Please login to merge, or discard this patch.
services/actions/type/index.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		$this->template = $template;
53 53
 		$this->content_types = $content_types;
54 54
 		$this->phpbb_root_path = $phpbb_root_path;
55
-		$this->phpbb_admin_path = $this->phpbb_root_path . $relative_admin_path;
55
+		$this->phpbb_admin_path = $this->phpbb_root_path.$relative_admin_path;
56 56
 		$this->php_ext = $php_ext;
57 57
 	}
58 58
 
@@ -76,19 +76,19 @@  discard block
 block discarded – undo
76 76
 
77 77
 				'S_ENABLED'		=> $entity->get_content_enabled(),
78 78
 
79
-				'U_DELETE'		=> $u_action . '&amp;do=pre_delete&amp;type=' . $type,
80
-				'U_EDIT'		=> $u_action . '&amp;do=edit&amp;type=' . $type,
81
-				'U_STATUS'		=> $u_action . '&amp;do=toggle_status&amp;type=' . $type,
79
+				'U_DELETE'		=> $u_action.'&amp;do=pre_delete&amp;type='.$type,
80
+				'U_EDIT'		=> $u_action.'&amp;do=edit&amp;type='.$type,
81
+				'U_STATUS'		=> $u_action.'&amp;do=toggle_status&amp;type='.$type,
82 82
 				'U_VIEW'		=> $this->controller_helper->route('blitze_content_type', array('type' => $type)),
83
-				'U_POST'		=> append_sid("{$this->phpbb_root_path}posting." . $this->php_ext, "mode=post&amp;f=$forum_id"),
84
-				'U_GROUP_PERMS'	=> append_sid("{$this->phpbb_admin_path}index." . $this->php_ext, "i=acp_permissions&amp;mode=setting_group_global"),
85
-				'U_FORUM_PERMS'	=> append_sid("{$this->phpbb_admin_path}index." . $this->php_ext, "i=acp_permissions&amp;mode=setting_forum_local&amp;forum_id[]=$forum_id"),
83
+				'U_POST'		=> append_sid("{$this->phpbb_root_path}posting.".$this->php_ext, "mode=post&amp;f=$forum_id"),
84
+				'U_GROUP_PERMS'	=> append_sid("{$this->phpbb_admin_path}index.".$this->php_ext, "i=acp_permissions&amp;mode=setting_group_global"),
85
+				'U_FORUM_PERMS'	=> append_sid("{$this->phpbb_admin_path}index.".$this->php_ext, "i=acp_permissions&amp;mode=setting_forum_local&amp;forum_id[]=$forum_id"),
86 86
 			);
87 87
 		}
88 88
 
89 89
 		$this->template->assign_vars(array(
90 90
 			'TYPES'			=> $types_list,
91
-			'U_ADD_TYPE'	=> $u_action . "&amp;do=add",
91
+			'U_ADD_TYPE'	=> $u_action."&amp;do=add",
92 92
 		));
93 93
 	}
94 94
 }
Please login to merge, or discard this patch.
services/form/field/image.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 		$value = $this->request->variable($name, $value);
38 38
 		$value = $this->get_image_src($value);
39 39
 
40
-		return ($value) ? '[img]' . $value . '[/img]' : '';
40
+		return ($value) ? '[img]'.$value.'[/img]' : '';
41 41
 	}
42 42
 
43 43
 	/**
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		));
59 59
 
60 60
 		$this->ptemplate->assign_vars($data);
61
-		$field = $this->ptemplate->render_view('blitze/content', "fields/image.html", $field . '_field');
61
+		$field = $this->ptemplate->render_view('blitze/content', "fields/image.html", $field.'_field');
62 62
 
63 63
 		$data['field_value'] = $bbcode_value;
64 64
 
@@ -73,12 +73,12 @@  discard block
 block discarded – undo
73 73
 		$image = '';
74 74
 		if ($data['field_value'])
75 75
 		{
76
-			$image = '<figure class="img-ui">' . $data['field_value'] . '</figure>';
76
+			$image = '<figure class="img-ui">'.$data['field_value'].'</figure>';
77 77
 			if ($mode !== 'block')
78 78
 			{
79
-				$view_props = array_fill_keys(array($mode . '_size', $mode . '_align'), '');
79
+				$view_props = array_fill_keys(array($mode.'_size', $mode.'_align'), '');
80 80
 				$image_props = array_filter(array_intersect_key($data['field_props'], $view_props));
81
-				$image = '<div class="' . join(' ', $image_props) . '">' . $image . '</div>';
81
+				$image = '<div class="'.join(' ', $image_props).'">'.$image.'</div>';
82 82
 			}
83 83
 		}
84 84
 		return $image;
Please login to merge, or discard this patch.
blocks/archive.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 				'count'	=> $row['total'],
80 80
 				'url'	=> $this->helper->route($info['route_name'], $info['route_params'] + array(
81 81
 					'filter_type'	=> 'archive',
82
-					'filter_value'	=> $row['year'] . '-' . $row['month'],
82
+					'filter_value'	=> $row['year'].'-'.$row['month'],
83 83
 				)),
84 84
 			);
85 85
 		}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -106,8 +106,7 @@
 block discarded – undo
106 106
 				'route_name'	=> 'blitze_content_type_filter',
107 107
 				'route_params'	=> array('type' => $this->content_types->get_forum_type($settings['forum_id'])),
108 108
 			);
109
-		}
110
-		else
109
+		} else
111 110
 		{
112 111
 			return array(
113 112
 				'forum_ids'		=> array_keys($this->content_types->get_forum_types()),
Please login to merge, or discard this patch.
controller/main_controller.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -116,8 +116,7 @@  discard block
 block discarded – undo
116 116
 		{
117 117
 			$this->update_views($topic_id, $update_count);
118 118
 			$template_file = $view_handler->get_detail_template();
119
-		}
120
-		else
119
+		} else
121 120
 		{
122 121
 			$template_file = 'views/print.html';
123 122
 			$this->template->assign_var('TOPIC_URL', generate_board_url(true) . $topic_data['topic_url']);
@@ -237,8 +236,7 @@  discard block
 block discarded – undo
237 236
 		if ($filter_type)
238 237
 		{
239 238
 			$filters = array($filter_type => (array) $filter_value);
240
-		}
241
-		else
239
+		} else
242 240
 		{
243 241
 			$filters = $this->request->variable('filters', array('' => array('' => '')));
244 242
 		}
Please login to merge, or discard this patch.