ErnadoO / ext-phpbb-directory

routing/categories_loader.php

Indentation +14 added lines, -14 removed lines

@@ -26,12 +26,12 @@ 
 	protected $categories_table;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\db\driver\driver_interface    $db          		Database connection
-	* @param string                               $categories_table Table name
-	* @access public
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\db\driver\driver_interface    $db          		Database connection
+	 * @param string                               $categories_table Table name
+	 * @access public
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, $categories_table)
 	{
 		$this->db          		= $db;
@@ -39,10 +39,10 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*
-	* @api
-	*/
+	 * {@inheritdoc}
+	 *
+	 * @api
+	 */
 	public function load($resource, $type = null)
 	{
 		$routes = new RouteCollection();
@@ -78,10 +78,10 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*
-	* @api
-	*/
+	 * {@inheritdoc}
+	 *
+	 * @api
+	 */
 	public function supports($resource, $type = null)
 	{
 		return $type === 'ernadoo_phpbbdirectory_route';

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, $categories_table)
 	{
-		$this->db          		= $db;
+		$this->db = $db;
 		$this->categories_table = $categories_table;
 	}
 
@@ -67,10 +67,10 @@ 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$defaults['cat_id'] = $row['cat_id'];
-			$path = 'directory/' . $row['cat_route'] . '/{page}/{sort_days}/{sort_key}/{sort_dir}';
+			$path = 'directory/'.$row['cat_route'].'/{page}/{sort_days}/{sort_key}/{sort_dir}';
 
 			$route = new Route($path, $defaults, $requirements);
-			$routes->add('ernadoo_phpbbdirectory_dynamic_route_' . $row['cat_id'], $route);
+			$routes->add('ernadoo_phpbbdirectory_dynamic_route_'.$row['cat_id'], $route);
 		}
 		$this->db->sql_freeresult();
 

controller/search.php

Spacing +26 added lines, -26 removed lines

@@ -69,18 +69,18 @@ 
 	*/
 	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\search\fulltext_directory $search, \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->search		= $search;
-		$this->categorie	= $categorie;
-		$this->link			= $link;
+		$this->pagination = $pagination;
+		$this->search = $search;
+		$this->categorie = $categorie;
+		$this->link = $link;
 
 		$language->add_lang('directory', 'ernadoo/phpbbdirectory');
 		$language->add_lang('search');
@@ -104,18 +104,18 @@ 
 			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
 		}
 
-		$cat_id				= $this->request->variable('cat_id', 0);
-		$keywords			= $this->request->variable('keywords', '', true);
+		$cat_id = $this->request->variable('cat_id', 0);
+		$keywords = $this->request->variable('keywords', '', true);
 		$search_terms		= $this->request->variable('terms', 'all');
-		$search_category	= $this->request->variable('cid', array(0));
-		$search_fields		= $this->request->variable('sf', 'all');
+		$search_category = $this->request->variable('cid', array(0));
+		$search_fields = $this->request->variable('sf', 'all');
 		$search_child		= $this->request->variable('sc', true);
-		$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');
-		$start				= ($page - 1) * (int) $this->config['dir_show'];
+		$start = ($page - 1) * (int) $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);
 
@@ -164,12 +164,12 @@ 
 
 			$u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit)));
 
-			($u_hilit) 					? $u_search['keywords']		= urlencode(htmlspecialchars_decode($keywords)) : '';
-			($search_terms != 'all') 	? $u_search['terms']		= $search_terms : '';
-			($cat_id)					? $u_search['cat_id']		= $cat_id : '';
-			($search_category)			? $u_search['cid']			= $search_category : '';
-			(!$search_child)			? $u_search['sc']			= 0 : '';
-			($search_fields != 'all')	? $u_search['sf'] 			= $search_fields : '';
+			($u_hilit) ? $u_search['keywords'] = urlencode(htmlspecialchars_decode($keywords)) : '';
+			($search_terms != 'all') ? $u_search['terms'] = $search_terms : '';
+			($cat_id) ? $u_search['cat_id'] = $cat_id : '';
+			($search_category) ? $u_search['cid'] = $search_category : '';
+			(!$search_child) ? $u_search['sc'] = 0 : '';
+			($search_fields != 'all') ? $u_search['sf'] = $search_fields : '';
 
 			$base_url = array(
 				'routes'	=> 'ernadoo_phpbbdirectory_search_controller',
@@ -199,7 +199,7 @@ 
 			{
 				$this->template->assign_vars(array(
 					'SEARCH_CATEGORY'	=> $this->language->lang('RETURN_TO', \ernadoo\phpbbdirectory\core\categorie::getname((int) $cat_id)),
-					'U_SEARCH_CATEGORY'	=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id),
+					'U_SEARCH_CATEGORY'	=> $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id),
 				));
 			}
 
