ErnadoO / ext-phpbb-directory

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
-	* @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
+	 * @param	string	$sort_dir	is either a or d representing ASC and DESC (ascending|descending)
+	 * @param	string	$mode		watch|unwatch
+	 * @return	\Symfony\Component\HttpFoundation\Response	A Symfony Response object
+	 * @throws	\phpbb\exception\http_exception
+	 */
 	public function view($cat_id, $page, $sort_days, $sort_key, $sort_dir, $mode = '')
 	{
 		if (false === $this->categorie->get($cat_id))
@@ -125,17 +125,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 = 1, $sort_days = 0, $sort_key = '', $sort_dir = '', $mode = '')
 	{
 		if (false === $this->categorie->get($cat_id))
@@ -390,11 +390,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())
@@ -411,11 +411,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 +24 added lines, -24 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');
@@ -119,7 +119,7 @@ 
 			throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_CATS');
 		}
 
-		$url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id, array('page' => $page));
+		$url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id, array('page' => $page));
 
 		return new RedirectResponse($url, 301);
 	}
@@ -145,13 +145,13 @@ 
 
 		$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
@@ -189,8 +189,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 >= ' . $min_post_time;
 			$result = $this->db->sql_query($sql);
 			$nb_links = (int) $this->db->sql_fetchfield('nb_links');
@@ -205,7 +205,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
@@ -218,7 +218,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),
 		);
 
@@ -231,14 +231,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'],
@@ -268,11 +268,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
@@ -315,7 +315,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)
@@ -332,8 +332,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)
 			{
@@ -343,10 +343,10 @@ 
 				$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_rss		= $this->link->display_rss($site);
+				$s_banner = $this->link->display_bann($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(
@@ -382,7 +382,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();