ErnadoO / ext-phpbb-directory

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/categories.php

Indentation +52 added lines, -52 removed lines

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

Spacing +26 added lines, -26 removed lines

@@ -66,16 +66,16 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
 	{
-		$this->db			= $db;
-		$this->config		= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->language		= $language;
 		$this->template		= $template;
 		$this->user			= $user;
-		$this->helper		= $helper;
-		$this->request		= $request;
+		$this->helper = $helper;
+		$this->request = $request;
 		$this->auth			= $auth;
-		$this->pagination	= $pagination;
-		$this->categorie	= $categorie;
+		$this->pagination = $pagination;
+		$this->categorie = $categorie;
 		$this->link			= $link;
 
 		$language->add_lang('directory', 'ernadoo/phpbbdirectory');
@@ -114,7 +114,7 @@ 
 	*/
 	public function view($cat_id, $page, $sort_days, $sort_key, $sort_dir, $mode = '')
 	{
-		$url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id, array('page' => $page, 'sort_days' => $sort_days, 'sort_key' => $sort_key, 'sort_dir' => $sort_dir));
+		$url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id, array('page' => $page, 'sort_days' => $sort_days, 'sort_key' => $sort_key, 'sort_dir' => $sort_dir));
 
 		return new RedirectResponse($url, 301);
 	}
@@ -140,18 +140,18 @@ 
 
 		$start = ($page - 1) * $this->config['dir_show'];
 
-		$default_sort_days	= 0;
+		$default_sort_days = 0;
 		$default_sort_key	= (string) substr($this->config['dir_default_order'], 0, 1);
 		$default_sort_dir	= (string) substr($this->config['dir_default_order'], 2);
 
 		$sort_days	= (!$sort_days) ? $this->request->variable('st', $default_sort_days) : $sort_days;
 		$sort_key 	= (!$sort_key) ? $this->request->variable('sk', $default_sort_key) : $sort_key;
-		$sort_dir	= (!$sort_dir) ? $this->request->variable('sd', $default_sort_dir) : $sort_dir;
+		$sort_dir = (!$sort_dir) ? $this->request->variable('sd', $default_sort_dir) : $sort_dir;
 		$link_list = $rowset = array();
 
 		// Categorie ordering options
 		$limit_days		= array(0 => $this->language->lang('SEE_ALL'), 1 => $this->language->lang('1_DAY'), 7 => $this->language->lang('7_DAYS'), 14 => $this->language->lang('2_WEEKS'), 30 => $this->language->lang('1_MONTH'), 90 => $this->language->lang('3_MONTHS'), 180 => $this->language->lang('6_MONTHS'), 365 => $this->language->lang('1_YEAR'));
-		$sort_by_text	= array('a' => $this->language->lang('AUTHOR'), 't' => $this->language->lang('POST_TIME'), 'r' => $this->language->lang('DIR_COMMENTS_ORDER'), 's' =>  $this->language->lang('DIR_NAME_ORDER'), 'v' => $this->language->lang('DIR_NB_CLICKS_ORDER'));
+		$sort_by_text = array('a' => $this->language->lang('AUTHOR'), 't' => $this->language->lang('POST_TIME'), 'r' => $this->language->lang('DIR_COMMENTS_ORDER'), 's' =>  $this->language->lang('DIR_NAME_ORDER'), 'v' => $this->language->lang('DIR_NB_CLICKS_ORDER'));
 		$sort_by_sql	= array('a' => 'u.username_clean', 't' => array('l.link_time', 'l.link_id'), 'r' => 'l.link_comment', 's' => 'LOWER(l.link_name)', 'v' => 'l.link_view');
 
 		if ($this->config['dir_activ_pagerank'])
@@ -190,8 +190,8 @@ 
 			$min_post_time = time() - ($sort_days * 86400);
 
 			$sql = 'SELECT COUNT(link_id) AS nb_links
-				FROM ' . $this->links_table . '
-				WHERE link_cat = ' . (int) $cat_id . '
+				FROM ' . $this->links_table.'
+				WHERE link_cat = ' . (int) $cat_id.'
 					AND link_time >= ' . (int) $min_post_time;
 			$result = $this->db->sql_query($sql);
 			$nb_links = (int) $this->db->sql_fetchfield('nb_links');
@@ -206,7 +206,7 @@ 
 		else
 		{
 			$sql_limit_time = '';
-			$nb_links		= (int) $this->categorie->data['cat_links'];
+			$nb_links = (int) $this->categorie->data['cat_links'];
 		}
 
 		// Make sure $start is set to the last page if it exceeds the amount
