ErnadoO / ext-phpbb-directory

notification/type/directory_website_in_queue.php

Indentation +61 added lines, -61 removed lines

@@ -18,31 +18,31 @@ 
 class directory_website_in_queue extends \phpbb\notification\type\base
 {
 	/**
-	* Get notification type name
-	*
-	* @return string
-	*/
+	 * Get notification type name
+	 *
+	 * @return string
+	 */
 	public function get_type()
 	{
 		return 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
 	}
 
 	/**
-	* 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_IN_MODERATION_QUEUE',
 		'group'	=> 'NOTIFICATION_DIR_UCP',
 	);
 
 	/**
-	* 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 = 'a_';
 
 	/** @var \phpbb\user_loader */
@@ -54,10 +54,10 @@ 
 	}
 
 	/**
-	* 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_get($this->permission, true);
@@ -66,21 +66,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
@@ -88,12 +88,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(
@@ -113,18 +113,18 @@ 
 	}
 
 	/**
-	* 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);
 	}
 
 	/**
-	* 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');
@@ -134,30 +134,30 @@ 
 	}
 
 	/**
-	* Get email template
-	*
-	* @return string
-	*/
+	 * Get email template
+	 *
+	 * @return string
+	 */
 	public function get_email_template()
 	{
 		return '@ernadoo_phpbbdirectory/directory_website_in_queue';
 	}
 
 	/**
-	* Get email template variables
-	*
-	* @return array
-	*/
+	 * Get email template variables
+	 *
+	 * @return array
+	 */
 	public function get_email_template_variables()
 	{
 		return array();
 	}
 
 	/**
-	* Get the url to this item
-	*
-	* @return string URL
-	*/
+	 * Get the url to this item
+	 *
+	 * @return string URL
+	 */
 	public function get_url()
 	{
 		global $phpbb_admin_path;
@@ -166,23 +166,23 @@ 
 	}
 
 	/**
-	* 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('user_from', $data['user_from']);

search/fulltext_directory.php

Indentation +20 added lines, -20 removed lines

@@ -16,32 +16,32 @@
 	protected $db;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface $db
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface $db
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db)
 	{
 		$this->db = $db;
 	}
 
 	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first
-	*
-	* @param	array		$keywords_ary		contains each words to search
-	* @param	string		$fields				contains either titleonly (link titles should be searched), desconly (only description bodies should be searched)
-	* @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_cid_ary			specifies an array of category ids which should not be searched
-	* @param	int			$cat_id				is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	int								total number of results
-	*/
+	 * Performs a search on keywords depending on display specific params. You have to run split_keywords() first
+	 *
+	 * @param	array		$keywords_ary		contains each words to search
+	 * @param	string		$fields				contains either titleonly (link titles should be searched), desconly (only description bodies should be searched)
+	 * @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
+	 * @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
+	 * @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
+	 * @param	string		$sort_dir			is either a or d representing ASC and DESC
+	 * @param	string		$sort_days			specifies the maximum amount of days a post may be old
+	 * @param	array		$ex_cid_ary			specifies an array of category ids which should not be searched
+	 * @param	int			$cat_id				is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
+	 * @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
+	 * @param	int			$start				indicates the first index of the page
+	 * @param	int			$per_page			number of ids each page is supposed to contain
+	 * @return	int								total number of results
+	 */
 	public function keyword_search($keywords_ary, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_cid_ary, $cat_id, &$id_ary, $start, $per_page)
 	{
 		$matches = array();

Spacing +9 added lines, -9 removed lines

@@ -69,20 +69,20 @@ 
 			$match_search_query = '';
 			foreach ($matches as $match)
 			{
-				$match_search_query .= (($match_search_query) ? ' OR ' : '') . 'LOWER('. $match . ') ';
-				$match_search_query .= $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), $this->db->get_any_char() . strtolower($word) . $this->db->get_any_char()));
+				$match_search_query .= (($match_search_query) ? ' OR ' : '').'LOWER('.$match.') ';
+				$match_search_query .= $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), $this->db->get_any_char().strtolower($word).$this->db->get_any_char()));
 			}
