Completed
Pull Request — master (#26)
by Daniel
09:34
created
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&t=$topic_id"),
110
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&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.
blocks/birthday.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	public function display(array $bdata, $edit_mode = false)
51 51
 	{
52
-		if (($content = $this->cache->get('pt_block_data_' . $bdata['bid'])) === false)
52
+		if (($content = $this->cache->get('pt_block_data_'.$bdata['bid'])) === false)
53 53
 		{
54 54
 			$content = '';
55 55
 			if ($this->find_birthday_users())
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 				$content = $this->ptemplate->render_view('blitze/sitemaker', 'blocks/birthday.html', 'birthday_block');
58 58
 
59 59
 				// we only check birthdays every hour, may make this an admin choice
60
-				$this->cache->put('pt_block_data_' . $bdata['bid'], $content, 3600);
60
+				$this->cache->put('pt_block_data_'.$bdata['bid'], $content, 3600);
61 61
 			}
62 62
 		}
63 63
 
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
 		$leap_year_birthdays = $this->adjust_leap_year($now, $time);
79 79
 
80 80
 		$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday 
81
-				FROM ' . USERS_TABLE . ' u
82
-				LEFT JOIN ' . BANLIST_TABLE . " b ON (u.user_id = b.ban_userid)
81
+				FROM ' . USERS_TABLE.' u
82
+				LEFT JOIN ' . BANLIST_TABLE." b ON (u.user_id = b.ban_userid)
83 83
 				WHERE (b.ban_id IS NULL
84 84
 					OR b.ban_exclude = 1)
85
-					AND (u.user_birthday " . $this->db->sql_like_expression(sprintf('%2d-%2d-', $now['mday'], $now['mon']) . $this->db->get_any_char()) . " $leap_year_birthdays)
86
-					AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')
85
+					AND (u.user_birthday " . $this->db->sql_like_expression(sprintf('%2d-%2d-', $now['mday'], $now['mon']).$this->db->get_any_char())." $leap_year_birthdays)
86
+					AND u.user_type IN (".USER_NORMAL.', '.USER_FOUNDER.')
87 87
 				ORDER BY u.username ASC';
88 88
 		$result = $this->db->sql_query($sql);
89 89
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 		$leap_year_birthdays = '';
114 114
 		if ($now['mday'] == 28 && $now['mon'] == 2 && !$time->format('L'))
115 115
 		{
116
-			$leap_year_birthdays = ' OR u.user_birthday ' . $this->db->sql_like_expression(sprintf('%2d-%2d-', 29, 2) . $this->db->get_any_char());
116
+			$leap_year_birthdays = ' OR u.user_birthday '.$this->db->sql_like_expression(sprintf('%2d-%2d-', 29, 2).$this->db->get_any_char());
117 117
 		}
118 118
 
119 119
 		return $leap_year_birthdays;
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.
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.
services/blocks/action/update_block.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
 		if (isset($allowed_fields[$field]))
36 36
 		{
37
-			$mutator = 'set_' . $field;
37
+			$mutator = 'set_'.$field;
38 38
 			$entity->$mutator($allowed_fields[$field]);
39 39
 			$item_mapper->save($entity);
40 40
 		}
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.
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.
services/blocks/cfg_handler.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 		// @codeCoverageIgnoreStart
64 64
 		if (!function_exists('validate_config_vars'))
65 65
 		{
66
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
66
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
67 67
 		}
68 68
 		// @codeCoverageIgnoreEnd
69 69
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		// @codeCoverageIgnoreStart
86 86
 		if (!function_exists('validate_config_vars'))
87 87
 		{
88
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
88
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
89 89
 		}
90 90
 		// @codeCoverageIgnoreEnd
91 91
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 		$vars['append'] = $this->append_field($vars);
174 174
 
175 175
 		$type = explode(':', $vars['type']);
176
-		$method = 'prep_' . $type[0] . '_field_for_display';
176
+		$method = 'prep_'.$type[0].'_field_for_display';
177 177
 
178 178
 		if (is_callable(array($this, $method)))
179 179
 		{
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		$l_explain = '';
218 218
 		if (!empty($vars['explain']))
219 219
 		{
220
-			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'] . '_EXPLAIN');
220
+			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'].'_EXPLAIN');
221 221
 		}
222 222
 
223 223
 		return $l_explain;
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 	{
318 318
 		$this->prep_checkbox_field_for_display($vars, $type, $field);
319 319
 
320
-		$vars['method'] ='build_multi_select';
320
+		$vars['method'] = 'build_multi_select';
321 321
 	}
322 322
 
323 323
 	/**
Please login to merge, or discard this patch.
services/blocks/action/save_blocks.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@
 block discarded – undo
41 41
 		if (is_array($message))
42 42
 		{
43 43
 			$this->message = (string) $message[0];
44
-		}
45
-		else
44
+		} else
46 45
 		{
47 46
 			$this->message = $message;
48 47
 		}
Please login to merge, or discard this patch.