ErnadoO / ext-phpbb-directory

ext.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 	* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
 	* @license GNU General Public License, version 2 (GPL-2.0)
 	* @param string $step The step (enable, disable, purge)
-	* @param array $notification_types The notification type names
+	* @param string[] $notification_types The notification type names
 	* @return string Return notifications as temporary state
 	* @access protected
 	*/

Indentation +30 added lines, -30 removed lines

@@ -17,11 +17,11 @@ 
 class ext extends \phpbb\extension\base
 {
 	/**
-	* Enable extension if requirements are met
-	*
-	* @return bool
-	* @aceess public
-	*/
+	 * Enable extension if requirements are met
+	 *
+	 * @return bool
+	 * @aceess public
+	 */
 	public function is_enableable()
 	{
 		$config = $this->container->get('config');
@@ -42,11 +42,11 @@ 
 	}
 
 	/**
-	* Single enable step that installs any included migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single enable step that installs any included migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	public function enable_step($old_state)
 	{
 		switch ($old_state)
@@ -74,11 +74,11 @@ 
 	}
 
 	/**
-	* Single disable step that does nothing
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single disable step that does nothing
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	public function disable_step($old_state)
 	{
 		switch ($old_state)
@@ -106,11 +106,11 @@ 
 	}
 
 	/**
-	* Single purge step that reverts any included and installed migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single purge step that reverts any included and installed migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	public function purge_step($old_state)
 	{
 		switch ($old_state)
@@ -138,16 +138,16 @@ 
 	}
 
 	/**
-	* Notification handler to call notification enable/disable/purge steps
-	*
-	* @author VSEphpbb (Matt Friedman)
-	* @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
-	* @license GNU General Public License, version 2 (GPL-2.0)
-	* @param string $step The step (enable, disable, purge)
-	* @param array $notification_types The notification type names
-	* @return string Return notifications as temporary state
-	* @access protected
-	*/
+	 * Notification handler to call notification enable/disable/purge steps
+	 *
+	 * @author VSEphpbb (Matt Friedman)
+	 * @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
+	 * @license GNU General Public License, version 2 (GPL-2.0)
+	 * @param string $step The step (enable, disable, purge)
+	 * @param array $notification_types The notification type names
+	 * @return string Return notifications as temporary state
+	 * @access protected
+	 */
 	protected function notification_handler($step, $notification_types)
 	{
 		$phpbb_notifications = $this->container->get('notification_manager');

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 
 		foreach ($notification_types as $notification_type)
 		{
-			call_user_func(array($phpbb_notifications, $step . '_notifications'), $notification_type);
+			call_user_func(array($phpbb_notifications, $step.'_notifications'), $notification_type);
 		}
 
 		return 'notifications';

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

controller/acp/cat.php

Indentation +105 added lines, -105 removed lines

@@ -70,20 +70,20 @@ 
 	private $update;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\cache\service								$cache				Cache object
-	* @param \phpbb\db\driver\driver_interface 					$db					Database object
-	* @param \phpbb\controller\helper							$helper				Helper object
-	* @param \phpbb\language\language							$language			Language object
-	* @param \phpbb\log\log										$log				Log object
-	* @param \phpbb\request\request								$request			Request object
-	* @param \phpbb\template\template							$template			Template object
-	* @param \phpbb\user										$user				User object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\helper				$dir_helper			PhpBB Directory extension helper object
-	* @param \ernadoo\phpbbdirectory\core\nestedset_category	$nestedset_category	PhpBB Directory extension nestedset object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\cache\service								$cache				Cache object
+	 * @param \phpbb\db\driver\driver_interface 					$db					Database object
+	 * @param \phpbb\controller\helper							$helper				Helper object
+	 * @param \phpbb\language\language							$language			Language object
+	 * @param \phpbb\log\log										$log				Log object
+	 * @param \phpbb\request\request								$request			Request object
+	 * @param \phpbb\template\template							$template			Template object
+	 * @param \phpbb\user										$user				User object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\helper				$dir_helper			PhpBB Directory extension helper object
+	 * @param \ernadoo\phpbbdirectory\core\nestedset_category	$nestedset_category	PhpBB Directory extension nestedset object
+	 */
 	public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\helper $dir_helper, \ernadoo\phpbbdirectory\core\nestedset_category $nestedset_category)
 	{
 		$this->cache				= $cache;
@@ -108,10 +108,10 @@ 
 	}
 
 	/**
-	* Initialize defaults data for add page
-	*
-	* @return null
-	*/
+	 * Initialize defaults data for add page
+	 *
+	 * @return null
+	 */
 	public function action_add()
 	{
 		$this->cat_id = $this->parent_id;
@@ -145,10 +145,10 @@ 
 	}
 
 	/**
-	* Display deleting page
-	*
-	* @return null
-	*/
+	 * Display deleting page
+	 *
+	 * @return null
+	 */
 	public function action_delete()
 	{
 		if (!$this->cat_id)
@@ -199,10 +199,10 @@ 
 	}
 
 	/**
-	* Initialize data for edit page
-	*
-	* @return null
-	*/
+	 * Initialize data for edit page
+	 *
+	 * @return null
+	 */
 	public function action_edit()
 	{
 		$row = $this->_get_cat_info($this->cat_id);
@@ -229,10 +229,10 @@ 
 	}
 
 	/**
-	* Move order categories
-	*
-	* @return null
-	*/
+	 * Move order categories
+	 *
+	 * @return null
+	 */
 	public function action_move()
 	{
 		if (!$this->cat_id)
@@ -275,10 +275,10 @@ 
 	}
 
 	/**
-	* Display progress bar for syncinc categories
-	*
-	* @return null
-	*/
+	 * Display progress bar for syncinc categories
+	 *
+	 * @return null
+	 */
 	public function action_progress_bar()
 	{
 		$start = $this->request->variable('start', 0);
@@ -299,10 +299,10 @@ 
 	}
 
 	/**
-	* Get link's ID interval for _sync_dir_links()
-	*
-	* @return null
-	*/
+	 * Get link's ID interval for _sync_dir_links()
+	 *
+	 * @return null
+	 */
 	public function action_sync()
 	{
 		if (!$this->cat_id)
@@ -386,10 +386,10 @@ 
 	}
 
 	/**
-	* Sync category data
-	*
-	* @return null
-	*/
+	 * Sync category data
+	 *
+	 * @return null
+	 */
 	public function action_sync_cat()
 	{
 		$sql = 'SELECT cat_name
@@ -413,10 +413,10 @@ 
 	}
 
 	/**
-	* Display categories page
-	*
-	* @return null
-	*/
+	 * Display categories page
+	 *
+	 * @return null
+	 */
 	public function display_cats()
 	{
 		// Default management page
@@ -511,22 +511,22 @@ 
 	}
 
 	/**
-	* Set page url
-	*
-	* @param	string $u_action Custom form action
-	* @return	null
-	* @access	public
-	*/
+	 * Set page url
+	 *
+	 * @param	string $u_action Custom form action
+	 * @return	null
+	 * @access	public
+	 */
 	public function set_page_url($u_action)
 	{
 		$this->u_action = $u_action;
 	}
 
 	/**
-	* Update cat table
-	*
-	* @return null
-	*/
+	 * Update cat table
+	 *
+	 * @return null
+	 */
 	public function update()
 	{
 		if (!check_form_key($this->form_key))
@@ -620,11 +620,11 @@ 
 	}
 
 	/**
-	* Display form
-	*
-	* @param	string $parents_list	Drop-down list
-	* @return	null
-	*/
+	 * Display form
+	 *
+	 * @param	string $parents_list	Drop-down list
+	 * @return	null
+	 */
 	private function _display_cat_form($parents_list)
 	{
 		$dir_cat_desc_data = array(
@@ -694,11 +694,11 @@ 
 	}
 
 	/**
-	* Get category details
-	*
-	* @param	int		$cat_id	The category ID
-	* @return 	array
-	*/
+	 * Get category details
+	 *
+	 * @param	int		$cat_id	The category ID
+	 * @return 	array
+	 */
 	private function _get_cat_info($cat_id)
 	{
 		$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_desc, cat_desc_uid, cat_desc_options, cat_icon, cat_name, display_subcat_list, cat_allow_comments, cat_allow_votes, cat_must_describe, cat_count_all, cat_validate, cat_cron_freq, cat_cron_nb_check, cat_link_back, cat_cron_enable, cat_cron_next
@@ -717,10 +717,10 @@ 
 	}
 
 	/**
-	* Update category data
-	*
-	* @return array
-	*/
+	 * Update category data
+	 *
+	 * @return array
+	 */
 	private function _update_cat_data()
 	{
 		if (!$this->cat_data['cat_name'])
@@ -814,14 +814,14 @@ 
 	}
 
 	/**
-	* Remove complete category
-	*
-	* @param	string	$action_links	Action for categories links
-	* @param	string	$action_subcats	Action for sub-categories
-	* @param	int		$links_to_id	New category ID for links
-	* @param	int		$subcats_to_id	New category ID for sub-categories
-	* @return 	array
-	*/
+	 * Remove complete category
+	 *
+	 * @param	string	$action_links	Action for categories links
+	 * @param	string	$action_subcats	Action for sub-categories
+	 * @param	int		$links_to_id	New category ID for links
+	 * @param	int		$subcats_to_id	New category ID for sub-categories
+	 * @return 	array
+	 */
 	private function _delete_cat($action_links = 'delete', $action_subcats = 'delete', $links_to_id = 0, $subcats_to_id = 0)
 	{
 		$this->cat_data = $this->_get_cat_info($this->cat_id);
@@ -938,12 +938,12 @@ 
 	}
 
 	/**
-	* Move category content from one to another forum
-	*
-	* @param	int	$from_id
-	* @param	int	$to_id
-	* @return	null
-	*/
+	 * Move category content from one to another forum
+	 *
+	 * @param	int	$from_id
+	 * @param	int	$to_id
+	 * @return	null
+	 */
 	private function _move_cat_content($from_id, $to_id)
 	{
 		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
@@ -959,10 +959,10 @@ 
 	}
 
 	/**
-	* Delete category content
-	*
-	* @return array
-	*/
+	 * Delete category content
+	 *
+	 * @return array
+	 */
 	private function _delete_cat_content()
 	{
 		$this->db->sql_transaction('begin');
@@ -1021,11 +1021,11 @@ 
 	}
 
 	/**
-	* Update links counter
-	*
-	* @param	int $cat_id	The category ID
-	* @return	null
-	*/
+	 * Update links counter
+	 *
+	 * @param	int $cat_id	The category ID
+	 * @return	null
+	 */
 	private function _sync_dir_cat($cat_id)
 	{
 		$sql = 'SELECT COUNT(link_id) AS num_links
@@ -1043,12 +1043,12 @@ 
 	}
 
 	/**
-	* Update link data (note, vote, comment)
-	*
-	* @param	int	$start
-	* @param	int	$stop
-	* @return	null
-	*/
+	 * Update link data (note, vote, comment)
+	 *
+	 * @param	int	$start
+	 * @param	int	$stop
+	 * @return	null
+	 */
 	private function _sync_dir_links($start, $stop)
 	{
 		$sql_ary = array(
@@ -1091,12 +1091,12 @@ 
 	}
 
 	/**
-	* Display icons drop-down list
-	*
-	* @param	string	$icons_path
-	* @param	string	$img_selected
-	* @return	string
-	*/
+	 * Display icons drop-down list
+	 *
+	 * @param	string	$icons_path
+	 * @param	string	$img_selected
+	 * @return	string
+	 */
 	private function _get_dir_icon_list($icons_path, $img_selected)
 	{
 		$imglist = filelist($icons_path, '');

Spacing +92 added lines, -92 removed lines

@@ -86,24 +86,24 @@ 
 	*/
 	public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\helper $dir_helper, \ernadoo\phpbbdirectory\core\nestedset_category $nestedset_category)
 	{
-		$this->cache				= $cache;
-		$this->db					= $db;
-		$this->helper				= $helper;
+		$this->cache = $cache;
+		$this->db = $db;
+		$this->helper = $helper;
 		$this->language				= $language;
 		$this->phpbb_log			= $log;
-		$this->request				= $request;
+		$this->request = $request;
 		$this->template				= $template;
-		$this->user					= $user;
+		$this->user = $user;
 		$this->categorie			= $categorie;
-		$this->dir_helper			= $dir_helper;
-		$this->nestedset_category	= $nestedset_category;
+		$this->dir_helper = $dir_helper;
+		$this->nestedset_category = $nestedset_category;
 
 		$this->form_key = 'acp_dir_cat';
 		add_form_key($this->form_key);
 
 		$this->action		= $this->request->variable('action', '');
 		$this->cat_id		= $request->variable('c', 0);
-		$this->parent_id	= $request->variable('parent_id', 0);
+		$this->parent_id = $request->variable('parent_id', 0);
 		$this->update		= ($this->request->is_set_post('update')) ? true : false;
 	}
 
@@ -153,7 +153,7 @@ 
 	{
 		if (!$this->cat_id)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		$this->cat_data = $this->_get_cat_info($this->cat_id);
@@ -169,7 +169,7 @@ 
 		$cat_list = $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $subcats_id);
 
 		$sql = 'SELECT cat_id
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			WHERE cat_id <> ' . (int) $this->cat_id;
 		$result = $this->db->sql_query_limit($sql, 1);
 
@@ -185,8 +185,8 @@ 
 
 		$this->template->assign_vars(array(
 			'S_DELETE_DIR_CAT'		=> true,
-			'U_ACTION'				=> $this->u_action . "&amp;parent_id={$parent_id}&amp;action=delete&amp;c=$this->cat_id",
-			'U_BACK'				=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
+			'U_ACTION'				=> $this->u_action."&amp;parent_id={$parent_id}&amp;action=delete&amp;c=$this->cat_id",
+			'U_BACK'				=> $this->u_action.'&amp;parent_id='.$this->parent_id,
 
 			'DIR_CAT_NAME'			=> $this->cat_data['cat_name'],
 			'S_HAS_SUBCATS'			=> ($this->cat_data['right_id'] - $this->cat_data['left_id'] > 1) ? true : false,
@@ -237,11 +237,11 @@ 
 	{
 		if (!$this->cat_id)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			WHERE cat_id = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -249,7 +249,7 @@ 
 
 		if (!$row)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		try
@@ -263,7 +263,7 @@ 
 
 		if ($move_cat_name !== false)
 		{
-			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_' . strtoupper($this->action), time(), array($row['cat_name'], $move_cat_name));
+			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_'.strtoupper($this->action), time(), array($row['cat_name'], $move_cat_name));
 			$this->cache->destroy('sql', DIR_CAT_TABLE);
 		}
 
@@ -307,13 +307,13 @@ 
 	{
 		if (!$this->cat_id)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		@set_time_limit(0);
 
 		$sql = 'SELECT cat_name, cat_links
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			WHERE cat_id = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -321,12 +321,12 @@ 
 
 		if (!$row)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		$sql = 'SELECT MIN(link_id) as min_link_id, MAX(link_id) as max_link_id
-			FROM ' . DIR_LINK_TABLE . '
-			WHERE link_cat = ' . (int) $this->cat_id . '
+			FROM ' . DIR_LINK_TABLE.'
+			WHERE link_cat = ' . (int) $this->cat_id.'
 				AND link_active = 1';
 		$result = $this->db->sql_query($sql);
 		$row2 = $this->db->sql_fetchrow($result);
@@ -348,23 +348,23 @@ 
 		{
 			// We really need to find a way of showing statistics... no progress here
 			$sql = 'SELECT COUNT(link_id) as num_links
-				FROM ' . DIR_LINK_TABLE . '
-				WHERE link_cat = ' . (int) $this->cat_id . '
+				FROM ' . DIR_LINK_TABLE.'
+				WHERE link_cat = ' . (int) $this->cat_id.'
 						AND link_active = 1
-						AND link_id BETWEEN ' . $start . ' AND ' . $end;
+						AND link_id BETWEEN ' . $start.' AND '.$end;
 			$result = $this->db->sql_query($sql);
 			$links_done = $this->request->variable('links_done', 0) + (int) $this->db->sql_fetchfield('num_links');
 			$this->db->sql_freeresult($result);
 
 			$start += $batch_size;
 
-			$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync&amp;start=$start&amp;links_done=$links_done&amp;total={$row['cat_links']}";
+			$url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync&amp;start=$start&amp;links_done=$links_done&amp;total={$row['cat_links']}";
 
 			meta_refresh(0, $url);
 
 			$this->template->assign_vars(array(
-				'U_PROGRESS_BAR'		=> $this->u_action . "&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}",
-				'UA_PROGRESS_BAR'		=> addslashes($this->u_action . "&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}"),
+				'U_PROGRESS_BAR'		=> $this->u_action."&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}",
+				'UA_PROGRESS_BAR'		=> addslashes($this->u_action."&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}"),
 				'S_CONTINUE_SYNC'		=> true,
 				'L_PROGRESS_EXPLAIN'	=> $this->language->lang('SYNC_IN_PROGRESS_EXPLAIN', $links_done, $row['cat_links']))
 			);
@@ -372,12 +372,12 @@ 
 			return;
 		}
 
-		$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync_cat";
+		$url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync_cat";
 		meta_refresh(0, $url);
 
 		$this->template->assign_vars(array(
-			'U_PROGRESS_BAR'		=> $this->u_action . '&amp;action=progress_bar',
-			'UA_PROGRESS_BAR'		=> addslashes($this->u_action . '&amp;action=progress_bar'),
+			'U_PROGRESS_BAR'		=> $this->u_action.'&amp;action=progress_bar',
+			'UA_PROGRESS_BAR'		=> addslashes($this->u_action.'&amp;action=progress_bar'),
 			'S_CONTINUE_SYNC'		=> true,
 			'L_PROGRESS_EXPLAIN'	=> $this->language->lang('SYNC_IN_PROGRESS_EXPLAIN', 0, $row['cat_links']))
 		);
@@ -393,7 +393,7 @@ 
 	public function action_sync_cat()
 	{
 		$sql = 'SELECT cat_name
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			WHERE cat_id = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -401,7 +401,7 @@ 
 
 		if (!$row)
 		{
-			trigger_error($this->language->lang('DIR_NO_CAT') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id), E_USER_WARNING);
+			trigger_error($this->language->lang('DIR_NO_CAT').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
 		}
 
 		$this->_sync_dir_cat($this->cat_id);
@@ -426,7 +426,7 @@ 
 		}
 		else
 		{
-			$navigation = '<a href="' . $this->u_action . '">' . $this->language->lang('DIR_INDEX') . '</a>';
+			$navigation = '<a href="'.$this->u_action.'">'.$this->language->lang('DIR_INDEX').'</a>';
 
 			$cats_nav = $this->nestedset_category->get_path_data($this->parent_id);
 
@@ -434,11 +434,11 @@ 
 			{
 				if ($row['cat_id'] == $this->parent_id)
 				{
-					$navigation .= ' -&gt; ' . $row['cat_name'];
+					$navigation .= ' -&gt; '.$row['cat_name'];
 				}
 				else
 				{
-					$navigation .= ' -&gt; <a href="' . $this->u_action . '&amp;parent_id=' . $row['cat_id'] . '">' . $row['cat_name'] . '</a>';
+					$navigation .= ' -&gt; <a href="'.$this->u_action.'&amp;parent_id='.$row['cat_id'].'">'.$row['cat_name'].'</a>';
 				}
 			}
 		}
@@ -452,8 +452,8 @@ 
 		}
 
 		$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_name, cat_icon, cat_desc_uid, cat_desc_bitfield, cat_desc, cat_desc_options, cat_links
-			FROM ' . DIR_CAT_TABLE . '
-			WHERE parent_id = ' . (int) $this->parent_id . '
+			FROM ' . DIR_CAT_TABLE.'
+			WHERE parent_id = ' . (int) $this->parent_id.'
 			ORDER BY left_id';
 		$result = $this->db->sql_query($sql);
 
@@ -461,23 +461,23 @@ 
 		{
 			do
 			{
-				$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="' . $this->language->lang('DIR_SUBCAT') . '" />' : '<img src="images/icon_folder.gif" alt="' . $this->language->lang('FOLDER') . '" />';
+				$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="'.$this->language->lang('DIR_SUBCAT').'" />' : '<img src="images/icon_folder.gif" alt="'.$this->language->lang('FOLDER').'" />';
 
-				$url = $this->u_action . "&amp;parent_id=$this->parent_id&amp;c={$row['cat_id']}";
+				$url = $this->u_action."&amp;parent_id=$this->parent_id&amp;c={$row['cat_id']}";
 
 				$this->template->assign_block_vars('cats', array(
 					'FOLDER_IMAGE'		=> $folder_image,
-					'CAT_IMAGE'			=> ($row['cat_icon']) ? '<img src="' . $this->dir_helper->get_img_path('icons', $row['cat_icon']) . '" alt="" />' : '',
+					'CAT_IMAGE'			=> ($row['cat_icon']) ? '<img src="'.$this->dir_helper->get_img_path('icons', $row['cat_icon']).'" alt="" />' : '',
 					'CAT_NAME'			=> $row['cat_name'],
 					'CAT_DESCRIPTION'	=> generate_text_for_display($row['cat_desc'], $row['cat_desc_uid'], $row['cat_desc_bitfield'], $row['cat_desc_options']),
 					'CAT_LINKS'			=> $row['cat_links'],
 
-					'U_CAT'				=> $this->u_action . '&amp;parent_id=' . $row['cat_id'],
-					'U_MOVE_UP'			=> $url . '&amp;action=move_up',
-					'U_MOVE_DOWN'		=> $url . '&amp;action=move_down',
-					'U_EDIT'			=> $url . '&amp;action=edit',
-					'U_DELETE'			=> $url . '&amp;action=delete',
-					'U_SYNC'			=> $url . '&amp;action=sync')
+					'U_CAT'				=> $this->u_action.'&amp;parent_id='.$row['cat_id'],
+					'U_MOVE_UP'			=> $url.'&amp;action=move_up',
+					'U_MOVE_DOWN'		=> $url.'&amp;action=move_down',
+					'U_EDIT'			=> $url.'&amp;action=edit',
+					'U_DELETE'			=> $url.'&amp;action=delete',
+					'U_SYNC'			=> $url.'&amp;action=sync')
 				);
 			}
 			while ($row = $this->db->sql_fetchrow($result));
@@ -486,14 +486,14 @@ 
 		{
 			$row = $this->_get_cat_info($this->parent_id);
 
-			$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;c=' . $row['cat_id'];
+			$url = $this->u_action.'&amp;parent_id='.$this->parent_id.'&amp;c='.$row['cat_id'];
 
 			$this->template->assign_vars(array(
 				'S_NO_CATS'			=> true,
 
-				'U_EDIT'			=> $url . '&amp;action=edit',
-				'U_DELETE'			=> $url . '&amp;action=delete',
-				'U_SYNC'			=> $url . '&amp;action=sync')
+				'U_EDIT'			=> $url.'&amp;action=edit',
+				'U_DELETE'			=> $url.'&amp;action=delete',
+				'U_SYNC'			=> $url.'&amp;action=sync')
 			);
 		}
 		$this->db->sql_freeresult($result);
@@ -503,10 +503,10 @@ 
 			'NAVIGATION'	=> $navigation,
 			'CAT_BOX'		=> $cat_box,
 			'U_SEL_ACTION'	=> $this->u_action,
-			'U_ACTION'		=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
+			'U_ACTION'		=> $this->u_action.'&amp;parent_id='.$this->parent_id,
 
-			'U_PROGRESS_BAR'	=> $this->u_action . '&amp;action=progress_bar',
-			'UA_PROGRESS_BAR'	=> addslashes($this->u_action . '&amp;action=progress_bar'),
+			'U_PROGRESS_BAR'	=> $this->u_action.'&amp;action=progress_bar',
+			'UA_PROGRESS_BAR'	=> addslashes($this->u_action.'&amp;action=progress_bar'),
 		));
 	}
 
@@ -538,10 +538,10 @@ 
 		switch ($this->action)
 		{
 			case 'delete':
-				$action_subcats	= $this->request->variable('action_subcats', '');
-				$subcats_to_id	= $this->request->variable('subcats_to_id', 0);
-				$action_links	= $this->request->variable('action_links', '');
-				$links_to_id	= $this->request->variable('links_to_id', 0);
+				$action_subcats = $this->request->variable('action_subcats', '');
+				$subcats_to_id = $this->request->variable('subcats_to_id', 0);
+				$action_links = $this->request->variable('action_links', '');
+				$links_to_id = $this->request->variable('links_to_id', 0);
 
 				try
 				{
@@ -559,7 +559,7 @@ 
 
 				$this->cache->destroy('sql', DIR_CAT_TABLE);
 
-				trigger_error($this->language->lang('DIR_CAT_DELETED') . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
+				trigger_error($this->language->lang('DIR_CAT_DELETED').adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id));
 
 				break;
 
@@ -612,7 +612,7 @@ 
 
 					$message = ($this->action == 'add') ? $this->language->lang('DIR_CAT_CREATED') : $this->language->lang('DIR_CAT_UPDATED');
 
-					trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
+					trigger_error($message.adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id));
 				}
 
 			break;
@@ -657,10 +657,10 @@ 
 			'S_CAT_PARENT_ID'	=> $this->cat_data['parent_id'],
 			'S_ADD_ACTION'		=> ($this->action == 'add') ? true : false,
 
-			'U_BACK'			=> $this->u_action . '&amp;parent_id=' . $this->parent_id,
-			'U_EDIT_ACTION'		=> $this->u_action . "&amp;parent_id={$this->parent_id}&amp;action=$this->action&amp;c=$this->cat_id",
+			'U_BACK'			=> $this->u_action.'&amp;parent_id='.$this->parent_id,
+			'U_EDIT_ACTION'		=> $this->u_action."&amp;parent_id={$this->parent_id}&amp;action=$this->action&amp;c=$this->cat_id",
 
-			'L_TITLE'					=> $this->language->lang('DIR_' . strtoupper($this->action) . '_CAT'),
+			'L_TITLE'					=> $this->language->lang('DIR_'.strtoupper($this->action).'_CAT'),
 			'ERROR_MSG'					=> (sizeof($this->errors)) ? implode('<br />', $this->errors) : '',
 			'ICON_IMAGE'				=> ($this->cat_data['cat_icon']) ? $this->dir_helper->get_img_path('icons', $this->cat_data['cat_icon']) : 'images/spacer.gif',
 
@@ -702,7 +702,7 @@ 
 	private function _get_cat_info($cat_id)
 	{
 		$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_desc, cat_desc_uid, cat_desc_options, cat_icon, cat_name, display_subcat_list, cat_allow_comments, cat_allow_votes, cat_must_describe, cat_count_all, cat_validate, cat_cron_freq, cat_cron_nb_check, cat_link_back, cat_cron_enable, cat_cron_next
-			FROM ' . DIR_CAT_TABLE . '
+			FROM ' . DIR_CAT_TABLE.'
 			WHERE cat_id = ' . (int) $cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -765,7 +765,7 @@ 
 		{
 			if ($cat_data_sql['cat_cron_enable'])
 			{
-				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq']*86400;
+				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
 			}
 
 			$this->cat_data = $this->nestedset_category->insert($cat_data_sql);
@@ -788,13 +788,13 @@ 
 
 			if ($cat_data_sql['cat_cron_enable'] && ($row['cat_cron_freq'] != $cat_data_sql['cat_cron_freq'] || !$row['cat_cron_enable']))
 			{
-				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq']*86400;
+				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
 			}
 
 			if ($row['cat_name'] != $cat_data_sql['cat_name'])
 			{
 				// the cat name has changed, clear the parents list of all categories (for safety)
-				$sql = 'UPDATE ' . DIR_CAT_TABLE . "
+				$sql = 'UPDATE '.DIR_CAT_TABLE."
 					SET cat_parents = ''";
 				$this->db->sql_query($sql);
 			}
@@ -802,8 +802,8 @@ 
 			// Setting the cat id to the categorie id is not really received well by some dbs. ;)
 			unset($cat_data_sql['cat_id']);
 
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $cat_data_sql) . '
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
+				SET ' . $this->db->sql_build_array('UPDATE', $cat_data_sql).'
 				WHERE cat_id = ' . (int) $this->cat_id;
 			$this->db->sql_query($sql);
 
@@ -844,7 +844,7 @@ 
 				$log_action_links = 'MOVE_LINKS';
 
 				$sql = 'SELECT cat_name
-					FROM ' . DIR_CAT_TABLE . '
+					FROM ' . DIR_CAT_TABLE.'
 					WHERE cat_id = ' . (int) $links_to_id;
 				$result = $this->db->sql_query($sql);
 				$row = $this->db->sql_fetchrow($result);
@@ -946,12 +946,12 @@ 
 	*/
 	private function _move_cat_content($from_id, $to_id)
 	{
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-			SET link_cat = ' . (int) $to_id . '
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
+			SET link_cat = ' . (int) $to_id.'
 			WHERE link_cat = ' . (int) $from_id;
 		$this->db->sql_query($sql);
 
-		$sql = 'DELETE FROM ' . DIR_WATCH_TABLE . '
+		$sql = 'DELETE FROM '.DIR_WATCH_TABLE.'
 			WHERE cat_id = ' . (int) $from_id;
 		$this->db->sql_query($sql);
 
@@ -969,7 +969,7 @@ 
 
 		// Before we remove anything we make sure we are able to adjust the post counts later. ;)
 		$sql = 'SELECT link_id, link_banner
-			FROM ' . DIR_LINK_TABLE . '
+			FROM ' . DIR_LINK_TABLE.'
 			WHERE link_cat = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 
@@ -1000,7 +1000,7 @@ 
 
 			foreach ($link_datas_ary as $table => $field)
 			{
-				$this->db->sql_query("DELETE FROM $table WHERE " . $this->db->sql_in_set($field, $link_ids));
+				$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $link_ids));
 			}
 		}
 
@@ -1012,7 +1012,7 @@ 
 
 		foreach ($cat_datas_ary as $table => $field)
 		{
-			$this->db->sql_query("DELETE FROM $table WHERE $field = " . (int) $this->cat_id);
+			$this->db->sql_query("DELETE FROM $table WHERE $field = ".(int) $this->cat_id);
 		}
 
 		$this->db->sql_transaction('commit');
@@ -1029,15 +1029,15 @@ 
 	private function _sync_dir_cat($cat_id)
 	{
 		$sql = 'SELECT COUNT(link_id) AS num_links
-			FROM ' . DIR_LINK_TABLE . '
-			WHERE link_cat = ' . (int) $cat_id . '
+			FROM ' . DIR_LINK_TABLE.'
+			WHERE link_cat = ' . (int) $cat_id.'
 				AND link_active = 1';
 		$result = $this->db->sql_query($sql);
 		$total_links = (int) $this->db->sql_fetchfield('num_links');
 		$this->db->sql_freeresult($result);
 
-		$sql = 'UPDATE ' . DIR_CAT_TABLE . '
-			SET cat_links = ' . $total_links . '
+		$sql = 'UPDATE '.DIR_CAT_TABLE.'
+			SET cat_links = ' . $total_links.'
 			WHERE cat_id = ' . (int) $cat_id;
 		$this->db->sql_query($sql);
 	}
@@ -1057,33 +1057,33 @@ 
 			'link_vote'		=> 0,
 		);
 