-			$search_query .= ((!$search_query) ? '' : (($terms == 'all') ? ' AND ' : ' OR ')) . '(' . $match_search_query . ')';
+			$search_query .= ((!$search_query) ? '' : (($terms == 'all') ? ' AND ' : ' OR ')).'('.$match_search_query.')';
 		}
 		$direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		$sql_array = array(
@@ -90,10 +90,10 @@ 
 			'FROM'		=> array(
 					$this->links_table	=> 'l'),
 			'WHERE'		=> 'l.link_active = 1
-				' . (($search_query) ? 'AND (' . $search_query . ')' : '') . '
-				' . (sizeof($ex_cid_ary) ? ' AND ' . $this->db->sql_in_set('l.link_cat', $ex_cid_ary, true) : '') . '
-				' . (($cat_id) ? ' AND ' . $this->db->sql_in_set('l.link_cat', $cat_id) : '') . '
-				' . (($sort_days) ? ' AND l.link_time >= ' . (time() - ($sort_days * 86400)) : ''),
+				' . (($search_query) ? 'AND ('.$search_query.')' : '').'
+				' . (sizeof($ex_cid_ary) ? ' AND '.$this->db->sql_in_set('l.link_cat', $ex_cid_ary, true) : '').'
+				' . (($cat_id) ? ' AND '.$this->db->sql_in_set('l.link_cat', $cat_id) : '').'
+				' . (($sort_days) ? ' AND l.link_time >= '.(time() - ($sort_days * 86400)) : ''),
 			'ORDER_BY'	=> $sql_sort_order
 		);
 

migrations/v20x/v2_0_0.php

Indentation +4 added lines, -4 removed lines

