login works; working at register

[living-lab-site.git] / application / controllers / catalog.php

diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php
index 95a6908..4570c1e 100644 (file)
--- a/application/controllers/catalog.php
+++ b/application/controllers/catalog.php
@@ -55,7 +55,9 @@ 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', NULL, TRUE);
@@ -67,23 +69,7 @@ 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, $ordering = 'hottest', $offset = 0)
@@ -116,7 +102,9 @@ class Catalog extends CI_Controller {
 //             $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'
                                                        ),
@@ -130,8 +118,7 @@ class Catalog extends CI_Controller {
                // **
                $this->load->view('html_begin', $this->html_head_params);
                $this->load->view('header', array(
-                       'search_category_name'=>$vs_data['category_name'],
-                       'search_category_title'=>$vs_data['category_title']
+                       'search_category_name'=> $vs_data['category_name']
                ));
                
 //             $main_params['content'] = $this->load->view('catalog/category_view', $data, TRUE);
@@ -146,20 +133,31 @@ class Catalog extends CI_Controller {
        
        public function search($search_query = "", $offset = 0, $category_name = NULL)
        {
+               $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', TRUE);
+               $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->input->post('search', TRUE));
+               {
+                       redirect('catalog/search/'
+                               . $this->videos_model->encode_search_query($str_post_search)
+                               . '/0'
+                               . ($str_post_category === FALSE ? '' : "/$str_post_category"));
+                       return;
+               }
 
-               $this->load->model('videos_model');
-               
                // **
                // ** LOADING MODEL
                // **
                // 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;
 
                // Category
@@ -172,14 +170,13 @@ class Catalog extends CI_Controller {
                if ($category_name !== NULL)
                {
                        $header_data['search_category_name'] = $results_data['category_name'];
-                       $header_data['search_category_title'] = $results_data['category_title'];
                }
                
                // Check if search string is valid.
-               if (strlen($search_query) < 4)
+               if (strlen($search_query) === 0)
                {
                        //$results_data['videos'] = NULL;
-                       $this->error($this->lang->line('error_search_query_too_short'),
+                       $this->error($this->lang->line('error_search_query_empty'),
                                $header_data);
                        return;
                }
@@ -207,7 +204,8 @@ class Catalog extends CI_Controller {
                }
                
                // HTML head parameters
-               $params = array(        'title' => $this->config->item('site_name'),
+               $params = array(        'title' => 'Search Results &ndash; '
+                                                               . $this->config->item('site_name'),
                                                        'css' => array(
                                                                'catalog.css'
                                                        ),
@@ -235,10 +233,11 @@ class Catalog extends CI_Controller {
        
        public function error($msg, $header_data)
        {
-               $params = array(        'title' => 'Error - '. $this->config->item('site_name'),
-                       //'css' => array(),
-                       //'js' => array(),
-                       //'metas' => array('description'=>'','keywords'=>'')
+               $params = array(        'title' => 'Error &ndash; '
+                                                               . $this->config->item('site_name'),
+                                                       //'css' => array(),
+                                                       //'js' => array(),
+                                                       //'metas' => array('description'=>'','keywords'=>'')
                );
                $this->load->library('html_head_params', $params);