-		$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-			WHERE link_id BETWEEN ' . (int) $start . ' AND ' . (int) $stop;
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
+			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
+			WHERE link_id BETWEEN ' . (int) $start.' AND '.(int) $stop;
 		$this->db->sql_query($sql);
 
-		$sql = 'SELECT vote_link_id, COUNT(vote_note) AS nb_vote, SUM(vote_note) AS total FROM ' . DIR_VOTE_TABLE . '
-			WHERE vote_link_id BETWEEN ' . (int) $start . ' AND ' . (int) $stop . '
+		$sql = 'SELECT vote_link_id, COUNT(vote_note) AS nb_vote, SUM(vote_note) AS total FROM '.DIR_VOTE_TABLE.'
+			WHERE vote_link_id BETWEEN ' . (int) $start.' AND '.(int) $stop.'
 			GROUP BY vote_link_id';
 		$result = $this->db->sql_query($sql);
 		while ($tmp = $this->db->sql_fetchrow($result))
 		{
-			$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-				SET link_note = ' . (int) $tmp['total'] . ', link_vote = ' . (int) $tmp['nb_vote'] . '
+			$sql = 'UPDATE '.DIR_LINK_TABLE.'
+				SET link_note = ' . (int) $tmp['total'].', link_vote = '.(int) $tmp['nb_vote'].'
 				WHERE link_id = ' . (int) $tmp['vote_link_id'];
 			$this->db->sql_query($sql);
 		}
 		$this->db->sql_freeresult($result);
 
 		$sql = 'SELECT 	comment_link_id, COUNT(comment_id) AS nb_comment
