ErnadoO / ext-phpbb-directory

notification/type/directory_website_approved.php

Indentation +64 added lines, -64 removed lines

@@ -21,32 +21,32 @@ 
 	protected $helper;
 
 	/**
-	* Set the controller helper
-	*
-	* @param \phpbb\controller\helper $helper
-	* @return null
-	*/
+	 * Set the controller helper
+	 *
+	 * @param \phpbb\controller\helper $helper
+	 * @return null
+	 */
 	public function set_controller_helper(\phpbb\controller\helper $helper)
 	{
 		$this->helper = $helper;
 	}
 
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'ernadoo.phpbbdirectory.notification.type.directory_website_approved';
 	}
 
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'id'	=> 'dir_moderation_queue',
 		'lang'	=> 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE',
@@ -54,17 +54,17 @@ 
 	);
 
 	/**
-	* Permission to check for (in find_users_for_notification)
-	*
-	* @var string Permission name
-	*/
+	 * Permission to check for (in find_users_for_notification)
+	 *
+	 * @var string Permission name
+	 */
 	protected $permission = array('a_', 'm_');
 
 	/**
-	* Is available
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is available
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		$has_permission = $this->auth->acl_gets($this->permission, true);
@@ -73,21 +73,21 @@ 
 	}
 
 	/**
-	* Get link id
-	*
-	* @param array $data The data from the link
-	* @return int
-	*/
+	 * Get link id
+	 *
+	 * @param array $data The data from the link
+	 * @return int
+	 */
 	static public function get_item_id($data)
 	{
 		return (int) $data['link_id'];
 	}
 
 	/**
-	* Get parent id - it's not used
-	*
-	* @param array $data The data from the link
-	*/
+	 * Get parent id - it's not used
+	 *
+	 * @param array $data The data from the link
+	 */
 	static public function get_item_parent_id($data)
 	{
 		// No parent
@@ -95,12 +95,12 @@ 
 	}
 
 	/**
-	* Find the users who want to receive notifications
-	*
-	* @param	array	$data		Data from submit link
-	* @param	array	$options	Options for finding users for notification
-	* @return	array
-	*/
+	 * Find the users who want to receive notifications
+	 *
+	 * @param	array	$data		Data from submit link
+	 * @param	array	$options	Options for finding users for notification
+	 * @return	array
+	 */
 	public function find_users_for_notification($data, $options = array())
 	{
 		$options = array_merge(array(
@@ -116,10 +116,10 @@ 
 	}
 
 	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
+	 * Get the HTML formatted title of this notification
+	 *
+	 * @return string
+	 */
 	public function get_title()
 	{
 		$link_name = $this->get_data('link_name');
@@ -129,20 +129,20 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string
-	*/
+	 * Get email template
+	 *
+	 * @return string
+	 */
 	public function get_email_template()
 	{
 		return '@ernadoo_phpbbdirectory/directory_website_approved';
 	}
 
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array(
@@ -151,33 +151,33 @@ 
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $this->get_data('cat_id'));
 	}
 
 	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
+	 * Users needed to query before this notification can be displayed
+	 *
+	 * @return array Array of user_ids
+	 */
 	public function users_to_query()
 	{
 		return array();
 	}
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param	array	$data				Data from submit link
-	* @param	array	$pre_create_data	Data from pre_create_insert_array()
-	* @return	array						Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param	array	$data				Data from submit link
+	 * @param	array	$pre_create_data	Data from pre_create_insert_array()
+	 * @return	array						Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('link_name', $data['link_name']);

Spacing +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 	*/
 	public function get_url()
 	{
-		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $this->get_data('cat_id'));
+		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$this->get_data('cat_id'));
 	}
 
 	/**

notification/type/directory_website.php

Indentation +62 added lines, -62 removed lines

@@ -24,11 +24,11 @@ 
 	protected $watch_table;
 
 	/**
-	* Set the controller helper
-	*
-	* @param \phpbb\controller\helper $helper
-	* @return null
-	*/
+	 * Set the controller helper
+	 *
+	 * @param \phpbb\controller\helper $helper
+	 * @return null
+	 */
 	public function set_controller_helper(\phpbb\controller\helper $helper)
 	{
 		$this->helper = $helper;
@@ -46,21 +46,21 @@ 
 	}
 
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'ernadoo.phpbbdirectory.notification.type.directory_website';
 	}
 
 	/**
-	* Notification option data (for outputting to the user)
-	*
-	* @var bool|array False if the service should use it's default data
-	* 					Array of data (including keys 'id', 'lang', and 'group')
-	*/
+	 * Notification option data (for outputting to the user)
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 * 					Array of data (including keys 'id', 'lang', and 'group')
+	 */
 	public static $notification_option = array(
 		'lang'	=> 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE',
 		'group'	=> 'NOTIFICATION_DIR_UCP',
@@ -75,31 +75,31 @@ 
 	}
 
 	/**
-	* Is available
-	*
-	* @return bool True/False whether or not this is available to the user
-	*/
+	 * Is available
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
 	public function is_available()
 	{
 		return true;
 	}
 
 	/**
-	* Get link id
-	*
-	* @param array $data The data from the link
-	* @return int
-	*/
+	 * Get link id
+	 *
+	 * @param array $data The data from the link
+	 * @return int
+	 */
 	static public function get_item_id($data)
 	{
 		return (int) $data['link_id'];
 	}
 
 	/**
-	* Get parent id - it's not used
-	*
-	* @param array $data The data from the link
-	*/
+	 * Get parent id - it's not used
+	 *
+	 * @param array $data The data from the link
+	 */
 	static public function get_item_parent_id($data)
 	{
 		// No parent
@@ -107,12 +107,12 @@ 
 	}
 
 	/**
-	* Find the users who want to receive notifications
-	*
-	* @param	array	$data		Data from submit link
-	* @param	array	$options	Options for finding users for notification
-	* @return	array
-	*/
+	 * Find the users who want to receive notifications
+	 *
+	 * @param	array	$data		Data from submit link
+	 * @param	array	$options	Options for finding users for notification
+	 * @return	array
+	 */
 	public function find_users_for_notification($data, $options = array())
 	{
 		$options = array_merge(array(
@@ -144,8 +144,8 @@ 
 	}
 
 	/**
-	* Get the user's avatar
-	*/
+	 * Get the user's avatar
+	 */
 	public function get_avatar()
 	{
 		return $this->user_loader->get_avatar($this->get_data('user_from'), false, true);
@@ -153,10 +153,10 @@ 
 
 
 	/**
-	* Get the HTML formatted title of this notification
-	*
-	* @return string
-	*/
+	 * Get the HTML formatted title of this notification
+	 *
+	 * @return string
+	 */
 
 	public function get_title()
 	{
@@ -169,20 +169,20 @@ 
 
 
 	/**
-	* Get email template
-	*
-	* @return string
-	*/
+	 * Get email template
+	 *
+	 * @return string
+	 */
 	public function get_email_template()
 	{
 		return '@ernadoo_phpbbdirectory/directory_website';
 	}
 
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array(
@@ -194,33 +194,33 @@ 
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $this->get_data('cat_id'));
 	}
 
 	/**
-	* Users needed to query before this notification can be displayed
-	*
-	* @return array Array of user_ids
-	*/
+	 * Users needed to query before this notification can be displayed
+	 *
+	 * @return array Array of user_ids
+	 */
 	public function users_to_query()
 	{
 		return array($this->get_data('user_from'));
 	}
 
 	/**
-	* Function for preparing the data for insertion in an SQL query
-	* (The service handles insertion)
-	*
-	* @param	array	$data				Data from submit link
-	* @param	array	$pre_create_data	Data from pre_create_insert_array()
-	* @return	array						Array of data ready to be inserted into the database
-	*/
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion)
+	 *
+	 * @param	array	$data				Data from submit link
+	 * @param	array	$pre_create_data	Data from pre_create_insert_array()
+	 * @return	array						Array of data ready to be inserted into the database
+	 */
 	public function create_insert_array($data, $pre_create_data = array())
 	{
 		$this->set_data('link_name', $data['link_name']);

Spacing +4 added lines, -4 removed lines

@@ -122,9 +122,9 @@ 
 		$users = array();
 
 		$sql = 'SELECT user_id
-			FROM ' . $this->watch_table . '
-			WHERE cat_id = ' . (int) $data['cat_id'] . '
-				AND notify_status = ' . NOTIFY_YES . '
+			FROM ' . $this->watch_table.'
+			WHERE cat_id = ' . (int) $data['cat_id'].'
+				AND notify_status = ' . NOTIFY_YES.'
 				AND user_id <> ' . (int) $data['user_from'];
 		$result = $this->db->sql_query($sql);
 		while ($row = $this->db->sql_fetchrow($result))
@@ -200,7 +200,7 @@ 
 	*/
 	public function get_url()
 	{
-		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $this->get_data('cat_id'));
+		return $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$this->get_data('cat_id'));
 	}
 
 	/**

controller/acp/cat.php

Indentation +111 added lines, -111 removed lines

@@ -69,19 +69,19 @@ 
 	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\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\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\nestedset_category $nestedset_category)
 	{
 		$this->cache				= $cache;
@@ -105,10 +105,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;
@@ -143,10 +143,10 @@ 
 	}
 
 	/**
-	* Display deleting page
-	*
-	* @return null
-	*/
+	 * Display deleting page
+	 *
+	 * @return null
+	 */
 	public function action_delete()
 	{
 		if (!$this->cat_id)
@@ -197,10 +197,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);
@@ -227,10 +227,10 @@ 
 	}
 
 	/**
-	* Move order categories
-	*
-	* @return null
-	*/
+	 * Move order categories
+	 *
+	 * @return null
+	 */
 	public function action_move()
 	{
 		if (!$this->cat_id)
@@ -273,10 +273,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);
@@ -297,10 +297,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)
@@ -382,10 +382,10 @@ 
 	}
 
 	/**
-	* Sync category data
-	*
-	* @return null
-	*/
+	 * Sync category data
+	 *
+	 * @return null
+	 */
 	public function action_sync_cat()
 	{
 		$sql = 'SELECT cat_name
@@ -409,10 +409,10 @@ 
 	}
 
 	/**
-	* Display categories page
-	*
-	* @return null
-	*/
+	 * Display categories page
+	 *
+	 * @return null
+	 */
 	public function display_cats()
 	{
 		// Default management page
@@ -506,22 +506,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))
@@ -619,13 +619,13 @@ 
 	}
 
 	/**
-	* Check route
-	*
-	* @param string $route Route text
-	* @return null
-	* @access public
-	* @throws \phpbb\pages\exception\unexpected_value
-	*/
+	 * Check route
+	 *
+	 * @param string $route Route text
+	 * @return null
+	 * @access public
+	 * @throws \phpbb\pages\exception\unexpected_value
+	 */
 	private function _check_route($route)
 	{
 		// Route is a required field
@@ -656,11 +656,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(
@@ -732,11 +732,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, cat_route, 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
@@ -755,10 +755,10 @@ 
 	}
 
 	/**
-	* Update category data
-	*
-	* @return array
-	*/
+	 * Update category data
+	 *
+	 * @return array
+	 */
 	private function _update_cat_data()
 	{
 		if (!$this->cat_data['cat_name'])
@@ -854,14 +854,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);
@@ -978,12 +978,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 ' . $this->links_table . '
@@ -999,10 +999,10 @@ 
 	}
 
 	/**
-	* Delete category content
-	*
-	* @return array
-	*/
+	 * Delete category content
+	 *
+	 * @return array
+	 */
 	private function _delete_cat_content()
 	{
 		$this->db->sql_transaction('begin');
@@ -1061,11 +1061,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
@@ -1083,12 +1083,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(
@@ -1131,12 +1131,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 +90 added lines, -90 removed lines

@@ -84,23 +84,23 @@ 
 	*/
 	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\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->nestedset_category	= $nestedset_category;
+		$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;
 	}
 
@@ -151,7 +151,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);
@@ -167,7 +167,7 @@ 
 		$cat_list = $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $subcats_id);
 
 		$sql = 'SELECT cat_id
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id <> ' . (int) $this->cat_id;
 		$result = $this->db->sql_query_limit($sql, 1);
 
