@@ -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 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | $actions = array('listing', 'store_user_block', 'disable_block'); |
27 | 27 | $action = 'listing'; |
28 | 28 | if (isset($_GET['action']) && in_array($_GET['action'],$actions)) { |
29 | - $action = $_GET['action']; |
|
29 | + $action = $_GET['action']; |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | // load styles from dashboard plugins |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | $dashboard_controller = new DashboardController(); |
38 | 38 | |
39 | 39 | if (isset($_GET['path'])) { |
40 | - $path = $_GET['path']; |
|
40 | + $path = $_GET['path']; |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | // distpacher actions to controller |
@@ -21,17 +21,17 @@ |
||
21 | 21 | |
22 | 22 | if ($ldap_login_success) |
23 | 23 | { |
24 | - //error_log('Found user '.$login.' on LDAP server',0); |
|
25 | - /* |
|
24 | + //error_log('Found user '.$login.' on LDAP server',0); |
|
25 | + /* |
|
26 | 26 | In here, we know that |
27 | 27 | - the user does not exist in dokeos |
28 | 28 | - the users login and password are correct |
29 | 29 | */ |
30 | - $info_array = ldap_find_user_info($login); |
|
31 | - ldap_put_user_info_locally($login, $info_array); |
|
30 | + $info_array = ldap_find_user_info($login); |
|
31 | + ldap_put_user_info_locally($login, $info_array); |
|
32 | 32 | } else { |
33 | 33 | //error_log('Could not find '.$login.' on LDAP server',0); |
34 | - $loginFailed = true; |
|
35 | - unset($_user['user_id']); |
|
36 | - $uidReset = false; |
|
34 | + $loginFailed = true; |
|
35 | + unset($_user['user_id']); |
|
36 | + $uidReset = false; |
|
37 | 37 | } |
@@ -20,16 +20,16 @@ |
||
20 | 20 | $users = Database::get_main_table(TABLE_MAIN_USER); |
21 | 21 | $string=''; |
22 | 22 | foreach ($list as $mail) { |
23 | - $mail = trim($mail); |
|
24 | - $sql = "SELECT user_id, official_code, firstname, lastname, email FROM $users WHERE email = '$mail'\n"; |
|
25 | - $res = Database::query($sql); |
|
26 | - if ($res === false) { die(mysql_error());} |
|
27 | - if (Database::num_rows($res) == 0) { |
|
23 | + $mail = trim($mail); |
|
24 | + $sql = "SELECT user_id, official_code, firstname, lastname, email FROM $users WHERE email = '$mail'\n"; |
|
25 | + $res = Database::query($sql); |
|
26 | + if ($res === false) { die(mysql_error());} |
|
27 | + if (Database::num_rows($res) == 0) { |
|
28 | 28 | $string .= 'No encontrado;'.$row['email']; |
29 | - } else { |
|
29 | + } else { |
|
30 | 30 | $row = Database::fetch_assoc($res); |
31 | - $string .= $row['user_id'].';'.$row['email'].';'.$row['firstname'].';'.$row['lastname'].';'.$row['official_code']."\r\n"; |
|
32 | - } |
|
31 | + $string .= $row['user_id'].';'.$row['email'].';'.$row['firstname'].';'.$row['lastname'].';'.$row['official_code']."\r\n"; |
|
32 | + } |
|
33 | 33 | } |
34 | 34 | echo $string; |
35 | 35 | file_put_contents('/tmp/list.txt',$string); |
@@ -29,20 +29,20 @@ discard block |
||
29 | 29 | global $_configuration; |
30 | 30 | |
31 | 31 | if (api_is_multiple_url_enabled()) { |
32 | - $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
|
33 | - $access_url_id = api_get_current_access_url_id(); |
|
34 | - if ($access_url_id != -1){ |
|
35 | - $sql = "SELECT code,visual_code,title |
|
32 | + $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
|
33 | + $access_url_id = api_get_current_access_url_id(); |
|
34 | + if ($access_url_id != -1){ |
|
35 | + $sql = "SELECT code,visual_code,title |
|
36 | 36 | FROM $course_table as c |
37 | 37 | INNER JOIN $tbl_course_rel_access_url as course_rel_url |
38 | 38 | ON (c.id = course_rel_url.c_id) |
39 | 39 | WHERE access_url_id = $access_url_id |
40 | 40 | ORDER BY visual_code"; |
41 | - } |
|
41 | + } |
|
42 | 42 | } |
43 | 43 | $result = Database::query($sql); |
44 | 44 | while ($course = Database::fetch_object($result)) { |
45 | - $courses[$course->code] = $course->visual_code.' - '.$course->title; |
|
45 | + $courses[$course->code] = $course->visual_code.' - '.$course->title; |
|
46 | 46 | } |
47 | 47 | $form = new FormValidator('export_users'); |
48 | 48 | $form->addElement('header', $tool_name); |
@@ -56,13 +56,13 @@ discard block |
||
56 | 56 | $form->setDefaults(array('file_type' => 'csv')); |
57 | 57 | |
58 | 58 | if ($form->validate()) { |
59 | - $export = $form->exportValues(); |
|
60 | - $file_type = $export['file_type']; |
|
61 | - $course_code = Database::escape_string($export['course_code']); |
|
62 | - $courseInfo = api_get_course_info($course_code); |
|
63 | - $courseId = $courseInfo['real_id']; |
|
59 | + $export = $form->exportValues(); |
|
60 | + $file_type = $export['file_type']; |
|
61 | + $course_code = Database::escape_string($export['course_code']); |
|
62 | + $courseInfo = api_get_course_info($course_code); |
|
63 | + $courseId = $courseInfo['real_id']; |
|
64 | 64 | |
65 | - $sql = "SELECT |
|
65 | + $sql = "SELECT |
|
66 | 66 | u.user_id AS UserId, |
67 | 67 | u.lastname AS LastName, |
68 | 68 | u.firstname AS FirstName, |
@@ -73,96 +73,96 @@ discard block |
||
73 | 73 | u.status AS Status, |
74 | 74 | u.official_code AS OfficialCode, |
75 | 75 | u.phone AS Phone"; |
76 | - if (strlen($course_code) > 0) { |
|
77 | - $sql .= " FROM $user_table u, $course_user_table cu |
|
76 | + if (strlen($course_code) > 0) { |
|
77 | + $sql .= " FROM $user_table u, $course_user_table cu |
|
78 | 78 | WHERE |
79 | 79 | u.user_id = cu.user_id AND |
80 | 80 | cu.c_id = $courseId AND |
81 | 81 | cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." |
82 | 82 | ORDER BY lastname,firstname"; |
83 | - $filename = 'export_users_'.$course_code.'_'.api_get_local_time(); |
|
84 | - } else { |
|
85 | - if (api_is_multiple_url_enabled()) { |
|
86 | - $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
87 | - $access_url_id = api_get_current_access_url_id(); |
|
88 | - if ($access_url_id != -1) { |
|
89 | - $sql.= " FROM $user_table u |
|
83 | + $filename = 'export_users_'.$course_code.'_'.api_get_local_time(); |
|
84 | + } else { |
|
85 | + if (api_is_multiple_url_enabled()) { |
|
86 | + $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
87 | + $access_url_id = api_get_current_access_url_id(); |
|
88 | + if ($access_url_id != -1) { |
|
89 | + $sql.= " FROM $user_table u |
|
90 | 90 | INNER JOIN $tbl_user_rel_access_url as user_rel_url |
91 | 91 | ON (u.user_id= user_rel_url.user_id) |
92 | 92 | WHERE access_url_id = $access_url_id |
93 | 93 | ORDER BY lastname,firstname"; |
94 | - } |
|
95 | - } else { |
|
96 | - $sql .= " FROM $user_table u ORDER BY lastname,firstname"; |
|
97 | - } |
|
98 | - $filename = 'export_users_'.api_get_local_time(); |
|
99 | - } |
|
100 | - $data = array(); |
|
101 | - $extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false); |
|
102 | - if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') { |
|
103 | - if ($_configuration['password_encryption'] != 'none') { |
|
104 | - $data[] = array( |
|
105 | - 'UserId', |
|
106 | - 'LastName', |
|
107 | - 'FirstName', |
|
108 | - 'Email', |
|
109 | - 'UserName', |
|
110 | - 'AuthSource', |
|
111 | - 'Status', |
|
112 | - 'OfficialCode', |
|
113 | - 'PhoneNumber', |
|
114 | - ); |
|
115 | - } else { |
|
116 | - $data[] = array( |
|
117 | - 'UserId', |
|
118 | - 'LastName', |
|
119 | - 'FirstName', |
|
120 | - 'Email', |
|
121 | - 'UserName', |
|
122 | - 'Password', |
|
123 | - 'AuthSource', |
|
124 | - 'Status', |
|
125 | - 'OfficialCode', |
|
126 | - 'PhoneNumber', |
|
127 | - ); |
|
128 | - } |
|
129 | - |
|
130 | - foreach($extra_fields as $extra) { |
|
131 | - $data[0][]=$extra[1]; |
|
132 | - } |
|
133 | - } |
|
134 | - |
|
135 | - $res = Database::query($sql); |
|
136 | - while($user = Database::fetch_array($res,'ASSOC')) { |
|
137 | - $student_data = UserManager:: get_extra_user_data( |
|
138 | - $user['UserId'], |
|
139 | - true, |
|
140 | - false |
|
141 | - ); |
|
142 | - foreach($student_data as $key=>$value) { |
|
143 | - $key = substr($key, 6); |
|
144 | - if (is_array($value)) { |
|
145 | - $user[$key] = $value[$key]; |
|
146 | - } else { |
|
147 | - $user[$key] = $value; |
|
148 | - } |
|
149 | - } |
|
150 | - $data[] = $user ; |
|
151 | - } |
|
152 | - |
|
153 | - switch ($file_type) { |
|
154 | - case 'xml': |
|
155 | - Export::arrayToXml($data, $filename, 'Contact', 'Contacts'); |
|
156 | - exit; |
|
157 | - break; |
|
158 | - case 'csv': |
|
159 | - Export::arrayToCsv($data, $filename); |
|
160 | - exit; |
|
161 | - case 'xls': |
|
162 | - Export::arrayToXls($data, $filename); |
|
163 | - exit; |
|
164 | - break; |
|
165 | - } |
|
94 | + } |
|
95 | + } else { |
|
96 | + $sql .= " FROM $user_table u ORDER BY lastname,firstname"; |
|
97 | + } |
|
98 | + $filename = 'export_users_'.api_get_local_time(); |
|
99 | + } |
|
100 | + $data = array(); |
|
101 | + $extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false); |
|
102 | + if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') { |
|
103 | + if ($_configuration['password_encryption'] != 'none') { |
|
104 | + $data[] = array( |
|
105 | + 'UserId', |
|
106 | + 'LastName', |
|
107 | + 'FirstName', |
|
108 | + 'Email', |
|
109 | + 'UserName', |
|
110 | + 'AuthSource', |
|
111 | + 'Status', |
|
112 | + 'OfficialCode', |
|
113 | + 'PhoneNumber', |
|
114 | + ); |
|
115 | + } else { |
|
116 | + $data[] = array( |
|
117 | + 'UserId', |
|
118 | + 'LastName', |
|
119 | + 'FirstName', |
|
120 | + 'Email', |
|
121 | + 'UserName', |
|
122 | + 'Password', |
|
123 | + 'AuthSource', |
|
124 | + 'Status', |
|
125 | + 'OfficialCode', |
|
126 | + 'PhoneNumber', |
|
127 | + ); |
|
128 | + } |
|
129 | + |
|
130 | + foreach($extra_fields as $extra) { |
|
131 | + $data[0][]=$extra[1]; |
|
132 | + } |
|
133 | + } |
|
134 | + |
|
135 | + $res = Database::query($sql); |
|
136 | + while($user = Database::fetch_array($res,'ASSOC')) { |
|
137 | + $student_data = UserManager:: get_extra_user_data( |
|
138 | + $user['UserId'], |
|
139 | + true, |
|
140 | + false |
|
141 | + ); |
|
142 | + foreach($student_data as $key=>$value) { |
|
143 | + $key = substr($key, 6); |
|
144 | + if (is_array($value)) { |
|
145 | + $user[$key] = $value[$key]; |
|
146 | + } else { |
|
147 | + $user[$key] = $value; |
|
148 | + } |
|
149 | + } |
|
150 | + $data[] = $user ; |
|
151 | + } |
|
152 | + |
|
153 | + switch ($file_type) { |
|
154 | + case 'xml': |
|
155 | + Export::arrayToXml($data, $filename, 'Contact', 'Contacts'); |
|
156 | + exit; |
|
157 | + break; |
|
158 | + case 'csv': |
|
159 | + Export::arrayToCsv($data, $filename); |
|
160 | + exit; |
|
161 | + case 'xls': |
|
162 | + Export::arrayToXls($data, $filename); |
|
163 | + exit; |
|
164 | + break; |
|
165 | + } |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | Display :: display_header($tool_name); |
@@ -13,19 +13,19 @@ discard block |
||
13 | 13 | $s->register( |
14 | 14 | 'WSSession.CreateSession', |
15 | 15 | array( |
16 | - 'secret_key' => 'xsd:string', |
|
17 | - 'name' => 'xsd:string', |
|
18 | - 'start_date' => 'xsd:string', |
|
19 | - 'end_date' => 'xsd:string', |
|
20 | - 'nb_days_access_before' => 'xsd:int', |
|
21 | - 'nb_days_access_after' => 'xsd:int', |
|
22 | - 'nolimit' => 'xsd:int', |
|
23 | - 'visibility' => 'xsd:int', |
|
24 | - 'user_id_field_name' => 'xsd:string', |
|
25 | - 'user_id_value' => 'xsd:string', |
|
26 | - 'session_id_field_name' => 'xsd:string', |
|
27 | - 'session_id_value' => 'xsd:string', |
|
28 | - 'extras' => 'tns:extra_field' |
|
16 | + 'secret_key' => 'xsd:string', |
|
17 | + 'name' => 'xsd:string', |
|
18 | + 'start_date' => 'xsd:string', |
|
19 | + 'end_date' => 'xsd:string', |
|
20 | + 'nb_days_access_before' => 'xsd:int', |
|
21 | + 'nb_days_access_after' => 'xsd:int', |
|
22 | + 'nolimit' => 'xsd:int', |
|
23 | + 'visibility' => 'xsd:int', |
|
24 | + 'user_id_field_name' => 'xsd:string', |
|
25 | + 'user_id_value' => 'xsd:string', |
|
26 | + 'session_id_field_name' => 'xsd:string', |
|
27 | + 'session_id_value' => 'xsd:string', |
|
28 | + 'extras' => 'tns:extra_field' |
|
29 | 29 | ), |
30 | 30 | array('return' => 'xsd:int') |
31 | 31 | ); |
@@ -33,50 +33,50 @@ discard block |
||
33 | 33 | $s->register( |
34 | 34 | 'WSSession.DeleteSession', |
35 | 35 | array( |
36 | - 'secret_key' => 'xsd:string', |
|
37 | - 'session_id_field_name' => 'xsd:string', |
|
38 | - 'session_id_value' => 'xsd:string' |
|
36 | + 'secret_key' => 'xsd:string', |
|
37 | + 'session_id_field_name' => 'xsd:string', |
|
38 | + 'session_id_value' => 'xsd:string' |
|
39 | 39 | ) |
40 | 40 | ); |
41 | 41 | |
42 | 42 | $s->register( |
43 | 43 | 'WSSession.EditSession', |
44 | 44 | array( |
45 | - 'secret_key' => 'xsd:string', |
|
46 | - 'name' => 'xsd:string', |
|
47 | - 'start_date' => 'xsd:string', |
|
48 | - 'end_date' => 'xsd:string', |
|
49 | - 'nb_days_access_before' => 'xsd:int', |
|
50 | - 'nb_days_access_after' => 'xsd:int', |
|
51 | - 'nolimit' => 'xsd:int', |
|
52 | - 'visibility' => 'xsd:int', |
|
53 | - 'user_id_field_name' => 'xsd:string', |
|
54 | - 'user_id_value' => 'xsd:string', |
|
55 | - 'session_id_field_name' => 'xsd:string', |
|
56 | - 'session_id_value' => 'xsd:string', |
|
57 | - 'extras' => 'tns:extra_field' |
|
45 | + 'secret_key' => 'xsd:string', |
|
46 | + 'name' => 'xsd:string', |
|
47 | + 'start_date' => 'xsd:string', |
|
48 | + 'end_date' => 'xsd:string', |
|
49 | + 'nb_days_access_before' => 'xsd:int', |
|
50 | + 'nb_days_access_after' => 'xsd:int', |
|
51 | + 'nolimit' => 'xsd:int', |
|
52 | + 'visibility' => 'xsd:int', |
|
53 | + 'user_id_field_name' => 'xsd:string', |
|
54 | + 'user_id_value' => 'xsd:string', |
|
55 | + 'session_id_field_name' => 'xsd:string', |
|
56 | + 'session_id_value' => 'xsd:string', |
|
57 | + 'extras' => 'tns:extra_field' |
|
58 | 58 | ) |
59 | 59 | ); |
60 | 60 | |
61 | 61 | $s->register( |
62 | 62 | 'WSSession.SubscribeUserToSession', |
63 | 63 | array( |
64 | - 'secret_key' => 'xsd:string', |
|
65 | - 'user_id_field_name' => 'xsd:string', |
|
66 | - 'user_id_value' => 'xsd:string', |
|
67 | - 'session_id_field_name' => 'xsd:string', |
|
68 | - 'session_id_value' => 'xsd:string' |
|
64 | + 'secret_key' => 'xsd:string', |
|
65 | + 'user_id_field_name' => 'xsd:string', |
|
66 | + 'user_id_value' => 'xsd:string', |
|
67 | + 'session_id_field_name' => 'xsd:string', |
|
68 | + 'session_id_value' => 'xsd:string' |
|
69 | 69 | ) |
70 | 70 | ); |
71 | 71 | |
72 | 72 | $s->register( |
73 | 73 | 'WSSession.UnsubscribeUserFromSession', |
74 | 74 | array( |
75 | - 'secret_key' => 'xsd:string', |
|
76 | - 'user_id_field_name' => 'xsd:string', |
|
77 | - 'user_id_value' => 'xsd:string', |
|
78 | - 'session_id_field_name' => 'xsd:string', |
|
79 | - 'session_id_value' => 'xsd:string' |
|
75 | + 'secret_key' => 'xsd:string', |
|
76 | + 'user_id_field_name' => 'xsd:string', |
|
77 | + 'user_id_value' => 'xsd:string', |
|
78 | + 'session_id_field_name' => 'xsd:string', |
|
79 | + 'session_id_value' => 'xsd:string' |
|
80 | 80 | ) |
81 | 81 | ); |
82 | 82 | |
@@ -84,46 +84,46 @@ discard block |
||
84 | 84 | 'WSSession.SubscribeTeacherToSessionCourse', |
85 | 85 | array( |
86 | 86 | 'secret_key' => 'xsd:string', |
87 | - 'user_id_field_name' => 'xsd:string', |
|
88 | - 'user_id_value' => 'xsd:string', |
|
89 | - 'session_id_field_name' => 'xsd:string', |
|
90 | - 'session_id_value' => 'xsd:string', |
|
87 | + 'user_id_field_name' => 'xsd:string', |
|
88 | + 'user_id_value' => 'xsd:string', |
|
89 | + 'session_id_field_name' => 'xsd:string', |
|
90 | + 'session_id_value' => 'xsd:string', |
|
91 | 91 | 'course_id_field_name' => 'xsd:string', |
92 | - 'course_id_value' => 'xsd:string' |
|
92 | + 'course_id_value' => 'xsd:string' |
|
93 | 93 | ) |
94 | 94 | ); |
95 | 95 | |
96 | 96 | $s->register( |
97 | 97 | 'WSSession.UnsubscribeTeacherFromSessionCourse', |
98 | 98 | array( |
99 | - 'secret_key' => 'xsd:string', |
|
100 | - 'user_id_field_name' => 'xsd:string', |
|
101 | - 'user_id_value' => 'xsd:string', |
|
102 | - 'session_id_field_name' => 'xsd:string', |
|
103 | - 'session_id_value' => 'xsd:string', |
|
99 | + 'secret_key' => 'xsd:string', |
|
100 | + 'user_id_field_name' => 'xsd:string', |
|
101 | + 'user_id_value' => 'xsd:string', |
|
102 | + 'session_id_field_name' => 'xsd:string', |
|
103 | + 'session_id_value' => 'xsd:string', |
|
104 | 104 | 'course_id_field_name' => 'xsd:string', |
105 | - 'course_id_value' => 'xsd:string' |
|
105 | + 'course_id_value' => 'xsd:string' |
|
106 | 106 | ) |
107 | 107 | ); |
108 | 108 | |
109 | 109 | $s->register( |
110 | 110 | 'WSSession.SubscribeCourseToSession', |
111 | 111 | array( |
112 | - 'secret_key' => 'xsd:string', |
|
113 | - 'course_id_field_name' => 'xsd:string', |
|
114 | - 'course_id_value' => 'xsd:string', |
|
115 | - 'session_id_field_name' => 'xsd:string', |
|
116 | - 'session_id_value' => 'xsd:string' |
|
112 | + 'secret_key' => 'xsd:string', |
|
113 | + 'course_id_field_name' => 'xsd:string', |
|
114 | + 'course_id_value' => 'xsd:string', |
|
115 | + 'session_id_field_name' => 'xsd:string', |
|
116 | + 'session_id_value' => 'xsd:string' |
|
117 | 117 | ) |
118 | 118 | ); |
119 | 119 | |
120 | 120 | $s->register( |
121 | 121 | 'WSSession.UnsubscribeCourseFromSession', |
122 | 122 | array( |
123 | - 'secret_key' => 'xsd:string', |
|
124 | - 'course_id_field_name' => 'xsd:string', |
|
125 | - 'course_id_value' => 'xsd:string', |
|
126 | - 'session_id_field_name' => 'xsd:string', |
|
127 | - 'session_id_value' => 'xsd:string' |
|
123 | + 'secret_key' => 'xsd:string', |
|
124 | + 'course_id_field_name' => 'xsd:string', |
|
125 | + 'course_id_value' => 'xsd:string', |
|
126 | + 'session_id_field_name' => 'xsd:string', |
|
127 | + 'session_id_value' => 'xsd:string' |
|
128 | 128 | ) |
129 | 129 | ); |
@@ -11,10 +11,10 @@ discard block |
||
11 | 11 | $from_myspace = false; |
12 | 12 | $from_link = ''; |
13 | 13 | if (isset($_GET['from']) && $_GET['from'] == 'myspace') { |
14 | - $from_link = '&from=myspace'; |
|
15 | - $this_section = SECTION_TRACKING; |
|
14 | + $from_link = '&from=myspace'; |
|
15 | + $this_section = SECTION_TRACKING; |
|
16 | 16 | } else { |
17 | - $this_section = SECTION_COURSES; |
|
17 | + $this_section = SECTION_COURSES; |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | $session_id = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id(); |
@@ -35,19 +35,19 @@ discard block |
||
35 | 35 | if (!api_is_platform_admin(true) && |
36 | 36 | !CourseManager :: is_course_teacher(api_get_user_id(), $courseCode) && |
37 | 37 | !Tracking :: is_allowed_to_coach_student(api_get_user_id(), $user_id) && !api_is_drh() && !api_is_course_tutor()) { |
38 | - api_not_allowed(); |
|
38 | + api_not_allowed(); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | if ($origin == 'user_course') { |
42 | - $interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']); |
|
43 | - $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users")); |
|
42 | + $interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']); |
|
43 | + $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users")); |
|
44 | 44 | } else if($origin == 'tracking_course') { |
45 | - $interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking")); |
|
45 | + $interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking")); |
|
46 | 46 | } else { |
47 | - $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace')); |
|
48 | - $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents")); |
|
49 | - $interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails")); |
|
50 | - $nameTools=get_lang("DetailsStudentInCourse"); |
|
47 | + $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace')); |
|
48 | + $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents")); |
|
49 | + $interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails")); |
|
50 | + $nameTools=get_lang("DetailsStudentInCourse"); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | $interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin , "name" => get_lang("DetailsStudentInCourse")); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | return false; |
127 | 127 | } |
128 | 128 | } |
129 | - */ |
|
129 | + */ |
|
130 | 130 | |
131 | 131 | /* |
132 | 132 | * Creating a Room for the meeting |
@@ -256,10 +256,10 @@ discard block |
||
256 | 256 | return true; |
257 | 257 | } |
258 | 258 | |
259 | - /** |
|
260 | - * Gets the password for a specific meeting for the current user |
|
261 | - * @return string A moderator password if user is teacher, or the course code otherwise |
|
262 | - */ |
|
259 | + /** |
|
260 | + * Gets the password for a specific meeting for the current user |
|
261 | + * @return string A moderator password if user is teacher, or the course code otherwise |
|
262 | + */ |
|
263 | 263 | public function getMeetingUserPassword() |
264 | 264 | { |
265 | 265 | if ($this->isTeacher()) { |
@@ -538,7 +538,7 @@ discard block |
||
538 | 538 | // |
539 | 539 | // } |
540 | 540 | // |
541 | - //$item['created_at'] = api_convert_and_format_date($meetingDb['created_at']); |
|
541 | + //$item['created_at'] = api_convert_and_format_date($meetingDb['created_at']); |
|
542 | 542 | // //created_at |
543 | 543 | // |
544 | 544 | // $item['publish_url'] = api_get_self().'?action=publish&id='.$meetingDb['id']; |