@@ -219,7 +219,7 @@ 
 		$this->categorie->make_cat_jumpbox();
 
 		$base_url = array(
-			'routes'	=> 'ernadoo_phpbbdirectory_dynamic_route_' . $cat_id,
+			'routes'	=> 'ernadoo_phpbbdirectory_dynamic_route_'.$cat_id,
 			'params'	=> array_merge(array('cat_id' => $cat_id), $u_sort_param),
 		);
 
@@ -232,14 +232,14 @@ 
 			'S_SELECT_SORT_KEY'		=> $s_sort_key,
 			'S_SELECT_SORT_DAYS'	=> $s_limit_days,
 			'S_CATLIST'				=> $this->categorie->make_cat_select($cat_id),
-			'S_PAGE_ACTION'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id, array('page' => $page)),
+			'S_PAGE_ACTION'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id, array('page' => $page)),
 			'S_CAT_ID'				=> $cat_id,
 
 			'TOTAL_LINKS'			=> $this->language->lang('DIR_NB_LINKS', (int) $nb_links),
 
 			'U_NEW_SITE' 			=> $this->helper->route('ernadoo_phpbbdirectory_new_controller', array('cat_id' => $cat_id)),
 
-			'U_VIEW_CAT'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id),
+			'U_VIEW_CAT'			=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id),
 			'U_WATCH_CAT'			=> $s_watching_categorie['link'],
 			'U_WATCH_CAT_TOGGLE'	=> $s_watching_categorie['link_toggle'],
 			'S_WATCH_CAT_TITLE'		=> $s_watching_categorie['title'],
@@ -269,11 +269,11 @@ 
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		// Grab just the sorted link ids
@@ -316,7 +316,7 @@ 
 						),
 						array(
 							'FROM'	=> array($this->votes_table => 'v'),
-							'ON'	=> 'l.link_id = v.vote_link_id AND v.vote_user_id = ' . $this->user->data['user_id']
+							'ON'	=> 'l.link_id = v.vote_link_id AND v.vote_user_id = '.$this->user->data['user_id']
 						)
 				),
 				'WHERE'		=> $this->db->sql_in_set('l.link_id', $link_list)
@@ -333,8 +333,8 @@ 
 
 			$link_list = ($store_reverse) ? array_reverse($link_list) : $link_list;
 
-			$votes_status 		= ($this->categorie->data['cat_allow_votes']) ? true : false;
-			$comments_status 	= ($this->categorie->data['cat_allow_comments']) ? true : false;
+			$votes_status = ($this->categorie->data['cat_allow_votes']) ? true : false;
+			$comments_status = ($this->categorie->data['cat_allow_comments']) ? true : false;
 
 			foreach ($link_list as $link_id)
 			{
@@ -344,11 +344,11 @@ 
 				$s_note		= $this->link->display_note($site['link_note'], $site['link_vote'], $votes_status);
 				$s_thumb	= $this->link->display_thumb($site);
 				$s_vote		= $this->link->display_vote($site);
-				$s_banner	= $this->link->display_bann($site);
-				$s_pr		= $this->link->display_pagerank($site);
-				$s_rss		= $this->link->display_rss($site);
+				$s_banner = $this->link->display_bann($site);
+				$s_pr = $this->link->display_pagerank($site);
+				$s_rss = $this->link->display_rss($site);
 
-				$edit_allowed 	= ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
+				$edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
 				$delete_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_delete_dir'))));
 
 				$this->template->assign_block_vars('site', array(
@@ -385,7 +385,7 @@ 
 			$this->template->assign_block_vars('no_draw_link', array());
 		}
 
-		$page_title = $this->language->lang('DIRECTORY') . ' - ' . $this->categorie->data['cat_name'];
+		$page_title = $this->language->lang('DIRECTORY').' - '.$this->categorie->data['cat_name'];
 
 		$this->categorie->display();
 

controller/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 ' . (int) $start . ' AND ' . (int) $end;
+						AND link_id BETWEEN ' . (int) $start.' AND '.(int) $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>';
 			}
 		}
 

migrations/v20x/add_cat_route_field.php

Indentation +6 added lines, -6 removed lines

@@ -22,8 +22,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
  	public function update_schema()
 	{
 		return array(
@@ -36,8 +36,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function update_data()
 	{
 		return array(
@@ -46,8 +46,8 @@ 
 	}
 
 	/**
-	* @inheritDoc
-	*/
+	 * @inheritDoc
+	 */
 	public function revert_schema()
 	{
 		return array(

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

Braces +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	* @inheritDoc
 	*/
  	public function update_schema()
-	{
+ 	{
 		return array(
 			'add_columns'	=> array(
 				$this->table_prefix . 'directory_cats' => array(