@@ -1,12 +1,12 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * Search widget. Shows the search screen contents. |
|
5 | - * @package chamilo.include.search |
|
6 | - */ |
|
4 | + * Search widget. Shows the search screen contents. |
|
5 | + * @package chamilo.include.search |
|
6 | + */ |
|
7 | 7 | /** |
8 | - * Code |
|
9 | - */ |
|
8 | + * Code |
|
9 | + */ |
|
10 | 10 | require_once dirname(__FILE__) . '/IndexableChunk.class.php'; |
11 | 11 | require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; |
12 | 12 | |
@@ -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)) { |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | * @package chamilo.search |
7 | 7 | */ |
8 | 8 | |
9 | -require_once dirname(__FILE__) . '/../inc/global.inc.php'; |
|
9 | +require_once dirname(__FILE__).'/../inc/global.inc.php'; |
|
10 | 10 | |
11 | 11 | function get_suggestions_from_search_engine($q) |
12 | 12 | { |
@@ -100,14 +100,14 @@ discard block |
||
100 | 100 | // will create a copy as Yannick - Car - Speed |
101 | 101 | // in $output[3] |
102 | 102 | $c = count($output); |
103 | - for ($i=0;$i<$c; $i++) { |
|
104 | - $output[($c+$i)] = $current_field_val; |
|
103 | + for ($i = 0; $i < $c; $i++) { |
|
104 | + $output[($c + $i)] = $current_field_val; |
|
105 | 105 | } |
106 | 106 | } else { |
107 | 107 | //no identical field id, continue as usual |
108 | 108 | $c = count($output); |
109 | 109 | if ($c == 0) { |
110 | - $output[] = $row2->getValue() . ' - '; |
|
110 | + $output[] = $row2->getValue().' - '; |
|
111 | 111 | } else { |
112 | 112 | foreach ($output as $i=>$out) { |
113 | 113 | //use the latest combination of fields |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | } |
119 | 119 | } |
120 | 120 | foreach ($output as $i=>$out) { |
121 | - if (api_stristr($out,$q) === false) {continue;} |
|
121 | + if (api_stristr($out, $q) === false) {continue; } |
|
122 | 122 | $s = api_convert_encoding(substr($out, 0, -3), 'UTF-8', $charset); |
123 | - if (!in_array($s,$more_sugg)) { |
|
123 | + if (!in_array($s, $more_sugg)) { |
|
124 | 124 | $more_sugg[] = $s; |
125 | 125 | $json[] = [ |
126 | 126 | 'id' => $s, |