Completed
Push — develop ( 7d0f73...48b424 )
by Daniel
12:13 queued 09:25
created
blocks/forum_topics.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	{
142 142
 		$this->set_display_fields();
143 143
 
144
-		$view = 'S_' . strtoupper($this->settings['template']);
144
+		$view = 'S_'.strtoupper($this->settings['template']);
145 145
 		$post_data = $this->get_post_data($topic_data);
146 146
 		$topic_data = array_values($topic_data);
147 147
 
@@ -189,10 +189,10 @@  discard block
 block discarded – undo
189 189
 				'VIEWS'				=> $row['topic_views'],
190 190
 				'S_UNREAD_TOPIC'	=> $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']),
191 191
 
192
-				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
193
-				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"),
194
-				'U_NEW_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&view=unread") . '#unread',
195
-				'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'],
192
+				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
193
+				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"),
194
+				'U_NEW_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&view=unread").'#unread',
195
+				'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'],
196 196
 			));
197 197
 			unset($topic_data[$i], $post_data[$topic_id]);
198 198
 		}
Please login to merge, or discard this patch.
blocks/member_menu.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
 				'USER_POSTS'	=> $this->user->data['user_posts'],
69 69
 				'NEW_POSTS'		=> $this->get_new_posts_count(),
70 70
 
71
-				'U_PROFILE'		=> append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&u=' . $this->user->data['user_id']),
72
-				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'),
73
-				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'),
74
-				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&folder=inbox'),
75
-				'U_LOGOUT'		=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id),
71
+				'U_PROFILE'		=> append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&u='.$this->user->data['user_id']),
72
+				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'),
73
+				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'),
74
+				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&folder=inbox'),
75
+				'U_LOGOUT'		=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id),
76 76
 				'U_MCP' 		=> $this->get_mcp_url(),
77 77
 				'U_ACP'			=> $this->get_acp_url(),
78 78
 			));
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	protected function get_mcp_url()
101 101
 	{
102
-		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : '';
102
+		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : '';
103 103
 	}
104 104
 
105 105
 	/**
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 */
108 108
 	protected function get_acp_url()
109 109
 	{
110
-		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path . 'adm/index.' . $this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
110
+		return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path.'adm/index.'.$this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : '';
111 111
 	}
112 112
 
113 113
 	/**
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 				POSTS_TABLE		=> 'p',
121 121
 			),
122 122
 			'WHERE'		=> array(
123
-				't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'],
123
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
124 124
 			),
125 125
 		);
126 126
 
Please login to merge, or discard this patch.
services/util.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 */
104 104
 	public function get_default_avatar()
105 105
 	{
106
-		return '<img src="' . $this->get_theme_path() . '/images/no_avatar.gif" alt="" />';
106
+		return '<img src="'.$this->get_theme_path().'/images/no_avatar.gif" alt="" />';
107 107
 	}
108 108
 
109 109
 	/**
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	public function get_theme_path()
114 114
 	{
115 115
 		$web_path = $this->get_web_path();
116
-		return "{$web_path}styles/" . rawurlencode($this->user->style['style_path']) . '/theme';
116
+		return "{$web_path}styles/".rawurlencode($this->user->style['style_path']).'/theme';
117 117
 	}
118 118
 
119 119
 	/**
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 	public function get_web_path()
124 124
 	{
125 125
 		// Determine board url - we may need it later
126
-		$board_url = generate_board_url() . '/';
126
+		$board_url = generate_board_url().'/';
127 127
 
128 128
 		$corrected_path = $this->path_helper->get_web_root_path();
129 129
 		return (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;
Please login to merge, or discard this patch.
services/tree/display.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	{
80 80
 		$sql = "SELECT *
81 81
 			FROM $this->items_table
82
-			WHERE $this->pk = " . (int) $node_id ;
82
+			WHERE $this->pk = ".(int) $node_id;
83 83
 		$result = $this->db->sql_query($sql);
84 84
 		$row = $this->db->sql_fetchrow($result);
85 85
 		$this->db->sql_freeresult($result);
@@ -108,8 +108,8 @@  discard block
 block discarded – undo
108 108
 					$this->items_table => 'i'
109 109
 				),
110 110
 				'WHERE'		=> array(
111
-					'i.depth ' . (($max_depth) ? " BETWEEN $start AND " . ($start + $max_depth) : ' >= ' . $start),
112
-					(($this->sql_where) ? 'i.' . $this->sql_where : ''),
111
+					'i.depth '.(($max_depth) ? " BETWEEN $start AND ".($start + $max_depth) : ' >= '.$start),
112
+					(($this->sql_where) ? 'i.'.$this->sql_where : ''),
113 113
 				),
114 114
 				'ORDER_BY'	=> 'i.left_id ASC',
115 115
 			),
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	 * @param \phpbb\template\twig\twig $template
156 156
 	 * @param string $handle
157 157
 	 */
