blitze / phpBB-ext-sitemaker

blocks/birthday.php

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	public function display(array $bdata, $edit_mode = false)
 	{
-		if (($content = $this->cache->get('pt_block_data_' . $bdata['bid'])) === false)
+		if (($content = $this->cache->get('pt_block_data_'.$bdata['bid'])) === false)
 		{
 			$content = '';
 			if ($this->find_birthday_users())
@@ -57,7 +57,7 @@ 
 				$content = $this->ptemplate->render_view('blitze/sitemaker', 'blocks/birthday.html', 'birthday_block');
 
 				// we only check birthdays every hour, may make this an admin choice
-				$this->cache->put('pt_block_data_' . $bdata['bid'], $content, 3600);
+				$this->cache->put('pt_block_data_'.$bdata['bid'], $content, 3600);
 			}
 		}
 
@@ -78,12 +78,12 @@ 
 		$leap_year_birthdays = $this->adjust_leap_year($now, $time);
 
 		$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday 
-				FROM ' . USERS_TABLE . ' u
-				LEFT JOIN ' . BANLIST_TABLE . " b ON (u.user_id = b.ban_userid)
+				FROM ' . USERS_TABLE.' u
+				LEFT JOIN ' . BANLIST_TABLE." b ON (u.user_id = b.ban_userid)
 				WHERE (b.ban_id IS NULL
 					OR b.ban_exclude = 1)
-					AND (u.user_birthday " . $this->db->sql_like_expression(sprintf('%2d-%2d-', $now['mday'], $now['mon']) . $this->db->get_any_char()) . " $leap_year_birthdays)
-					AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')
+					AND (u.user_birthday " . $this->db->sql_like_expression(sprintf('%2d-%2d-', $now['mday'], $now['mon']).$this->db->get_any_char())." $leap_year_birthdays)
+					AND u.user_type IN (".USER_NORMAL.', '.USER_FOUNDER.')
 				ORDER BY u.username ASC';
 		$result = $this->db->sql_query($sql);
 
@@ -113,7 +113,7 @@ 
 		$leap_year_birthdays = '';
 		if ($now['mday'] == 28 && $now['mon'] == 2 && !$time->format('L'))
 		{
-			$leap_year_birthdays = ' OR u.user_birthday ' . $this->db->sql_like_expression(sprintf('%2d-%2d-', 29, 2) . $this->db->get_any_char());
+			$leap_year_birthdays = ' OR u.user_birthday '.$this->db->sql_like_expression(sprintf('%2d-%2d-', 29, 2).$this->db->get_any_char());
 		}
 
 		return $leap_year_birthdays;

acp/menu_module.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 			'ICON_PICKER'	=> $this->icon->picker(),
 			'T_PATH'		=> $this->phpbb_root_path,
 			'UA_MENU_ID'	=> $menu_id,
-			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '') . '/',
+			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '').'/',
 		));
 
 		$this->tpl_name = 'acp_menu';

event/listener.php

Spacing +6 added lines, -6 removed lines

@@ -117,9 +117,9 @@ 
 	public function load_permission_language(\phpbb\event\data $event)
 	{
 		$permissions = $event['permissions'];
-		$permissions['a_sm_settings']	= array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
-		$permissions['a_sm_manage_blocks']	= array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
-		$permissions['a_sm_manage_menus']	= array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
+		$permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
+		$permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
+		$permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
 		$event['permissions'] = $permissions;
 	}
 
