Completed
Pull Request — master (#26)
by Daniel
16:40 queued 13:36
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.
blocks/wordgraph.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
109 109
 			$this->ptemplate->assign_block_vars('wordgraph', array(
110 110
 				'WORD'			=> $this->show_word($word, $words_array[$word], $settings['show_word_count']),
111 111
 				'WORD_SIZE'		=> $settings['min_word_size'] + (($words_array[$word] - $params['min_count']) * $params['size_step']),
112
-				'WORD_COLOR'	=> $r . $g . $b,
113
-				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords=' . urlencode($word)),
112
+				'WORD_COLOR'	=> $r.$g.$b,
113
+				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords='.urlencode($word)),
114 114
 			));
115 115
 		}
116 116
 	}
@@ -187,8 +187,8 @@  discard block
 block discarded – undo
187 187
 				AND m.word_id = l.word_id
188 188
 				AND m.post_id = p.post_id
189 189
 				AND t.topic_id = p.topic_id
190
-				AND t.topic_time <= ' . time() . '
191
-				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.') .
190
+				AND t.topic_time <= ' . time().'
191
+				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.').
192 192
 				$sql_where,
193 193
 			'GROUP_BY'	=> 'l.word_text, l.word_count',
194 194
 			'ORDER_BY'	=> 'l.word_count DESC'
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 		if ($exclude_words)
206 206
 		{
207 207
 			$exclude_words = array_filter(explode(',', str_replace(' ', '', strtolower($exclude_words))));
208
-			$sql_where = (sizeof($exclude_words)) ? ' AND ' . $this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
208
+			$sql_where = (sizeof($exclude_words)) ? ' AND '.$this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
209 209
 		}
210 210
 
211 211
 		return $sql_where;
@@ -219,6 +219,6 @@  discard block
 block discarded – undo
219 219
 	 */
220 220
 	private function show_word($word, $count, $show_count)
221 221
 	{
222
-		return censor_text(($show_count) ? $word . '(' . $count . ')' : $word);
222
+		return censor_text(($show_count) ? $word.'('.$count.')' : $word);
223 223
 	}
224 224
 }
Please login to merge, or discard this patch.
blocks/mybookmarks.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 
108 108
 			$this->ptemplate->assign_block_vars('topicrow', array(
109 109
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
110
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id"),
110
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
111 111
 			));
112 112
 			unset($topic_data[$i]);
113 113
 		}
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 				BOOKMARKS_TABLE		=> 'b',
126 126
 			),
127 127
 			'WHERE'		=> array(
128
-				'b.user_id = ' . $this->user->data['user_id'],
128
+				'b.user_id = '.$this->user->data['user_id'],
129 129
 				'b.topic_id = t.topic_id',
130 130
 			),
131 131
 		);
Please login to merge, or discard this patch.
acp/menu_module.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
 			'ICON_PICKER'	=> $this->icon->picker(),
113 113
 			'T_PATH'		=> $this->phpbb_root_path,
114 114
 			'UA_MENU_ID'	=> $menu_id,
115
-			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '') . '/',
115
+			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '').'/',
116 116
 		));
117 117
 
118 118
 		$this->tpl_name = 'acp_menu';
Please login to merge, or discard this patch.
acp/settings_module.php 2 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -93,16 +93,16 @@  discard block
 block discarded – undo
93 93
 
94 94
 		$layouts = $this->get_layouts();
95 95
 
