satanasov / phpbbgallery

core/controller/search.php

Spacing +14 added lines, -14 removed lines

@@ -141,24 +141,24 @@ 
 
 	public function base($page = 1)
 	{
-		$search_id		= $this->request->variable('search_id', '');
+		$search_id = $this->request->variable('search_id', '');
 		$image_id		= $this->request->variable('image_id', 0);
 
-		$submit			= $this->request->variable('submit', false);
+		$submit = $this->request->variable('submit', false);
 		$keywords		= utf8_normalize_nfc($this->request->variable('keywords', '', true));
 		$add_keywords	= utf8_normalize_nfc($this->request->variable('add_keywords', '', true));
 		$username		= $this->request->variable('username', '', true);
-		$user_id		= $this->request->variable('user_id', array(0));
+		$user_id = $this->request->variable('user_id', array(0));
 		$search_terms	= $this->request->variable('terms', 'all');
 		$search_album	= $this->request->variable('aid', array(0));
 		$search_child	= $this->request->variable('sc', true);
-		$search_fields	= $this->request->variable('sf', 'all');
-		$sort_days		= $this->request->variable('st', 0);
+		$search_fields = $this->request->variable('sf', 'all');
+		$sort_days = $this->request->variable('st', 0);
 		$sort_key		= $this->request->variable('sk', 't');
 		$sort_dir		= $this->request->variable('sd', 'd');
 
-		$start 			= ($page - 1) * $this->gallery_config->get('items_per_page');
-		if ($keywords != '' && $add_keywords ='' )
+		$start = ($page - 1) * $this->gallery_config->get('items_per_page');
+		if ($keywords != '' && $add_keywords = '')
 		{
 			$submit = true;
 		}
@@ -174,7 +174,7 @@ 
 		if ($this->gallery_config->get('allow_rates'))
 		{
 			$sort_by_text['ra'] = $this->language->lang('RATING');
-			$sort_by_sql['ra'] = 'image_rate_points';//@todo: (phpbb_gallery_contest::$mode == phpbb_gallery_contest::MODE_SUM) ? 'image_rate_points' : 'image_rate_avg';
+			$sort_by_sql['ra'] = 'image_rate_points'; //@todo: (phpbb_gallery_contest::$mode == phpbb_gallery_contest::MODE_SUM) ? 'image_rate_points' : 'image_rate_avg';
 			$sort_by_text['r'] = $this->language->lang('RATES_COUNT');
 			$sort_by_sql['r'] = 'image_rates';
 		}
@@ -205,7 +205,7 @@ 
 				{
 					trigger_error(sprintf($this->language->lang('TOO_FEW_AUTHOR_CHARS'), $this->config['min_search_author_chars']));
 				}
-				$username_parsed = (strpos($username, '*') !== false) ? ' username_clean ' . $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), utf8_clean_string($this->db->sql_escape($username)))) : ' username_clean = \'' . $this->db->sql_escape(utf8_clean_string($username)) .'\'';
+				$username_parsed = (strpos($username, '*') !== false) ? ' username_clean ' . $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), utf8_clean_string($this->db->sql_escape($username)))) : ' username_clean = \'' . $this->db->sql_escape(utf8_clean_string($username)) . '\'';
 				$sql = 'SELECT user_id
 					FROM ' . USERS_TABLE . '
 					WHERE ' . $username_parsed . '
@@ -223,7 +223,7 @@ 
 
 			if (!empty($user_id))
 			{
-				$sql_where[] =  $this->db->sql_in_set('i.image_user_id', $user_id);
+				$sql_where[] = $this->db->sql_in_set('i.image_user_id', $user_id);
 			}
 			// if we search in an existing search result just add the additional keywords. But we need to use "all search terms"-mode
 			// so we can keep the old keywords in their old mode, but add the new ones as required words
@@ -236,7 +236,7 @@ 
 				else
 				{
 					$search_terms = 'all';
-					$keywords = preg_replace('#\s+#u', ' |', $keywords) . ' ' .$add_keywords;
+					$keywords = preg_replace('#\s+#u', ' |', $keywords) . ' ' . $add_keywords;
 				}
 			}
 			$keywords_ary = ($keywords) ? explode(' ', $keywords) : array();
@@ -261,7 +261,7 @@ 
 				$match_search_query = '';
 				foreach ($matches as $match)
 				{
-					$match_search_query .= (($match_search_query) ? ' OR ' : '') . 'LOWER('. $match . ') ';
+					$match_search_query .= (($match_search_query) ? ' OR ' : '') . 'LOWER(' . $match . ') ';
 					$match_search_query .= $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), $this->db->get_any_char() . mb_strtolower($word) . $this->db->get_any_char()));
 				}
 				$search_query .= ((!$search_query) ? '' : (($search_terms == 'all') ? ' AND ' : ' OR ')) . '(' . $match_search_query . ')';
@@ -290,7 +290,7 @@ 
 				trigger_error('NO_SEARCH_RESULTS');
 			}
 			$sql_array['SELECT'] = '*, a.album_name, a.album_status, a.album_user_id, a.album_id';
-			$sql_array['LEFT_JOIN']	= array(
+			$sql_array['LEFT_JOIN'] = array(
 				array(
 					'FROM'		=> array($this->albums_table => 'a'),
 					'ON'		=> 'a.album_id = i.image_album_id',
@@ -318,7 +318,7 @@ 
 			{
 				$this->image->assign_block('imageblock.image', $row, $show_options, $thumbnail_link, $imagename_link);
 			}
-			$current_page = $page*$this->gallery_config->get('items_per_page');
+			$current_page = $page * $this->gallery_config->get('items_per_page');
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(
 					'phpbbgallery_core_search',