X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fcontrollers%2Fcatalog.php;h=4570c1e6ee6467354ca8692d483113b68343b4a8;hb=93de016032e54b45db35f18d8538fd5b11a7c72e;hp=816be74fcf361bbf662aa14ed6f88123d22e20e6;hpb=e788f88e8475e9c87eef355c71abed3c329c4c0b;p=living-lab-site.git

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index 816be74..4570c1e 100644
--- a/application/controllers/catalog.php
+++ b/application/controllers/catalog.php
@@ -55,10 +55,12 @@ class Catalog extends CI_Controller {
 		// ** LOADING VIEWS
 		// **
 		$this->load->view('html_begin', $this->html_head_params);
-		$this->load->view('header', array('selected_menu' => 'home'));
+		$this->load->view('header', array(
+			'selected_menu'=> 'home'
+		));
 		
 		$main_params['content'] = $this->load->view('catalog/index_view', $data, TRUE);
-		$main_params['side'] = $this->load->view('side_default.php', NULL, TRUE);
+		$main_params['side'] = $this->load->view('side_default', NULL, TRUE);
 		$this->load->view('main', $main_params);
 		
 		$this->load->view('footer');
@@ -67,59 +69,42 @@ class Catalog extends CI_Controller {
 	
 	public function test($page = 0)
 	{
-		$params = array(	'title' => 'Test - '. $this->config->item('site_name'),
-							//'css' => array(),
-							//'js' => array(),
-							//'metas' => array('description'=>'','keywords'=>'')
-			);
-		$this->load->library('html_head_params', $params);
-		
-		// **
-		// ** LOADING VIEWS
-		// **
-		$this->load->view('html_begin', $this->html_head_params);
-		$this->load->view('header', array('selected_menu' => 'home'));
-		
-		$this->load->view('echo', array('output'=>'Test Page', 'clear'=>TRUE));
-		
-		$this->load->view('footer');
-		$this->load->view('html_end');
+		echo $this->uri->segment(1);
 	}
 	
-	public function category($category_name, $offset = 0)
+	public function category($category_name, $ordering = 'hottest', $offset = 0)
 	{
 		// **
 		// ** LOADING MODEL
 		// **
 		// Video Category
-		$categories = $this->config->item('categories');
-		$category_id = array_search($category_name, $categories);
-		$vs_data['category_name'] = $category_name;
-		$vs_data['category_id'] = $category_id;
-		$vs_data['category_title'] = $category_name ?
-		$this->lang->line("ui_categ_$category_name") : $category_name;		
+		$vs_data = $this->_get_category_data($category_name);
 		
 		// Retrieve videos summary.
 		$this->load->model('videos_model');
 		$vs_data['videos'] = $this->videos_model->get_videos_summary(
 			$vs_data['category_id'], intval($offset),
-			$this->config->item('videos_per_page'));
+			$this->config->item('videos_per_page'), $ordering);
+		
+		$vs_data['ordering'] = $ordering;
 		
 		// Pagination
 		$this->load->library('pagination');
-		$pg_config['base_url'] = site_url("catalog/category/$category_name/");
-		$pg_config['uri_segment'] = 4;
+		$pg_config['base_url'] = site_url("catalog/category/$category_name/$ordering/");
+		$pg_config['uri_segment'] = 5;
 		$pg_config['total_rows'] = $this->videos_model->get_videos_count(
-			$category_id);
+			$vs_data['category_id']);
 		$pg_config['per_page'] = $this->config->item('videos_per_page');
 		$this->pagination->initialize($pg_config);
 		$vs_data['pagination'] = $this->pagination->create_links();
 		
 		// Video Summary
-		$data['video_summary'] = $this->load->view('catalog/videos_summary_view',
-			$vs_data, TRUE);
+// 		$data['video_summary'] = $this->load->view('catalog/videos_summary_view',
+// 			$vs_data, TRUE);
 		
-		$params = array(	'title' => $this->config->item('site_name'),
+		$params = array(	'title' =>
+								$vs_data['category_title'].' – '
+									. $this->config->item('site_name'),
 							'css' => array(
 								'catalog.css'
 							),
@@ -132,44 +117,95 @@ class Catalog extends CI_Controller {
 		// ** LOADING VIEWS
 		// **
 		$this->load->view('html_begin', $this->html_head_params);
-		$this->load->view('header');
+		$this->load->view('header', array(
+			'search_category_name'=> $vs_data['category_name']
+		));
 		
-		$main_params['content'] = $this->load->view('catalog/category_view', $data, TRUE);
-		$main_params['side'] = $this->load->view('side_default.php', NULL, TRUE);
+// 		$main_params['content'] = $this->load->view('catalog/category_view', $data, TRUE);
+		$main_params['content'] = 
+			$this->load->view('catalog/videos_summary_view', $vs_data, TRUE);
+		$main_params['side'] = $this->load->view('side_default', NULL, TRUE);
 		$this->load->view('main', $main_params);
 		
 		$this->load->view('footer');
 		$this->load->view('html_end');
 	}
 	
-	public function search($str_search = "")
+	public function search($search_query = "", $offset = 0, $category_name = NULL)
 	{
-		// TODO get query string from URL.
-		if ($str_search === "") 
-			redirect('catalog/search/'. $this->input->post('search', TRUE));
+		$this->load->model('videos_model');
+		$this->load->library('security');
+		
+		// Redirect to an URL which contains search string if data was passed
+		// via POST method and not via URL segments.
+		$str_post_search = $this->input->post('search');
+		$str_post_category = $this->input->post('search-category');
+		if ($search_query === "" && $str_post_search !== FALSE) 
+		{
+			redirect('catalog/search/'
+				. $this->videos_model->encode_search_query($str_post_search)
+				. '/0'
+				. ($str_post_category === FALSE ? '' : "/$str_post_category"));
+			return;
+		}
 
 		// **
 		// ** LOADING MODEL
 		// **
-		// Video Category
-		// TODO
-		$vs_data['category_name'] = "";
-		$vs_data['category_title'] = "Search Results for «$str_search»";
-
-		// Retrieve videos summary.
-		$this->load->model('videos_model');
-		$vs_data['videos'] = $this->videos_model->search_videos(
-			$str_search);
-		if ($vs_data['videos'] === NULL)
-			$vs_data['videos'] = array();
+		// Search query is encoded for URL and must be decoded.
+		$enc_search_query = $search_query;
+		$search_query = $this->videos_model->decode_search_query($search_query);
+		
+		// Security filtering
+		$search_query = $this->security->xss_clean($search_query);
+		$results_data['search_query'] = $search_query;
 
-		$vs_data['pagination'] = '';
+		// Category
+		$results_data = $this->_get_category_data($category_name);
+		if ($results_data === NULL)
+			$results_data = array('category_id'=>NULL);
 		
-		// Video Summary
-		$data['video_summary'] = $this->load->view('catalog/videos_summary_view',
-			$vs_data, TRUE);
+		// Page header data
+		$header_data['search_query'] = $search_query;
+		if ($category_name !== NULL)
+		{
+			$header_data['search_category_name'] = $results_data['category_name'];
+		}
 		
-		$params = array(	'title' => $this->config->item('site_name'),
+		// Check if search string is valid.
+		if (strlen($search_query) === 0)
+		{
+			//$results_data['videos'] = NULL;
+			$this->error($this->lang->line('error_search_query_empty'),
+				$header_data);
+			return;
+		}
+		else
+		{
+			// Retrieve search results.
+			$results_data['count'] = $this->videos_model->search_videos(
+				$search_query, 0, 0, $results_data['category_id']);
+			$results_data['videos'] = $this->videos_model->search_videos(
+				$search_query, intval($offset),
+				$this->config->item('search_results_per_page'),
+				$results_data['category_id']);
+			if ($results_data['videos'] === NULL)
+				$results_data['videos'] = array();
+	
+			// Pagination
+			$this->load->library('pagination');
+			$pg_config['base_url'] = site_url("catalog/search/$enc_search_query/");
+			$pg_config['uri_segment'] = 4;
+			$pg_config['total_rows'] = $results_data['count'];
+			$pg_config['per_page'] =
+				$this->config->item('search_results_per_page');
+			$this->pagination->initialize($pg_config);
+			$results_data['pagination'] = $this->pagination->create_links();
+		}
+		
+		// HTML head parameters
+		$params = array(	'title' => 'Search Results – '
+								. $this->config->item('site_name'),
 							'css' => array(
 								'catalog.css'
 							),
@@ -182,16 +218,57 @@ class Catalog extends CI_Controller {
 		// ** LOADING VIEWS
 		// **
 		$this->load->view('html_begin', $this->html_head_params);
-		$this->load->view('header');
+		$this->load->view('header', $header_data);
 		
-		$main_params['content'] = $this->load->view('catalog/category_view', $data, TRUE);
-		$main_params['side'] = $this->load->view('side_default.php', NULL, TRUE);
+		// Search Results
+		$main_params['content'] = 
+			$this->load->view('catalog/search_results_view',
+				$results_data, TRUE);
+		$main_params['side'] = $this->load->view('side_default', NULL, TRUE);
+		$this->load->view('main', $main_params);
+		
+		$this->load->view('footer');
+		$this->load->view('html_end');
+	}
+	
+	public function error($msg, $header_data)
+	{
+		$params = array(	'title' => 'Error – '
+								. $this->config->item('site_name'),
+							//'css' => array(),
+							//'js' => array(),
+							//'metas' => array('description'=>'','keywords'=>'')
+		);
+		$this->load->library('html_head_params', $params);
+		
+		// **
+		// ** LOADING VIEWS
+		// **
+		$this->load->view('html_begin', $this->html_head_params);
+		$this->load->view('header', $header_data);
+		
+		$main_params['content'] = $this->load->view('error_view', array('msg'=>$msg), TRUE);
+		$main_params['side'] = $this->load->view('side_default', NULL, TRUE);
 		$this->load->view('main', $main_params);
 		
 		$this->load->view('footer');
 		$this->load->view('html_end');
-
 	}
+	
+	public function _get_category_data($category_name)
+	{
+		if ($category_name === NULL)
+			return NULL;
+		
+		$categories = $this->config->item('categories');
+		$category_id = array_search($category_name, $categories);
+		$results_data['category_name'] = $category_name;
+		$results_data['category_id'] = $category_id;
+		$results_data['category_title'] = $category_name ?
+			$this->lang->line("ui_categ_$category_name") : $category_name;
+		
+		return $results_data;
+	} 
 }
 
 /* End of file catalog.php */