96
-        $this->template->assign_vars(array(
97
-            'u_action'			=> $this->u_action,
96
+		$this->template->assign_vars(array(
97
+			'u_action'			=> $this->u_action,
98 98
 			'icon_picker'		=> $this->icon->picker(),
99
-            'forum_icon'		=> $this->config['sm_forum_icon'],
100
-            'show_forum_nav'	=> (bool) $this->config['sm_show_forum_nav'],
99
+			'forum_icon'		=> $this->config['sm_forum_icon'],
100
+			'show_forum_nav'	=> (bool) $this->config['sm_show_forum_nav'],
101 101
 			'hide_login'		=> (bool) $this->config['sm_hide_login'],
102 102
 			'hide_online'		=> (bool) $this->config['sm_hide_online'],
103 103
 			'hide_birthday'		=> (bool) $this->config['sm_hide_birthday'],
104
-            'styles'			=> $this->get_styles_data($layouts),
105
-            'layouts'			=> $layouts,
104
+			'styles'			=> $this->get_styles_data($layouts),
105
+			'layouts'			=> $layouts,
106 106
 		));
107 107
 
108 108
 		$this->util->add_assets(array(
@@ -119,21 +119,21 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	protected function save_settings($form_key)
121 121
 	{
122
-        if ($this->request->is_set_post('submit'))
123
-        {
124
-            $this->check_form_key($form_key);
122
+		if ($this->request->is_set_post('submit'))
123
+		{
124
+			$this->check_form_key($form_key);
125 125
 
126 126
 			$layout_prefs = $this->request->variable('layouts', array(0 => array('' => '')));
127
-            $this->config_text->set('sm_layout_prefs', json_encode($layout_prefs));
127
+			$this->config_text->set('sm_layout_prefs', json_encode($layout_prefs));
128 128
 
129
-            $this->config->set('sm_hide_login', $this->request->variable('hide_login', 0));
130
-            $this->config->set('sm_hide_online', $this->request->variable('hide_online', 0));
131
-            $this->config->set('sm_hide_birthday', $this->request->variable('hide_birthday', 0));
132
-            $this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
133
-            $this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
129
+			$this->config->set('sm_hide_login', $this->request->variable('hide_login', 0));
130
+			$this->config->set('sm_hide_online', $this->request->variable('hide_online', 0));
131
+			$this->config->set('sm_hide_birthday', $this->request->variable('hide_birthday', 0));
132
+			$this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
133
+			$this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
134 134
 
135
-            $this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
136
-        }
135
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
136
+		}
137 137
 	}
138 138
 
139 139
 	/**
@@ -227,9 +227,9 @@  discard block
 block discarded – undo
227 227
 	protected function check_form_key($form_key)
228 228
 	{
229 229
 		if (!check_form_key($form_key))
230
-        {
231
-            $this->trigger_error('FORM_INVALID');
232
-        }
230
+		{
231
+			$this->trigger_error('FORM_INVALID');
232
+		}
233 233
 	}
234 234
 
235 235
 	/**
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
             $this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
133 133
             $this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
134 134
 
135
-            $this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
135
+            $this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
136 136
         }
137 137
 	}
138 138
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	{
145 145
 		$style_prefs = json_decode($this->config_text->get('sm_layout_prefs'), true);
146 146
 
147
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
147
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
148 148
 
149 149
 		$styles = array();
150 150
 		while ($row = $this->db->sql_fetchrow($result))
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 		foreach ($layouts as $name => $path)
198 198
 		{
199 199
 			$selected = ($path == $pref) ? ' selected="selected"' : '';
200
-			$options .= '<option value="' . $path . '"' . $selected . '>' . $this->translator->lang('LAYOUT_' . strtoupper($name)) . '</option>';
200
+			$options .= '<option value="'.$path.'"'.$selected.'>'.$this->translator->lang('LAYOUT_'.strtoupper($name)).'</option>';
201 201
 		}
202 202
 
203 203
 		return $options;
@@ -211,11 +211,11 @@  discard block
 block discarded – undo
211 211
 	{
212 212
 		$views = array('basic', 'boxed', 'simple');
213 213
 
214
-		$options = '<option value="">' . $this->translator->lang('BLOCK_VIEW_DEFAULT') . '</option>';
214
+		$options = '<option value="">'.$this->translator->lang('BLOCK_VIEW_DEFAULT').'</option>';
215 215
 		foreach ($views as $view)
216 216
 		{
217 217
 			$selected = ($view == $pref) ? ' selected="selected"' : '';
218
-			$options .= '<option value="' . $view . '"' . $selected . '>' . $this->translator->lang('BLOCK_VIEW_' . strtoupper($view)) . '</option>';
218
+			$options .= '<option value="'.$view.'"'.$selected.'>'.$this->translator->lang('BLOCK_VIEW_'.strtoupper($view)).'</option>';
219 219
 		}
220 220
 
221 221
 		return $options;
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 			$path = dirname($path);
258 258
 			$name = basename($path);
259 259
 
260
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
260
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
261 261
 		}
262 262
 
263 263
 		return $layouts;
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.
controller/forum.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 		// @codeCoverageIgnoreStart
58 58
 		if (!function_exists('display_forums'))
59 59
 		{
60
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
60
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
61 61
 		}
62 62
 		// @codeCoverageIgnoreEnd
63 63
 
Please login to merge, or discard this patch.
exception/base.php 2 patches
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -16,23 +16,23 @@  discard block
 block discarded – undo
16 16
 class base extends \Exception
17 17
 {
18 18
 	/**
19
-	* Null if the message is a string, array if the message was submitted as an array
20
-	* @var string|array
21
-	*/
19
+	 * Null if the message is a string, array if the message was submitted as an array
20
+	 * @var string|array
21
+	 */
22 22
 	protected $message_full;
23 23
 
24 24
 	protected $previous;
25 25
 
26 26
 	/**
27
-	* Constructor
28
-	*
29
-	* Different from normal exceptions in that we do not enforce $message to be a string.
30
-	*
31
-	* @param string|array $message
32
-	* @param int $code
33
-	* @param \Exception $previous
34
-	* @access public
35
-	*/
27
+	 * Constructor
28
+	 *
29
+	 * Different from normal exceptions in that we do not enforce $message to be a string.
30
+	 *
31
+	 * @param string|array $message
32
+	 * @param int $code
33
+	 * @param \Exception $previous
34
+	 * @access public
35
+	 */
36 36
 	public function __construct($message = null, $code = 0, \Exception $previous = null)
37 37
 	{
38 38
 		// We're slightly changing the way exceptions work
@@ -53,18 +53,18 @@  discard block
 block discarded – undo
53 53
 	}
54 54
 
55 55
 	/**
56
-	* Translate all portions of the message sent to the exception
57
-	*
58
-	* Goes through each element of the array and tries to translate them
59
-	*
60
-	* @param \phpbb\language\language $translator
61
-	* @param string|array $message_portions The message portions to translate
62
-	* @param string|null $parent_message Send a string to translate all of the
63
-	*     portions with the parent message (typically used to format a string
64
-	*     with the given message portions). Null to ignore. Default: Null
65
-	* @return array|string Array if $parent_message === null else a string
66
-	* @access protected
67
-	*/
56
+	 * Translate all portions of the message sent to the exception
57
+	 *
58
+	 * Goes through each element of the array and tries to translate them
59
+	 *
60
+	 * @param \phpbb\language\language $translator
61
+	 * @param string|array $message_portions The message portions to translate
62
+	 * @param string|null $parent_message Send a string to translate all of the
63
+	 *     portions with the parent message (typically used to format a string
64
+	 *     with the given message portions). Null to ignore. Default: Null
65
+	 * @return array|string Array if $parent_message === null else a string
66
+	 * @access protected
67
+	 */
68 68
 	protected function translate_portions(\phpbb\language\language $translator, $message_portions, $parent_message = null)
69 69
 	{
70 70
 		// Make sure our language file has been loaded
@@ -106,12 +106,12 @@  discard block
 block discarded – undo
106 106
 	}
107 107
 
108 108
 	/**
109
-	* Add our language file
110
-	*
111
-	* @param \phpbb\language\language $translator
112
-	* @return null
113
-	* @access public
114
-	*/
109
+	 * Add our language file
110
+	 *
111
+	 * @param \phpbb\language\language $translator
112
+	 * @return null
113
+	 * @access public
114
+	 */
115 115
 	public function add_lang(\phpbb\language\language $translator)
116 116
 	{
117 117
 		static $is_loaded = false;
@@ -130,15 +130,15 @@  discard block
 block discarded – undo
130 130
 	}
131 131
 
132 132
 	/**
133
-	* Output a string of this error message
134
-	*
135
-	* This will hopefully be never called, always catch the expected exceptions
136
-	* and call get_message to translate them into an error that a user can
137
-	* understand
138
-	*
139
-	* @return string
140
-	* @access public
141
-	*/
133
+	 * Output a string of this error message
134
+	 *
135
+	 * This will hopefully be never called, always catch the expected exceptions
136
+	 * and call get_message to translate them into an error that a user can
137
+	 * understand
138
+	 *
139
+	 * @return string
140
+	 * @access public
141
+	 */
142 142
 	public function __toString()
143 143
 	{
144 144
 		return (is_array($this->message_full)) ? var_export($this->message_full, true) : (string) $this->message_full;
Please login to merge, or discard this 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.
exception/out_of_bounds.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@
 block discarded – undo
15 15
 class invalid_argument extends base
16 16
 {
17 17
 	/**
18
-	* Translate this exception
19
-	*
20
-	* @param \phpbb\language\language $translator
21
-	* @return array|string
22
-	* @access public
23
-	*/
18
+	 * Translate this exception
19
+	 *
20
+	 * @param \phpbb\language\language $translator
21
+	 * @return array|string
22
+	 * @access public
23
+	 */
24 24
 	public function get_message(\phpbb\language\language $translator)
25 25
 	{
26 26
 		return $this->translate_portions($translator, $this->message_full, 'EXCEPTION_INVALID_ARGUMENT');
Please login to merge, or discard this patch.