@@ -183,8 +183,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,
@@ -235,11 +235,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 ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -247,7 +247,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
@@ -261,7 +261,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', $this->categories_table);
 		}
 
@@ -305,13 +305,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 ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -319,12 +319,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 ' . $this->links_table . '
-			WHERE link_cat = ' . (int) $this->cat_id . '
+			FROM ' . $this->links_table.'
+			WHERE link_cat = ' . (int) $this->cat_id.'
 				AND link_active = 1';
 		$result = $this->db->sql_query($sql);
 		$row2 = $this->db->sql_fetchrow($result);
@@ -346,22 +346,22 @@ 
 		{
 			// We really need to find a way of showing statistics... no progress here
 			$sql = 'SELECT COUNT(link_id) as num_links
-				FROM ' . $this->links_table . '
-				WHERE link_cat = ' . (int) $this->cat_id . '
+				FROM ' . $this->links_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(
-				'UA_PROGRESS_BAR'		=> $this->u_action . "&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}",
+				'UA_PROGRESS_BAR'		=> $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']))
 			);
@@ -369,11 +369,11 @@ 
 			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(
-			'UA_PROGRESS_BAR'		=> $this->u_action . '&amp;action=progress_bar',
+			'UA_PROGRESS_BAR'		=> $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']))
 		);