@@ -13,8 +13,8 @@ 
 class v2_0_0 extends \phpbb\db\migration\container_aware_migration
 {
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	static public function depends_on()
 	{
 		return array(
@@ -23,8 +23,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function update_data()
 	{
 		return array(

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 		{
 			$default_reparser = new $fast_reparsers[0][0](
 				$this->db,
-				$this->container->getParameter('core.table_prefix') . $fast_reparsers[0][1]);
+				$this->container->getParameter('core.table_prefix').$fast_reparsers[0][1]);
 
 			$resume_data = array(
 				'reparser'	=> 0,
@@ -60,7 +60,7 @@ 
 		{
 			$reparser = new $fast_reparsers[$resume_data['reparser']][0](
 				$this->db,
-				$this->container->getParameter('core.table_prefix') . $fast_reparsers[$resume_data['reparser']][1]
+				$this->container->getParameter('core.table_prefix').$fast_reparsers[$resume_data['reparser']][1]
 				);
 
 			// New reparser

textreparser/plugins/comment_text.php

Indentation +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
 class comment_text extends \phpbb\textreparser\row_based_plugin
 {
 	/**
-	* {@inheritdoc}
-	*/
+	 * {@inheritdoc}
+	 */
 	public function get_columns()
 	{
 		return array(

acp/phpbbdirectory_module.php

Indentation +16 added lines, -16 removed lines

@@ -19,10 +19,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;
@@ -187,11 +187,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(
@@ -211,11 +211,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;
@@ -244,8 +244,8 @@ 
 	}
 
 	/**
-	* Adjust all three max_filesize config vars for display
-	*/
+	 * Adjust all three max_filesize config vars for display
+	 */
 	public function max_filesize($value, $key = '')
 	{
 		// Determine size var and adjust the value accordingly

Spacing +3 added lines, -3 removed lines

@@ -204,7 +204,7 @@ 
 		{
 			$selected = ($url == $url_selected) ? 'selected="selected"' : '';
 
-			$select_options .= '<option value="' . $url . '" ' . $selected . '>' . parse_url($url, PHP_URL_HOST) . '</option>';
+			$select_options .= '<option value="'.$url.'" '.$selected.'>'.parse_url($url, PHP_URL_HOST).'</option>';
 		}
 
 		return $select_options;
@@ -237,7 +237,7 @@ 
 		{
 			$selected = ($i == $order_selected) ? 'selected="selected"' : '';
 			$order_substr = trim(str_replace(' ', '_', $i));
-			$tpl .= '<option value="' . $i . '" ' . $selected . '>' . $user->lang['DIR_ORDER_' . strtoupper($order_substr)] . '</option>';
+			$tpl .= '<option value="'.$i.'" '.$selected.'>'.$user->lang['DIR_ORDER_'.strtoupper($order_substr)].'</option>';
 		}
 
 		return ($tpl);
@@ -254,6 +254,6 @@ 
 		$value = $filesize['value'];
 
 		// size and maxlength must not be specified for input of type number
-		return '<input type="number" id="' . $key . '" min="0" max="999999999999999" step="any" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
+		return '<input type="number" id="'.$key.'" min="0" max="999999999999999" step="any" name="config['.$key.']" value="'.$value.'" /> <select name="'.$key.'">'.size_select_options($size_var).'</select>';
 	}
 }

controller/acp/validation.php

Indentation +58 added lines, -58 removed lines

@@ -66,22 +66,22 @@ 
 	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\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\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\link $link, $root_path, $php_ext)
 	{
 		$this->config		= $config;
@@ -102,11 +102,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(
@@ -118,10 +118,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;
@@ -225,11 +225,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);
@@ -252,10 +252,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'))
@@ -299,22 +299,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)
@@ -343,10 +343,10 @@ 
 	}
 
 	/**
-	* Disapprove action
-	*
-	* @return null
-	*/
+	 * Disapprove action
+	 *
+	 * @return null
+	 */
 	private function _action_disapproved()
 	{
 		foreach ($this->links_data as $row)
@@ -367,11 +367,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(
@@ -406,11 +406,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 +21 added lines, -21 removed lines

@@ -84,21 +84,21 @@ 
 	*/
 	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\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->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', '');
 	}
 
 	/**
@@ -127,14 +127,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'));
@@ -150,15 +150,15 @@ 
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		$sql = 'SELECT COUNT(1) AS total_links
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_active = 0' .
 				(($sql_where) ? " AND link_time >= $sql_where" : '');
 		$result = $this->db->sql_query($sql);
@@ -182,7 +182,7 @@ 
 					'ON'	=> 'u.user_id = l.link_user_id'
 				)
 			),
-			'WHERE'		=> 'l.link_active = 0' . (($sql_where) ? " AND l.link_time >= $sql_where" : ''),
+			'WHERE'		=> 'l.link_active = 0'.(($sql_where) ? " AND l.link_time >= $sql_where" : ''),
 			'ORDER_BY'	=> $sql_sort_order);
 
 		$sql = $this->db->sql_build_query('SELECT', $sql_array);
@@ -209,7 +209,7 @@ 
 
 		$option_ary = array('approved' => 'DIR_LINK_ACTIVATE', 'disapproved' => 'DIR_LINK_DELETE');
 
-		$base_url = $this->u_action . "&$u_sort_param&links_per_page=$per_page";
+		$base_url = $this->u_action."&$u_sort_param&links_per_page=$per_page";
 		$this->pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_links, $per_page, $start);
 
 		$this->template->assign_vars(array(
@@ -220,7 +220,7 @@ 
 			'S_SORT_DIR'		=> $s_sort_dir,
 			'LINKS_PER_PAGE'	=> $per_page,
 
-			'U_ACTION'			=> $this->u_action . "&$u_sort_param&links_per_page=$per_page&start=$start",
+			'U_ACTION'			=> $this->u_action."&$u_sort_param&links_per_page=$per_page&start=$start",
 		));
 	}
 
@@ -248,7 +248,7 @@ 
 				return;
 		}
 
-		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_' . strtoupper($this->action), time(), array(implode(', ', $this->affected_link_name)));
+		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_'.strtoupper($this->action), time(), array(implode(', ', $this->affected_link_name)));
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	{
 		if (!class_exists('messenger'))
 		{
-			include($this->root_path . 'includes/functions_messenger.' . $this->php_ext);
+			include($this->root_path.'includes/functions_messenger.'.$this->php_ext);
 		}
 		$messenger = new \messenger(false);
 
@@ -327,15 +327,15 @@ 
 				'link_cat'		=> (int) $row['link_cat'],
 			);
 
-			$sql = 'UPDATE ' . $this->links_table . '
-							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+			$sql = 'UPDATE '.$this->links_table.'
+							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
 							WHERE link_id = ' . (int) $row['link_id'];
 			$this->db->sql_query($sql);
 		}
 
 		foreach ($this->cat_data as $cat_id => $count)
 		{
-			$sql = 'UPDATE ' . $this->categories_table . '
+			$sql = 'UPDATE '.$this->categories_table.'
 							SET cat_links = cat_links + '.$count.'
 							WHERE cat_id = ' . (int) $cat_id;
 			$this->db->sql_query($sql);
@@ -361,7 +361,7 @@ 
 				}
 			}
 
-			$sql = 'DELETE FROM ' . $this->links_table . ' WHERE link_id = ' . (int) $row['link_id'];
+			$sql = 'DELETE FROM '.$this->links_table.' WHERE link_id = '.(int) $row['link_id'];
 			$this->db->sql_query($sql);
 		}
 	}

controller/acp/main.php

Indentation +32 added lines, -32 removed lines

@@ -30,13 +30,13 @@ 
 	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
-	*/
+	 * 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
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\request\request $request, \phpbb\template\template $template)
 	{
 		$this->db			= $db;
@@ -46,11 +46,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)
@@ -88,10 +88,10 @@ 
 	}
 
 	/**
-	* Display phpBB Directory statistics
-	*
-	* @return null
-	*/
+	 * Display phpBB Directory statistics
+	 *
+	 * @return null
+	 */
 	public function display_stats()
 	{
 		// Count number of categories
@@ -178,11 +178,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)
@@ -257,23 +257,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->get_banner_path();

Spacing +12 added lines, -12 removed lines

@@ -39,10 +39,10 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\request\request $request, \phpbb\template\template $template)
 	{
-		$this->db			= $db;
+		$this->db = $db;
 		$this->language		= $language;
 		$this->template		= $template;
-		$this->request		= $request;
+		$this->request = $request;
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 			{
 				if ($file[0] != '.' && $file[0] != '..' && strpos($file, 'index.') === false && strpos($file, '.db') === false)
 				{
-					$banners_dir_size += filesize($banners_path . $file);
+					$banners_dir_size += filesize($banners_path.$file);
 				}
 			}
 			closedir($banners_dir);
@@ -167,7 +167,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,
@@ -192,15 +192,15 @@ 
 				{
 					case 'sqlite':
 					case 'firebird':
-						$this->db->sql_query('DELETE FROM ' . $this->votes_table);
+						$this->db->sql_query('DELETE FROM '.$this->votes_table);
 					break;
 
 					default:
-						$this->db->sql_query('TRUNCATE TABLE ' . $this->votes_table);
+						$this->db->sql_query('TRUNCATE TABLE '.$this->votes_table);
 					break;
 				}
 
-				$sql = 'UPDATE ' . $this->links_table . '
+				$sql = 'UPDATE '.$this->links_table.'
 					SET link_vote = 0, link_note = 0';
 				$this->db->sql_query($sql);
 
@@ -215,15 +215,15 @@ 
 				{
 					case 'sqlite':
 					case 'firebird':
-						$this->db->sql_query('DELETE FROM ' . $this->comments_table);
+						$this->db->sql_query('DELETE FROM '.$this->comments_table);
 					break;
 
 					default:
-						$this->db->sql_query('TRUNCATE TABLE ' . $this->comments_table);
+						$this->db->sql_query('TRUNCATE TABLE '.$this->comments_table);
 					break;
 				}
 
-				$sql = 'UPDATE ' . $this->links_table . '
+				$sql = 'UPDATE '.$this->links_table.'
 					SET link_comment = 0';
 				$this->db->sql_query($sql);
 
@@ -235,7 +235,7 @@ 
 				break;
 
 			case 'clicks':
-				$sql = 'UPDATE ' . $this->links_table . '
+				$sql = 'UPDATE '.$this->links_table.'
 					SET link_view = 0';
 				$this->db->sql_query($sql);
 
@@ -289,7 +289,7 @@ 
 			{
 				$physical_files[] = $img;
 			}
-			$sql = 'SELECT link_banner FROM ' . $this->links_table . '
+			$sql = 'SELECT link_banner FROM '.$this->links_table.'
 				WHERE link_banner <> \'\'';
 			$result = $this->db->sql_query($sql);
 

core/nestedset_category.php

Indentation +6 added lines, -6 removed lines

@@ -13,12 +13,12 @@
 class nestedset_category extends \phpbb\tree\nestedset
 {
 	/**
-	* Construct
-	*
-	* @param \phpbb\db\driver\driver_interface	$db					Database connection
-	* @param \phpbb\lock\db						$lock				Lock class used to lock the table when moving forums around
-	* @param string								$categorie_table	Categories table
-	*/
+	 * Construct
+	 *
+	 * @param \phpbb\db\driver\driver_interface	$db					Database connection
+	 * @param \phpbb\lock\db						$lock				Lock class used to lock the table when moving forums around
+	 * @param string								$categorie_table	Categories table
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $categorie_table)
 	{
 		parent::__construct(

core/categorie.php

Indentation +61 added lines, -61 removed lines

@@ -46,18 +46,18 @@ 
 	public $data = array();
 
 	/**
-	* 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\cron\manager					$cron		Cron 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\cron\manager					$cron		Cron 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\cron\manager $cron)
 	{
 		$this->db			= $db;
@@ -72,21 +72,21 @@ 
 	}
 
 	/**
-	* Function for get approval setting
-	* used in edit mode for test the setting of new category's link
-	*
-	* @return bool
-	*/
+	 * Function for get approval setting
+	 * used in edit mode for test the setting of new category's link
+	 *
+	 * @return bool
+	 */
 	public function need_approval()
 	{
 		return (bool) $this->data['cat_validate'];
 	}
 
 	/**
-	* Generate Jumpbox
-	*
-	* @return null
-	*/
+	 * Generate Jumpbox
+	 *
+	 * @return null
+	 */
 	public function make_cat_jumpbox()
 	{
 		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
@@ -139,12 +139,12 @@ 
 	}
 
 	/**
-	* Generate a list of directory's categories
-	*
-	* @param	int		$select_id		Selected category
-	* @param	array	$ignore_id		Array of ignored categories
-	* @return	string	$cat_list		html code
-	*/
+	 * Generate a list of directory's categories
+	 *
+	 * @param	int		$select_id		Selected category
+	 * @param	array	$ignore_id		Array of ignored categories
+	 * @return	string	$cat_list		html code
+	 */
 	public function make_cat_select($select_id = 0, $ignore_id = array())
 	{
 		$ignore_id = is_array($ignore_id) ? $ignore_id : array($ignore_id);
@@ -190,10 +190,10 @@ 
 	}
 
 	/**
-	* Display cat or subcat
-	*
-	* @return	null
-	*/
+	 * Display cat or subcat
+	 *
+	 * @return	null
+	 */
 	public function display()
 	{
 		$cat_rows	= $subcats = array();
@@ -322,11 +322,11 @@ 
 	}
 
 	/**
-	* Get informations about a cat or subcat
-	*
-	* @param	int	$cat_id		The category ID
-	* @return	null|false
-	*/
+	 * Get informations about a cat or subcat
+	 *
+	 * @param	int	$cat_id		The category ID
+	 * @return	null|false
+	 */
 	public function get($cat_id = 0)
 	{
 		if ($cat_id)
@@ -354,11 +354,11 @@ 
 	}
 
 	/**
-	* Create category navigation links for given category, create parent
-	* list if currently null, assign basic category info to template
-	*
-	* @param	array	$dir_cat_data
-	*/
+	 * Create category navigation links for given category, create parent
+	 * list if currently null, assign basic category info to template
+	 *
+	 * @param	array	$dir_cat_data
+	 */
 	public function generate_dir_nav(&$dir_cat_data)
 	{
 		global $phpbb_container;
@@ -395,12 +395,12 @@ 
 	}
 
 	/**
-	* Return good key language
-	*
-	* @param	bool	$validate	True if approbation needed before publication
-	* @return	string				Information about approval, depends on user auth level
-	* @throws	\phpbb\exception\runtime_exception
-	*/
+	 * Return good key language
+	 *
+	 * @param	bool	$validate	True if approbation needed before publication
+	 * @return	string				Information about approval, depends on user auth level
+	 * @throws	\phpbb\exception\runtime_exception
+	 */
 	public function dir_submit_type($validate)
 	{
 		if ($validate && !$this->auth->acl_get('a_'))
@@ -424,15 +424,15 @@ 
 	}
 
 	/**
-	* Category watching common code
-	*
-	* @param	string		$mode			Watch or unwatch a category
-	* @param	array		$s_watching		An empty array, passed by reference
-	* @param	int			$user_id		The user ID
-	* @param	int			$cat_id			The category ID
-	* @param	string		$notify_status	User is watching the category?
-	* @return	null|string
-	*/
+	 * Category watching common code
+	 *
+	 * @param	string		$mode			Watch or unwatch a category
+	 * @param	array		$s_watching		An empty array, passed by reference
+	 * @param	int			$user_id		The user ID
+	 * @param	int			$cat_id			The category ID
+	 * @param	string		$notify_status	User is watching the category?
+	 * @return	null|string
+	 */
 	public function watch_categorie($mode, &$s_watching, $user_id, $cat_id, $notify_status)
 	{
 		// Is user watching this thread?
@@ -518,11 +518,11 @@ 
 	}
 
 	/**
-	* Return Category name
-	*
-	* @param	int		$cat_id		The category ID
-	* @return	string				The category name
-	*/
+	 * Return Category name
+	 *
+	 * @param	int		$cat_id		The category ID
+	 * @return	string				The category name
+	 */
 	static public function getname($cat_id)
 	{
 		global $db, $phpbb_container;

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