blitze / phpBB-ext-sitemaker

blocks/featured_member.php

Spacing +6 added lines, -6 removed lines

@@ -147,7 +147,7 @@ 
 	private function change_user()
 	{
 		$change = false;
-		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 ' . self::$rotations[$this->settings['rotation']]))
+		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 '.self::$rotations[$this->settings['rotation']]))
 		{
 			$this->settings['last_changed'] = time();
 			$change = true;
@@ -162,7 +162,7 @@ 
 	 */
 	private function get_settings(array $bdata)
 	{
-		$cached_settings = $this->cache->get('pt_block_data_' . $bdata['bid']);
+		$cached_settings = $this->cache->get('pt_block_data_'.$bdata['bid']);
 		$settings = ($cached_settings && $cached_settings['hash'] === $bdata['hash']) ? $cached_settings : $bdata['settings'];
 		$settings['hash'] = $bdata['hash'];
 
@@ -182,8 +182,8 @@ 
 			$sql_data = array(
 				'settings'	=> json_encode($settings)
 			);
-			$this->db->sql_query('UPDATE ' . $this->blocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE bid = ' . (int) $bid);
-			$this->cache->put('pt_block_data_' . $bid, $this->settings);
+			$this->db->sql_query('UPDATE '.$this->blocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE bid = '.(int) $bid);
+			$this->cache->put('pt_block_data_'.$bid, $this->settings);
 		}
 	}
 
@@ -235,8 +235,8 @@ 
 		$rotation = $this->settings['rotation'];
 
 		$this->ptemplate->assign_vars(array(
-			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_' . strtoupper($query_type)) : '',
-			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation) . '_MEMBER') : '',
+			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_'.strtoupper($query_type)) : '',
+			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation).'_MEMBER') : '',
 		));
 	}
 

Braces +1 added lines, -2 removed lines

@@ -130,8 +130,7 @@
 		if (isset($sort_keys[$this->settings['qtype']]))
 		{
 			return $this->user_data->query($sql_where, $sort_keys[$this->settings['qtype']], 1);
-		}
-		else
+		} else
 		{
 			$user_id = (int) userlist::get_user_id($this->settings, $change_user);
 			$data = $this->user_data->get_users(array($user_id), $sql_where);

blocks/attachments.php

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
 				$this->ptemplate->assign_block_vars('postrow.attachment', array(
 					'DISPLAY_ATTACHMENT'	=> $attachment,
 					'EXTENSION_GROUP'		=> $extensions[$row['extension']]['group_name'],
-					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id") . '#p' . $post_id,
+					'U_VIEWTOPIC'			=> append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", "t=$topic_id&p=$post_id").'#p'.$post_id,
 				));
 			}
 		}

blocks/whats_new.php

Spacing +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
 
 			$this->ptemplate->assign_block_vars('topicrow', array(
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
 			));
 			unset($topic_data[$i]);
 		}
@@ -140,7 +140,7 @@ 
 	{
 		return array(
 			'WHERE'		=> array(
-				't.topic_last_post_time > ' . $this->user->data['user_lastvisit'],
+				't.topic_last_post_time > '.$this->user->data['user_lastvisit'],
 				't.topic_moved_id = 0',
 			),
 		);
@@ -156,7 +156,7 @@ 
 				POSTS_TABLE		=> 'p',
 			),
 			'WHERE'		=> array(
-				't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'],
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
 			),
 		);
 	}

Braces +2 added lines, -4 removed lines

@@ -72,8 +72,7 @@ 
 				'title'		=> '',
 				'content'	=> '',
 			);
-		}
-		else
+		} else
 		{
 			$this->fetch_new($bdata['settings']);
 
@@ -117,8 +116,7 @@ 
 		{
 			$sorting = 't.topic_last_post_time';
 			$sql_array = $this->get_topics_sql();
-		}
-		else
+		} else
 		{
 			$sorting = 'p.post_time';
 			$sql_array = $this->get_posts_sql();

blocks/wordgraph.php

Spacing +6 added lines, -6 removed lines

@@ -109,8 +109,8 @@ 
 			$this->ptemplate->assign_block_vars('wordgraph', array(
 				'WORD'			=> $this->show_word($word, $words_array[$word], $settings['show_word_count']),
 				'WORD_SIZE'		=> $settings['min_word_size'] + (($words_array[$word] - $params['min_count']) * $params['size_step']),
-				'WORD_COLOR'	=> $r . $g . $b,
-				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords=' . urlencode($word)),
+				'WORD_COLOR'	=> $r.$g.$b,
+				'WORD_URL'		=> append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords='.urlencode($word)),
 			));
 		}
 	}
@@ -187,8 +187,8 @@ 
 				AND m.word_id = l.word_id
 				AND m.post_id = p.post_id
 				AND t.topic_id = p.topic_id
-				AND t.topic_time <= ' . time() . '
-				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.') .
+				AND t.topic_time <= ' . time().'
+				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.').
 				$sql_where,
 			'GROUP_BY'	=> 'l.word_text, l.word_count',
 			'ORDER_BY'	=> 'l.word_count DESC'
@@ -205,7 +205,7 @@ 
 		if ($exclude_words)
 		{
 			$exclude_words = array_filter(explode(',', str_replace(' ', '', strtolower($exclude_words))));
-			$sql_where = (sizeof($exclude_words)) ? ' AND ' . $this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
+			$sql_where = (sizeof($exclude_words)) ? ' AND '.$this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
 		}
 
 		return $sql_where;
@@ -219,6 +219,6 @@ 
 	 */
 	private function show_word($word, $count, $show_count)
 	{
-		return censor_text(($show_count) ? $word . '(' . $count . ')' : $word);
+		return censor_text(($show_count) ? $word.'('.$count.')' : $word);
 	}
 }

blocks/mybookmarks.php

Spacing +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
 
 			$this->ptemplate->assign_block_vars('topicrow', array(
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
 			));
 			unset($topic_data[$i]);
 		}
@@ -125,7 +125,7 @@ 
 				BOOKMARKS_TABLE		=> 'b',
 			),
 			'WHERE'		=> array(
-				'b.user_id = ' . $this->user->data['user_id'],
+				'b.user_id = '.$this->user->data['user_id'],
 				'b.topic_id = t.topic_id',
 			),
 		);

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');

blocks/member_menu.php

Spacing +8 added lines, -8 removed lines

@@ -68,11 +68,11 @@ 
 				'USER_POSTS'	=> $this->user->data['user_posts'],
 				'NEW_POSTS'		=> $this->get_new_posts_count(),
 
-				'U_PROFILE'		=> append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&u=' . $this->user->data['user_id']),
-				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'),
-				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'),
-				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&folder=inbox'),
-				'U_LOGOUT'		=> append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id),
+				'U_PROFILE'		=> append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&u='.$this->user->data['user_id']),
+				'U_SEARCH_NEW'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'),
+				'U_SEARCH_SELF'	=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'),
+				'U_PRIVATE_MSG'	=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&folder=inbox'),
+				'U_LOGOUT'		=> append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id),
 				'U_MCP' 		=> $this->get_mcp_url(),
 				'U_ACP'			=> $this->get_acp_url(),
 			));
@@ -99,7 +99,7 @@ 
 	 */
 	protected function get_mcp_url()
 	{
-		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : '';
+		return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : '';
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	protected function get_acp_url()
 	{
-		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) : '';
+		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) : '';
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 				POSTS_TABLE		=> 'p',
 			),
 			'WHERE'		=> array(
-				't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'],
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
 			),
 		);