158
-	public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
158
+	public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
159 159
 	{
160 160
 		$prev_depth = 0;
161 161
 		$parental_depth = array(0 => -1);
@@ -164,10 +164,10 @@  discard block
 block discarded – undo
164 164
 		for ($i = 0, $size = sizeof($data); $i < $size; $i++)
165 165
 		{
166 166
 			$row 		= $data[$i];
167
-			$this_depth	= $parental_depth[$row['parent_id']] + 1;
168
-			$repeat		= abs($prev_depth - $this_depth);
167
+			$this_depth = $parental_depth[$row['parent_id']] + 1;
168
+			$repeat = abs($prev_depth - $this_depth);
169 169
 
170
-			$tpl_data	= array(
170
+			$tpl_data = array(
171 171
 				'PREV_DEPTH'	=> $prev_depth,
172 172
 				'THIS_DEPTH'	=> $this_depth,
173 173
 				'NUM_KIDS'		=> $this->count_descendants($row),
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
 			for ($j = 0; $j < $repeat; $j++)
179 179
 			{
180
-				$template->assign_block_vars($handle . '.close', array());
180
+				$template->assign_block_vars($handle.'.close', array());
181 181
 			}
182 182
 
183 183
 			$prev_depth = $this_depth;
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 
187 187
 		for ($i = 0; $i < $prev_depth; $i++)
188 188
 		{
189
-			$template->assign_block_vars('close_' . $handle, array());
189
+			$template->assign_block_vars('close_'.$handle, array());
190 190
 		}
191 191
 	}
192 192
 
@@ -225,10 +225,10 @@  discard block
 block discarded – undo
225 225
 			}
226 226
 
227 227
 			$right = $row['right_id'];
228
-			$title = $padding . '&#x251c;&#x2500; ' . $row[$title_column];
228
+			$title = $padding.'&#x251c;&#x2500; '.$row[$title_column];
229 229
 			$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
230 230
 
231
-			$return_options .= '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
231
+			$return_options .= '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
232 232
 			$return_data[$row[$this->pk]] = $title;
233 233
 		}
234 234
 
Please login to merge, or discard this patch.
services/icon_picker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 				'@blitze_sitemaker/assets/icons/picker.min.js',
51 51
 			),
52 52
 			'css'	=> array(
53
-				defined('IN_ADMIN') ? $this->util->get_web_path() . 'assets/css/font-awesome.min.css' : '',
53
+				defined('IN_ADMIN') ? $this->util->get_web_path().'assets/css/font-awesome.min.css' : '',
54 54
 				'@blitze_sitemaker/vendor/jquery-ui/themes/smoothness/jquery-ui.min.css',
55 55
 				'@blitze_sitemaker/assets/icons/picker.min.css',
56 56
 			)
Please login to merge, or discard this patch.
controller/forum.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,12 +59,12 @@
 block discarded – undo
59 59
 		 * to fix relative paths for forum images
