@@ -77,7 +77,7 @@ |
||
77 | 77 | |
78 | 78 | $i = 1; // we re-use $i and $old_pente bellow the loop |
79 | 79 | $old_pente = 0; |
80 | - // for each points of the polygon but the first |
|
80 | + // for each points of the polygon but the first |
|
81 | 81 | for (; $i < sizeof($poly) && (!empty($poly[$i]['x']) && !empty($poly[$i]['y'])); $i++) { |
82 | 82 | /* special cases */ |
83 | 83 | if ($poly[$i - 1]['y'] == $poly[$i]['y']) { |
@@ -26,11 +26,11 @@ |
||
26 | 26 | $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}"); |
27 | 27 | |
28 | 28 | if ($digestParts['response'] != $validResponse) |
29 | - requireLogin($realm, $nonce); |
|
29 | + requireLogin($realm, $nonce); |
|
30 | 30 | else { |
31 | - // We're in! |
|
32 | - echo 'a7532ae474e5e66a0c16eddab02e02a7'; |
|
33 | - die(); |
|
31 | + // We're in! |
|
32 | + echo 'a7532ae474e5e66a0c16eddab02e02a7'; |
|
33 | + die(); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | // This function returns the digest string |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
44 | 44 | |
45 | 45 | $sql_query = "SELECT id FROM $table_message ". |
46 | - " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)". |
|
47 | - " ORDER BY send_date LIMIT $from,$number_of_items"; |
|
46 | + " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)". |
|
47 | + " ORDER BY send_date LIMIT $from,$number_of_items"; |
|
48 | 48 | |
49 | 49 | $sql_result = Database::query($sql_query); |
50 | 50 | $message = "#"; |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
91 | 91 | |
92 | 92 | $sql_query = "SELECT ".$field_table." FROM $table_message ". |
93 | - " WHERE user_receiver_id=".$user_id." AND id=".$message_id; |
|
93 | + " WHERE user_receiver_id=".$user_id." AND id=".$message_id; |
|
94 | 94 | |
95 | 95 | $sql_result = Database::query($sql_query); |
96 | 96 | $result = Database::fetch_row($sql_result); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $user_id = UserManager::get_user_id_from_username($username); |
158 | 158 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
159 | 159 | $sql_query = "SELECT ".$field_table." FROM $table_message ". |
160 | - " WHERE user_sender_id=".$user_id." AND id=".$id; |
|
160 | + " WHERE user_sender_id=".$user_id." AND id=".$id; |
|
161 | 161 | $sql_result = Database::query($sql_query); |
162 | 162 | $result = Database::fetch_row($sql_result); |
163 | 163 | |
@@ -189,11 +189,11 @@ discard block |
||
189 | 189 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
190 | 190 | |
191 | 191 | $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ". |
192 | - " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')"; |
|
192 | + " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')"; |
|
193 | 193 | $result = Database::query($query); |
194 | 194 | |
195 | 195 | $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ". |
196 | - " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')"; |
|
196 | + " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')"; |
|
197 | 197 | $result = Database::query($query); |
198 | 198 | |
199 | 199 | $inbox_last_id = Database::insert_id(); |
@@ -171,14 +171,14 @@ |
||
171 | 171 | |
172 | 172 | |
173 | 173 | /** |
174 | - * Get a list of users of which the given conditions match with a LIKE '%cond%' |
|
175 | - * @param array $conditions a list of condition (exemple : status=>STUDENT) |
|
176 | - * @param array $order_by a list of fields on which sort |
|
177 | - * @return array An array with all users of the platform. |
|
178 | - * @todo optional course code parameter, optional sorting parameters... |
|
174 | + * Get a list of users of which the given conditions match with a LIKE '%cond%' |
|
175 | + * @param array $conditions a list of condition (exemple : status=>STUDENT) |
|
176 | + * @param array $order_by a list of fields on which sort |
|
177 | + * @return array An array with all users of the platform. |
|
178 | + * @todo optional course code parameter, optional sorting parameters... |
|
179 | 179 | *@todo Use the UserManager class |
180 | 180 | * @todo security filter order by |
181 | - */ |
|
181 | + */ |
|
182 | 182 | private static function get_user_list_like_start($conditions = [], $order_by = []) |
183 | 183 | { |
184 | 184 | $user_table = Database::get_main_table(TABLE_MAIN_USER); |
@@ -59,8 +59,8 @@ |
||
59 | 59 | $server->register( |
60 | 60 | 'WSCourseList', // method name |
61 | 61 | array('username' => 'xsd:string', |
62 | - 'signature' => 'xsd:string', |
|
63 | - 'visibilities' => 'xsd:string'), // input parameters |
|
62 | + 'signature' => 'xsd:string', |
|
63 | + 'visibilities' => 'xsd:string'), // input parameters |
|
64 | 64 | array('return' => 'xsd:Array'), // output parameters |
65 | 65 | 'urn:WSCourseList', // namespace |
66 | 66 | 'urn:WSCourseList#WSCourseList', // soapaction |
@@ -18,8 +18,8 @@ discard block |
||
18 | 18 | $newstudents = $evaluation[0]->get_not_subscribed_students(); |
19 | 19 | |
20 | 20 | if (count($newstudents) == '0') { |
21 | - header('Location: gradebook_view_result.php?nouser=&selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq()); |
|
22 | - exit; |
|
21 | + header('Location: gradebook_view_result.php?nouser=&selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq()); |
|
22 | + exit; |
|
23 | 23 | } |
24 | 24 | $add_user_form = new EvalForm( |
25 | 25 | EvalForm :: TYPE_ADD_USERS_TO_EVAL, |
@@ -67,12 +67,12 @@ discard block |
||
67 | 67 | |
68 | 68 | $interbreadcrumb[] = array('url' => Category::getUrl(), 'name' => get_lang('Gradebook')); |
69 | 69 | $interbreadcrumb[] = array( |
70 | - 'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(), |
|
71 | - 'name' => get_lang('ViewResult') |
|
70 | + 'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(), |
|
71 | + 'name' => get_lang('ViewResult') |
|
72 | 72 | ); |
73 | 73 | Display :: display_header(get_lang('AddUserToEval')); |
74 | 74 | if (isset ($_GET['erroroneuser'])) { |
75 | - echo Display::return_message(get_lang('AtLeastOneUser'), 'warning', false); |
|
75 | + echo Display::return_message(get_lang('AtLeastOneUser'), 'warning', false); |
|
76 | 76 | } |
77 | 77 | DisplayGradebook :: display_header_result($evaluation[0], null, 0, 0); |
78 | 78 | echo '<div class="main">'; |
@@ -51,26 +51,26 @@ discard block |
||
51 | 51 | |
52 | 52 | // Please, do not modify this dirname formatting |
53 | 53 | if (strstr($dir, '..')) { |
54 | - $dir = '/'; |
|
54 | + $dir = '/'; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | if ($dir[0] == '.') { |
58 | - $dir = substr($dir, 1); |
|
58 | + $dir = substr($dir, 1); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | if ($dir[0] != '/') { |
62 | - $dir = '/'.$dir; |
|
62 | + $dir = '/'.$dir; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | if ($dir[strlen($dir) - 1] != '/') { |
66 | - $dir .= '/'; |
|
66 | + $dir .= '/'; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir; |
70 | 70 | |
71 | 71 | if (!is_dir($filepath)) { |
72 | - $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
73 | - $dir = '/'; |
|
72 | + $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/'; |
|
73 | + $dir = '/'; |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | $groupId = api_get_group_id(); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | if (!($is_allowed_to_edit || $groupRights || |
101 | - DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id())) |
|
101 | + DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir), api_get_session_id())) |
|
102 | 102 | ) { |
103 | 103 | api_not_allowed(true); |
104 | 104 | } |
@@ -157,17 +157,17 @@ discard block |
||
157 | 157 | $locktitle = "false"; |
158 | 158 | |
159 | 159 | if ($_SERVER['HTTP_HOST'] == "localhost") { |
160 | - $path_and_file = api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
161 | - if (!file_exists($path_and_file)) { |
|
162 | - $crossdomain = '<?xml version="1.0"?> |
|
160 | + $path_and_file = api_get_path(SYS_PATH).'/crossdomain.xml'; |
|
161 | + if (!file_exists($path_and_file)) { |
|
162 | + $crossdomain = '<?xml version="1.0"?> |
|
163 | 163 | <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd"> |
164 | 164 | <cross-domain-policy> |
165 | 165 | <allow-access-from domain="cdn.pixlr.com" /> |
166 | 166 | <site-control permitted-cross-domain-policies="master-only"/> |
167 | 167 | <allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/> |
168 | 168 | </cross-domain-policy>';//more open domain="*" |
169 | - @file_put_contents($path_and_file, $crossdomain); |
|
170 | - } |
|
169 | + @file_put_contents($path_and_file, $crossdomain); |
|
170 | + } |
|
171 | 171 | $credentials = "true"; |
172 | 172 | } else { |
173 | 173 | $credentials = "false"; |
@@ -90,12 +90,12 @@ discard block |
||
90 | 90 | |
91 | 91 | // I'm in a preview mode as course admin. Display the action menu. |
92 | 92 | if (api_is_course_admin() && $origin != 'learnpath') { |
93 | - echo '<div class="actions">'; |
|
94 | - echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'. |
|
93 | + echo '<div class="actions">'; |
|
94 | + echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'">'. |
|
95 | 95 | Display::return_icon('back.png', get_lang('GoBackToQuestionList'), array(), 32).'</a>'; |
96 | - echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'. |
|
96 | + echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'. |
|
97 | 97 | Display::return_icon('edit.png', get_lang('ModifyExercise'), array(), 32).'</a>'; |
98 | - echo '</div>'; |
|
98 | + echo '</div>'; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | $feedback_type = $objExercise->feedback_type; |
@@ -204,9 +204,9 @@ discard block |
||
204 | 204 | } |
205 | 205 | Display::display_footer(); |
206 | 206 | } else { |
207 | - $lp_mode = Session::read('lp_mode'); |
|
208 | - $url = '../lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type.'#atoc_'.$learnpath_item_id; |
|
209 | - $href = $lp_mode == 'fullscreen' ? ' window.opener.location.href="'.$url.'" ' : ' top.location.href="'.$url.'"'; |
|
207 | + $lp_mode = Session::read('lp_mode'); |
|
208 | + $url = '../lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$learnpath_id.'&lp_item_id='.$learnpath_item_id.'&exeId='.$exercise_stat_info['exe_id'].'&fb_type='.$objExercise->feedback_type.'#atoc_'.$learnpath_item_id; |
|
209 | + $href = $lp_mode == 'fullscreen' ? ' window.opener.location.href="'.$url.'" ' : ' top.location.href="'.$url.'"'; |
|
210 | 210 | |
211 | 211 | if (api_is_allowed_to_session_edit()) { |
212 | 212 | Session::erase('objExercise'); |
@@ -806,7 +806,7 @@ |
||
806 | 806 | $actionsRight = ''; |
807 | 807 | if (api_is_platform_admin()) { |
808 | 808 | $actionsRight .= '<a class="pull-right" href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'. |
809 | - Display::return_icon('new_user.png', get_lang('AddUsers'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
809 | + Display::return_icon('new_user.png', get_lang('AddUsers'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
810 | 810 | } |
811 | 811 | |
812 | 812 | $actionsLeft .= $form->returnForm(); |