@@ -6,24 +6,24 @@ |
||
6 | 6 | */ |
7 | 7 | class HTML_QuickForm_Compare_Fields extends HTML_QuickForm_Rule_Compare |
8 | 8 | { |
9 | - /** |
|
10 | - * Function to check an array of fields |
|
11 | - * @param array of field names |
|
9 | + /** |
|
10 | + * Function to check an array of fields |
|
11 | + * @param array of field names |
|
12 | 12 | * @param string operator ==, >=, etc |
13 | 13 | * @param string the value to compare |
14 | - * @return boolean True if date is valid |
|
15 | - */ |
|
16 | - function validate($values = [], $operator_and_max_value = null) { |
|
14 | + * @return boolean True if date is valid |
|
15 | + */ |
|
16 | + function validate($values = [], $operator_and_max_value = null) { |
|
17 | 17 | if (is_array($values) && !empty($values) && !empty($operator_and_max_value)) { |
18 | - $final_value = 0; |
|
19 | - foreach ($values as $value) { |
|
20 | - $final_value += $value; |
|
21 | - } |
|
22 | - $params = explode('@', $operator_and_max_value); |
|
23 | - $operator = $params[0]; |
|
24 | - $max_value = $params[1]; |
|
25 | - return parent::validate(array($final_value, $max_value), $operator); |
|
18 | + $final_value = 0; |
|
19 | + foreach ($values as $value) { |
|
20 | + $final_value += $value; |
|
21 | + } |
|
22 | + $params = explode('@', $operator_and_max_value); |
|
23 | + $operator = $params[0]; |
|
24 | + $max_value = $params[1]; |
|
25 | + return parent::validate(array($final_value, $max_value), $operator); |
|
26 | 26 | } |
27 | 27 | return false; |
28 | - } |
|
28 | + } |
|
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -18,11 +18,11 @@ discard block |
||
18 | 18 | |
19 | 19 | $document_data = DocumentManager::get_document_data_by_id($_GET['id'], api_get_course_id(), true); |
20 | 20 | if (empty($document_data)) { |
21 | - if (api_is_in_group()) { |
|
22 | - $group_properties = GroupManager::get_group_properties(api_get_group_id()); |
|
23 | - $document_id = DocumentManager::get_document_id(api_get_course_info(), $group_properties['directory']); |
|
24 | - $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id()); |
|
25 | - } |
|
21 | + if (api_is_in_group()) { |
|
22 | + $group_properties = GroupManager::get_group_properties(api_get_group_id()); |
|
23 | + $document_id = DocumentManager::get_document_id(api_get_course_info(), $group_properties['directory']); |
|
24 | + $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id()); |
|
25 | + } |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | $document_id = $document_data['id']; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | //make some vars |
32 | 32 | $wamidir = $dir; |
33 | 33 | if ($wamidir == "/") { |
34 | - $wamidir = ""; |
|
34 | + $wamidir = ""; |
|
35 | 35 | } |
36 | 36 | $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/"; |
37 | 37 | $groupId = api_get_group_id(); |
@@ -41,48 +41,48 @@ discard block |
||
41 | 41 | // Please, do not modify this dirname formatting |
42 | 42 | |
43 | 43 | if (strstr($dir, '..')) { |
44 | - $dir = '/'; |
|
44 | + $dir = '/'; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | if ($dir[0] == '.') { |
48 | - $dir = substr($dir, 1); |
|
48 | + $dir = substr($dir, 1); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | if ($dir[0] != '/') { |
52 | - $dir = '/'.$dir; |
|
52 | + $dir = '/'.$dir; |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | if ($dir[strlen($dir) - 1] != '/') { |
56 | - $dir .= '/'; |
|
56 | + $dir .= '/'; |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
60 | 60 | |
61 | 61 | if (!is_dir($filepath)) { |
62 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
63 | - $dir = '/'; |
|
62 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
63 | + $dir = '/'; |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | //groups //TODO: clean |
67 | 67 | if (!empty($groupId)) { |
68 | - $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
69 | - $noPHP_SELF = true; |
|
70 | - $group = GroupManager :: get_group_properties($groupId); |
|
71 | - $path = explode('/', $dir); |
|
72 | - if ('/'.$path[1] != $group['directory']) { |
|
73 | - api_not_allowed(true); |
|
74 | - } |
|
68 | + $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace')); |
|
69 | + $noPHP_SELF = true; |
|
70 | + $group = GroupManager :: get_group_properties($groupId); |
|
71 | + $path = explode('/', $dir); |
|
72 | + if ('/'.$path[1] != $group['directory']) { |
|
73 | + api_not_allowed(true); |
|
74 | + } |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id.'&'.api_get_cidreq(), "name" => get_lang('Documents')); |
78 | 78 | |
79 | 79 | if (!$is_allowed_in_course) { |
80 | - api_not_allowed(true); |
|
80 | + api_not_allowed(true); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || |
84 | - DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
85 | - api_not_allowed(true); |
|
84 | + DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) { |
|
85 | + api_not_allowed(true); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /* Header */ |
@@ -90,26 +90,26 @@ discard block |
||
90 | 90 | |
91 | 91 | $display_dir = $dir; |
92 | 92 | if (isset ($group)) { |
93 | - $display_dir = explode('/', $dir); |
|
94 | - unset ($display_dir[0]); |
|
95 | - unset ($display_dir[1]); |
|
96 | - $display_dir = implode('/', $display_dir); |
|
93 | + $display_dir = explode('/', $dir); |
|
94 | + unset ($display_dir[0]); |
|
95 | + unset ($display_dir[1]); |
|
96 | + $display_dir = implode('/', $display_dir); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | // Interbreadcrumb for the current directory root path |
100 | 100 | $counter = 0; |
101 | 101 | if (isset($document_data['parents'])) { |
102 | - foreach($document_data['parents'] as $document_sub_data) { |
|
103 | - //fixing double group folder in breadcrumb |
|
104 | - if (api_get_group_id()) { |
|
105 | - if ($counter == 0) { |
|
106 | - $counter++; |
|
107 | - continue; |
|
108 | - } |
|
109 | - } |
|
110 | - $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']); |
|
111 | - $counter++; |
|
112 | - } |
|
102 | + foreach($document_data['parents'] as $document_sub_data) { |
|
103 | + //fixing double group folder in breadcrumb |
|
104 | + if (api_get_group_id()) { |
|
105 | + if ($counter == 0) { |
|
106 | + $counter++; |
|
107 | + continue; |
|
108 | + } |
|
109 | + } |
|
110 | + $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']); |
|
111 | + $counter++; |
|
112 | + } |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | //make some vars |
@@ -121,12 +121,12 @@ discard block |
||
121 | 121 | $htmlHeadXtra[] = '<script type="text/javascript" src="' . api_get_path(WEB_LIBRARY_PATH) . 'swfobject/swfobject.js"></script>'; |
122 | 122 | |
123 | 123 | $actions = Display::toolbarButton( |
124 | - get_lang('BackTo') . ' ' . get_lang('DocumentsOverview'), |
|
125 | - 'document.php?' . api_get_cidreq() . "&id=$document_id", |
|
126 | - 'arrow-left', |
|
127 | - 'default', |
|
128 | - [], |
|
129 | - false |
|
124 | + get_lang('BackTo') . ' ' . get_lang('DocumentsOverview'), |
|
125 | + 'document.php?' . api_get_cidreq() . "&id=$document_id", |
|
126 | + 'arrow-left', |
|
127 | + 'default', |
|
128 | + [], |
|
129 | + false |
|
130 | 130 | ); |
131 | 131 | |
132 | 132 | $template = new Template($nameTools); |
@@ -37,11 +37,11 @@ discard block |
||
37 | 37 | set_time_limit(0); |
38 | 38 | |
39 | 39 | if (isset($_POST['formSent'])) { |
40 | - $formSent = $_POST['formSent']; |
|
41 | - $file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv'; |
|
42 | - $session_id = $_POST['session_id']; |
|
43 | - if (empty($session_id)) { |
|
44 | - $sql = "SELECT |
|
40 | + $formSent = $_POST['formSent']; |
|
41 | + $file_type = isset($_POST['file_type']) ? $_POST['file_type'] : 'csv'; |
|
42 | + $session_id = $_POST['session_id']; |
|
43 | + if (empty($session_id)) { |
|
44 | + $sql = "SELECT |
|
45 | 45 | s.id, |
46 | 46 | name, |
47 | 47 | id_coach, |
@@ -55,84 +55,84 @@ discard block |
||
55 | 55 | ON $tbl_user.user_id = s.id_coach |
56 | 56 | ORDER BY id"; |
57 | 57 | |
58 | - if (api_is_multiple_url_enabled()) { |
|
59 | - $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
60 | - $access_url_id = api_get_current_access_url_id(); |
|
61 | - if ($access_url_id != -1){ |
|
62 | - $sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id |
|
58 | + if (api_is_multiple_url_enabled()) { |
|
59 | + $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
60 | + $access_url_id = api_get_current_access_url_id(); |
|
61 | + if ($access_url_id != -1){ |
|
62 | + $sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id |
|
63 | 63 | FROM $tbl_session s |
64 | 64 | INNER JOIN $tbl_session_rel_access_url as session_rel_url |
65 | 65 | ON (s.id= session_rel_url.session_id) |
66 | 66 | INNER JOIN $tbl_user u ON (u.user_id = s.id_coach) |
67 | 67 | WHERE access_url_id = $access_url_id |
68 | 68 | ORDER BY id"; |
69 | - } |
|
70 | - } |
|
69 | + } |
|
70 | + } |
|
71 | 71 | |
72 | - $result = Database::query($sql); |
|
73 | - } else { |
|
74 | - $sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id |
|
72 | + $result = Database::query($sql); |
|
73 | + } else { |
|
74 | + $sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id |
|
75 | 75 | FROM $tbl_session s |
76 | 76 | INNER JOIN $tbl_user |
77 | 77 | ON $tbl_user.user_id = s.id_coach |
78 | 78 | WHERE id='$session_id'"; |
79 | - $result = Database::query($sql); |
|
80 | - } |
|
79 | + $result = Database::query($sql); |
|
80 | + } |
|
81 | 81 | |
82 | - if (Database::num_rows($result)) { |
|
82 | + if (Database::num_rows($result)) { |
|
83 | 83 | |
84 | 84 | |
85 | 85 | |
86 | - $sessionListToExport = []; |
|
86 | + $sessionListToExport = []; |
|
87 | 87 | |
88 | - if (in_array($file_type, ['csv', 'xls'])) { |
|
88 | + if (in_array($file_type, ['csv', 'xls'])) { |
|
89 | 89 | |
90 | - $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time(); |
|
90 | + $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time(); |
|
91 | 91 | |
92 | - $cvs = true; |
|
93 | - $sessionListToExport[] = [ |
|
94 | - 'SessionName', |
|
95 | - 'Coach', |
|
96 | - 'DateStart', |
|
97 | - 'DateEnd', |
|
98 | - 'Visibility', |
|
99 | - 'SessionCategory', |
|
100 | - 'Users', |
|
101 | - 'Courses' |
|
102 | - ]; |
|
103 | - } else { |
|
104 | - if (!file_exists($archivePath)) { |
|
105 | - mkdir($archivePath, api_get_permissions_for_new_directories(), true); |
|
106 | - } |
|
92 | + $cvs = true; |
|
93 | + $sessionListToExport[] = [ |
|
94 | + 'SessionName', |
|
95 | + 'Coach', |
|
96 | + 'DateStart', |
|
97 | + 'DateEnd', |
|
98 | + 'Visibility', |
|
99 | + 'SessionCategory', |
|
100 | + 'Users', |
|
101 | + 'Courses' |
|
102 | + ]; |
|
103 | + } else { |
|
104 | + if (!file_exists($archivePath)) { |
|
105 | + mkdir($archivePath, api_get_permissions_for_new_directories(), true); |
|
106 | + } |
|
107 | 107 | |
108 | - if (!file_exists($archivePath.'index.html')) { |
|
109 | - $fp = fopen($archivePath.'index.html', 'w'); |
|
110 | - fputs($fp, '<html><head></head><body></body></html>'); |
|
111 | - fclose($fp); |
|
112 | - } |
|
108 | + if (!file_exists($archivePath.'index.html')) { |
|
109 | + $fp = fopen($archivePath.'index.html', 'w'); |
|
110 | + fputs($fp, '<html><head></head><body></body></html>'); |
|
111 | + fclose($fp); |
|
112 | + } |
|
113 | 113 | |
114 | - $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type; |
|
115 | - while (file_exists($archivePath.$archiveFile)) { |
|
116 | - $archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type; |
|
117 | - } |
|
114 | + $archiveFile = 'export_sessions_'.$session_id.'_'.api_get_local_time().'.'.$file_type; |
|
115 | + while (file_exists($archivePath.$archiveFile)) { |
|
116 | + $archiveFile ='export_users_'.$session_id.'_'.api_get_local_time().'_'.uniqid('').'.'.$file_type; |
|
117 | + } |
|
118 | 118 | |
119 | - $cvs = false; |
|
120 | - $fp = fopen($archivePath.$archiveFile, 'w'); |
|
121 | - fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n"); |
|
122 | - } |
|
119 | + $cvs = false; |
|
120 | + $fp = fopen($archivePath.$archiveFile, 'w'); |
|
121 | + fputs($fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Sessions>\n"); |
|
122 | + } |
|
123 | 123 | |
124 | 124 | |
125 | - while ($row = Database::fetch_array($result)) { |
|
126 | - $row['name'] = str_replace(';',',',$row['name']); |
|
127 | - $row['username'] = str_replace(';',',',$row['username']); |
|
128 | - $row['access_start_date'] = str_replace(';',',',$row['access_start_date']); |
|
129 | - $row['access_end_date'] = str_replace(';',',',$row['access_end_date']); |
|
130 | - $row['visibility'] = str_replace(';',',',$row['visibility']); |
|
131 | - $row['session_category'] = str_replace(';',',',$row['session_category_id']); |
|
125 | + while ($row = Database::fetch_array($result)) { |
|
126 | + $row['name'] = str_replace(';',',',$row['name']); |
|
127 | + $row['username'] = str_replace(';',',',$row['username']); |
|
128 | + $row['access_start_date'] = str_replace(';',',',$row['access_start_date']); |
|
129 | + $row['access_end_date'] = str_replace(';',',',$row['access_end_date']); |
|
130 | + $row['visibility'] = str_replace(';',',',$row['visibility']); |
|
131 | + $row['session_category'] = str_replace(';',',',$row['session_category_id']); |
|
132 | 132 | |
133 | 133 | |
134 | - // users |
|
135 | - $sql = "SELECT DISTINCT $tbl_user.username |
|
134 | + // users |
|
135 | + $sql = "SELECT DISTINCT $tbl_user.username |
|
136 | 136 | FROM $tbl_user |
137 | 137 | INNER JOIN $tbl_session_user |
138 | 138 | ON |
@@ -140,33 +140,33 @@ discard block |
||
140 | 140 | $tbl_session_user.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND |
141 | 141 | $tbl_session_user.session_id = '".$row['id']."'"; |
142 | 142 | |
143 | - $rsUsers = Database::query($sql); |
|
144 | - $users = ''; |
|
145 | - while ($rowUsers = Database::fetch_array($rsUsers)){ |
|
146 | - if($cvs){ |
|
147 | - $users .= str_replace(';',',',$rowUsers['username']).'|'; |
|
148 | - } else { |
|
149 | - $users .= "\t\t<User>$rowUsers[username]</User>\n"; |
|
150 | - } |
|
151 | - } |
|
152 | - |
|
153 | - if (!empty($users) && $cvs) { |
|
154 | - $users = api_substr($users, 0, api_strlen($users) - 1); |
|
155 | - } |
|
156 | - |
|
157 | - // Courses |
|
158 | - $sql = "SELECT DISTINCT c.code, sc.id, c_id |
|
143 | + $rsUsers = Database::query($sql); |
|
144 | + $users = ''; |
|
145 | + while ($rowUsers = Database::fetch_array($rsUsers)){ |
|
146 | + if($cvs){ |
|
147 | + $users .= str_replace(';',',',$rowUsers['username']).'|'; |
|
148 | + } else { |
|
149 | + $users .= "\t\t<User>$rowUsers[username]</User>\n"; |
|
150 | + } |
|
151 | + } |
|
152 | + |
|
153 | + if (!empty($users) && $cvs) { |
|
154 | + $users = api_substr($users, 0, api_strlen($users) - 1); |
|
155 | + } |
|
156 | + |
|
157 | + // Courses |
|
158 | + $sql = "SELECT DISTINCT c.code, sc.id, c_id |
|
159 | 159 | FROM $tbl_course c |
160 | 160 | INNER JOIN $tbl_session_course_user sc |
161 | 161 | ON c.id = sc.c_id |
162 | 162 | AND sc.session_id = '".$row['id']."'"; |
163 | 163 | |
164 | - $rsCourses = Database::query($sql); |
|
164 | + $rsCourses = Database::query($sql); |
|
165 | 165 | |
166 | - $courses = ''; |
|
167 | - while ($rowCourses = Database::fetch_array($rsCourses)) { |
|
168 | - // get coachs from a course |
|
169 | - $sql = "SELECT u.username |
|
166 | + $courses = ''; |
|
167 | + while ($rowCourses = Database::fetch_array($rsCourses)) { |
|
168 | + // get coachs from a course |
|
169 | + $sql = "SELECT u.username |
|
170 | 170 | FROM $tbl_session_course_user scu |
171 | 171 | INNER JOIN $tbl_user u |
172 | 172 | ON u.user_id = scu.user_id |
@@ -175,25 +175,25 @@ discard block |
||
175 | 175 | scu.session_id = '".$row['id']."' AND |
176 | 176 | scu.status = 2 "; |
177 | 177 | |
178 | - $rs_coachs = Database::query($sql); |
|
179 | - $coachs = array(); |
|
180 | - while ($row_coachs = Database::fetch_array($rs_coachs)) { |
|
181 | - $coachs[] = $row_coachs['username']; |
|
182 | - } |
|
183 | - |
|
184 | - $coachs = implode(",", $coachs); |
|
185 | - |
|
186 | - if ($cvs) { |
|
187 | - $courses .= str_replace(';',',',$rowCourses['code']); |
|
188 | - $courses .= '['.str_replace(';',',',$coachs).']['; |
|
189 | - } else { |
|
190 | - $courses .= "\t\t<Course>\n"; |
|
191 | - $courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n"; |
|
192 | - $courses .= "\t\t\t<Coach>$coachs</Coach>\n"; |
|
193 | - } |
|
194 | - |
|
195 | - // rel user courses |
|
196 | - $sql = "SELECT DISTINCT u.username |
|
178 | + $rs_coachs = Database::query($sql); |
|
179 | + $coachs = array(); |
|
180 | + while ($row_coachs = Database::fetch_array($rs_coachs)) { |
|
181 | + $coachs[] = $row_coachs['username']; |
|
182 | + } |
|
183 | + |
|
184 | + $coachs = implode(",", $coachs); |
|
185 | + |
|
186 | + if ($cvs) { |
|
187 | + $courses .= str_replace(';',',',$rowCourses['code']); |
|
188 | + $courses .= '['.str_replace(';',',',$coachs).']['; |
|
189 | + } else { |
|
190 | + $courses .= "\t\t<Course>\n"; |
|
191 | + $courses .= "\t\t\t<CourseCode>$rowCourses[code]</CourseCode>\n"; |
|
192 | + $courses .= "\t\t\t<Coach>$coachs</Coach>\n"; |
|
193 | + } |
|
194 | + |
|
195 | + // rel user courses |
|
196 | + $sql = "SELECT DISTINCT u.username |
|
197 | 197 | FROM $tbl_session_course_user scu |
198 | 198 | INNER JOIN $tbl_session_user su |
199 | 199 | ON |
@@ -206,79 +206,79 @@ discard block |
||
206 | 206 | scu.c_id='".$rowCourses['c_id']."' AND |
207 | 207 | scu.session_id='".$row['id']."'"; |
208 | 208 | |
209 | - $rsUsersCourse = Database::query($sql); |
|
210 | - $userscourse = ''; |
|
211 | - while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){ |
|
212 | - if ($cvs) { |
|
213 | - $userscourse .= str_replace(';',',',$rowUsersCourse['username']).','; |
|
214 | - } else { |
|
215 | - $courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n"; |
|
216 | - } |
|
217 | - } |
|
218 | - |
|
219 | - if ($cvs) { |
|
220 | - if (!empty($userscourse)) { |
|
221 | - $userscourse = api_substr( |
|
222 | - $userscourse, |
|
223 | - 0, |
|
224 | - api_strlen($userscourse) - 1 |
|
225 | - ); |
|
226 | - } |
|
227 | - |
|
228 | - $courses .= $userscourse.']|'; |
|
229 | - } else { |
|
230 | - $courses .= "\t\t</Course>\n"; |
|
231 | - } |
|
232 | - } |
|
233 | - |
|
234 | - if (!empty($courses) && $cvs) { |
|
235 | - $courses = api_substr($courses, 0, api_strlen($courses) - 1); |
|
236 | - } |
|
237 | - $add = $courses; |
|
238 | - |
|
239 | - if (in_array($file_type, ['csv', 'xls'])) { |
|
240 | - $sessionListToExport[] = [ |
|
241 | - $row['name'], |
|
242 | - $row['username'], |
|
243 | - $row['access_start_date'], |
|
244 | - $row['access_end_date'], |
|
245 | - $row['visibility'], |
|
246 | - $row['session_category'], |
|
247 | - $users, |
|
248 | - $courses |
|
249 | - ]; |
|
250 | - } else { |
|
251 | - $add = "\t<Session>\n" |
|
252 | - ."\t\t<SessionName>$row[name]</SessionName>\n" |
|
253 | - ."\t\t<Coach>$row[username]</Coach>\n" |
|
254 | - ."\t\t<DateStart>$row[access_start_date]</DateStart>\n" |
|
255 | - ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n" |
|
256 | - ."\t\t<Visibility>$row[visibility]</Visibility>\n" |
|
257 | - ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n"; |
|
258 | - } |
|
259 | - |
|
260 | - if (!$cvs) { |
|
261 | - $add .= "\t</Session>\n"; |
|
262 | - fputs($fp, $add); |
|
263 | - } |
|
264 | - } |
|
265 | - |
|
266 | - switch ($file_type) { |
|
267 | - case 'xml': |
|
268 | - fputs($fp, "</Sessions>\n"); |
|
269 | - fclose($fp); |
|
270 | - $errorMsg = get_lang('UserListHasBeenExported').'<br/> |
|
209 | + $rsUsersCourse = Database::query($sql); |
|
210 | + $userscourse = ''; |
|
211 | + while ($rowUsersCourse = Database::fetch_array($rsUsersCourse)){ |
|
212 | + if ($cvs) { |
|
213 | + $userscourse .= str_replace(';',',',$rowUsersCourse['username']).','; |
|
214 | + } else { |
|
215 | + $courses .= "\t\t\t<User>$rowUsersCourse[username]</User>\n"; |
|
216 | + } |
|
217 | + } |
|
218 | + |
|
219 | + if ($cvs) { |
|
220 | + if (!empty($userscourse)) { |
|
221 | + $userscourse = api_substr( |
|
222 | + $userscourse, |
|
223 | + 0, |
|
224 | + api_strlen($userscourse) - 1 |
|
225 | + ); |
|
226 | + } |
|
227 | + |
|
228 | + $courses .= $userscourse.']|'; |
|
229 | + } else { |
|
230 | + $courses .= "\t\t</Course>\n"; |
|
231 | + } |
|
232 | + } |
|
233 | + |
|
234 | + if (!empty($courses) && $cvs) { |
|
235 | + $courses = api_substr($courses, 0, api_strlen($courses) - 1); |
|
236 | + } |
|
237 | + $add = $courses; |
|
238 | + |
|
239 | + if (in_array($file_type, ['csv', 'xls'])) { |
|
240 | + $sessionListToExport[] = [ |
|
241 | + $row['name'], |
|
242 | + $row['username'], |
|
243 | + $row['access_start_date'], |
|
244 | + $row['access_end_date'], |
|
245 | + $row['visibility'], |
|
246 | + $row['session_category'], |
|
247 | + $users, |
|
248 | + $courses |
|
249 | + ]; |
|
250 | + } else { |
|
251 | + $add = "\t<Session>\n" |
|
252 | + ."\t\t<SessionName>$row[name]</SessionName>\n" |
|
253 | + ."\t\t<Coach>$row[username]</Coach>\n" |
|
254 | + ."\t\t<DateStart>$row[access_start_date]</DateStart>\n" |
|
255 | + ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n" |
|
256 | + ."\t\t<Visibility>$row[visibility]</Visibility>\n" |
|
257 | + ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n"; |
|
258 | + } |
|
259 | + |
|
260 | + if (!$cvs) { |
|
261 | + $add .= "\t</Session>\n"; |
|
262 | + fputs($fp, $add); |
|
263 | + } |
|
264 | + } |
|
265 | + |
|
266 | + switch ($file_type) { |
|
267 | + case 'xml': |
|
268 | + fputs($fp, "</Sessions>\n"); |
|
269 | + fclose($fp); |
|
270 | + $errorMsg = get_lang('UserListHasBeenExported').'<br/> |
|
271 | 271 | <a class="btn btn-default" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>'; |
272 | - break; |
|
273 | - case 'csv': |
|
274 | - Export::arrayToCsv($sessionListToExport, $archiveFile); |
|
275 | - exit; |
|
276 | - case 'xls': |
|
277 | - Export::arrayToXls($sessionListToExport, $archiveFile); |
|
278 | - exit; |
|
279 | - break; |
|
280 | - } |
|
281 | - } |
|
272 | + break; |
|
273 | + case 'csv': |
|
274 | + Export::arrayToCsv($sessionListToExport, $archiveFile); |
|
275 | + exit; |
|
276 | + case 'xls': |
|
277 | + Export::arrayToXls($sessionListToExport, $archiveFile); |
|
278 | + exit; |
|
279 | + break; |
|
280 | + } |
|
281 | + } |
|
282 | 282 | } |
283 | 283 | |
284 | 284 | // display the header |
@@ -288,26 +288,26 @@ discard block |
||
288 | 288 | $sql = "SELECT id, name FROM $tbl_session ORDER BY name"; |
289 | 289 | |
290 | 290 | if (api_is_multiple_url_enabled()) { |
291 | - $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
292 | - $access_url_id = api_get_current_access_url_id(); |
|
293 | - if ($access_url_id != -1){ |
|
294 | - $sql = "SELECT s.id, name FROM $tbl_session s |
|
291 | + $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
292 | + $access_url_id = api_get_current_access_url_id(); |
|
293 | + if ($access_url_id != -1){ |
|
294 | + $sql = "SELECT s.id, name FROM $tbl_session s |
|
295 | 295 | INNER JOIN $tbl_session_rel_access_url as session_rel_url |
296 | 296 | ON (s.id = session_rel_url.session_id) |
297 | 297 | WHERE access_url_id = $access_url_id |
298 | 298 | ORDER BY name"; |
299 | - } |
|
299 | + } |
|
300 | 300 | } |
301 | 301 | $result = Database::query($sql); |
302 | 302 | $Sessions = Database::store_result($result); |
303 | 303 | |
304 | 304 | echo '<div class="actions">'; |
305 | 305 | echo '<a href="../session/session_list.php">'. |
306 | - Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
306 | + Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('SessionList'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
307 | 307 | echo '</div>'; |
308 | 308 | |
309 | 309 | if (!empty($errorMsg)) { |
310 | - Display::display_normal_message($errorMsg, false); //main API |
|
310 | + Display::display_normal_message($errorMsg, false); //main API |
|
311 | 311 | } |
312 | 312 | |
313 | 313 | $form = new FormValidator('session_export', 'post', api_get_self()); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $sessionId = api_get_session_id(); |
70 | 70 | |
71 | 71 | if (api_is_in_group()) { |
72 | - $group_properties = GroupManager::get_group_properties($group_id); |
|
72 | + $group_properties = GroupManager::get_group_properties($group_id); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | $dir = '/'; |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $_GET['id'], |
82 | 82 | api_get_course_id(), |
83 | 83 | true, |
84 | - 0 |
|
84 | + 0 |
|
85 | 85 | ); |
86 | 86 | |
87 | 87 | if (!empty($sessionId) && empty($document_data)) { |
@@ -93,13 +93,13 @@ discard block |
||
93 | 93 | ); |
94 | 94 | } |
95 | 95 | |
96 | - $document_id = $document_data['id']; |
|
97 | - $file = $document_data['path']; |
|
98 | - $parent_id = DocumentManager::get_document_id($course_info, dirname($file)); |
|
99 | - $dir = dirname($document_data['path']); |
|
100 | - $dir_original = $dir; |
|
101 | - $doc = basename($file); |
|
102 | - $readonly = $document_data['readonly']; |
|
96 | + $document_id = $document_data['id']; |
|
97 | + $file = $document_data['path']; |
|
98 | + $parent_id = DocumentManager::get_document_id($course_info, dirname($file)); |
|
99 | + $dir = dirname($document_data['path']); |
|
100 | + $dir_original = $dir; |
|
101 | + $doc = basename($file); |
|
102 | + $readonly = $document_data['readonly']; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | if (empty($document_data)) { |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | |
122 | 122 | // Level correction for group documents. |
123 | 123 | if (!empty($group_properties['directory'])) { |
124 | - $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
124 | + $count_dir = $count_dir > 0 ? $count_dir - 1 : 0; |
|
125 | 125 | } |
126 | 126 | $relative_url = ''; |
127 | 127 | for ($i = 0; $i < ($count_dir); $i++) { |
@@ -143,13 +143,13 @@ discard block |
||
143 | 143 | ); |
144 | 144 | |
145 | 145 | if ($is_certificate_mode) { |
146 | - $editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
147 | - $editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
148 | - $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir; |
|
146 | + $editorConfig['CreateDocumentDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
147 | + $editorConfig['CreateDocumentWebDir'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'; |
|
148 | + $editorConfig['BaseHref'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir; |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | $is_allowed_to_edit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights']|| |
152 | - DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
|
152 | + DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $sessionId); |
|
153 | 153 | $noPHP_SELF = true; |
154 | 154 | |
155 | 155 | /* Other initialization code */ |
@@ -162,8 +162,8 @@ discard block |
||
162 | 162 | 'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(), |
163 | 163 | 'name' => get_lang('GroupSpace'), |
164 | 164 | ); |
165 | - $group_document = true; |
|
166 | - $noPHP_SELF = true; |
|
165 | + $group_document = true; |
|
166 | + $noPHP_SELF = true; |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | if (!$is_certificate_mode) { |
@@ -197,9 +197,9 @@ discard block |
||
197 | 197 | |
198 | 198 | //TODO:check the below code and his funcionality |
199 | 199 | if (!api_is_allowed_to_edit()) { |
200 | - if (DocumentManager::check_readonly($course_info, $user_id, $file)) { |
|
201 | - api_not_allowed(); |
|
202 | - } |
|
200 | + if (DocumentManager::check_readonly($course_info, $user_id, $file)) { |
|
201 | + api_not_allowed(); |
|
202 | + } |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | /* MAIN TOOL CODE */ |
@@ -207,18 +207,18 @@ discard block |
||
207 | 207 | /* Code to change the comment */ |
208 | 208 | |
209 | 209 | if (isset($_POST['comment'])) { |
210 | - // Fixing the path if it is wrong |
|
211 | - $comment = trim($_POST['comment']); |
|
212 | - $title = trim($_POST['title']); |
|
210 | + // Fixing the path if it is wrong |
|
211 | + $comment = trim($_POST['comment']); |
|
212 | + $title = trim($_POST['title']); |
|
213 | 213 | |
214 | 214 | // Just in case see BT#3525 |
215 | 215 | if (empty($title)) { |
216 | - $title = $document_data['title']; |
|
217 | - } |
|
216 | + $title = $document_data['title']; |
|
217 | + } |
|
218 | 218 | |
219 | - if (empty($title)) { |
|
220 | - $title = get_document_title($_POST['filename']); |
|
221 | - } |
|
219 | + if (empty($title)) { |
|
220 | + $title = get_document_title($_POST['filename']); |
|
221 | + } |
|
222 | 222 | |
223 | 223 | if (!empty($document_id)) { |
224 | 224 | $params = [ |
@@ -230,43 +230,43 @@ discard block |
||
230 | 230 | $params, |
231 | 231 | ['c_id = ? AND id = ?' => [$course_id, $document_id]] |
232 | 232 | ); |
233 | - Display::addFlash(Display::return_message(get_lang('fileModified'))); |
|
233 | + Display::addFlash(Display::return_message(get_lang('fileModified'))); |
|
234 | 234 | } |
235 | 235 | } |
236 | 236 | |
237 | 237 | /* WYSIWYG HTML EDITOR - Program Logic */ |
238 | 238 | if ($is_allowed_to_edit) { |
239 | - if (isset($_POST['formSent']) && $_POST['formSent'] == 1) { |
|
239 | + if (isset($_POST['formSent']) && $_POST['formSent'] == 1) { |
|
240 | 240 | |
241 | - $filename = stripslashes($_POST['filename']); |
|
241 | + $filename = stripslashes($_POST['filename']); |
|
242 | 242 | $extension = $_POST['extension']; |
243 | - $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null; |
|
244 | - $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY); |
|
243 | + $content = isset($_POST['content']) ? trim(str_replace(array("\r", "\n"), '', stripslashes($_POST['content']))) : null; |
|
244 | + $content = Security::remove_XSS($content, COURSEMANAGERLOWSECURITY); |
|
245 | 245 | |
246 | 246 | if ($dir == '/') { |
247 | 247 | $dir = ''; |
248 | 248 | } |
249 | 249 | |
250 | - $file = $dir.'/'.$filename.'.'.$extension; |
|
251 | - $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
252 | - $read_only_flag = empty($read_only_flag) ? 0 : 1; |
|
250 | + $file = $dir.'/'.$filename.'.'.$extension; |
|
251 | + $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
252 | + $read_only_flag = empty($read_only_flag) ? 0 : 1; |
|
253 | 253 | |
254 | - if (empty($filename)) { |
|
254 | + if (empty($filename)) { |
|
255 | 255 | Display::addFlash(Display::return_message(get_lang('NoFileName'), 'warning')); |
256 | - } else { |
|
256 | + } else { |
|
257 | 257 | |
258 | - $file_size = filesize($document_data['absolute_path']); |
|
258 | + $file_size = filesize($document_data['absolute_path']); |
|
259 | 259 | |
260 | - if ($read_only_flag == 0) { |
|
261 | - if (!empty($content)) { |
|
262 | - if ($fp = @fopen($document_data['absolute_path'], 'w')) { |
|
263 | - // For flv player, change absolute path temporarily to prevent from erasing it in the following lines |
|
264 | - $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content); |
|
265 | - fputs($fp, $content); |
|
266 | - fclose($fp); |
|
260 | + if ($read_only_flag == 0) { |
|
261 | + if (!empty($content)) { |
|
262 | + if ($fp = @fopen($document_data['absolute_path'], 'w')) { |
|
263 | + // For flv player, change absolute path temporarily to prevent from erasing it in the following lines |
|
264 | + $content = str_replace(array('flv=h', 'flv=/'), array('flv=h|', 'flv=/|'), $content); |
|
265 | + fputs($fp, $content); |
|
266 | + fclose($fp); |
|
267 | 267 | |
268 | 268 | $filepath = $document_data['absolute_parent_path']; |
269 | - /* |
|
269 | + /* |
|
270 | 270 | if (!is_dir($filepath.'css')) { |
271 | 271 | mkdir($filepath.'css', api_get_permissions_for_new_directories()); |
272 | 272 | $doc_id = add_document($_course, $dir.'css', 'folder', 0, 'css'); |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | ); |
297 | 297 | }*/ |
298 | 298 | |
299 | - /*if (!is_file($filepath.'css/frames.css')) { |
|
299 | + /*if (!is_file($filepath.'css/frames.css')) { |
|
300 | 300 | $platform_theme = api_get_setting('stylesheets'); |
301 | 301 | if (file_exists(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css')) { |
302 | 302 | copy(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css', $filepath.'css/frames.css'); |
@@ -334,54 +334,54 @@ discard block |
||
334 | 334 | } |
335 | 335 | }*/ |
336 | 336 | |
337 | - // "WHAT'S NEW" notification: update table item_property |
|
338 | - $document_id = DocumentManager::get_document_id($_course, $file); |
|
339 | - |
|
340 | - if ($document_id) { |
|
341 | - update_existing_document( |
|
342 | - $_course, |
|
343 | - $document_id, |
|
344 | - $file_size, |
|
345 | - $read_only_flag |
|
346 | - ); |
|
347 | - api_item_property_update( |
|
348 | - $_course, |
|
349 | - TOOL_DOCUMENT, |
|
350 | - $document_id, |
|
351 | - 'DocumentUpdated', |
|
352 | - api_get_user_id(), |
|
353 | - null, |
|
354 | - null, |
|
355 | - null, |
|
356 | - null, |
|
357 | - $sessionId |
|
358 | - ); |
|
359 | - // Update parent folders |
|
360 | - item_property_update_on_folder( |
|
361 | - $_course, |
|
362 | - $dir, |
|
363 | - api_get_user_id() |
|
364 | - ); |
|
365 | - header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
366 | - exit; |
|
367 | - } else { |
|
337 | + // "WHAT'S NEW" notification: update table item_property |
|
338 | + $document_id = DocumentManager::get_document_id($_course, $file); |
|
339 | + |
|
340 | + if ($document_id) { |
|
341 | + update_existing_document( |
|
342 | + $_course, |
|
343 | + $document_id, |
|
344 | + $file_size, |
|
345 | + $read_only_flag |
|
346 | + ); |
|
347 | + api_item_property_update( |
|
348 | + $_course, |
|
349 | + TOOL_DOCUMENT, |
|
350 | + $document_id, |
|
351 | + 'DocumentUpdated', |
|
352 | + api_get_user_id(), |
|
353 | + null, |
|
354 | + null, |
|
355 | + null, |
|
356 | + null, |
|
357 | + $sessionId |
|
358 | + ); |
|
359 | + // Update parent folders |
|
360 | + item_property_update_on_folder( |
|
361 | + $_course, |
|
362 | + $dir, |
|
363 | + api_get_user_id() |
|
364 | + ); |
|
365 | + header('Location: document.php?id=' . $document_data['parent_id'] . '&' . api_get_cidreq() . ($is_certificate_mode?'&curdirpath=/certificates&selectcat=1':'')); |
|
366 | + exit; |
|
367 | + } else { |
|
368 | 368 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
369 | - } |
|
370 | - } else { |
|
369 | + } |
|
370 | + } else { |
|
371 | 371 | Display::addFlash(Display::return_message(get_lang('Impossible'), 'warning')); |
372 | - } |
|
373 | - } else { |
|
374 | - if ($document_id) { |
|
372 | + } |
|
373 | + } else { |
|
374 | + if ($document_id) { |
|
375 | 375 | update_existing_document($_course, $document_id, $file_size, $read_only_flag); |
376 | - } |
|
377 | - } |
|
378 | - } else { |
|
376 | + } |
|
377 | + } |
|
378 | + } else { |
|
379 | 379 | if ($document_id) { |
380 | 380 | update_existing_document($_course, $document_id, $file_size, $read_only_flag); |
381 | 381 | } |
382 | - } |
|
383 | - } |
|
384 | - } |
|
382 | + } |
|
383 | + } |
|
384 | + } |
|
385 | 385 | } |
386 | 386 | |
387 | 387 | // Replace relative paths by absolute web paths (e.g. './' => 'http://www.chamilo.org/courses/ABC/document/') |
@@ -435,35 +435,35 @@ discard block |
||
435 | 435 | api_get_group_id() |
436 | 436 | ) |
437 | 437 | ) { |
438 | - $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq(); |
|
438 | + $action = api_get_self().'?id='.$document_data['id'].'&'.api_get_cidreq(); |
|
439 | 439 | if ($is_certificate_mode) { |
440 | 440 | $action .= '&curdirpath=/certificates&selectcat=1'; |
441 | 441 | } |
442 | - $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical')); |
|
443 | - |
|
444 | - // Form title |
|
445 | - $form->addElement('header', $nameTools); |
|
446 | - $form->addElement('hidden', 'filename'); |
|
447 | - $form->addElement('hidden', 'extension'); |
|
448 | - $form->addElement('hidden', 'file_path'); |
|
449 | - $form->addElement('hidden', 'commentPath'); |
|
450 | - $form->addElement('hidden', 'showedit'); |
|
451 | - $form->addElement('hidden', 'origin'); |
|
452 | - $form->addElement('hidden', 'origin_opt'); |
|
442 | + $form = new FormValidator('formEdit', 'post', $action, null, array('class' => 'form-vertical')); |
|
443 | + |
|
444 | + // Form title |
|
445 | + $form->addElement('header', $nameTools); |
|
446 | + $form->addElement('hidden', 'filename'); |
|
447 | + $form->addElement('hidden', 'extension'); |
|
448 | + $form->addElement('hidden', 'file_path'); |
|
449 | + $form->addElement('hidden', 'commentPath'); |
|
450 | + $form->addElement('hidden', 'showedit'); |
|
451 | + $form->addElement('hidden', 'origin'); |
|
452 | + $form->addElement('hidden', 'origin_opt'); |
|
453 | 453 | $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus')); |
454 | 454 | |
455 | - $defaults['title'] = $document_data['title']; |
|
455 | + $defaults['title'] = $document_data['title']; |
|
456 | 456 | |
457 | - $form->addElement('hidden', 'formSent'); |
|
458 | - $defaults['formSent'] = 1; |
|
457 | + $form->addElement('hidden', 'formSent'); |
|
458 | + $defaults['formSent'] = 1; |
|
459 | 459 | |
460 | - $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
460 | + $read_only_flag = isset($_POST['readonly']) ? $_POST['readonly'] : null; |
|
461 | 461 | |
462 | - // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor. |
|
463 | - // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573 |
|
464 | - $defaults['content'] = str_replace('<!--[', '<!-- [', $content); |
|
462 | + // Desactivation of IE proprietary commenting tags inside the text before loading it on the online editor. |
|
463 | + // This fix has been proposed by Hubert Borderiou, see Bug #573, http://support.chamilo.org/issues/573 |
|
464 | + $defaults['content'] = str_replace('<!--[', '<!-- [', $content); |
|
465 | 465 | |
466 | - // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved. |
|
466 | + // HotPotatoes tests are html files, but they should not be edited in order their functionality to be preserved. |
|
467 | 467 | |
468 | 468 | $showSystemFolders = api_get_course_setting('show_system_folders'); |
469 | 469 | $condition = stripos($dir, '/HotPotatoes_files') === false; |
@@ -471,44 +471,44 @@ discard block |
||
471 | 471 | $condition = true; |
472 | 472 | } |
473 | 473 | |
474 | - if (($extension == 'htm' || $extension == 'html') && $condition) { |
|
475 | - if (empty($readonly) && $readonly == 0) { |
|
474 | + if (($extension == 'htm' || $extension == 'html') && $condition) { |
|
475 | + if (empty($readonly) && $readonly == 0) { |
|
476 | 476 | $form->addHtmlEditor('content', '', true, true, $editorConfig); |
477 | - } |
|
478 | - } |
|
477 | + } |
|
478 | + } |
|
479 | 479 | |
480 | - if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) { |
|
481 | - // Updated on field |
|
480 | + if (!$group_document && !DocumentManager::is_my_shared_folder(api_get_user_id(), $currentDirPath, $sessionId)) { |
|
481 | + // Updated on field |
|
482 | 482 | $display_date = date_to_str_ago($last_edit_date). |
483 | - ' <span class="dropbox_date">'.api_format_date(api_get_local_time($last_edit_date)).'</span>'; |
|
484 | - $form->addElement('static', null, get_lang('UpdatedOn'), $display_date); |
|
485 | - } |
|
483 | + ' <span class="dropbox_date">'.api_format_date(api_get_local_time($last_edit_date)).'</span>'; |
|
484 | + $form->addElement('static', null, get_lang('UpdatedOn'), $display_date); |
|
485 | + } |
|
486 | 486 | |
487 | - $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
|
487 | + $form->addElement('textarea', 'comment', get_lang('Comment'), ['cols-size' => [2, 10, 0]]); |
|
488 | 488 | |
489 | - if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
|
490 | - $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
491 | - if ($readonly == 1) { |
|
492 | - $checked->setChecked(true); |
|
493 | - } |
|
494 | - } |
|
489 | + if ($owner_id == api_get_user_id() || api_is_platform_admin()) { |
|
490 | + $checked =& $form->addElement('checkbox', 'readonly', null, get_lang('ReadOnly')); |
|
491 | + if ($readonly == 1) { |
|
492 | + $checked->setChecked(true); |
|
493 | + } |
|
494 | + } |
|
495 | 495 | |
496 | - if ($is_certificate_mode) { |
|
497 | - $form->addButtonUpdate(get_lang('SaveCertificate')); |
|
496 | + if ($is_certificate_mode) { |
|
497 | + $form->addButtonUpdate(get_lang('SaveCertificate')); |
|
498 | 498 | } else { |
499 | - $form->addButtonUpdate(get_lang('SaveDocument')); |
|
499 | + $form->addButtonUpdate(get_lang('SaveDocument')); |
|
500 | 500 | } |
501 | 501 | |
502 | - $defaults['filename'] = $filename; |
|
503 | - $defaults['extension'] = $extension; |
|
504 | - $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null; |
|
505 | - $defaults['commentPath'] = $file; |
|
506 | - $defaults['renameTo'] = $file_name; |
|
507 | - $defaults['comment'] = $document_data['comment']; |
|
508 | - $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null; |
|
509 | - $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null; |
|
502 | + $defaults['filename'] = $filename; |
|
503 | + $defaults['extension'] = $extension; |
|
504 | + $defaults['file_path'] = isset($_GET['file']) ? Security::remove_XSS($_GET['file']) : null; |
|
505 | + $defaults['commentPath'] = $file; |
|
506 | + $defaults['renameTo'] = $file_name; |
|
507 | + $defaults['comment'] = $document_data['comment']; |
|
508 | + $defaults['origin'] = isset($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : null; |
|
509 | + $defaults['origin_opt'] = isset($_GET['origin_opt']) ? Security::remove_XSS($_GET['origin_opt']) : null; |
|
510 | 510 | |
511 | - $form->setDefaults($defaults); |
|
511 | + $form->setDefaults($defaults); |
|
512 | 512 | |
513 | 513 | show_return( |
514 | 514 | $parent_id, |
@@ -518,25 +518,25 @@ discard block |
||
518 | 518 | $is_certificate_mode |
519 | 519 | ); |
520 | 520 | |
521 | - if ($is_certificate_mode) { |
|
522 | - $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate( |
|
523 | - api_get_user_id(), |
|
524 | - api_get_course_id() |
|
525 | - ); |
|
526 | - $str_info = ''; |
|
527 | - foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
528 | - $str_info .= $info_value.'<br/>'; |
|
529 | - } |
|
530 | - $create_certificate=get_lang('CreateCertificateWithTags'); |
|
531 | - Display::display_normal_message( |
|
532 | - $create_certificate.': <br /><br />'.$str_info, |
|
533 | - false |
|
534 | - ); |
|
535 | - } |
|
536 | - |
|
537 | - if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
538 | - Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
|
539 | - } |
|
521 | + if ($is_certificate_mode) { |
|
522 | + $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate( |
|
523 | + api_get_user_id(), |
|
524 | + api_get_course_id() |
|
525 | + ); |
|
526 | + $str_info = ''; |
|
527 | + foreach ($all_information_by_create_certificate[0] as $info_value) { |
|
528 | + $str_info .= $info_value.'<br/>'; |
|
529 | + } |
|
530 | + $create_certificate=get_lang('CreateCertificateWithTags'); |
|
531 | + Display::display_normal_message( |
|
532 | + $create_certificate.': <br /><br />'.$str_info, |
|
533 | + false |
|
534 | + ); |
|
535 | + } |
|
536 | + |
|
537 | + if ($extension=='svg' && !api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){ |
|
538 | + Display::display_warning_message(get_lang('BrowserDontSupportsSVG')); |
|
539 | + } |
|
540 | 540 | // HTML-editor |
541 | 541 | echo '<div class="page-create"> |
542 | 542 | <div class="row" style="overflow:hidden"> |
@@ -563,26 +563,26 @@ discard block |
||
563 | 563 | */ |
564 | 564 | function change_name($base_work_dir, $source_file, $rename_to, $dir, $doc) |
565 | 565 | { |
566 | - $file_name_for_change = $base_work_dir.$dir.$source_file; |
|
566 | + $file_name_for_change = $base_work_dir.$dir.$source_file; |
|
567 | 567 | $rename_to = disable_dangerous_file($rename_to); // Avoid renaming to .htaccess file |
568 | - $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API |
|
569 | - |
|
570 | - if ($rename_to) { |
|
571 | - if (isset($dir) && $dir != '') { |
|
572 | - $source_file = $dir.$source_file; |
|
573 | - $new_full_file_name = dirname($source_file).'/'.$rename_to; |
|
574 | - } else { |
|
575 | - $source_file = '/'.$source_file; |
|
576 | - $new_full_file_name = '/'.$rename_to; |
|
577 | - } |
|
578 | - |
|
579 | - update_db_info('update', $source_file, $new_full_file_name); // fileManage API |
|
568 | + $rename_to = my_rename($file_name_for_change, stripslashes($rename_to)); // fileManage API |
|
569 | + |
|
570 | + if ($rename_to) { |
|
571 | + if (isset($dir) && $dir != '') { |
|
572 | + $source_file = $dir.$source_file; |
|
573 | + $new_full_file_name = dirname($source_file).'/'.$rename_to; |
|
574 | + } else { |
|
575 | + $source_file = '/'.$source_file; |
|
576 | + $new_full_file_name = '/'.$rename_to; |
|
577 | + } |
|
578 | + |
|
579 | + update_db_info('update', $source_file, $new_full_file_name); // fileManage API |
|
580 | 580 | Display::addFlash(Display::return_message(get_lang('fileModified'))); |
581 | 581 | |
582 | - return true; |
|
583 | - } else { |
|
582 | + return true; |
|
583 | + } else { |
|
584 | 584 | Display::addFlash(Display::return_message(get_lang('FileExists'))); |
585 | - } |
|
585 | + } |
|
586 | 586 | } |
587 | 587 | |
588 | 588 | //return button back to |
@@ -595,32 +595,32 @@ discard block |
||
595 | 595 | global $parent_id; |
596 | 596 | $url = api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$parent_id; |
597 | 597 | |
598 | - if ($is_certificate_mode) { |
|
599 | - $selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : ''); |
|
600 | - $actionsLeft .= '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'. |
|
598 | + if ($is_certificate_mode) { |
|
599 | + $selectedCategory = (isset($_GET['curdirpath']) ? Security::remove_XSS($_GET['curdirpath']) : ''); |
|
600 | + $actionsLeft .= '<a href="document.php?curdirpath='. $selectedCategory .'&selectcat=' . $selectedCategory .'">'. |
|
601 | 601 | Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
602 | 602 | $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>'; |
603 | - } elseif($call_from_tool=='slideshow') { |
|
604 | - $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
|
603 | + } elseif($call_from_tool=='slideshow') { |
|
604 | + $actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'. |
|
605 | 605 | Display::return_icon('slideshow.png', get_lang('BackTo').' '.get_lang('ViewSlideshow'),'',ICON_SIZE_MEDIUM).'</a>'; |
606 | - } elseif($call_from_tool=='editdraw') { |
|
607 | - $actionsLeft .= '<a href="'.$url.'">'. |
|
606 | + } elseif($call_from_tool=='editdraw') { |
|
607 | + $actionsLeft .= '<a href="'.$url.'">'. |
|
608 | 608 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
609 | - $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
|
610 | - } elseif($call_from_tool=='editodf') { |
|
609 | + $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Draw'), array(), 32).'</a>'; |
|
610 | + } elseif($call_from_tool=='editodf') { |
|
611 | 611 | $actionsLeft .= '<a href="'.$url.'">'. |
612 | 612 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
613 | 613 | $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('draw.png', get_lang('BackTo').' '.get_lang('Write'), array(), 32).'</a>'; |
614 | 614 | $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>'; |
615 | 615 | } elseif($call_from_tool=='editpaint'){ |
616 | - $actionsLeft .= '<a href="'.$url.'">'. |
|
616 | + $actionsLeft .= '<a href="'.$url.'">'. |
|
617 | 617 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'), array(), ICON_SIZE_MEDIUM).'</a>'; |
618 | - $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
|
619 | - } else { |
|
620 | - $actionsLeft .= '<a href="'.$url.'">'. |
|
618 | + $actionsLeft .= '<a href="javascript:history.back(1)">'.Display::return_icon('paint.png', get_lang('BackTo').' '.get_lang('Paint'), array(), 32).'</a>'; |
|
619 | + } else { |
|
620 | + $actionsLeft .= '<a href="'.$url.'">'. |
|
621 | 621 | Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>'; |
622 | 622 | $actionsLeft .= '<a id="hide_bar_template" href="#">'.Display::return_icon('expand.png',get_lang('Expand'),array('id'=>'expand'),ICON_SIZE_MEDIUM).Display::return_icon('contract.png',get_lang('Collapse'),array('id'=>'contract', 'class'=>'hide'),ICON_SIZE_MEDIUM).'</a>'; |
623 | - } |
|
623 | + } |
|
624 | 624 | |
625 | 625 | echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => '')); |
626 | 626 | } |
@@ -3,121 +3,121 @@ discard block |
||
3 | 3 | * Validates imported data. |
4 | 4 | */ |
5 | 5 | function validate_data($users) { |
6 | - global $defined_auth_sources; |
|
7 | - $errors = array (); |
|
8 | - $usernames = array (); |
|
9 | - if(is_array($users)) { |
|
10 | - foreach ($users as $index => $user) { |
|
11 | - // 1. Check whether mandatory fields have been set. |
|
12 | - $mandatory_fields = array ('LastName', 'FirstName'); |
|
13 | - if (api_get_setting('registration', 'email') == 'true') { |
|
14 | - $mandatory_fields[] = 'Email'; |
|
15 | - } |
|
16 | - foreach ($mandatory_fields as $key => $field) { |
|
17 | - if (!isset ($user[$field]) || strlen($user[$field]) == 0) { |
|
18 | - $user['error'] = get_lang($field.'Mandatory'); |
|
19 | - $errors[] = $user; |
|
20 | - } |
|
21 | - } |
|
22 | - // 2. Check username. |
|
23 | - if (!UserManager::is_username_empty($user['UserName'])) { |
|
24 | - // 2.1. Check whether username was used twice in the import file. |
|
25 | - if (isset($usernames[$user['UserName']])) { |
|
26 | - $user['error'] = get_lang('UserNameUsedTwice'); |
|
27 | - $errors[] = $user; |
|
28 | - } |
|
29 | - $usernames[$user['UserName']] = 1; |
|
30 | - // 2.2. Check whether username is allready in use in database. |
|
31 | - if (!UserManager::is_username_available($user['UserName'])) { |
|
32 | - $user['error'] = get_lang('UserNameNotAvailable'); |
|
33 | - $errors[] = $user; |
|
34 | - } |
|
35 | - // 2.3. Check whether username is too long. |
|
36 | - if (UserManager::is_username_too_long($user['UserName'])) { |
|
37 | - $user['error'] = get_lang('UserNameTooLong'); |
|
38 | - $errors[] = $user; |
|
39 | - } |
|
40 | - } |
|
41 | - // 3. Check status. |
|
42 | - if (isset ($user['Status']) && !api_status_exists($user['Status'])) { |
|
43 | - $user['error'] = get_lang('WrongStatus'); |
|
44 | - $errors[] = $user; |
|
45 | - } |
|
46 | - // 5. Check authentication source. |
|
47 | - if (isset ($user['AuthSource']) && strlen($user['AuthSource']) != 0) { |
|
48 | - if (!in_array($user['AuthSource'], $defined_auth_sources)) { |
|
49 | - $user['error'] = get_lang('AuthSourceNotAvailable'); |
|
50 | - $errors[] = $user; |
|
51 | - } |
|
52 | - } |
|
53 | - } |
|
54 | - } |
|
55 | - return $errors; |
|
6 | + global $defined_auth_sources; |
|
7 | + $errors = array (); |
|
8 | + $usernames = array (); |
|
9 | + if(is_array($users)) { |
|
10 | + foreach ($users as $index => $user) { |
|
11 | + // 1. Check whether mandatory fields have been set. |
|
12 | + $mandatory_fields = array ('LastName', 'FirstName'); |
|
13 | + if (api_get_setting('registration', 'email') == 'true') { |
|
14 | + $mandatory_fields[] = 'Email'; |
|
15 | + } |
|
16 | + foreach ($mandatory_fields as $key => $field) { |
|
17 | + if (!isset ($user[$field]) || strlen($user[$field]) == 0) { |
|
18 | + $user['error'] = get_lang($field.'Mandatory'); |
|
19 | + $errors[] = $user; |
|
20 | + } |
|
21 | + } |
|
22 | + // 2. Check username. |
|
23 | + if (!UserManager::is_username_empty($user['UserName'])) { |
|
24 | + // 2.1. Check whether username was used twice in the import file. |
|
25 | + if (isset($usernames[$user['UserName']])) { |
|
26 | + $user['error'] = get_lang('UserNameUsedTwice'); |
|
27 | + $errors[] = $user; |
|
28 | + } |
|
29 | + $usernames[$user['UserName']] = 1; |
|
30 | + // 2.2. Check whether username is allready in use in database. |
|
31 | + if (!UserManager::is_username_available($user['UserName'])) { |
|
32 | + $user['error'] = get_lang('UserNameNotAvailable'); |
|
33 | + $errors[] = $user; |
|
34 | + } |
|
35 | + // 2.3. Check whether username is too long. |
|
36 | + if (UserManager::is_username_too_long($user['UserName'])) { |
|
37 | + $user['error'] = get_lang('UserNameTooLong'); |
|
38 | + $errors[] = $user; |
|
39 | + } |
|
40 | + } |
|
41 | + // 3. Check status. |
|
42 | + if (isset ($user['Status']) && !api_status_exists($user['Status'])) { |
|
43 | + $user['error'] = get_lang('WrongStatus'); |
|
44 | + $errors[] = $user; |
|
45 | + } |
|
46 | + // 5. Check authentication source. |
|
47 | + if (isset ($user['AuthSource']) && strlen($user['AuthSource']) != 0) { |
|
48 | + if (!in_array($user['AuthSource'], $defined_auth_sources)) { |
|
49 | + $user['error'] = get_lang('AuthSourceNotAvailable'); |
|
50 | + $errors[] = $user; |
|
51 | + } |
|
52 | + } |
|
53 | + } |
|
54 | + } |
|
55 | + return $errors; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
59 | 59 | * Adds missing user-information (which isn't required, like password, username, etc). |
60 | 60 | */ |
61 | 61 | function complete_missing_data($user) { |
62 | - // 1. Create a username if necessary. |
|
63 | - if (UserManager::is_username_empty($user['UserName'])) { |
|
64 | - $user['UserName'] = UserManager::create_unique_username($user['FirstName'], $user['LastName']); |
|
65 | - } |
|
66 | - // 2. Generate a password if necessary. |
|
67 | - if (!isset ($user['Password']) || strlen($user['Password']) == 0) { |
|
68 | - $user['Password'] = api_generate_password(); |
|
69 | - } |
|
70 | - // 3. set status if not allready set. |
|
71 | - if (!isset ($user['Status']) || strlen($user['Status']) == 0) { |
|
72 | - $user['Status'] = 'user'; |
|
73 | - } |
|
74 | - // 4. Set authsource if not allready set. |
|
75 | - if (!isset ($user['AuthSource']) || strlen($user['AuthSource']) == 0) { |
|
76 | - $user['AuthSource'] = PLATFORM_AUTH_SOURCE; |
|
77 | - } |
|
78 | - return $user; |
|
62 | + // 1. Create a username if necessary. |
|
63 | + if (UserManager::is_username_empty($user['UserName'])) { |
|
64 | + $user['UserName'] = UserManager::create_unique_username($user['FirstName'], $user['LastName']); |
|
65 | + } |
|
66 | + // 2. Generate a password if necessary. |
|
67 | + if (!isset ($user['Password']) || strlen($user['Password']) == 0) { |
|
68 | + $user['Password'] = api_generate_password(); |
|
69 | + } |
|
70 | + // 3. set status if not allready set. |
|
71 | + if (!isset ($user['Status']) || strlen($user['Status']) == 0) { |
|
72 | + $user['Status'] = 'user'; |
|
73 | + } |
|
74 | + // 4. Set authsource if not allready set. |
|
75 | + if (!isset ($user['AuthSource']) || strlen($user['AuthSource']) == 0) { |
|
76 | + $user['AuthSource'] = PLATFORM_AUTH_SOURCE; |
|
77 | + } |
|
78 | + return $user; |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
82 | 82 | * Save the imported data |
83 | 83 | */ |
84 | 84 | function save_data($users) { |
85 | - $user_table = Database :: get_main_table(TABLE_MAIN_USER); |
|
86 | - if(is_array($users)) { |
|
87 | - foreach ($users as $index => $user) { |
|
88 | - $user = complete_missing_data($user); |
|
85 | + $user_table = Database :: get_main_table(TABLE_MAIN_USER); |
|
86 | + if(is_array($users)) { |
|
87 | + foreach ($users as $index => $user) { |
|
88 | + $user = complete_missing_data($user); |
|
89 | 89 | |
90 | - $user['Status'] = api_status_key($user['Status']); |
|
90 | + $user['Status'] = api_status_key($user['Status']); |
|
91 | 91 | |
92 | - $user_id = UserManager :: create_user($user['FirstName'], $user['LastName'], $user['Status'], $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], '', $user['AuthSource']); |
|
93 | - foreach ($user['Courses'] as $index => $course) { |
|
94 | - if(CourseManager :: course_exists($course)) |
|
95 | - CourseManager :: subscribe_user($user_id, $course,$user['Status']); |
|
96 | - } |
|
92 | + $user_id = UserManager :: create_user($user['FirstName'], $user['LastName'], $user['Status'], $user['Email'], $user['UserName'], $user['Password'], $user['OfficialCode'], api_get_setting('PlatformLanguage'), $user['PhoneNumber'], '', $user['AuthSource']); |
|
93 | + foreach ($user['Courses'] as $index => $course) { |
|
94 | + if(CourseManager :: course_exists($course)) |
|
95 | + CourseManager :: subscribe_user($user_id, $course,$user['Status']); |
|
96 | + } |
|
97 | 97 | |
98 | - // TODO: Hard-coded French texts. |
|
98 | + // TODO: Hard-coded French texts. |
|
99 | 99 | |
100 | - // Qualite |
|
101 | - if (!empty($user['Qualite'])) { |
|
102 | - UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']); |
|
103 | - } |
|
100 | + // Qualite |
|
101 | + if (!empty($user['Qualite'])) { |
|
102 | + UserManager::update_extra_field_value($user_id, 'qualite', $user['Qualite']); |
|
103 | + } |
|
104 | 104 | |
105 | - // Categorie |
|
106 | - if (!empty($user['Categorie'])) { |
|
107 | - UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']); |
|
108 | - } |
|
105 | + // Categorie |
|
106 | + if (!empty($user['Categorie'])) { |
|
107 | + UserManager::update_extra_field_value($user_id, 'categorie', $user['Categorie']); |
|
108 | + } |
|
109 | 109 | |
110 | - // Etat |
|
111 | - if (!empty($user['Etat'])) { |
|
112 | - UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']); |
|
113 | - } |
|
110 | + // Etat |
|
111 | + if (!empty($user['Etat'])) { |
|
112 | + UserManager::update_extra_field_value($user_id, 'etat', $user['Etat']); |
|
113 | + } |
|
114 | 114 | |
115 | - // Niveau |
|
116 | - if (!empty($user['Niveau'])) { |
|
117 | - UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']); |
|
118 | - } |
|
119 | - } |
|
120 | - } |
|
115 | + // Niveau |
|
116 | + if (!empty($user['Niveau'])) { |
|
117 | + UserManager::update_extra_field_value($user_id, 'niveau', $user['Niveau']); |
|
118 | + } |
|
119 | + } |
|
120 | + } |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | /** |
@@ -126,12 +126,12 @@ discard block |
||
126 | 126 | * @return array All userinformation read from the file |
127 | 127 | */ |
128 | 128 | function parse_csv_data($file) { |
129 | - $users = Import :: csvToArray($file); |
|
130 | - foreach ($users as $index => $user) { |
|
131 | - if (isset ($user['Courses'])) { |
|
132 | - $user['Courses'] = explode('|', trim($user['Courses'])); |
|
133 | - } |
|
134 | - $users[$index] = $user; |
|
135 | - } |
|
136 | - return $users; |
|
129 | + $users = Import :: csvToArray($file); |
|
130 | + foreach ($users as $index => $user) { |
|
131 | + if (isset ($user['Courses'])) { |
|
132 | + $user['Courses'] = explode('|', trim($user['Courses'])); |
|
133 | + } |
|
134 | + $users[$index] = $user; |
|
135 | + } |
|
136 | + return $users; |
|
137 | 137 | } |
@@ -14,20 +14,20 @@ discard block |
||
14 | 14 | */ |
15 | 15 | class UniqueAnswerNoOption extends Question |
16 | 16 | { |
17 | - public static $typePicture = 'mcuao.png'; |
|
18 | - public static $explanationLangVar = 'UniqueAnswerNoOption'; |
|
17 | + public static $typePicture = 'mcuao.png'; |
|
18 | + public static $explanationLangVar = 'UniqueAnswerNoOption'; |
|
19 | 19 | |
20 | - /** |
|
21 | - * Constructor |
|
22 | - */ |
|
23 | - public function __construct() |
|
20 | + /** |
|
21 | + * Constructor |
|
22 | + */ |
|
23 | + public function __construct() |
|
24 | 24 | { |
25 | - parent::__construct(); |
|
26 | - $this -> type = UNIQUE_ANSWER_NO_OPTION; |
|
27 | - $this -> isContent = $this-> getIsContent(); |
|
28 | - } |
|
25 | + parent::__construct(); |
|
26 | + $this -> type = UNIQUE_ANSWER_NO_OPTION; |
|
27 | + $this -> isContent = $this-> getIsContent(); |
|
28 | + } |
|
29 | 29 | |
30 | - /** |
|
30 | + /** |
|
31 | 31 | * function which redifines Question::createAnswersForm |
32 | 32 | * @param the formvalidator instance |
33 | 33 | * @param the answers number to display |
@@ -283,37 +283,37 @@ discard block |
||
283 | 283 | } |
284 | 284 | |
285 | 285 | /** |
286 | - * Function which creates the form to create / edit the answers of the question |
|
287 | - * @param the formvalidator instance |
|
288 | - * @param the answers number to display |
|
289 | - */ |
|
290 | - function processAnswersCreation($form) |
|
286 | + * Function which creates the form to create / edit the answers of the question |
|
287 | + * @param the formvalidator instance |
|
288 | + * @param the answers number to display |
|
289 | + */ |
|
290 | + function processAnswersCreation($form) |
|
291 | 291 | { |
292 | - $questionWeighting = $nbrGoodAnswers = 0; |
|
293 | - $correct = $form -> getSubmitValue('correct'); |
|
294 | - $objAnswer = new Answer($this->id); |
|
295 | - $nb_answers = $form -> getSubmitValue('nb_answers'); |
|
296 | - $minus = 1; |
|
297 | - if ($form -> getSubmitValue('new_question')) { |
|
298 | - $minus = 0; |
|
299 | - } |
|
300 | - |
|
301 | - for ($i=1 ; $i <= $nb_answers - $minus; $i++) { |
|
302 | - $position = trim($form -> getSubmitValue('position['.$i.']')); |
|
303 | - $answer = trim($form -> getSubmitValue('answer['.$i.']')); |
|
292 | + $questionWeighting = $nbrGoodAnswers = 0; |
|
293 | + $correct = $form -> getSubmitValue('correct'); |
|
294 | + $objAnswer = new Answer($this->id); |
|
295 | + $nb_answers = $form -> getSubmitValue('nb_answers'); |
|
296 | + $minus = 1; |
|
297 | + if ($form -> getSubmitValue('new_question')) { |
|
298 | + $minus = 0; |
|
299 | + } |
|
300 | + |
|
301 | + for ($i=1 ; $i <= $nb_answers - $minus; $i++) { |
|
302 | + $position = trim($form -> getSubmitValue('position['.$i.']')); |
|
303 | + $answer = trim($form -> getSubmitValue('answer['.$i.']')); |
|
304 | 304 | $comment = trim($form -> getSubmitValue('comment['.$i.']')); |
305 | 305 | $weighting = trim($form -> getSubmitValue('weighting['.$i.']')); |
306 | 306 | $scenario = $form -> getSubmitValue('scenario'); |
307 | 307 | |
308 | - //$list_destination = $form -> getSubmitValue('destination'.$i); |
|
309 | - //$destination_str = $form -> getSubmitValue('destination'.$i); |
|
308 | + //$list_destination = $form -> getSubmitValue('destination'.$i); |
|
309 | + //$destination_str = $form -> getSubmitValue('destination'.$i); |
|
310 | 310 | |
311 | - $try = $scenario['try'.$i]; |
|
311 | + $try = $scenario['try'.$i]; |
|
312 | 312 | $lp = $scenario['lp'.$i]; |
313 | - $destination = $scenario['destination'.$i]; |
|
314 | - $url = trim($scenario['url'.$i]); |
|
313 | + $destination = $scenario['destination'.$i]; |
|
314 | + $url = trim($scenario['url'.$i]); |
|
315 | 315 | |
316 | - /* |
|
316 | + /* |
|
317 | 317 | How we are going to parse the destination value |
318 | 318 | |
319 | 319 | here we parse the destination value which is a string |
@@ -326,41 +326,41 @@ discard block |
||
326 | 326 | selected_questions= ids of questions |
327 | 327 | url= an url |
328 | 328 | */ |
329 | - /* |
|
329 | + /* |
|
330 | 330 | $destination_str=''; |
331 | 331 | foreach ($list_destination as $destination_id) |
332 | 332 | { |
333 | 333 | $destination_str.=$destination_id.';'; |
334 | 334 | }*/ |
335 | 335 | |
336 | - $goodAnswer= ($correct == $i) ? true : false; |
|
336 | + $goodAnswer= ($correct == $i) ? true : false; |
|
337 | 337 | |
338 | - if ($goodAnswer) { |
|
339 | - $nbrGoodAnswers++; |
|
340 | - $weighting = abs($weighting); |
|
341 | - if($weighting > 0) { |
|
338 | + if ($goodAnswer) { |
|
339 | + $nbrGoodAnswers++; |
|
340 | + $weighting = abs($weighting); |
|
341 | + if($weighting > 0) { |
|
342 | 342 | $questionWeighting += $weighting; |
343 | 343 | } |
344 | - } |
|
344 | + } |
|
345 | 345 | |
346 | - if (empty($try)) |
|
347 | - $try=0; |
|
346 | + if (empty($try)) |
|
347 | + $try=0; |
|
348 | 348 | |
349 | - if (empty($lp)) { |
|
350 | - $lp=0; |
|
351 | - } |
|
349 | + if (empty($lp)) { |
|
350 | + $lp=0; |
|
351 | + } |
|
352 | 352 | |
353 | - if (empty($destination)) { |
|
354 | - $destination=0; |
|
355 | - } |
|
353 | + if (empty($destination)) { |
|
354 | + $destination=0; |
|
355 | + } |
|
356 | 356 | |
357 | - if ($url=='') { |
|
358 | - $url=0; |
|
359 | - } |
|
357 | + if ($url=='') { |
|
358 | + $url=0; |
|
359 | + } |
|
360 | 360 | |
361 | - //1@@1;2;@@2;4;4;@@http://www.chamilo.org |
|
362 | - $dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url; |
|
363 | - $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest); |
|
361 | + //1@@1;2;@@2;4;4;@@http://www.chamilo.org |
|
362 | + $dest= $try.'@@'.$lp.'@@'.$destination.'@@'.$url; |
|
363 | + $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest); |
|
364 | 364 | } |
365 | 365 | |
366 | 366 | //Create 666 answer |
@@ -373,18 +373,18 @@ discard block |
||
373 | 373 | |
374 | 374 | $objAnswer -> createAnswer($answer,$goodAnswer,$comment,$weighting,$i,NULL,NULL,$dest); |
375 | 375 | |
376 | - // saves the answers into the data base |
|
376 | + // saves the answers into the data base |
|
377 | 377 | $objAnswer -> save(); |
378 | 378 | |
379 | 379 | // sets the total weighting of the question |
380 | 380 | $this -> updateWeighting($questionWeighting); |
381 | 381 | $this -> save(); |
382 | - } |
|
382 | + } |
|
383 | 383 | |
384 | - function return_header($feedback_type = null, $counter = null, $score = null) |
|
384 | + function return_header($feedback_type = null, $counter = null, $score = null) |
|
385 | 385 | { |
386 | - $header = parent::return_header($feedback_type, $counter, $score); |
|
387 | - $header .= '<table class="'.$this->question_table_class .'"> |
|
386 | + $header = parent::return_header($feedback_type, $counter, $score); |
|
387 | + $header .= '<table class="'.$this->question_table_class .'"> |
|
388 | 388 | <tr> |
389 | 389 | <th>'.get_lang("Choice").'</th> |
390 | 390 | <th>'. get_lang("ExpectedChoice").'</th> |
@@ -392,5 +392,5 @@ discard block |
||
392 | 392 | $header .= '<th>'.get_lang("Comment").'</th>'; |
393 | 393 | $header .= '</tr>'; |
394 | 394 | return $header; |
395 | - } |
|
395 | + } |
|
396 | 396 | } |
@@ -25,8 +25,8 @@ |
||
25 | 25 | // user clicked ON a hotspot |
26 | 26 | $hit = 1; |
27 | 27 | $answerId = api_substr($_GET['answerId'],22,2); |
28 | - // Save into session |
|
29 | - $_SESSION['exerciseResult'][$questionId][$answerId] = $hit; |
|
28 | + // Save into session |
|
29 | + $_SESSION['exerciseResult'][$questionId][$answerId] = $hit; |
|
30 | 30 | } |
31 | 31 | //round-up the coordinates |
32 | 32 | $coords = explode('/',$coordinates); |
@@ -20,16 +20,16 @@ |
||
20 | 20 | $exerciseId = $objExercise->selectId(); |
21 | 21 | if ($_GET['answerId'] == "0") { // click is NOT on a hotspot |
22 | 22 | $hit = 0; |
23 | - $answerId = $hotspotId; |
|
23 | + $answerId = $hotspotId; |
|
24 | 24 | |
25 | - // remove from session |
|
26 | - unset($_SESSION['exerciseResult'][$questionId][$answerId]); |
|
25 | + // remove from session |
|
26 | + unset($_SESSION['exerciseResult'][$questionId][$answerId]); |
|
27 | 27 | } else { // user clicked ON a hotspot |
28 | - $hit = 1; |
|
29 | - $answerId = $hotspotId; |
|
28 | + $hit = 1; |
|
29 | + $answerId = $hotspotId; |
|
30 | 30 | |
31 | - // Save into session |
|
32 | - $_SESSION['exerciseResult'][$questionId][$answerId] = $hit; |
|
31 | + // Save into session |
|
32 | + $_SESSION['exerciseResult'][$questionId][$answerId] = $hit; |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | //round-up the coordinates |
@@ -49,29 +49,29 @@ discard block |
||
49 | 49 | $extra_field_list = UserManager::get_extra_fields(); |
50 | 50 | $new_field_list = array(); |
51 | 51 | if (is_array($extra_field_list)) { |
52 | - foreach ($extra_field_list as $extra_field) { |
|
53 | - //if is enabled to filter and is a "<select>" field type |
|
54 | - if ($extra_field[8]==1 && $extra_field[2]==4 ) { |
|
52 | + foreach ($extra_field_list as $extra_field) { |
|
53 | + //if is enabled to filter and is a "<select>" field type |
|
54 | + if ($extra_field[8]==1 && $extra_field[2]==4 ) { |
|
55 | 55 | $new_field_list[] = array( |
56 | 56 | 'name' => $extra_field[3], |
57 | 57 | 'variable' => $extra_field[1], |
58 | 58 | 'data' => $extra_field[9], |
59 | 59 | ); |
60 | - } |
|
61 | - } |
|
60 | + } |
|
61 | + } |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | function search_users($needle, $type) |
65 | 65 | { |
66 | - global $id_session; |
|
66 | + global $id_session; |
|
67 | 67 | |
68 | 68 | $tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
69 | 69 | $tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER); |
70 | 70 | |
71 | - $xajax_response = new xajaxResponse(); |
|
72 | - $return = ''; |
|
71 | + $xajax_response = new xajaxResponse(); |
|
72 | + $return = ''; |
|
73 | 73 | |
74 | - if (!empty($needle) && !empty($type)) { |
|
74 | + if (!empty($needle) && !empty($type)) { |
|
75 | 75 | |
76 | 76 | //normal behaviour |
77 | 77 | if ($type == 'any_session' && $needle == 'false') { |
@@ -79,32 +79,32 @@ discard block |
||
79 | 79 | $needle = ''; |
80 | 80 | } |
81 | 81 | |
82 | - // xajax send utf8 datas... datas in db can be non-utf8 datas |
|
83 | - $charset = api_get_system_encoding(); |
|
84 | - $needle = Database::escape_string($needle); |
|
85 | - $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
|
82 | + // xajax send utf8 datas... datas in db can be non-utf8 datas |
|
83 | + $charset = api_get_system_encoding(); |
|
84 | + $needle = Database::escape_string($needle); |
|
85 | + $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
|
86 | 86 | |
87 | - $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; |
|
88 | - $cond_user_id = ''; |
|
87 | + $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username'; |
|
88 | + $cond_user_id = ''; |
|
89 | 89 | |
90 | 90 | //Only for single & multiple |
91 | 91 | if (in_array($type, array('single','multiple'))) { |
92 | - if (!empty($id_session)) { |
|
93 | - $id_session = intval($id_session); |
|
94 | - // check id_user from session_rel_user table |
|
95 | - $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.' |
|
92 | + if (!empty($id_session)) { |
|
93 | + $id_session = intval($id_session); |
|
94 | + // check id_user from session_rel_user table |
|
95 | + $sql = 'SELECT user_id FROM '.$tbl_session_rel_user.' |
|
96 | 96 | WHERE session_id ="'.$id_session.'" AND relation_type<>'.SESSION_RELATION_TYPE_RRHH.' '; |
97 | - $res = Database::query($sql); |
|
98 | - $user_ids = array(); |
|
99 | - if (Database::num_rows($res) > 0) { |
|
100 | - while ($row = Database::fetch_row($res)) { |
|
101 | - $user_ids[] = (int)$row[0]; |
|
102 | - } |
|
103 | - } |
|
104 | - if (count($user_ids) > 0) { |
|
105 | - $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')'; |
|
106 | - } |
|
107 | - } |
|
97 | + $res = Database::query($sql); |
|
98 | + $user_ids = array(); |
|
99 | + if (Database::num_rows($res) > 0) { |
|
100 | + while ($row = Database::fetch_row($res)) { |
|
101 | + $user_ids[] = (int)$row[0]; |
|
102 | + } |
|
103 | + } |
|
104 | + if (count($user_ids) > 0) { |
|
105 | + $cond_user_id = ' AND user.user_id NOT IN('.implode(",",$user_ids).')'; |
|
106 | + } |
|
107 | + } |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | switch ($type) { |
@@ -136,11 +136,11 @@ discard block |
||
136 | 136 | user.status <> 6 '.$cond_user_id. |
137 | 137 | $order_clause; |
138 | 138 | break; |
139 | - } |
|
140 | - if (api_is_multiple_url_enabled()) { |
|
141 | - $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
142 | - $access_url_id = api_get_current_access_url_id(); |
|
143 | - if ($access_url_id != -1) { |
|
139 | + } |
|
140 | + if (api_is_multiple_url_enabled()) { |
|
141 | + $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
142 | + $access_url_id = api_get_current_access_url_id(); |
|
143 | + if ($access_url_id != -1) { |
|
144 | 144 | switch ($type) { |
145 | 145 | case 'single': |
146 | 146 | $sql = 'SELECT user.user_id, username, lastname, firstname |
@@ -178,36 +178,36 @@ discard block |
||
178 | 178 | user.status<>6 '.$cond_user_id. |
179 | 179 | $order_clause; |
180 | 180 | break; |
181 | - } |
|
182 | - } |
|
183 | - } |
|
181 | + } |
|
182 | + } |
|
183 | + } |
|
184 | 184 | |
185 | - $rs = Database::query($sql); |
|
185 | + $rs = Database::query($sql); |
|
186 | 186 | $i=0; |
187 | - if ($type == 'single') { |
|
188 | - while ($user = Database::fetch_array($rs)) { |
|
189 | - $i++; |
|
190 | - if ($i<=10) { |
|
191 | - $person_name = api_get_person_name($user['firstname'], $user['lastname']); |
|
192 | - $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />'; |
|
193 | - } else { |
|
194 | - $return .= '...<br />'; |
|
195 | - } |
|
196 | - } |
|
197 | - |
|
198 | - $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); |
|
199 | - } else { |
|
200 | - $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">'; |
|
201 | - while ($user = Database :: fetch_array($rs)) { |
|
202 | - $person_name = api_get_person_name($user['firstname'], $user['lastname']); |
|
203 | - $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>'; |
|
204 | - } |
|
205 | - $return .= '</select>'; |
|
206 | - $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return)); |
|
207 | - } |
|
208 | - } |
|
187 | + if ($type == 'single') { |
|
188 | + while ($user = Database::fetch_array($rs)) { |
|
189 | + $i++; |
|
190 | + if ($i<=10) { |
|
191 | + $person_name = api_get_person_name($user['firstname'], $user['lastname']); |
|
192 | + $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_session(\''.$user['user_id'].'\',\''.$person_name.' ('.$user['username'].')'.'\')">'.$person_name.' ('.$user['username'].')</a><br />'; |
|
193 | + } else { |
|
194 | + $return .= '...<br />'; |
|
195 | + } |
|
196 | + } |
|
197 | + |
|
198 | + $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return)); |
|
199 | + } else { |
|
200 | + $return .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">'; |
|
201 | + while ($user = Database :: fetch_array($rs)) { |
|
202 | + $person_name = api_get_person_name($user['firstname'], $user['lastname']); |
|
203 | + $return .= '<option value="'.$user['user_id'].'">'.$person_name.' ('.$user['username'].')</option>'; |
|
204 | + } |
|
205 | + $return .= '</select>'; |
|
206 | + $xajax_response -> addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return)); |
|
207 | + } |
|
208 | + } |
|
209 | 209 | |
210 | - return $xajax_response; |
|
210 | + return $xajax_response; |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | $xajax -> processRequests(); |
@@ -347,8 +347,8 @@ discard block |
||
347 | 347 | |
348 | 348 | if ($use_extra_fields) { |
349 | 349 | $final_result = array(); |
350 | - if (count($extra_field_result)>1) { |
|
351 | - for($i=0;$i<count($extra_field_result)-1;$i++) { |
|
350 | + if (count($extra_field_result)>1) { |
|
351 | + for($i=0;$i<count($extra_field_result)-1;$i++) { |
|
352 | 352 | if (is_array($extra_field_result[$i+1])) { |
353 | 353 | $final_result = array_intersect( |
354 | 354 | $extra_field_result[$i], |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | 'un' => $user['username'] |
427 | 427 | ); |
428 | 428 | unset($users[$uid]); |
429 | - } |
|
429 | + } |
|
430 | 430 | } |
431 | 431 | unset($users); //clean to free memory |
432 | 432 | |
@@ -471,13 +471,13 @@ discard block |
||
471 | 471 | } |
472 | 472 | |
473 | 473 | if ($add_type === 'multiple') { |
474 | - $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>'; |
|
475 | - $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple'); |
|
474 | + $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>'; |
|
475 | + $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple'); |
|
476 | 476 | } else { |
477 | - $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique'); |
|
478 | - $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>'; |
|
477 | + $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique'); |
|
478 | + $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>'; |
|
479 | 479 | } |
480 | - $link_add_group = '<a href="usergroups.php">'. |
|
480 | + $link_add_group = '<a href="usergroups.php">'. |
|
481 | 481 | Display::return_icon('multiple.gif', get_lang('RegistrationByUsersGroups')).get_lang('RegistrationByUsersGroups').'</a>'; |
482 | 482 | ?> |
483 | 483 | <div class="actions"> |
@@ -487,30 +487,30 @@ discard block |
||
487 | 487 | <?php echo '<legend>'.$tool_name.' ('.$session_info['name'].') </legend>'; ?> |
488 | 488 | <?php |
489 | 489 | if ($add_type === 'multiple') { |
490 | - if (is_array($extra_field_list)) { |
|
491 | - if (is_array($new_field_list) && count($new_field_list)>0 ) { |
|
492 | - echo '<h3>'.get_lang('FilterUsers').'</h3>'; |
|
493 | - foreach ($new_field_list as $new_field) { |
|
494 | - echo $new_field['name']; |
|
495 | - $varname = 'field_'.$new_field['variable']; |
|
496 | - echo ' <select name="'.$varname.'">'; |
|
497 | - echo '<option value="0">--'.get_lang('Select').'--</option>'; |
|
498 | - foreach ($new_field['data'] as $option) { |
|
499 | - $checked=''; |
|
500 | - if (isset($_POST[$varname])) { |
|
501 | - if ($_POST[$varname] == $option[1]) { |
|
502 | - $checked = 'selected="true"'; |
|
503 | - } |
|
504 | - } |
|
505 | - echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>'; |
|
506 | - } |
|
507 | - echo '</select>'; |
|
508 | - echo ' '; |
|
509 | - } |
|
510 | - echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />'; |
|
511 | - echo '<br /><br />'; |
|
512 | - } |
|
513 | - } |
|
490 | + if (is_array($extra_field_list)) { |
|
491 | + if (is_array($new_field_list) && count($new_field_list)>0 ) { |
|
492 | + echo '<h3>'.get_lang('FilterUsers').'</h3>'; |
|
493 | + foreach ($new_field_list as $new_field) { |
|
494 | + echo $new_field['name']; |
|
495 | + $varname = 'field_'.$new_field['variable']; |
|
496 | + echo ' <select name="'.$varname.'">'; |
|
497 | + echo '<option value="0">--'.get_lang('Select').'--</option>'; |
|
498 | + foreach ($new_field['data'] as $option) { |
|
499 | + $checked=''; |
|
500 | + if (isset($_POST[$varname])) { |
|
501 | + if ($_POST[$varname] == $option[1]) { |
|
502 | + $checked = 'selected="true"'; |
|
503 | + } |
|
504 | + } |
|
505 | + echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>'; |
|
506 | + } |
|
507 | + echo '</select>'; |
|
508 | + echo ' '; |
|
509 | + } |
|
510 | + echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />'; |
|
511 | + echo '<br /><br />'; |
|
512 | + } |
|
513 | + } |
|
514 | 514 | } |
515 | 515 | ?> |
516 | 516 | <input type="hidden" name="form_sent" value="1" /> |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | <div id="content_source"> |
534 | 534 | <?php |
535 | 535 | if (!($add_type == 'multiple')) { |
536 | - ?> |
|
536 | + ?> |
|
537 | 537 | <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" /> |
538 | 538 | <div id="ajax_list_users_single"></div> |
539 | 539 | <?php |
@@ -542,12 +542,12 @@ discard block |
||
542 | 542 | <div id="ajax_list_users_multiple"> |
543 | 543 | <select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" class="span5"> |
544 | 544 | <?php |
545 | - foreach ($nosessionUsersList as $uid => $enreg) { |
|
546 | - ?> |
|
545 | + foreach ($nosessionUsersList as $uid => $enreg) { |
|
546 | + ?> |
|
547 | 547 | <option value="<?php echo $uid; ?>" <?php if(in_array($uid,$UserList)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['fn'], $enreg['ln']).' ('.$enreg['un'].')'; ?></option> |
548 | 548 | <?php |
549 | - } |
|
550 | - ?> |
|
549 | + } |
|
550 | + ?> |
|
551 | 551 | </select> |
552 | 552 | </div> |
553 | 553 | <input type="checkbox" onchange="checked_in_no_session(this.checked);" name="user_with_any_session" id="user_with_any_session_id"> |
@@ -555,7 +555,7 @@ discard block |
||
555 | 555 | <?php |
556 | 556 | } |
557 | 557 | unset($nosessionUsersList); |
558 | - ?> |
|
558 | + ?> |
|
559 | 559 | </div> |
560 | 560 | </div> |
561 | 561 | |
@@ -582,13 +582,13 @@ discard block |
||
582 | 582 | <br /> |
583 | 583 | <br /> |
584 | 584 | <?php |
585 | - if (isset($_GET['add'])) { |
|
586 | - echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>'; |
|
585 | + if (isset($_GET['add'])) { |
|
586 | + echo '<button class="btn btn-primary" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>'; |
|
587 | 587 | } else { |
588 | 588 | //@todo see that the call to "valide()" doesn't duplicate the onsubmit of the form (necessary to avoid delete on "enter" key pressed) |
589 | - echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>'; |
|
589 | + echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>'; |
|
590 | 590 | } |
591 | - ?> |
|
591 | + ?> |
|
592 | 592 | </div> |
593 | 593 | <div class="span5"> |
594 | 594 | <div class="multiple_select_header"> |