ErnadoO / ext-phpbb-directory

acp/phpbbdirectory_info.php

Spacing +5 added lines, -5 removed lines

@@ -18,11 +18,11 @@
 			'filename'		=> '\ernadoo\phpbbdirectory\acp\phpbbdirectory_module',
 			'title'			=> 'ACP_DIRECTORY',
 			'modes'			=> array(
-				''				=> array('title' => 'ACP_DIRECTORY',			'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('')),
-				'main'			=> array('title' => 'ACP_DIRECTORY_MAIN',		'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
-				'settings'		=> array('title' => 'ACP_DIRECTORY_SETTINGS',	'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
-				'cat'			=> array('title' => 'ACP_DIRECTORY_CATS',		'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
-				'val'			=> array('title' => 'ACP_DIRECTORY_VAL',		'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				''				=> array('title' => 'ACP_DIRECTORY', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('')),
+				'main'			=> array('title' => 'ACP_DIRECTORY_MAIN', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				'settings'		=> array('title' => 'ACP_DIRECTORY_SETTINGS', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				'cat'			=> array('title' => 'ACP_DIRECTORY_CATS', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				'val'			=> array('title' => 'ACP_DIRECTORY_VAL', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
 			),
 		);
 	}

event/listener.php

Spacing +30 added lines, -30 removed lines

@@ -52,13 +52,13 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\helper $dir_helper, $table_prefix, $php_ext)
 	{
-		$this->db			= $db;
-		$this->helper 		= $helper;
-		$this->template 	= $template;
-		$this->user 		= $user;
-		$this->dir_helper	= $dir_helper;
+		$this->db = $db;
+		$this->helper = $helper;
+		$this->template = $template;
+		$this->user = $user;
+		$this->dir_helper = $dir_helper;
 		$this->table_prefix = $table_prefix;
-		$this->php_ext		= $php_ext;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -101,11 +101,11 @@ 
 	*/
 	public function add_page_header_variables()
 	{
-		$ext_theme_path		= $this->dir_helper->get_ext_name() . '/styles/prosilver/theme/';
+		$ext_theme_path		= $this->dir_helper->get_ext_name().'/styles/prosilver/theme/';
 		$theme_lang_path	= $this->user->lang_name;
 
 		// Prevent 'Twig_Error_Loader' if user's lang directory doesn't exist
-		if (!file_exists($ext_theme_path . $theme_lang_path . '/directory.css'))
+		if (!file_exists($ext_theme_path.$theme_lang_path.'/directory.css'))
 		{
 			// Fallback to English language.
 			$theme_lang_path = 'en';
@@ -125,10 +125,10 @@ 
 	*/
 	public function add_page_viewonline($event)
 	{
-		if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/directory') === 0)
+		if (strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/directory') === 0)
 		{
-			$event['location']		= $this->user->lang['DIRECTORY'];
-			$event['location_url']	= $this->helper->route('ernadoo_phpbbdirectory_base_controller');
+			$event['location'] = $this->user->lang['DIRECTORY'];
+			$event['location_url'] = $this->helper->route('ernadoo_phpbbdirectory_base_controller');
 		}
 	}
 
@@ -158,24 +158,24 @@ 
 	{
 		$categories				= $event['categories'];
 		$categories				= array_merge($categories, array('dir' => 'ACL_CAT_DIRECTORY'));
-		$event['categories']	= $categories;
+		$event['categories'] = $categories;
 
 		$permissions = $event['permissions'];
 
 		$permissions = array_merge($permissions, array(
-			'm_delete_dir'			=> array('lang' => 'ACL_M_DELETE_DIR', 			'cat' => 'dir'),
-			'm_delete_comment_dir'	=> array('lang' => 'ACL_M_DELETE_COMMENT_DIR',	'cat' => 'dir'),
-			'm_edit_dir'			=> array('lang' => 'ACL_M_EDIT_DIR',			'cat' => 'dir'),
-			'm_edit_comment_dir'	=> array('lang' => 'ACL_M_EDIT_COMMENT_DIR',	'cat' => 'dir'),
-
-			'u_comment_dir'			=> array('lang' => 'ACL_U_COMMENT_DIR',			'cat' => 'dir'),
-			'u_delete_dir'			=> array('lang' => 'ACL_U_DELETE_DIR',			'cat' => 'dir'),
-			'u_delete_comment_dir'	=> array('lang' => 'ACL_U_DELETE_COMMENT_DIR',	'cat' => 'dir'),
-			'u_edit_dir'			=> array('lang' => 'ACL_U_EDIT_DIR',			'cat' => 'dir'),
-			'u_edit_comment_dir'	=> array('lang' => 'ACL_U_EDIT_COMMENT_DIR',	'cat' => 'dir'),
-			'u_search_dir'			=> array('lang' => 'ACL_U_SEARCH_DIR',			'cat' => 'dir'),
-			'u_submit_dir'			=> array('lang' => 'ACL_U_SUBMIT_DIR',			'cat' => 'dir'),
-			'u_vote_dir'			=> array('lang' => 'ACL_U_VOTE_DIR',			'cat' => 'dir'),
+			'm_delete_dir'			=> array('lang' => 'ACL_M_DELETE_DIR', 'cat' => 'dir'),
+			'm_delete_comment_dir'	=> array('lang' => 'ACL_M_DELETE_COMMENT_DIR', 'cat' => 'dir'),
+			'm_edit_dir'			=> array('lang' => 'ACL_M_EDIT_DIR', 'cat' => 'dir'),
+			'm_edit_comment_dir'	=> array('lang' => 'ACL_M_EDIT_COMMENT_DIR', 'cat' => 'dir'),
+
+			'u_comment_dir'			=> array('lang' => 'ACL_U_COMMENT_DIR', 'cat' => 'dir'),
+			'u_delete_dir'			=> array('lang' => 'ACL_U_DELETE_DIR', 'cat' => 'dir'),
+			'u_delete_comment_dir'	=> array('lang' => 'ACL_U_DELETE_COMMENT_DIR', 'cat' => 'dir'),
+			'u_edit_dir'			=> array('lang' => 'ACL_U_EDIT_DIR', 'cat' => 'dir'),
+			'u_edit_comment_dir'	=> array('lang' => 'ACL_U_EDIT_COMMENT_DIR', 'cat' => 'dir'),
+			'u_search_dir'			=> array('lang' => 'ACL_U_SEARCH_DIR', 'cat' => 'dir'),
+			'u_submit_dir'			=> array('lang' => 'ACL_U_SUBMIT_DIR', 'cat' => 'dir'),
+			'u_vote_dir'			=> array('lang' => 'ACL_U_VOTE_DIR', 'cat' => 'dir'),
 		));
 
 		$event['permissions'] = $permissions;
@@ -196,17 +196,17 @@ 
 			$user_ids = array($user_ids);
 		}
 
-		$sql = 'UPDATE ' . DIR_COMMENT_TABLE . '
-			SET comment_user_id = ' . ANONYMOUS . '
+		$sql = 'UPDATE '.DIR_COMMENT_TABLE.'
+			SET comment_user_id = ' . ANONYMOUS.'
 			WHERE ' . $this->db->sql_in_set('comment_user_id', $user_ids);
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-			SET link_user_id = ' . ANONYMOUS . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
+			SET link_user_id = ' . ANONYMOUS.'
 			WHERE ' . $this->db->sql_in_set('link_user_id', $user_ids);
 		$this->db->sql_query($sql);
 
-		$sql = 'DELETE FROM ' . DIR_WATCH_TABLE . '
+		$sql = 'DELETE FROM '.DIR_WATCH_TABLE.'
 			WHERE ' . $this->db->sql_in_set('user_id', $user_ids);
 		$this->db->sql_query($sql);
 	}

migrations/v10x/v1_0_0.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
 	{
 		return array(
 			'add_tables' => array(
-				$this->table_prefix . 'directory_cats' => array(
+				$this->table_prefix.'directory_cats' => array(
 					'COLUMNS' => array(
 						'cat_id'				=> array('UINT', null, 'auto_increment'),
 						'parent_id'				=> array('UINT', 0),
@@ -57,7 +57,7 @@ 
 					),
 				),
 
-				$this->table_prefix . 'directory_comments' => array(
+				$this->table_prefix.'directory_comments' => array(
 					'COLUMNS' => array(
 						'comment_id' 		=> array('UINT', null, 'auto_increment'),
 						'comment_date' 		=> array('TIMESTAMP', 0),
@@ -73,7 +73,7 @@ 
 					'PRIMARY_KEY'	=> array('comment_id'),
 				),
 
-				$this->table_prefix . 'directory_links' => array(
+				$this->table_prefix.'directory_links' => array(
 					'COLUMNS' => array(
 						'link_id'			=> array('UINT', null, 'auto_increment'),
 						'link_time' 		=> array('TIMESTAMP', 0),
@@ -110,7 +110,7 @@ 
 					),
 				),
 
-				$this->table_prefix . 'directory_watch' => array(
+				$this->table_prefix.'directory_watch' => array(
 					'COLUMNS' => array(
 						'cat_id'		=> array('UINT', 0),
 						'user_id'		=> array('UINT', 0),
@@ -125,7 +125,7 @@ 
 
 				),
 
-				$this->table_prefix . 'directory_votes' => array(
+				$this->table_prefix.'directory_votes' => array(
 					'COLUMNS' => array(
 						'vote_id'			=> array('UINT', null, 'auto_increment'),
 						'vote_link_id'		=> array('UINT', 0),
@@ -148,11 +148,11 @@ 
 	{
 		return array(
 			'drop_tables'	=> array(
-				$this->table_prefix . 'directory_cats',
-				$this->table_prefix . 'directory_comments',
-				$this->table_prefix . 'directory_links',
-				$this->table_prefix . 'directory_votes',
-				$this->table_prefix . 'directory_watch',
+				$this->table_prefix.'directory_cats',
+				$this->table_prefix.'directory_comments',
+				$this->table_prefix.'directory_links',
+				$this->table_prefix.'directory_votes',
+				$this->table_prefix.'directory_watch',
 			),
 		);
 	}
@@ -272,10 +272,10 @@ 
 
 		foreach ($directories as $dir)
 		{
-			if (!file_exists($this->phpbb_root_path . $dir))
+			if (!file_exists($this->phpbb_root_path.$dir))
 			{
-				@mkdir($this->phpbb_root_path . $dir, 0777, true);
-				phpbb_chmod($this->phpbb_root_path . $dir, CHMOD_READ | CHMOD_WRITE);
+				@mkdir($this->phpbb_root_path.$dir, 0777, true);
+				phpbb_chmod($this->phpbb_root_path.$dir, CHMOD_READ | CHMOD_WRITE);
 			}
 		}
 	}
@@ -287,7 +287,7 @@ 
 	*/
 	public function remove_directories()
 	{
-		$dir = $this->phpbb_root_path . 'files/ext/ernadoo/phpbbdirectory/';
+		$dir = $this->phpbb_root_path.'files/ext/ernadoo/phpbbdirectory/';
 
 		$this->_recursive_rmdir($dir);
 	}

migrations/converter/convert_module.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	public function effectively_installed()
 	{
 		$sql = 'SELECT module_id
-			FROM ' . $this->table_prefix . "modules
+			FROM ' . $this->table_prefix."modules
 			WHERE module_class = 'acp'
 				AND module_basename = 'acp_directory'
 				AND module_mode = 'main'";
@@ -56,8 +56,8 @@ 
 			'module_auth'		=> 'ext_ernadoo/phpbbdirectory'
 		);
 
-		$sql = 'UPDATE '  . $this->table_prefix . 'modules
-			SET ' . $this->db->sql_build_array('UPDATE', $module_data) . "
+		$sql = 'UPDATE '.$this->table_prefix.'modules
+			SET ' . $this->db->sql_build_array('UPDATE', $module_data)."
 			WHERE module_basename = 'acp_directory'
 				AND module_mode IN ('main', 'settings', 'cat', 'val')";
 		$this->db->sql_query($sql);

migrations/converter/convert_notifications.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 	*/
 	public function effectively_installed()
 	{
-		return !$this->db_tools->sql_table_exists($this->table_prefix . 'directory_notifications');
+		return !$this->db_tools->sql_table_exists($this->table_prefix.'directory_notifications');
 	}
 
 	static public function depends_on()
@@ -54,7 +54,7 @@ 
 	public function copy_from_notifications()
 	{
 		$sql = 'SELECT n_user_id, n_cat_id
-			FROM ' . $this->table_prefix . 'directory_notifications';
+			FROM ' . $this->table_prefix.'directory_notifications';
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
@@ -65,7 +65,7 @@ 
 				'notify_status'	=> 1,
 			);
 
-			$sql = 'INSERT INTO ' . $this->table_prefix . 'directory_watch ' . $this->db->sql_build_array('INSERT', $data);
+			$sql = 'INSERT INTO '.$this->table_prefix.'directory_watch '.$this->db->sql_build_array('INSERT', $data);
 			$this->db->sql_query($sql);
 		}
 		$this->db->sql_freeresult($result);

core/helper.php

Spacing +5 added lines, -5 removed lines

@@ -29,8 +29,8 @@ 
 	*/
 	public function __construct(\phpbb\extension\manager $phpbb_extension_manager, \phpbb\path_helper $path_helper)
 	{
-		$this->extension_manager	= $phpbb_extension_manager;
-		$this->path_helper			= $path_helper;
+		$this->extension_manager = $phpbb_extension_manager;
+		$this->path_helper = $path_helper;
 	}
 
 	/**
@@ -41,7 +41,7 @@ 
 	*/
 	public function get_ext_name($web_root_path = false)
 	{
-		return (($web_root_path) ? $this->path_helper->get_web_root_path() : '') . $this->extension_manager->get_extension_path($this->ext_name);
+		return (($web_root_path) ? $this->path_helper->get_web_root_path() : '').$this->extension_manager->get_extension_path($this->ext_name);
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	*/
 	public function get_img_path($type, $image = '')
 	{
-		return $this->get_ext_name(true) . 'images/' . $type . '/' . $image;
+		return $this->get_ext_name(true).'images/'.$type.'/'.$image;
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	*/
 	public function get_banner_path($banner = '')
 	{
-		return 'files/' . $this->get_ext_name() . 'banners/' . $banner;
+		return 'files/'.$this->get_ext_name().'banners/'.$banner;
 	}
 
 	/**

core/categorie.php

Spacing +26 added lines, -26 removed lines

@@ -58,15 +58,15 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\cron\manager $cron, \ernadoo\phpbbdirectory\core\helper $dir_helper)
 	{
-		$this->db			= $db;
+		$this->db = $db;
 		$this->config		= $config;
-		$this->template		= $template;
+		$this->template = $template;
 		$this->user			= $user;
 		$this->helper		= $helper;
-		$this->request		= $request;
+		$this->request = $request;
 		$this->auth			= $auth;
 		$this->cron 		= $cron;
-		$this->dir_helper	= $dir_helper;
+		$this->dir_helper = $dir_helper;
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	public function make_cat_jumpbox()
 	{
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			ORDER BY left_id ASC';
 		$result = $this->db->sql_query($sql, 600);
 
@@ -149,7 +149,7 @@ 
 
 		// This query is identical to the jumpbox one
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			ORDER BY left_id ASC';
 		$result = $this->db->sql_query($sql, 600);
 
@@ -179,7 +179,7 @@ 
 			}
 
 			$selected = (($row['cat_id'] == $select_id) ? ' selected="selected"' : '');
-			$cat_list .= '<option value="' . $row['cat_id'] . '"' . (($disabled) ? ' disabled="disabled" class="disabled-option"' : $selected) . '>' . $padding . $row['cat_name'] . '</option>';
+			$cat_list .= '<option value="'.$row['cat_id'].'"'.(($disabled) ? ' disabled="disabled" class="disabled-option"' : $selected).'>'.$padding.$row['cat_name'].'</option>';
 		}
 		$this->db->sql_freeresult($result);
 		unset($padding_store);
@@ -194,7 +194,7 @@ 
 	*/
 	public function display()
 	{
-		$cat_rows	= $subcats = array();
+		$cat_rows = $subcats = array();
 		$parent_id	= $visible_cats = 0;
 
 		$sql_array = array(
@@ -212,7 +212,7 @@ 
 		else
 		{
 			$root_data = $this->data;
-			$sql_where = 'left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
+			$sql_where = 'left_id > '.$root_data['left_id'].' AND left_id < '.$root_data['right_id'];
 		}
 
 		$sql = $this->db->sql_build_query('SELECT', array(
@@ -259,7 +259,7 @@ 
 			{
 				foreach ($subcats[$dir_cat_id] as $subcat_id => $subcat_row)
 				{
-					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links']+$subcat_row['links']) : $row['cat_links'];
+					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links'] + $subcat_row['links']) : $row['cat_links'];
 
 					if ($subcat_row['display'] && $subcat_row['parent_id'] == $dir_cat_id)
 					{
@@ -314,7 +314,7 @@ 
 			if ($task->is_ready())
 			{
 				$url = $task->get_url();
-				$this->template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="" />');
+				$this->template->assign_var('RUN_CRON_TASK', '<img src="'.$url.'" width="1" height="1" alt="" />');
 			}
 		}
 	}
@@ -336,10 +336,10 @@ 
 				'LEFT_JOIN'	=> array(
 						array(
 							'FROM'	=> array(DIR_WATCH_TABLE	=> 'w'),
-							'ON'	=> 'c.cat_id = w.cat_id AND w.user_id = ' . (int) $this->user->data['user_id']
+							'ON'	=> 'c.cat_id = w.cat_id AND w.user_id = '.(int) $this->user->data['user_id']
 						),
 				),
-				'WHERE'		=> 'c.cat_id = ' . (int) $cat_id
+				'WHERE'		=> 'c.cat_id = '.(int) $cat_id
 			);
 			$sql = $this->db->sql_build_query('SELECT', $sql_array);
 			$result = $this->db->sql_query($sql);
@@ -376,7 +376,7 @@ 
 				$this->template->assign_block_vars('dir_navlinks', array(
 					'FORUM_NAME'	=> $parent_data['cat_name'],
 					'FORUM_ID'		=> $parent_cat_id,
-					'MICRODATA'		=> $microdata_attr . '="' . $parent_cat_id . '"',
+					'MICRODATA'		=> $microdata_attr.'="'.$parent_cat_id.'"',
 					'U_VIEW_FORUM'	=> $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $parent_cat_id)),
 				));
 			}
@@ -385,7 +385,7 @@ 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $dir_cat_data['cat_name'],
 			'FORUM_ID'		=> $dir_cat_data['cat_id'],
-			'MICRODATA'		=> $microdata_attr . '="' . $dir_cat_data['cat_id'] . '"',
+			'MICRODATA'		=> $microdata_attr.'="'.$dir_cat_data['cat_id'].'"',
 			'U_VIEW_FORUM'	=> $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $dir_cat_data['cat_id'])),
 		));
 
@@ -442,7 +442,7 @@ 
 			{
 				if ($mode == 'unwatch')
 				{
-					$sql = 'DELETE FROM ' . DIR_WATCH_TABLE . "
+					$sql = 'DELETE FROM '.DIR_WATCH_TABLE."
 						WHERE cat_id = $cat_id
 							AND user_id = $user_id";
 					$this->db->sql_query($sql);
@@ -452,7 +452,7 @@ 
 
 					if (!$this->request->is_ajax())
 					{
-						$message .= '<br /><br />' . $this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $redirect_url . '">', '</a>');
+						$message .= '<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$redirect_url.'">', '</a>');
 					}
 
 					meta_refresh(3, $redirect_url);
@@ -464,8 +464,8 @@ 
 
 					if ($notify_status != NOTIFY_YES)
 					{
-						$sql = 'UPDATE ' . DIR_WATCH_TABLE . '
-							SET notify_status = ' . NOTIFY_YES . "
+						$sql = 'UPDATE '.DIR_WATCH_TABLE.'
+							SET notify_status = ' . NOTIFY_YES."
 							WHERE cat_id = $cat_id
 								AND user_id = $user_id";
 						$this->db->sql_query($sql);
@@ -476,8 +476,8 @@ 
 			{
 				if ($mode == 'watch')
 				{
-					$sql = 'INSERT INTO ' . DIR_WATCH_TABLE . " (user_id, cat_id, notify_status)
-						VALUES ($user_id, $cat_id, " . NOTIFY_YES . ')';
+					$sql = 'INSERT INTO '.DIR_WATCH_TABLE." (user_id, cat_id, notify_status)
+						VALUES ($user_id, $cat_id, ".NOTIFY_YES.')';
 					$this->db->sql_query($sql);
 
 					$redirect_url = $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id));
@@ -485,7 +485,7 @@ 
 
 					if (!$this->request->is_ajax())
 					{
-						$message .= '<br /><br />' . $this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $redirect_url . '">', '</a>');
+						$message .= '<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$redirect_url.'">', '</a>');
 					}
 
 					meta_refresh(3, $redirect_url);
@@ -505,10 +505,10 @@ 
 
 		if ($can_watch)
 		{
-			$s_watching['link'] 		= $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => (($is_watching) ? 'unwatch' : 'watch')));
+			$s_watching['link'] = $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => (($is_watching) ? 'unwatch' : 'watch')));
 			$s_watching['link_toggle'] 	= $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => ((!$is_watching) ? 'unwatch' : 'watch')));
-			$s_watching['title'] 		= $this->user->lang[(($is_watching) ? 'DIR_STOP' : 'DIR_START') . '_WATCHING_CAT'];
-			$s_watching['title_toggle'] = $this->user->lang[((!$is_watching) ? 'DIR_STOP' : 'DIR_START') . '_WATCHING_CAT'];
+			$s_watching['title'] = $this->user->lang[(($is_watching) ? 'DIR_STOP' : 'DIR_START').'_WATCHING_CAT'];
+			$s_watching['title_toggle'] = $this->user->lang[((!$is_watching) ? 'DIR_STOP' : 'DIR_START').'_WATCHING_CAT'];
 			$s_watching['is_watching'] 	= $is_watching;
 		}
 
@@ -526,7 +526,7 @@ 
 		global $db;
 
 		$sql = 'SELECT cat_name
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			WHERE cat_id = ' . (int) $cat_id;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);

core/comment.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user)
 	{
-		$this->db	= $db;
+		$this->db = $db;
 		$this->user = $user;
 	}
 
@@ -43,10 +43,10 @@ 
 	{
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . DIR_COMMENT_TABLE . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.DIR_COMMENT_TABLE.' '.$this->db->sql_build_array('INSERT', $data);
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_comment = link_comment + 1
 			WHERE link_id = ' . (int) $data['comment_link_id'];
 		$this->db->sql_query($sql);
@@ -63,8 +63,8 @@ 
 	*/
 	public function edit($data, $comment_id)
 	{
-		$sql = 'UPDATE ' . DIR_COMMENT_TABLE . '
-			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
+		$sql = 'UPDATE '.DIR_COMMENT_TABLE.'
+			SET ' . $this->db->sql_build_array('UPDATE', $data).'
 			WHERE comment_id = ' . (int) $comment_id;
 		$this->db->sql_query($sql);
 	}
@@ -82,10 +82,10 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'DELETE FROM ' . DIR_COMMENT_TABLE . ' WHERE comment_id = ' . (int) $comment_id;
+		$sql = 'DELETE FROM '.DIR_COMMENT_TABLE.' WHERE comment_id = '.(int) $comment_id;
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_comment = link_comment - 1
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
@@ -95,7 +95,7 @@ 
 		if ($request->is_ajax())
 		{
 			$sql = 'SELECT COUNT(comment_id) AS nb_comments
-				FROM ' . DIR_COMMENT_TABLE . '
+				FROM ' . DIR_COMMENT_TABLE.'
 				WHERE comment_link_id = ' . (int) $link_id;
 			$result = $this->db->sql_query($sql);
 			$nb_comments = (int) $this->db->sql_fetchfield('nb_comments');

core/link.php

Spacing +62 added lines, -62 removed lines

@@ -62,17 +62,17 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\notification\manager $notification, \ernadoo\phpbbdirectory\core\helper $dir_helper, $root_path, $php_ext)
 	{
-		$this->db			= $db;
+		$this->db = $db;
 		$this->config		= $config;
-		$this->template		= $template;
+		$this->template = $template;
 		$this->user			= $user;
 		$this->helper		= $helper;
-		$this->request		= $request;
+		$this->request = $request;
 		$this->auth			= $auth;
-		$this->notification	= $notification;
-		$this->dir_helper	= $dir_helper;
-		$this->root_path	= $root_path;
-		$this->php_ext		= $php_ext;
+		$this->notification = $notification;
+		$this->dir_helper = $dir_helper;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -88,13 +88,13 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . DIR_LINK_TABLE . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.DIR_LINK_TABLE.' '.$this->db->sql_build_array('INSERT', $data);
 		$this->db->sql_query($sql);
 		$notification_data['link_id'] = $this->db->sql_nextid();
 
 		if (!$need_approval || $this->auth->acl_get('a_') || $this->auth->acl_get('m_'))
 		{
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . '
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
 				SET cat_links = cat_links + 1
 				WHERE cat_id = ' . (int) $data['link_cat'];
 			$this->db->sql_query($sql);
@@ -152,14 +152,14 @@ 
 
 			$this->db->sql_transaction('begin');
 
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . '
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
 				SET cat_links = cat_links - 1
 				WHERE cat_id = ' . (int) $old_cat;
 			$this->db->sql_query($sql);
 
 			if (!$need_approval)
 			{
-				$sql = 'UPDATE ' . DIR_CAT_TABLE . '
+				$sql = 'UPDATE '.DIR_CAT_TABLE.'
 					SET cat_links = cat_links + 1
 					WHERE cat_id = ' . (int) $data['link_cat'];
 				$this->db->sql_query($sql);
@@ -177,8 +177,8 @@ 
 			$this->notification->add_notifications($notification_type, $notification_data);
 		}
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
+			SET ' . $this->db->sql_build_array('UPDATE', $data).'
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
 	}
@@ -204,7 +204,7 @@ 
 		);
 
 		$sql = 'SELECT link_banner
-			FROM ' . DIR_LINK_TABLE . '
+			FROM ' . DIR_LINK_TABLE.'
 			WHERE '. $this->db->sql_in_set('link_id', $url_array);
 		$result = $this->db->sql_query($sql);
 
@@ -226,7 +226,7 @@ 
 			$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $url_array));
 		}
 
-		$sql = 'UPDATE ' . DIR_CAT_TABLE . '
+		$sql = 'UPDATE '.DIR_CAT_TABLE.'
 			SET cat_links = cat_links - '.sizeof($url_array).'
 			WHERE cat_id = ' . (int) $cat_id;
 		$this->db->sql_query($sql);
@@ -244,7 +244,7 @@ 
 		if ($this->request->is_ajax())
 		{
 			$sql = 'SELECT cat_links
-				FROM ' . DIR_CAT_TABLE . '
+				FROM ' . DIR_CAT_TABLE.'
 				WHERE cat_id = ' . (int) $cat_id;
 			$result = $this->db->sql_query($sql);
 			$data = $this->db->sql_fetchrow($result);
@@ -271,7 +271,7 @@ 
 	public function view($link_id)
 	{
 		$sql = 'SELECT link_id, link_url
-			FROM ' . DIR_LINK_TABLE . '
+			FROM ' . DIR_LINK_TABLE.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$data = $this->db->sql_fetchrow($result);
@@ -281,7 +281,7 @@ 
 			throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
 		}
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_view = link_view + 1
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
@@ -306,7 +306,7 @@ 
 		if ($details['scheme'] == 'https')
 		{
 			$default_port = 443;
-			$hostname = 'tls://' . $details['host'];
+			$hostname = 'tls://'.$details['host'];
 		}
 
 		if (!isset($details['path']))
@@ -364,7 +364,7 @@ 
 		$flag_path = $ext_path.'images/flags/';
 		$img_flag = 'no_flag.png';
 
-		if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path . $data['link_flag']))
+		if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path.$data['link_flag']))
 		{
 			$img_flag = $data['link_flag'];
 		}
@@ -406,7 +406,7 @@ 
 			$list = '<select name="vote">';
 			for ($i = 0; $i <= 10; $i++)
 			{
-				$list .= '<option value="' . $i . '"' . (($i == 5) ? ' selected="selected"' : '') . '>' . $i . '</option>';
+				$list .= '<option value="'.$i.'"'.(($i == 5) ? ' selected="selected"' : '').'>'.$i.'</option>';
 			}
 			$list .= '</select>';
 
@@ -444,8 +444,8 @@ 
 			{
 				$thumb = $this->thumb_process($data['link_url']);
 
-				$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-					SET link_thumb = "' . $this->db->sql_escape($thumb) . '"
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
+					SET link_thumb = "' . $this->db->sql_escape($thumb).'"
 					WHERE link_id = ' . (int) $data['link_id'];
 				$this->db->sql_query($sql);
 
@@ -469,8 +469,8 @@ 
 			{
 				$pagerank = $this->pagerank_process($data['link_url']);
 
-				$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-					SET link_pagerank = ' . (int) $pagerank . '
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
+					SET link_pagerank = ' . (int) $pagerank.'
 					WHERE link_id = ' . (int) $data['link_id'];
 				$this->db->sql_query($sql);
 			}
@@ -479,9 +479,9 @@ 
 				$pagerank = (int) $data['link_pagerank'];
 			}
 
-			$prpos=40*$pagerank/10;
-			$prneg=40-$prpos;
-			$html='<img src="http://www.google.com/images/pos.gif" width="'.$prpos.'" height="4" alt="'.$pagerank.'" /><img src="http://www.google.com/images/neg.gif" width="'.$prneg.'" height="4" alt="'.$pagerank.'" /> ';
+			$prpos = 40 * $pagerank / 10;
+			$prneg = 40 - $prpos;
+			$html = '<img src="http://www.google.com/images/pos.gif" width="'.$prpos.'" height="4" alt="'.$pagerank.'" /><img src="http://www.google.com/images/neg.gif" width="'.$prneg.'" height="4" alt="'.$pagerank.'" /> ';
 
 			$pagerank = $pagerank == '-1' ? $this->user->lang['DIR_PAGERANK_NOT_AVAILABLE'] : $this->user->lang('DIR_FROM_TEN', $pagerank);
 			return $html.$pagerank;
@@ -521,7 +521,7 @@ 
 				$height /= $coef_max;
 			}
 
-			$s_banner = '<img src="' . $img_src . '" width="' . $width . '" height="' . $height . '" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
+			$s_banner = '<img src="'.$img_src.'" width="'.$width.'" height="'.$height.'" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
 		}
 
 		return $s_banner;
@@ -543,12 +543,12 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . DIR_VOTE_TABLE . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.DIR_VOTE_TABLE.' '.$this->db->sql_build_array('INSERT', $data);
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_vote = link_vote + 1,
-			link_note = link_note + ' . (int) $data['vote_note'] . '
+			link_note = link_note + ' . (int) $data['vote_note'].'
 		WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
 
@@ -556,7 +556,7 @@ 
 
 		if ($this->request->is_ajax())
 		{
-			$sql= 'SELECT link_vote, link_note FROM ' . DIR_LINK_TABLE . ' WHERE link_id = ' . (int) $link_id;
+			$sql = 'SELECT link_vote, link_note FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $link_id;
 			$result = $this->db->sql_query($sql);
 			$data = $this->db->sql_fetchrow($result);
 
@@ -590,8 +590,8 @@ 
 
 		$details = parse_url($url);
 
-		$root_url		= $details['scheme'].'://'.$details['host'];
-		$absolute_url	= isset($details['path']) ? $root_url.$details['path'] : $root_url;
+		$root_url = $details['scheme'].'://'.$details['host'];
+		$absolute_url = isset($details['path']) ? $root_url.$details['path'] : $root_url;
 
 		if ($this->config['dir_activ_thumb_remote'] && $this->_ascreen_exist($details['scheme'], $details['host']))
 		{
@@ -634,7 +634,7 @@ 
 		$destination = $this->dir_helper->get_banner_path();
 
 		// Can we upload?
-		$can_upload = ($this->config['dir_storage_banner'] && file_exists($this->root_path . $destination) && phpbb_is_writable($this->root_path . $destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
+		$can_upload = ($this->config['dir_storage_banner'] && file_exists($this->root_path.$destination) && phpbb_is_writable($this->root_path.$destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
 
 		if ($banner && $can_upload)
 		{
@@ -674,13 +674,13 @@ 
 		// Init upload class
 		if (!class_exists('fileupload'))
 		{
-			include($this->root_path . 'includes/functions_upload.' . $this->php_ext);
+			include($this->root_path.'includes/functions_upload.'.$this->php_ext);
 		}
 		$upload = new \fileupload('DIR_BANNER_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['dir_banner_filesize']);
 
 		$file = $upload->remote_upload($banner);
 
-		$prefix = unique_id() . '_';
+		$prefix = unique_id().'_';
 		$file->clean_filename('real', $prefix);
 
 		$destination = $this->dir_helper->get_banner_path();
@@ -695,7 +695,7 @@ 
 			return false;
 		}
 
-		return $prefix .strtolower($file->uploadname);
+		return $prefix.strtolower($file->uploadname);
 	}
 
 	/**
@@ -710,7 +710,7 @@ 
 	{
 		if (!preg_match('#^(http|https|ftp)://#i', $banner))
 		{
-			$banner = 'http://' . $banner;
+			$banner = 'http://'.$banner;
 		}
 		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $banner))
 		{
@@ -737,11 +737,11 @@ 
 		// Check image type
 		if (!class_exists('fileupload'))
 		{
-			include($this->root_path . 'includes/functions_upload.' . $this->php_ext);
+			include($this->root_path.'includes/functions_upload.'.$this->php_ext);
 		}
 
-		$types		= \fileupload::image_types();
-		$extension	= strtolower(\filespec::get_extension($banner));
+		$types = \fileupload::image_types();
+		$extension = strtolower(\filespec::get_extension($banner));
 
 		// Check if this is actually an image
 		if ($file_stream = @fopen($banner, 'r'))
@@ -843,14 +843,14 @@ 
 	*/
 	public function pagerank_process($q)
 	{
-		$googleDomains	= array('.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch');
-		$seed			= $this->user->lang['SEED'];
-		$result			= 0x01020345;
+		$googleDomains = array('.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch');
+		$seed = $this->user->lang['SEED'];
+		$result = 0x01020345;
 		$len			= strlen($q);
 
-		for ($i=0; $i<$len; $i++)
+		for ($i = 0; $i < $len; $i++)
 		{
-			$result ^= ord($seed{$i%strlen($seed)}) ^ ord($q{$i});
+			$result ^= ord($seed{$i % strlen($seed)}) ^ ord($q{$i});
 			$result = (($result >> 23) & 0x1ff) | $result << 9;
 		}
 
@@ -861,10 +861,10 @@ 
 
 		$ch		= sprintf('8%x', $result);
 		$url	= 'http://%s/tbr?client=navclient-auto&ch=%s&features=Rank&q=info:%s';
-		$host	= 'toolbarqueries.google'.$googleDomains[mt_rand(0,count($googleDomains)-1)];
+		$host = 'toolbarqueries.google'.$googleDomains[mt_rand(0, count($googleDomains) - 1)];
 
-		$url	= sprintf($url,$host,$ch,$q);
-		@$pr	= trim(file_get_contents($url,false));
+		$url	= sprintf($url, $host, $ch, $q);
+		@$pr	= trim(file_get_contents($url, false));
 
 		if (is_numeric(substr(strrchr($pr, ':'), 1)))
 		{
@@ -906,7 +906,7 @@ 
 
 			if (file_exists($flag_path.$img_file))
 			{
-				$list .= '<option value="' . $img_file . '" ' . (($img_file == $value) ? 'selected="selected"' : '') . '>' . $name . '</option>';
+				$list .= '<option value="'.$img_file.'" '.(($img_file == $value) ? 'selected="selected"' : '').'>'.$name.'</option>';
 			}
 		}
 
@@ -922,8 +922,8 @@ 
 	{
 		if ($this->config['dir_recent_block'])
 		{
-			$limit_sql		= $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
-			$exclude_array	= explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
+			$limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
+			$exclude_array = explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
 
 			$sql_array = array(
 				'SELECT'	=> 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_thumb, u.user_id, u.username, u.user_colour, c.cat_name',
@@ -956,7 +956,7 @@ 
 			if (sizeof($rowset))
 			{
 				$this->template->assign_block_vars('block', array(
-					'S_COL_WIDTH'			=> (100 / $this->config['dir_recent_columns']) . '%',
+					'S_COL_WIDTH'			=> (100 / $this->config['dir_recent_columns']).'%',
 				));
 
 				foreach ($rowset as $row)
@@ -1062,7 +1062,7 @@ 
 						'ON'	=> 'l.link_user_id = u.user_id'
 					)
 			),
-			'WHERE'		=> 'l.link_back <> "" AND l.link_active = 1 AND l.link_cat = '  . (int) $cat_id);
+			'WHERE'		=> 'l.link_back <> "" AND l.link_active = 1 AND l.link_cat = '.(int) $cat_id);
 
 		$sql = $this->db->sql_build_query('SELECT', $sql_array);
 		$result = $this->db->sql_query($sql);
@@ -1071,7 +1071,7 @@ 
 		{
 			if ($this->validate_link_back($row['link_back'], false, true) !== false)
 			{
-				if (!$nb_check || ($row['link_nb_check']+1) >= $nb_check)
+				if (!$nb_check || ($row['link_nb_check'] + 1) >= $nb_check)
 				{
 					$del_array[] = $row['link_id'];
 				}
@@ -1105,7 +1105,7 @@ 
 		global $phpbb_log;
 
 		$sql = 'SELECT cat_name
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			WHERE cat_id = ' . (int) $cat_data['cat_id'];
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -1117,9 +1117,9 @@ 
 
 			$this->_check($cat_data['cat_id'], $cat_data['cat_cron_nb_check'], $next_prune);
 
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+			$sql = 'UPDATE '.DIR_CAT_TABLE."
 				SET cat_cron_next = $next_prune
-				WHERE cat_id = " . (int) $cat_data['cat_id'];
+				WHERE cat_id = ".(int) $cat_data['cat_id'];
 			$this->db->sql_query($sql);
 
 			$phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_AUTO_PRUNE', time(), array($row['cat_name']));
@@ -1139,7 +1139,7 @@ 
 	{
 		if (!class_exists('messenger'))
 		{
-			include($this->root_path . 'includes/functions_messenger.' . $this->php_ext);
+			include($this->root_path.'includes/functions_messenger.'.$this->php_ext);
 		}
 
 		$messenger = new \messenger(false);
@@ -1148,7 +1148,7 @@ 
 		// We need to define it, because we use user->format_date below
 		$this->user->timezone = new \DateTimeZone($this->config['board_timezone']);
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_nb_check = link_nb_check + 1
 			WHERE ' . $this->db->sql_in_set('link_id', array_keys($u_array));
 		$this->db->sql_query($sql);