@@ -193,13 +193,13 @@ 
 	 */
 	public function set_startpage(\phpbb\event\data $event)
 	{
-		if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
+		if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
 		{
 			$method = $this->config['sitemaker_startpage_method'];
 			$this->is_startpage = true;
 
 			$controller_dir = explode('\\', get_class($controller_object));
-			$controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles';
+			$controller_style_dir = 'ext/'.$controller_dir[0].'/'.$controller_dir[1].'/styles';
 			$this->template->set_style(array($controller_style_dir, 'styles'));
 
 			$arguments = explode('/', $this->config['sitemaker_startpage_params']);
@@ -220,7 +220,7 @@ 
 	 */
 	public function add_viewonline_location(\phpbb\event\data $event)
 	{
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
 		{
 			$event['location'] = $this->translator->lang('FORUM_INDEX');
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');

services/util.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
 	 */
 	public function get_default_avatar()
 	{
-		return '<img src="' . $this->get_theme_path() . '/images/no_avatar.gif" alt="" />';
+		return '<img src="'.$this->get_theme_path().'/images/no_avatar.gif" alt="" />';
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	public function get_theme_path()
 	{
 		$web_path = $this->get_web_path();
-		return "{$web_path}styles/" . rawurlencode($this->user->style['style_path']) . '/theme';
+		return "{$web_path}styles/".rawurlencode($this->user->style['style_path']).'/theme';
 	}
 
 	/**
@@ -123,7 +123,7 @@ 
 	public function get_web_path()
 	{
 		// Determine board url - we may need it later
-		$board_url = generate_board_url() . '/';
+		$board_url = generate_board_url().'/';
 
 		$corrected_path = $this->path_helper->get_web_root_path();
 		return (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;

services/icon_picker.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 				'@blitze_sitemaker/assets/icons/picker.min.js',
 			),
 			'css'	=> array(
-				defined('IN_ADMIN') ? $this->util->get_web_path() . 'assets/css/font-awesome.min.css' : '',
+				defined('IN_ADMIN') ? $this->util->get_web_path().'assets/css/font-awesome.min.css' : '',
 				'@blitze_sitemaker/vendor/jquery-ui/themes/smoothness/jquery-ui.min.css',
 				'@blitze_sitemaker/assets/icons/picker.min.css',
 			)

controller/forum.php

Spacing +2 added lines, -2 removed lines

@@ -59,12 +59,12 @@
 		 * to fix relative paths for forum images
 		 */
 		global $phpbb_root_path;
-		$phpbb_root_path = generate_board_url() . '/';
+		$phpbb_root_path = generate_board_url().'/';
 
 		// @codeCoverageIgnoreStart
 		if (!function_exists('display_forums'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
 		}
 		// @codeCoverageIgnoreEnd
 

services/menus/display.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
 	 * @param string $handle
 	 * @return void
 	 */
-	public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
+	public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
 	{
 		$this->prepare_items($data);
 
@@ -84,10 +84,10 @@ 
 				$row['num_kids'] = $this->count_descendants($row);
 
 				$template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER));
-				$this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth));
+				$this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth));
 			}
 
-			$this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth));
+			$this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth));
 		}
 	}
 
@@ -126,7 +126,7 @@ 
 			}
 
 			$is_current_item = $this->is_current_item($row);
-			$this_depth	= $this->parental_depth[$row['parent_id']] + 1;
+			$this_depth = $this->parental_depth[$row['parent_id']] + 1;
 			$leaf = $this->get_leaf_node($row, $is_current_item);
 
 			$this->parental_depth[$row[$this->pk]] = $this_depth;
@@ -155,8 +155,8 @@ 
 	 */
 	protected function set_current_item(array $data)
 	{
-		$curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
-		$curr_page = str_replace('/index.' . $this->php_ext, '/', $curr_page);
+		$curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
+		$curr_page = str_replace('/index.'.$this->php_ext, '/', $curr_page);
 		$curr_parts = explode('&', $this->user->page['query_string']);
 
 		$data = array_values($data);
@@ -239,7 +239,7 @@ 
 	 * @param int $repeat
 	 * @return void
 	 */
-	protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat)
+	protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat)
 	{
 		for ($i = 0; $i < $repeat; $i++)
 		{

services/menus/menu_block.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
 	{
 		$row['is_navigable'] = $this->is_navigable($row);
 		$row['is_expandable'] = ($row['is_navigable'] && !$row['item_target']) ? true : false;
-		$row['url_path'] = str_replace('/index.' . $this->php_ext, '/', $row['url_path']);
+		$row['url_path'] = str_replace('/index.'.$this->php_ext, '/', $row['url_path']);
 	}
 
 	/**

services/blocks/routes.php

Spacing +3 added lines, -3 removed lines

@@ -175,12 +175,12 @@
 	{
 		if ($page_dir)
 		{
-			$route = ltrim(dirname($page_dir) . '/index.php', './');
+			$route = ltrim(dirname($page_dir).'/index.php', './');
 			$parent_route = $this->get_parent_route_info($routes, $route);
 		}
-		else if ($current_route === 'viewtopic.' . $this->php_ext)
+		else if ($current_route === 'viewtopic.'.$this->php_ext)
 		{
-			$route = 'viewforum.' . $this->php_ext;
+			$route = 'viewforum.'.$this->php_ext;
 			$parent_route = $this->get_parent_route_info($routes, $route);
 		}
 		else

Braces +2 added lines, -4 removed lines

@@ -177,13 +177,11 @@
 		{
 			$route = ltrim(dirname($page_dir) . '/index.php', './');
 			$parent_route = $this->get_parent_route_info($routes, $route);
-		}
-		else if ($current_route === 'viewtopic.' . $this->php_ext)
+		} else if ($current_route === 'viewtopic.' . $this->php_ext)
 		{
 			$route = 'viewforum.' . $this->php_ext;
 			$parent_route = $this->get_parent_route_info($routes, $route);
-		}
-		else
+		} else
 		{
 			$parent_route = $this->get_virtual_parent($routes, $current_route);
 		}