-			FROM ' . DIR_COMMENT_TABLE . '
-			WHERE comment_link_id BETWEEN ' . (int) $start . ' AND ' . (int) $stop . '
+			FROM ' . DIR_COMMENT_TABLE.'
+			WHERE comment_link_id BETWEEN ' . (int) $start.' AND '.(int) $stop.'
 			GROUP BY comment_link_id';
 		$result = $this->db->sql_query($sql);
 		while ($tmp = $this->db->sql_fetchrow($result))
 		{
-			$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-				SET link_comment = ' . (int) $tmp['nb_comment'] . '
+			$sql = 'UPDATE '.DIR_LINK_TABLE.'
+				SET link_comment = ' . (int) $tmp['nb_comment'].'
 				WHERE link_id = ' . (int) $tmp['comment_link_id'];
 			$this->db->sql_query($sql);
 		}
@@ -1108,7 +1108,7 @@ 
 
 			foreach ($img_ary as $img)
 			{
-				$img = $path . $img;
+				$img = $path.$img;
 				$selected = '';
 
 				if (strlen($img) > 255)
@@ -1121,7 +1121,7 @@ 
 					$selected = ' selected="selected"';
 				}
 
-				$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>';
+				$filename_list .= '<option value="'.htmlspecialchars($img).'"'.$selected.'>'.$img.'</option>';
 			}
 		}
 

controller/acp/main.php

Indentation +33 added lines, -33 removed lines

@@ -31,14 +31,14 @@ 
 	protected $u_action;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 		$db			Database object
