Completed
Push — develop ( 755a17...843010 )
by Daniel
07:33
created
services/fields.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
 		$this->display_mode = $view_mode;
95 95
 		$this->content_type = $entity->get_content_name();
96
-		$this->tpl_name	= ($custom_tpl) ? $this->content_type . '_' . $view_mode : '';
96
+		$this->tpl_name = ($custom_tpl) ? $this->content_type.'_'.$view_mode : '';
97 97
 		$this->view_mode = (in_array($view_mode, array('summary', 'detail'))) ? $view_mode : 'summary';
98 98
 		$this->form_fields = array_intersect_key($this->fields_factory->get_all(), array_flip($view_mode_fields));
99 99
 		$this->db_fields = $db_fields;
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public function show($type, array $topic_data, array $post_data, array $users_cache, array &$attachments, array &$update_count, array $topic_tracking_info, array $topic_data_overwrite = array(), $mode = '')
116 116
 	{
117
-		$callable = 'get_' . $this->view_mode . '_template_data';
117
+		$callable = 'get_'.$this->view_mode.'_template_data';
118 118
 		$tpl_data = array_merge(array(
119 119
 				'TOPIC_COMMENTS'	=> $this->comments->count($topic_data),
120 120
 				'S_USER_LOGGED_IN'	=> $this->user->data['is_registered'],
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 			$field_data['field_props'] = array_replace_recursive($this->form_fields[$field_type]->get_default_props(), $field_data['field_props']);
182 182
 			$field_data['field_value'] = &$field_values[$field_name];
183 183
 
184
-			$field_contents	= $this->form_fields[$field_type]->display_field($field_data, $this->display_mode, $tpl_data, $this->content_type);
184
+			$field_contents = $this->form_fields[$field_type]->display_field($field_data, $this->display_mode, $tpl_data, $this->content_type);
185 185
 
186 186
 			// this essentially hides other fields if the field returns an array
187 187
 			if (is_array($field_contents))
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 
193 193
 			if (!empty($field_contents))
194 194
 			{
195
-				$display_data[$field_name] = '<div class="field-label ' . $this->label[$field_data['field_' . $this->view_mode . '_ldisp']] . '">' . $field_data['field_label'] . $this->language->lang('COLON') . ' </div>' . $field_contents;
195
+				$display_data[$field_name] = '<div class="field-label '.$this->label[$field_data['field_'.$this->view_mode.'_ldisp']].'">'.$field_data['field_label'].$this->language->lang('COLON').' </div>'.$field_contents;
196 196
 			}
197 197
 		}
198 198
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -139,8 +139,7 @@
 block discarded – undo
139 139
 			$this->template->assign_vars(array_change_key_case(array_merge($tpl_data, $fields_data), CASE_UPPER));
140 140
 			$this->template->set_filenames(array('content' => $this->tpl_name));
141 141
 			$tpl_data['CUSTOM_DISPLAY'] = $this->template->assign_display('content');
142
-		}
143
-		else
142
+		} else
144 143
 		{
145 144
 			$tpl_data['SEQ_DISPLAY'] = join("\n", $fields_data);
146 145
 		}
Please login to merge, or discard this patch.
controller/main_controller.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 	 * @param \blitze\content\services\poll							$poll				Poll object
51 51
 	 * @param \blitze\content\services\types						$content_types		Content types object
52 52
 	 * @param \blitze\content\services\views\views_factory			$views_factory		Views handlers