@@ -389,7 +389,7 @@ 
 	public function action_sync_cat()
 	{
 		$sql = 'SELECT cat_name
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -397,7 +397,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);
@@ -422,7 +422,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);
 
@@ -430,11 +430,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>';
 				}
 			}
 		}
@@ -448,8 +448,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 ' . $this->categories_table . '
-			WHERE parent_id = ' . (int) $this->parent_id . '
+			FROM ' . $this->categories_table.'
+			WHERE parent_id = ' . (int) $this->parent_id.'
 			ORDER BY left_id';
 		$result = $this->db->sql_query($sql);
 
@@ -457,23 +457,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->get_img_path('icons', $row['cat_icon']) . '" alt="" />' : '',
+					'CAT_IMAGE'			=> ($row['cat_icon']) ? '<img src="'.$this->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));
@@ -482,14 +482,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);
@@ -499,9 +499,9 @@ 
 			'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,
 
-			'UA_PROGRESS_BAR'	=> $this->u_action . '&amp;action=progress_bar',
+			'UA_PROGRESS_BAR'	=> $this->u_action.'&amp;action=progress_bar',
 		));
 	}
 
@@ -533,10 +533,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
 				{
@@ -554,7 +554,7 @@ 
 
 				$this->cache->destroy('sql', $this->categories_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;
 
@@ -608,7 +608,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;
@@ -642,8 +642,8 @@ 
 		}
 
 		$sql = 'SELECT cat_route
-			FROM ' . $this->categories_table  . "
-			WHERE cat_route = '" . $this->db->sql_escape($route) . "'
+			FROM ' . $this->categories_table."
+			WHERE cat_route = '" . $this->db->sql_escape($route)."'
 				AND cat_id <> " . $this->cat_id;
 		$result = $this->db->sql_query_limit($sql, 1);
 		$row = $this->db->sql_fetchrow($result);
@@ -693,10 +693,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->get_img_path('icons', $this->cat_data['cat_icon']) : 'images/spacer.gif',
 
@@ -740,7 +740,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, cat_route, 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 ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -805,7 +805,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);
@@ -828,13 +828,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 ' . $this->categories_table . "
+				$sql = 'UPDATE '.$this->categories_table."
 					SET cat_parents = ''";
 				$this->db->sql_query($sql);
 			}