@@ -243,7 +243,7 @@ 
 
 					foreach ($rowset as $data)
 					{
-						$s_banner	= $this->link->display_bann($data);
+						$s_banner = $this->link->display_bann($data);
 						$s_thumb	= $this->link->display_thumb($data);
 						$s_flag		= $this->link->display_flag($data);
 
@@ -251,8 +251,8 @@ 
 
 						if ($hilit)
 						{
-							$data['link_name'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_name']);
-							$data['link_description'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_description']);
+							$data['link_name'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_name']);
+							$data['link_description'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_description']);
 						}
 
 						$this->template->assign_block_vars('results', array(
@@ -312,7 +312,7 @@ 
 	private function _get_exclude_categories(&$search_category, $search_child)
 	{
 		$sql = 'SELECT cat_id, parent_id, right_id
-				FROM ' . $this->categories_table . '
+				FROM ' . $this->categories_table.'
 				ORDER BY left_id';
 		$result = $this->db->sql_query($sql);
 

tests/controller/controller_base.php

Doc Comments +4 added lines, -1 removed lines

@@ -36,7 +36,7 @@ 
 	/**
 	* Define the extensions to be tested
 	*
-	* @return array vendor/name of extension(s) to test
+	* @return string[] vendor/name of extension(s) to test
 	*/
 	static protected function setup_extensions()
 	{
@@ -221,6 +221,9 @@ 
 		$this->core_categorie->set_extension_manager($phpbb_extension_manager);
 	}
 
+	/**
+	 * @param \ernadoo\phpbbdirectory\cron\task\core\prune_categorie[] $tasks
+	 */
 	private function create_cron_manager($tasks)
 	{
 		global $phpbb_root_path, $phpEx;

Indentation +4 added lines, -4 removed lines

@@ -34,10 +34,10 @@
 	protected $user;
 
 	/**
-	* Define the extensions to be tested
-	*
-	* @return array vendor/name of extension(s) to test
-	*/
+	 * Define the extensions to be tested
+	 *
+	 * @return array vendor/name of extension(s) to test
+	 */
 	static protected function setup_extensions()
 	{
 		return array('ernadoo/phpbbdirectory');

Spacing +4 added lines, -4 removed lines

@@ -51,8 +51,8 @@ 
 
 		parent::setUp();
 
-		$table_categories	= 'phpbb_directory_cats';
-		$tables_comments	= 'phpbb_directory_comments';
+		$table_categories = 'phpbb_directory_cats';
+		$tables_comments = 'phpbb_directory_comments';
 		$tables_links		= 'phpbb_directory_links';
 		$tables_votes		= 'phpbb_directory_votes';
 		$tables_watch		= 'phpbb_directory_watch';
@@ -100,7 +100,7 @@ 
 
 		$this->helper->expects($this->any())
 			->method('render')
-			->willReturnCallback(function ($template_file, $page_title = '', $status_code = 200, $display_online_list = false) {
+			->willReturnCallback(function($template_file, $page_title = '', $status_code = 200, $display_online_list = false) {
 				return new \Symfony\Component\HttpFoundation\Response($template_file, $status_code);
 		});
 		$this->helper
@@ -131,7 +131,7 @@ 
 		$phpbb_container->set('path_helper', $phpbb_path_helper);
 		$phpbb_container->set('ext.manager', $phpbb_extension_manager);
 		$phpbb_container->set('user', $this->user);
-		$phpbb_container->setParameter('core.cache_dir', $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/');
+		$phpbb_container->setParameter('core.cache_dir', $phpbb_root_path.'cache/'.PHPBB_ENVIRONMENT.'/');
 
 		$context = new \phpbb\template\context();
 		$twig_extension = new \phpbb\template\twig\extension($context, $this->lang);

Braces +2 added lines, -1 removed lines

@@ -100,7 +100,8 @@
 
 		$this->helper->expects($this->any())
 			->method('render')
-			->willReturnCallback(function ($template_file, $page_title = '', $status_code = 200, $display_online_list = false) {
+			->willReturnCallback(function ($template_file, $page_title = '', $status_code = 200, $display_online_list = false)
+			{
 				return new \Symfony\Component\HttpFoundation\Response($template_file, $status_code);
 		});
 		$this->helper

tests/controller/phpbbdirectory_base_test.php

Indentation +13 added lines, -13 removed lines

@@ -22,8 +22,8 @@ 
 	}
 
 	/**
-	* Setup test environment
-	*/
+	 * Setup test environment
+	 */
 	public function setUp()
 	{
 		parent::setUp();
@@ -61,10 +61,10 @@ 
 	}
 
 	/**
-	* Test data for the test_display_base() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_display_base() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function display_base_data()
 	{
 		return array(
@@ -73,10 +73,10 @@ 
 	}
 
 	/**
-	* Test controller display
-	*
-	* @dataProvider display_base_data
-	*/
+	 * Test controller display
+	 *
+	 * @dataProvider display_base_data
+	 */
 	public function test_display_base($status_code, $page_content)
 	{
 		$controller = $this->get_controller();
@@ -87,9 +87,9 @@ 
 	}
 
 	/**
-	* Test base case scenario
-	*
-	*/
+	 * Test base case scenario
+	 *
+	 */
 	public function test_for_root_categories()
 	{
 		$this->template->expects($this->exactly(2))

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 {
 	public function getDataSet()
 	{
-		return $this->createMySQLXMLDataSet(__DIR__ . '/fixtures/fixture_base.xml');
+		return $this->createMySQLXMLDataSet(__DIR__.'/fixtures/fixture_base.xml');
 	}
 
 	/**

tests/controller/phpbbdirectory_cats_test.php

Indentation +42 added lines, -42 removed lines

@@ -22,8 +22,8 @@ 
 	}
 
 	/**
-	* Setup test environment
-	*/
+	 * Setup test environment
+	 */
 	public function setUp()
 	{
 		parent::setUp();
@@ -65,10 +65,10 @@ 
 	}
 
 	/**
-	* Test data for the test_display_cat_by_id() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_display_cat_by_id() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function display_cat_by_id_data()
 	{
 		return array(
@@ -77,10 +77,10 @@ 
 	}
 
 	/**
-	* Test controller display
-	*
-	* @dataProvider display_cat_by_id_data
-	*/
+	 * Test controller display
+	 *
+	 * @dataProvider display_cat_by_id_data
+	 */
 	public function test_display_cat_by_id($cat_id, $page, $status_code)
 	{
 		$controller = $this->get_controller();
@@ -121,10 +121,10 @@ 
 	}
 
 	/**
-	* Test data for the test_display_cat_fails() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_display_cat_fails() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function display_cat_fails_data()
 	{
 		return array(
@@ -133,10 +133,10 @@ 
 	}
 
 	/**
-	* Test controller display throws 404 exceptions
-	*
-	* @dataProvider display_cat_fails_data
-	*/
+	 * Test controller display throws 404 exceptions
+	 *
+	 * @dataProvider display_cat_fails_data
+	 */
 	public function test_display_cat_fails($cat_id, $page, $status_code, $page_content)
 	{
 		$controller = $this->get_controller();
@@ -153,10 +153,10 @@ 
 	}
 
 	/**
-	* Test data for the test_category_one_page() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_category_one_page() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function category_one_page_data()
 	{
 		return array(
@@ -165,10 +165,10 @@ 
 	}
 
 	/**
-	* Test base case scenario
-	*
-	* @dataProvider category_one_page_data
-	*/
+	 * Test base case scenario
+	 *
+	 * @dataProvider category_one_page_data
+	 */
 	function test_category_one_page($cat_id, $cat_name, $parent_cat_id, $nb_links)
 	{
 		$controller = $this->get_controller();
@@ -178,10 +178,10 @@ 
 	}
 
 	/**
-	* Test data for the test_category_no_links() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_category_no_links() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function category_no_links_data()
 	{
 		return array(
@@ -190,10 +190,10 @@ 
 	}
 
 	/**
-	* Test base case scenario
-	*
-	* @dataProvider category_no_links_data
-	*/
+	 * Test base case scenario
+	 *
+	 * @dataProvider category_no_links_data
+	 */
 	function test_category_no_links($cat_id, $cat_name, $nb_links)
 	{
 		$this->template->expects($this->at(3))
@@ -209,10 +209,10 @@ 
 	}
 
 	/**
-	* Test data for the test_category_with_pages() function
-	*
-	* @return array Array of test data
-	*/
+	 * Test data for the test_category_with_pages() function
+	 *
+	 * @return array Array of test data
+	 */
 	public function category_with_pages_data()
 	{
 		return array(
@@ -222,10 +222,10 @@ 
 	}
 
 	/**
-	* Test base case scenario
-	*
-	* @dataProvider category_with_pages_data
-	*/
+	 * Test base case scenario
+	 *
+	 * @dataProvider category_with_pages_data
+	 */
 	public function test_category_with_pages($cat_id, $cat_name, $parent_cat_id, $parent_cat_name, $nb_links, $page = 1, $sort_days = 0)
 	{
 		$controller = $this->get_controller();

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 {
 	public function getDataSet()
 	{
-		return $this->createMySQLXMLDataSet(__DIR__ . '/fixtures/fixture_categories.xml');
+		return $this->createMySQLXMLDataSet(__DIR__.'/fixtures/fixture_categories.xml');
 	}
 
 	/**

tests/routing/categories_routing_loader_test.php

Indentation +17 added lines, -17 removed lines

@@ -13,10 +13,10 @@ 
 class categories_routing_loader_test extends \phpbb_database_test_case
 {
 	/**
-	* Define the extensions to be tested
-	*
-	* @return array vendor/name of extension(s) to test
-	*/
+	 * Define the extensions to be tested
+	 *
+	 * @return array vendor/name of extension(s) to test
+	 */
 	static protected function setup_extensions()
 	{
 		return array('ernadoo/phpbbdirectory');
@@ -50,10 +50,10 @@ 
 	}
 
 	/**
-	* Get the route collection from the categories_loader
-	*
-	* @return \Symfony\Component\Routing\RouteCollection
-	*/
+	 * Get the route collection from the categories_loader
+	 *
+	 * @return \Symfony\Component\Routing\RouteCollection
+	 */
 	public function get_categories_route_collection()
 	{
 		$collection = $this->loader->load('ernadoo_phpbbdirectory_route_controller', 'pages_extension');
@@ -65,10 +65,10 @@ 
 	}
 
 	/**
-	* Data set for test_page_loader
-	*
-	* @return array
-	*/
+	 * Data set for test_page_loader
+	 *
+	 * @return array
+	 */
 	public function page_loader_data()
 	{
 		return array(
@@ -79,11 +79,11 @@ 
 	}
 
 	/**
-	* @dataProvider page_loader_data
-	*
-	* @param int    $id       Id of a categorie
-	* @param string $expected Expected route of a categorie
-	*/
+	 * @dataProvider page_loader_data
+	 *
+	 * @param int    $id       Id of a categorie
+	 * @param string $expected Expected route of a categorie
+	 */
 	public function test_page_loader($id, $expected)
 	{
 		// Get a route instance

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
 	public function getDataSet()
 	{
-		return $this->createMySQLXMLDataSet(__DIR__ . '/fixtures/categories.xml');
+		return $this->createMySQLXMLDataSet(__DIR__.'/fixtures/categories.xml');
 	}
 
 	public function setUp()
@@ -87,7 +87,7 @@ 
 	public function test_page_loader($id, $expected)
 	{
 		// Get a route instance
-		$route = $this->collection->get('ernadoo_phpbbdirectory_dynamic_route_' . $id);
+		$route = $this->collection->get('ernadoo_phpbbdirectory_dynamic_route_'.$id);
 
 		// Assert the roue is an instance of Route
 		$this->assertInstanceOf('Symfony\Component\Routing\Route', $route, 'A route instance could not be made.');

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