Completed
Push — master ( e581ca...436d2e )
by Daniel
08:58
created
services/menus/action_handler.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	 */
47 47
 	public function create($action)
48 48
 	{
49
-		$action_class = 'blitze\\sitemaker\\services\\menus\\action\\' . $action;
49
+		$action_class = 'blitze\\sitemaker\\services\\menus\\action\\'.$action;
50 50
 
51 51
 		if (!class_exists($action_class))
52 52
 		{
Please login to merge, or discard this patch.
services/menus/nestedset.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,12 +14,12 @@
 block discarded – undo
14 14
 class nestedset extends builder
15 15
 {
16 16
 	/**
17
-	* Construct
18
-	*
19
-	* @param \phpbb\db\driver\driver_interface	$db				Database connection
20
-	* @param \phpbb\lock\db						$lock			Lock class used to lock the table when moving forums around
21
-	* @param string								$table_name		Table name
22
-	*/
17
+	 * Construct
18
+	 *
19
+	 * @param \phpbb\db\driver\driver_interface	$db				Database connection
20
+	 * @param \phpbb\lock\db						$lock			Lock class used to lock the table when moving forums around
21
+	 * @param string								$table_name		Table name
22
+	 */
23 23
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name)
24 24
 	{
25 25
 		parent::__construct(
Please login to merge, or discard this patch.
blocks/attachments.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
 				$this->ptemplate->assign_block_vars('postrow.attachment', array(
139 139
 					'DISPLAY_ATTACHMENT'	=> $attachment,
140 140
 					'EXTENSION_GROUP'		=> $extensions[$row['extension']]['group_name'],
141
-					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id") . '#p' . $post_id,
141
+					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id").'#p'.$post_id,
142 142
 				));
143 143
 			}
144 144
 		}
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   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 	public function load_permission_language(\phpbb\event\data $event)
113 113
 	{
114 114
 		$permissions = $event['permissions'];
115
-		$permissions['a_sm_manage_blocks']	= array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
116
-		$permissions['a_sm_manage_menus']	= array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
115
+		$permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
116
+		$permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
117 117
 		$event['permissions'] = $permissions;
118 118
 	}
119 119
 
@@ -192,13 +192,13 @@  discard block
 block discarded – undo
192 192
 	 */
193 193
 	public function set_startpage(\phpbb\event\data $event)
194 194
 	{
195
-		if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->startpage && ($controller_object = $this->get_startpage_controller()) !== false)
195
+		if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->startpage && ($controller_object = $this->get_startpage_controller()) !== false)
196 196
 		{
197 197
 			$method = $this->config['sitemaker_startpage_method'];
198 198
 			$this->startpage = true;
199 199
 
200 200
 			$controller_dir = explode('\\', get_class($controller_object));
201
-			$controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles';
201
+			$controller_style_dir = 'ext/'.$controller_dir[0].'/'.$controller_dir[1].'/styles';
202 202
 			$this->template->set_style(array($controller_style_dir, 'styles'));
203 203
 
204 204
 			$arguments = explode('/', $this->config['sitemaker_startpage_params']);
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 	 */
220 220
 	public function add_viewonline_location(\phpbb\event\data $event)
221 221
 	{
222
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
222
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
223 223
 		{
224 224
 			$event['location'] = $this->user->lang('FORUM_INDEX');
225 225
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');
Please login to merge, or discard this patch.
services/forum/data.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 			$this->store['topic'][$row['topic_id']] = $row;
85 85
 
86 86
 			$this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id'];
87
-			$this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time'];
87
+			$this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time'];
88 88
 			$this->store['post_ids']['first'][] = $row['topic_first_post_id'];
89 89
 			$this->store['post_ids']['last'][] = $row['topic_last_post_id'];
90 90
 		}
@@ -319,10 +319,10 @@  discard block
 block discarded – undo
319 319
 	private function _get_attachment_sql($allowed_extensions, $exclude_in_message, $order_by)
320 320
 	{
321 321
 		return 'SELECT *
322
-			FROM ' . ATTACHMENTS_TABLE . '
323
-			WHERE ' . $this->db->sql_in_set('post_msg_id', $this->store['attachments']) .
324
-				(($exclude_in_message) ? ' AND in_message = 0' : '') .
325
-				(sizeof($allowed_extensions) ? ' AND ' . $this->db->sql_in_set('extension', $allowed_extensions) : '') . '
322
+			FROM ' . ATTACHMENTS_TABLE.'
323
+			WHERE ' . $this->db->sql_in_set('post_msg_id', $this->store['attachments']).
324
+				(($exclude_in_message) ? ' AND in_message = 0' : '').
325
+				(sizeof($allowed_extensions) ? ' AND '.$this->db->sql_in_set('extension', $allowed_extensions) : '').'
326 326
 			ORDER BY ' . $order_by;
327 327
 	}
328 328
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -218,8 +218,7 @@  discard block
 block discarded – undo
218 218
 		if (sizeof($post_ids))
219 219
 		{
220 220
 			$sql_where[] = $this->db->sql_in_set('p.post_id', $post_ids);
221
-		}
222
-		else if (sizeof($this->store['topic']))
221
+		} else if (sizeof($this->store['topic']))
223 222
 		{
224 223
 			$this->_limit_posts_by_topic($sql_where, $topic_first_or_last_post);
225 224
 		}
@@ -252,8 +251,7 @@  discard block
 block discarded – undo
252 251
 		if ($this->_can_track_by_lastread())
253 252
 		{
254 253
 			$info = $this->_build_tracking_info('get_topic_tracking');
255
-		}
256
-		else if ($this->_can_track_anonymous())
254
+		} else if ($this->_can_track_anonymous())
257 255
 		{
258 256
 			$info = $this->_build_tracking_info('get_complete_topic_tracking');
259 257
 		}
Please login to merge, or discard this patch.
services/menus/action/add_menu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 
21 21
 		/** @type \blitze\sitemaker\model\menus\entity\menu $entity */
22 22
 		$entity = $menu_mapper->create_entity(array(
23
-			'menu_name' => $this->user->lang('MENU') . '-' . mt_rand(1000, 9999),
23
+			'menu_name' => $this->user->lang('MENU').'-'.mt_rand(1000, 9999),
24 24
 		));
25 25
 
26 26
 		$entity = $menu_mapper->save($entity);
Please login to merge, or discard this patch.
services/profilefields.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
 		if (!function_exists('phpbb_show_profile'))
47 47
 		{
48
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
48
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
49 49
 		}
50 50
 	}
51 51
 
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 	public function get_all_fields()
56 56
 	{
57 57
 		$sql = 'SELECT l.lang_name, f.field_ident
58
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
59
-			WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . '
58
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
59
+			WHERE l.lang_id = ' . $this->user->get_iso_lang_id().'
60 60
 				AND f.field_active = 1
61 61
 				AND f.field_no_view = 0
62 62
 				AND f.field_hide = 0
Please login to merge, or discard this patch.