@@ -842,8 +842,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 ' . $this->categories_table . '
-				SET ' . $this->db->sql_build_array('UPDATE', $cat_data_sql) . '
+			$sql = 'UPDATE '.$this->categories_table.'
+				SET ' . $this->db->sql_build_array('UPDATE', $cat_data_sql).'
 				WHERE cat_id = ' . (int) $this->cat_id;
 			$this->db->sql_query($sql);
 
@@ -884,7 +884,7 @@ 
 				$log_action_links = 'MOVE_LINKS';
 
 				$sql = 'SELECT cat_name
-					FROM ' . $this->categories_table . '
+					FROM ' . $this->categories_table.'
 					WHERE cat_id = ' . (int) $links_to_id;
 				$result = $this->db->sql_query($sql);
 				$row = $this->db->sql_fetchrow($result);
@@ -986,12 +986,12 @@ 
 	*/
 	private function _move_cat_content($from_id, $to_id)
 	{
-		$sql = 'UPDATE ' . $this->links_table . '
-			SET link_cat = ' . (int) $to_id . '
+		$sql = 'UPDATE '.$this->links_table.'
+			SET link_cat = ' . (int) $to_id.'
 			WHERE link_cat = ' . (int) $from_id;
 		$this->db->sql_query($sql);
 
-		$sql = 'DELETE FROM ' . $this->watch_table . '
+		$sql = 'DELETE FROM '.$this->watch_table.'
 			WHERE cat_id = ' . (int) $from_id;
 		$this->db->sql_query($sql);
 
@@ -1009,7 +1009,7 @@ 
 
 		// Before we remove anything we make sure we are able to adjust the post counts later. ;)
 		$sql = 'SELECT link_id, link_banner
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_cat = ' . (int) $this->cat_id;
 		$result = $this->db->sql_query($sql);
 
@@ -1040,7 +1040,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));
 			}
 		}
 
