chamilo /
chamilo-lms
@@ -106,7 +106,9 @@ discard block |
||
| 106 | 106 | //Check if the user is registered in the session otherwise we will add it |
| 107 | 107 | $result = SessionManager::get_users_by_session($new_session_id); |
| 108 | 108 | if (empty($result) || !in_array($user_id, array_keys($result))) { |
| 109 | - if ($debug) echo 'User added to the session'; |
|
| 109 | + if ($debug) { |
|
| 110 | + echo 'User added to the session'; |
|
| 111 | + } |
|
| 110 | 112 | //Registering user to the new session |
| 111 | 113 | SessionManager::suscribe_users_to_session($new_session_id,array($user_id),false); |
| 112 | 114 | } |
@@ -141,10 +143,11 @@ discard block |
||
| 141 | 143 | $list[$row['exe_id']]= $row; |
| 142 | 144 | } |
| 143 | 145 | |
| 144 | - if (!empty($list)) |
|
| 145 | - foreach ($list as $exe_id =>$data) { |
|
| 146 | + if (!empty($list)) { |
|
| 147 | + foreach ($list as $exe_id =>$data) { |
|
| 146 | 148 | if ($update_database) { |
| 147 | 149 | $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id"; |
| 150 | + } |
|
| 148 | 151 | $res = Database::query($sql); |
| 149 | 152 | $result_message[$TABLETRACK_EXERCICES]++; |
| 150 | 153 | } else { |
@@ -168,10 +171,11 @@ discard block |
||
| 168 | 171 | $list[$row['exe_id']]= $row; |
| 169 | 172 | } |
| 170 | 173 | |
| 171 | - if (!empty($list)) |
|
| 172 | - foreach ($list as $exe_id =>$data) { |
|
| 174 | + if (!empty($list)) { |
|
| 175 | + foreach ($list as $exe_id =>$data) { |
|
| 173 | 176 | if ($update_database) { |
| 174 | 177 | $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id"; |
| 178 | + } |
|
| 175 | 179 | $res = Database::query($sql); |
| 176 | 180 | $result_message[$TABLETRACK_EXERCICES]++; |
| 177 | 181 | } else { |
@@ -196,10 +200,11 @@ discard block |
||
| 196 | 200 | $list[$row['course_access_id']] = $row; |
| 197 | 201 | } |
| 198 | 202 | |
| 199 | - if (!empty($list)) |
|
| 200 | - foreach ($list as $id => $data) { |
|
| 203 | + if (!empty($list)) { |
|
| 204 | + foreach ($list as $id => $data) { |
|
| 201 | 205 | if ($update_database) { |
| 202 | 206 | $sql = "UPDATE $TBL_TRACK_E_COURSE_ACCESS SET session_id = $new_session_id WHERE course_access_id = $id"; |
| 207 | + } |
|
| 203 | 208 | if ($debug) { |
| 204 | 209 | echo $sql; |
| 205 | 210 | } |
@@ -218,13 +223,18 @@ discard block |
||
| 218 | 223 | while($row = Database::fetch_array($res,'ASSOC')) { |
| 219 | 224 | $list[] = $row['access_id']; |
| 220 | 225 | } |
| 221 | - if (!empty($list)) |
|
| 222 | - foreach ($list as $id) { |
|
| 226 | + if (!empty($list)) { |
|
| 227 | + foreach ($list as $id) { |
|
| 223 | 228 | if ($update_database) { |
| 224 | 229 | $sql = "UPDATE $TBL_TRACK_E_LAST_ACCESS SET access_session_id = $new_session_id WHERE access_id = $id"; |
| 225 | - if ($debug) echo $sql; |
|
| 230 | + } |
|
| 231 | + if ($debug) { |
|
| 232 | + echo $sql; |
|
| 233 | + } |
|
| 226 | 234 | $res = Database::query($sql); |
| 227 | - if ($debug) var_dump($res); |
|
| 235 | + if ($debug) { |
|
| 236 | + var_dump($res); |
|
| 237 | + } |
|
| 228 | 238 | $result_message[$TBL_TRACK_E_LAST_ACCESS]++; |
| 229 | 239 | } |
| 230 | 240 | } |
@@ -248,13 +258,18 @@ discard block |
||
| 248 | 258 | } |
| 249 | 259 | } |
| 250 | 260 | |
| 251 | - if (!empty($list)) |
|
| 252 | - foreach ($list as $id=>$data) { |
|
| 261 | + if (!empty($list)) { |
|
| 262 | + foreach ($list as $id=>$data) { |
|
| 253 | 263 | if ($update_database) { |
| 254 | 264 | $sql = "UPDATE $TBL_LP_VIEW SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id "; |
| 255 | - if ($debug) var_dump($sql); |
|
| 265 | + } |
|
| 266 | + if ($debug) { |
|
| 267 | + var_dump($sql); |
|
| 268 | + } |
|
| 256 | 269 | $res = Database::query($sql); |
| 257 | - if ($debug) var_dump($res); |
|
| 270 | + if ($debug) { |
|
| 271 | + var_dump($res); |
|
| 272 | + } |
|
| 258 | 273 | $result_message[$TBL_LP_VIEW]++; |
| 259 | 274 | } else { |
| 260 | 275 | //Getting all information of that lp_item_id |
@@ -281,10 +296,11 @@ discard block |
||
| 281 | 296 | $list[$row['id']] = $row; |
| 282 | 297 | } |
| 283 | 298 | } |
| 284 | - if (!empty($list)) |
|
| 285 | - foreach ($list as $id=>$data) { |
|
| 299 | + if (!empty($list)) { |
|
| 300 | + foreach ($list as $id=>$data) { |
|
| 286 | 301 | //Getting all information of that lp_item_id |
| 287 | 302 | $score = Tracking::get_avg_student_score($user_id, $origin_course_code, array($data['lp_id']), $new_session_id); |
| 303 | + } |
|
| 288 | 304 | $progress = Tracking::get_avg_student_progress($user_id, $origin_course_code, array($data['lp_id']), $new_session_id); |
| 289 | 305 | $result_message_compare['LP_VIEW'][$data['lp_id']] = array('score' => $score, 'progress' =>$progress); |
| 290 | 306 | } |
@@ -300,9 +316,13 @@ discard block |
||
| 300 | 316 | $id = $row['ref']; |
| 301 | 317 | if ($update_database) { |
| 302 | 318 | $sql = "UPDATE $TBL_AGENDA SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id "; |
| 303 | - if ($debug) var_dump($sql); |
|
| 319 | + if ($debug) { |
|
| 320 | + var_dump($sql); |
|
| 321 | + } |
|
| 304 | 322 | $res_update = Database::query($sql); |
| 305 | - if ($debug) var_dump($res_update); |
|
| 323 | + if ($debug) { |
|
| 324 | + var_dump($res_update); |
|
| 325 | + } |
|
| 306 | 326 | $result_message['agenda']++; |
| 307 | 327 | } |
| 308 | 328 | } |
@@ -314,22 +334,30 @@ discard block |
||
| 314 | 334 | //echo '<h1>Student publication</h1>'; |
| 315 | 335 | |
| 316 | 336 | $sql = "SELECT ref FROM $TBL_ITEM_PROPERTY WHERE tool = 'work' AND insert_user_id = $user_id AND c_id = $course_id"; |
| 317 | - if ($debug) echo $sql; |
|
| 337 | + if ($debug) { |
|
| 338 | + echo $sql; |
|
| 339 | + } |
|
| 318 | 340 | $res = Database::query($sql); |
| 319 | 341 | while($row = Database::fetch_array($res,'ASSOC')) { |
| 320 | 342 | $id = $row['ref']; |
| 321 | 343 | $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $id AND session_id = $origin_session_id AND c_id = $course_id"; |
| 322 | - if ($debug) var_dump($sql); |
|
| 344 | + if ($debug) { |
|
| 345 | + var_dump($sql); |
|
| 346 | + } |
|
| 323 | 347 | $sub_res = Database::query($sql); |
| 324 | 348 | if (Database::num_rows($sub_res) > 0 ) { |
| 325 | 349 | $data = Database::fetch_array($sub_res,'ASSOC'); |
| 326 | - if ($debug) var_dump($data); |
|
| 350 | + if ($debug) { |
|
| 351 | + var_dump($data); |
|
| 352 | + } |
|
| 327 | 353 | $parent_id = $data['parent_id']; |
| 328 | 354 | if (isset($data['parent_id']) && !empty($data['parent_id'])) { |
| 329 | 355 | $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $parent_id AND c_id = $course_id"; |
| 330 | 356 | $select_res = Database::query($sql); |
| 331 | 357 | $parent_data = Database::fetch_array($select_res,'ASSOC'); |
| 332 | - if ($debug) var_dump($parent_data); |
|
| 358 | + if ($debug) { |
|
| 359 | + var_dump($parent_data); |
|
| 360 | + } |
|
| 333 | 361 | |
| 334 | 362 | $sys_course_path = api_get_path(SYS_COURSE_PATH); |
| 335 | 363 | $course_dir = $sys_course_path . $course_info['path']; |
@@ -344,7 +372,9 @@ discard block |
||
| 344 | 372 | $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION |
| 345 | 373 | WHERE description like '%$search_this%' AND url LIKE '%$search_this2%' AND session_id = $new_session_id AND c_id = $course_id |
| 346 | 374 | ORDER BY id desc LIMIT 1"; |
| 347 | - if ($debug) echo $sql; |
|
| 375 | + if ($debug) { |
|
| 376 | + echo $sql; |
|
| 377 | + } |
|
| 348 | 378 | $sub_res = Database::query($sql); |
| 349 | 379 | $num_rows = Database::num_rows($sub_res); |
| 350 | 380 | |
@@ -377,12 +407,16 @@ discard block |
||
| 377 | 407 | date_of_qualification = '0000-00-00 00:00:00', |
| 378 | 408 | session_id = ".$new_session_id; |
| 379 | 409 | $rest_insert = Database::query($sql_add_publication); |
| 380 | - if ($debug) echo ($sql_add_publication); |
|
| 410 | + if ($debug) { |
|
| 411 | + echo ($sql_add_publication); |
|
| 412 | + } |
|
| 381 | 413 | // add the directory |
| 382 | 414 | $id = Database::insert_id(); |
| 383 | 415 | //Folder created |
| 384 | 416 | api_item_property_update($course_info, 'work', $id, 'DirectoryCreated', api_get_user_id()); |
| 385 | - if ($debug) var_dump($rest_insert); |
|
| 417 | + if ($debug) { |
|
| 418 | + var_dump($rest_insert); |
|
| 419 | + } |
|
| 386 | 420 | $new_parent_id = $id; |
| 387 | 421 | $result_message[$TBL_STUDENT_PUBLICATION.' - new folder created called: '.$created_dir]++; |
| 388 | 422 | } |
@@ -390,7 +424,9 @@ discard block |
||
| 390 | 424 | |
| 391 | 425 | //Creating student_publication_assignment if exists |
| 392 | 426 | $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION_ASSIGNMENT WHERE publication_id = $parent_id AND c_id = $course_id"; |
| 393 | - if ($debug) var_dump($sql); |
|
| 427 | + if ($debug) { |
|
| 428 | + var_dump($sql); |
|
| 429 | + } |
|
| 394 | 430 | $rest_select = Database::query($sql); |
| 395 | 431 | if (Database::num_rows($rest_select) > 0 ) { |
| 396 | 432 | if ($update_database) { |
@@ -402,7 +438,9 @@ discard block |
||
| 402 | 438 | add_to_calendar = '".$assignment_data['add_to_calendar']."', |
| 403 | 439 | enable_qualification = '".$assignment_data['enable_qualification']."', |
| 404 | 440 | publication_id = '".$new_parent_id."'"; |
| 405 | - if ($debug) echo $sql_add_publication; |
|
| 441 | + if ($debug) { |
|
| 442 | + echo $sql_add_publication; |
|
| 443 | + } |
|
| 406 | 444 | $rest_select = Database::query($sql_add_publication); |
| 407 | 445 | $id = Database::insert_id(); |
| 408 | 446 | |
@@ -410,11 +448,15 @@ discard block |
||
| 410 | 448 | "has_properties = '".$id."', |
| 411 | 449 | view_properties = '1' |
| 412 | 450 | WHERE id = ".$new_parent_id; |
| 413 | - if ($debug) echo $sql_update; |
|
| 451 | + if ($debug) { |
|
| 452 | + echo $sql_update; |
|
| 453 | + } |
|
| 414 | 454 | $rest_update = Database::query($sql_update); |
| 415 | 455 | |
| 416 | 456 | |
| 417 | - if ($debug) var_dump($sql_update); |
|
| 457 | + if ($debug) { |
|
| 458 | + var_dump($sql_update); |
|
| 459 | + } |
|
| 418 | 460 | $result_message[$TBL_STUDENT_PUBLICATION_ASSIGNMENT]++; |
| 419 | 461 | } |
| 420 | 462 | } |
@@ -437,9 +479,13 @@ discard block |
||
| 437 | 479 | parent_id = ".$new_parent_id ." , |
| 438 | 480 | session_id = ".$new_session_id; |
| 439 | 481 | |
| 440 | - if ($debug) echo $sql_add_publication; |
|
| 482 | + if ($debug) { |
|
| 483 | + echo $sql_add_publication; |
|
| 484 | + } |
|
| 441 | 485 | $rest_insert = Database::query($sql_add_publication); |
| 442 | - if ($debug) var_dump($rest_insert); |
|
| 486 | + if ($debug) { |
|
| 487 | + var_dump($rest_insert); |
|
| 488 | + } |
|
| 443 | 489 | $id = Database::insert_id(); |
| 444 | 490 | api_item_property_update($course_info, 'work', $id, 'DocumentAdded', $user_id); |
| 445 | 491 | $result_message[$TBL_STUDENT_PUBLICATION]++; |
@@ -453,7 +499,9 @@ discard block |
||
| 453 | 499 | if ($result) { |
| 454 | 500 | unlink($full_file_name); |
| 455 | 501 | $sql = "DELETE FROM $TBL_STUDENT_PUBLICATION WHERE id= ".$data['id']; |
| 456 | - if ($debug) var_dump($sql); |
|
| 502 | + if ($debug) { |
|
| 503 | + var_dump($sql); |
|
| 504 | + } |
|
| 457 | 505 | $result_delete = Database::query($sql); |
| 458 | 506 | api_item_property_update($course_info, 'work', $data['id'], 'DocumentDeleted', api_get_user_id()); |
| 459 | 507 | } |
@@ -469,22 +517,30 @@ discard block |
||
| 469 | 517 | //10. Dropbox - not neccesary to move categories (no presence of session_id) |
| 470 | 518 | |
| 471 | 519 | $sql = "SELECT id FROM $TBL_DROPBOX_FILE WHERE uploader_id = $user_id AND session_id = $origin_session_id AND c_id = $course_id"; |
| 472 | - if ($debug) var_dump($sql); |
|
| 520 | + if ($debug) { |
|
| 521 | + var_dump($sql); |
|
| 522 | + } |
|
| 473 | 523 | $res = Database::query($sql); |
| 474 | 524 | while($row = Database::fetch_array($res,'ASSOC')) { |
| 475 | 525 | $id = $row['id']; |
| 476 | 526 | if ($update_database) { |
| 477 | 527 | $sql = "UPDATE $TBL_DROPBOX_FILE SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id"; |
| 478 | - if ($debug) var_dump($sql); |
|
| 528 | + if ($debug) { |
|
| 529 | + var_dump($sql); |
|
| 530 | + } |
|
| 479 | 531 | $res = Database::query($sql); |
| 480 | - if ($debug) var_dump($res); |
|
| 532 | + if ($debug) { |
|
| 533 | + var_dump($res); |
|
| 534 | + } |
|
| 481 | 535 | |
| 482 | 536 | $sql = "UPDATE $TBL_DROPBOX_POST SET session_id = $new_session_id WHERE file_id = $id"; |
| 483 | - if ($debug) |
|
| 484 | - var_dump($sql); |
|
| 537 | + if ($debug) { |
|
| 538 | + var_dump($sql); |
|
| 539 | + } |
|
| 485 | 540 | $res = Database::query($sql); |
| 486 | - if ($debug) |
|
| 487 | - var_dump($res); |
|
| 541 | + if ($debug) { |
|
| 542 | + var_dump($res); |
|
| 543 | + } |
|
| 488 | 544 | $result_message[$TBL_DROPBOX_FILE]++; |
| 489 | 545 | } |
| 490 | 546 | } |
@@ -493,23 +549,30 @@ discard block |
||
| 493 | 549 | |
| 494 | 550 | $sql = "SELECT notebook_id FROM $TBL_NOTEBOOK |
| 495 | 551 | WHERE user_id = $user_id AND session_id = $origin_session_id AND course = '$origin_course_code' AND c_id = $course_id"; |
| 496 | - if ($debug) var_dump($sql); |
|
| 552 | + if ($debug) { |
|
| 553 | + var_dump($sql); |
|
| 554 | + } |
|
| 497 | 555 | $res = Database::query($sql); |
| 498 | 556 | while($row = Database::fetch_array($res,'ASSOC')) { |
| 499 | 557 | $id = $row['notebook_id']; |
| 500 | 558 | if ($update_database) { |
| 501 | 559 | $sql = "UPDATE $TBL_NOTEBOOK SET session_id = $new_session_id WHERE c_id = $course_id AND notebook_id = $id"; |
| 502 | - if ($debug) var_dump($sql); |
|
| 560 | + if ($debug) { |
|
| 561 | + var_dump($sql); |
|
| 562 | + } |
|
| 503 | 563 | $res = Database::query($sql); |
| 504 | - if ($debug) var_dump($res); |
|
| 564 | + if ($debug) { |
|
| 565 | + var_dump($res); |
|
| 566 | + } |
|
| 505 | 567 | } |
| 506 | 568 | } |
| 507 | 569 | |
| 508 | 570 | if ($update_database) { |
| 509 | 571 | echo '<h2>'.get_lang('StatsMoved').'</h2>'; |
| 510 | - if (is_array($result_message)) |
|
| 511 | - foreach ($result_message as $table=>$times) { |
|
| 572 | + if (is_array($result_message)) { |
|
| 573 | + foreach ($result_message as $table=>$times) { |
|
| 512 | 574 | echo 'Table '.$table.' - '.$times.' records updated <br />'; |
| 575 | + } |
|
| 513 | 576 | } |
| 514 | 577 | } else { |
| 515 | 578 | echo '<h2>'.get_lang('UserInformationOfThisCourse').'</h2>'; |
@@ -626,10 +689,11 @@ discard block |
||
| 626 | 689 | } |
| 627 | 690 | $navigation .= ' '; |
| 628 | 691 | $page ++; |
| 629 | -if ($page < $nro_pages) |
|
| 692 | +if ($page < $nro_pages) { |
|
| 630 | 693 | $navigation .= '<a href="'.api_get_self().'?page='.$page.'">'.get_lang('Next').'</a>'; |
| 631 | -else |
|
| 694 | +} else { |
|
| 632 | 695 | $navigation .= get_lang('Next'); |
| 696 | +} |
|
| 633 | 697 | |
| 634 | 698 | echo $navigation; |
| 635 | 699 | $user_list = UserManager::get_user_list(array(), array(), $begin, $default); |
@@ -65,8 +65,10 @@ discard block |
||
| 65 | 65 | $bords = array_fill(0, $bord_lenght, array()); // building this array |
| 66 | 66 | |
| 67 | 67 | /* adding the first point of the polygone */ |
| 68 | - if (is_array($bords[$poly[0]['y']])) //avoid warning |
|
| 68 | + if (is_array($bords[$poly[0]['y']])) { |
|
| 69 | + //avoid warning |
|
| 69 | 70 | array_push($bords[$poly[0]['y']], $poly[0]['x']); |
| 71 | + } |
|
| 70 | 72 | |
| 71 | 73 | $i = 1; // we re-use $i and $old_pente bellow the loop |
| 72 | 74 | $old_pente=0; |
@@ -75,11 +77,14 @@ discard block |
||
| 75 | 77 | |
| 76 | 78 | /* special cases */ |
| 77 | 79 | if ($poly[$i-1]['y'] == $poly[$i]['y']) { |
| 78 | - if ($poly[$i-1]['x'] == $poly[$i]['x']) |
|
| 79 | - continue; // twice the same point |
|
| 80 | + if ($poly[$i-1]['x'] == $poly[$i]['x']) { |
|
| 81 | + continue; |
|
| 82 | + } |
|
| 83 | + // twice the same point |
|
| 80 | 84 | else { // infinite elevation of the edge |
| 81 | - if (is_array($bords[$poly[$i]['y']])) |
|
| 82 | - array_push($bords[$poly[$i]['y']],$poly[$i]['x']); |
|
| 85 | + if (is_array($bords[$poly[$i]['y']])) { |
|
| 86 | + array_push($bords[$poly[$i]['y']],$poly[$i]['x']); |
|
| 87 | + } |
|
| 83 | 88 | $old_pente=0; |
| 84 | 89 | continue; |
| 85 | 90 | } |
@@ -87,9 +92,13 @@ discard block |
||
| 87 | 92 | |
| 88 | 93 | //echo 'point:'.$poly[$i]['y']; bug here |
| 89 | 94 | // adding the point as a part of an edge |
| 90 | - if (is_array($bords[$poly[$i]['y']])) //avoid warning |
|
| 95 | + if (is_array($bords[$poly[$i]['y']])) { |
|
| 96 | + //avoid warning |
|
| 91 | 97 | array_push($bords[$poly[$i]['y']], $poly[$i]['x']); |
| 92 | - if (DEBUG) echo '('.$poly[$i]['x'].';'.$poly[$i]['y'].') '; |
|
| 98 | + } |
|
| 99 | + if (DEBUG) { |
|
| 100 | + echo '('.$poly[$i]['x'].';'.$poly[$i]['y'].') '; |
|
| 101 | + } |
|
| 93 | 102 | |
| 94 | 103 | /* computing the elevation of the edge going */ |
| 95 | 104 | // from $poly[$i-1] to $poly[$i] |
@@ -99,15 +108,17 @@ discard block |
||
| 99 | 108 | // if the sign of the elevation change from the one of the |
| 100 | 109 | // previous edge, the point must be added a second time inside |
| 101 | 110 | // $bords |
| 102 | - if ($i>1) |
|
| 103 | - if (($old_pente<0 && $pente>0) |
|
| 111 | + if ($i>1) { |
|
| 112 | + if (($old_pente<0 && $pente>0) |
|
| 104 | 113 | || ($old_pente>0 && $pente<0)) { |
| 105 | 114 | if (is_array($bords[$poly[$i]['y']])) //avoid warning |
| 106 | 115 | array_push($bords[$poly[$i]['y']],$poly[$i]['x']); |
| 116 | + } |
|
| 107 | 117 | |
| 108 | - if (DEBUG) |
|
| 109 | - echo '*('.$poly[$i]['x']. |
|
| 118 | + if (DEBUG) { |
|
| 119 | + echo '*('.$poly[$i]['x']. |
|
| 110 | 120 | ';'.$poly[$i]['y'].') '; |
| 121 | + } |
|
| 111 | 122 | } |
| 112 | 123 | |
| 113 | 124 | /* detect the direction of the elevation in Y */ |
@@ -136,10 +147,11 @@ discard block |
||
| 136 | 147 | |
| 137 | 148 | // elevation between $poly[0]['x'] and $poly[1]['x']) |
| 138 | 149 | $rest = $poly[0]['y']-$poly[1]['y']; |
| 139 | - if ($rest!=0) |
|
| 140 | - $pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest); |
|
| 141 | - else |
|
| 142 | - $pente1 = 0; |
|
| 150 | + if ($rest!=0) { |
|
| 151 | + $pente1 = ($poly[0]['x']-$poly[1]['x'])/($rest); |
|
| 152 | + } else { |
|
| 153 | + $pente1 = 0; |
|
| 154 | + } |
|
| 143 | 155 | |
| 144 | 156 | // elevation between $poly[$i-1]['x'] and $poly[0]['x']) |
| 145 | 157 | $pente = ($poly[$i-1]['x']-$poly[0]['x'])/ |
@@ -151,14 +163,17 @@ discard block |
||
| 151 | 163 | |
| 152 | 164 | // doubling the first point if needed (see above) |
| 153 | 165 | if (($pente1<0 && $pente>0) || ($pente1>0 && $pente<0)) { |
| 154 | - if (is_array($bords[$poly[$i - 1]['y']])) |
|
| 155 | - array_push($bords[$poly[$i - 1]['y']], round($poly[$i - 1]['x'])); |
|
| 166 | + if (is_array($bords[$poly[$i - 1]['y']])) { |
|
| 167 | + array_push($bords[$poly[$i - 1]['y']], round($poly[$i - 1]['x'])); |
|
| 168 | + } |
|
| 156 | 169 | //if (DEBUG) echo '('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].') '; |
| 157 | 170 | } |
| 158 | 171 | // doubling the last point if neededd |
| 159 | 172 | if (($old_pente<0 && $pente>0) || ($old_pente>0 && $pente<0)) { |
| 160 | - if (is_array($bords[$poly[$i-1]['y']])) //avoid warning |
|
| 173 | + if (is_array($bords[$poly[$i-1]['y']])) { |
|
| 174 | + //avoid warning |
|
| 161 | 175 | array_push($bords[$poly[$i-1]['y']], round($poly[$i-1]['x'])); |
| 176 | + } |
|
| 162 | 177 | //if (DEBUG) echo '*('.$poly[$i-1]['x'].';'.$poly[$i-1]['y'].') '; |
| 163 | 178 | } |
| 164 | 179 | |
@@ -227,11 +242,13 @@ discard block |
||
| 227 | 242 | $s = "<div style='font-size: 8px; line-height:3px'><pre>\n"; |
| 228 | 243 | } |
| 229 | 244 | for ($i=0; $i<$max['y']; $i++) { |
| 230 | - for($j=0; $j<$max['x']; $j++) |
|
| 231 | - if($poly[$j][$i] == TRUE) |
|
| 245 | + for($j=0; $j<$max['x']; $j++) { |
|
| 246 | + if($poly[$j][$i] == TRUE) |
|
| 232 | 247 | $s .= ($format=='html'?"<b>1</b>":'1'); |
| 233 | - else |
|
| 234 | - $s .= "0"; |
|
| 248 | + } |
|
| 249 | + else { |
|
| 250 | + $s .= "0"; |
|
| 251 | + } |
|
| 235 | 252 | $s .= ($format=='html'?"<br />\n":"\n"); |
| 236 | 253 | } |
| 237 | 254 | $s .= ($format=='html'?"</pre></div>\n":"\n"); |
@@ -252,15 +269,19 @@ discard block |
||
| 252 | 269 | $surfaceOf1 = 0; |
| 253 | 270 | $surfaceOf2 = 0; |
| 254 | 271 | |
| 255 | - for ($i=0; $i<$max['x']; $i++) |
|
| 256 | - for($j=0; $j<$max['y']; $j++) { |
|
| 272 | + for ($i=0; $i<$max['x']; $i++) { |
|
| 273 | + for($j=0; |
|
| 274 | + } |
|
| 275 | + $j<$max['y']; $j++) { |
|
| 257 | 276 | if (isset($poly1[$i][$j]) && ($poly1[$i][$j] == TRUE)) { |
| 258 | 277 | $surfaceOf1++; |
| 259 | - if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE)) |
|
| 260 | - $onlyIn1++; |
|
| 278 | + if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == FALSE)) { |
|
| 279 | + $onlyIn1++; |
|
| 280 | + } |
|
| 281 | + } |
|
| 282 | + if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == TRUE)) { |
|
| 283 | + $surfaceOf2++; |
|
| 261 | 284 | } |
| 262 | - if (isset($poly2[$i][$j]) && ($poly2[$i][$j] == TRUE)) |
|
| 263 | - $surfaceOf2++; |
|
| 264 | 285 | } |
| 265 | 286 | |
| 266 | 287 | return array ( |
@@ -41,28 +41,35 @@ |
||
| 41 | 41 | 'where r.course_id=c.id and r.tool_id='. |
| 42 | 42 | reports_getToolId(TOOL_QUIZ). |
| 43 | 43 | ' order by r.course_id, r.child_name'); |
| 44 | - if (Database::num_rows($columns) == 0) |
|
| 45 | - die('<b>'.get_lang('no data found').'</b>'); |
|
| 44 | + if (Database::num_rows($columns) == 0) { |
|
| 45 | + die('<b>'.get_lang('no data found').'</b>'); |
|
| 46 | + } |
|
| 46 | 47 | $query = 'select u.lastname Name, u.firstname Firstname'; |
| 47 | 48 | $columns = Database::store_result($columns); |
| 48 | - if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max') |
|
| 49 | - $function = $_REQUEST['tattempt']; |
|
| 50 | - else |
|
| 51 | - $function = 'avg'; |
|
| 52 | - foreach ($columns as $key => $column) |
|
| 53 | - $query .= ', '.$function.'(k'.$key.'.score) as `'. |
|
| 49 | + if ($_REQUEST['tattempt'] == 'min' || $_REQUEST['tattempt'] == 'max') { |
|
| 50 | + $function = $_REQUEST['tattempt']; |
|
| 51 | + } else { |
|
| 52 | + $function = 'avg'; |
|
| 53 | + } |
|
| 54 | + foreach ($columns as $key => $column) { |
|
| 55 | + $query .= ', '.$function.'(k'.$key.'.score) as `'. |
|
| 54 | 56 | $column['course'].' - '. |
| 55 | 57 | $column['test'].'` '; |
| 58 | + } |
|
| 56 | 59 | $query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u '; |
| 57 | - foreach ($columns as $key => $column) // fixme sessions |
|
| 60 | + foreach ($columns as $key => $column) { |
|
| 61 | + // fixme sessions |
|
| 58 | 62 | $query .= 'left outer join '. |
| 59 | 63 | Database::get_main_table(TABLE_MAIN_REPORTS_VALUES). |
| 60 | 64 | ' k'.$key. |
| 61 | 65 | ' on k'.$key.'.key_id = '.$column['kid']. |
| 62 | 66 | ' and k'.$key.'.user_id = u.user_id '; |
| 67 | + } |
|
| 63 | 68 | $query .= ' group by '; |
| 64 | - foreach ($columns as $key => $column) // grouping attempt |
|
| 69 | + foreach ($columns as $key => $column) { |
|
| 70 | + // grouping attempt |
|
| 65 | 71 | $query .= 'k'.$key.'.attempt, '; |
| 72 | + } |
|
| 66 | 73 | $query = substr($query, 0, -2); // removing last ', '; |
| 67 | 74 | |
| 68 | 75 | |
@@ -1009,8 +1009,9 @@ discard block |
||
| 1009 | 1009 | $blog_post_actions .= '</a>'; |
| 1010 | 1010 | } |
| 1011 | 1011 | |
| 1012 | - if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) |
|
| 1013 | - $rating_select = Blog::display_rating_form('post',$blog_id,$post_id); |
|
| 1012 | + if (api_is_allowed('BLOG_' . $blog_id, 'article_rate')) { |
|
| 1013 | + $rating_select = Blog::display_rating_form('post',$blog_id,$post_id); |
|
| 1014 | + } |
|
| 1014 | 1015 | |
| 1015 | 1016 | $blog_post_text=stripslashes($blog_post_text); |
| 1016 | 1017 | |
@@ -1654,8 +1655,9 @@ discard block |
||
| 1654 | 1655 | |
| 1655 | 1656 | $arrPermissions = array(); |
| 1656 | 1657 | |
| 1657 | - while ($row = Database::fetch_array($result)) |
|
| 1658 | - $arrPermissions[] = $row['action']; |
|
| 1658 | + while ($row = Database::fetch_array($result)) { |
|
| 1659 | + $arrPermissions[] = $row['action']; |
|
| 1660 | + } |
|
| 1659 | 1661 | |
| 1660 | 1662 | echo '<tr>'; |
| 1661 | 1663 | echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ': </td>'; |
@@ -2332,8 +2334,9 @@ discard block |
||
| 2332 | 2334 | //Handle leap year |
| 2333 | 2335 | $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); |
| 2334 | 2336 | |
| 2335 | - if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) |
|
| 2336 | - $numberofdays[2] = 29; |
|
| 2337 | + if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) { |
|
| 2338 | + $numberofdays[2] = 29; |
|
| 2339 | + } |
|
| 2337 | 2340 | |
| 2338 | 2341 | //Get the first day of the month |
| 2339 | 2342 | $dayone = getdate(mktime(0, 0, 0, $month, 1, $year)); |
@@ -2363,8 +2366,9 @@ discard block |
||
| 2363 | 2366 | if( Database::num_rows($result) > 0) { |
| 2364 | 2367 | while($blog_post = Database::fetch_array($result)) { |
| 2365 | 2368 | // If the day of this post is not yet in the array, add it. |
| 2366 | - if (!in_array($blog_post['post_day'], $posts)) |
|
| 2367 | - $posts[] = $blog_post['post_day']; |
|
| 2369 | + if (!in_array($blog_post['post_day'], $posts)) { |
|
| 2370 | + $posts[] = $blog_post['post_day']; |
|
| 2371 | + } |
|
| 2368 | 2372 | } |
| 2369 | 2373 | } |
| 2370 | 2374 | |
@@ -2403,8 +2407,9 @@ discard block |
||
| 2403 | 2407 | |
| 2404 | 2408 | echo "<tr>\n"; |
| 2405 | 2409 | |
| 2406 | - for($ii = 1; $ii < 8; $ii ++) |
|
| 2407 | - echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>"; |
|
| 2410 | + for($ii = 1; $ii < 8; $ii ++) { |
|
| 2411 | + echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>"; |
|
| 2412 | + } |
|
| 2408 | 2413 | |
| 2409 | 2414 | echo "</tr>"; |
| 2410 | 2415 | |
@@ -2414,8 +2419,9 @@ discard block |
||
| 2414 | 2419 | while ($curday <= $numberofdays[$month]) { |
| 2415 | 2420 | echo "<tr>"; |
| 2416 | 2421 | for ($ii = 0; $ii < 7; $ii ++) { |
| 2417 | - if (($curday == -1) && ($ii == $startdayofweek)) |
|
| 2418 | - $curday = 1; |
|
| 2422 | + if (($curday == -1) && ($ii == $startdayofweek)) { |
|
| 2423 | + $curday = 1; |
|
| 2424 | + } |
|
| 2419 | 2425 | |
| 2420 | 2426 | if (($curday > 0) && ($curday <= $numberofdays[$month])) { |
| 2421 | 2427 | $bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\""; |
@@ -2429,10 +2435,11 @@ discard block |
||
| 2429 | 2435 | echo "<td " . $class.">"; |
| 2430 | 2436 | |
| 2431 | 2437 | // If there are posts on this day, create a filter link. |
| 2432 | - if(in_array($curday, $posts)) |
|
| 2433 | - echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>'; |
|
| 2434 | - else |
|
| 2435 | - echo $dayheader; |
|
| 2438 | + if(in_array($curday, $posts)) { |
|
| 2439 | + echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>'; |
|
| 2440 | + } else { |
|
| 2441 | + echo $dayheader; |
|
| 2442 | + } |
|
| 2436 | 2443 | |
| 2437 | 2444 | if (count($tasks) > 0) { |
| 2438 | 2445 | if (isset($tasks[$curday]) && is_array($tasks[$curday])) { |
@@ -2446,8 +2453,9 @@ discard block |
||
| 2446 | 2453 | |
| 2447 | 2454 | echo "</td>"; |
| 2448 | 2455 | $curday ++; |
| 2449 | - } else |
|
| 2450 | - echo "<td> </td>"; |
|
| 2456 | + } else { |
|
| 2457 | + echo "<td> </td>"; |
|
| 2458 | + } |
|
| 2451 | 2459 | } |
| 2452 | 2460 | echo "</tr>"; |
| 2453 | 2461 | } |
@@ -1152,68 +1152,52 @@ |
||
| 1152 | 1152 | if (stripos($this->_agent, 'windows') !== false) |
| 1153 | 1153 | { |
| 1154 | 1154 | $this->_platform = self::PLATFORM_WINDOWS; |
| 1155 | - } |
|
| 1156 | - else if (stripos($this->_agent, 'iPad') !== false) |
|
| 1155 | + } else if (stripos($this->_agent, 'iPad') !== false) |
|
| 1157 | 1156 | { |
| 1158 | 1157 | $this->_platform = self::PLATFORM_IPAD; |
| 1159 | - } |
|
| 1160 | - else if (stripos($this->_agent, 'iPod') !== false) |
|
| 1158 | + } else if (stripos($this->_agent, 'iPod') !== false) |
|
| 1161 | 1159 | { |
| 1162 | 1160 | $this->_platform = self::PLATFORM_IPOD; |
| 1163 | - } |
|
| 1164 | - else if (stripos($this->_agent, 'iPhone') !== false) |
|
| 1161 | + } else if (stripos($this->_agent, 'iPhone') !== false) |
|
| 1165 | 1162 | { |
| 1166 | 1163 | $this->_platform = self::PLATFORM_IPHONE; |
| 1167 | - } |
|
| 1168 | - elseif (stripos($this->_agent, 'mac') !== false) |
|
| 1164 | + } elseif (stripos($this->_agent, 'mac') !== false) |
|
| 1169 | 1165 | { |
| 1170 | 1166 | $this->_platform = self::PLATFORM_APPLE; |
| 1171 | - } |
|
| 1172 | - elseif (stripos($this->_agent, 'android') !== false) |
|
| 1167 | + } elseif (stripos($this->_agent, 'android') !== false) |
|
| 1173 | 1168 | { |
| 1174 | 1169 | $this->_platform = self::PLATFORM_ANDROID; |
| 1175 | - } |
|
| 1176 | - elseif (stripos($this->_agent, 'linux') !== false) |
|
| 1170 | + } elseif (stripos($this->_agent, 'linux') !== false) |
|
| 1177 | 1171 | { |
| 1178 | 1172 | $this->_platform = self::PLATFORM_LINUX; |
| 1179 | - } |
|
| 1180 | - else if (stripos($this->_agent, 'Nokia') !== false) |
|
| 1173 | + } else if (stripos($this->_agent, 'Nokia') !== false) |
|
| 1181 | 1174 | { |
| 1182 | 1175 | $this->_platform = self::PLATFORM_NOKIA; |
| 1183 | - } |
|
| 1184 | - else if (stripos($this->_agent, 'BlackBerry') !== false) |
|
| 1176 | + } else if (stripos($this->_agent, 'BlackBerry') !== false) |
|
| 1185 | 1177 | { |
| 1186 | 1178 | $this->_platform = self::PLATFORM_BLACKBERRY; |
| 1187 | - } |
|
| 1188 | - elseif (stripos($this->_agent, 'FreeBSD') !== false) |
|
| 1179 | + } elseif (stripos($this->_agent, 'FreeBSD') !== false) |
|
| 1189 | 1180 | { |
| 1190 | 1181 | $this->_platform = self::PLATFORM_FREEBSD; |
| 1191 | - } |
|
| 1192 | - elseif (stripos($this->_agent, 'OpenBSD') !== false) |
|
| 1182 | + } elseif (stripos($this->_agent, 'OpenBSD') !== false) |
|
| 1193 | 1183 | { |
| 1194 | 1184 | $this->_platform = self::PLATFORM_OPENBSD; |
| 1195 | - } |
|
| 1196 | - elseif (stripos($this->_agent, 'NetBSD') !== false) |
|
| 1185 | + } elseif (stripos($this->_agent, 'NetBSD') !== false) |
|
| 1197 | 1186 | { |
| 1198 | 1187 | $this->_platform = self::PLATFORM_NETBSD; |
| 1199 | - } |
|
| 1200 | - elseif (stripos($this->_agent, 'OpenSolaris') !== false) |
|
| 1188 | + } elseif (stripos($this->_agent, 'OpenSolaris') !== false) |
|
| 1201 | 1189 | { |
| 1202 | 1190 | $this->_platform = self::PLATFORM_OPENSOLARIS; |
| 1203 | - } |
|
| 1204 | - elseif (stripos($this->_agent, 'SunOS') !== false) |
|
| 1191 | + } elseif (stripos($this->_agent, 'SunOS') !== false) |
|
| 1205 | 1192 | { |
| 1206 | 1193 | $this->_platform = self::PLATFORM_SUNOS; |
| 1207 | - } |
|
| 1208 | - elseif (stripos($this->_agent, 'OS\/2') !== false) |
|
| 1194 | + } elseif (stripos($this->_agent, 'OS\/2') !== false) |
|
| 1209 | 1195 | { |
| 1210 | 1196 | $this->_platform = self::PLATFORM_OS2; |
| 1211 | - } |
|
| 1212 | - elseif (stripos($this->_agent, 'BeOS') !== false) |
|
| 1197 | + } elseif (stripos($this->_agent, 'BeOS') !== false) |
|
| 1213 | 1198 | { |
| 1214 | 1199 | $this->_platform = self::PLATFORM_BEOS; |
| 1215 | - } |
|
| 1216 | - elseif (stripos($this->_agent, 'win') !== false) |
|
| 1200 | + } elseif (stripos($this->_agent, 'win') !== false) |
|
| 1217 | 1201 | { |
| 1218 | 1202 | $this->_platform = self::PLATFORM_WINDOWS; |
| 1219 | 1203 | } |
@@ -29,14 +29,16 @@ |
||
| 29 | 29 | {
|
| 30 | 30 | foreach ( $_POST as $key => $value ) |
| 31 | 31 | {
|
| 32 | - if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) |
|
| 33 | - continue; |
|
| 32 | + if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) { |
|
| 33 | + continue; |
|
| 34 | + } |
|
| 34 | 35 | |
| 35 | - if ( get_magic_quotes_gpc() ) |
|
| 36 | - $value = htmlspecialchars( stripslashes((string)$value) ); |
|
| 37 | - else |
|
| 38 | - $value = htmlspecialchars( (string)$value ); |
|
| 39 | -?> |
|
| 36 | + if ( get_magic_quotes_gpc() ) { |
|
| 37 | + $value = htmlspecialchars( stripslashes((string)$value) ); |
|
| 38 | + } else { |
|
| 39 | + $value = htmlspecialchars( (string)$value ); |
|
| 40 | + } |
|
| 41 | + ?> |
|
| 40 | 42 | <tr> |
| 41 | 43 | <th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th> |
| 42 | 44 | <td><pre class="samples"><?php echo $value; ?></pre></td> |
@@ -866,7 +866,7 @@ discard block |
||
| 866 | 866 | |
| 867 | 867 | if ($progress === null) { |
| 868 | 868 | $progress = '0%'; |
| 869 | - } else { |
|
| 869 | + } else { |
|
| 870 | 870 | $any_result = true; |
| 871 | 871 | } |
| 872 | 872 | |
@@ -896,7 +896,9 @@ discard block |
||
| 896 | 896 | $start_time = '-'; |
| 897 | 897 | } |
| 898 | 898 | |
| 899 | - if (!empty($total_time)) $any_result = true; |
|
| 899 | + if (!empty($total_time)) { |
|
| 900 | + $any_result = true; |
|
| 901 | + } |
|
| 900 | 902 | |
| 901 | 903 | // Quiz in lp |
| 902 | 904 | $score = Tracking::get_avg_student_score( |
@@ -1089,10 +1091,11 @@ discard block |
||
| 1089 | 1091 | $result_last_attempt = Database::query($sql); |
| 1090 | 1092 | if (Database :: num_rows($result_last_attempt) > 0) { |
| 1091 | 1093 | $id_last_attempt = Database :: result($result_last_attempt, 0, 0); |
| 1092 | - if ($count_attempts > 0) |
|
| 1093 | - echo '<a href="../exercice/exercise_show.php?id=' . $id_last_attempt . '&cidReq='.$course_code.'&session_id='.$sessionId.'&student='.$student_id.'&origin='.(empty($origin)?'tracking':$origin).'"> |
|
| 1094 | + if ($count_attempts > 0) { |
|
| 1095 | + echo '<a href="../exercice/exercise_show.php?id=' . $id_last_attempt . '&cidReq='.$course_code.'&session_id='.$sessionId.'&student='.$student_id.'&origin='.(empty($origin)?'tracking':$origin).'"> |
|
| 1094 | 1096 | '.Display::return_icon('quiz.gif').' |
| 1095 | 1097 | </a>'; |
| 1098 | + } |
|
| 1096 | 1099 | } |
| 1097 | 1100 | echo '</td>'; |
| 1098 | 1101 | |
@@ -3939,8 +3939,9 @@ discard block |
||
| 3939 | 3939 | WHERE c_id = ".$course_id." |
| 3940 | 3940 | ORDER BY display_order"; |
| 3941 | 3941 | $res = Database::query($sql); |
| 3942 | - if ($res === false) |
|
| 3943 | - return false; |
|
| 3942 | + if ($res === false) { |
|
| 3943 | + return false; |
|
| 3944 | + } |
|
| 3944 | 3945 | $lps = array (); |
| 3945 | 3946 | $lp_order = array (); |
| 3946 | 3947 | $num = Database :: num_rows($res); |
@@ -4540,8 +4541,9 @@ discard block |
||
| 4540 | 4541 | if ($this->debug > 0) { |
| 4541 | 4542 | error_log('New LP - In learnpath::set_maker()', 0); |
| 4542 | 4543 | } |
| 4543 | - if (empty ($name)) |
|
| 4544 | - return false; |
|
| 4544 | + if (empty ($name)) { |
|
| 4545 | + return false; |
|
| 4546 | + } |
|
| 4545 | 4547 | $this->maker = $name; |
| 4546 | 4548 | $lp_table = Database :: get_course_table(TABLE_LP_MAIN); |
| 4547 | 4549 | $course_id = api_get_course_int_id(); |
@@ -4606,8 +4608,9 @@ discard block |
||
| 4606 | 4608 | public function set_terms_by_prefix($terms_string, $prefix) |
| 4607 | 4609 | { |
| 4608 | 4610 | $course_id = api_get_course_int_id(); |
| 4609 | - if (api_get_setting('search_enabled') !== 'true') |
|
| 4610 | - return false; |
|
| 4611 | + if (api_get_setting('search_enabled') !== 'true') { |
|
| 4612 | + return false; |
|
| 4613 | + } |
|
| 4611 | 4614 | |
| 4612 | 4615 | if (!extension_loaded('xapian')) { |
| 4613 | 4616 | return false; |
@@ -4620,8 +4623,9 @@ discard block |
||
| 4620 | 4623 | $stored_terms = $this->get_common_index_terms_by_prefix($prefix); |
| 4621 | 4624 | |
| 4622 | 4625 | // Don't do anything if no change, verify only at DB, not the search engine. |
| 4623 | - if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) |
|
| 4624 | - return false; |
|
| 4626 | + if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) { |
|
| 4627 | + return false; |
|
| 4628 | + } |
|
| 4625 | 4629 | |
| 4626 | 4630 | require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API. |
| 4627 | 4631 | require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php'; |
@@ -4813,8 +4817,9 @@ discard block |
||
| 4813 | 4817 | if ($this->debug > 0) { |
| 4814 | 4818 | error_log('New LP - In learnpath::set_proximity()', 0); |
| 4815 | 4819 | } |
| 4816 | - if (empty ($name)) |
|
| 4817 | - return false; |
|
| 4820 | + if (empty ($name)) { |
|
| 4821 | + return false; |
|
| 4822 | + } |
|
| 4818 | 4823 | |
| 4819 | 4824 | $this->proximity = $name; |
| 4820 | 4825 | $lp_table = Database :: get_course_table(TABLE_LP_MAIN); |
@@ -5156,8 +5161,9 @@ discard block |
||
| 5156 | 5161 | |
| 5157 | 5162 | $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order"; |
| 5158 | 5163 | $res = Database::query($sql); |
| 5159 | - if ($res === false) |
|
| 5160 | - return false; |
|
| 5164 | + if ($res === false) { |
|
| 5165 | + return false; |
|
| 5166 | + } |
|
| 5161 | 5167 | |
| 5162 | 5168 | $num = Database :: num_rows($res); |
| 5163 | 5169 | // First check the order is correct, globally (might be wrong because |
@@ -5468,8 +5474,9 @@ discard block |
||
| 5468 | 5474 | $position[$key] = $row['display_order']; |
| 5469 | 5475 | } |
| 5470 | 5476 | |
| 5471 | - if (count($array) > 0) |
|
| 5472 | - array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array); |
|
| 5477 | + if (count($array) > 0) { |
|
| 5478 | + array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array); |
|
| 5479 | + } |
|
| 5473 | 5480 | |
| 5474 | 5481 | return $array; |
| 5475 | 5482 | } |
@@ -6037,8 +6044,9 @@ discard block |
||
| 6037 | 6044 | $tmp_filename = $filename; |
| 6038 | 6045 | |
| 6039 | 6046 | $i = 0; |
| 6040 | - while (file_exists($filepath . $tmp_filename . '.'.$extension)) |
|
| 6041 | - $tmp_filename = $filename . '_' . ++ $i; |
|
| 6047 | + while (file_exists($filepath . $tmp_filename . '.'.$extension)) { |
|
| 6048 | + $tmp_filename = $filename . '_' . ++ $i; |
|
| 6049 | + } |
|
| 6042 | 6050 | |
| 6043 | 6051 | $filename = $tmp_filename . '.'.$extension; |
| 6044 | 6052 | if ($extension == 'html') { |
@@ -6117,10 +6125,12 @@ discard block |
||
| 6117 | 6125 | if ($new_comment || $new_title) { |
| 6118 | 6126 | $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT); |
| 6119 | 6127 | $ct = ''; |
| 6120 | - if ($new_comment) |
|
| 6121 | - $ct .= ", comment='" . Database::escape_string($new_comment). "'"; |
|
| 6122 | - if ($new_title) |
|
| 6123 | - $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' "; |
|
| 6128 | + if ($new_comment) { |
|
| 6129 | + $ct .= ", comment='" . Database::escape_string($new_comment). "'"; |
|
| 6130 | + } |
|
| 6131 | + if ($new_title) { |
|
| 6132 | + $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' "; |
|
| 6133 | + } |
|
| 6124 | 6134 | |
| 6125 | 6135 | $sql = "UPDATE " . $tbl_doc ." SET " . substr($ct, 1)." |
| 6126 | 6136 | WHERE c_id = ".$course_id." AND id = " . $document_id; |
@@ -6144,17 +6154,21 @@ discard block |
||
| 6144 | 6154 | // Please, do not modify this dirname formatting. |
| 6145 | 6155 | $dir = isset($_GET['dir']) ? $_GET['dir'] : $_POST['dir']; |
| 6146 | 6156 | |
| 6147 | - if (strstr($dir, '..')) |
|
| 6148 | - $dir = '/'; |
|
| 6157 | + if (strstr($dir, '..')) { |
|
| 6158 | + $dir = '/'; |
|
| 6159 | + } |
|
| 6149 | 6160 | |
| 6150 | - if ($dir[0] == '.') |
|
| 6151 | - $dir = substr($dir, 1); |
|
| 6161 | + if ($dir[0] == '.') { |
|
| 6162 | + $dir = substr($dir, 1); |
|
| 6163 | + } |
|
| 6152 | 6164 | |
| 6153 | - if ($dir[0] != '/') |
|
| 6154 | - $dir = '/' . $dir; |
|
| 6165 | + if ($dir[0] != '/') { |
|
| 6166 | + $dir = '/' . $dir; |
|
| 6167 | + } |
|
| 6155 | 6168 | |
| 6156 | - if ($dir[strlen($dir) - 1] != '/') |
|
| 6157 | - $dir .= '/'; |
|
| 6169 | + if ($dir[strlen($dir) - 1] != '/') { |
|
| 6170 | + $dir .= '/'; |
|
| 6171 | + } |
|
| 6158 | 6172 | |
| 6159 | 6173 | $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir; |
| 6160 | 6174 | |
@@ -6219,8 +6233,9 @@ discard block |
||
| 6219 | 6233 | } |
| 6220 | 6234 | $return .= '<div style="padding:10px;">'; |
| 6221 | 6235 | |
| 6222 | - if ($msg != '') |
|
| 6223 | - $return .= $msg; |
|
| 6236 | + if ($msg != '') { |
|
| 6237 | + $return .= $msg; |
|
| 6238 | + } |
|
| 6224 | 6239 | |
| 6225 | 6240 | $return .= '<h3>'.$row['title'].'</h3>'; |
| 6226 | 6241 | switch ($row['item_type']) { |
@@ -6484,10 +6499,11 @@ discard block |
||
| 6484 | 6499 | $item_title = Security::remove_XSS($item_title); |
| 6485 | 6500 | $item_description = Security::remove_XSS($item_description); |
| 6486 | 6501 | |
| 6487 | - if ($id != 0 && is_array($extra_info)) |
|
| 6488 | - $parent = $extra_info['parent_item_id']; |
|
| 6489 | - else |
|
| 6490 | - $parent = 0; |
|
| 6502 | + if ($id != 0 && is_array($extra_info)) { |
|
| 6503 | + $parent = $extra_info['parent_item_id']; |
|
| 6504 | + } else { |
|
| 6505 | + $parent = 0; |
|
| 6506 | + } |
|
| 6491 | 6507 | |
| 6492 | 6508 | $sql = "SELECT * FROM " . $tbl_lp_item . " |
| 6493 | 6509 | WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id; |
@@ -6760,11 +6776,13 @@ discard block |
||
| 6760 | 6776 | } |
| 6761 | 6777 | |
| 6762 | 6778 | $legend = '<legend>'; |
| 6763 | - if ($action == 'add') |
|
| 6764 | - $legend .= get_lang('CreateTheExercise'); |
|
| 6765 | - elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentExercise'); |
|
| 6766 | - else |
|
| 6767 | - $legend .= get_lang('EditCurrentExecice'); |
|
| 6779 | + if ($action == 'add') { |
|
| 6780 | + $legend .= get_lang('CreateTheExercise'); |
|
| 6781 | + } elseif ($action == 'move') { |
|
| 6782 | + $legend .= get_lang('MoveTheCurrentExercise'); |
|
| 6783 | + } else { |
|
| 6784 | + $legend .= get_lang('EditCurrentExecice'); |
|
| 6785 | + } |
|
| 6768 | 6786 | if (isset ($_GET['edit']) && $_GET['edit'] == 'true') { |
| 6769 | 6787 | $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument')); |
| 6770 | 6788 | } |
@@ -6791,8 +6809,9 @@ discard block |
||
| 6791 | 6809 | $arrHide[] = $arrLP[$i]['id']; |
| 6792 | 6810 | } |
| 6793 | 6811 | } else { |
| 6794 | - if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') |
|
| 6795 | - $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>'; |
|
| 6812 | + if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') { |
|
| 6813 | + $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>'; |
|
| 6814 | + } |
|
| 6796 | 6815 | } |
| 6797 | 6816 | } |
| 6798 | 6817 | |
@@ -6810,11 +6829,13 @@ discard block |
||
| 6810 | 6829 | |
| 6811 | 6830 | for ($i = 0; $i < count($arrLP); $i++) { |
| 6812 | 6831 | if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) { |
| 6813 | - if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) |
|
| 6832 | + if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) { |
|
| 6833 | + $selected = 'selected="selected" '; |
|
| 6834 | + } elseif ($action == 'add') { |
|
| 6814 | 6835 | $selected = 'selected="selected" '; |
| 6815 | - elseif ($action == 'add') $selected = 'selected="selected" '; |
|
| 6816 | - else |
|
| 6817 | - $selected = ''; |
|
| 6836 | + } else { |
|
| 6837 | + $selected = ''; |
|
| 6838 | + } |
|
| 6818 | 6839 | |
| 6819 | 6840 | $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>'; |
| 6820 | 6841 | } |
@@ -6841,9 +6862,11 @@ discard block |
||
| 6841 | 6862 | $arrHide = array (); |
| 6842 | 6863 | for ($i = 0; $i < count($arrLP); $i++) { |
| 6843 | 6864 | if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') { |
| 6844 | - if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) |
|
| 6845 | - $s_selected_position = $arrLP[$i]['id']; |
|
| 6846 | - elseif ($action == 'add') $s_selected_position = 0; |
|
| 6865 | + if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) { |
|
| 6866 | + $s_selected_position = $arrLP[$i]['id']; |
|
| 6867 | + } elseif ($action == 'add') { |
|
| 6868 | + $s_selected_position = 0; |
|
| 6869 | + } |
|
| 6847 | 6870 | $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title']; |
| 6848 | 6871 | |
| 6849 | 6872 | } |
@@ -7040,9 +7063,11 @@ discard block |
||
| 7040 | 7063 | $arrHide = array(); |
| 7041 | 7064 | for ($i = 0; $i < count($arrLP); $i++) { |
| 7042 | 7065 | if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') { |
| 7043 | - if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) |
|
| 7044 | - $s_selected_position = $arrLP[$i]['id']; |
|
| 7045 | - elseif ($action == 'add') $s_selected_position = 0; |
|
| 7066 | + if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) { |
|
| 7067 | + $s_selected_position = $arrLP[$i]['id']; |
|
| 7068 | + } elseif ($action == 'add') { |
|
| 7069 | + $s_selected_position = 0; |
|
| 7070 | + } |
|
| 7046 | 7071 | $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title']; |
| 7047 | 7072 | } |
| 7048 | 7073 | } |
@@ -7245,9 +7270,11 @@ discard block |
||
| 7245 | 7270 | |
| 7246 | 7271 | for ($i = 0; $i < count($arrLP); $i++) { |
| 7247 | 7272 | if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') { |
| 7248 | - if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) |
|
| 7249 | - $s_selected_position = $arrLP[$i]['id']; |
|
| 7250 | - elseif ($action == 'add') $s_selected_position = 0; |
|
| 7273 | + if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) { |
|
| 7274 | + $s_selected_position = $arrLP[$i]['id']; |
|
| 7275 | + } elseif ($action == 'add') { |
|
| 7276 | + $s_selected_position = 0; |
|
| 7277 | + } |
|
| 7251 | 7278 | $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title']; |
| 7252 | 7279 | |
| 7253 | 7280 | } |
@@ -7281,8 +7308,7 @@ discard block |
||
| 7281 | 7308 | |
| 7282 | 7309 | if (is_numeric($extra_info)) { |
| 7283 | 7310 | $form->addHidden('path', $extra_info); |
| 7284 | - } |
|
| 7285 | - elseif (is_array($extra_info)) { |
|
| 7311 | + } elseif (is_array($extra_info)) { |
|
| 7286 | 7312 | $form->addHidden('path', $extra_info['path']); |
| 7287 | 7313 | } |
| 7288 | 7314 | |
@@ -7335,8 +7361,9 @@ discard block |
||
| 7335 | 7361 | lp_id = " . $this->lp_id . " AND |
| 7336 | 7362 | id != $id"; |
| 7337 | 7363 | |
| 7338 | - if ($item_type == 'module') |
|
| 7339 | - $sql .= " AND parent_item_id = 0"; |
|
| 7364 | + if ($item_type == 'module') { |
|
| 7365 | + $sql .= " AND parent_item_id = 0"; |
|
| 7366 | + } |
|
| 7340 | 7367 | |
| 7341 | 7368 | $result = Database::query($sql); |
| 7342 | 7369 | $arrLP = array (); |
@@ -7722,9 +7749,11 @@ discard block |
||
| 7722 | 7749 | |
| 7723 | 7750 | for ($i = 0; $i < count($arrLP); $i++) { |
| 7724 | 7751 | if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter' && $arrLP[$i]['item_type'] !== TOOL_LP_FINAL_ITEM) { |
| 7725 | - if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) |
|
| 7752 | + if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) { |
|
| 7753 | + $s_selected_position = $arrLP[$i]['id']; |
|
| 7754 | + } elseif ($action == 'add') { |
|
| 7726 | 7755 | $s_selected_position = $arrLP[$i]['id']; |
| 7727 | - elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id']; |
|
| 7756 | + } |
|
| 7728 | 7757 | |
| 7729 | 7758 | $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title']; |
| 7730 | 7759 | |
@@ -7735,17 +7764,18 @@ discard block |
||
| 7735 | 7764 | $item_type = isset($extra_info['item_type']) ? $extra_info['item_type'] : null; |
| 7736 | 7765 | $edit = isset($_GET['edit']) ? $_GET['edit'] : null; |
| 7737 | 7766 | if (($extra_info == 'new' || $item_type == TOOL_DOCUMENT || $item_type == TOOL_LP_FINAL_ITEM || $edit == 'true')) { |
| 7738 | - if (isset ($_POST['content'])) |
|
| 7739 | - $content = stripslashes($_POST['content']); |
|
| 7740 | - elseif (is_array($extra_info)) { |
|
| 7767 | + if (isset ($_POST['content'])) { |
|
| 7768 | + $content = stripslashes($_POST['content']); |
|
| 7769 | + } elseif (is_array($extra_info)) { |
|
| 7741 | 7770 | //If it's an html document or a text file |
| 7742 | 7771 | if (!$no_display_edit_textarea) { |
| 7743 | 7772 | $content = $this->display_document($extra_info['path'], false, false); |
| 7744 | 7773 | } |
| 7745 | - } elseif (is_numeric($extra_info)) |
|
| 7746 | - $content = $this->display_document($extra_info, false, false); |
|
| 7747 | - else |
|
| 7748 | - $content = ''; |
|
| 7774 | + } elseif (is_numeric($extra_info)) { |
|
| 7775 | + $content = $this->display_document($extra_info, false, false); |
|
| 7776 | + } else { |
|
| 7777 | + $content = ''; |
|
| 7778 | + } |
|
| 7749 | 7779 | |
| 7750 | 7780 | if (!$no_display_edit_textarea) { |
| 7751 | 7781 | // We need to calculate here some specific settings for the online editor. |
@@ -8013,9 +8043,11 @@ discard block |
||
| 8013 | 8043 | $arrHide = array(); |
| 8014 | 8044 | for ($i = 0; $i < count($arrLP); $i++) { |
| 8015 | 8045 | if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') { |
| 8016 | - if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) |
|
| 8017 | - $s_selected_position = $arrLP[$i]['id']; |
|
| 8018 | - elseif ($action == 'add') $s_selected_position = 0; |
|
| 8046 | + if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) { |
|
| 8047 | + $s_selected_position = $arrLP[$i]['id']; |
|
| 8048 | + } elseif ($action == 'add') { |
|
| 8049 | + $s_selected_position = 0; |
|
| 8050 | + } |
|
| 8019 | 8051 | $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title']; |
| 8020 | 8052 | |
| 8021 | 8053 | } |
@@ -8218,9 +8250,11 @@ discard block |
||
| 8218 | 8250 | $arrHide = array (); |
| 8219 | 8251 | for ($i = 0; $i < count($arrLP); $i++) { |
| 8220 | 8252 | if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') { |
| 8221 | - if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) |
|
| 8222 | - $s_selected_position = $arrLP[$i]['id']; |
|
| 8223 | - elseif ($action == 'add') $s_selected_position = 0; |
|
| 8253 | + if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) { |
|
| 8254 | + $s_selected_position = $arrLP[$i]['id']; |
|
| 8255 | + } elseif ($action == 'add') { |
|
| 8256 | + $s_selected_position = 0; |
|
| 8257 | + } |
|
| 8224 | 8258 | $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title']; |
| 8225 | 8259 | |
| 8226 | 8260 | } |
@@ -9795,9 +9829,9 @@ discard block |
||
| 9795 | 9829 | $main_code_path = api_get_path(SYS_CODE_PATH).'newscorm/packaging/'; |
| 9796 | 9830 | $extra_files = scandir($main_code_path); |
| 9797 | 9831 | foreach ($extra_files as $extra_file) { |
| 9798 | - if (strpos($extra_file, '.') === 0) |
|
| 9799 | - continue; |
|
| 9800 | - else { |
|
| 9832 | + if (strpos($extra_file, '.') === 0) { |
|
| 9833 | + continue; |
|
| 9834 | + } else { |
|
| 9801 | 9835 | $dest_file = $archive_path . $temp_dir_short . '/' . $extra_file; |
| 9802 | 9836 | $this->create_path($dest_file); |
| 9803 | 9837 | copy($main_code_path.$extra_file, $dest_file); |
@@ -13,7 +13,9 @@ discard block |
||
| 13 | 13 | $use_anonymous = true; |
| 14 | 14 | |
| 15 | 15 | $debug = 0; |
| 16 | -if ($debug > 0) error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0); |
|
| 16 | +if ($debug > 0) { |
|
| 17 | + error_log('New LP -+- Entered lp_controller.php -+- (action: '.$_REQUEST['action'].')', 0); |
|
| 18 | +} |
|
| 17 | 19 | |
| 18 | 20 | // Language files that needs to be included. |
| 19 | 21 | if (isset($_GET['action'])) { |
@@ -231,10 +233,14 @@ discard block |
||
| 231 | 233 | // If refresh is set, we regenerate the oLP object from the database (kind of flush). |
| 232 | 234 | Session::erase('refresh'); |
| 233 | 235 | $myrefresh = 1; |
| 234 | - if ($debug > 0) error_log('New LP - Refresh asked', 0); |
|
| 235 | -} |
|
| 236 | + if ($debug > 0) { |
|
| 237 | + error_log('New LP - Refresh asked', 0); |
|
| 238 | + } |
|
| 239 | + } |
|
| 236 | 240 | |
| 237 | -if ($debug > 0) error_log('New LP - Passed refresh check', 0); |
|
| 241 | +if ($debug > 0) { |
|
| 242 | + error_log('New LP - Passed refresh check', 0); |
|
| 243 | +} |
|
| 238 | 244 | |
| 239 | 245 | if (!empty($_REQUEST['dialog_box'])) { |
| 240 | 246 | $dialog_box = stripslashes(urldecode($_REQUEST['dialog_box'])); |
@@ -244,17 +250,23 @@ discard block |
||
| 244 | 250 | $lp_found = false; |
| 245 | 251 | |
| 246 | 252 | if (isset($_SESSION['lpobject'])) { |
| 247 | - if ($debug > 0) error_log('New LP - SESSION[lpobject] is defined', 0); |
|
| 253 | + if ($debug > 0) { |
|
| 254 | + error_log('New LP - SESSION[lpobject] is defined', 0); |
|
| 255 | + } |
|
| 248 | 256 | $oLP = unserialize($_SESSION['lpobject']); |
| 249 | 257 | if (isset($oLP) && is_object($oLP)) { |
| 250 | - if ($debug > 0) error_log('New LP - oLP is object', 0); |
|
| 258 | + if ($debug > 0) { |
|
| 259 | + error_log('New LP - oLP is object', 0); |
|
| 260 | + } |
|
| 251 | 261 | if ($myrefresh == 1 OR |
| 252 | 262 | empty($oLP->cc) OR |
| 253 | 263 | $oLP->cc != api_get_course_id() OR |
| 254 | 264 | $oLP->lp_view_session_id != $session_id OR |
| 255 | 265 | $oLP->scorm_debug == '1' |
| 256 | 266 | ) { |
| 257 | - if ($debug > 0) error_log('New LP - Course has changed, discard lp object', 0); |
|
| 267 | + if ($debug > 0) { |
|
| 268 | + error_log('New LP - Course has changed, discard lp object', 0); |
|
| 269 | + } |
|
| 258 | 270 | if ($myrefresh == 1) { $myrefresh_id = $oLP->get_id(); } |
| 259 | 271 | $oLP = null; |
| 260 | 272 | Session::erase('oLP'); |
@@ -268,13 +280,19 @@ discard block |
||
| 268 | 280 | |
| 269 | 281 | $course_id = api_get_course_int_id(); |
| 270 | 282 | |
| 271 | -if ($debug>0) error_log('New LP - Passed data remains check', 0); |
|
| 283 | +if ($debug>0) { |
|
| 284 | + error_log('New LP - Passed data remains check', 0); |
|
| 285 | +} |
|
| 272 | 286 | |
| 273 | 287 | if (!$lp_found || (!empty($_REQUEST['lp_id']) && $_SESSION['oLP']->get_id() != $_REQUEST['lp_id'])) { |
| 274 | - if ($debug > 0) error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0); |
|
| 288 | + if ($debug > 0) { |
|
| 289 | + error_log('New LP - oLP is not object, has changed or refresh been asked, getting new', 0); |
|
| 290 | + } |
|
| 275 | 291 | // Regenerate a new lp object? Not always as some pages don't need the object (like upload?) |
| 276 | 292 | if (!empty($_REQUEST['lp_id']) || !empty($myrefresh_id)) { |
| 277 | - if ($debug > 0) error_log('New LP - lp_id is defined', 0); |
|
| 293 | + if ($debug > 0) { |
|
| 294 | + error_log('New LP - lp_id is defined', 0); |
|
| 295 | + } |
|
| 278 | 296 | // Select the lp in the database and check which type it is (scorm/dokeos/aicc) to generate the |
| 279 | 297 | // right object. |
| 280 | 298 | if (!empty($_REQUEST['lp_id'])) { |
@@ -286,49 +304,67 @@ discard block |
||
| 286 | 304 | $lp_table = Database::get_course_table(TABLE_LP_MAIN); |
| 287 | 305 | if (is_numeric($lp_id)) { |
| 288 | 306 | $sel = "SELECT lp_type FROM $lp_table WHERE c_id = $course_id AND id = $lp_id"; |
| 289 | - if ($debug > 0) error_log('New LP - querying '.$sel, 0); |
|
| 307 | + if ($debug > 0) { |
|
| 308 | + error_log('New LP - querying '.$sel, 0); |
|
| 309 | + } |
|
| 290 | 310 | $res = Database::query($sel); |
| 291 | 311 | |
| 292 | 312 | if (Database::num_rows($res)) { |
| 293 | 313 | $row = Database::fetch_array($res); |
| 294 | 314 | $type = $row['lp_type']; |
| 295 | - if ($debug > 0) error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 315 | + if ($debug > 0) { |
|
| 316 | + error_log('New LP - found row - type '.$type. ' - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 317 | + } |
|
| 296 | 318 | switch ($type) { |
| 297 | 319 | case 1: |
| 298 | - if ($debug > 0) error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 320 | + if ($debug > 0) { |
|
| 321 | + error_log('New LP - found row - type dokeos - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 322 | + } |
|
| 299 | 323 | |
| 300 | 324 | $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id()); |
| 301 | 325 | if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); } |
| 302 | 326 | break; |
| 303 | 327 | case 2: |
| 304 | - if ($debug > 0) error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 328 | + if ($debug > 0) { |
|
| 329 | + error_log('New LP - found row - type scorm - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 330 | + } |
|
| 305 | 331 | $oLP = new scorm(api_get_course_id(), $lp_id, api_get_user_id()); |
| 306 | 332 | if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); } |
| 307 | 333 | break; |
| 308 | 334 | case 3: |
| 309 | - if ($debug > 0) error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 335 | + if ($debug > 0) { |
|
| 336 | + error_log('New LP - found row - type aicc - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 337 | + } |
|
| 310 | 338 | $oLP = new aicc(api_get_course_id(), $lp_id, api_get_user_id()); |
| 311 | 339 | if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); } |
| 312 | 340 | break; |
| 313 | 341 | default: |
| 314 | - if ($debug > 0) error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 342 | + if ($debug > 0) { |
|
| 343 | + error_log('New LP - found row - type other - Calling constructor with '.api_get_course_id().' - '.$lp_id.' - '.api_get_user_id(), 0); |
|
| 344 | + } |
|
| 315 | 345 | $oLP = new learnpath(api_get_course_id(), $lp_id, api_get_user_id()); |
| 316 | 346 | if ($oLP !== false) { $lp_found = true; } else { error_log($oLP->error, 0); } |
| 317 | 347 | break; |
| 318 | 348 | } |
| 319 | 349 | } |
| 320 | 350 | } else { |
| 321 | - if ($debug > 0) error_log('New LP - Request[lp_id] is not numeric', 0); |
|
| 351 | + if ($debug > 0) { |
|
| 352 | + error_log('New LP - Request[lp_id] is not numeric', 0); |
|
| 353 | + } |
|
| 322 | 354 | } |
| 323 | 355 | } else { |
| 324 | - if ($debug > 0) error_log('New LP - Request[lp_id] and refresh_id were empty', 0); |
|
| 356 | + if ($debug > 0) { |
|
| 357 | + error_log('New LP - Request[lp_id] and refresh_id were empty', 0); |
|
| 358 | + } |
|
| 325 | 359 | } |
| 326 | 360 | if ($lp_found) { |
| 327 | 361 | $_SESSION['oLP'] = $oLP; |
| 328 | 362 | } |
| 329 | 363 | } |
| 330 | 364 | |
| 331 | -if ($debug > 0) error_log('New LP - Passed oLP creation check', 0); |
|
| 365 | +if ($debug > 0) { |
|
| 366 | + error_log('New LP - Passed oLP creation check', 0); |
|
| 367 | +} |
|
| 332 | 368 | |
| 333 | 369 | $is_allowed_to_edit = api_is_allowed_to_edit(false, true, false, false); |
| 334 | 370 | |
@@ -372,11 +408,15 @@ discard block |
||
| 372 | 408 | if (!$is_allowed_to_edit) { |
| 373 | 409 | api_not_allowed(true); |
| 374 | 410 | } |
| 375 | - if ($debug > 0) error_log('New LP - add item action triggered', 0); |
|
| 411 | + if ($debug > 0) { |
|
| 412 | + error_log('New LP - add item action triggered', 0); |
|
| 413 | + } |
|
| 376 | 414 | |
| 377 | 415 | if (!$lp_found) { |
| 378 | 416 | //check if the learnpath ID was defined, otherwise send back to list |
| 379 | - if ($debug > 0) error_log('New LP - No learnpath given for add item', 0); |
|
| 417 | + if ($debug > 0) { |
|
| 418 | + error_log('New LP - No learnpath given for add item', 0); |
|
| 419 | + } |
|
| 380 | 420 | require 'lp_list.php'; |
| 381 | 421 | } else { |
| 382 | 422 | $_SESSION['refresh'] = 1; |
@@ -450,11 +490,15 @@ discard block |
||
| 450 | 490 | if (!$is_allowed_to_edit) { |
| 451 | 491 | api_not_allowed(true); |
| 452 | 492 | } |
| 453 | - if ($debug > 0) error_log('New LP - add audio action triggered', 0); |
|
| 493 | + if ($debug > 0) { |
|
| 494 | + error_log('New LP - add audio action triggered', 0); |
|
| 495 | + } |
|
| 454 | 496 | |
| 455 | 497 | if (!$lp_found) { |
| 456 | 498 | //check if the learnpath ID was defined, otherwise send back to list |
| 457 | - if ($debug > 0) error_log('New LP - No learnpath given for add audio', 0); |
|
| 499 | + if ($debug > 0) { |
|
| 500 | + error_log('New LP - No learnpath given for add audio', 0); |
|
| 501 | + } |
|
| 458 | 502 | require 'lp_list.php'; |
| 459 | 503 | } else { |
| 460 | 504 | $_SESSION['refresh'] = 1; |
@@ -528,7 +572,9 @@ discard block |
||
| 528 | 572 | if (!$is_allowed_to_edit) { |
| 529 | 573 | api_not_allowed(true); |
| 530 | 574 | } |
| 531 | - if ($debug > 0) error_log('New LP - add_lp action triggered', 0); |
|
| 575 | + if ($debug > 0) { |
|
| 576 | + error_log('New LP - add_lp action triggered', 0); |
|
| 577 | + } |
|
| 532 | 578 | if (isset($_REQUEST['lp_name']) && !empty($_REQUEST['lp_name'])) { |
| 533 | 579 | $_REQUEST['lp_name'] = trim($_REQUEST['lp_name']); |
| 534 | 580 | $_SESSION['refresh'] = 1; |
@@ -587,9 +633,10 @@ discard block |
||
| 587 | 633 | if (!$is_allowed_to_edit) { |
| 588 | 634 | api_not_allowed(true); |
| 589 | 635 | } |
| 590 | - if ($debug > 0) error_log('New LP - admin_view action triggered', 0); |
|
| 591 | - if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; } |
|
| 592 | - else { |
|
| 636 | + if ($debug > 0) { |
|
| 637 | + error_log('New LP - admin_view action triggered', 0); |
|
| 638 | + } |
|
| 639 | + if (!$lp_found) { error_log('New LP - No learnpath given for admin_view', 0); require 'lp_list.php'; } else { |
|
| 593 | 640 | $_SESSION['refresh'] = 1; |
| 594 | 641 | require 'lp_admin_view.php'; |
| 595 | 642 | } |
@@ -599,9 +646,10 @@ discard block |
||
| 599 | 646 | if (!$is_allowed_to_edit) { |
| 600 | 647 | api_not_allowed(true); |
| 601 | 648 | } |
| 602 | - if ($debug > 0) error_log('New LP - auto_launch action triggered', 0); |
|
| 603 | - if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; } |
|
| 604 | - else { |
|
| 649 | + if ($debug > 0) { |
|
| 650 | + error_log('New LP - auto_launch action triggered', 0); |
|
| 651 | + } |
|
| 652 | + if (!$lp_found) { error_log('New LP - No learnpath given for set_autolaunch', 0); require 'lp_list.php'; } else { |
|
| 605 | 653 | $_SESSION['oLP']->set_autolaunch($_GET['lp_id'], $_GET['status']); |
| 606 | 654 | require 'lp_list.php'; |
| 607 | 655 | exit; |
@@ -612,10 +660,11 @@ discard block |
||
| 612 | 660 | if (!$is_allowed_to_edit) { |
| 613 | 661 | api_not_allowed(true); |
| 614 | 662 | } |
| 615 | - if ($debug > 0) error_log('New LP - build action triggered', 0); |
|
| 663 | + if ($debug > 0) { |
|
| 664 | + error_log('New LP - build action triggered', 0); |
|
| 665 | + } |
|
| 616 | 666 | |
| 617 | - if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; } |
|
| 618 | - else { |
|
| 667 | + if (!$lp_found) { error_log('New LP - No learnpath given for build', 0); require 'lp_list.php'; } else { |
|
| 619 | 668 | $_SESSION['refresh'] = 1; |
| 620 | 669 | //require 'lp_build.php'; |
| 621 | 670 | $url = api_get_self().'?action=add_item&type=step&lp_id='.intval($_SESSION['oLP']->lp_id); |
@@ -627,10 +676,11 @@ discard block |
||
| 627 | 676 | if (!$is_allowed_to_edit) { |
| 628 | 677 | api_not_allowed(true); |
| 629 | 678 | } |
| 630 | - if ($debug > 0) error_log('New LP - edit item action triggered', 0); |
|
| 679 | + if ($debug > 0) { |
|
| 680 | + error_log('New LP - edit item action triggered', 0); |
|
| 681 | + } |
|
| 631 | 682 | |
| 632 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; } |
|
| 633 | - else { |
|
| 683 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit item', 0); require 'lp_list.php'; } else { |
|
| 634 | 684 | $_SESSION['refresh'] = 1; |
| 635 | 685 | if (isset($_POST['submit_button']) && !empty($post_title)) { |
| 636 | 686 | |
@@ -680,9 +730,10 @@ discard block |
||
| 680 | 730 | if (!$is_allowed_to_edit) { |
| 681 | 731 | api_not_allowed(true); |
| 682 | 732 | } |
| 683 | - if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0); |
|
| 684 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } |
|
| 685 | - else { |
|
| 733 | + if ($debug > 0) { |
|
| 734 | + error_log('New LP - edit item prereq action triggered', 0); |
|
| 735 | + } |
|
| 736 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else { |
|
| 686 | 737 | if (isset($_POST['submit_button'])) { |
| 687 | 738 | //Updating the lp.modified_on |
| 688 | 739 | $_SESSION['oLP']->set_modified_on(); |
@@ -710,9 +761,10 @@ discard block |
||
| 710 | 761 | if (!$is_allowed_to_edit) { |
| 711 | 762 | api_not_allowed(true); |
| 712 | 763 | } |
| 713 | - if ($debug > 0) error_log('New LP - move item action triggered', 0); |
|
| 714 | - if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; } |
|
| 715 | - else { |
|
| 764 | + if ($debug > 0) { |
|
| 765 | + error_log('New LP - move item action triggered', 0); |
|
| 766 | + } |
|
| 767 | + if (!$lp_found) { error_log('New LP - No learnpath given for move item', 0); require 'lp_list.php'; } else { |
|
| 716 | 768 | $_SESSION['refresh'] = 1; |
| 717 | 769 | if (isset($_POST['submit_button'])) { |
| 718 | 770 | //Updating the lp.modified_on |
@@ -745,7 +797,9 @@ discard block |
||
| 745 | 797 | if (!$is_allowed_to_edit) { |
| 746 | 798 | api_not_allowed(true); |
| 747 | 799 | } |
| 748 | - if ($debug > 0) error_log('New LP - view_item action triggered', 0); |
|
| 800 | + if ($debug > 0) { |
|
| 801 | + error_log('New LP - view_item action triggered', 0); |
|
| 802 | + } |
|
| 749 | 803 | if (!$lp_found) { |
| 750 | 804 | error_log('New LP - No learnpath given for view item', 0); require 'lp_list.php'; |
| 751 | 805 | } else { |
@@ -757,7 +811,9 @@ discard block |
||
| 757 | 811 | if (!$is_allowed_to_edit) { |
| 758 | 812 | api_not_allowed(true); |
| 759 | 813 | } |
| 760 | - if ($debug > 0) error_log('New LP - upload action triggered', 0); |
|
| 814 | + if ($debug > 0) { |
|
| 815 | + error_log('New LP - upload action triggered', 0); |
|
| 816 | + } |
|
| 761 | 817 | $cwdir = getcwd(); |
| 762 | 818 | require 'lp_upload.php'; |
| 763 | 819 | // Reinit current working directory as many functions in upload change it. |
@@ -774,9 +830,10 @@ discard block |
||
| 774 | 830 | api_not_allowed(true); |
| 775 | 831 | } |
| 776 | 832 | |
| 777 | - if ($debug > 0) error_log('New LP - export action triggered', 0); |
|
| 778 | - if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; } |
|
| 779 | - else { |
|
| 833 | + if ($debug > 0) { |
|
| 834 | + error_log('New LP - export action triggered', 0); |
|
| 835 | + } |
|
| 836 | + if (!$lp_found) { error_log('New LP - No learnpath given for copy', 0); require 'lp_list.php'; } else { |
|
| 780 | 837 | $_SESSION['oLP']->copy(); |
| 781 | 838 | } |
| 782 | 839 | require 'lp_list.php'; |
@@ -789,9 +846,10 @@ discard block |
||
| 789 | 846 | if ($hideScormExportLink === 'true') { |
| 790 | 847 | api_not_allowed(true); |
| 791 | 848 | } |
| 792 | - if ($debug > 0) error_log('New LP - export action triggered', 0); |
|
| 793 | - if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; } |
|
| 794 | - else { |
|
| 849 | + if ($debug > 0) { |
|
| 850 | + error_log('New LP - export action triggered', 0); |
|
| 851 | + } |
|
| 852 | + if (!$lp_found) { error_log('New LP - No learnpath given for export', 0); require 'lp_list.php'; } else { |
|
| 795 | 853 | $_SESSION['oLP']->scorm_export(); |
| 796 | 854 | exit(); |
| 797 | 855 | //require 'lp_list.php'; |
@@ -806,7 +864,9 @@ discard block |
||
| 806 | 864 | api_not_allowed(true); |
| 807 | 865 | } |
| 808 | 866 | |
| 809 | - if ($debug > 0) error_log('New LP - export action triggered', 0); |
|
| 867 | + if ($debug > 0) { |
|
| 868 | + error_log('New LP - export action triggered', 0); |
|
| 869 | + } |
|
| 810 | 870 | if (!$lp_found) { error_log('New LP - No learnpath given for export_to_pdf', 0); require 'lp_list.php'; |
| 811 | 871 | } else { |
| 812 | 872 | $result = $_SESSION['oLP']->scorm_export_to_pdf($_GET['lp_id']); |
@@ -820,9 +880,10 @@ discard block |
||
| 820 | 880 | if (!$is_allowed_to_edit) { |
| 821 | 881 | api_not_allowed(true); |
| 822 | 882 | } |
| 823 | - if ($debug > 0) error_log('New LP - delete action triggered', 0); |
|
| 824 | - if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; } |
|
| 825 | - else { |
|
| 883 | + if ($debug > 0) { |
|
| 884 | + error_log('New LP - delete action triggered', 0); |
|
| 885 | + } |
|
| 886 | + if (!$lp_found) { error_log('New LP - No learnpath given for delete', 0); require 'lp_list.php'; } else { |
|
| 826 | 887 | $_SESSION['refresh'] = 1; |
| 827 | 888 | $_SESSION['oLP']->delete(null, $_GET['lp_id'], 'remove'); |
| 828 | 889 | Session::erase('oLP'); |
@@ -834,9 +895,10 @@ discard block |
||
| 834 | 895 | if (!$is_allowed_to_edit) { |
| 835 | 896 | api_not_allowed(true); |
| 836 | 897 | } |
| 837 | - if ($debug > 0) error_log('New LP - visibility action triggered', 0); |
|
| 838 | - if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; } |
|
| 839 | - else { |
|
| 898 | + if ($debug > 0) { |
|
| 899 | + error_log('New LP - visibility action triggered', 0); |
|
| 900 | + } |
|
| 901 | + if (!$lp_found) { error_log('New LP - No learnpath given for visibility', 0); require 'lp_list.php'; } else { |
|
| 840 | 902 | learnpath::toggle_visibility($_REQUEST['lp_id'], $_REQUEST['new_status']); |
| 841 | 903 | require 'lp_list.php'; |
| 842 | 904 | } |
@@ -846,9 +908,10 @@ discard block |
||
| 846 | 908 | if (!$is_allowed_to_edit) { |
| 847 | 909 | api_not_allowed(true); |
| 848 | 910 | } |
| 849 | - if ($debug > 0) error_log('New LP - publish action triggered', 0); |
|
| 850 | - if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; } |
|
| 851 | - else { |
|
| 911 | + if ($debug > 0) { |
|
| 912 | + error_log('New LP - publish action triggered', 0); |
|
| 913 | + } |
|
| 914 | + if (!$lp_found) { error_log('New LP - No learnpath given for publish', 0); require 'lp_list.php'; } else { |
|
| 852 | 915 | learnpath::toggle_publish($_REQUEST['lp_id'], $_REQUEST['new_status']); |
| 853 | 916 | require 'lp_list.php'; |
| 854 | 917 | } |
@@ -858,7 +921,9 @@ discard block |
||
| 858 | 921 | if (!$is_allowed_to_edit) { |
| 859 | 922 | api_not_allowed(true); |
| 860 | 923 | } |
| 861 | - if ($debug > 0) error_log('New LP - publish action triggered', 0); |
|
| 924 | + if ($debug > 0) { |
|
| 925 | + error_log('New LP - publish action triggered', 0); |
|
| 926 | + } |
|
| 862 | 927 | if (!$lp_found) { |
| 863 | 928 | error_log('New LP - No learnpath given for publish', 0); |
| 864 | 929 | require 'lp_list.php'; |
@@ -872,7 +937,9 @@ discard block |
||
| 872 | 937 | if (!$is_allowed_to_edit) { |
| 873 | 938 | api_not_allowed(true); |
| 874 | 939 | } |
| 875 | - if ($debug > 0) error_log('New LP - publish action triggered', 0); |
|
| 940 | + if ($debug > 0) { |
|
| 941 | + error_log('New LP - publish action triggered', 0); |
|
| 942 | + } |
|
| 876 | 943 | if (!$lp_found) { |
| 877 | 944 | error_log('New LP - No learnpath given for publish', 0); |
| 878 | 945 | require 'lp_list.php'; |
@@ -885,9 +952,10 @@ discard block |
||
| 885 | 952 | if (!$is_allowed_to_edit) { |
| 886 | 953 | api_not_allowed(true); |
| 887 | 954 | } |
| 888 | - if ($debug > 0) error_log('New LP - edit action triggered', 0); |
|
| 889 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } |
|
| 890 | - else { |
|
| 955 | + if ($debug > 0) { |
|
| 956 | + error_log('New LP - edit action triggered', 0); |
|
| 957 | + } |
|
| 958 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else { |
|
| 891 | 959 | $_SESSION['refresh'] = 1; |
| 892 | 960 | require 'lp_edit.php'; |
| 893 | 961 | } |
@@ -896,9 +964,10 @@ discard block |
||
| 896 | 964 | if (!$is_allowed_to_edit) { |
| 897 | 965 | api_not_allowed(true); |
| 898 | 966 | } |
| 899 | - if ($debug > 0) error_log('New LP - update_lp action triggered', 0); |
|
| 900 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } |
|
| 901 | - else { |
|
| 967 | + if ($debug > 0) { |
|
| 968 | + error_log('New LP - update_lp action triggered', 0); |
|
| 969 | + } |
|
| 970 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit', 0); require 'lp_list.php'; } else { |
|
| 902 | 971 | $_SESSION['refresh'] = 1; |
| 903 | 972 | $lp_name = Security::remove_XSS($_REQUEST['lp_name']); |
| 904 | 973 | $_SESSION['oLP']->set_name($lp_name); |
@@ -965,8 +1034,9 @@ discard block |
||
| 965 | 1034 | ); |
| 966 | 1035 | $extraFieldValue->saveFieldValues($_REQUEST); |
| 967 | 1036 | |
| 968 | - if ($_FILES['lp_preview_image']['size'] > 0) |
|
| 969 | - $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']); |
|
| 1037 | + if ($_FILES['lp_preview_image']['size'] > 0) { |
|
| 1038 | + $_SESSION['oLP']->upload_image($_FILES['lp_preview_image']); |
|
| 1039 | + } |
|
| 970 | 1040 | |
| 971 | 1041 | if (api_get_setting('search_enabled') === 'true') { |
| 972 | 1042 | require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; |
@@ -1006,9 +1076,10 @@ discard block |
||
| 1006 | 1076 | if (!$is_allowed_to_edit) { |
| 1007 | 1077 | api_not_allowed(true); |
| 1008 | 1078 | } |
| 1009 | - if ($debug > 0) error_log('New LP - add sub item action triggered', 0); |
|
| 1010 | - if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; } |
|
| 1011 | - else { |
|
| 1079 | + if ($debug > 0) { |
|
| 1080 | + error_log('New LP - add sub item action triggered', 0); |
|
| 1081 | + } |
|
| 1082 | + if (!$lp_found) { error_log('New LP - No learnpath given for add sub item', 0); require 'lp_list.php'; } else { |
|
| 1012 | 1083 | $_SESSION['refresh'] = 1; |
| 1013 | 1084 | if (!empty($_REQUEST['parent_item_id'])) { |
| 1014 | 1085 | $_SESSION['from_learnpath']='yes'; |
@@ -1024,9 +1095,10 @@ discard block |
||
| 1024 | 1095 | if (!$is_allowed_to_edit) { |
| 1025 | 1096 | api_not_allowed(true); |
| 1026 | 1097 | } |
| 1027 | - if ($debug > 0) error_log('New LP - delete item action triggered', 0); |
|
| 1028 | - if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; } |
|
| 1029 | - else { |
|
| 1098 | + if ($debug > 0) { |
|
| 1099 | + error_log('New LP - delete item action triggered', 0); |
|
| 1100 | + } |
|
| 1101 | + if (!$lp_found) { error_log('New LP - No learnpath given for delete item', 0); require 'lp_list.php'; } else { |
|
| 1030 | 1102 | //$_SESSION['refresh'] = 1; |
| 1031 | 1103 | if (!empty($_REQUEST['id'])) { |
| 1032 | 1104 | $_SESSION['oLP']->delete_item($_REQUEST['id']); |
@@ -1041,9 +1113,10 @@ discard block |
||
| 1041 | 1113 | if (!$is_allowed_to_edit) { |
| 1042 | 1114 | api_not_allowed(true); |
| 1043 | 1115 | } |
| 1044 | - if ($debug > 0) error_log('New LP - edit item prereq action triggered', 0); |
|
| 1045 | - if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } |
|
| 1046 | - else { |
|
| 1116 | + if ($debug > 0) { |
|
| 1117 | + error_log('New LP - edit item prereq action triggered', 0); |
|
| 1118 | + } |
|
| 1119 | + if (!$lp_found) { error_log('New LP - No learnpath given for edit item prereq', 0); require 'lp_list.php'; } else { |
|
| 1047 | 1120 | if (!empty($_REQUEST['id']) && !empty($_REQUEST['submit_item'])) { |
| 1048 | 1121 | $_SESSION['refresh'] = 1; |
| 1049 | 1122 | $_SESSION['oLP']->edit_item_prereq($_REQUEST['id'], $_REQUEST['prereq']); |
@@ -1052,64 +1125,80 @@ discard block |
||
| 1052 | 1125 | } |
| 1053 | 1126 | break; |
| 1054 | 1127 | case 'restart': |
| 1055 | - if ($debug > 0) error_log('New LP - restart action triggered', 0); |
|
| 1056 | - if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; } |
|
| 1057 | - else { |
|
| 1128 | + if ($debug > 0) { |
|
| 1129 | + error_log('New LP - restart action triggered', 0); |
|
| 1130 | + } |
|
| 1131 | + if (!$lp_found) { error_log('New LP - No learnpath given for restart', 0); require 'lp_list.php'; } else { |
|
| 1058 | 1132 | $_SESSION['oLP']->restart(); |
| 1059 | 1133 | require 'lp_view.php'; |
| 1060 | 1134 | } |
| 1061 | 1135 | break; |
| 1062 | 1136 | case 'last': |
| 1063 | - if ($debug > 0) error_log('New LP - last action triggered', 0); |
|
| 1064 | - if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; } |
|
| 1065 | - else { |
|
| 1137 | + if ($debug > 0) { |
|
| 1138 | + error_log('New LP - last action triggered', 0); |
|
| 1139 | + } |
|
| 1140 | + if (!$lp_found) { error_log('New LP - No learnpath given for last', 0); require 'lp_list.php'; } else { |
|
| 1066 | 1141 | $_SESSION['oLP']->last(); |
| 1067 | 1142 | require 'lp_view.php'; |
| 1068 | 1143 | } |
| 1069 | 1144 | break; |
| 1070 | 1145 | case 'first': |
| 1071 | - if ($debug > 0) error_log('New LP - first action triggered', 0); |
|
| 1072 | - if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; } |
|
| 1073 | - else { |
|
| 1146 | + if ($debug > 0) { |
|
| 1147 | + error_log('New LP - first action triggered', 0); |
|
| 1148 | + } |
|
| 1149 | + if (!$lp_found) { error_log('New LP - No learnpath given for first', 0); require 'lp_list.php'; } else { |
|
| 1074 | 1150 | $_SESSION['oLP']->first(); |
| 1075 | 1151 | require 'lp_view.php'; |
| 1076 | 1152 | } |
| 1077 | 1153 | break; |
| 1078 | 1154 | case 'next': |
| 1079 | - if ($debug > 0) error_log('New LP - next action triggered', 0); |
|
| 1080 | - if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; } |
|
| 1081 | - else { |
|
| 1155 | + if ($debug > 0) { |
|
| 1156 | + error_log('New LP - next action triggered', 0); |
|
| 1157 | + } |
|
| 1158 | + if (!$lp_found) { error_log('New LP - No learnpath given for next', 0); require 'lp_list.php'; } else { |
|
| 1082 | 1159 | $_SESSION['oLP']->next(); |
| 1083 | 1160 | require 'lp_view.php'; |
| 1084 | 1161 | } |
| 1085 | 1162 | break; |
| 1086 | 1163 | case 'previous': |
| 1087 | - if ($debug > 0) error_log('New LP - previous action triggered', 0); |
|
| 1088 | - if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; } |
|
| 1089 | - else { |
|
| 1164 | + if ($debug > 0) { |
|
| 1165 | + error_log('New LP - previous action triggered', 0); |
|
| 1166 | + } |
|
| 1167 | + if (!$lp_found) { error_log('New LP - No learnpath given for previous', 0); require 'lp_list.php'; } else { |
|
| 1090 | 1168 | $_SESSION['oLP']->previous(); |
| 1091 | 1169 | require 'lp_view.php'; |
| 1092 | 1170 | } |
| 1093 | 1171 | break; |
| 1094 | 1172 | case 'content': |
| 1095 | - if ($debug > 0) error_log('New LP - content action triggered', 0); |
|
| 1096 | - if ($debug > 0) error_log('New LP - Item id is '.intval($_GET['item_id']), 0); |
|
| 1173 | + if ($debug > 0) { |
|
| 1174 | + error_log('New LP - content action triggered', 0); |
|
| 1175 | + } |
|
| 1176 | + if ($debug > 0) { |
|
| 1177 | + error_log('New LP - Item id is '.intval($_GET['item_id']), 0); |
|
| 1178 | + } |
|
| 1097 | 1179 | if (!$lp_found) { |
| 1098 | 1180 | error_log('New LP - No learnpath given for content', 0); |
| 1099 | 1181 | require 'lp_list.php'; |
| 1100 | 1182 | } else { |
| 1101 | - if ($debug > 0) error_log('New LP - save_last()', 0); |
|
| 1183 | + if ($debug > 0) { |
|
| 1184 | + error_log('New LP - save_last()', 0); |
|
| 1185 | + } |
|
| 1102 | 1186 | $_SESSION['oLP']->save_last(); |
| 1103 | - if ($debug > 0) error_log('New LP - set_current_item()', 0); |
|
| 1187 | + if ($debug > 0) { |
|
| 1188 | + error_log('New LP - set_current_item()', 0); |
|
| 1189 | + } |
|
| 1104 | 1190 | $_SESSION['oLP']->set_current_item($_GET['item_id']); |
| 1105 | - if ($debug > 0) error_log('New LP - start_current_item()', 0); |
|
| 1191 | + if ($debug > 0) { |
|
| 1192 | + error_log('New LP - start_current_item()', 0); |
|
| 1193 | + } |
|
| 1106 | 1194 | $_SESSION['oLP']->start_current_item(); |
| 1107 | 1195 | require 'lp_content.php'; |
| 1108 | 1196 | } |
| 1109 | 1197 | break; |
| 1110 | 1198 | case 'view': |
| 1111 | - if ($debug > 0) |
|
| 1112 | - error_log('New LP - view action triggered', 0); |
|
| 1199 | + if ($debug > 0) { |
|
| 1200 | + error_log('New LP - view action triggered', 0); |
|
| 1201 | + } |
|
| 1113 | 1202 | if (!$lp_found) { |
| 1114 | 1203 | error_log('New LP - No learnpath given for view', 0); |
| 1115 | 1204 | require 'lp_list.php'; |
@@ -1122,17 +1211,19 @@ discard block |
||
| 1122 | 1211 | } |
| 1123 | 1212 | break; |
| 1124 | 1213 | case 'save': |
| 1125 | - if ($debug > 0) error_log('New LP - save action triggered', 0); |
|
| 1126 | - if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; } |
|
| 1127 | - else { |
|
| 1214 | + if ($debug > 0) { |
|
| 1215 | + error_log('New LP - save action triggered', 0); |
|
| 1216 | + } |
|
| 1217 | + if (!$lp_found) { error_log('New LP - No learnpath given for save', 0); require 'lp_list.php'; } else { |
|
| 1128 | 1218 | $_SESSION['oLP']->save_item(); |
| 1129 | 1219 | require 'lp_save.php'; |
| 1130 | 1220 | } |
| 1131 | 1221 | break; |
| 1132 | 1222 | case 'stats': |
| 1133 | - if ($debug > 0) error_log('New LP - stats action triggered', 0); |
|
| 1134 | - if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } |
|
| 1135 | - else { |
|
| 1223 | + if ($debug > 0) { |
|
| 1224 | + error_log('New LP - stats action triggered', 0); |
|
| 1225 | + } |
|
| 1226 | + if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else { |
|
| 1136 | 1227 | $_SESSION['oLP']->save_current(); |
| 1137 | 1228 | $_SESSION['oLP']->save_last(); |
| 1138 | 1229 | $output = require 'lp_stats.php'; |
@@ -1140,7 +1231,9 @@ discard block |
||
| 1140 | 1231 | } |
| 1141 | 1232 | break; |
| 1142 | 1233 | case 'list': |
| 1143 | - if ($debug > 0) error_log('New LP - list action triggered', 0); |
|
| 1234 | + if ($debug > 0) { |
|
| 1235 | + error_log('New LP - list action triggered', 0); |
|
| 1236 | + } |
|
| 1144 | 1237 | if ($lp_found) { |
| 1145 | 1238 | $_SESSION['refresh'] = 1; |
| 1146 | 1239 | $_SESSION['oLP']->save_last(); |
@@ -1149,7 +1242,9 @@ discard block |
||
| 1149 | 1242 | break; |
| 1150 | 1243 | case 'mode': |
| 1151 | 1244 | // Switch between fullscreen and embedded mode. |
| 1152 | - if ($debug > 0) error_log('New LP - mode change triggered', 0); |
|
| 1245 | + if ($debug > 0) { |
|
| 1246 | + error_log('New LP - mode change triggered', 0); |
|
| 1247 | + } |
|
| 1153 | 1248 | $mode = $_REQUEST['mode']; |
| 1154 | 1249 | if ($mode == 'fullscreen') { |
| 1155 | 1250 | $_SESSION['oLP']->mode = 'fullscreen'; |
@@ -1163,7 +1258,9 @@ discard block |
||
| 1163 | 1258 | require 'lp_view.php'; |
| 1164 | 1259 | break; |
| 1165 | 1260 | case 'switch_view_mode': |
| 1166 | - if ($debug > 0) error_log('New LP - switch_view_mode action triggered', 0); |
|
| 1261 | + if ($debug > 0) { |
|
| 1262 | + error_log('New LP - switch_view_mode action triggered', 0); |
|
| 1263 | + } |
|
| 1167 | 1264 | if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; } |
| 1168 | 1265 | if (Security::check_token('get')) { |
| 1169 | 1266 | $_SESSION['refresh'] = 1; |
@@ -1172,7 +1269,9 @@ discard block |
||
| 1172 | 1269 | require 'lp_list.php'; |
| 1173 | 1270 | break; |
| 1174 | 1271 | case 'switch_force_commit': |
| 1175 | - if ($debug > 0) error_log('New LP - switch_force_commit action triggered', 0); |
|
| 1272 | + if ($debug > 0) { |
|
| 1273 | + error_log('New LP - switch_force_commit action triggered', 0); |
|
| 1274 | + } |
|
| 1176 | 1275 | if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; } |
| 1177 | 1276 | $_SESSION['refresh'] = 1; |
| 1178 | 1277 | $_SESSION['oLP']->update_default_scorm_commit(); |
@@ -1195,25 +1294,33 @@ discard block |
||
| 1195 | 1294 | break; |
| 1196 | 1295 | */ |
| 1197 | 1296 | case 'switch_attempt_mode': |
| 1198 | - if($debug>0) error_log('New LP - switch_reinit action triggered',0); |
|
| 1297 | + if($debug>0) { |
|
| 1298 | + error_log('New LP - switch_reinit action triggered',0); |
|
| 1299 | + } |
|
| 1199 | 1300 | if(!$lp_found){ error_log('New LP - No learnpath given for switch',0); require 'lp_list.php'; } |
| 1200 | 1301 | $_SESSION['refresh'] = 1; |
| 1201 | 1302 | $_SESSION['oLP']->switch_attempt_mode(); |
| 1202 | 1303 | require 'lp_list.php'; |
| 1203 | 1304 | break; |
| 1204 | 1305 | case 'switch_scorm_debug': |
| 1205 | - if ($debug > 0) error_log('New LP - switch_scorm_debug action triggered', 0); |
|
| 1306 | + if ($debug > 0) { |
|
| 1307 | + error_log('New LP - switch_scorm_debug action triggered', 0); |
|
| 1308 | + } |
|
| 1206 | 1309 | if (!$lp_found) { error_log('New LP - No learnpath given for switch', 0); require 'lp_list.php'; } |
| 1207 | 1310 | $_SESSION['refresh'] = 1; |
| 1208 | 1311 | $_SESSION['oLP']->update_scorm_debug(); |
| 1209 | 1312 | require 'lp_list.php'; |
| 1210 | 1313 | break; |
| 1211 | 1314 | case 'intro_cmdAdd': |
| 1212 | - if ($debug > 0) error_log('New LP - intro_cmdAdd action triggered', 0); |
|
| 1315 | + if ($debug > 0) { |
|
| 1316 | + error_log('New LP - intro_cmdAdd action triggered', 0); |
|
| 1317 | + } |
|
| 1213 | 1318 | // Add introduction section page. |
| 1214 | 1319 | break; |
| 1215 | 1320 | case 'js_api_refresh': |
| 1216 | - if ($debug > 0) error_log('New LP - js_api_refresh action triggered', 0); |
|
| 1321 | + if ($debug > 0) { |
|
| 1322 | + error_log('New LP - js_api_refresh action triggered', 0); |
|
| 1323 | + } |
|
| 1217 | 1324 | if (!$lp_found) { error_log('New LP - No learnpath given for js_api_refresh', 0); require 'lp_message.php'; } |
| 1218 | 1325 | if (isset($_REQUEST['item_id'])) { |
| 1219 | 1326 | $htmlHeadXtra[] = $_SESSION['oLP']->get_js_info($_REQUEST['item_id']); |
@@ -1221,8 +1328,7 @@ discard block |
||
| 1221 | 1328 | require 'lp_message.php'; |
| 1222 | 1329 | break; |
| 1223 | 1330 | case 'return_to_course_homepage': |
| 1224 | - if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } |
|
| 1225 | - else { |
|
| 1331 | + if (!$lp_found) { error_log('New LP - No learnpath given for stats', 0); require 'lp_list.php'; } else { |
|
| 1226 | 1332 | $_SESSION['oLP']->save_current(); |
| 1227 | 1333 | $_SESSION['oLP']->save_last(); |
| 1228 | 1334 | $url = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/index.php?id_session='.api_get_session_id(); |
@@ -1240,8 +1346,9 @@ discard block |
||
| 1240 | 1346 | require 'lp_list_search.php'; |
| 1241 | 1347 | break; |
| 1242 | 1348 | case 'impress': |
| 1243 | - if ($debug > 0) |
|
| 1244 | - error_log('New LP - view action triggered', 0); |
|
| 1349 | + if ($debug > 0) { |
|
| 1350 | + error_log('New LP - view action triggered', 0); |
|
| 1351 | + } |
|
| 1245 | 1352 | if (!$lp_found) { |
| 1246 | 1353 | error_log('New LP - No learnpath given for view', 0); |
| 1247 | 1354 | require 'lp_list.php'; |
@@ -1413,15 +1520,19 @@ discard block |
||
| 1413 | 1520 | ]); |
| 1414 | 1521 | break; |
| 1415 | 1522 | default: |
| 1416 | - if ($debug > 0) error_log('New LP - default action triggered', 0); |
|
| 1523 | + if ($debug > 0) { |
|
| 1524 | + error_log('New LP - default action triggered', 0); |
|
| 1525 | + } |
|
| 1417 | 1526 | require 'lp_list.php'; |
| 1418 | 1527 | break; |
| 1419 | 1528 | } |
| 1420 | 1529 | |
| 1421 | 1530 | if (!empty($_SESSION['oLP'])) { |
| 1422 | 1531 | $_SESSION['lpobject'] = serialize($_SESSION['oLP']); |
| 1423 | - if ($debug > 0) error_log('New LP - lpobject is serialized in session', 0); |
|
| 1424 | -} |
|
| 1532 | + if ($debug > 0) { |
|
| 1533 | + error_log('New LP - lpobject is serialized in session', 0); |
|
| 1534 | + } |
|
| 1535 | + } |
|
| 1425 | 1536 | |
| 1426 | 1537 | if (!empty($redirectTo)) { |
| 1427 | 1538 | header("Location: $redirectTo"); |