-	* @param \phpbb\language\language				$language	Language object
-	* @param \phpbb\request\request					$request	Request object
-	* @param \phpbb\template\template				$template	Template object
-	* @param \ernadoo\phpbbdirectory\core\helper	$dir_helper	PhpBB Directory extension helper object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface 		$db			Database object
+	 * @param \phpbb\language\language				$language	Language object
+	 * @param \phpbb\request\request					$request	Request object
+	 * @param \phpbb\template\template				$template	Template object
+	 * @param \ernadoo\phpbbdirectory\core\helper	$dir_helper	PhpBB Directory extension helper object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\request\request $request, \phpbb\template\template $template, \ernadoo\phpbbdirectory\core\helper $dir_helper)
 	{
 		$this->db			= $db;
@@ -49,11 +49,11 @@ 
 	}
 
 	/**
-	* Display confirm box
-	*
-	* @param	string $action Requested action
-	* @return	null
-	*/
+	 * Display confirm box
+	 *
+	 * @param	string $action Requested action
+	 * @return	null
+	 */
 	public function display_confirm($action)
 	{
 		switch ($action)
@@ -91,10 +91,10 @@ 
 	}
 
 	/**
-	* Display phpBB Directory statistics
-	*
-	* @return null
-	*/
+	 * Display phpBB Directory statistics
+	 *
+	 * @return null
+	 */
 	public function display_stats()
 	{
 		// Count number of categories
@@ -181,11 +181,11 @@ 
 	}
 
 	/**
-	* Execute action requested
-	*
-	* @param	string $action Requested action
-	* @return	null
-	*/
+	 * Execute action requested
+	 *
+	 * @param	string $action Requested action
+	 * @return	null
+	 */
 	public function exec_action($action)
 	{
 		switch ($action)
@@ -260,23 +260,23 @@ 
 	}
 
 	/**
-	* Set page url
-	*
-	* @param	string $u_action Custom form action
-	* @return	null
-	* @access	public
-	*/
+	 * Set page url
+	 *
+	 * @param	string $u_action Custom form action
+	 * @return	null
+	 * @access	public
+	 */
 	public function set_page_url($u_action)
 	{
 		$this->u_action = $u_action;
 	}
 
 	/**
-	* Get orphan banners
-	*
-	* @param	bool		$delete	True if we want to delete banners, else false
-	* @return	null|int	Number of orphan files, else null
-	*/
+	 * Get orphan banners
+	 *
+	 * @param	bool		$delete	True if we want to delete banners, else false
+	 * @return	null|int	Number of orphan files, else null
+	 */
 	private function _orphan_files($delete = false)
 	{
 		$banner_path = $this->dir_helper->get_banner_path();

Spacing +13 added lines, -13 removed lines

@@ -41,11 +41,11 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\request\request $request, \phpbb\template\template $template, \ernadoo\phpbbdirectory\core\helper $dir_helper)
 	{
-		$this->db			= $db;
+		$this->db = $db;
 		$this->language		= $language;
 		$this->template		= $template;
-		$this->request		= $request;
-		$this->dir_helper	= $dir_helper;
+		$this->request = $request;
+		$this->dir_helper = $dir_helper;
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 			{
 				if ($file[0] != '.' && $file[0] != '..' && strpos($file, 'index.') === false && strpos($file, '.db') === false)
 				{
-					$banners_dir_size += filesize($banners_path . $file);
+					$banners_dir_size += filesize($banners_path.$file);
 				}
 			}
 			closedir($banners_dir);
@@ -170,7 +170,7 @@ 
 			'U_ACTION'			=> $this->u_action,
 
 			'TOTAL_CATS'		=> $total_cats,
-			'TOTAL_LINKS'		=> $total_links-$waiting_links,
+			'TOTAL_LINKS'		=> $total_links - $waiting_links,
 			'WAITING_LINKS'		=> $waiting_links,
 			'TOTAL_COMMENTS'	=> $total_comments,
 			'TOTAL_VOTES'		=> $total_votes,
@@ -195,15 +195,15 @@ 
 				{
 					case 'sqlite':
 					case 'firebird':
-						$this->db->sql_query('DELETE FROM ' . DIR_VOTE_TABLE);
+						$this->db->sql_query('DELETE FROM '.DIR_VOTE_TABLE);
 					break;
 
 					default:
-						$this->db->sql_query('TRUNCATE TABLE ' . DIR_VOTE_TABLE);
+						$this->db->sql_query('TRUNCATE TABLE '.DIR_VOTE_TABLE);
 					break;
 				}
 
-				$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
 					SET link_vote = 0, link_note = 0';
 				$this->db->sql_query($sql);
 
@@ -218,15 +218,15 @@ 
 				{
 					case 'sqlite':
 					case 'firebird':
-						$this->db->sql_query('DELETE FROM ' . DIR_COMMENT_TABLE);
+						$this->db->sql_query('DELETE FROM '.DIR_COMMENT_TABLE);
 					break;
 
 					default:
-						$this->db->sql_query('TRUNCATE TABLE ' . DIR_COMMENT_TABLE);
+						$this->db->sql_query('TRUNCATE TABLE '.DIR_COMMENT_TABLE);
 					break;
 				}
 
-				$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
 					SET link_comment = 0';
 				$this->db->sql_query($sql);
 
@@ -238,7 +238,7 @@ 
 				break;
 
 			case 'clicks':
-				$sql = 'UPDATE ' . DIR_LINK_TABLE . '
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
 					SET link_view = 0';
 				$this->db->sql_query($sql);
 
@@ -292,7 +292,7 @@ 
 			{
 				$physical_files[] = $img;
 			}
-			$sql = 'SELECT link_banner FROM ' . DIR_LINK_TABLE . '
+			$sql = 'SELECT link_banner FROM '.DIR_LINK_TABLE.'
 				WHERE link_banner <> \'\'';
 			$result = $this->db->sql_query($sql);
 

controller/acp/settings.php

Indentation +27 added lines, -27 removed lines

@@ -40,15 +40,15 @@ 
 	private $display_vars;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\config\config		$config		Config object
-	* @param \phpbb\language\language	$language	Language object
-	* @param \phpbb\log\log				$log		Log object
-	* @param \phpbb\request\request		$request	Request object
-	* @param \phpbb\template\template	$template	Template object
-	* @param \phpbb\user				$user		User object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\config\config		$config		Config object
+	 * @param \phpbb\language\language	$language	Language object
+	 * @param \phpbb\log\log				$log		Log object
+	 * @param \phpbb\request\request		$request	Request object
+	 * @param \phpbb\template\template	$template	Template object
+	 * @param \phpbb\user				$user		User object
+	 */
 	public function __construct(\phpbb\config\config $config, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
 		$this->config	= $config;
@@ -62,10 +62,10 @@ 
 	}
 
 	/**
-	* Display config page
-	*
-	* @return null
-	*/
+	 * Display config page
+	 *
+	 * @return null
+	 */
 	public function display_config()
 	{
 		// Output relevant page
@@ -111,10 +111,10 @@ 
 	}
 
 	/**
-	* Validate config vars and update config table if needed
-	*
-	* @return null
-	*/
+	 * Validate config vars and update config table if needed
+	 *
+	 * @return null
+	 */
 	public function process()
 	{
 		$submit	= ($this->request->is_set_post('submit')) ? true : false;
@@ -167,22 +167,22 @@ 
 	}
 
 	/**
-	* Set page url
-	*
-	* @param	string $u_action Custom form action
-	* @return	null
-	* @access	public
-	*/
+	 * Set page url
+	 *
+	 * @param	string $u_action Custom form action
+	 * @return	null
+	 * @access	public
+	 */
 	public function set_page_url($u_action)
 	{
 		$this->u_action = $u_action;
 	}
 
 	/**
-	* Build config matrice
-	*
-	* @return null
-	*/
+	 * Build config matrice
+	 *
+	 * @return null
+	 */
 	private function _generate_config()
 	{
 		$this->display_vars = array(

Spacing +37 added lines, -37 removed lines

@@ -51,12 +51,12 @@ 
 	*/
 	public function __construct(\phpbb\config\config $config, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
 	{
-		$this->config	= $config;
+		$this->config = $config;
 		$this->language	= $language;
-		$this->log		= $log;
+		$this->log = $log;
 		$this->template	= $template;
-		$this->user		= $user;
-		$this->request	= $request;
+		$this->user = $user;
+		$this->request = $request;
 
 		$this->_generate_config();
 	}
@@ -95,7 +95,7 @@ 
 			}
 			else if ($vars['explain'])
 			{
-				$l_explain = $this->language->lang($vars['lang'] . '_EXPLAIN');
+				$l_explain = $this->language->lang($vars['lang'].'_EXPLAIN');
 			}
 
 			$this->template->assign_block_vars('options', array(
@@ -117,7 +117,7 @@ 
 	*/
 	public function process()
 	{
-		$submit	= ($this->request->is_set_post('submit')) ? true : false;
+		$submit = ($this->request->is_set_post('submit')) ? true : false;
 
 		$this->new_config = $this->config;
 		$cfg_array = ($this->request->is_set('config')) ? $this->request->variable('config', array('' => ''), true) : $this->new_config;
@@ -158,12 +158,12 @@ 
 		{
 			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'DIR_CONFIG_SETTINGS');
 
-			trigger_error($this->language->lang('CONFIG_UPDATED') . adm_back_link($this->u_action));
+			trigger_error($this->language->lang('CONFIG_UPDATED').adm_back_link($this->u_action));
 		}
 
 		$this->template->assign_vars(array(
 			'L_TITLE'			=> $this->language->lang($this->display_vars['title']),
-			'L_TITLE_EXPLAIN'	=> $this->language->lang($this->display_vars['title'] . '_EXPLAIN'),
+			'L_TITLE_EXPLAIN'	=> $this->language->lang($this->display_vars['title'].'_EXPLAIN'),
 
 			'S_ERROR'			=> (sizeof($error)) ? true : false,
 			'ERROR_MSG'			=> implode('<br />', $error),
@@ -199,45 +199,45 @@ 
 				'dir_banner_width'					=> '',
 				'dir_banner_height'					=> '',
 
-				'dir_mail'							=> array('lang' => 'DIR_MAIL_VALIDATION',	'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_activ_checkurl'				=> array('lang' => 'DIR_ACTIVE_CHECK',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-				'dir_activ_flag'					=> array('lang' => 'DIR_ACTIV_FLAG',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_activ_rss'						=> array('lang' => 'DIR_ACTIV_RSS',			'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-				'dir_activ_pagerank'				=> array('lang' => 'DIR_ACTIV_PAGERANK',	'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-				'dir_show'							=> array('lang' => 'DIR_SHOW',				'validate' => 'int:1:9999', 'type' => 'number:1:9999',	'explain' => false),
-				'dir_length_describe'				=> array('lang' => 'DIR_MAX_DESC',			'validate' => 'int:1:999',	'type' => 'number:1:999',	'explain' => false),
-				'dir_new_time'						=> array('lang' => 'DIR_NEW_TIME',			'validate' => 'int:1:999', 	'type' => 'number:1:999',	'explain' => true),
-				'dir_default_order'					=> array('lang' => 'DIR_DEFAULT_ORDER',		'validate' => 'string', 	'type' => 'select',			'explain' => true, 'method' => 'get_order_list', 'params' => array('{CONFIG_VALUE}')),
+				'dir_mail'							=> array('lang' => 'DIR_MAIL_VALIDATION', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_activ_checkurl'				=> array('lang' => 'DIR_ACTIVE_CHECK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_activ_flag'					=> array('lang' => 'DIR_ACTIV_FLAG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_activ_rss'						=> array('lang' => 'DIR_ACTIV_RSS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_activ_pagerank'				=> array('lang' => 'DIR_ACTIV_PAGERANK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_show'							=> array('lang' => 'DIR_SHOW', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false),
+				'dir_length_describe'				=> array('lang' => 'DIR_MAX_DESC', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false),
+				'dir_new_time'						=> array('lang' => 'DIR_NEW_TIME', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true),
+				'dir_default_order'					=> array('lang' => 'DIR_DEFAULT_ORDER', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_order_list', 'params' => array('{CONFIG_VALUE}')),
 
 				'legend2'							=> 'DIR_RECENT_GUEST',
-				'dir_recent_block'					=> array('lang' => 'DIR_RECENT_ENABLE',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-				'dir_recent_rows'					=> array('lang' => 'DIR_RECENT_ROWS',		'validate' => 'int:1:999',	'type' => 'number:1:999',	'explain' => false),
-				'dir_recent_columns'				=> array('lang' => 'DIR_RECENT_COLUMNS',	'validate' => 'int:1:999',	'type' => 'number:1:999',	'explain' => false),
-				'dir_recent_exclude'				=> array('lang' => 'DIR_RECENT_EXCLUDE',	'validate' => 'string',		'type' => 'text:6:99',		'explain' => true),
+				'dir_recent_block'					=> array('lang' => 'DIR_RECENT_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_recent_rows'					=> array('lang' => 'DIR_RECENT_ROWS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false),
+				'dir_recent_columns'				=> array('lang' => 'DIR_RECENT_COLUMNS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false),
+				'dir_recent_exclude'				=> array('lang' => 'DIR_RECENT_EXCLUDE', 'validate' => 'string', 'type' => 'text:6:99', 'explain' => true),
 
 				'legend3'							=> 'DIR_ADD_GUEST',
-				'dir_visual_confirm'				=> array('lang' => 'DIR_VISUAL_CONFIRM',	'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => true),
-				'dir_visual_confirm_max_attempts'	=> array('lang' => 'DIR_MAX_ADD_ATTEMPTS',	'validate' => 'int:0:9999',	'type' => 'number:0:9999',	'explain' => true),
+				'dir_visual_confirm'				=> array('lang' => 'DIR_VISUAL_CONFIRM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_visual_confirm_max_attempts'	=> array('lang' => 'DIR_MAX_ADD_ATTEMPTS', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true),
 
 				'legend4'							=> 'DIR_THUMB_PARAM',
-				'dir_activ_thumb'					=> array('lang' => 'DIR_ACTIVE_THUMB',			'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-				'dir_activ_thumb_remote'			=> array('lang' => 'DIR_ACTIVE_THUMB_REMOTE',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
-				'dir_thumb_service'					=> array('lang' => 'DIR_THUMB_SERVICE',			'validate' => 'string', 'type' => 'select',			'explain' => true, 'method' => 'get_thumb_service_list', 'params' => array('{CONFIG_VALUE}')),
-				'dir_thumb_service_reverse'			=> array('lang' => 'DIR_THUMB_SERVICE_REVERSE',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
+				'dir_activ_thumb'					=> array('lang' => 'DIR_ACTIVE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_activ_thumb_remote'			=> array('lang' => 'DIR_ACTIVE_THUMB_REMOTE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
+				'dir_thumb_service'					=> array('lang' => 'DIR_THUMB_SERVICE', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_thumb_service_list', 'params' => array('{CONFIG_VALUE}')),
+				'dir_thumb_service_reverse'			=> array('lang' => 'DIR_THUMB_SERVICE_REVERSE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 
 				'legend5'							=> 'DIR_COMM_PARAM',
-				'dir_allow_bbcode'					=> array('lang' => 'DIR_ALLOW_BBCODE',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_allow_flash'					=> array('lang' => 'DIR_ALLOW_FLASH',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_allow_links'					=> array('lang' => 'DIR_ALLOW_LINKS',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_allow_smilies'					=> array('lang' => 'DIR_ALLOW_SMILIES',		'validate' => 'bool',		'type' => 'radio:yes_no',	'explain' => false),
-				'dir_length_comments'				=> array('lang' => 'DIR_LENGTH_COMMENTS',	'validate' => 'int:1:999',	'type' => 'number:1:999',	'explain' => true),
-				'dir_comments_per_page'				=> array('lang' => 'DIR_COMM_PER_PAGE',		'validate' => 'int:1:9999',	'type' => 'number:1:9999',	'explain' => false),
+				'dir_allow_bbcode'					=> array('lang' => 'DIR_ALLOW_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_allow_flash'					=> array('lang' => 'DIR_ALLOW_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_allow_links'					=> array('lang' => 'DIR_ALLOW_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_allow_smilies'					=> array('lang' => 'DIR_ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_length_comments'				=> array('lang' => 'DIR_LENGTH_COMMENTS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true),
+				'dir_comments_per_page'				=> array('lang' => 'DIR_COMM_PER_PAGE', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false),
 
 				'legend6'							=> 'DIR_BANN_PARAM',
-				'dir_activ_banner'					=> array('lang' => 'DIR_ACTIV_BANNER',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-				'dir_banner'						=> array('lang' => 'DIR_MAX_BANN',			'validate' => 'int:0',	'type' => 'dimension:0',	'explain' => true, 'append' => ' ' . $this->user->lang['PIXEL']),
-				'dir_banner_filesize'				=> array('lang' => 'DIR_MAX_SIZE',			'validate' => 'string',	'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
-				'dir_storage_banner'				=> array('lang' => 'DIR_STORAGE_BANNER',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
+				'dir_activ_banner'					=> array('lang' => 'DIR_ACTIV_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
+				'dir_banner'						=> array('lang' => 'DIR_MAX_BANN', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' '.$this->user->lang['PIXEL']),
+				'dir_banner_filesize'				=> array('lang' => 'DIR_MAX_SIZE', 'validate' => 'string', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
+				'dir_storage_banner'				=> array('lang' => 'DIR_STORAGE_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
 			)
 		);
 	}

controller/acp/validation.php

Indentation +59 added lines, -59 removed lines

@@ -67,23 +67,23 @@ 
 	private $links_data;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\config\config								$config				Config object
-	* @param \phpbb\db\driver\driver_interface 					$db					Database object
-	* @param \phpbb\pagination									$pagination			Pagination object
-	* @param \phpbb\language\language							$language			Language object
-	* @param \phpbb\log\log										$log				Log object
-	* @param \phpbb\notification\manager						$notification		Notification object
-	* @param \phpbb\request\request								$request			Request object
-	* @param \phpbb\template\template							$template			Template object
-	* @param \phpbb\user										$user				User object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\helper				$dir_helper			PhpBB Directory extension helper object
-	* @param \ernadoo\phpbbdirectory\core\link					$link				PhpBB Directory extension link object
-	* @param string												$root_path			phpBB root path
-	* @param string												$php_ext   			phpEx
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\config\config								$config				Config object
+	 * @param \phpbb\db\driver\driver_interface 					$db					Database object
+	 * @param \phpbb\pagination									$pagination			Pagination object
+	 * @param \phpbb\language\language							$language			Language object
+	 * @param \phpbb\log\log										$log				Log object
+	 * @param \phpbb\notification\manager						$notification		Notification object
+	 * @param \phpbb\request\request								$request			Request object
+	 * @param \phpbb\template\template							$template			Template object
+	 * @param \phpbb\user										$user				User object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\helper				$dir_helper			PhpBB Directory extension helper object
+	 * @param \ernadoo\phpbbdirectory\core\link					$link				PhpBB Directory extension link object
+	 * @param string												$root_path			phpBB root path
+	 * @param string												$php_ext   			phpEx
+	 */
 	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\pagination $pagination, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\notification\manager $notification, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\helper $dir_helper, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
 	{
 		$this->config		= $config;
@@ -105,11 +105,11 @@ 
 	}
 
 	/**
-	* Display confirm box
-	*
-	* @param	array $mark Website selected for (dis)approval
-	* @return	null
-	*/
+	 * Display confirm box
+	 *
+	 * @param	array $mark Website selected for (dis)approval
+	 * @return	null
+	 */
 	public function display_confirm($mark)
 	{
 		$s_hidden_fields = array(
@@ -121,10 +121,10 @@ 
 	}
 
 	/**
-	* Display website list for (dis)approval
-	*
-	* @return null
-	*/
+	 * Display website list for (dis)approval
+	 *
+	 * @return null
+	 */
 	public function display_websites()
 	{
 		global $phpbb_admin_path;
@@ -228,11 +228,11 @@ 
 	}
 
 	/**
-	* Get link's information and call appropriate action
-	*
-	* @param	array $mark Website selected for (dis)approval
-	* @return	null
-	*/
+	 * Get link's information and call appropriate action
+	 *
+	 * @param	array $mark Website selected for (dis)approval
+	 * @return	null
+	 */
 	public function exec_action($mark)
 	{
 		$this->_get_infos_links($mark);
@@ -255,10 +255,10 @@ 
 	}
 
 	/**
-	* Notify users which had submitted their websites
-	*
-	* @return null
-	*/
+	 * Notify users which had submitted their websites
+	 *
+	 * @return null
+	 */
 	public function notifiy_submiters()
 	{
 		if (!class_exists('messenger'))
@@ -302,22 +302,22 @@ 
 	}
 
 	/**
-	* Set page url
-	*
-	* @param	string $u_action Custom form action
-	* @return	null
-	* @access	public
-	*/
+	 * Set page url
+	 *
+	 * @param	string $u_action Custom form action
+	 * @return	null
+	 * @access	public
+	 */
 	public function set_page_url($u_action)
 	{
 		$this->u_action = $u_action;
 	}
 
 	/**
-	* Approve action
-	*
-	* @return null
-	*/
+	 * Approve action
+	 *
+	 * @return null
+	 */
 	private function _action_approved()
 	{
 		foreach ($this->links_data as $row)
@@ -346,10 +346,10 @@ 
 	}
 
 	/**
-	* Disapprove action
-	*
-	* @return null
-	*/
+	 * Disapprove action
+	 *
+	 * @return null
+	 */
 	private function _action_disapproved()
 	{
 		foreach ($this->links_data as $row)
@@ -370,11 +370,11 @@ 
 	}
 
 	/**
-	* Get informations about links selected
-	*
-	* @param	$mark Website selected for (dis)approval
-	* @return	null
-	*/
+	 * Get informations about links selected
+	 *
+	 * @param	$mark Website selected for (dis)approval
+	 * @return	null
+	 */
 	private function _get_infos_links($mark)
 	{
 		$sql_array = array(
@@ -409,11 +409,11 @@ 
 	}
 
 	/**
-	* Notify users which watch categories
-	*
-	* @param	$row Informations about website
-	* @return	null
-	*/
+	 * Notify users which watch categories
+	 *
+	 * @param	$row Informations about website
+	 * @return	null
+	 */
 	private function _notify_suscribers($row)
 	{
 		$notification_data = array(

Spacing +22 added lines, -22 removed lines

@@ -85,21 +85,21 @@ 
 	*/
 	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\pagination $pagination, \phpbb\log\log $log, \phpbb\notification\manager $notification, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\helper $dir_helper, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
 	{
-		$this->config		= $config;
-		$this->db			= $db;
-		$this->pagination	= $pagination;
+		$this->config = $config;
+		$this->db = $db;
+		$this->pagination = $pagination;
 		$this->phpbb_log	= $log;
-		$this->notification	= $notification;
-		$this->request		= $request;
+		$this->notification = $notification;
+		$this->request = $request;
 		$this->template		= $template;
 		$this->user			= $user;
 		$this->categorie	= $categorie;
-		$this->dir_helper	= $dir_helper;
+		$this->dir_helper = $dir_helper;
 		$this->link			= $link;
 		$this->root_path	= $root_path;
-		$this->php_ext		= $php_ext;
+		$this->php_ext = $php_ext;
 
-		$this->action		= $this->request->variable('action', '');
+		$this->action = $this->request->variable('action', '');
 	}
 
 	/**
@@ -128,14 +128,14 @@ 
 		global $phpbb_admin_path;
 
 		// Sort keys
-		$sort_days	= $this->request->variable('st', 0);
+		$sort_days = $this->request->variable('st', 0);
 		$sort_key	= $this->request->variable('sk', 't');
 		$sort_dir	= $this->request->variable('sd', 'd');
 
 		// Number of entries to display
 		$per_page = $this->request->variable('links_per_page', (int) $this->config['dir_show']);
 
-		$start	= $this->request->variable('start', 0);
+		$start = $this->request->variable('start', 0);
 
 		// Categorie ordering options
 		$limit_days		= array(0 => $this->user->lang['SEE_ALL'], 1 => $this->user->lang['1_DAY'], 7 => $this->user->lang['7_DAYS'], 14 => $this->user->lang['2_WEEKS'], 30 => $this->user->lang['1_MONTH'], 90 => $this->user->lang['3_MONTHS'], 180 => $this->user->lang['6_MONTHS'], 365 => $this->user->lang['1_YEAR']);
@@ -151,15 +151,15 @@ 
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		$sql = 'SELECT COUNT(1) AS total_links
-			FROM ' . DIR_LINK_TABLE . '
+			FROM ' . DIR_LINK_TABLE.'
 			WHERE link_active = 0' .
 				(($sql_where) ? " AND link_time >= $sql_where" : '');
 		$result = $this->db->sql_query($sql);
@@ -183,7 +183,7 @@ 
 					'ON'	=> 'u.user_id = l.link_user_id'
 				)
 			),
-			'WHERE'		=> 'l.link_active = 0' . (($sql_where) ? " AND l.link_time >= $sql_where" : ''),
+			'WHERE'		=> 'l.link_active = 0'.(($sql_where) ? " AND l.link_time >= $sql_where" : ''),
 			'ORDER_BY'	=> $sql_sort_order);
 
 		$sql = $this->db->sql_build_query('SELECT', $sql_array);
@@ -210,7 +210,7 @@ 
 
 		$option_ary = array('approved' => 'DIR_LINK_ACTIVATE', 'disapproved' => 'DIR_LINK_DELETE');
 
-		$base_url = $this->u_action . "&$u_sort_param&links_per_page=$per_page";
+		$base_url = $this->u_action."&$u_sort_param&links_per_page=$per_page";
 		$this->pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_links, $per_page, $start);
 
 		$this->template->assign_vars(array(
@@ -221,7 +221,7 @@ 
 			'S_SORT_DIR'		=> $s_sort_dir,
 			'LINKS_PER_PAGE'	=> $per_page,
 
-			'U_ACTION'			=> $this->u_action . "&$u_sort_param&links_per_page=$per_page&start=$start",
+			'U_ACTION'			=> $this->u_action."&$u_sort_param&links_per_page=$per_page&start=$start",
 		));
 	}
 
@@ -249,7 +249,7 @@ 
 				return;
 		}
 
-		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_' . strtoupper($this->action), time(), array(implode(', ', $this->affected_link_name)));
+		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_'.strtoupper($this->action), time(), array(implode(', ', $this->affected_link_name)));
 	}
 
 	/**
@@ -261,7 +261,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);
 
@@ -328,15 +328,15 @@ 
 				'link_cat'		=> (int) $row['link_cat'],
 			);
 
-			$sql = 'UPDATE ' . DIR_LINK_TABLE . '
-							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+			$sql = 'UPDATE '.DIR_LINK_TABLE.'
+							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
 							WHERE link_id = ' . (int) $row['link_id'];
 			$this->db->sql_query($sql);
 		}
 
 		foreach ($this->cat_data as $cat_id => $count)
 		{
-			$sql = 'UPDATE ' . DIR_CAT_TABLE . '
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
 							SET cat_links = cat_links + '.$count.'
 							WHERE cat_id = ' . (int) $cat_id;
 			$this->db->sql_query($sql);
@@ -362,7 +362,7 @@ 
 				}
 			}
 
-			$sql = 'DELETE FROM ' . DIR_LINK_TABLE . ' WHERE link_id = ' . (int) $row['link_id'];
+			$sql = 'DELETE FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $row['link_id'];
 			$this->db->sql_query($sql);
 		}
 	}

controller/categories.php

Indentation +34 added lines, -34 removed lines

@@ -46,20 +46,20 @@ 
 	protected $link;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface					$db			Database object
-	* @param \phpbb\config\config								$config		Config object
-	* @param \phpbb\language\language							$language	Language object
-	* @param \phpbb\template\template							$template	Template object
-	* @param \phpbb\user										$user		User object
-	* @param \phpbb\controller\helper							$helper		Controller helper object
-	* @param \phpbb\request\request								$request	Request object
-	* @param \phpbb\auth\auth									$auth		Auth object
-	* @param \phpbb\pagination									$pagination	Pagination object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie	PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\link					$link		PhpBB Directory extension link object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface					$db			Database object
+	 * @param \phpbb\config\config								$config		Config object
+	 * @param \phpbb\language\language							$language	Language object
+	 * @param \phpbb\template\template							$template	Template object
+	 * @param \phpbb\user										$user		User object
+	 * @param \phpbb\controller\helper							$helper		Controller helper object
+	 * @param \phpbb\request\request								$request	Request object
+	 * @param \phpbb\auth\auth									$auth		Auth object
+	 * @param \phpbb\pagination									$pagination	Pagination object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie	PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link					$link		PhpBB Directory extension link object
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
 	{
 		$this->db			= $db;
@@ -83,10 +83,10 @@ 
 	}
 
 	/**
-	* Base controller to be accessed with the URL /directory
-	*
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * Base controller to be accessed with the URL /directory
+	 *
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	public function base()
 	{
 		$this->categorie->display();
@@ -96,17 +96,17 @@ 
 	}
 
 	/**
-	* View controller for display a category
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	int		$page		Page number taken from the URL
-	* @param	int		$sort_days	Specifies the maximum amount of days a link may be old
-	* @param	string	$sort_key	is the key of $sort_by_sql for the selected sorting: a|t|r|s|v|p
-	* @param	string	$sort_dir	is either a or d representing ASC and DESC (ascending|descending)
-	* @param	string	$mode		watch|unwatch
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * View controller for display a category
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @param	int		$page		Page number taken from the URL
+	 * @param	int		$sort_days	Specifies the maximum amount of days a link may be old
+	 * @param	string	$sort_key	is the key of $sort_by_sql for the selected sorting: a|t|r|s|v|p
+	 * @param	string	$sort_dir	is either a or d representing ASC and DESC (ascending|descending)
+	 * @param	string	$mode		watch|unwatch
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function view($cat_id, $page, $sort_days, $sort_key, $sort_dir, $mode = '')
 	{
 		if (false === $this->categorie->get($cat_id))
@@ -366,11 +366,11 @@ 
 	}
 
 	/**
-	* date controller for return a date
-	*
-	* @return	\phpbb\json_response	A Json Response
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * date controller for return a date
+	 *
+	 * @return	\phpbb\json_response	A Json Response
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function return_date()
 	{
 		if (!$this->request->is_ajax())

Spacing +22 added lines, -22 removed lines

@@ -62,16 +62,16 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
 	{
-		$this->db			= $db;
-		$this->config		= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->language		= $language;
 		$this->template		= $template;
 		$this->user			= $user;
-		$this->helper		= $helper;
-		$this->request		= $request;
+		$this->helper = $helper;
+		$this->request = $request;
 		$this->auth			= $auth;
-		$this->pagination	= $pagination;
-		$this->categorie	= $categorie;
+		$this->pagination = $pagination;
+		$this->categorie = $categorie;
 		$this->link			= $link;
 
 		$language->add_lang('directory', 'ernadoo/phpbbdirectory');
@@ -115,18 +115,18 @@ 
 
 		$start = ($page - 1) * $this->config['dir_show'];
 
-		$default_sort_days	= 0;
+		$default_sort_days = 0;
 		$default_sort_key	= (string) substr($this->config['dir_default_order'], 0, 1);
 		$default_sort_dir	= (string) substr($this->config['dir_default_order'], 2);
 
 		$sort_days	= (!$sort_days) ? $this->request->variable('st', $default_sort_days) : $sort_days;
 		$sort_key 	= (!$sort_key) ? $this->request->variable('sk', $default_sort_key) : $sort_key;
-		$sort_dir	= (!$sort_dir) ? $this->request->variable('sd', $default_sort_dir) : $sort_dir;
+		$sort_dir = (!$sort_dir) ? $this->request->variable('sd', $default_sort_dir) : $sort_dir;
 		$link_list = $rowset = array();
 
 		// Categorie ordering options
 		$limit_days		= array(0 => $this->language->lang('SEE_ALL'), 1 => $this->language->lang('1_DAY'), 7 => $this->language->lang('7_DAYS'), 14 => $this->language->lang('2_WEEKS'), 30 => $this->language->lang('1_MONTH'), 90 => $this->language->lang('3_MONTHS'), 180 => $this->language->lang('6_MONTHS'), 365 => $this->language->lang('1_YEAR'));
-		$sort_by_text	= array('a' => $this->language->lang('AUTHOR'), 't' => $this->language->lang('POST_TIME'), 'r' => $this->language->lang('DIR_COMMENTS_ORDER'), 's' =>  $this->language->lang('DIR_NAME_ORDER'), 'v' => $this->language->lang('DIR_NB_CLICKS_ORDER'));
+		$sort_by_text = array('a' => $this->language->lang('AUTHOR'), 't' => $this->language->lang('POST_TIME'), 'r' => $this->language->lang('DIR_COMMENTS_ORDER'), 's' =>  $this->language->lang('DIR_NAME_ORDER'), 'v' => $this->language->lang('DIR_NB_CLICKS_ORDER'));
 		$sort_by_sql	= array('a' => 'u.username_clean', 't' => array('l.link_time', 'l.link_id'), 'r' => 'l.link_comment', 's' => 'LOWER(l.link_name)', 'v' => 'l.link_view');
 
 		if ($this->config['dir_activ_pagerank'])
@@ -165,8 +165,8 @@ 
 			$min_post_time = time() - ($sort_days * 86400);
 
 			$sql = 'SELECT COUNT(link_id) AS nb_links
-				FROM ' . DIR_LINK_TABLE . '
-				WHERE link_cat = ' . (int) $cat_id . '
+				FROM ' . DIR_LINK_TABLE.'
+				WHERE link_cat = ' . (int) $cat_id.'
 					AND link_time >= ' . $min_post_time;
 			$result = $this->db->sql_query($sql);
 			$nb_links = (int) $this->db->sql_fetchfield('nb_links');
@@ -181,7 +181,7 @@ 
 		else
 		{
 			$sql_limit_time = '';
-			$nb_links		= (int) $this->categorie->data['cat_links'];
+			$nb_links = (int) $this->categorie->data['cat_links'];
 		}
 
 		// Make sure $start is set to the last page if it exceeds the amount
@@ -241,11 +241,11 @@ 
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		// Grab just the sorted link ids
@@ -288,7 +288,7 @@ 
 						),
 						array(
 							'FROM'	=> array(DIR_VOTE_TABLE => 'v'),
-							'ON'	=> 'l.link_id = v.vote_link_id AND v.vote_user_id = ' . $this->user->data['user_id']
+							'ON'	=> 'l.link_id = v.vote_link_id AND v.vote_user_id = '.$this->user->data['user_id']
 						)
 				),
 				'WHERE'		=> $this->db->sql_in_set('l.link_id', $link_list)
@@ -305,8 +305,8 @@ 
 
 			$link_list = ($store_reverse) ? array_reverse($link_list) : $link_list;
 
-			$votes_status 		= ($this->categorie->data['cat_allow_votes']) ? true : false;
-			$comments_status 	= ($this->categorie->data['cat_allow_comments']) ? true : false;
+			$votes_status = ($this->categorie->data['cat_allow_votes']) ? true : false;
+			$comments_status = ($this->categorie->data['cat_allow_comments']) ? true : false;
 
 			foreach ($link_list as $link_id)
 			{
@@ -316,11 +316,11 @@ 
 				$s_note		= $this->link->display_note($site['link_note'], $site['link_vote'], $votes_status);
 				$s_thumb	= $this->link->display_thumb($site);
 				$s_vote		= $this->link->display_vote($site);
-				$s_banner	= $this->link->display_bann($site);
-				$s_pr		= $this->link->display_pagerank($site);
-				$s_rss		= $this->link->display_rss($site);
+				$s_banner = $this->link->display_bann($site);
+				$s_pr = $this->link->display_pagerank($site);
+				$s_rss = $this->link->display_rss($site);
 
-				$edit_allowed 	= ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
+				$edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
 				$delete_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_delete_dir'))));
 
 				$this->template->assign_block_vars('site', array(
@@ -357,7 +357,7 @@ 
 			$this->template->assign_block_vars('no_draw_link', array());
 		}
 
-		$page_title = $this->language->lang('DIRECTORY') . ' - ' . $this->categorie->data['cat_name'];
+		$page_title = $this->language->lang('DIRECTORY').' - '.$this->categorie->data['cat_name'];
 
 		$this->categorie->display();
 

controller/comments.php

Indentation +64 added lines, -64 removed lines

@@ -59,23 +59,23 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface					$db					Database object
-	* @param \phpbb\config\config								$config				Config object
-	* @param \phpbb\language\language							$language			Language object
-	* @param \phpbb\template\template							$template			Template object
-	* @param \phpbb\user										$user				User object
-	* @param \phpbb\controller\helper							$helper				Controller helper object
-	* @param \phpbb\request\request								$request			Request object
-	* @param \phpbb\auth\auth									$auth				Auth object
-	* @param \phpbb\pagination									$pagination			Pagination object
-	* @param \phpbb\captcha\factory								$captcha_factory	Captcha object
-	* @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\comment				$comment			PhpBB Directory extension comment object
-	* @param string												$root_path			phpBB root path
-	* @param string												$php_ext			phpEx
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface					$db					Database object
+	 * @param \phpbb\config\config								$config				Config object
+	 * @param \phpbb\language\language							$language			Language object
+	 * @param \phpbb\template\template							$template			Template object
+	 * @param \phpbb\user										$user				User object
+	 * @param \phpbb\controller\helper							$helper				Controller helper object
+	 * @param \phpbb\request\request								$request			Request object
+	 * @param \phpbb\auth\auth									$auth				Auth object
+	 * @param \phpbb\pagination									$pagination			Pagination object
+	 * @param \phpbb\captcha\factory								$captcha_factory	Captcha object
+	 * @param \ernadoo\phpbbdirectory\core\categorie				$categorie			PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\comment				$comment			PhpBB Directory extension comment object
+	 * @param string												$root_path			phpBB root path
+	 * @param string												$php_ext			phpEx
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\comment $comment, $root_path, $php_ext)
 	{
 		$this->db				= $db;
@@ -111,13 +111,13 @@ 
 	}
 
 	/**
-	* Populate form when an error occurred
-	*
-	* @param	int		$link_id		The link ID
-	* @param	int		$comment_id		The comment ID
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Populate form when an error occurred
+	 *
+	 * @param	int		$link_id		The link ID
+	 * @param	int		$comment_id		The comment ID
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function delete_comment($link_id, $comment_id)
 	{
 		$this->_check_comments_enable($link_id);
@@ -156,13 +156,13 @@ 
 	}
 
 	/**
-	* Edit a comment
-	*
-	* @param	int		$link_id		The category ID
-	* @param	int		$comment_id		The comment ID
-	* @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Edit a comment
+	 *
+	 * @param	int		$link_id		The category ID
+	 * @param	int		$comment_id		The comment ID
+	 * @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function edit_comment($link_id, $comment_id)
 	{
 		$this->_check_comments_enable($link_id);
@@ -193,12 +193,12 @@ 
 	}
 
 	/**
-	* Post a new comment
-	*
-	* @param	int	$link_id		The category ID
-	* @return	null
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Post a new comment
+	 *
+	 * @param	int	$link_id		The category ID
+	 * @return	null
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function new_comment($link_id)
 	{
 		$this->_check_comments_enable($link_id);
@@ -224,14 +224,14 @@ 
 	}
 
 	/**
-	* Display popup comment
-	*
-	* @param	int		$link_id		The category ID
-	* @param	int		$page			Page number taken from the URL
-	* @param	string	$mode			add|edit
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Display popup comment
+	 *
+	 * @param	int		$link_id		The category ID
+	 * @param	int		$page			Page number taken from the URL
+	 * @param	string	$mode			add|edit
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function view($link_id, $page, $mode = 'new')
 	{
 		$this->_check_comments_enable($link_id);
@@ -324,13 +324,13 @@ 
 	}
 
 	/**
-	* Routine
-	*
-	* @param	int		$link_id		The link ID
-	* @param	int		$comment_id		The comment ID
-	* @param	string	$mode			new|edit
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * Routine
+	 *
+	 * @param	int		$link_id		The link ID
+	 * @param	int		$comment_id		The comment ID
+	 * @param	string	$mode			new|edit
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	private function _data_processing($link_id, $comment_id = 0, $mode = 'new')
 	{
 		if (!check_form_key('dir_form_comment'))
@@ -418,12 +418,12 @@ 
 	}
 
 	/**
-	* Check if comments are enable in a category
-	*
-	* @param	int		$link_id		The link ID
-	* @return	null					Retun null if comments are allowed, http_exception if not
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Check if comments are enable in a category
+	 *
+	 * @param	int		$link_id		The link ID
+	 * @return	null					Retun null if comments are allowed, http_exception if not
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	private function _check_comments_enable($link_id)
 	{
 		$sql = 'SELECT link_cat
@@ -449,12 +449,12 @@ 
 	}
 
 	/**
-	* Populate form when an error occurred
-	*
-	* @param	int		$link_id		The link ID
-	* @param	string	$mode			add|edit
-	* @return	null
-	*/
+	 * Populate form when an error occurred
+	 *
+	 * @param	int		$link_id		The link ID
+	 * @param	string	$mode			add|edit
+	 * @return	null
+	 */
 	private function _populate_form($link_id, $mode)
 	{
 		if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'] && $mode != 'edit')

Doc Comments +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
 	* Post a new comment
 	*
 	* @param	int	$link_id		The category ID
-	* @return	null
+	* @return	\Symfony\Component\HttpFoundation\Response|null
 	* @throws	\phpbb\exception\http_exception
 	*/
 	public function new_comment($link_id)

Spacing +28 added lines, -28 removed lines

@@ -78,16 +78,16 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\comment $comment, $root_path, $php_ext)
 	{
-		$this->db				= $db;
-		$this->config			= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->language			= $language;
 		$this->template			= $template;
 		$this->user				= $user;
-		$this->helper			= $helper;
-		$this->request			= $request;
+		$this->helper = $helper;
+		$this->request = $request;
 		$this->auth				= $auth;
-		$this->pagination		= $pagination;
-		$this->captcha_factory 	= $captcha_factory;
+		$this->pagination = $pagination;
+		$this->captcha_factory = $captcha_factory;
 		$this->categorie		= $categorie;
 		$this->comment			= $comment;
 		$this->root_path		= $root_path;
@@ -128,7 +128,7 @@ 
 		}
 
 		$sql = 'SELECT *
-			FROM ' . DIR_COMMENT_TABLE . '
+			FROM ' . DIR_COMMENT_TABLE.'
 			WHERE comment_id = ' . (int) $comment_id;
 		$result = $this->db->sql_query($sql);
 		$value = $this->db->sql_fetchrow($result);
@@ -145,7 +145,7 @@ 
 			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $link_id));
 			meta_refresh(3, $meta_info);
 			$message = $this->language->lang('DIR_COMMENT_DELETE_OK');
-			$message = $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="' . $meta_info . '">', '</a>');
+			$message = $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -167,7 +167,7 @@ 
 		$this->_check_comments_enable($link_id);
 
 		$sql = 'SELECT *
-			FROM ' . DIR_COMMENT_TABLE . '
+			FROM ' . DIR_COMMENT_TABLE.'
 			WHERE comment_id = ' . (int) $comment_id;
 		$result = $this->db->sql_query($sql);
 		$value = $this->db->sql_fetchrow($result);
@@ -180,7 +180,7 @@ 
 		$comment_text = generate_text_for_edit($value['comment_text'], $value['comment_uid'], $value['comment_flags']);
 		$this->s_comment = $comment_text['text'];
 
-		$submit	= $this->request->is_set_post('update_comment') ? true : false;
+		$submit = $this->request->is_set_post('update_comment') ? true : false;
 
 		// If form is done
 		if ($submit)
@@ -236,15 +236,15 @@ 
 		$this->_check_comments_enable($link_id);
 
 		$comment_id = $this->request->variable('c', 0);
-		$view 		= $this->request->variable('view', '');
-		$start 		= ($page - 1) * $this->config['dir_comments_per_page'];
+		$view = $this->request->variable('view', '');
+		$start = ($page - 1) * $this->config['dir_comments_per_page'];
 
 		$this->s_hidden_fields = array_merge($this->s_hidden_fields, array('page' => $page));
 
 		$this->_populate_form($link_id, $mode);
 
 		$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');
@@ -264,10 +264,10 @@ 
 					),
 					array(
 						'FROM'	=> array(ZEBRA_TABLE => 'z'),
-						'ON'	=> 'z.user_id = ' . $this->user->data['user_id'] . ' AND z.zebra_id = a.comment_user_id'
+						'ON'	=> 'z.user_id = '.$this->user->data['user_id'].' AND z.zebra_id = a.comment_user_id'
 					)
 			),
-			'WHERE'		=> 'a.comment_link_id = ' . (int) $link_id,
+			'WHERE'		=> 'a.comment_link_id = '.(int) $link_id,
 			'ORDER_BY'	=> 'a.comment_date DESC');
 		$sql = $this->db->sql_build_query('SELECT', $sql_array);
 		$result = $this->db->sql_query_limit($sql, $this->config['dir_comments_per_page'], $start);
@@ -296,12 +296,12 @@ 
 				'S_COMMENT'			=> generate_text_for_display($comments['comment_text'], $comments['comment_uid'], $comments['comment_bitfield'], $comments['comment_flags']),
 				'S_ID'				=> $comments['comment_id'],
 
-				'U_EDIT'			=> ($edit_allowed) 		? $this->helper->route('ernadoo_phpbbdirectory_comment_edit_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'])) : '',
-				'U_DELETE'			=> ($delete_allowed) 	? $this->helper->route('ernadoo_phpbbdirectory_comment_delete_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'], '_referer' => $this->helper->get_current_url())) : '',
+				'U_EDIT'			=> ($edit_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_edit_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'])) : '',
+				'U_DELETE'			=> ($delete_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_delete_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'], '_referer' => $this->helper->get_current_url())) : '',
 
 				'S_IGNORE_POST'		=> ($comments['foe'] && ($view != 'show' || $comment_id != $comments['comment_id'])) ? true : false,
 				'L_IGNORE_POST'		=> ($comments['foe']) ? $this->language->lang('POST_BY_FOE', get_username_string('full', $comments['comment_user_id'], $comments['username'], $comments['user_colour']), '<a href="'.$this->helper->url('directory/link/'.$link_id.'/comment'.(($page > 1) ? '/'.$page : '').'?view=show#c'.(int) $comments['comment_id']).'">', '</a>') : '',
-				'L_POST_DISPLAY'	=> ($comments['foe']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="' . $comments['comment_id'] . '" href="' . $this->helper->url('directory/link/'.$link_id.'/comment'.(($page > 1) ? '/'.$page : '').'?c='.(int) $comments['comment_id'] . '&view=show#c'.(int) $comments['comment_id']).'">', '</a>') : '',
+				'L_POST_DISPLAY'	=> ($comments['foe']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="'.$comments['comment_id'].'" href="'.$this->helper->url('directory/link/'.$link_id.'/comment'.(($page > 1) ? '/'.$page : '').'?c='.(int) $comments['comment_id'].'&view=show#c'.(int) $comments['comment_id']).'">', '</a>') : '',
 
 				'S_INFO'			=> $this->auth->acl_get('m_info'),
 			));
@@ -341,7 +341,7 @@ 
 
 		if (!function_exists('validate_data'))
 		{
-			include($this->root_path . 'includes/functions_user.' . $this->php_ext);
+			include($this->root_path.'includes/functions_user.'.$this->php_ext);
 		}
 
 		$error = validate_data(
@@ -403,7 +403,7 @@ 
 			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $link_id));
 			meta_refresh(3, $meta_info);
 			$message = $this->language->lang('DIR_'.strtoupper($mode).'_COMMENT_OK');
-			$message = $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="' . $meta_info . '">', '</a>');
+			$message = $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -426,7 +426,7 @@ 
 	private function _check_comments_enable($link_id)
 	{
 		$sql = 'SELECT link_cat
-			FROM ' . DIR_LINK_TABLE . '
+			FROM ' . DIR_LINK_TABLE.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$cat_id = (int) $this->db->sql_fetchfield('link_cat');
@@ -468,11 +468,11 @@ 
 
 		if (!function_exists('generate_smilies'))
 		{
-			include($this->root_path . 'includes/functions_posting.' . $this->php_ext);
+			include($this->root_path.'includes/functions_posting.'.$this->php_ext);
 		}
 		if (!function_exists('display_custom_bbcodes'))
 		{
-			include($this->root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->root_path.'includes/functions_display.'.$this->php_ext);
 		}
 
 		generate_smilies('inline', 0);
@@ -482,11 +482,11 @@ 
 		$this->template->assign_vars(array(
 			'S_AUTH_COMM' 		=> $this->auth->acl_get('u_comment_dir'),
 
-			'BBCODE_STATUS'		=> ($this->config['dir_allow_bbcode']) 	? $this->language->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>'),
-			'IMG_STATUS'		=> ($this->config['dir_allow_bbcode']) 	? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
-			'SMILIES_STATUS'	=> ($this->config['dir_allow_smilies'])	? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'),
-			'URL_STATUS'		=> ($this->config['dir_allow_links'])	? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'),
-			'FLASH_STATUS'		=> ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash'])	? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
+			'BBCODE_STATUS'		=> ($this->config['dir_allow_bbcode']) ? $this->language->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'),
+			'IMG_STATUS'		=> ($this->config['dir_allow_bbcode']) ? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
+			'SMILIES_STATUS'	=> ($this->config['dir_allow_smilies']) ? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'),
+			'URL_STATUS'		=> ($this->config['dir_allow_links']) ? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'),
+			'FLASH_STATUS'		=> ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash']) ? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
 
 			'L_DIR_REPLY_EXP'	=> $this->language->lang('DIR_REPLY_EXP', $this->config['dir_length_comments']),
 

controller/links.php

Indentation +69 added lines, -69 removed lines

@@ -71,23 +71,23 @@ 
 	protected $php_ext;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface 		$db					Database object
-	* @param \phpbb\config\config					$config				Config object
-	* @param \phpbb\language\language				$language			Language object
-	* @param \phpbb\template\template				$template			Template object
-	* @param \phpbb\user							$user				User object
-	* @param \phpbb\controller\helper				$helper				Controller helper object
-	* @param \phpbb\request\request					$request			Request object
-	* @param \phpbb\auth\auth						$auth				Auth object
-	* @param \phpbb\captcha\factory					$captcha_factory	Captcha object
-	* @param \ernadoo\phpbbdirectory\core\categorie	$categorie			PhpBB Directory extension categorie object
-	* @param \ernadoo\phpbbdirectory\core\link		$link				PhpBB Directory extension link object
-	* @param \ernadoo\phpbbdirectory\core\helper	$dir_helper			PhpBB Directory extension helper object
-	* @param string									$root_path			phpBB root path
-	* @param string									$php_ext   			phpEx
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface 		$db					Database object
+	 * @param \phpbb\config\config					$config				Config object
+	 * @param \phpbb\language\language				$language			Language object
+	 * @param \phpbb\template\template				$template			Template object
+	 * @param \phpbb\user							$user				User object
+	 * @param \phpbb\controller\helper				$helper				Controller helper object
+	 * @param \phpbb\request\request					$request			Request object
+	 * @param \phpbb\auth\auth						$auth				Auth object
+	 * @param \phpbb\captcha\factory					$captcha_factory	Captcha object
+	 * @param \ernadoo\phpbbdirectory\core\categorie	$categorie			PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link		$link				PhpBB Directory extension link object
+	 * @param \ernadoo\phpbbdirectory\core\helper	$dir_helper			PhpBB Directory extension helper object
+	 * @param string									$root_path			phpBB root path
+	 * @param string									$php_ext   			phpEx
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, \ernadoo\phpbbdirectory\core\helper $dir_helper, $root_path, $php_ext)
 	{
 		$this->db				= $db;
@@ -114,12 +114,12 @@ 
 	}
 
 	/**
-	* Delete a link
-	*
-	* @param	int	$cat_id		The category ID
-	* @param	int	$link_id		The link ID
-	* @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * Delete a link
+	 *
+	 * @param	int	$cat_id		The category ID
+	 * @param	int	$link_id		The link ID
+	 * @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	public function delete_link($cat_id, $link_id)
 	{
 		if ($this->request->is_set_post('cancel'))
@@ -162,13 +162,13 @@ 
 	}
 
 	/**
-	* Edit a link
-	*
-	* @param	int	$cat_id		The category ID
-	* @param	int	$link_id	The link ID
-	* @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Edit a link
+	 *
+	 * @param	int	$cat_id		The category ID
+	 * @param	int	$link_id	The link ID
+	 * @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function edit_link($cat_id, $link_id)
 	{
 		$sql = 'SELECT link_user_id
@@ -243,12 +243,12 @@ 
 	}
 
 	/**
-	* Display add form
-	*
-	* @param	int	$cat_id		The category ID
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Display add form
+	 *
+	 * @param	int	$cat_id		The category ID
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function new_link($cat_id)
 	{
 		if (!$this->auth->acl_get('u_submit_dir'))
@@ -290,23 +290,23 @@ 
 	}
 
 	/**
-	* View link controller
-	*
-	* @param	int	$link_id		The link ID
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * View link controller
+	 *
+	 * @param	int	$link_id		The link ID
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	public function view_link($link_id)
 	{
 		return $this->link->view($link_id);
 	}
 
 	/**
-	* Vote for a link
-	*
-	* @param	int $cat_id		The category ID
-	* @param	int $link_id	The link ID
-	* @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	*/
+	 * Vote for a link
+	 *
+	 * @param	int $cat_id		The category ID
+	 * @param	int $link_id	The link ID
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 */
 	public function vote_link($cat_id, $link_id)
 	{
 		$this->categorie->get($cat_id);
@@ -342,14 +342,14 @@ 
 	}
 
 	/**
-	* Routine
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	int		$link_id	The link ID
-	* @param	string	$mode		add|edit
-	* @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
-	* @throws	\phpbb\exception\http_exception
-	*/
+	 * Routine
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @param	int		$link_id	The link ID
+	 * @param	string	$mode		add|edit
+	 * @return	null|\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	private function _data_processing($cat_id, $link_id = 0, $mode = 'new')
 	{
 		if (($mode == 'edit' && !$this->auth->acl_get('m_edit_dir') && !$this->auth->acl_get('u_edit_dir')) || ($mode == 'new' && !$this->auth->acl_get('u_submit_dir')))
@@ -439,8 +439,8 @@ 
 		if (!$error)
 		{
 			/**
-			* No errrors, we execute heavy tasks wich need a valid url
-			*/
+			 * No errrors, we execute heavy tasks wich need a valid url
+			 */
 
 			// Banner
 			$this->link->banner_process($this->banner, $error);
@@ -523,11 +523,11 @@ 
 	}
 
 	/**
-	* Display a banner
-	*
-	* @param	string $banner_img		Path to banner file
-	* @return	Response object
-	*/
+	 * Display a banner
+	 *
+	 * @param	string $banner_img		Path to banner file
+	 * @return	Response object
+	 */
 	public function return_banner($banner_img)
 	{
 		if (!function_exists('file_gc'))
@@ -561,13 +561,13 @@ 
 	}
 
 	/**
-	* Populate form when an error occurred
-	*
-	* @param	int		$cat_id		The category ID
-	* @param	string	$mode		add|edit
-	* @param	string	$title		Page title (depends of $mode)
-	* @return	null
-	*/
+	 * Populate form when an error occurred
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @param	string	$mode		add|edit
+	 * @param	string	$title		Page title (depends of $mode)
+	 * @return	null
+	 */
 	private function _populate_form($cat_id, $mode, $title)
 	{
 		global $phpbb_extension_manager;

Spacing +40 added lines, -40 removed lines

@@ -90,20 +90,20 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, \ernadoo\phpbbdirectory\core\helper $dir_helper, $root_path, $php_ext)
 	{
-		$this->db				= $db;
-		$this->config			= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->language			= $language;
 		$this->template			= $template;
 		$this->user				= $user;
-		$this->helper			= $helper;
-		$this->request			= $request;
+		$this->helper = $helper;
+		$this->request = $request;
 		$this->auth				= $auth;
-		$this->captcha_factory 	= $captcha_factory;
+		$this->captcha_factory = $captcha_factory;
 		$this->categorie		= $categorie;
 		$this->link				= $link;
-		$this->dir_helper		= $dir_helper;
+		$this->dir_helper = $dir_helper;
 		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->php_ext = $php_ext;
 
 		$language->add_lang('directory', 'ernadoo/phpbbdirectory');
 
@@ -128,7 +128,7 @@ 
 		}
 
 		$sql = 'SELECT link_user_id
-			FROM ' . DIR_LINK_TABLE . '
+			FROM ' . DIR_LINK_TABLE.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$link_data = $this->db->sql_fetchrow($result);
@@ -151,7 +151,7 @@ 
 
 			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id));
 			meta_refresh(3, $meta_info);
-			$message = $this->language->lang('DIR_DELETE_OK') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_base_controller') . '">', '</a>') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id)) . '">', '</a>');
+			$message = $this->language->lang('DIR_DELETE_OK').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id)).'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -171,7 +171,7 @@ 
 	public function edit_link($cat_id, $link_id)
 	{
 		$sql = 'SELECT link_user_id
-			FROM ' . DIR_LINK_TABLE . '
+			FROM ' . DIR_LINK_TABLE.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$link_data = $this->db->sql_fetchrow($result);
@@ -187,7 +187,7 @@ 
 		$cat_id		= $this->request->variable('id', $cat_id);
 		$submit		= $this->request->is_set_post('submit') ? true : false;
 		$refresh	= $this->request->is_set_post('refresh_vc') ? true : false;
-		$title		= $this->language->lang('DIR_EDIT_SITE');
+		$title = $this->language->lang('DIR_EDIT_SITE');
 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $title,
@@ -207,7 +207,7 @@ 
 		else
 		{
 			$sql = 'SELECT link_id, link_uid, link_flags, link_bitfield, link_cat, link_url, link_description, link_guest_email, link_name, link_rss, link_back, link_banner, link_flag, link_cat, link_time
-				FROM ' . DIR_LINK_TABLE . '
+				FROM ' . DIR_LINK_TABLE.'
 				WHERE link_id = ' . (int) $link_id;
 			$result = $this->db->sql_query($sql);
 
@@ -223,15 +223,15 @@ 
 				'old_banner'	=> $site['link_banner'],
 			);
 
-			$site_description		= generate_text_for_edit($site['link_description'], $site['link_uid'], $site['link_flags']);
-			$site['link_banner'] 	= (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $site['link_banner'])) ? $site['link_banner'] : '';
+			$site_description = generate_text_for_edit($site['link_description'], $site['link_uid'], $site['link_flags']);
+			$site['link_banner'] = (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $site['link_banner'])) ? $site['link_banner'] : '';
 
-			$this->url			= $site['link_url'];
-			$this->site_name	= $site['link_name'];
+			$this->url = $site['link_url'];
+			$this->site_name = $site['link_name'];
 			$this->description	= $site_description['text'];
 			$this->guest_email	= $site['link_guest_email'];
-			$this->rss			= $site['link_rss'];
-			$this->banner 		= $site['link_banner'];
+			$this->rss = $site['link_rss'];
+			$this->banner = $site['link_banner'];
 			$this->back			= $site['link_back'];
 			$this->flag 		= $site['link_flag'];
 		}
@@ -258,7 +258,7 @@ 
 		$cat_id		= $this->request->variable('id', $cat_id);
 		$submit		= $this->request->is_set_post('submit') ? true : false;
 		$refresh	= $this->request->is_set_post('refresh_vc') ? true : false;
-		$title		= $this->language->lang('DIR_NEW_SITE');
+		$title = $this->language->lang('DIR_NEW_SITE');
 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $title,
@@ -322,7 +322,7 @@ 
 
 		// We check if user had already vot for this website.
 		$sql = 'SELECT vote_link_id
-			FROM ' . DIR_VOTE_TABLE . '
+			FROM ' . DIR_VOTE_TABLE.'
 			WHERE ' . $this->db->sql_build_array('SELECT', $data);
 		$result = $this->db->sql_query($sql);
 		$data = $this->db->sql_fetchrow($result);
@@ -336,7 +336,7 @@ 
 
 		$meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id));
 		meta_refresh(3, $meta_info);
-		$message = $this->language->lang('DIR_VOTE_OK') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $meta_info . '">', '</a>');
+		$message = $this->language->lang('DIR_VOTE_OK').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$meta_info.'">', '</a>');
 		return $this->helper->message($message);
 	}
 
@@ -361,18 +361,18 @@ 
 			return $this->helper->message('FORM_INVALID');
 		}
 
-		$this->url			= $this->request->variable('url', '');
-		$this->site_name	= $this->request->variable('site_name', '', true);
+		$this->url = $this->request->variable('url', '');
+		$this->site_name = $this->request->variable('site_name', '', true);
 		$this->description	= $this->request->variable('description', '', true);
 		$this->guest_email	= $this->request->variable('guest_email', '');
-		$this->rss			= $this->request->variable('rss', '');
-		$this->banner 		= $this->request->variable('banner', '');
+		$this->rss = $this->request->variable('rss', '');
+		$this->banner = $this->request->variable('banner', '');
 		$this->back			= $this->request->variable('back', '');
 		$this->flag 		= $this->request->variable('flag', '');
 
 		if (!function_exists('validate_data'))
 		{
-			include($this->root_path . 'includes/functions_user.' . $this->php_ext);
+			include($this->root_path.'includes/functions_user.'.$this->php_ext);
 		}
 
 		// We define variables to check
@@ -395,17 +395,17 @@ 
 			'site_name' =>			array(
 				array('string', false, 1, 100)),
 			'website'		=>		array(
-				array('string',	false, 12, 255),
-				array('match',	true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
+				array('string', false, 12, 255),
+				array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
 			'description'	=>		array(
 				array('string', !$this->categorie->data['cat_must_describe'], 1, $this->config['dir_length_describe'])),
 			'rss'			=>		array(
 				array('string', true, 12, 255),
-				array('match',	empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
+				array('match', empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
 			'banner'		=>		array(
 				array('string', true, 5, 255)),
 			'back'			=>		array(
-				array('string',	!$this->categorie->data['cat_link_back'], 12, 255),
+				array('string', !$this->categorie->data['cat_link_back'], 12, 255),
 				array(array($this->link, 'link_back'), true)),
 			'cat'			=>		array(
 				array('num', '', 1))
@@ -454,8 +454,8 @@ 
 		// Still no errors?? So let's go!
 		if (!$error)
 		{
-			$this->banner	= (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
-			$this->url		= $this->link->clean_url($this->url);
+			$this->banner = (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
+			$this->url = $this->link->clean_url($this->url);
 
 			$data_edit = array(
 				'link_user_id'		=> $this->link_user_id,
@@ -504,7 +504,7 @@ 
 			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id));
 			meta_refresh(3, $meta_info);
 			$message	= ($need_approval) ? $this->language->lang('DIR_'.strtoupper($mode).'_SITE_ACTIVE') : $this->language->lang('DIR_'.strtoupper($mode).'_SITE_OK');
-			$message	= $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_base_controller') . '">', '</a>') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id)) . '">', '</a>');
+			$message	= $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_page_controller', array('cat_id' => (int) $cat_id)).'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -533,7 +533,7 @@ 
 	{
 		if (!function_exists('file_gc'))
 		{
-			include($this->root_path . 'includes/functions_download.' . $this->php_ext);
+			include($this->root_path.'includes/functions_download.'.$this->php_ext);
 		}
 
 		$file_path = $this->dir_helper->get_banner_path($banner_img);
@@ -588,7 +588,7 @@ 
 
 		if (!function_exists('display_custom_bbcodes'))
 		{
-			include($this->root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->root_path.'includes/functions_display.'.$this->php_ext);
 		}
 		display_custom_bbcodes();
 		add_form_key('dir_form');
@@ -597,17 +597,17 @@ 
 		$flag_path = $ext_path.'images/flags/';
 
 		$s_guest	= (!$this->user->data['is_registered'] || !empty($this->guest_email));
-		$s_rss		= $this->config['dir_activ_rss'];
-		$s_banner	= $this->config['dir_activ_banner'];
+		$s_rss = $this->config['dir_activ_rss'];
+		$s_banner = $this->config['dir_activ_banner'];
 		$s_back		= $this->categorie->data['cat_link_back'];
 		$s_flag		= $this->config['dir_activ_flag'];
 
 		$this->template->assign_vars(array(
-			'BBCODE_STATUS'			=> ($this->config['allow_bbcode']) 	? $this->language->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>'),
-			'IMG_STATUS'			=> ($this->config['allow_bbcode'])	? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
+			'BBCODE_STATUS'			=> ($this->config['allow_bbcode']) ? $this->language->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'),
+			'IMG_STATUS'			=> ($this->config['allow_bbcode']) ? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
 			'SMILIES_STATUS'		=> ($this->config['allow_smilies']) ? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'),
 			'URL_STATUS'			=> ($this->config['allow_post_links']) ? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'),
-			'FLASH_STATUS'			=> ($this->config['allow_bbcode'] && $this->config['allow_post_flash'])	? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
+			'FLASH_STATUS'			=> ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
 
 			'L_TITLE'				=> $title,
 			'L_DIR_DESCRIPTION_EXP'	=> $this->language->lang('DIR_DESCRIPTION_EXP', $this->config['dir_length_describe']),