@@ -1052,7 +1052,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');
@@ -1069,15 +1069,15 @@ 
 	private function _sync_dir_cat($cat_id)
 	{
 		$sql = 'SELECT COUNT(link_id) AS num_links
-			FROM ' . $this->links_table . '
-			WHERE link_cat = ' . (int) $cat_id . '
+			FROM ' . $this->links_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 ' . $this->categories_table . '
-			SET cat_links = ' . $total_links . '
+		$sql = 'UPDATE '.$this->categories_table.'
+			SET cat_links = ' . $total_links.'
 			WHERE cat_id = ' . (int) $cat_id;
 		$this->db->sql_query($sql);
 	}
@@ -1097,33 +1097,33 @@ 
 			'link_vote'		=> 0,
 		);
 
-		$sql = 'UPDATE ' . $this->links_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-			WHERE link_id BETWEEN ' . (int) $start . ' AND ' . (int) $stop;
+		$sql = 'UPDATE '.$this->links_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 ' . $this->votes_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 '.$this->votes_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 ' . $this->links_table . '
-				SET link_note = ' . (int) $tmp['total'] . ', link_vote = ' . (int) $tmp['nb_vote'] . '
+			$sql = 'UPDATE '.$this->links_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 ' . $this->comments_table . '
-			WHERE comment_link_id BETWEEN ' . (int) $start . ' AND ' . (int) $stop . '
+			FROM ' . $this->comments_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 ' . $this->links_table . '
-				SET link_comment = ' . (int) $tmp['nb_comment'] . '
+			$sql = 'UPDATE '.$this->links_table.'
+				SET link_comment = ' . (int) $tmp['nb_comment'].'
 				WHERE link_id = ' . (int) $tmp['comment_link_id'];
 			$this->db->sql_query($sql);
 		}
@@ -1148,7 +1148,7 @@ 
 
 			foreach ($img_ary as $img)
 			{
-				$img = $path . $img;
+				$img = $path.$img;
 				$selected = '';
 
 				if (strlen($img) > 255)
@@ -1161,7 +1161,7 @@ 
 					$selected = ' selected="selected"';
 				}
 
-				$filename_list .= '<option value="' . htmlspecialchars($img) . '"' . $selected . '>' . $img . '</option>';
+				$filename_list .= '<option value="'.htmlspecialchars($img).'"'.$selected.'>'.$img.'</option>';
 			}
 		}
 

controller/links.php

Spacing +43 added lines, -43 removed lines

@@ -87,19 +87,19 @@ 
 	*/
 	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, $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->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->php_ext = $php_ext;
 
 		$language->add_lang('directory', 'ernadoo/phpbbdirectory');
 
@@ -119,12 +119,12 @@ 
 	{
 		if ($this->request->is_set_post('cancel'))
 		{
-			$redirect = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+			$redirect = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 			redirect($redirect);
 		}
 
 		$sql = 'SELECT link_user_id
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$link_data = $this->db->sql_fetchrow($result);
@@ -145,9 +145,9 @@ 
 		{
 			$this->link->del($cat_id, $link_id);
 
-			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$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_dynamic_route_' . $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_dynamic_route_'.$cat_id).'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -167,7 +167,7 @@ 
 	public function edit_link($cat_id, $link_id)
 	{
 		$sql = 'SELECT link_user_id
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$link_data = $this->db->sql_fetchrow($result);
@@ -183,7 +183,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,
@@ -203,7 +203,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 ' . $this->links_table . '
+				FROM ' . $this->links_table.'
 				WHERE link_id = ' . (int) $link_id;
 			$result = $this->db->sql_query($sql);
 
@@ -219,15 +219,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'];
 		}
@@ -254,7 +254,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,
@@ -318,7 +318,7 @@ 
 
 		// We check if user had already vot for this website.
 		$sql = 'SELECT vote_link_id
-			FROM ' . $this->votes_table . '
+			FROM ' . $this->votes_table.'
 			WHERE ' . $this->db->sql_build_array('SELECT', $data);
 		$result = $this->db->sql_query($sql);
 		$data = $this->db->sql_fetchrow($result);
@@ -330,9 +330,9 @@ 
 
 		$this->link->add_vote($link_id);
 
-		$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+		$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$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);
 	}
 
