Completed
Pull Request — master (#26)
by Daniel
12:09 queued 09:23
created
blocks/stats.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,9 +40,9 @@
 block discarded – undo
40 40
 	public function display(array $settings, $edit_mode = false)
41 41
 	{
42 42
 		$content = '';
43
-		$content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']) . '<br />';
44
-		$content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']) . '<br />';
45
-		$content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']) . '<br />';
43
+		$content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']).'<br />';
44
+		$content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']).'<br />';
45
+		$content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']).'<br />';
46 46
 		$content .= $this->translator->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour']));
47 47
 
48 48
 		return array(
Please login to merge, or discard this patch.
event/listener.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -117,9 +117,9 @@  discard block
 block discarded – undo
117 117
 	public function load_permission_language(\phpbb\event\data $event)
118 118
 	{
119 119
 		$permissions = $event['permissions'];
120
-		$permissions['a_sm_settings']	= array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
121
-		$permissions['a_sm_manage_blocks']	= array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
122
-		$permissions['a_sm_manage_menus']	= array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
120
+		$permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
121
+		$permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
122
+		$permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
123 123
 		$event['permissions'] = $permissions;
124 124
 	}
125 125
 
@@ -193,13 +193,13 @@  discard block
 block discarded – undo
193 193
 	 */
194 194
 	public function set_startpage(\phpbb\event\data $event)
195 195
 	{
196
-		if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
196
+		if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
197 197
 		{
198 198
 			$method = $this->config['sitemaker_startpage_method'];
199 199
 			$this->is_startpage = true;
200 200
 
201 201
 			$controller_dir = explode('\\', get_class($controller_object));
202
-			$controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles';
202
+			$controller_style_dir = 'ext/'.$controller_dir[0].'/'.$controller_dir[1].'/styles';
203 203
 			$this->template->set_style(array($controller_style_dir, 'styles'));
204 204
 
205 205
 			$arguments = explode('/', $this->config['sitemaker_startpage_params']);
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 */
221 221
 	public function add_viewonline_location(\phpbb\event\data $event)
222 222
 	{
223
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
223
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
224 224
 		{
225 225
 			$event['location'] = $this->translator->lang('FORUM_INDEX');
226 226
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');
Please login to merge, or discard this patch.
exception/base.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,10 +80,10 @@
 block discarded – undo
80 80
 		foreach ($message_portions as &$message)
81 81
 		{
82 82
 			// Attempt to translate each portion
83
-			$translated_message = $translator->lang('EXCEPTION_' . $message);
83
+			$translated_message = $translator->lang('EXCEPTION_'.$message);
84 84
 
85 85
 			// Check if translating did anything
86
-			if ($translated_message !== 'EXCEPTION_' . $message)
86
+			if ($translated_message !== 'EXCEPTION_'.$message)
87 87
 			{
88 88
 				// It did, so replace message with the translated version
89 89
 				$message = $translated_message;
Please login to merge, or discard this patch.
acp/settings_module.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 			$this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
136 136
 			$this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
137 137
 
138
-			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
138
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
139 139
 		}
140 140
 	}
141 141
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	{
148 148
 		$style_prefs = json_decode($this->config_text->get('sm_layout_prefs'), true);
149 149
 
150
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
150
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
151 151
 
152 152
 		$styles = array();
153 153
 		while ($row = $this->db->sql_fetchrow($result))
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 		foreach ($layouts as $name => $path)
201 201
 		{
202 202
 			$selected = ($path == $pref) ? ' selected="selected"' : '';
203
-			$options .= '<option value="' . $path . '"' . $selected . '>' . $this->translator->lang('LAYOUT_' . strtoupper($name)) . '</option>';
203
+			$options .= '<option value="'.$path.'"'.$selected.'>'.$this->translator->lang('LAYOUT_'.strtoupper($name)).'</option>';
204 204
 		}
205 205
 
206 206
 		return $options;
@@ -214,11 +214,11 @@  discard block
 block discarded – undo
214 214
 	{
215 215
 		$views = array('basic', 'boxed', 'simple');
216 216
 
217
-		$options = '<option value="">' . $this->translator->lang('BLOCK_VIEW_DEFAULT') . '</option>';
217
+		$options = '<option value="">'.$this->translator->lang('BLOCK_VIEW_DEFAULT').'</option>';
218 218
 		foreach ($views as $view)
219 219
 		{
220 220
 			$selected = ($view == $pref) ? ' selected="selected"' : '';
221
-			$options .= '<option value="' . $view . '"' . $selected . '>' . $this->translator->lang('BLOCK_VIEW_' . strtoupper($view)) . '</option>';
221
+			$options .= '<option value="'.$view.'"'.$selected.'>'.$this->translator->lang('BLOCK_VIEW_'.strtoupper($view)).'</option>';
222 222
 		}
223 223
 
224 224
 		return $options;
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 			$path = dirname($path);
261 261
 			$name = basename($path);
262 262
 
263
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
263
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
264 264
 		}
265 265
 		ksort($layouts);
266 266
 
Please login to merge, or discard this patch.
model/blocks/entity/block.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
141 141
 	 */
142 142
 	public function set_class($class)
143 143
 	{
144
-		$this->class = ($class) ? ' ' . trim($class) : '';
144
+		$this->class = ($class) ? ' '.trim($class) : '';
145 145
 		return $this;
146 146
 	}
147 147
 
Please login to merge, or discard this patch.
services/forum/options.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 		// @codeCoverageIgnoreStart
23 23
 		if (!function_exists('make_forum_select'))
24 24
 		{
25
-			include($phpbb_root_path . 'includes/functions_admin.' . $php_ext);
25
+			include($phpbb_root_path.'includes/functions_admin.'.$php_ext);
26 26
 		}
27 27
 		// @codeCoverageIgnoreEnd
28 28
 	}
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 		$forum_options = array('' => 'ALL');
44 44
 		foreach ($forumlist as $row)
45 45
 		{
46
-			$forum_options[$row['forum_id']] = $row['padding'] . $row['forum_name'];
46
+			$forum_options[$row['forum_id']] = $row['padding'].$row['forum_name'];
47 47
 		}
48 48
 
49 49
 		return $forum_options;
Please login to merge, or discard this patch.
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&amp;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&amp;t=$topic_id&amp;view=unread") . '#unread',
195
-				'U_LAST_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;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&amp;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&amp;t=$topic_id&amp;view=unread").'#unread',
195
+				'U_LAST_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;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&amp;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&amp;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&amp;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&amp;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.