@@ -2,7 +2,7 @@ |
||
2 | 2 | // $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $ |
3 | 3 | |
4 | 4 | return array( |
5 | - 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
|
5 | + 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
|
6 | 6 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
7 | 7 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
8 | 8 | NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K', |
@@ -2,7 +2,7 @@ |
||
2 | 2 | // $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $ |
3 | 3 | |
4 | 4 | return array( |
5 | - 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
|
5 | + 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
|
6 | 6 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
7 | 7 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
8 | 8 | NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K', |
@@ -2,7 +2,7 @@ |
||
2 | 2 | // $Id: xfd.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $ |
3 | 3 | |
4 | 4 | return array( |
5 | - 'en' => array('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
|
5 | + 'en' => array('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
|
6 | 6 | '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
7 | 7 | '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
8 | 8 | '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
@@ -2,7 +2,7 @@ |
||
2 | 2 | // $Id: xfd.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $ |
3 | 3 | |
4 | 4 | return array( |
5 | - 'en' => array('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
|
5 | + 'en' => array('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
|
6 | 6 | '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
7 | 7 | '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
8 | 8 | '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
@@ -2,7 +2,7 @@ |
||
2 | 2 | // $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $ |
3 | 3 | |
4 | 4 | return array( |
5 | - 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
|
5 | + 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
|
6 | 6 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
7 | 7 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
8 | 8 | NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K', |
@@ -2,7 +2,7 @@ |
||
2 | 2 | // $Id: xfd.php,v 1.1.8.1 2008/06/12 20:34:32 smk Exp $ |
3 | 3 | |
4 | 4 | return array( |
5 | - 'en' => array('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
|
5 | + 'en' => array('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
|
6 | 6 | '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
7 | 7 | '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
8 | 8 | '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', |
@@ -2,7 +2,7 @@ |
||
2 | 2 | // $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $ |
3 | 3 | |
4 | 4 | return array( |
5 | - 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
|
5 | + 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
|
6 | 6 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
7 | 7 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
8 | 8 | NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K', |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * Get one term html select |
31 | 31 | */ |
32 | 32 | function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr='size="7" class="sf-select-multiple"') { |
33 | - global $charset; |
|
33 | + global $charset; |
|
34 | 34 | $multiple_select = '<select '. $extra_select_attr .' title="'. $prefix .'" id="sf-'. $prefix .'" name="sf_'. $prefix .'[]">'; |
35 | 35 | |
36 | 36 | $all_selected = ''; |
@@ -119,20 +119,20 @@ discard block |
||
119 | 119 | * could not send a form in pagination |
120 | 120 | */ |
121 | 121 | |
122 | - if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
123 | - $action='index.php'; |
|
124 | - } |
|
125 | - $navigator_info = api_get_navigator(); |
|
122 | + if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
123 | + $action='index.php'; |
|
124 | + } |
|
125 | + $navigator_info = api_get_navigator(); |
|
126 | 126 | |
127 | - if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { |
|
128 | - $submit_button1 = '<input type="submit" id="submit" value="'. get_lang('Search') .'" />'; |
|
129 | - $submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />'; |
|
127 | + if ($navigator_info['name']=='Internet Explorer' && $navigator_info['version']=='6') { |
|
128 | + $submit_button1 = '<input type="submit" id="submit" value="'. get_lang('Search') .'" />'; |
|
129 | + $submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />'; |
|
130 | 130 | $reset_button = '<input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'; |
131 | - } else { |
|
132 | - $submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>'; |
|
133 | - $submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>'; |
|
131 | + } else { |
|
132 | + $submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>'; |
|
133 | + $submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>'; |
|
134 | 134 | $reset_button = '<button class="save" type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'. get_lang('SearchResetKeywords') .'</button> '; |
135 | - } |
|
135 | + } |
|
136 | 136 | |
137 | 137 | $form = '<form id="chamilo_search" action="'. $action .'" method="GET"> |
138 | 138 | <input type="text" id="query" name="query" size="40" value="'.stripslashes(Security::remove_XSS($_REQUEST['query'])).'" /> |
@@ -197,9 +197,9 @@ discard block |
||
197 | 197 | * SortableTableFromArray pagination is done with simple links, so now we |
198 | 198 | * could not send a form in pagination |
199 | 199 | */ |
200 | - if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
201 | - $action='index.php'; |
|
202 | - } |
|
200 | + if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) { |
|
201 | + $action='index.php'; |
|
202 | + } |
|
203 | 203 | |
204 | 204 | $form = ' |
205 | 205 | <form id="chamilo_search" action="'. $action .'" method="GET"> |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | </table> |
265 | 265 | </div>'; |
266 | 266 | } |
267 | - $form .= ' |
|
267 | + $form .= ' |
|
268 | 268 | </form> |
269 | 269 | <br style="clear: both;"/>'; |
270 | 270 | |
@@ -322,10 +322,10 @@ discard block |
||
322 | 322 | foreach ($specific_fields as $specific_field) { |
323 | 323 | $temp = array(); |
324 | 324 | if (is_array($dkterms) && count($dkterms)>0) { |
325 | - foreach($dkterms[1] as $obj) { |
|
326 | - $temp = array_merge($obj['sf-'.$specific_field['code']], $temp); |
|
327 | - } |
|
328 | - } |
|
325 | + foreach($dkterms[1] as $obj) { |
|
326 | + $temp = array_merge($obj['sf-'.$specific_field['code']], $temp); |
|
327 | + } |
|
328 | + } |
|
329 | 329 | $sf_terms[$specific_field['code']] = $temp; |
330 | 330 | $url_params[] = 'sf_'.$specific_field['code']; |
331 | 331 | unset($temp); |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | } |
341 | 341 | echo '<h2>'.get_lang('Search').'</h2>'; |
342 | 342 | |
343 | - // Tool introduction |
|
343 | + // Tool introduction |
|
344 | 344 | // TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here. |
345 | 345 | if (api_get_course_id() !== -1) |
346 | 346 | if (!empty($groupId)) { |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param string $query_string The term string |
34 | 34 | */ |
35 | 35 | function chamilo_get_boolean_query($term) { |
36 | - return xapian_get_boolean_query($term); |
|
36 | + return xapian_get_boolean_query($term); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -44,22 +44,22 @@ discard block |
||
44 | 44 | $results_by_tool = array(); |
45 | 45 | if (count($results)>0) { |
46 | 46 | |
47 | - foreach ($results as $key => $row) { |
|
48 | - $results_by_tool[$row['toolid']][] = $row; |
|
49 | - } |
|
47 | + foreach ($results as $key => $row) { |
|
48 | + $results_by_tool[$row['toolid']][] = $row; |
|
49 | + } |
|
50 | 50 | |
51 | - $processed_results = array(); |
|
52 | - foreach ($results_by_tool as $toolid => $rows) { |
|
53 | - $tool_processor_class = $toolid .'_processor'; |
|
54 | - $tool_processor_path = api_get_path(LIBRARY_PATH) .'search/tool_processors/'. $tool_processor_class .'.class.php'; |
|
55 | - if (file_exists($tool_processor_path)) { |
|
56 | - require_once($tool_processor_path); |
|
57 | - $tool_processor = new $tool_processor_class($rows); |
|
58 | - $processed_results = array_merge($tool_processor->process(), $processed_results); |
|
59 | - } |
|
60 | - } |
|
51 | + $processed_results = array(); |
|
52 | + foreach ($results_by_tool as $toolid => $rows) { |
|
53 | + $tool_processor_class = $toolid .'_processor'; |
|
54 | + $tool_processor_path = api_get_path(LIBRARY_PATH) .'search/tool_processors/'. $tool_processor_class .'.class.php'; |
|
55 | + if (file_exists($tool_processor_path)) { |
|
56 | + require_once($tool_processor_path); |
|
57 | + $tool_processor = new $tool_processor_class($rows); |
|
58 | + $processed_results = array_merge($tool_processor->process(), $processed_results); |
|
59 | + } |
|
60 | + } |
|
61 | 61 | |
62 | - return array(count($processed_results), $processed_results); |
|
62 | + return array(count($processed_results), $processed_results); |
|
63 | 63 | } |
64 | 64 | } |
65 | 65 | |
@@ -72,5 +72,5 @@ discard block |
||
72 | 72 | * @return XapianQuery query joined |
73 | 73 | */ |
74 | 74 | function chamilo_join_queries($query1, $query2=NULL, $op='or') { |
75 | - return xapian_join_queries($query1, $query2, $op); |
|
75 | + return xapian_join_queries($query1, $query2, $op); |
|
76 | 76 | } |