@@ -357,18 +357,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
@@ -391,17 +391,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))
@@ -450,8 +450,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,
@@ -497,10 +497,10 @@ 
 				$this->link->add($data_add, $need_approval);
 			}
 
-			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$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_dynamic_route_' . $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_dynamic_route_'.$cat_id).'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -529,7 +529,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->get_banner_path($banner_img);
@@ -584,7 +584,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');
@@ -593,17 +593,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']),

core/categorie.php

Spacing +33 added lines, -33 removed lines

@@ -60,13 +60,13 @@ 
 	*/
 	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\cron\manager $cron)
 	{
-		$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->cron 		= $cron;
 	}
@@ -90,7 +90,7 @@ 
 	public function make_cat_jumpbox()
 	{
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			ORDER BY left_id ASC';
 		$result = $this->db->sql_query($sql, 600);
 
@@ -119,7 +119,7 @@ 
 				'FORUM_ID'		=> $row['cat_id'],
 				'FORUM_NAME'	=> $row['cat_name'],
 				'S_FORUM_COUNT'	=> $iteration,
-				'LINK'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $row['cat_id']),
+				'LINK'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$row['cat_id']),
 			));
 
 			for ($i = 0; $i < $padding; $i++)
@@ -151,7 +151,7 @@ 
 
 		// This query is identical to the jumpbox one
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			ORDER BY left_id ASC';
 		$result = $this->db->sql_query($sql, 600);
 
@@ -181,7 +181,7 @@ 
 			}
 
 			$selected = (($row['cat_id'] == $select_id) ? ' selected="selected"' : '');
-			$cat_list .= '<option value="' . $row['cat_id'] . '"' . (($disabled) ? ' disabled="disabled" class="disabled-option"' : $selected) . '>' . $padding . $row['cat_name'] . '</option>';
+			$cat_list .= '<option value="'.$row['cat_id'].'"'.(($disabled) ? ' disabled="disabled" class="disabled-option"' : $selected).'>'.$padding.$row['cat_name'].'</option>';
 		}
 		$this->db->sql_freeresult($result);
 		unset($padding_store);
@@ -196,7 +196,7 @@ 
 	*/
 	public function display()
 	{
-		$cat_rows	= $subcats = array();
+		$cat_rows = $subcats = array();
 		$parent_id	= $visible_cats = 0;
 
 		$sql_array = array(
@@ -214,7 +214,7 @@ 
 		else
 		{
 			$root_data = $this->data;
-			$sql_where = 'left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id'];
+			$sql_where = 'left_id > '.$root_data['left_id'].' AND left_id < '.$root_data['right_id'];
 		}
 
 		$sql = $this->db->sql_build_query('SELECT', array(
@@ -261,12 +261,12 @@ 
 			{
 				foreach ($subcats[$dir_cat_id] as $subcat_id => $subcat_row)
 				{
-					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links']+$subcat_row['links']) : $row['cat_links'];
+					$row['cat_links'] = ($row['cat_count_all']) ? ($row['cat_links'] + $subcat_row['links']) : $row['cat_links'];
 
 					if ($subcat_row['display'] && $subcat_row['parent_id'] == $dir_cat_id)
 					{
 						$subcats_list[] = array(
-							'link'		=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $subcat_id),
+							'link'		=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$subcat_id),
 							'name'		=> $subcat_row['name'],
 							'links'		=> $subcat_row['links']
 						);
@@ -284,7 +284,7 @@ 
 				'CAT_LINKS'				=> $row['cat_links'],
 				'CAT_IMG'				=> $this->get_img_path('icons', $row['cat_icon']),
 
-				'U_CAT'					=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $row['cat_id']),
+				'U_CAT'					=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$row['cat_id']),
 			));
 
 			// Assign subcats loop for style authors
@@ -316,7 +316,7 @@ 
 			if ($task->is_ready())
 			{
 				$url = $task->get_url();
-				$this->template->assign_var('RUN_CRON_TASK', '<img src="' . $url . '" width="1" height="1" alt="" />');
+				$this->template->assign_var('RUN_CRON_TASK', '<img src="'.$url.'" width="1" height="1" alt="" />');
 			}
 		}
 	}
