ErnadoO / ext-phpbb-directory

controller/search.php

Spacing +25 added lines, -25 removed lines

@@ -63,17 +63,17 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \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->db = $db;
 		$this->config		= $config;
-		$this->template		= $template;
+		$this->template = $template;
 		$this->user			= $user;
 		$this->helper		= $helper;
-		$this->request		= $request;
+		$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;
 
 		$this->user->add_lang_ext('ernadoo/phpbbdirectory', array('directory'));
 		$this->user->add_lang('search');
@@ -98,24 +98,24 @@ 
 			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);
 
 		// Categorie ordering options
 		$limit_days		= array(0 => $this->user->lang['ALL_RESULTS'], 1 => $this->user->lang['1_DAY'], 7 => $this->user->lang['7_DAYS'], 14 => $this->user->lang['2_WEEKS'], 30 => $this->user->lang['1_MONTH'], 90 => $this->user->lang['3_MONTHS'], 180 => $this->user->lang['6_MONTHS'], 365 => $this->user->lang['1_YEAR']);
-		$sort_by_text	= array('a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->lang['DIR_NB_CLICKS_ORDER']);
+		$sort_by_text = array('a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->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'])
@@ -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',
@@ -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(
@@ -322,7 +322,7 @@ 
 	private function _get_exclude_categories(&$search_category, $search_child)
 	{
 		$sql = 'SELECT cat_id, parent_id, right_id
-				FROM ' . DIR_CAT_TABLE . '
+				FROM ' . DIR_CAT_TABLE.'
 				ORDER BY left_id';
 		$result = $this->db->sql_query($sql);