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

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

acp/phpbbdirectory_module.php

Indentation +14 added lines, -14 removed lines

@@ -15,10 +15,10 @@ 
 	public $u_action;
 
 	/**
-	*
-	* @param int	$id
-	* @param string	$mode
-	*/
+	 *
+	 * @param int	$id
+	 * @param string	$mode
+	 */
 	public function main($id, $mode)
 	{
 		global $request, $phpbb_container;
@@ -183,11 +183,11 @@ 
 	}
 
 	/**
-	* Display thumb services available
-	*
-	* @param 	string	$url_selected
-	* @return 	string
-	*/
+	 * Display thumb services available
+	 *
+	 * @param 	string	$url_selected
+	 * @return 	string
+	 */
 	public function get_thumb_service_list($url_selected)
 	{
 		$thumbshot = array(
@@ -207,11 +207,11 @@ 
 	}
 
 	/**
-	* Display order drop-down list
-	*
-	* @param	string	$order_selected
-	* @return	string
-	*/
+	 * Display order drop-down list
+	 *
+	 * @param	string	$order_selected
+	 * @return	string
+	 */
 	public function get_order_list($order_selected)
 	{
 		global $user;

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 +14 added lines, -14 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;
 	}
 
@@ -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
 				{
@@ -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,7 +788,7 @@ 
 
 			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'])

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 +4 added lines, -4 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;
 	}
 
 	/**
@@ -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,

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 +34 added lines, -34 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();
 	}
@@ -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;
@@ -193,45 +193,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', 	'type' => 'text:3:3',		'explain' => false),
-				'dir_length_describe'				=> array('lang' => 'DIR_MAX_DESC',			'validate' => 'int:1', 	'type' => 'text:3:3',		'explain' => false),
-				'dir_new_time'						=> array('lang' => 'DIR_NEW_TIME',			'validate' => 'int', 	'type' => 'text:3:3',		'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', 'type' => 'text:3:3', 'explain' => false),
+				'dir_length_describe'				=> array('lang' => 'DIR_MAX_DESC', 'validate' => 'int:1', 'type' => 'text:3:3', 'explain' => false),
+				'dir_new_time'						=> array('lang' => 'DIR_NEW_TIME', 'validate' => 'int', 'type' => 'text:3:3', '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',		'type' => 'text:3:3',		'explain' => false),
-				'dir_recent_columns'				=> array('lang' => 'DIR_RECENT_COLUMNS',	'validate' => 'int:1',		'type' => 'text:3:3',		'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', 'type' => 'text:3:3', 'explain' => false),
+				'dir_recent_columns'				=> array('lang' => 'DIR_RECENT_COLUMNS', 'validate' => 'int:1', 'type' => 'text:3:3', '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:1:10',	'type' => 'text:3:3',		'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:1:10', 'type' => 'text:3:3', '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:2',	'type' => 'text:3:3',		'explain' => true),
-				'dir_comments_per_page'				=> array('lang' => 'DIR_COMM_PER_PAGE',		'validate' => 'int:1',	'type' => 'text:3:3',		'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:2', 'type' => 'text:3:3', 'explain' => true),
+				'dir_comments_per_page'				=> array('lang' => 'DIR_COMM_PER_PAGE', 'validate' => 'int:1', 'type' => 'text:3:3', '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',	'type' => 'dimension:0',	'explain' => true, 'append' => ' ' . $this->language->lang('PIXEL')),
-				'dir_banner_filesize'				=> array('lang' => 'DIR_MAX_SIZE',			'validate' => 'int:0',	'type' => 'number:0',		'explain' => true, 'append' => ' ' . $this->language->lang('BYTES')),
-				'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', 'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $this->language->lang('PIXEL')),
+				'dir_banner_filesize'				=> array('lang' => 'DIR_MAX_SIZE', 'validate' => 'int:0', 'type' => 'number:0', 'explain' => true, 'append' => ' ' . $this->language->lang('BYTES')),
+				'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 +15 added lines, -15 removed lines

@@ -86,22 +86,22 @@ 
 	*/
 	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;
-		$this->db			= $db;
-		$this->pagination	= $pagination;
+		$this->config = $config;
+		$this->db = $db;
+		$this->pagination = $pagination;
 		$this->language		= $language;
 		$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', '');
 	}
 
 	/**
@@ -130,14 +130,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->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'));
@@ -201,7 +201,7 @@ 
 				'LINK_URL'			=> $row['link_url'],
 				'LINK_NAME'			=> $row['link_name'],
 				'LINK_DESC'			=> generate_text_for_display($row['link_description'], $row['link_uid'], $row['link_bitfield'], $row['link_flags']),
-				'L_DIR_USER_PROP'	=> $this->language->lang('DIR_USER_PROP', get_username_string('full', $row['link_user_id'], $username, $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$this->php_ext", 'i=users&amp;mode=overview')), '<select name=c'.$row['link_id'].'>'.$this->categorie->make_cat_select((int) $row['link_cat']).'</select>', $this->user->format_date($row['link_time'])),
+				'L_DIR_USER_PROP'	=> $this->language->lang('DIR_USER_PROP', get_username_string('full', $row['link_user_id'], $username, $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$this->php_ext", 'i=users&amp;mode=overview')), '<select name=c' . $row['link_id'] . '>' . $this->categorie->make_cat_select((int) $row['link_cat']) . '</select>', $this->user->format_date($row['link_time'])),
 				'BANNER'			=> $s_banner,
 				'LINK_ID'			=> $row['link_id'],
 
@@ -276,7 +276,7 @@ 
 			{
 				$username = $email = $row['link_guest_email'];
 
-				$messenger->template('@ernadoo_phpbbdirectory/directory_website_'.$this->action, $row['user_lang']);
+				$messenger->template('@ernadoo_phpbbdirectory/directory_website_' . $this->action, $row['user_lang']);
 				$messenger->to($email, $username);
 
 				$messenger->assign_vars(array(
@@ -296,7 +296,7 @@ 
 					'cat_id'			=> (int) $row['link_cat'],
 				);
 
-				$this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_'.$this->action, $notification_data);
+				$this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_' . $this->action, $notification_data);
 			}
 		}
 	}
@@ -339,7 +339,7 @@ 
 		foreach ($this->cat_data as $cat_id => $count)
 		{
 			$sql = 'UPDATE ' . DIR_CAT_TABLE . '
-							SET cat_links = cat_links + '.$count.'
+							SET cat_links = cat_links + '.$count . '
 							WHERE cat_id = ' . (int) $cat_id;
 			$this->db->sql_query($sql);
 		}
@@ -398,7 +398,7 @@ 
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$row['link_cat'] = $this->request->variable('c'.$row['link_id'], (int) $row['cat_id']);
+			$row['link_cat'] = $this->request->variable('c' . $row['link_id'], (int) $row['cat_id']);
 
 			$this->links_data[] = $row;
 

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 +17 added lines, -17 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');
@@ -116,18 +116,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' => 'l.link_name', 'v' => 'l.link_view');
 
 		if ($this->config['dir_activ_pagerank'])
@@ -182,7 +182,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
@@ -306,8 +306,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)
 			{
@@ -317,11 +317,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(
@@ -340,7 +340,7 @@ 
 					'VOTE_LIST'		=> ($votes_status) ? $s_vote : '',
 
 					'IMG_FLAG'		=> $s_flag,
-					'ON_CLICK' 		=> "onclick=\"window.open('".$this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $site['link_id']))."'); return false;\"",
+					'ON_CLICK' 		=> "onclick=\"window.open('" . $this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $site['link_id'])) . "'); return false;\"",
 
 					'S_NEW_LINK'	=> (((time() - $site['link_time']) / 86400) <= $this->config['dir_new_time']) ? true : false,
 

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

Spacing +19 added lines, -19 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;
@@ -181,7 +181,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)
@@ -237,8 +237,8 @@ 
 		$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));
 
@@ -297,12 +297,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_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>') : '',
 
 				'S_INFO'			=> $this->auth->acl_get('m_info'),
 			));
@@ -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 = $this->language->lang('DIR_' . strtoupper($mode) . '_COMMENT_OK');
 			$message = $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="' . $meta_info . '">', '</a>');
 			return $this->helper->message($message);
 		}
@@ -483,11 +483,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']),