@@ -338,10 +338,10 @@ 
 				'LEFT_JOIN'	=> array(
 						array(
 							'FROM'	=> array($this->watch_table	=> 'w'),
-							'ON'	=> 'c.cat_id = w.cat_id AND w.user_id = ' . (int) $this->user->data['user_id']
+							'ON'	=> 'c.cat_id = w.cat_id AND w.user_id = '.(int) $this->user->data['user_id']
 						),
 				),
-				'WHERE'		=> 'c.cat_id = ' . (int) $cat_id
+				'WHERE'		=> 'c.cat_id = '.(int) $cat_id
 			);
 			$sql = $this->db->sql_build_query('SELECT', $sql_array);
 			$result = $this->db->sql_query($sql);
@@ -378,8 +378,8 @@ 
 				$this->template->assign_block_vars('dir_navlinks', array(
 					'FORUM_NAME'	=> $parent_data['cat_name'],
 					'FORUM_ID'		=> $parent_cat_id,
-					'MICRODATA'		=> $microdata_attr . '="' . $parent_cat_id . '"',
-					'U_VIEW_FORUM'	=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $parent_cat_id),
+					'MICRODATA'		=> $microdata_attr.'="'.$parent_cat_id.'"',
+					'U_VIEW_FORUM'	=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$parent_cat_id),
 				));
 			}
 		}
@@ -387,8 +387,8 @@ 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $dir_cat_data['cat_name'],
 			'FORUM_ID'		=> $dir_cat_data['cat_id'],
-			'MICRODATA'		=> $microdata_attr . '="' . $dir_cat_data['cat_id'] . '"',
-			'U_VIEW_FORUM'	=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $dir_cat_data['cat_id']),
+			'MICRODATA'		=> $microdata_attr.'="'.$dir_cat_data['cat_id'].'"',
+			'U_VIEW_FORUM'	=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$dir_cat_data['cat_id']),
 		));
 
 		return;
