@@ -19,7 +19,8 @@ |
||
| 19 | 19 | |
| 20 | 20 | if (api_is_allowed_to_edit(null, true)) { |
| 21 | 21 | // HIDE |
| 22 | - if (!empty($_GET['hide'])) { // visibility 1 -> 0 |
|
| 22 | + if (!empty($_GET['hide'])) { |
|
| 23 | +// visibility 1 -> 0 |
|
| 23 | 24 | $sql = "UPDATE $tool_table SET visibility=0 WHERE c_id = $course_id AND id='".$id."'"; |
| 24 | 25 | Database::query($sql); |
| 25 | 26 | $show_message = Display::return_message(get_lang('ToolIsNowHidden'), 'confirmation'); |
@@ -176,7 +176,8 @@ |
||
| 176 | 176 | $auto_launch = api_get_course_setting('enable_lp_auto_launch'); |
| 177 | 177 | $session_id = api_get_session_id(); |
| 178 | 178 | if (!empty($auto_launch)) { |
| 179 | - if ($auto_launch == 2) { //LP list |
|
| 179 | + if ($auto_launch == 2) { |
|
| 180 | +//LP list |
|
| 180 | 181 | if (api_is_platform_admin() || api_is_allowed_to_edit()) { |
| 181 | 182 | $show_autolaunch_lp_warning = true; |
| 182 | 183 | } else { |
@@ -25,7 +25,8 @@ |
||
| 25 | 25 | $user['country_bu'] = $new_user['country_bu']; |
| 26 | 26 | $user['extra'] = $new_user['extra']; |
| 27 | 27 | |
| 28 | -if ($new_user !== false) { //User can login |
|
| 28 | +if ($new_user !== false) { |
|
| 29 | +//User can login |
|
| 29 | 30 | external_update_user($user); |
| 30 | 31 | $loginFailed = false; |
| 31 | 32 | $_user['user_id'] = $user['user_id']; |
@@ -84,15 +84,18 @@ |
||
| 84 | 84 | //echo do something to logout |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | -function validate_user($user, $pass) { |
|
| 87 | +function validate_user($user, $pass) |
|
| 88 | +{ |
|
| 88 | 89 | return true; |
| 89 | 90 | } |
| 90 | -function filter_xss($val) { |
|
| 91 | +function filter_xss($val) |
|
| 92 | +{ |
|
| 91 | 93 | //do some cleaning |
| 92 | 94 | return $val; |
| 93 | 95 | } |
| 94 | 96 | |
| 95 | -function chamilo_sso_protocol() { |
|
| 97 | +function chamilo_sso_protocol() |
|
| 98 | +{ |
|
| 96 | 99 | //get the sso_protocol from chamilo using webservices |
| 97 | 100 | return 'http://'; |
| 98 | 101 | } |
@@ -45,8 +45,9 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | break; |
| 47 | 47 | case "stackgetall": |
| 48 | - if (storage_can_set($_REQUEST['svuser'])) |
|
| 49 | - print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']); |
|
| 48 | + if (storage_can_set($_REQUEST['svuser'])) { |
|
| 49 | + print storage_stack_getall($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey']); |
|
| 50 | + } |
|
| 50 | 51 | break; |
| 51 | 52 | case "getposition": |
| 52 | 53 | print storage_get_position($_REQUEST['svuser'], $_REQUEST['svcourse'], $_REQUEST['svsco'], $_REQUEST['svkey'], $_REQUEST['svasc']); |
@@ -63,7 +64,8 @@ discard block |
||
| 63 | 64 | // Do nothing |
| 64 | 65 | } |
| 65 | 66 | |
| 66 | -function storage_can_set($sv_user) { |
|
| 67 | +function storage_can_set($sv_user) |
|
| 68 | +{ |
|
| 67 | 69 | // platform admin can change any user's stored values, other users can only change their own values |
| 68 | 70 | $allowed = ((api_is_platform_admin()) || ($sv_user == api_get_user_id())); |
| 69 | 71 | if (!$allowed) { |
@@ -72,7 +74,8 @@ discard block |
||
| 72 | 74 | return $allowed; |
| 73 | 75 | } |
| 74 | 76 | |
| 75 | -function storage_get($sv_user, $sv_course, $sv_sco, $sv_key) { |
|
| 77 | +function storage_get($sv_user, $sv_course, $sv_sco, $sv_key) |
|
| 78 | +{ |
|
| 76 | 79 | $sql = "select sv_value |
| 77 | 80 | from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." |
| 78 | 81 | where user_id= '$sv_user' |
@@ -87,13 +90,13 @@ discard block |
||
| 87 | 90 | } else { |
| 88 | 91 | return $row['sv_value']; |
| 89 | 92 | } |
| 90 | - } |
|
| 91 | - else { |
|
| 93 | + } else { |
|
| 92 | 94 | return null; |
| 93 | 95 | } |
| 94 | 96 | } |
| 95 | 97 | |
| 96 | -function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) { |
|
| 98 | +function storage_get_leaders($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) |
|
| 99 | +{ |
|
| 97 | 100 | |
| 98 | 101 | // get leaders |
| 99 | 102 | $sql_leaders = "select u.user_id, firstname, lastname, email, username, sv_value as value |
@@ -127,7 +130,8 @@ discard block |
||
| 127 | 130 | return json_encode($result); |
| 128 | 131 | } |
| 129 | 132 | |
| 130 | -function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) { |
|
| 133 | +function storage_get_position($sv_user, $sv_course, $sv_sco, $sv_key, $sv_asc, $sv_length) |
|
| 134 | +{ |
|
| 131 | 135 | $sql = "select count(list.user_id) as position |
| 132 | 136 | from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." search, |
| 133 | 137 | ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." list |
@@ -144,13 +148,13 @@ discard block |
||
| 144 | 148 | if (Database::num_rows($res) > 0) { |
| 145 | 149 | $row = Database::fetch_assoc($res); |
| 146 | 150 | return $row['position']; |
| 147 | - } |
|
| 148 | - else { |
|
| 151 | + } else { |
|
| 149 | 152 | return null; |
| 150 | 153 | } |
| 151 | 154 | } |
| 152 | 155 | |
| 153 | -function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) { |
|
| 156 | +function storage_set($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) |
|
| 157 | +{ |
|
| 154 | 158 | $sv_value = Database::escape_string($sv_value); |
| 155 | 159 | $sql = "replace into ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." |
| 156 | 160 | (user_id, sco_id, course_id, sv_key, sv_value) |
@@ -160,7 +164,8 @@ discard block |
||
| 160 | 164 | return Database::affected_rows($res); |
| 161 | 165 | } |
| 162 | 166 | |
| 163 | -function storage_getall($sv_user, $sv_course, $sv_sco) { |
|
| 167 | +function storage_getall($sv_user, $sv_course, $sv_sco) |
|
| 168 | +{ |
|
| 164 | 169 | $sql = "select sv_key, sv_value |
| 165 | 170 | from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES)." |
| 166 | 171 | where user_id= '$sv_user' |
@@ -177,7 +182,8 @@ discard block |
||
| 177 | 182 | return json_encode($data); |
| 178 | 183 | } |
| 179 | 184 | |
| 180 | -function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) { |
|
| 185 | +function storage_stack_push($sv_user, $sv_course, $sv_sco, $sv_key, $sv_value) |
|
| 186 | +{ |
|
| 181 | 187 | $sv_value = Database::escape_string($sv_value); |
| 182 | 188 | Database::query("start transaction"); |
| 183 | 189 | $sqlorder = "select ifnull((select max(stack_order) |
@@ -198,14 +204,14 @@ discard block |
||
| 198 | 204 | if ($resorder && $resinsert) { |
| 199 | 205 | Database::query("commit"); |
| 200 | 206 | return 1; |
| 201 | - } |
|
| 202 | - else { |
|
| 207 | + } else { |
|
| 203 | 208 | Database::query("rollback"); |
| 204 | 209 | return 0; |
| 205 | 210 | } |
| 206 | 211 | } |
| 207 | 212 | |
| 208 | -function storage_stack_pop($sv_user, $sv_course, $sv_sco, $sv_key) { |
|
| 213 | +function storage_stack_pop($sv_user, $sv_course, $sv_sco, $sv_key) |
|
| 214 | +{ |
|
| 209 | 215 | Database::query("start transaction"); |
| 210 | 216 | $sqlselect = "select sv_value, stack_order |
| 211 | 217 | from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)." |
@@ -239,7 +245,8 @@ discard block |
||
| 239 | 245 | } |
| 240 | 246 | } |
| 241 | 247 | |
| 242 | -function storage_stack_length($sv_user, $sv_course, $sv_sco, $sv_key) { |
|
| 248 | +function storage_stack_length($sv_user, $sv_course, $sv_sco, $sv_key) |
|
| 249 | +{ |
|
| 243 | 250 | $sql = "select count(*) as length |
| 244 | 251 | from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)." |
| 245 | 252 | where user_id= '$sv_user' |
@@ -251,7 +258,8 @@ discard block |
||
| 251 | 258 | return $row['length']; |
| 252 | 259 | } |
| 253 | 260 | |
| 254 | -function storage_stack_clear($sv_user, $sv_course, $sv_sco, $sv_key) { |
|
| 261 | +function storage_stack_clear($sv_user, $sv_course, $sv_sco, $sv_key) |
|
| 262 | +{ |
|
| 255 | 263 | $sql = "delete |
| 256 | 264 | from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)." |
| 257 | 265 | where user_id= '$sv_user' |
@@ -262,7 +270,8 @@ discard block |
||
| 262 | 270 | return Database::num_rows($res); |
| 263 | 271 | } |
| 264 | 272 | |
| 265 | -function storage_stack_getall($sv_user, $sv_course, $sv_sco, $sv_key) { |
|
| 273 | +function storage_stack_getall($sv_user, $sv_course, $sv_sco, $sv_key) |
|
| 274 | +{ |
|
| 266 | 275 | $sql = "select stack_order as stack_order, sv_value as value |
| 267 | 276 | from ".Database::get_main_table(TABLE_TRACK_STORED_VALUES_STACK)." |
| 268 | 277 | where user_id= '$sv_user' |
@@ -280,7 +289,8 @@ discard block |
||
| 280 | 289 | return json_encode($results); |
| 281 | 290 | } |
| 282 | 291 | |
| 283 | -function storage_get_all_users() { |
|
| 292 | +function storage_get_all_users() |
|
| 293 | +{ |
|
| 284 | 294 | $sql = "select user_id, username, firstname, lastname |
| 285 | 295 | from ".Database::get_main_table(TABLE_MAIN_USER)." |
| 286 | 296 | order by user_id asc"; |
@@ -55,7 +55,8 @@ discard block |
||
| 55 | 55 | $lmsFinish = 0, |
| 56 | 56 | $userNavigatesAway = 0, |
| 57 | 57 | $statusSignalReceived = 0 |
| 58 | -) { |
|
| 58 | +) |
|
| 59 | +{ |
|
| 59 | 60 | //global $debug; |
| 60 | 61 | $debug = 0; |
| 61 | 62 | $return = null; |
@@ -477,7 +478,8 @@ discard block |
||
| 477 | 478 | if (is_array($_REQUEST['interact'])) { |
| 478 | 479 | foreach ($_REQUEST['interact'] as $idx => $interac) { |
| 479 | 480 | $interactions[$idx] = preg_split('/,/', substr($interac, 1, -1)); |
| 480 | - if (!isset($interactions[$idx][7])) { // Make sure there are 7 elements. |
|
| 481 | + if (!isset($interactions[$idx][7])) { |
|
| 482 | +// Make sure there are 7 elements. |
|
| 481 | 483 | $interactions[$idx][7] = ''; |
| 482 | 484 | } |
| 483 | 485 | } |
@@ -380,7 +380,8 @@ |
||
| 380 | 380 | * @param $b |
| 381 | 381 | * @return int |
| 382 | 382 | */ |
| 383 | -function sort_user($a, $b) { |
|
| 383 | +function sort_user($a, $b) |
|
| 384 | +{ |
|
| 384 | 385 | if (is_numeric($a['score']) && is_numeric($b['score'])) { |
| 385 | 386 | if ($a['score'] < $b['score']) { |
| 386 | 387 | return 1; |
@@ -38,7 +38,8 @@ |
||
| 38 | 38 | $new, |
| 39 | 39 | $show_equals = false, |
| 40 | 40 | $format_line_function = 'format_line' |
| 41 | -) { |
|
| 41 | +) |
|
| 42 | +{ |
|
| 42 | 43 | $oldArr = str_split_on_new_line($old); |
| 43 | 44 | $newArr = str_split_on_new_line($new); |
| 44 | 45 | |
@@ -244,7 +244,8 @@ discard block |
||
| 244 | 244 | $poly_answer = convert_coordinates($answer_question, '|'); |
| 245 | 245 | $max_coord = poly_get_max($poly_user, $poly_answer); |
| 246 | 246 | |
| 247 | - if (empty($_GET['hotspot'])) { //no user response |
|
| 247 | + if (empty($_GET['hotspot'])) { |
|
| 248 | +//no user response |
|
| 248 | 249 | $overlap = -2; |
| 249 | 250 | } else { |
| 250 | 251 | $poly_user_compiled = poly_compile($poly_user, $max_coord); |
@@ -346,7 +347,8 @@ discard block |
||
| 346 | 347 | $test = false; |
| 347 | 348 | // if ($answerId == 2 ){$test = true;} for test oars |
| 348 | 349 | |
| 349 | - if (empty($_GET['hotspot'])) { //no user response |
|
| 350 | + if (empty($_GET['hotspot'])) { |
|
| 351 | +//no user response |
|
| 350 | 352 | $overlap = false; |
| 351 | 353 | } else { |
| 352 | 354 | // poly_compile really works tested with gnuplot |