60 60
 		 */
61 61
 		global $phpbb_root_path;
62
-		$phpbb_root_path = generate_board_url() . '/';
62
+		$phpbb_root_path = generate_board_url().'/';
63 63
 
64 64
 		// @codeCoverageIgnoreStart
65 65
 		if (!function_exists('display_forums'))
66 66
 		{
67
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
67
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
68 68
 		}
69 69
 		// @codeCoverageIgnoreEnd
70 70
 
Please login to merge, or discard this patch.
services/menus/display.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 * @param string $handle
71 71
 	 * @return void
72 72
 	 */
73
-	public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
73
+	public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
74 74
 	{
75 75
 		$this->prepare_items($data);
76 76
 
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
 				$row['num_kids'] = $this->count_descendants($row);
85 85
 
86 86
 				$template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER));
87
-				$this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth));
87
+				$this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth));
88 88
 			}
89 89
 
90
-			$this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth));
90
+			$this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth));
91 91
 		}
92 92
 	}
93 93
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 			}
127 127
 
128 128
 			$is_current_item = $this->is_current_item($row);
129
-			$this_depth	= $this->parental_depth[$row['parent_id']] + 1;
129
+			$this_depth = $this->parental_depth[$row['parent_id']] + 1;
130 130
 			$leaf = $this->get_leaf_node($row, $is_current_item);
131 131
 
132 132
 			$this->parental_depth[$row[$this->pk]] = $this_depth;
@@ -155,8 +155,8 @@  discard block
 block discarded – undo
155 155
 	 */
156 156
 	protected function set_current_item(array $data)
157 157
 	{
158
-		$curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
159
-		$curr_page = str_replace('/index.' . $this->php_ext, '/', $curr_page);
158
+		$curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
159
+		$curr_page = str_replace('/index.'.$this->php_ext, '/', $curr_page);
160 160
 		$curr_parts = explode('&', $this->user->page['query_string']);
161 161
 
162 162
 		$data = array_values($data);
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	 * @param int $repeat
240 240
 	 * @return void
241 241
 	 */
242
-	protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat)
242
+	protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat)
243 243
 	{
244 244
 		for ($i = 0; $i < $repeat; $i++)
245 245
 		{
Please login to merge, or discard this patch.
services/menus/menu_block.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@
 block discarded – undo
124 124
 	{
125 125
 		$row['is_navigable'] = $this->is_navigable($row);
126 126
 		$row['is_expandable'] = ($row['is_navigable'] && !$row['item_target']) ? true : false;
127
-		$row['url_path'] = str_replace('/index.' . $this->php_ext, '/', $row['url_path']);
127
+		$row['url_path'] = str_replace('/index.'.$this->php_ext, '/', $row['url_path']);
128 128
 	}
129 129
 
130 130
 	/**
Please login to merge, or discard this patch.
services/blocks/display.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
 			$edit_mode = $this->toggle_edit_mode();
70 70
 			$style_id = $this->get_style_id();
71
-			$current_route = ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
71
+			$current_route = ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
72 72
 			$route_info = $blocks->get_route_info($current_route, $this->user->page['page_dir'], $style_id, $edit_mode);
73 73
 
74 74
 			$display_modes = $this->get_display_modes($route_info['is_sub_route']);
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	protected function toggle_edit_mode()
116 116
 	{
117
-		$edit_mode = $this->request->variable($this->config['cookie_name'] . '_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
117
+		$edit_mode = $this->request->variable($this->config['cookie_name'].'_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
118 118
 
119 119
 		if ($this->request->is_set('edit_mode'))
120 120
 		{
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 				);
171 171
 			}
172 172
 
173
-			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode);
173
+			$u_edit_mode = append_sid(generate_board_url().'/'.ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode='.(int) !$edit_mode);
174 174
 		}
175 175
 		else
176 176
 		{
Please login to merge, or discard this patch.