@@ -444,17 +444,17 @@ 
 			{
 				if ($mode == 'unwatch')
 				{
-					$sql = 'DELETE FROM ' . $this->watch_table . "
+					$sql = 'DELETE FROM '.$this->watch_table."
 						WHERE cat_id = $cat_id
 							AND user_id = $user_id";
 					$this->db->sql_query($sql);
 
-					$redirect_url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+					$redirect_url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 					$message = $this->language->lang('DIR_NOT_WATCHING_CAT');
 
 					if (!$this->request->is_ajax())
 					{
-						$message .= '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $redirect_url . '">', '</a>');
+						$message .= '<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$redirect_url.'">', '</a>');
 					}
 
 					meta_refresh(3, $redirect_url);
@@ -466,8 +466,8 @@ 
 
 					if ($notify_status != NOTIFY_YES)
 					{
-						$sql = 'UPDATE ' . $this->watch_table . '
-							SET notify_status = ' . NOTIFY_YES . "
+						$sql = 'UPDATE '.$this->watch_table.'
+							SET notify_status = ' . NOTIFY_YES."
 							WHERE cat_id = $cat_id
 								AND user_id = $user_id";
 						$this->db->sql_query($sql);
@@ -478,16 +478,16 @@ 
 			{
 				if ($mode == 'watch')
 				{
-					$sql = 'INSERT INTO ' . $this->watch_table . " (user_id, cat_id, notify_status)
-						VALUES ($user_id, $cat_id, " . NOTIFY_YES . ')';
+					$sql = 'INSERT INTO '.$this->watch_table." (user_id, cat_id, notify_status)
+						VALUES ($user_id, $cat_id, ".NOTIFY_YES.')';
 					$this->db->sql_query($sql);
 
-					$redirect_url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+					$redirect_url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 					$message = $this->language->lang('DIR_ARE_WATCHING_CAT');
 
 					if (!$this->request->is_ajax())
 					{
-						$message .= '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $redirect_url . '">', '</a>');
+						$message .= '<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$redirect_url.'">', '</a>');
 					}
 
 					meta_refresh(3, $redirect_url);
@@ -507,10 +507,10 @@ 
 
 		if ($can_watch)
 		{
-			$s_watching['link'] 		= $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => (($is_watching) ? 'unwatch' : 'watch')));
+			$s_watching['link'] = $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => (($is_watching) ? 'unwatch' : 'watch')));
 			$s_watching['link_toggle'] 	= $this->helper->route('ernadoo_phpbbdirectory_suscribe_controller', array('cat_id' => $cat_id, 'mode' => ((!$is_watching) ? 'unwatch' : 'watch')));
-			$s_watching['title'] 		= $this->language->lang((($is_watching) ? 'DIR_STOP' : 'DIR_START') . '_WATCHING_CAT');
-			$s_watching['title_toggle'] = $this->language->lang(((!$is_watching) ? 'DIR_STOP' : 'DIR_START') . '_WATCHING_CAT');
+			$s_watching['title'] = $this->language->lang((($is_watching) ? 'DIR_STOP' : 'DIR_START').'_WATCHING_CAT');
+			$s_watching['title_toggle'] = $this->language->lang(((!$is_watching) ? 'DIR_STOP' : 'DIR_START').'_WATCHING_CAT');
 			$s_watching['is_watching'] 	= $is_watching;
 		}
 
@@ -530,7 +530,7 @@ 
 		$categories_table = $phpbb_container->getParameter('tables.dir.categories');
 
 		$sql = 'SELECT cat_name
-			FROM ' . $categories_table . '
+			FROM ' . $categories_table.'
 			WHERE cat_id = ' . (int) $cat_id;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);

migrations/v20x/add_cat_route_field.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		return array(
 			'add_columns'	=> array(
-				$this->table_prefix . 'directory_cats' => array(
+				$this->table_prefix.'directory_cats' => array(
 					'cat_route'	=> array('VCHAR', '', 'after' => 'cat_name'),
 				)
 			),
@@ -52,7 +52,7 @@ 
 	{
 		return array(
 			'drop_columns'	=> array(
-				$this->table_prefix . 'directory_cats' => array(
+				$this->table_prefix.'directory_cats' => array(
 					'cat_route',
 				),
 			),
@@ -63,13 +63,13 @@ 
 	{
 		$slug = new \E1379\SpeakingUrl\SpeakingUrl();
 
-		$sql = 'SELECT cat_id, cat_name FROM ' . $this->table_prefix . 'directory_cats';
+		$sql = 'SELECT cat_id, cat_name FROM '.$this->table_prefix.'directory_cats';
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$sql = 'UPDATE ' . $this->table_prefix . 'directory_cats' . '
-				SET cat_route = "' . (string) $slug->getSlug($row['cat_name'], array('lang' => $this->config['default_lang'], 'symbols' => true)). '"
+			$sql = 'UPDATE '.$this->table_prefix.'directory_cats'.'
+				SET cat_route = "' . (string) $slug->getSlug($row['cat_name'], array('lang' => $this->config['default_lang'], 'symbols' => true)).'"
 				WHERE cat_id = ' . (int) $row['cat_id'];
 			$this->db->sql_query($sql);
 		}

Indentation +6 added lines, -6 removed lines

@@ -20,8 +20,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function update_schema()
 	{
 		return array(
@@ -34,8 +34,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function update_data()
 	{
 		return array(
@@ -44,8 +44,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function revert_schema()
 	{
 		return array(

ext.php

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()
 	{
 		$php_ini = $this->container->get('php_ini');
@@ -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)
@@ -80,11 +80,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)
@@ -112,11 +112,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)
@@ -144,16 +144,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 +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 			return false;
 		}
 
-		if (!file_exists($this->extension_path. 'vendor/autoload.php'))
+		if (!file_exists($this->extension_path.'vendor/autoload.php'))
 		{
 			return false;
 		}
@@ -69,7 +69,7 @@ 
 				if (!class_exists('\E1379\SpeakingUrl\SpeakingUrl'))
 				{
 					// When migration is executed, phpBB doesn't know yet extension dependencies, so we need to manually include autoload file
-					require($this->extension_path. 'vendor/autoload.php');
+					require($this->extension_path.'vendor/autoload.php');
 				}
 
 				// Run parent enable step method
@@ -160,7 +160,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';

controller/acp/settings.php

Spacing +36 added lines, -36 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,44 +199,44 @@ 
 				'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_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' => false, '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_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' => false, '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),
 			)
 		);
 	}

migrations/v20x/remove_pagerank_conf.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	{
 		return array(
 			'drop_columns' => array(
-				$this->table_prefix . 'directory_links'	=> array(
+				$this->table_prefix.'directory_links'	=> array(
 					'link_pagerank',
 				),
 			),
@@ -48,7 +48,7 @@ 
 	{
 		return array(
 			'add_columns' => array(
-				$this->table_prefix . 'directory_links'	=> array(
+				$this->table_prefix.'directory_links'	=> array(
 					'link_pagerank' => array('CHAR:2', ''),
 				),
 			),