53
-	*/
53
+	 */
54 54
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\request\request_interface $request, \phpbb\template\template $template, \phpbb\user $user, \blitze\content\services\comments\comments_interface $comments, \blitze\content\services\poll $poll, \blitze\content\services\types $content_types, \blitze\content\services\views\views_factory $views_factory)
55 55
 	{
56 56
 		$this->db = $db;
Please login to merge, or discard this patch.
event/mcp_topic.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 	 * @param \blitze\content\services\fields		$fields				Content fields object
37 37
 	 * @param string								$phpbb_root_path	Path to the phpbb includes directory.
38 38
 	 * @param string								$php_ext			php file extension
39
-	*/
39
+	 */
40 40
 	public function __construct(\phpbb\db\driver\driver_interface $db, \blitze\content\services\types $content_types, \blitze\content\services\fields $fields, $phpbb_root_path, $php_ext)
41 41
 	{
42 42
 		$this->db = $db;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -115,9 +115,9 @@
 block discarded – undo
115 115
 		$forum_list = is_array($forum_list) ? $forum_list : array($forum_list);
116 116
 
117 117
 		$sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, t.topic_title AS post_subject, t.topic_time AS post_time, t.topic_poster AS poster_id, t.topic_first_post_id AS post_id, t.topic_attachment AS post_attachment, t.topic_first_poster_name AS username, t.topic_first_poster_colour AS user_colour
118
-			FROM ' . TOPICS_TABLE . ' t
119
-			WHERE ' . $this->db->sql_in_set('forum_id', $this->get_forum_list($forum_list)) . '
120
-				AND  ' . $this->db->sql_in_set('topic_visibility', $event['visibility_const']) . "
118
+			FROM ' . TOPICS_TABLE.' t
119
+			WHERE ' . $this->db->sql_in_set('forum_id', $this->get_forum_list($forum_list)).'
120
+				AND  ' . $this->db->sql_in_set('topic_visibility', $event['visibility_const'])."
121 121
 				AND topic_delete_user <> 0
122 122
 				{$event['limit_time_sql']}
123 123
 			ORDER BY {$event['sort_order_sql']}";
Please login to merge, or discard this patch.
event/search.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 	 * @param \phpbb\db\driver\driver_interface		$db					Database object
29 29
 	 * @param \phpbb\controller\helper				$helper				Helper object
30 30
 	 * @param \blitze\content\services\types		$content_types		Content types object
31
-	*/
31
+	 */
32 32
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \blitze\content\services\types $content_types)
33 33
 	{
34 34
 		$this->db = $db;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 	public function modify_posts_data(\phpbb\event\data $event)
59 59
 	{
60 60
 		$sql_array = $event['sql_array'];
61
-		$sql_array['WHERE'] .= ' AND t.topic_time <= ' . time();
61
+		$sql_array['WHERE'] .= ' AND t.topic_time <= '.time();
62 62
 
63 63
 		$sql_count = $sql_array;
64 64
 		$sql_count['SELECT'] = 'COUNT(p.post_id) AS total_results';
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 	public function modify_topic_data(\phpbb\event\data $event)
83 83
 	{
84 84
 		$sql_where = $event['sql_where'];
85
-		$sql_where .= ' AND t.topic_time <= ' . time();
85
+		$sql_where .= ' AND t.topic_time <= '.time();
86 86
 
87
-		$sql = 'SELECT COUNT(t.topic_id) AS total_results FROM ' . $event['sql_from'] . ' WHERE ' . $sql_where;
87
+		$sql = 'SELECT COUNT(t.topic_id) AS total_results FROM '.$event['sql_from'].' WHERE '.$sql_where;
88 88
 		$result = $this->db->sql_query($sql);
89 89
 		$total_results = $this->db->sql_fetchfield('total_results');
90 90
 		$this->db->sql_freeresult($result);
Please login to merge, or discard this patch.
event/listener.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 	 * @param \phpbb\language\language				$language			Language object
29 29
 	 * @param \blitze\content\services\types		$content_types		Content types object
30 30
 	 * @param string								$php_ext			php file extension
31
-	*/
31
+	 */
32 32
 	public function __construct(\phpbb\language\language $language, \blitze\content\services\types $content_types, $php_ext)
33 33
 	{
34 34
 		$this->language = $language;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
 	 */
79 79
 	public function add_viewonline_location(\phpbb\event\data $event)
80 80
 	{
81
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/content/') === 0)
81
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/content/') === 0)
82 82
 		{
83 83
 			$types = join('|', $this->content_types->get_forum_types());
84 84
 			preg_match("/\/content\/($types)(\/[0-9]\/.*)?/is", $event['row']['session_page'], $match);
Please login to merge, or discard this patch.
event/viewtopic.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	 *
25 25
 	 * @param \phpbb\controller\helper				$helper				Helper object
26 26
 	 * @param \blitze\content\services\types		$content_types		Content types object
27
-	*/
27
+	 */
28 28
 	public function __construct(\phpbb\controller\helper $helper, \blitze\content\services\types $content_types)
29 29
 	{
30 30
 		$this->helper = $helper;
Please login to merge, or discard this patch.
event/bbcodes.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
 
42 42
 		// Let's create the new BBCode
43 43
 		$configurator->BBCodes->addCustom(
44
-		    '[pagebreak title={SIMPLETEXT;optional;postFilter=ucwords}]',
45
-		    '<p><!-- pagebreak --></p>' .
46
-		    '<xsl:if test="@title"><h4>{SIMPLETEXT}</h4><br /></xsl:if>'
44
+			'[pagebreak title={SIMPLETEXT;optional;postFilter=ucwords}]',
45
+			'<p><!-- pagebreak --></p>' .
46
+			'<xsl:if test="@title"><h4>{SIMPLETEXT}</h4><br /></xsl:if>'
47 47
 		);
48 48
 	}
49 49
 
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 
63 63
 		// Let's create the new BBCode
64 64
 		$configurator->BBCodes->addCustom(
65
-		    '[tag={IDENTIFIER}]{TEXT}[/tag]',
66
-		    "<!-- begin field -->\n" .
65
+			'[tag={IDENTIFIER}]{TEXT}[/tag]',
66
+			"<!-- begin field -->\n" .
67 67
 			"<div data-field=\"{IDENTIFIER}\">{TEXT}</div><br />\n" .
68 68
 			"<!-- end field -->\n"
69 69
 		);
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 		// Let's create the new BBCode
43 43
 		$configurator->BBCodes->addCustom(
44 44
 		    '[pagebreak title={SIMPLETEXT;optional;postFilter=ucwords}]',
45
-		    '<p><!-- pagebreak --></p>' .
45
+		    '<p><!-- pagebreak --></p>'.
46 46
 		    '<xsl:if test="@title"><h4>{SIMPLETEXT}</h4><br /></xsl:if>'
47 47
 		);
48 48
 	}
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 		// Let's create the new BBCode
64 64
 		$configurator->BBCodes->addCustom(
65 65
 		    '[tag={IDENTIFIER}]{TEXT}[/tag]',
66
-		    "<!-- begin field -->\n" .
67
-			"<div data-field=\"{IDENTIFIER}\">{TEXT}</div><br />\n" .
66
+		    "<!-- begin field -->\n".
67
+			"<div data-field=\"{IDENTIFIER}\">{TEXT}</div><br />\n".
68 68
 			"<!-- end field -->\n"
69 69
 		);
70 70
 	}
Please login to merge, or discard this patch.
event/posting.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	 * Constructor
30 30
 	 *
31 31
 	 * @param \blitze\content\services\form\builder		$builder		Form builder object
32
-	*/
32
+	 */
33 33
 	public function __construct(\blitze\content\services\form\builder $builder)
34 34
 	{
35 35
 		$this->builder = $builder;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -160,8 +160,7 @@
 block discarded – undo
160 160
 			if ($this->build_content)
161 161
 			{
162 162
 				$event['redirect_url'] = $this->builder->get_cp_url();
163
-			}
164
-			else
163
+			} else
165 164
 			{
166 165
 				$topic_url = $this->builder->get_post_url($this->content_type, $event['post_data']);
167 166
 
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
@@ -172,8 +172,8 @@  discard block
 block discarded – undo
172 172
 			$update_count = array();
173 173
 			foreach ($posts_data as $topic_id => $posts)
174 174
 			{
175
-				$post_data	= array_shift($posts);
176
-				$topic_data	= $topics_data[$topic_id];
175
+				$post_data = array_shift($posts);
176
+				$topic_data = $topics_data[$topic_id];
177 177
 				$this->ptemplate->assign_block_vars('topicrow', $this->fields->show($type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info));
178 178
 			}
179 179
 			unset($topics_data, $posts_data, $users_cache, $attachments, $topic_tracking_info);
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 			POST_STICKY		=> 'CONTENT_STICKY_POSTS',
201 201
 		);
202 202
 
203
-		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);
203
+		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 204
 	}
205 205
 
206 206
 	/**
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 		foreach ($content_types as $value => $title)
268 268
 		{
269 269
 			$selected = ($type == $value) ? ' selected="selected"' : '';
270
-			$html .= '<option value="' . $value . '"' . $selected . ' data-toggle-setting="#fields-col-' . $value . '">' . $title . '</option>';
270
+			$html .= '<option value="'.$value.'"'.$selected.' data-toggle-setting="#fields-col-'.$value.'">'.$title.'</option>';
271 271
 		}
272 272
 
273 273
 		return $html;
Please login to merge, or discard this patch.