@@ -591,13 +591,13 @@ |
||
591 | 591 | |
592 | 592 | } |
593 | 593 | |
594 | - /** |
|
595 | - * Add a tab to platform |
|
596 | - * @param string $tabName |
|
597 | - * @param string $url |
|
598 | - * |
|
599 | - * @return boolean |
|
600 | - */ |
|
594 | + /** |
|
595 | + * Add a tab to platform |
|
596 | + * @param string $tabName |
|
597 | + * @param string $url |
|
598 | + * |
|
599 | + * @return boolean |
|
600 | + */ |
|
601 | 601 | public function addTab($tabName, $url) |
602 | 602 | { |
603 | 603 | $sql = "SELECT * FROM settings_current |
@@ -1679,7 +1679,7 @@ discard block |
||
1679 | 1679 | |
1680 | 1680 | // We get the coach for the given course in a given session. |
1681 | 1681 | $sql = 'SELECT user_id FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) . |
1682 | - ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2'; |
|
1682 | + ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2'; |
|
1683 | 1683 | $rs = Database::query($sql); |
1684 | 1684 | while ($user = Database::fetch_array($rs)) { |
1685 | 1685 | $user_info = api_get_user_info($user['user_id']); |
@@ -3972,7 +3972,7 @@ discard block |
||
3972 | 3972 | } |
3973 | 3973 | |
3974 | 3974 | $session_title .= isset($course['special_course']) ? ' ' . |
3975 | - Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : ''; |
|
3975 | + Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : ''; |
|
3976 | 3976 | |
3977 | 3977 | $params['title'] = $session_title; |
3978 | 3978 | $params['extra'] = ''; |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * Definition of the Accessurleditcoursestourl class |
|
5 | - * @package chamilo.library |
|
6 | - */ |
|
4 | + * Definition of the Accessurleditcoursestourl class |
|
5 | + * @package chamilo.library |
|
6 | + */ |
|
7 | 7 | |
8 | 8 | /** |
9 | 9 | * Access_url_edit_courses_to_url class |
@@ -38,17 +38,17 @@ discard block |
||
38 | 38 | $needle = Database::escape_string($needle); |
39 | 39 | // search courses where username or firstname or lastname begins likes $needle |
40 | 40 | $sql = 'SELECT code, title FROM '.$tbl_course.' u '. |
41 | - ' WHERE (title LIKE "'.$needle.'%" '. |
|
42 | - ' OR code LIKE "'.$needle.'%" '. |
|
43 | - ' ) '. |
|
44 | - ' ORDER BY title, code '. |
|
45 | - ' LIMIT 11'; |
|
41 | + ' WHERE (title LIKE "'.$needle.'%" '. |
|
42 | + ' OR code LIKE "'.$needle.'%" '. |
|
43 | + ' ) '. |
|
44 | + ' ORDER BY title, code '. |
|
45 | + ' LIMIT 11'; |
|
46 | 46 | $rs = Database::query($sql); |
47 | 47 | $i=0; |
48 | 48 | while ($course = Database :: fetch_array($rs)) { |
49 | 49 | $i++; |
50 | 50 | if ($i<=10) { |
51 | - $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />'; |
|
51 | + $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />'; |
|
52 | 52 | } else { |
53 | 53 | $return .= '...<br />'; |
54 | 54 | } |
@@ -510,7 +510,7 @@ discard block |
||
510 | 510 | if ($course_visibility != COURSE_VISIBILITY_HIDDEN && |
511 | 511 | ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER) |
512 | 512 | ) { |
513 | - $result .= '<span class="title">' . $course_title . '<span>'; |
|
513 | + $result .= '<span class="title">' . $course_title . '<span>'; |
|
514 | 514 | } else { |
515 | 515 | $result .= $course_title." "." ".get_lang('CourseClosed').""; |
516 | 516 | } |
@@ -1414,7 +1414,7 @@ discard block |
||
1414 | 1414 | } |
1415 | 1415 | $media .= '<div class="user-image">'; |
1416 | 1416 | $media .= '<a href="'.$url.'" ><img src="'. $users[$userIdLoop]['avatar'] . |
1417 | - '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>'; |
|
1417 | + '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>'; |
|
1418 | 1418 | $media .= '</div>'; |
1419 | 1419 | $media .= '<div class="user-data">'; |
1420 | 1420 | $media .= '<div class="username">' . '<a href="'.$url.'">'.$nameComplete.'</a></div>'; |
@@ -1645,10 +1645,10 @@ discard block |
||
1645 | 1645 | return $name; |
1646 | 1646 | } |
1647 | 1647 | /** |
1648 | - * Delete messages delete logic |
|
1649 | - * @param int $id id message to delete. |
|
1650 | - * @return bool status query |
|
1651 | - */ |
|
1648 | + * Delete messages delete logic |
|
1649 | + * @param int $id id message to delete. |
|
1650 | + * @return bool status query |
|
1651 | + */ |
|
1652 | 1652 | public static function deleteMessage($id) |
1653 | 1653 | { |
1654 | 1654 | $id = intval($id); |
@@ -1532,7 +1532,7 @@ |
||
1532 | 1532 | |
1533 | 1533 | if (isset($_REQUEST['action'])) { |
1534 | 1534 | switch ($_REQUEST['action']) { |
1535 | - case 'mark_as_unread' : |
|
1535 | + case 'mark_as_unread' : |
|
1536 | 1536 | $number_of_selected_messages = count($_POST['id']); |
1537 | 1537 | if (is_array($_POST['id'])) { |
1538 | 1538 | foreach ($_POST['id'] as $index => $message_id) { |
@@ -33,11 +33,11 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | /** |
36 | - * This function is for editing profile info from profile_id. |
|
37 | - * @param int $profileId |
|
38 | - * @param string $name |
|
39 | - * @param string $description |
|
40 | - */ |
|
36 | + * This function is for editing profile info from profile_id. |
|
37 | + * @param int $profileId |
|
38 | + * @param string $name |
|
39 | + * @param string $description |
|
40 | + */ |
|
41 | 41 | public function updateProfileInfo($profileId, $name, $description) |
42 | 42 | { |
43 | 43 | $profileId = intval($profileId); |
@@ -128,9 +128,9 @@ discard block |
||
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
131 | - * This function is for getting profile info from profile_id. |
|
132 | - * @param int $profileId |
|
133 | - */ |
|
131 | + * This function is for getting profile info from profile_id. |
|
132 | + * @param int $profileId |
|
133 | + */ |
|
134 | 134 | |
135 | 135 | public function getProfileInfo($profileId) |
136 | 136 | { |
@@ -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)) { |
@@ -1,12 +1,12 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /* For licensing terms, see /license.txt */ |
3 | 3 | /** |
4 | - * Script defining generic functions against a search engine api. Just only if one day the search engine changes |
|
5 | - * @package chamilo.include.search |
|
6 | - */ |
|
4 | + * Script defining generic functions against a search engine api. Just only if one day the search engine changes |
|
5 | + * @package chamilo.include.search |
|
6 | + */ |
|
7 | 7 | /** |
8 | - * Code |
|
9 | - */ |
|
8 | + * Code |
|
9 | + */ |
|
10 | 10 | require 'xapian/XapianQuery.php'; |
11 | 11 | |
12 | 12 | /** |
@@ -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 | } |
@@ -150,7 +150,7 @@ |
||
150 | 150 | $data = substr($png,$ipos,$chunk['size']); |
151 | 151 | $sections = explode("\0", $data); |
152 | 152 | if ($sections[0] == $key) { |
153 | - return $sections; |
|
153 | + return $sections; |
|
154 | 154 | } |
155 | 155 | } |
156 | 156 | // Extract the data and the CRC |