chamilo /
chamilo-lms
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | /** |
| 191 | 191 | * Gets an array with all the course tables (deprecated?) |
| 192 | - * @return array |
|
| 192 | + * @return string[] |
|
| 193 | 193 | * @assert (null) !== null |
| 194 | 194 | */ |
| 195 | 195 | public static function get_course_tables() |
@@ -310,6 +310,8 @@ discard block |
||
| 310 | 310 | * @param string Complete path to directory we want to list |
| 311 | 311 | * @param array A list of files to which we want to add the files found |
| 312 | 312 | * @param string Type of base directory from which we want to recover the files |
| 313 | + * @param string $path |
|
| 314 | + * @param string $media |
|
| 313 | 315 | * @return array |
| 314 | 316 | * @assert (null,null,null) === false |
| 315 | 317 | * @assert ('abc',array(),'') === array() |
@@ -371,6 +373,7 @@ discard block |
||
| 371 | 373 | * Sorts pictures by type (used?) |
| 372 | 374 | * @param array List of files (sthg like array(0=>array('png'=>1))) |
| 373 | 375 | * @param string File type |
| 376 | + * @param string $type |
|
| 374 | 377 | * @return array The received array without files not matching type |
| 375 | 378 | * @assert (array(),null) === array() |
| 376 | 379 | */ |
@@ -41,9 +41,9 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | while (!$keys_are_unique) { |
| 43 | 43 | |
| 44 | - $keys_course_id = $prefix_for_all . $unique_prefix . $wanted_code . $final_suffix['CourseId']; |
|
| 44 | + $keys_course_id = $prefix_for_all.$unique_prefix.$wanted_code.$final_suffix['CourseId']; |
|
| 45 | 45 | //$keys_course_db_name = $prefix_for_base_name . $unique_prefix . strtoupper($keys_course_id) . $final_suffix['CourseDb']; |
| 46 | - $keys_course_repository = $prefix_for_path . $unique_prefix . $wanted_code . $final_suffix['CourseDir']; |
|
| 46 | + $keys_course_repository = $prefix_for_path.$unique_prefix.$wanted_code.$final_suffix['CourseDir']; |
|
| 47 | 47 | $keys_are_unique = true; |
| 48 | 48 | |
| 49 | 49 | // Check whether they are unique. |
@@ -52,12 +52,12 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | if (Database::num_rows($result)) { |
| 54 | 54 | $keys_are_unique = false; |
| 55 | - $try_new_fsc_id ++; |
|
| 55 | + $try_new_fsc_id++; |
|
| 56 | 56 | $final_suffix['CourseId'] = substr(md5(uniqid(rand())), 0, 4); |
| 57 | 57 | } |
| 58 | 58 | if (file_exists(api_get_path(SYS_COURSE_PATH).$keys_course_repository)) { |
| 59 | 59 | $keys_are_unique = false; |
| 60 | - $try_new_fsc_dir ++; |
|
| 60 | + $try_new_fsc_dir++; |
|
| 61 | 61 | $final_suffix['CourseDir'] = substr(md5(uniqid(rand())), 0, 4); |
| 62 | 62 | } |
| 63 | 63 | |
@@ -85,12 +85,12 @@ discard block |
||
| 85 | 85 | $perm = api_get_permissions_for_new_directories(); |
| 86 | 86 | $perm_file = api_get_permissions_for_new_files(); |
| 87 | 87 | $htmlpage = "<!DOCTYPE html>\n<html lang=\"en\">\n <head>\n <meta charset=\"utf-8\">\n <title>Not authorized</title>\n </head>\n <body>\n </body>\n</html>"; |
| 88 | - $cp = api_get_path(SYS_COURSE_PATH) . $course_repository; |
|
| 88 | + $cp = api_get_path(SYS_COURSE_PATH).$course_repository; |
|
| 89 | 89 | |
| 90 | 90 | //Creating document folder |
| 91 | 91 | mkdir($cp, $perm); |
| 92 | - mkdir($cp . '/document', $perm); |
|
| 93 | - $cpt = $cp . '/document/index.html'; |
|
| 92 | + mkdir($cp.'/document', $perm); |
|
| 93 | + $cpt = $cp.'/document/index.html'; |
|
| 94 | 94 | $fd = fopen($cpt, 'w'); |
| 95 | 95 | fwrite($fd, $htmlpage); |
| 96 | 96 | fclose($fd); |
@@ -112,49 +112,49 @@ discard block |
||
| 112 | 112 | @copy($cpt, $cp . '/document/video/index.html'); */ |
| 113 | 113 | |
| 114 | 114 | //Creatind dropbox folder |
| 115 | - mkdir($cp . '/dropbox', $perm); |
|
| 116 | - $cpt = $cp . '/dropbox/index.html'; |
|
| 115 | + mkdir($cp.'/dropbox', $perm); |
|
| 116 | + $cpt = $cp.'/dropbox/index.html'; |
|
| 117 | 117 | $fd = fopen($cpt, 'w'); |
| 118 | 118 | fwrite($fd, $htmlpage); |
| 119 | 119 | fclose($fd); |
| 120 | 120 | @chmod($cpt, $perm_file); |
| 121 | - mkdir($cp . '/group', $perm); |
|
| 122 | - @copy($cpt, $cp . '/group/index.html'); |
|
| 123 | - mkdir($cp . '/page', $perm); |
|
| 124 | - @copy($cpt, $cp . '/page/index.html'); |
|
| 125 | - mkdir($cp . '/scorm', $perm); |
|
| 126 | - @copy($cpt, $cp . '/scorm/index.html'); |
|
| 127 | - mkdir($cp . '/upload', $perm); |
|
| 128 | - @copy($cpt, $cp . '/upload/index.html'); |
|
| 129 | - mkdir($cp . '/upload/forum', $perm); |
|
| 130 | - @copy($cpt, $cp . '/upload/forum/index.html'); |
|
| 131 | - mkdir($cp . '/upload/forum/images', $perm); |
|
| 132 | - @copy($cpt, $cp . '/upload/forum/images/index.html'); |
|
| 133 | - mkdir($cp . '/upload/test', $perm); |
|
| 134 | - @copy($cpt, $cp . '/upload/test/index.html'); |
|
| 135 | - mkdir($cp . '/upload/blog', $perm); |
|
| 136 | - @copy($cpt, $cp . '/upload/blog/index.html'); |
|
| 137 | - mkdir($cp . '/upload/learning_path', $perm); |
|
| 138 | - @copy($cpt, $cp . '/upload/learning_path/index.html'); |
|
| 139 | - mkdir($cp . '/upload/learning_path/images', $perm); |
|
| 140 | - @copy($cpt, $cp . '/upload/learning_path/images/index.html'); |
|
| 141 | - mkdir($cp . '/upload/calendar', $perm); |
|
| 142 | - @copy($cpt, $cp . '/upload/calendar/index.html'); |
|
| 143 | - mkdir($cp . '/upload/calendar/images', $perm); |
|
| 144 | - @copy($cpt, $cp . '/upload/calendar/images/index.html'); |
|
| 145 | - mkdir($cp . '/work', $perm); |
|
| 146 | - @copy($cpt, $cp . '/work/index.html'); |
|
| 147 | - mkdir($cp . '/upload/announcements', $perm); |
|
| 148 | - @copy($cpt, $cp . '/upload/announcements/index.html'); |
|
| 149 | - mkdir($cp . '/upload/announcements/images', $perm); |
|
| 150 | - @copy($cpt, $cp . '/upload/announcements/images/index.html'); |
|
| 121 | + mkdir($cp.'/group', $perm); |
|
| 122 | + @copy($cpt, $cp.'/group/index.html'); |
|
| 123 | + mkdir($cp.'/page', $perm); |
|
| 124 | + @copy($cpt, $cp.'/page/index.html'); |
|
| 125 | + mkdir($cp.'/scorm', $perm); |
|
| 126 | + @copy($cpt, $cp.'/scorm/index.html'); |
|
| 127 | + mkdir($cp.'/upload', $perm); |
|
| 128 | + @copy($cpt, $cp.'/upload/index.html'); |
|
| 129 | + mkdir($cp.'/upload/forum', $perm); |
|
| 130 | + @copy($cpt, $cp.'/upload/forum/index.html'); |
|
| 131 | + mkdir($cp.'/upload/forum/images', $perm); |
|
| 132 | + @copy($cpt, $cp.'/upload/forum/images/index.html'); |
|
| 133 | + mkdir($cp.'/upload/test', $perm); |
|
| 134 | + @copy($cpt, $cp.'/upload/test/index.html'); |
|
| 135 | + mkdir($cp.'/upload/blog', $perm); |
|
| 136 | + @copy($cpt, $cp.'/upload/blog/index.html'); |
|
| 137 | + mkdir($cp.'/upload/learning_path', $perm); |
|
| 138 | + @copy($cpt, $cp.'/upload/learning_path/index.html'); |
|
| 139 | + mkdir($cp.'/upload/learning_path/images', $perm); |
|
| 140 | + @copy($cpt, $cp.'/upload/learning_path/images/index.html'); |
|
| 141 | + mkdir($cp.'/upload/calendar', $perm); |
|
| 142 | + @copy($cpt, $cp.'/upload/calendar/index.html'); |
|
| 143 | + mkdir($cp.'/upload/calendar/images', $perm); |
|
| 144 | + @copy($cpt, $cp.'/upload/calendar/images/index.html'); |
|
| 145 | + mkdir($cp.'/work', $perm); |
|
| 146 | + @copy($cpt, $cp.'/work/index.html'); |
|
| 147 | + mkdir($cp.'/upload/announcements', $perm); |
|
| 148 | + @copy($cpt, $cp.'/upload/announcements/index.html'); |
|
| 149 | + mkdir($cp.'/upload/announcements/images', $perm); |
|
| 150 | + @copy($cpt, $cp.'/upload/announcements/images/index.html'); |
|
| 151 | 151 | |
| 152 | 152 | //Oral expression question type |
| 153 | - mkdir($cp . '/exercises', $perm); |
|
| 154 | - @copy($cpt, $cp . '/exercises/index.html'); |
|
| 153 | + mkdir($cp.'/exercises', $perm); |
|
| 154 | + @copy($cpt, $cp.'/exercises/index.html'); |
|
| 155 | 155 | |
| 156 | 156 | // Create .htaccess in the dropbox directory. |
| 157 | - $fp = fopen($cp . '/dropbox/.htaccess', 'w'); |
|
| 157 | + $fp = fopen($cp.'/dropbox/.htaccess', 'w'); |
|
| 158 | 158 | fwrite( |
| 159 | 159 | $fp, |
| 160 | 160 | "AuthName AllowLocalAccess |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | { |
| 298 | 298 | $list = self::get_course_tables(); |
| 299 | 299 | foreach ($list as $table) { |
| 300 | - $sql = "DROP TABLE IF EXISTS " . DB_COURSE_PREFIX . $table; |
|
| 300 | + $sql = "DROP TABLE IF EXISTS ".DB_COURSE_PREFIX.$table; |
|
| 301 | 301 | Database::query($sql); |
| 302 | 302 | } |
| 303 | 303 | } |
@@ -319,47 +319,47 @@ discard block |
||
| 319 | 319 | if ($media == 'images') { |
| 320 | 320 | $code_path = api_get_path( |
| 321 | 321 | SYS_CODE_PATH |
| 322 | - ) . 'default_course_document/images/'; |
|
| 322 | + ).'default_course_document/images/'; |
|
| 323 | 323 | } |
| 324 | 324 | if ($media == 'audio') { |
| 325 | 325 | $code_path = api_get_path( |
| 326 | 326 | SYS_CODE_PATH |
| 327 | - ) . 'default_course_document/audio/'; |
|
| 327 | + ).'default_course_document/audio/'; |
|
| 328 | 328 | } |
| 329 | 329 | if ($media == 'flash') { |
| 330 | 330 | $code_path = api_get_path( |
| 331 | 331 | SYS_CODE_PATH |
| 332 | - ) . 'default_course_document/flash/'; |
|
| 332 | + ).'default_course_document/flash/'; |
|
| 333 | 333 | } |
| 334 | 334 | if ($media == 'video') { |
| 335 | 335 | $code_path = api_get_path( |
| 336 | 336 | SYS_CODE_PATH |
| 337 | - ) . 'default_course_document/video/'; |
|
| 337 | + ).'default_course_document/video/'; |
|
| 338 | 338 | } |
| 339 | 339 | if ($media == 'certificates') { |
| 340 | 340 | $code_path = api_get_path( |
| 341 | 341 | SYS_CODE_PATH |
| 342 | - ) . 'default_course_document/certificates/'; |
|
| 342 | + ).'default_course_document/certificates/'; |
|
| 343 | 343 | } |
| 344 | 344 | if (is_dir($path)) { |
| 345 | 345 | $handle = opendir($path); |
| 346 | 346 | while (false !== ($file = readdir($handle))) { |
| 347 | - if (is_dir($path . $file) && strpos($file, '.') !== 0) { |
|
| 347 | + if (is_dir($path.$file) && strpos($file, '.') !== 0) { |
|
| 348 | 348 | $files[]['dir'] = str_replace( |
| 349 | 349 | $code_path, |
| 350 | 350 | '', |
| 351 | - $path . $file . '/' |
|
| 351 | + $path.$file.'/' |
|
| 352 | 352 | ); |
| 353 | 353 | $files = self::browse_folders( |
| 354 | - $path . $file . '/', |
|
| 354 | + $path.$file.'/', |
|
| 355 | 355 | $files, |
| 356 | 356 | $media |
| 357 | 357 | ); |
| 358 | - } elseif (is_file($path . $file) && strpos($file, '.') !== 0) { |
|
| 358 | + } elseif (is_file($path.$file) && strpos($file, '.') !== 0) { |
|
| 359 | 359 | $files[]['file'] = str_replace( |
| 360 | 360 | $code_path, |
| 361 | 361 | '', |
| 362 | - $path . $file |
|
| 362 | + $path.$file |
|
| 363 | 363 | ); |
| 364 | 364 | } |
| 365 | 365 | } |
@@ -471,8 +471,8 @@ discard block |
||
| 471 | 471 | TABLE_MAIN_GRADEBOOK_CERTIFICATE |
| 472 | 472 | ); |
| 473 | 473 | |
| 474 | - include_once api_get_path(SYS_CODE_PATH) . 'lang/english/trad4all.inc.php'; |
|
| 475 | - $file_to_include = api_get_path(SYS_CODE_PATH) . 'lang/' . $language . '/trad4all.inc.php'; |
|
| 474 | + include_once api_get_path(SYS_CODE_PATH).'lang/english/trad4all.inc.php'; |
|
| 475 | + $file_to_include = api_get_path(SYS_CODE_PATH).'lang/'.$language.'/trad4all.inc.php'; |
|
| 476 | 476 | |
| 477 | 477 | if (file_exists($file_to_include)) { |
| 478 | 478 | include_once $file_to_include; |
@@ -486,117 +486,117 @@ discard block |
||
| 486 | 486 | |
| 487 | 487 | Database::query( |
| 488 | 488 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 489 | - VALUES ($course_id, 1, '" . TOOL_COURSE_DESCRIPTION . "','course_description/','info.gif','" . self::string2binary( |
|
| 489 | + VALUES ($course_id, 1, '".TOOL_COURSE_DESCRIPTION."','course_description/','info.gif','".self::string2binary( |
|
| 490 | 490 | api_get_setting( |
| 491 | 491 | 'course_create_active_tools', |
| 492 | 492 | 'course_description' |
| 493 | 493 | ) |
| 494 | - ) . "','0','squaregrey.gif', 0,'_self','authoring','0')" |
|
| 494 | + )."','0','squaregrey.gif', 0,'_self','authoring','0')" |
|
| 495 | 495 | ); |
| 496 | 496 | Database::query( |
| 497 | 497 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 498 | - VALUES ($course_id, 2, '" . TOOL_CALENDAR_EVENT . "','calendar/agenda.php','agenda.gif','" . self::string2binary( |
|
| 498 | + VALUES ($course_id, 2, '".TOOL_CALENDAR_EVENT."','calendar/agenda.php','agenda.gif','".self::string2binary( |
|
| 499 | 499 | api_get_setting('course_create_active_tools', 'agenda') |
| 500 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 500 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 501 | 501 | ); |
| 502 | 502 | Database::query( |
| 503 | 503 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 504 | - VALUES ($course_id, 3, '" . TOOL_DOCUMENT . "','document/document.php','folder_document.gif','" . self::string2binary( |
|
| 504 | + VALUES ($course_id, 3, '".TOOL_DOCUMENT."','document/document.php','folder_document.gif','".self::string2binary( |
|
| 505 | 505 | api_get_setting('course_create_active_tools', 'documents') |
| 506 | - ) . "','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 506 | + )."','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 507 | 507 | ); |
| 508 | 508 | Database::query( |
| 509 | 509 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 510 | - VALUES ($course_id, 4, '" . TOOL_LEARNPATH . "','newscorm/lp_controller.php','scorms.gif','" . self::string2binary( |
|
| 510 | + VALUES ($course_id, 4, '".TOOL_LEARNPATH."','newscorm/lp_controller.php','scorms.gif','".self::string2binary( |
|
| 511 | 511 | api_get_setting('course_create_active_tools', 'learning_path') |
| 512 | - ) . "','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 512 | + )."','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 513 | 513 | ); |
| 514 | 514 | Database::query( |
| 515 | 515 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 516 | - VALUES ($course_id, 5, '" . TOOL_LINK . "','link/link.php','links.gif','" . self::string2binary( |
|
| 516 | + VALUES ($course_id, 5, '".TOOL_LINK."','link/link.php','links.gif','".self::string2binary( |
|
| 517 | 517 | api_get_setting('course_create_active_tools', 'links') |
| 518 | - ) . "','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 518 | + )."','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 519 | 519 | ); |
| 520 | 520 | Database::query( |
| 521 | 521 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 522 | - VALUES ($course_id, 6, '" . TOOL_QUIZ . "','exercice/exercice.php','quiz.gif','" . self::string2binary( |
|
| 522 | + VALUES ($course_id, 6, '".TOOL_QUIZ."','exercice/exercice.php','quiz.gif','".self::string2binary( |
|
| 523 | 523 | api_get_setting('course_create_active_tools', 'quiz') |
| 524 | - ) . "','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 524 | + )."','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 525 | 525 | ); |
| 526 | 526 | Database::query( |
| 527 | 527 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 528 | - VALUES ($course_id, 7, '" . TOOL_ANNOUNCEMENT . "','announcements/announcements.php','valves.gif','" . self::string2binary( |
|
| 528 | + VALUES ($course_id, 7, '".TOOL_ANNOUNCEMENT."','announcements/announcements.php','valves.gif','".self::string2binary( |
|
| 529 | 529 | api_get_setting('course_create_active_tools', 'announcements') |
| 530 | - ) . "','0','squaregrey.gif', 0,'_self','authoring','0')" |
|
| 530 | + )."','0','squaregrey.gif', 0,'_self','authoring','0')" |
|
| 531 | 531 | ); |
| 532 | 532 | Database::query( |
| 533 | 533 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 534 | - VALUES ($course_id, 8, '" . TOOL_FORUM . "','forum/index.php','forum.gif','" . self::string2binary( |
|
| 534 | + VALUES ($course_id, 8, '".TOOL_FORUM."','forum/index.php','forum.gif','".self::string2binary( |
|
| 535 | 535 | api_get_setting('course_create_active_tools', 'forums') |
| 536 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 536 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 537 | 537 | ); |
| 538 | 538 | Database::query( |
| 539 | 539 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 540 | - VALUES ($course_id, 9, '" . TOOL_DROPBOX . "','dropbox/index.php','dropbox.gif','" . self::string2binary( |
|
| 540 | + VALUES ($course_id, 9, '".TOOL_DROPBOX."','dropbox/index.php','dropbox.gif','".self::string2binary( |
|
| 541 | 541 | api_get_setting('course_create_active_tools', 'dropbox') |
| 542 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 542 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 543 | 543 | ); |
| 544 | 544 | Database::query( |
| 545 | 545 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 546 | - VALUES ($course_id, 10, '" . TOOL_USER . "','user/user.php','members.gif','" . self::string2binary( |
|
| 546 | + VALUES ($course_id, 10, '".TOOL_USER."','user/user.php','members.gif','".self::string2binary( |
|
| 547 | 547 | api_get_setting('course_create_active_tools', 'users') |
| 548 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 548 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 549 | 549 | ); |
| 550 | 550 | Database::query( |
| 551 | 551 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 552 | - VALUES ($course_id, 11, '" . TOOL_GROUP . "','group/group.php','group.gif','" . self::string2binary( |
|
| 552 | + VALUES ($course_id, 11, '".TOOL_GROUP."','group/group.php','group.gif','".self::string2binary( |
|
| 553 | 553 | api_get_setting('course_create_active_tools', 'groups') |
| 554 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 554 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 555 | 555 | ); |
| 556 | 556 | Database::query( |
| 557 | 557 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 558 | - VALUES ($course_id, 12, '" . TOOL_CHAT . "','chat/chat.php','chat.gif','" . self::string2binary( |
|
| 558 | + VALUES ($course_id, 12, '".TOOL_CHAT."','chat/chat.php','chat.gif','".self::string2binary( |
|
| 559 | 559 | api_get_setting('course_create_active_tools', 'chat') |
| 560 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 560 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 561 | 561 | ); |
| 562 | 562 | Database::query( |
| 563 | 563 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 564 | - VALUES ($course_id, 13, '" . TOOL_STUDENTPUBLICATION . "','work/work.php','works.gif','" . self::string2binary( |
|
| 564 | + VALUES ($course_id, 13, '".TOOL_STUDENTPUBLICATION."','work/work.php','works.gif','".self::string2binary( |
|
| 565 | 565 | api_get_setting( |
| 566 | 566 | 'course_create_active_tools', |
| 567 | 567 | 'student_publications' |
| 568 | 568 | ) |
| 569 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 569 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 570 | 570 | ); |
| 571 | 571 | Database::query( |
| 572 | 572 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 573 | - VALUES ($course_id, 14, '" . TOOL_SURVEY . "','survey/survey_list.php','survey.gif','" . self::string2binary( |
|
| 573 | + VALUES ($course_id, 14, '".TOOL_SURVEY."','survey/survey_list.php','survey.gif','".self::string2binary( |
|
| 574 | 574 | api_get_setting('course_create_active_tools', 'survey') |
| 575 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 575 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 576 | 576 | ); |
| 577 | 577 | Database::query( |
| 578 | 578 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 579 | - VALUES ($course_id, 15, '" . TOOL_WIKI . "','wiki/index.php','wiki.gif','" . self::string2binary( |
|
| 579 | + VALUES ($course_id, 15, '".TOOL_WIKI."','wiki/index.php','wiki.gif','".self::string2binary( |
|
| 580 | 580 | api_get_setting('course_create_active_tools', 'wiki') |
| 581 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 581 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 582 | 582 | ); |
| 583 | 583 | Database::query( |
| 584 | 584 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 585 | - VALUES ($course_id, 16, '" . TOOL_GRADEBOOK . "','gradebook/index.php','gradebook.gif','" . self::string2binary( |
|
| 585 | + VALUES ($course_id, 16, '".TOOL_GRADEBOOK."','gradebook/index.php','gradebook.gif','".self::string2binary( |
|
| 586 | 586 | api_get_setting('course_create_active_tools', 'gradebook') |
| 587 | - ) . "','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 587 | + )."','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 588 | 588 | ); |
| 589 | 589 | Database::query( |
| 590 | 590 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 591 | - VALUES ($course_id, 17, '" . TOOL_GLOSSARY . "','glossary/index.php','glossary.gif','" . self::string2binary( |
|
| 591 | + VALUES ($course_id, 17, '".TOOL_GLOSSARY."','glossary/index.php','glossary.gif','".self::string2binary( |
|
| 592 | 592 | api_get_setting('course_create_active_tools', 'glossary') |
| 593 | - ) . "','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 593 | + )."','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 594 | 594 | ); |
| 595 | 595 | Database::query( |
| 596 | 596 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 597 | - VALUES ($course_id, 18, '" . TOOL_NOTEBOOK . "','notebook/index.php','notebook.gif','" . self::string2binary( |
|
| 597 | + VALUES ($course_id, 18, '".TOOL_NOTEBOOK."','notebook/index.php','notebook.gif','".self::string2binary( |
|
| 598 | 598 | api_get_setting('course_create_active_tools', 'notebook') |
| 599 | - ) . "','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 599 | + )."','0','squaregrey.gif',0,'_self','interaction','0')" |
|
| 600 | 600 | ); |
| 601 | 601 | |
| 602 | 602 | $setting = intval(self::string2binary( |
@@ -605,13 +605,13 @@ discard block |
||
| 605 | 605 | |
| 606 | 606 | Database::query( |
| 607 | 607 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 608 | - VALUES ($course_id, 19, '" . TOOL_ATTENDANCE . "','attendance/index.php','attendance.gif','" . $setting. "','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 608 | + VALUES ($course_id, 19, '".TOOL_ATTENDANCE."','attendance/index.php','attendance.gif','".$setting."','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 609 | 609 | ); |
| 610 | 610 | Database::query( |
| 611 | 611 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 612 | - VALUES ($course_id, 20, '" . TOOL_COURSE_PROGRESS . "','course_progress/index.php','course_progress.gif','" . self::string2binary( |
|
| 612 | + VALUES ($course_id, 20, '".TOOL_COURSE_PROGRESS."','course_progress/index.php','course_progress.gif','".self::string2binary( |
|
| 613 | 613 | intval(api_get_setting('course_create_active_tools', 'course_progress')) |
| 614 | - ) . "','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 614 | + )."','0','squaregrey.gif',0,'_self','authoring','0')" |
|
| 615 | 615 | ); |
| 616 | 616 | |
| 617 | 617 | if (api_get_setting('service_visio', 'active') == 'true') { |
@@ -619,11 +619,11 @@ discard block |
||
| 619 | 619 | if (!empty($mycheck)) { |
| 620 | 620 | Database::query( |
| 621 | 621 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 622 | - VALUES ($course_id, 21, '" . TOOL_VISIO_CONFERENCE . "','conference/index.php?type=conference','visio_meeting.gif','1','0','squaregrey.gif','NO','_self','interaction','0')" |
|
| 622 | + VALUES ($course_id, 21, '".TOOL_VISIO_CONFERENCE."','conference/index.php?type=conference','visio_meeting.gif','1','0','squaregrey.gif','NO','_self','interaction','0')" |
|
| 623 | 623 | ); |
| 624 | 624 | Database::query( |
| 625 | 625 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 626 | - VALUES ($course_id, 22, '" . TOOL_VISIO_CLASSROOM . "','conference/index.php?type=classroom','visio.gif','1','0','squaregrey.gif','NO','_self','authoring','0')" |
|
| 626 | + VALUES ($course_id, 22, '".TOOL_VISIO_CLASSROOM."','conference/index.php?type=classroom','visio.gif','1','0','squaregrey.gif','NO','_self','authoring','0')" |
|
| 627 | 627 | ); |
| 628 | 628 | } |
| 629 | 629 | } |
@@ -631,33 +631,33 @@ discard block |
||
| 631 | 631 | if (api_get_setting('search_enabled') == 'true') { |
| 632 | 632 | Database::query( |
| 633 | 633 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 634 | - VALUES ($course_id, 23, '" . TOOL_SEARCH . "','search/','info.gif','" . self::string2binary( |
|
| 634 | + VALUES ($course_id, 23, '".TOOL_SEARCH."','search/','info.gif','".self::string2binary( |
|
| 635 | 635 | api_get_setting( |
| 636 | 636 | 'course_create_active_tools', |
| 637 | 637 | 'enable_search' |
| 638 | 638 | ) |
| 639 | - ) . "','0','search.gif',0,'_self','authoring','0')" |
|
| 639 | + )."','0','search.gif',0,'_self','authoring','0')" |
|
| 640 | 640 | ); |
| 641 | 641 | } |
| 642 | 642 | |
| 643 | 643 | $sql = "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 644 | - VALUES ($course_id, 24,'" . TOOL_BLOGS . "','blog/blog_admin.php','blog_admin.gif','" . intval(self::string2binary( |
|
| 644 | + VALUES ($course_id, 24,'".TOOL_BLOGS."','blog/blog_admin.php','blog_admin.gif','".intval(self::string2binary( |
|
| 645 | 645 | api_get_setting('course_create_active_tools', 'blogs')) |
| 646 | - ) . "','1','squaregrey.gif',0,'_self','admin','0')"; |
|
| 646 | + )."','1','squaregrey.gif',0,'_self','admin','0')"; |
|
| 647 | 647 | Database::query($sql); |
| 648 | 648 | |
| 649 | 649 | /* Course homepage tools for course admin only */ |
| 650 | 650 | Database::query( |
| 651 | 651 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 652 | - VALUES ($course_id, 25, '" . TOOL_TRACKING . "','tracking/courseLog.php','statistics.gif','$visible_for_course_admin','1','', 0,'_self','admin','0')" |
|
| 652 | + VALUES ($course_id, 25, '".TOOL_TRACKING."','tracking/courseLog.php','statistics.gif','$visible_for_course_admin','1','', 0,'_self','admin','0')" |
|
| 653 | 653 | ); |
| 654 | 654 | Database::query( |
| 655 | 655 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 656 | - VALUES ($course_id, 26, '" . TOOL_COURSE_SETTING . "','course_info/infocours.php','reference.gif','$visible_for_course_admin','1','', 0,'_self','admin','0')" |
|
| 656 | + VALUES ($course_id, 26, '".TOOL_COURSE_SETTING."','course_info/infocours.php','reference.gif','$visible_for_course_admin','1','', 0,'_self','admin','0')" |
|
| 657 | 657 | ); |
| 658 | 658 | Database::query( |
| 659 | 659 | "INSERT INTO $tbl_course_homepage (c_id, id, name, link, image, visibility, admin, address, added_tool, target, category, session_id) |
| 660 | - VALUES ($course_id, 27, '" . TOOL_COURSE_MAINTENANCE . "','course_info/maintenance.php','backup.gif','$visible_for_course_admin','1','',0,'_self', 'admin','0')" |
|
| 660 | + VALUES ($course_id, 27, '".TOOL_COURSE_MAINTENANCE."','course_info/maintenance.php','backup.gif','$visible_for_course_admin','1','',0,'_self', 'admin','0')" |
|
| 661 | 661 | ); |
| 662 | 662 | |
| 663 | 663 | $defaultEmailExerciseAlert = 1; |
@@ -708,7 +708,7 @@ discard block |
||
| 708 | 708 | |
| 709 | 709 | Database::query( |
| 710 | 710 | "INSERT INTO $TABLEGROUPCATEGORIES (c_id, id, title , description, max_student, self_reg_allowed, self_unreg_allowed, groups_per_user, display_order, doc_state,calendar_state, work_state ,announcements_state, forum_state, wiki_state, chat_state) |
| 711 | - VALUES ($course_id, '2', '" . self::lang2db(get_lang('DefaultGroupCategory')) . "', '', '8', '0', '0', '0', '0', 1, 1 ,1 ,1 ,1, 1, 1);" |
|
| 711 | + VALUES ($course_id, '2', '".self::lang2db(get_lang('DefaultGroupCategory'))."', '', '8', '0', '0', '0', '0', 1, 1 ,1 ,1 ,1, 1, 1);" |
|
| 712 | 712 | ); |
| 713 | 713 | |
| 714 | 714 | /* Example Material */ |
@@ -738,7 +738,7 @@ discard block |
||
| 738 | 738 | $perm = api_get_permissions_for_new_directories(); |
| 739 | 739 | $perm_file = api_get_permissions_for_new_files(); |
| 740 | 740 | |
| 741 | - $chat_path = $sys_course_path . $course_repository . '/document/chat_files'; |
|
| 741 | + $chat_path = $sys_course_path.$course_repository.'/document/chat_files'; |
|
| 742 | 742 | |
| 743 | 743 | if (!is_dir($chat_path)) { |
| 744 | 744 | @mkdir($chat_path, api_get_permissions_for_new_directories()); |
@@ -770,11 +770,11 @@ discard block |
||
| 770 | 770 | 'certificates', |
| 771 | 771 | ); |
| 772 | 772 | |
| 773 | - $default_course_path = api_get_path(SYS_CODE_PATH) . 'default_course_document/'; |
|
| 773 | + $default_course_path = api_get_path(SYS_CODE_PATH).'default_course_document/'; |
|
| 774 | 774 | |
| 775 | 775 | $default_document_array = array(); |
| 776 | 776 | foreach ($folders_to_copy_from_default_course as $folder) { |
| 777 | - $default_course_folder_path = $default_course_path . $folder . '/'; |
|
| 777 | + $default_course_folder_path = $default_course_path.$folder.'/'; |
|
| 778 | 778 | $files = self::browse_folders( |
| 779 | 779 | $default_course_folder_path, |
| 780 | 780 | array(), |
@@ -805,30 +805,30 @@ discard block |
||
| 805 | 805 | //hack until feature #5242 is implemented |
| 806 | 806 | if ($media_type == 'images') { |
| 807 | 807 | $media_type = 'images/gallery'; |
| 808 | - $images_folder = $sys_course_path . $course_repository . "/document/images/"; |
|
| 808 | + $images_folder = $sys_course_path.$course_repository."/document/images/"; |
|
| 809 | 809 | |
| 810 | 810 | if (!is_dir($images_folder)) { |
| 811 | 811 | //Creating index.html |
| 812 | 812 | mkdir($images_folder, $perm); |
| 813 | - $fd = fopen($images_folder . 'index.html', 'w'); |
|
| 813 | + $fd = fopen($images_folder.'index.html', 'w'); |
|
| 814 | 814 | fwrite($fd, $htmlpage); |
| 815 | - @chmod($images_folder . 'index.html', $perm_file); |
|
| 815 | + @chmod($images_folder.'index.html', $perm_file); |
|
| 816 | 816 | } |
| 817 | 817 | } |
| 818 | 818 | |
| 819 | - $course_documents_folder = $sys_course_path . $course_repository . "/document/$media_type/"; |
|
| 820 | - $default_course_path = api_get_path(SYS_CODE_PATH) . 'default_course_document' . $path_documents; |
|
| 819 | + $course_documents_folder = $sys_course_path.$course_repository."/document/$media_type/"; |
|
| 820 | + $default_course_path = api_get_path(SYS_CODE_PATH).'default_course_document'.$path_documents; |
|
| 821 | 821 | |
| 822 | 822 | if (!is_dir($course_documents_folder)) { |
| 823 | 823 | // Creating index.html |
| 824 | 824 | mkdir($course_documents_folder, $perm); |
| 825 | 825 | $fd = fopen( |
| 826 | - $course_documents_folder . 'index.html', |
|
| 826 | + $course_documents_folder.'index.html', |
|
| 827 | 827 | 'w' |
| 828 | 828 | ); |
| 829 | 829 | fwrite($fd, $htmlpage); |
| 830 | 830 | @chmod( |
| 831 | - $course_documents_folder . 'index.html', |
|
| 831 | + $course_documents_folder.'index.html', |
|
| 832 | 832 | $perm_file |
| 833 | 833 | ); |
| 834 | 834 | } |
@@ -836,15 +836,15 @@ discard block |
||
| 836 | 836 | if (is_array($array_media) && count($array_media) > 0) { |
| 837 | 837 | foreach ($array_media as $key => $value) { |
| 838 | 838 | if (isset($value['dir']) && !empty($value['dir'])) { |
| 839 | - if (!is_dir($course_documents_folder . $value['dir'])) { |
|
| 839 | + if (!is_dir($course_documents_folder.$value['dir'])) { |
|
| 840 | 840 | //Creating folder |
| 841 | 841 | mkdir( |
| 842 | - $course_documents_folder . $value['dir'], |
|
| 842 | + $course_documents_folder.$value['dir'], |
|
| 843 | 843 | $perm |
| 844 | 844 | ); |
| 845 | 845 | |
| 846 | 846 | //Creating index.html (for light protection) |
| 847 | - $index_html = $course_documents_folder . $value['dir'] . '/index.html'; |
|
| 847 | + $index_html = $course_documents_folder.$value['dir'].'/index.html'; |
|
| 848 | 848 | $fd = fopen($index_html, 'w'); |
| 849 | 849 | fwrite($fd, $htmlpage); |
| 850 | 850 | @chmod($index_html, $perm_file); |
@@ -866,12 +866,12 @@ discard block |
||
| 866 | 866 | } |
| 867 | 867 | |
| 868 | 868 | if ($media_type == 'images/gallery') { |
| 869 | - $folder_path = 'gallery/' . $folder_path; |
|
| 869 | + $folder_path = 'gallery/'.$folder_path; |
|
| 870 | 870 | } |
| 871 | 871 | |
| 872 | 872 | Database::query( |
| 873 | 873 | "INSERT INTO $TABLETOOLDOCUMENT (c_id, path,title,filetype,size) |
| 874 | - VALUES ($course_id,'$path_documents" . $folder_path . "','" . $title . "','folder','0')" |
|
| 874 | + VALUES ($course_id,'$path_documents".$folder_path."','".$title."','folder','0')" |
|
| 875 | 875 | ); |
| 876 | 876 | $image_id = Database:: insert_id(); |
| 877 | 877 | |
@@ -884,33 +884,33 @@ discard block |
||
| 884 | 884 | |
| 885 | 885 | if (isset($value['file']) && !empty($value['file'])) { |
| 886 | 886 | if (!file_exists( |
| 887 | - $course_documents_folder . $value['file'] |
|
| 887 | + $course_documents_folder.$value['file'] |
|
| 888 | 888 | ) |
| 889 | 889 | ) { |
| 890 | 890 | //Copying file |
| 891 | 891 | copy( |
| 892 | - $default_course_path . $value['file'], |
|
| 893 | - $course_documents_folder . $value['file'] |
|
| 892 | + $default_course_path.$value['file'], |
|
| 893 | + $course_documents_folder.$value['file'] |
|
| 894 | 894 | ); |
| 895 | 895 | chmod( |
| 896 | - $course_documents_folder . $value['file'], |
|
| 896 | + $course_documents_folder.$value['file'], |
|
| 897 | 897 | $perm_file |
| 898 | 898 | ); |
| 899 | 899 | //echo $default_course_path.$value['file']; echo ' - '; echo $course_documents_folder.$value['file']; echo '<br />'; |
| 900 | 900 | $temp = explode('/', $value['file']); |
| 901 | 901 | $file_size = filesize( |
| 902 | - $course_documents_folder . $value['file'] |
|
| 902 | + $course_documents_folder.$value['file'] |
|
| 903 | 903 | ); |
| 904 | 904 | |
| 905 | 905 | //hack until feature #5242 is implemented |
| 906 | 906 | if ($media_type == 'images/gallery') { |
| 907 | - $value["file"] = 'gallery/' . $value["file"]; |
|
| 907 | + $value["file"] = 'gallery/'.$value["file"]; |
|
| 908 | 908 | } |
| 909 | 909 | |
| 910 | 910 | //Inserting file in the DB |
| 911 | 911 | Database::query( |
| 912 | 912 | "INSERT INTO $TABLETOOLDOCUMENT (c_id, path,title,filetype,size) |
| 913 | - VALUES ($course_id,'$path_documents" . $value["file"] . "','" . $temp[count($temp) - 1] . "','file','$file_size')" |
|
| 913 | + VALUES ($course_id,'$path_documents".$value["file"]."','".$temp[count($temp) - 1]."','file','$file_size')" |
|
| 914 | 914 | ); |
| 915 | 915 | $image_id = Database:: insert_id(); |
| 916 | 916 | if ($image_id) { |
@@ -918,7 +918,7 @@ discard block |
||
| 918 | 918 | $sql = "UPDATE $TABLETOOLDOCUMENT SET id = iid WHERE iid = $image_id"; |
| 919 | 919 | Database::query($sql); |
| 920 | 920 | |
| 921 | - if ($path_documents . $value['file'] == '/certificates/default.html') { |
|
| 921 | + if ($path_documents.$value['file'] == '/certificates/default.html') { |
|
| 922 | 922 | $example_cert_id = $image_id; |
| 923 | 923 | } |
| 924 | 924 | Database::query( |
@@ -958,7 +958,7 @@ discard block |
||
| 958 | 958 | 'c_id' => $course_id, |
| 959 | 959 | 'url' => 'http://www.google.com', |
| 960 | 960 | 'title' => 'Google', |
| 961 | - 'description' => get_lang('Google') , |
|
| 961 | + 'description' => get_lang('Google'), |
|
| 962 | 962 | 'category_id' => 0, |
| 963 | 963 | 'on_homepage' => 0, |
| 964 | 964 | 'target' => '_self', |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | 'c_id' => $course_id, |
| 969 | 969 | 'url' => 'http://www.wikipedia.org', |
| 970 | 970 | 'title' => 'Wikipedia', |
| 971 | - 'description' => get_lang('Wikipedia') , |
|
| 971 | + 'description' => get_lang('Wikipedia'), |
|
| 972 | 972 | 'category_id' => 0, |
| 973 | 973 | 'on_homepage' => 0, |
| 974 | 974 | 'target' => '_self', |
@@ -976,7 +976,7 @@ discard block |
||
| 976 | 976 | ] |
| 977 | 977 | ]; |
| 978 | 978 | |
| 979 | - foreach($links as $params) { |
|
| 979 | + foreach ($links as $params) { |
|
| 980 | 980 | $link->save($params); |
| 981 | 981 | } |
| 982 | 982 | |
@@ -995,8 +995,8 @@ discard block |
||
| 995 | 995 | /* Introduction text */ |
| 996 | 996 | |
| 997 | 997 | $intro_text = '<p style="text-align: center;"> |
| 998 | - <img src="' . api_get_path(REL_CODE_PATH) . 'img/mascot.png" alt="Mr. Chamilo" title="Mr. Chamilo" /> |
|
| 999 | - <h2>' . self::lang2db(get_lang('IntroductionText')) . '</h2> |
|
| 998 | + <img src="' . api_get_path(REL_CODE_PATH).'img/mascot.png" alt="Mr. Chamilo" title="Mr. Chamilo" /> |
|
| 999 | + <h2>' . self::lang2db(get_lang('IntroductionText')).'</h2> |
|
| 1000 | 1000 | </p>'; |
| 1001 | 1001 | |
| 1002 | 1002 | $toolIntro = new Chamilo\CourseBundle\Entity\CToolIntro(); |
@@ -1032,9 +1032,9 @@ discard block |
||
| 1032 | 1032 | $html = '<table width="100%" border="0" cellpadding="0" cellspacing="0"> |
| 1033 | 1033 | <tr> |
| 1034 | 1034 | <td width="110" valign="top" align="left"> |
| 1035 | - <img src="' . api_get_path(WEB_CODE_PATH) . 'default_course_document/images/mr_dokeos/thinking.jpg"> |
|
| 1035 | + <img src="' . api_get_path(WEB_CODE_PATH).'default_course_document/images/mr_dokeos/thinking.jpg"> |
|
| 1036 | 1036 | </td> |
| 1037 | - <td valign="top" align="left">' . get_lang('Antique') . '</td></tr> |
|
| 1037 | + <td valign="top" align="left">' . get_lang('Antique').'</td></tr> |
|
| 1038 | 1038 | </table>'; |
| 1039 | 1039 | $exercise->type = 1; |
| 1040 | 1040 | $exercise->setRandom(0); |
@@ -1279,7 +1279,7 @@ discard block |
||
| 1279 | 1279 | 'https://' |
| 1280 | 1280 | ) === false |
| 1281 | 1281 | ) { |
| 1282 | - $department_url = 'http://' . $department_url; |
|
| 1282 | + $department_url = 'http://'.$department_url; |
|
| 1283 | 1283 | } |
| 1284 | 1284 | //just in case |
| 1285 | 1285 | if ($department_url == 'http://') { |
@@ -1290,26 +1290,26 @@ discard block |
||
| 1290 | 1290 | if ($ok_to_register_course) { |
| 1291 | 1291 | |
| 1292 | 1292 | // Here we must add 2 fields. |
| 1293 | - $sql = "INSERT INTO " . $TABLECOURSE . " SET |
|
| 1293 | + $sql = "INSERT INTO ".$TABLECOURSE." SET |
|
| 1294 | 1294 | code = '".Database:: escape_string($code)."', |
| 1295 | 1295 | directory = '".Database:: escape_string($directory)."', |
| 1296 | 1296 | course_language = '".Database:: escape_string($course_language)."', |
| 1297 | 1297 | title = '".Database:: escape_string($title)."', |
| 1298 | 1298 | description = '".self::lang2db(get_lang('CourseDescription'))."', |
| 1299 | 1299 | category_code = '".Database:: escape_string($category_code)."', |
| 1300 | - visibility = '" . $visibility . "', |
|
| 1300 | + visibility = '" . $visibility."', |
|
| 1301 | 1301 | show_score = '1', |
| 1302 | - disk_quota = '" . intval($disk_quota) . "', |
|
| 1302 | + disk_quota = '" . intval($disk_quota)."', |
|
| 1303 | 1303 | creation_date = '$time', |
| 1304 | - expiration_date = '" . $expiration_date . "', |
|
| 1304 | + expiration_date = '".$expiration_date."', |
|
| 1305 | 1305 | last_edit = '$time', |
| 1306 | 1306 | last_visit = NULL, |
| 1307 | - tutor_name = '" . Database:: escape_string($tutor_name) . "', |
|
| 1308 | - department_name = '" . Database:: escape_string($department_name) . "', |
|
| 1309 | - department_url = '" . Database:: escape_string($department_url) . "', |
|
| 1310 | - subscribe = '" . intval($subscribe) . "', |
|
| 1311 | - unsubscribe = '" . intval($unsubscribe) . "', |
|
| 1312 | - visual_code = '" . Database:: escape_string($visual_code) . "'"; |
|
| 1307 | + tutor_name = '".Database:: escape_string($tutor_name)."', |
|
| 1308 | + department_name = '" . Database:: escape_string($department_name)."', |
|
| 1309 | + department_url = '" . Database:: escape_string($department_url)."', |
|
| 1310 | + subscribe = '" . intval($subscribe)."', |
|
| 1311 | + unsubscribe = '" . intval($unsubscribe)."', |
|
| 1312 | + visual_code = '" . Database:: escape_string($visual_code)."'"; |
|
| 1313 | 1313 | Database::query($sql); |
| 1314 | 1314 | $course_id = Database::insert_id(); |
| 1315 | 1315 | |
@@ -1324,12 +1324,12 @@ discard block |
||
| 1324 | 1324 | $code |
| 1325 | 1325 | ); |
| 1326 | 1326 | if (!empty($user_id)) { |
| 1327 | - $sql = "INSERT INTO " . $TABLECOURSUSER . " SET |
|
| 1328 | - c_id = '" . $course_id . "', |
|
| 1329 | - user_id = '" . intval($user_id) . "', |
|
| 1327 | + $sql = "INSERT INTO ".$TABLECOURSUSER." SET |
|
| 1328 | + c_id = '" . $course_id."', |
|
| 1329 | + user_id = '" . intval($user_id)."', |
|
| 1330 | 1330 | status = '1', |
| 1331 | 1331 | is_tutor = '0', |
| 1332 | - sort = '" . ($i_course_sort) . "', |
|
| 1332 | + sort = '" . ($i_course_sort)."', |
|
| 1333 | 1333 | relation_type = 0, |
| 1334 | 1334 | user_course_cat = '0'"; |
| 1335 | 1335 | Database::query($sql); |
@@ -1348,12 +1348,12 @@ discard block |
||
| 1348 | 1348 | if (empty($key)) { |
| 1349 | 1349 | continue; |
| 1350 | 1350 | } |
| 1351 | - $sql = "INSERT INTO " . $TABLECOURSUSER . " SET |
|
| 1352 | - c_id = '" . Database::escape_string($course_id) . "', |
|
| 1353 | - user_id = '" . Database::escape_string($key) . "', |
|
| 1351 | + $sql = "INSERT INTO ".$TABLECOURSUSER." SET |
|
| 1352 | + c_id = '" . Database::escape_string($course_id)."', |
|
| 1353 | + user_id = '" . Database::escape_string($key)."', |
|
| 1354 | 1354 | status = '1', |
| 1355 | 1355 | is_tutor = '0', |
| 1356 | - sort = '" . ($sort + 1) . "', |
|
| 1356 | + sort = '" . ($sort + 1)."', |
|
| 1357 | 1357 | relation_type = 0, |
| 1358 | 1358 | user_course_cat = '0'"; |
| 1359 | 1359 | Database::query($sql); |
@@ -1397,18 +1397,18 @@ discard block |
||
| 1397 | 1397 | $iname = api_get_setting('Institution'); |
| 1398 | 1398 | $subject = get_lang( |
| 1399 | 1399 | 'NewCourseCreatedIn' |
| 1400 | - ) . ' ' . $siteName . ' - ' . $iname; |
|
| 1400 | + ).' '.$siteName.' - '.$iname; |
|
| 1401 | 1401 | $message = get_lang( |
| 1402 | 1402 | 'Dear' |
| 1403 | - ) . ' ' . $recipient_name . ",\n\n" . get_lang( |
|
| 1403 | + ).' '.$recipient_name.",\n\n".get_lang( |
|
| 1404 | 1404 | 'MessageOfNewCourseToAdmin' |
| 1405 | - ) . ' ' . $siteName . ' - ' . $iname . "\n"; |
|
| 1406 | - $message .= get_lang('CourseName') . ' ' . $title . "\n"; |
|
| 1405 | + ).' '.$siteName.' - '.$iname."\n"; |
|
| 1406 | + $message .= get_lang('CourseName').' '.$title."\n"; |
|
| 1407 | 1407 | $message .= get_lang( |
| 1408 | 1408 | 'Category' |
| 1409 | - ) . ' ' . $category_code . "\n"; |
|
| 1410 | - $message .= get_lang('Tutor') . ' ' . $tutor_name . "\n"; |
|
| 1411 | - $message .= get_lang('Language') . ' ' . $course_language; |
|
| 1409 | + ).' '.$category_code."\n"; |
|
| 1410 | + $message .= get_lang('Tutor').' '.$tutor_name."\n"; |
|
| 1411 | + $message .= get_lang('Language').' '.$course_language; |
|
| 1412 | 1412 | |
| 1413 | 1413 | $userInfo = api_get_user_info($user_id); |
| 1414 | 1414 | |
@@ -10,7 +10,7 @@ |
||
| 10 | 10 | * Searches a course, given a search string and a type of search box |
| 11 | 11 | * @param string $needle Search string |
| 12 | 12 | * @param string $type Type of search box ('single' or anything else) |
| 13 | - * @return string XajaxResponse |
|
| 13 | + * @return xajaxResponse XajaxResponse |
|
| 14 | 14 | * @assert ('abc', 'single') !== null |
| 15 | 15 | * @assert ('abc', 'multiple') !== null |
| 16 | 16 | */ |
@@ -6,47 +6,47 @@ discard block |
||
| 6 | 6 | */ |
| 7 | 7 | class AddCourseToSession |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Searches a course, given a search string and a type of search box |
|
| 11 | - * @param string $needle Search string |
|
| 12 | - * @param string $type Type of search box ('single' or anything else) |
|
| 13 | - * @return string XajaxResponse |
|
| 14 | - * @assert ('abc', 'single') !== null |
|
| 15 | - * @assert ('abc', 'multiple') !== null |
|
| 16 | - */ |
|
| 17 | - public static function search_courses($needle, $type) |
|
| 18 | - { |
|
| 19 | - global $tbl_session_rel_course, $id_session; |
|
| 9 | + /** |
|
| 10 | + * Searches a course, given a search string and a type of search box |
|
| 11 | + * @param string $needle Search string |
|
| 12 | + * @param string $type Type of search box ('single' or anything else) |
|
| 13 | + * @return string XajaxResponse |
|
| 14 | + * @assert ('abc', 'single') !== null |
|
| 15 | + * @assert ('abc', 'multiple') !== null |
|
| 16 | + */ |
|
| 17 | + public static function search_courses($needle, $type) |
|
| 18 | + { |
|
| 19 | + global $tbl_session_rel_course, $id_session; |
|
| 20 | 20 | $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE); |
| 21 | - $course_title = null; |
|
| 22 | - $xajax_response = new xajaxResponse(); |
|
| 23 | - $return = ''; |
|
| 24 | - if(!empty($needle) && !empty($type)) { |
|
| 25 | - // xajax send utf8 datas... datas in db can be non-utf8 datas |
|
| 26 | - $charset = api_get_system_encoding(); |
|
| 27 | - $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
|
| 21 | + $course_title = null; |
|
| 22 | + $xajax_response = new xajaxResponse(); |
|
| 23 | + $return = ''; |
|
| 24 | + if(!empty($needle) && !empty($type)) { |
|
| 25 | + // xajax send utf8 datas... datas in db can be non-utf8 datas |
|
| 26 | + $charset = api_get_system_encoding(); |
|
| 27 | + $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
|
| 28 | 28 | |
| 29 | - $cond_course_code = ''; |
|
| 30 | - if (!empty($id_session)) { |
|
| 31 | - $id_session = intval($id_session); |
|
| 32 | - // check course_code from session_rel_course table |
|
| 33 | - $sql = 'SELECT c_id FROM '.$tbl_session_rel_course.' |
|
| 29 | + $cond_course_code = ''; |
|
| 30 | + if (!empty($id_session)) { |
|
| 31 | + $id_session = intval($id_session); |
|
| 32 | + // check course_code from session_rel_course table |
|
| 33 | + $sql = 'SELECT c_id FROM '.$tbl_session_rel_course.' |
|
| 34 | 34 | WHERE session_id = '.$id_session; |
| 35 | - $res = Database::query($sql); |
|
| 36 | - $course_codes = ''; |
|
| 37 | - if (Database::num_rows($res) > 0) { |
|
| 38 | - while ($row = Database::fetch_row($res)) { |
|
| 39 | - $course_codes .= '\''.$row[0].'\','; |
|
| 40 | - } |
|
| 41 | - $course_codes = substr($course_codes,0,(strlen($course_codes)-1)); |
|
| 35 | + $res = Database::query($sql); |
|
| 36 | + $course_codes = ''; |
|
| 37 | + if (Database::num_rows($res) > 0) { |
|
| 38 | + while ($row = Database::fetch_row($res)) { |
|
| 39 | + $course_codes .= '\''.$row[0].'\','; |
|
| 40 | + } |
|
| 41 | + $course_codes = substr($course_codes,0,(strlen($course_codes)-1)); |
|
| 42 | 42 | |
| 43 | - $cond_course_code = ' AND course.id NOT IN('.$course_codes.') '; |
|
| 44 | - } |
|
| 45 | - } |
|
| 43 | + $cond_course_code = ' AND course.id NOT IN('.$course_codes.') '; |
|
| 44 | + } |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - if ($type=='single') { |
|
| 48 | - // search users where username or firstname or lastname begins likes $needle |
|
| 49 | - $sql = 'SELECT |
|
| 47 | + if ($type=='single') { |
|
| 48 | + // search users where username or firstname or lastname begins likes $needle |
|
| 49 | + $sql = 'SELECT |
|
| 50 | 50 | course.code, |
| 51 | 51 | course.visual_code, |
| 52 | 52 | course.title, |
@@ -58,21 +58,21 @@ discard block |
||
| 58 | 58 | WHERE |
| 59 | 59 | course.visual_code LIKE "'.$needle.'%" OR |
| 60 | 60 | course.title LIKE "'.$needle.'%"'; |
| 61 | - } else { |
|
| 62 | - $sql = 'SELECT course.code, course.visual_code, course.title |
|
| 61 | + } else { |
|
| 62 | + $sql = 'SELECT course.code, course.visual_code, course.title |
|
| 63 | 63 | FROM '.$tbl_course.' course |
| 64 | 64 | WHERE |
| 65 | 65 | course.visual_code LIKE "'.$needle.'%" '.$cond_course_code.' |
| 66 | 66 | ORDER BY course.code '; |
| 67 | - } |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - if (api_is_multiple_url_enabled()) { |
|
| 70 | - $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
|
| 71 | - $access_url_id = api_get_current_access_url_id(); |
|
| 72 | - if ($access_url_id != -1){ |
|
| 69 | + if (api_is_multiple_url_enabled()) { |
|
| 70 | + $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
|
| 71 | + $access_url_id = api_get_current_access_url_id(); |
|
| 72 | + if ($access_url_id != -1){ |
|
| 73 | 73 | |
| 74 | - if ($type=='single') { |
|
| 75 | - $sql = 'SELECT |
|
| 74 | + if ($type=='single') { |
|
| 75 | + $sql = 'SELECT |
|
| 76 | 76 | course.code, |
| 77 | 77 | course.visual_code, |
| 78 | 78 | course.title, |
@@ -87,42 +87,42 @@ discard block |
||
| 87 | 87 | access_url_id = '.$access_url_id.' AND |
| 88 | 88 | (course.visual_code LIKE "'.$needle.'%" OR |
| 89 | 89 | course.title LIKE "'.$needle.'%" )'; |
| 90 | - } else { |
|
| 91 | - $sql = 'SELECT course.code, course.visual_code, course.title |
|
| 90 | + } else { |
|
| 91 | + $sql = 'SELECT course.code, course.visual_code, course.title |
|
| 92 | 92 | FROM '.$tbl_course.' course, '.$tbl_course_rel_access_url.' url_course |
| 93 | 93 | WHERE |
| 94 | 94 | url_course.c_id = course.id AND |
| 95 | 95 | access_url_id = '.$access_url_id.' AND |
| 96 | 96 | course.visual_code LIKE "'.$needle.'%" '.$cond_course_code.' |
| 97 | 97 | ORDER BY course.code '; |
| 98 | - } |
|
| 99 | - } |
|
| 100 | - } |
|
| 98 | + } |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | 101 | |
| 102 | - $rs = Database::query($sql); |
|
| 103 | - $course_list = array(); |
|
| 104 | - if ($type=='single') { |
|
| 102 | + $rs = Database::query($sql); |
|
| 103 | + $course_list = array(); |
|
| 104 | + if ($type=='single') { |
|
| 105 | 105 | |
| 106 | - while($course = Database :: fetch_array($rs)) { |
|
| 107 | - $course_list[] = $course['code']; |
|
| 108 | - $course_title=str_replace("'","\'",$course_title); |
|
| 109 | - $return .= '<a href="javascript: void(0);" onclick="javascript: add_course_to_session(\''.$course['code'].'\',\''.$course_title.' ('.$course['visual_code'].')'.'\')">'.$course['title'].' ('.$course['visual_code'].')</a><br />'; |
|
| 110 | - } |
|
| 111 | - $xajax_response -> addAssign('ajax_list_courses_single','innerHTML',api_utf8_encode($return)); |
|
| 112 | - } else { |
|
| 113 | - $return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">'; |
|
| 114 | - while($course = Database :: fetch_array($rs)) { |
|
| 115 | - $course_list[] = $course['code']; |
|
| 116 | - $course_title=str_replace("'","\'",$course_title); |
|
| 117 | - $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')',ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>'; |
|
| 118 | - } |
|
| 119 | - $return .= '</select>'; |
|
| 106 | + while($course = Database :: fetch_array($rs)) { |
|
| 107 | + $course_list[] = $course['code']; |
|
| 108 | + $course_title=str_replace("'","\'",$course_title); |
|
| 109 | + $return .= '<a href="javascript: void(0);" onclick="javascript: add_course_to_session(\''.$course['code'].'\',\''.$course_title.' ('.$course['visual_code'].')'.'\')">'.$course['title'].' ('.$course['visual_code'].')</a><br />'; |
|
| 110 | + } |
|
| 111 | + $xajax_response -> addAssign('ajax_list_courses_single','innerHTML',api_utf8_encode($return)); |
|
| 112 | + } else { |
|
| 113 | + $return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">'; |
|
| 114 | + while($course = Database :: fetch_array($rs)) { |
|
| 115 | + $course_list[] = $course['code']; |
|
| 116 | + $course_title=str_replace("'","\'",$course_title); |
|
| 117 | + $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')',ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>'; |
|
| 118 | + } |
|
| 119 | + $return .= '</select>'; |
|
| 120 | 120 | |
| 121 | - $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return)); |
|
| 122 | - } |
|
| 123 | - } |
|
| 124 | - $_SESSION['course_list'] = $course_list; |
|
| 121 | + $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return)); |
|
| 122 | + } |
|
| 123 | + } |
|
| 124 | + $_SESSION['course_list'] = $course_list; |
|
| 125 | 125 | |
| 126 | - return $xajax_response; |
|
| 127 | - } |
|
| 126 | + return $xajax_response; |
|
| 127 | + } |
|
| 128 | 128 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | $course_title = null; |
| 22 | 22 | $xajax_response = new xajaxResponse(); |
| 23 | 23 | $return = ''; |
| 24 | - if(!empty($needle) && !empty($type)) { |
|
| 24 | + if (!empty($needle) && !empty($type)) { |
|
| 25 | 25 | // xajax send utf8 datas... datas in db can be non-utf8 datas |
| 26 | 26 | $charset = api_get_system_encoding(); |
| 27 | 27 | $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
@@ -38,13 +38,13 @@ discard block |
||
| 38 | 38 | while ($row = Database::fetch_row($res)) { |
| 39 | 39 | $course_codes .= '\''.$row[0].'\','; |
| 40 | 40 | } |
| 41 | - $course_codes = substr($course_codes,0,(strlen($course_codes)-1)); |
|
| 41 | + $course_codes = substr($course_codes, 0, (strlen($course_codes) - 1)); |
|
| 42 | 42 | |
| 43 | 43 | $cond_course_code = ' AND course.id NOT IN('.$course_codes.') '; |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - if ($type=='single') { |
|
| 47 | + if ($type == 'single') { |
|
| 48 | 48 | // search users where username or firstname or lastname begins likes $needle |
| 49 | 49 | $sql = 'SELECT |
| 50 | 50 | course.code, |
@@ -69,9 +69,9 @@ discard block |
||
| 69 | 69 | if (api_is_multiple_url_enabled()) { |
| 70 | 70 | $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
| 71 | 71 | $access_url_id = api_get_current_access_url_id(); |
| 72 | - if ($access_url_id != -1){ |
|
| 72 | + if ($access_url_id != -1) { |
|
| 73 | 73 | |
| 74 | - if ($type=='single') { |
|
| 74 | + if ($type == 'single') { |
|
| 75 | 75 | $sql = 'SELECT |
| 76 | 76 | course.code, |
| 77 | 77 | course.visual_code, |
@@ -101,24 +101,24 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | $rs = Database::query($sql); |
| 103 | 103 | $course_list = array(); |
| 104 | - if ($type=='single') { |
|
| 104 | + if ($type == 'single') { |
|
| 105 | 105 | |
| 106 | - while($course = Database :: fetch_array($rs)) { |
|
| 106 | + while ($course = Database :: fetch_array($rs)) { |
|
| 107 | 107 | $course_list[] = $course['code']; |
| 108 | - $course_title=str_replace("'","\'",$course_title); |
|
| 108 | + $course_title = str_replace("'", "\'", $course_title); |
|
| 109 | 109 | $return .= '<a href="javascript: void(0);" onclick="javascript: add_course_to_session(\''.$course['code'].'\',\''.$course_title.' ('.$course['visual_code'].')'.'\')">'.$course['title'].' ('.$course['visual_code'].')</a><br />'; |
| 110 | 110 | } |
| 111 | - $xajax_response -> addAssign('ajax_list_courses_single','innerHTML',api_utf8_encode($return)); |
|
| 111 | + $xajax_response -> addAssign('ajax_list_courses_single', 'innerHTML', api_utf8_encode($return)); |
|
| 112 | 112 | } else { |
| 113 | 113 | $return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">'; |
| 114 | - while($course = Database :: fetch_array($rs)) { |
|
| 114 | + while ($course = Database :: fetch_array($rs)) { |
|
| 115 | 115 | $course_list[] = $course['code']; |
| 116 | - $course_title=str_replace("'","\'",$course_title); |
|
| 117 | - $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')',ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>'; |
|
| 116 | + $course_title = str_replace("'", "\'", $course_title); |
|
| 117 | + $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')', ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>'; |
|
| 118 | 118 | } |
| 119 | 119 | $return .= '</select>'; |
| 120 | 120 | |
| 121 | - $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return)); |
|
| 121 | + $xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return)); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | $_SESSION['course_list'] = $course_list; |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | * Search for a session based on a given search string |
| 18 | 18 | * @param string A search string |
| 19 | 19 | * @param string A search box type (single or anything else) |
| 20 | - * @return string XajaxResponse |
|
| 20 | + * @return xajaxResponse XajaxResponse |
|
| 21 | 21 | * @assert () !== '' |
| 22 | 22 | * @assert ('abc','single') !== '' |
| 23 | 23 | */ |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /* For licensing terms, see /license.txt */ |
| 3 | 3 | /** |
| 4 | - * Definition of the AddManySessionToCategoryFunctions class |
|
| 5 | - * @package chamilo.library |
|
| 6 | - */ |
|
| 4 | + * Definition of the AddManySessionToCategoryFunctions class |
|
| 5 | + * @package chamilo.library |
|
| 6 | + */ |
|
| 7 | 7 | /** |
| 8 | - * Requires |
|
| 9 | - */ |
|
| 8 | + * Requires |
|
| 9 | + */ |
|
| 10 | 10 | require_once ('xajax/xajax.inc.php'); |
| 11 | 11 | /** |
| 12 | - * AddManySessionToCategoryFunctions class |
|
| 13 | - */ |
|
| 12 | + * AddManySessionToCategoryFunctions class |
|
| 13 | + */ |
|
| 14 | 14 | class AddManySessionToCategoryFunctions |
| 15 | 15 | { |
| 16 | 16 | /** |
@@ -24,28 +24,28 @@ discard block |
||
| 24 | 24 | function search_courses($needle,$type) |
| 25 | 25 | { |
| 26 | 26 | $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); |
| 27 | - $xajax_response = new xajaxResponse(); |
|
| 28 | - $return = ''; |
|
| 29 | - if(!empty($needle) && !empty($type)) { |
|
| 30 | - // xajax send utf8 datas... datas in db can be non-utf8 datas |
|
| 31 | - $charset = api_get_system_encoding(); |
|
| 32 | - $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
|
| 33 | - $needle = Database::escape_string($needle); |
|
| 27 | + $xajax_response = new xajaxResponse(); |
|
| 28 | + $return = ''; |
|
| 29 | + if(!empty($needle) && !empty($type)) { |
|
| 30 | + // xajax send utf8 datas... datas in db can be non-utf8 datas |
|
| 31 | + $charset = api_get_system_encoding(); |
|
| 32 | + $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
|
| 33 | + $needle = Database::escape_string($needle); |
|
| 34 | 34 | |
| 35 | - $sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id'; |
|
| 35 | + $sql = 'SELECT * FROM '.$tbl_session.' WHERE name LIKE "'.$needle.'%" ORDER BY id'; |
|
| 36 | 36 | |
| 37 | - $rs = Database::query($sql); |
|
| 38 | - $course_list = array(); |
|
| 37 | + $rs = Database::query($sql); |
|
| 38 | + $course_list = array(); |
|
| 39 | 39 | |
| 40 | - $return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">'; |
|
| 41 | - while($course = Database :: fetch_array($rs)) { |
|
| 42 | - $course_list[] = $course['id']; |
|
| 43 | - $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>'; |
|
| 44 | - } |
|
| 45 | - $return .= '</select>'; |
|
| 46 | - $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return)); |
|
| 47 | - } |
|
| 48 | - $_SESSION['course_list'] = $course_list; |
|
| 49 | - return $xajax_response; |
|
| 50 | - } |
|
| 40 | + $return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">'; |
|
| 41 | + while($course = Database :: fetch_array($rs)) { |
|
| 42 | + $course_list[] = $course['id']; |
|
| 43 | + $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>'; |
|
| 44 | + } |
|
| 45 | + $return .= '</select>'; |
|
| 46 | + $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return)); |
|
| 47 | + } |
|
| 48 | + $_SESSION['course_list'] = $course_list; |
|
| 49 | + return $xajax_response; |
|
| 50 | + } |
|
| 51 | 51 | } |
@@ -21,12 +21,12 @@ discard block |
||
| 21 | 21 | * @assert () !== '' |
| 22 | 22 | * @assert ('abc','single') !== '' |
| 23 | 23 | */ |
| 24 | - function search_courses($needle,$type) |
|
| 24 | + function search_courses($needle, $type) |
|
| 25 | 25 | { |
| 26 | 26 | $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); |
| 27 | 27 | $xajax_response = new xajaxResponse(); |
| 28 | 28 | $return = ''; |
| 29 | - if(!empty($needle) && !empty($type)) { |
|
| 29 | + if (!empty($needle) && !empty($type)) { |
|
| 30 | 30 | // xajax send utf8 datas... datas in db can be non-utf8 datas |
| 31 | 31 | $charset = api_get_system_encoding(); |
| 32 | 32 | $needle = api_convert_encoding($needle, $charset, 'utf-8'); |
@@ -38,12 +38,12 @@ discard block |
||
| 38 | 38 | $course_list = array(); |
| 39 | 39 | |
| 40 | 40 | $return .= '<select id="origin" name="NoSessionCategoryList[]" multiple="multiple" size="20" style="width:340px;">'; |
| 41 | - while($course = Database :: fetch_array($rs)) { |
|
| 41 | + while ($course = Database :: fetch_array($rs)) { |
|
| 42 | 42 | $course_list[] = $course['id']; |
| 43 | - $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'],ENT_QUOTES).'">'.$course['name'].'</option>'; |
|
| 43 | + $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['name'], ENT_QUOTES).'">'.$course['name'].'</option>'; |
|
| 44 | 44 | } |
| 45 | 45 | $return .= '</select>'; |
| 46 | - $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return)); |
|
| 46 | + $xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return)); |
|
| 47 | 47 | } |
| 48 | 48 | $_SESSION['course_list'] = $course_list; |
| 49 | 49 | return $xajax_response; |
@@ -554,13 +554,12 @@ discard block |
||
| 554 | 554 | * @param string $title |
| 555 | 555 | * @param string $content |
| 556 | 556 | * @param array $usersToSend |
| 557 | - * @param int $editRepeatType |
|
| 558 | 557 | * @param array $attachmentArray |
| 559 | 558 | * @param string $attachmentComment |
| 560 | 559 | * @param string $comment |
| 561 | 560 | * @param string $color |
| 562 | 561 | * |
| 563 | - * @return bool |
|
| 562 | + * @return null|false |
|
| 564 | 563 | */ |
| 565 | 564 | public function editEvent( |
| 566 | 565 | $id, |
@@ -1292,6 +1291,7 @@ discard block |
||
| 1292 | 1291 | * |
| 1293 | 1292 | * @param int $eventId |
| 1294 | 1293 | * @param int $courseId |
| 1294 | + * @param integer $sessionId |
|
| 1295 | 1295 | * @paraù int $sessionId |
| 1296 | 1296 | * |
| 1297 | 1297 | * @return array |
@@ -2284,6 +2284,7 @@ discard block |
||
| 2284 | 2284 | * @param array $fileUserUpload ($_FILES['user_upload']) |
| 2285 | 2285 | * @param string comment about file |
| 2286 | 2286 | * @param array $courseInfo |
| 2287 | + * @param string $comment |
|
| 2287 | 2288 | * @return string |
| 2288 | 2289 | */ |
| 2289 | 2290 | public function addAttachment($eventId, $fileUserUpload, $comment, $courseInfo) |
@@ -2403,6 +2404,7 @@ discard block |
||
| 2403 | 2404 | * Adds x weeks to a UNIX timestamp |
| 2404 | 2405 | * @param int The timestamp |
| 2405 | 2406 | * @param int The number of weeks to add |
| 2407 | + * @param integer $timestamp |
|
| 2406 | 2408 | * @return int The new timestamp |
| 2407 | 2409 | */ |
| 2408 | 2410 | function addWeek($timestamp, $num = 1) |
@@ -2414,6 +2416,7 @@ discard block |
||
| 2414 | 2416 | * Adds x months to a UNIX timestamp |
| 2415 | 2417 | * @param int The timestamp |
| 2416 | 2418 | * @param int The number of years to add |
| 2419 | + * @param integer $timestamp |
|
| 2417 | 2420 | * @return int The new timestamp |
| 2418 | 2421 | */ |
| 2419 | 2422 | function addMonth($timestamp, $num = 1) |
@@ -2432,6 +2435,7 @@ discard block |
||
| 2432 | 2435 | * Adds x years to a UNIX timestamp |
| 2433 | 2436 | * @param int The timestamp |
| 2434 | 2437 | * @param int The number of years to add |
| 2438 | + * @param integer $timestamp |
|
| 2435 | 2439 | * @return int The new timestamp |
| 2436 | 2440 | */ |
| 2437 | 2441 | function addYear($timestamp, $num = 1) |
@@ -2631,7 +2635,7 @@ discard block |
||
| 2631 | 2635 | /** |
| 2632 | 2636 | * @param array $courseInfo |
| 2633 | 2637 | * @param $file |
| 2634 | - * @return array|bool|string |
|
| 2638 | + * @return false|string |
|
| 2635 | 2639 | */ |
| 2636 | 2640 | public function importEventFile($courseInfo, $file) |
| 2637 | 2641 | { |
@@ -2744,7 +2748,7 @@ discard block |
||
| 2744 | 2748 | |
| 2745 | 2749 | /** |
| 2746 | 2750 | * Parse filter turns USER:12 to ['users' => [12])] or G:1 ['groups' => [1]] |
| 2747 | - * @param $filter |
|
| 2751 | + * @param integer $filter |
|
| 2748 | 2752 | * @return array |
| 2749 | 2753 | */ |
| 2750 | 2754 | public function parseAgendaFilter($filter) |
@@ -3259,6 +3263,7 @@ discard block |
||
| 3259 | 3263 | * @param int user ID of the user |
| 3260 | 3264 | * @param string Optional start date in datetime format (if no start date is given, uses today) |
| 3261 | 3265 | * @param string Optional end date in datetime format (if no date is given, uses one year from now) |
| 3266 | + * @param integer $user_id |
|
| 3262 | 3267 | * @return array Array of events ordered by start date, in |
| 3263 | 3268 | * [0]('datestart','dateend','title'),[1]('datestart','dateend','title','link','coursetitle') format, |
| 3264 | 3269 | * where datestart and dateend are in yyyyMMddhhmmss format. |
@@ -1483,12 +1483,12 @@ discard block |
||
| 1483 | 1483 | } |
| 1484 | 1484 | |
| 1485 | 1485 | if (empty($session_id)) { |
| 1486 | - $sessionCondition = " |
|
| 1486 | + $sessionCondition = " |
|
| 1487 | 1487 | ( |
| 1488 | 1488 | agenda.session_id = 0 AND (ip.session_id IS NULL OR ip.session_id = 0) |
| 1489 | 1489 | ) "; |
| 1490 | 1490 | } else { |
| 1491 | - $sessionCondition = " |
|
| 1491 | + $sessionCondition = " |
|
| 1492 | 1492 | ( |
| 1493 | 1493 | agenda.session_id = $session_id AND |
| 1494 | 1494 | ip.session_id = $session_id |
@@ -1527,13 +1527,13 @@ discard block |
||
| 1527 | 1527 | } |
| 1528 | 1528 | |
| 1529 | 1529 | if (empty($session_id)) { |
| 1530 | - $sessionCondition = " |
|
| 1530 | + $sessionCondition = " |
|
| 1531 | 1531 | ( |
| 1532 | 1532 | agenda.session_id = 0 AND |
| 1533 | 1533 | (ip.session_id IS NULL OR ip.session_id = 0) |
| 1534 | 1534 | ) "; |
| 1535 | 1535 | } else { |
| 1536 | - $sessionCondition = " |
|
| 1536 | + $sessionCondition = " |
|
| 1537 | 1537 | ( |
| 1538 | 1538 | agenda.session_id = $session_id AND |
| 1539 | 1539 | ip.session_id = $session_id |
@@ -1585,7 +1585,7 @@ discard block |
||
| 1585 | 1585 | while ($row = Database::fetch_array($result, 'ASSOC')) { |
| 1586 | 1586 | $event = array(); |
| 1587 | 1587 | $event['id'] = 'course_'.$row['id']; |
| 1588 | - $event['unique_id'] = $row['iid']; |
|
| 1588 | + $event['unique_id'] = $row['iid']; |
|
| 1589 | 1589 | // To avoid doubles |
| 1590 | 1590 | if (in_array($event['unique_id'], $eventsAdded)) { |
| 1591 | 1591 | continue; |
@@ -2663,8 +2663,8 @@ discard block |
||
| 2663 | 2663 | |
| 2664 | 2664 | $startDateTime = api_get_local_time($start->format('Y-m-d H:i:s'), $currentTimeZone, $start->format('e')); |
| 2665 | 2665 | $endDateTime = api_get_local_time($end->format('Y-m-d H:i'), $currentTimeZone, $end->format('e')); |
| 2666 | - $title = api_convert_encoding((string)$event->summary, $charset, 'UTF-8'); |
|
| 2667 | - $description = api_convert_encoding((string)$event->description, $charset, 'UTF-8'); |
|
| 2666 | + $title = api_convert_encoding((string) $event->summary, $charset, 'UTF-8'); |
|
| 2667 | + $description = api_convert_encoding((string) $event->description, $charset, 'UTF-8'); |
|
| 2668 | 2668 | |
| 2669 | 2669 | $id = $this->addEvent( |
| 2670 | 2670 | $startDateTime, |
@@ -2806,7 +2806,7 @@ discard block |
||
| 2806 | 2806 | ORDER BY start_date "; |
| 2807 | 2807 | } else { |
| 2808 | 2808 | // if the user is not an administrator of that course |
| 2809 | - if (is_array($group_memberships) && count($group_memberships)>0) { |
|
| 2809 | + if (is_array($group_memberships) && count($group_memberships) > 0) { |
|
| 2810 | 2810 | $sqlquery = "SELECT agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref |
| 2811 | 2811 | FROM ".$TABLEAGENDA." agenda, |
| 2812 | 2812 | ".$TABLE_ITEMPROPERTY." ip |
@@ -2836,14 +2836,14 @@ discard block |
||
| 2836 | 2836 | $agendaday = -1; |
| 2837 | 2837 | if ($item['start_date'] != '0000-00-00 00:00:00') { |
| 2838 | 2838 | $item['start_date'] = api_get_local_time($item['start_date']); |
| 2839 | - $item['start_date_tms'] = api_strtotime($item['start_date']); |
|
| 2839 | + $item['start_date_tms'] = api_strtotime($item['start_date']); |
|
| 2840 | 2840 | $agendaday = date("j", $item['start_date_tms']); |
| 2841 | 2841 | } |
| 2842 | 2842 | if ($item['end_date'] != '0000-00-00 00:00:00') { |
| 2843 | 2843 | $item['end_date'] = api_get_local_time($item['end_date']); |
| 2844 | 2844 | } |
| 2845 | 2845 | |
| 2846 | - $url = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday"; |
|
| 2846 | + $url = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday"; |
|
| 2847 | 2847 | |
| 2848 | 2848 | $item['url'] = $url; |
| 2849 | 2849 | $item['course_name'] = $array_course_info['title']; |
@@ -2855,9 +2855,9 @@ discard block |
||
| 2855 | 2855 | } |
| 2856 | 2856 | |
| 2857 | 2857 | // sorting by hour for every day |
| 2858 | - $agendaitems = array (); |
|
| 2858 | + $agendaitems = array(); |
|
| 2859 | 2859 | while (list ($agendaday, $tmpitems) = each($items)) { |
| 2860 | - if(!isset($agendaitems[$agendaday])) { |
|
| 2860 | + if (!isset($agendaitems[$agendaday])) { |
|
| 2861 | 2861 | $agendaitems[$agendaday] = ''; |
| 2862 | 2862 | } |
| 2863 | 2863 | sort($tmpitems); |
@@ -3031,9 +3031,9 @@ discard block |
||
| 3031 | 3031 | $end_year = $start_end_day_of_week['end']['year']; |
| 3032 | 3032 | // in sql statements you have to use year-month-day for date calculations |
| 3033 | 3033 | $start_filter = $start_year."-".$start_month."-".$start_day." 00:00:00"; |
| 3034 | - $start_filter = api_get_utc_datetime($start_filter); |
|
| 3034 | + $start_filter = api_get_utc_datetime($start_filter); |
|
| 3035 | 3035 | $end_filter = $end_year."-".$end_month."-".$end_day." 23:59:59"; |
| 3036 | - $end_filter = api_get_utc_datetime($end_filter); |
|
| 3036 | + $end_filter = api_get_utc_datetime($end_filter); |
|
| 3037 | 3037 | $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$user_id."' AND date>='".$start_filter."' AND date<='".$end_filter."'"; |
| 3038 | 3038 | } |
| 3039 | 3039 | // 3. creating the SQL statement for getting the personal agenda items in DAY view |
@@ -3041,18 +3041,18 @@ discard block |
||
| 3041 | 3041 | // we are in day view |
| 3042 | 3042 | // we could use mysql date() function but this is only available from 4.1 and higher |
| 3043 | 3043 | $start_filter = $year."-".$month."-".$day." 00:00:00"; |
| 3044 | - $start_filter = api_get_utc_datetime($start_filter); |
|
| 3044 | + $start_filter = api_get_utc_datetime($start_filter); |
|
| 3045 | 3045 | $end_filter = $year."-".$month."-".$day." 23:59:59"; |
| 3046 | - $end_filter = api_get_utc_datetime($end_filter); |
|
| 3046 | + $end_filter = api_get_utc_datetime($end_filter); |
|
| 3047 | 3047 | $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$user_id."' AND date>='".$start_filter."' AND date<='".$end_filter."'"; |
| 3048 | 3048 | } |
| 3049 | 3049 | |
| 3050 | 3050 | $result = Database::query($sql); |
| 3051 | 3051 | while ($item = Database::fetch_array($result, 'ASSOC')) { |
| 3052 | 3052 | |
| 3053 | - $time_minute = api_convert_and_format_date($item['date'], TIME_NO_SEC_FORMAT); |
|
| 3054 | - $item['date'] = api_get_local_time($item['date']); |
|
| 3055 | - $item['start_date_tms'] = api_strtotime($item['date']); |
|
| 3053 | + $time_minute = api_convert_and_format_date($item['date'], TIME_NO_SEC_FORMAT); |
|
| 3054 | + $item['date'] = api_get_local_time($item['date']); |
|
| 3055 | + $item['start_date_tms'] = api_strtotime($item['date']); |
|
| 3056 | 3056 | $item['content'] = $item['text']; |
| 3057 | 3057 | |
| 3058 | 3058 | // we break the date field in the database into a date and a time part |
@@ -3072,7 +3072,7 @@ discard block |
||
| 3072 | 3072 | $second = $agendatime[2]; |
| 3073 | 3073 | |
| 3074 | 3074 | if ($type == 'month_view') { |
| 3075 | - $item['calendar_type'] = 'personal'; |
|
| 3075 | + $item['calendar_type'] = 'personal'; |
|
| 3076 | 3076 | $item['start_date'] = $item['date']; |
| 3077 | 3077 | $agendaitems[$day][] = $item; |
| 3078 | 3078 | continue; |
@@ -3097,7 +3097,7 @@ discard block |
||
| 3097 | 3097 | // this is the array construction for the DAY view |
| 3098 | 3098 | $halfhour = 2 * $agendatime['0']; |
| 3099 | 3099 | if ($agendatime['1'] >= '30') { |
| 3100 | - $halfhour = $halfhour +1; |
|
| 3100 | + $halfhour = $halfhour + 1; |
|
| 3101 | 3101 | } |
| 3102 | 3102 | |
| 3103 | 3103 | //Display events by list |
@@ -3121,25 +3121,25 @@ discard block |
||
| 3121 | 3121 | { |
| 3122 | 3122 | global $DaysShort, $course_path; |
| 3123 | 3123 | //Handle leap year |
| 3124 | - $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); |
|
| 3124 | + $numberofdays = array(0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); |
|
| 3125 | 3125 | if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) |
| 3126 | 3126 | $numberofdays[2] = 29; |
| 3127 | 3127 | //Get the first day of the month |
| 3128 | 3128 | $dayone = getdate(mktime(0, 0, 0, $month, 1, $year)); |
| 3129 | 3129 | //Start the week on monday |
| 3130 | 3130 | $startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6; |
| 3131 | - $g_cc = (isset($_GET['courseCode'])?$_GET['courseCode']:''); |
|
| 3131 | + $g_cc = (isset($_GET['courseCode']) ? $_GET['courseCode'] : ''); |
|
| 3132 | 3132 | |
| 3133 | - $prev_icon = Display::return_icon('action_prev.png',get_lang('Previous')); |
|
| 3134 | - $next_icon = Display::return_icon('action_next.png',get_lang('Next')); |
|
| 3133 | + $prev_icon = Display::return_icon('action_prev.png', get_lang('Previous')); |
|
| 3134 | + $next_icon = Display::return_icon('action_next.png', get_lang('Next')); |
|
| 3135 | 3135 | |
| 3136 | - $next_month = ($month == 1 ? 12 : $month -1); |
|
| 3137 | - $prev_month = ($month == 12 ? 1 : $month +1); |
|
| 3136 | + $next_month = ($month == 1 ? 12 : $month - 1); |
|
| 3137 | + $prev_month = ($month == 12 ? 1 : $month + 1); |
|
| 3138 | 3138 | |
| 3139 | - $next_year = ($month == 1 ? $year -1 : $year); |
|
| 3140 | - $prev_year = ($month == 12 ? $year +1 : $year); |
|
| 3139 | + $next_year = ($month == 1 ? $year - 1 : $year); |
|
| 3140 | + $prev_year = ($month == 12 ? $year + 1 : $year); |
|
| 3141 | 3141 | |
| 3142 | - if ($show_content) { |
|
| 3142 | + if ($show_content) { |
|
| 3143 | 3143 | $back_url = Display::url($prev_icon, api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($g_cc)."&action=view&view=month&month=".$next_month."&year=".$next_year); |
| 3144 | 3144 | $next_url = Display::url($next_icon, api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($g_cc)."&action=view&view=month&month=".$prev_month."&year=".$prev_year); |
| 3145 | 3145 | } else { |
@@ -3155,7 +3155,7 @@ discard block |
||
| 3155 | 3155 | echo '</tr>'; |
| 3156 | 3156 | |
| 3157 | 3157 | echo '<tr>'; |
| 3158 | - for ($ii = 1; $ii < 8; $ii ++) { |
|
| 3158 | + for ($ii = 1; $ii < 8; $ii++) { |
|
| 3159 | 3159 | echo '<td class="weekdays">'.$DaysShort[$ii % 7].'</td>'; |
| 3160 | 3160 | } |
| 3161 | 3161 | echo '</tr>'; |
@@ -3164,7 +3164,7 @@ discard block |
||
| 3164 | 3164 | $today = getdate(); |
| 3165 | 3165 | while ($curday <= $numberofdays[$month]) { |
| 3166 | 3166 | echo "<tr>"; |
| 3167 | - for ($ii = 0; $ii < 7; $ii ++) { |
|
| 3167 | + for ($ii = 0; $ii < 7; $ii++) { |
|
| 3168 | 3168 | if (($curday == -1) && ($ii == $startdayofweek)) { |
| 3169 | 3169 | $curday = 1; |
| 3170 | 3170 | } |
@@ -3178,21 +3178,21 @@ discard block |
||
| 3178 | 3178 | echo "<td ".$class.">".$dayheader; |
| 3179 | 3179 | |
| 3180 | 3180 | if (!empty($agendaitems[$curday])) { |
| 3181 | - $items = $agendaitems[$curday]; |
|
| 3182 | - $items = msort($items, 'start_date_tms'); |
|
| 3181 | + $items = $agendaitems[$curday]; |
|
| 3182 | + $items = msort($items, 'start_date_tms'); |
|
| 3183 | 3183 | |
| 3184 | - foreach($items as $value) { |
|
| 3184 | + foreach ($items as $value) { |
|
| 3185 | 3185 | $value['title'] = Security::remove_XSS($value['title']); |
| 3186 | 3186 | $start_time = api_format_date($value['start_date'], TIME_NO_SEC_FORMAT); |
| 3187 | 3187 | $end_time = ''; |
| 3188 | 3188 | |
| 3189 | 3189 | if (!empty($value['end_date']) && $value['end_date'] != '0000-00-00 00:00:00') { |
| 3190 | - $end_time = '- <i>'.api_format_date($value['end_date'], DATE_TIME_FORMAT_LONG).'</i>'; |
|
| 3190 | + $end_time = '- <i>'.api_format_date($value['end_date'], DATE_TIME_FORMAT_LONG).'</i>'; |
|
| 3191 | 3191 | } |
| 3192 | 3192 | $complete_time = '<i>'.api_format_date($value['start_date'], DATE_TIME_FORMAT_LONG).'</i> '.$end_time; |
| 3193 | 3193 | $time = '<i>'.$start_time.'</i>'; |
| 3194 | 3194 | |
| 3195 | - switch($value['calendar_type']) { |
|
| 3195 | + switch ($value['calendar_type']) { |
|
| 3196 | 3196 | case 'personal': |
| 3197 | 3197 | $bg_color = '#D0E7F4'; |
| 3198 | 3198 | $icon = Display::return_icon('user.png', get_lang('MyAgenda'), array(), ICON_SIZE_SMALL); |
@@ -3244,7 +3244,7 @@ discard block |
||
| 3244 | 3244 | } |
| 3245 | 3245 | } |
| 3246 | 3246 | echo "</td>"; |
| 3247 | - $curday ++; |
|
| 3247 | + $curday++; |
|
| 3248 | 3248 | } else { |
| 3249 | 3249 | echo "<td></td>"; |
| 3250 | 3250 | } |
@@ -3264,18 +3264,18 @@ discard block |
||
| 3264 | 3264 | * where datestart and dateend are in yyyyMMddhhmmss format. |
| 3265 | 3265 | * @TODO Implement really personal events (from user DB) and global events (from main DB) |
| 3266 | 3266 | */ |
| 3267 | - public static function get_personal_agenda_items_between_dates($user_id, $date_start='', $date_end='') |
|
| 3267 | + public static function get_personal_agenda_items_between_dates($user_id, $date_start = '', $date_end = '') |
|
| 3268 | 3268 | { |
| 3269 | - $items = array (); |
|
| 3269 | + $items = array(); |
|
| 3270 | 3270 | if ($user_id != strval(intval($user_id))) { return $items; } |
| 3271 | - if (empty($date_start)) { $date_start = date('Y-m-d H:i:s');} |
|
| 3272 | - if (empty($date_end)) { $date_end = date('Y-m-d H:i:s',mktime(0, 0, 0, date("m"), date("d"), date("Y")+1));} |
|
| 3271 | + if (empty($date_start)) { $date_start = date('Y-m-d H:i:s'); } |
|
| 3272 | + if (empty($date_end)) { $date_end = date('Y-m-d H:i:s', mktime(0, 0, 0, date("m"), date("d"), date("Y") + 1)); } |
|
| 3273 | 3273 | $expr = '/\d{4}-\d{2}-\d{2}\ \d{2}:\d{2}:\d{2}/'; |
| 3274 | - if(!preg_match($expr,$date_start)) { return $items; } |
|
| 3275 | - if(!preg_match($expr,$date_end)) { return $items; } |
|
| 3274 | + if (!preg_match($expr, $date_start)) { return $items; } |
|
| 3275 | + if (!preg_match($expr, $date_end)) { return $items; } |
|
| 3276 | 3276 | |
| 3277 | 3277 | // get agenda-items for every course |
| 3278 | - $courses = api_get_user_courses($user_id,false); |
|
| 3278 | + $courses = api_get_user_courses($user_id, false); |
|
| 3279 | 3279 | foreach ($courses as $id => $course) { |
| 3280 | 3280 | $c = api_get_course_info_by_id($course['real_id']); |
| 3281 | 3281 | //databases of the courses |
@@ -3299,9 +3299,9 @@ discard block |
||
| 3299 | 3299 | " ORDER BY start_date "; |
| 3300 | 3300 | } else { |
| 3301 | 3301 | // if the user is not an administrator of that course, then... |
| 3302 | - if (is_array($group_memberships) && count($group_memberships)>0) |
|
| 3302 | + if (is_array($group_memberships) && count($group_memberships) > 0) |
|
| 3303 | 3303 | { |
| 3304 | - $sqlquery = "SELECT " . |
|
| 3304 | + $sqlquery = "SELECT ". |
|
| 3305 | 3305 | "DISTINCT agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref ". |
| 3306 | 3306 | " FROM ".$t_a." agenda, ". |
| 3307 | 3307 | $t_ip." ip ". |
@@ -3329,13 +3329,13 @@ discard block |
||
| 3329 | 3329 | |
| 3330 | 3330 | $result = Database::query($sqlquery); |
| 3331 | 3331 | while ($item = Database::fetch_array($result)) { |
| 3332 | - $agendaday = date("j",strtotime($item['start_date'])); |
|
| 3333 | - $month = date("n",strtotime($item['start_date'])); |
|
| 3334 | - $year = date("Y",strtotime($item['start_date'])); |
|
| 3332 | + $agendaday = date("j", strtotime($item['start_date'])); |
|
| 3333 | + $month = date("n", strtotime($item['start_date'])); |
|
| 3334 | + $year = date("Y", strtotime($item['start_date'])); |
|
| 3335 | 3335 | $URL = api_get_path(WEB_PATH)."main/calendar/agenda.php?cidReq=".urlencode($course["code"])."&day=$agendaday&month=$month&year=$year#$agendaday"; |
| 3336 | - list($year,$month,$day,$hour,$min,$sec) = split('[-: ]',$item['start_date']); |
|
| 3336 | + list($year, $month, $day, $hour, $min, $sec) = split('[-: ]', $item['start_date']); |
|
| 3337 | 3337 | $start_date = $year.$month.$day.$hour.$min; |
| 3338 | - list($year,$month,$day,$hour,$min,$sec) = split('[-: ]',$item['end_date']); |
|
| 3338 | + list($year, $month, $day, $hour, $min, $sec) = split('[-: ]', $item['end_date']); |
|
| 3339 | 3339 | $end_date = $year.$month.$day.$hour.$min; |
| 3340 | 3340 | |
| 3341 | 3341 | $items[] = array( |
@@ -3364,7 +3364,7 @@ discard block |
||
| 3364 | 3364 | $user = api_get_user_id(); |
| 3365 | 3365 | $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE id=".$id." AND user = ".$user; |
| 3366 | 3366 | $result = Database::query($sql); |
| 3367 | - if(Database::num_rows($result)==1) { |
|
| 3367 | + if (Database::num_rows($result) == 1) { |
|
| 3368 | 3368 | $item = Database::fetch_array($result); |
| 3369 | 3369 | } else { |
| 3370 | 3370 | $item = null; |
@@ -3386,9 +3386,9 @@ discard block |
||
| 3386 | 3386 | // step 2: we which day this is (0=sunday, 1=monday, ...) |
| 3387 | 3387 | $number_day_in_week = date('w', $random_day_in_week); |
| 3388 | 3388 | // step 3: we calculate the timestamp of the monday of the week we are in |
| 3389 | - $start_timestamp = $random_day_in_week - (($number_day_in_week -1) * 24 * 60 * 60); |
|
| 3389 | + $start_timestamp = $random_day_in_week - (($number_day_in_week - 1) * 24 * 60 * 60); |
|
| 3390 | 3390 | // step 4: we calculate the timestamp of the sunday of the week we are in |
| 3391 | - $end_timestamp = $random_day_in_week + ((7 - $number_day_in_week +1) * 24 * 60 * 60) - 3600; |
|
| 3391 | + $end_timestamp = $random_day_in_week + ((7 - $number_day_in_week + 1) * 24 * 60 * 60) - 3600; |
|
| 3392 | 3392 | // step 5: calculating the start_day, end_day, start_month, end_month, start_year, end_year |
| 3393 | 3393 | $start_day = date('j', $start_timestamp); |
| 3394 | 3394 | $start_month = date('n', $start_timestamp); |
@@ -3122,8 +3122,9 @@ |
||
| 3122 | 3122 | global $DaysShort, $course_path; |
| 3123 | 3123 | //Handle leap year |
| 3124 | 3124 | $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31); |
| 3125 | - if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) |
|
| 3126 | - $numberofdays[2] = 29; |
|
| 3125 | + if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0)) { |
|
| 3126 | + $numberofdays[2] = 29; |
|
| 3127 | + } |
|
| 3127 | 3128 | //Get the first day of the month |
| 3128 | 3129 | $dayone = getdate(mktime(0, 0, 0, $month, 1, $year)); |
| 3129 | 3130 | //Start the week on monday |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | /** |
| 17 | 17 | * |
| 18 | 18 | * @param int|array $course |
| 19 | - * @param int|array $annoucement |
|
| 19 | + * @param integer $announcement |
|
| 20 | 20 | * |
| 21 | 21 | * @return AnnouncementEmail |
| 22 | 22 | */ |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * |
| 51 | 51 | * @param string $key |
| 52 | 52 | * |
| 53 | - * @return array |
|
| 53 | + * @return string|null |
|
| 54 | 54 | */ |
| 55 | 55 | public function course($key = '') |
| 56 | 56 | { |
@@ -196,7 +196,7 @@ |
||
| 196 | 196 | * |
| 197 | 197 | * @return array |
| 198 | 198 | */ |
| 199 | - public function sender($key = '', $userId = '') |
|
| 199 | + public function sender($key = '', $userId = '') |
|
| 200 | 200 | { |
| 201 | 201 | $_user = api_get_user_info($userId); |
| 202 | 202 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * @return array |
|
| 21 | + * @return string[] |
|
| 22 | 22 | */ |
| 23 | 23 | public static function get_tags() |
| 24 | 24 | { |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param string $course_code |
| 41 | 41 | * @param int $session_id |
| 42 | 42 | * |
| 43 | - * @return mixed |
|
| 43 | + * @return string |
|
| 44 | 44 | */ |
| 45 | 45 | public static function parse_content($userId, $content, $course_code, $session_id = 0) |
| 46 | 46 | { |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | * @param array uploaded file $_FILES |
| 350 | 350 | * @param string Comment describing the attachment |
| 351 | 351 | * @param bool $sendToUsersInSession |
| 352 | - * @return int false on failure, ID of the announcement on success |
|
| 352 | + * @return false|string false on failure, ID of the announcement on success |
|
| 353 | 353 | */ |
| 354 | 354 | public static function add_announcement( |
| 355 | 355 | $emailTitle, |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | * @param $to_users |
| 461 | 461 | * @param array $file |
| 462 | 462 | * @param string $file_comment |
| 463 | - * @return bool|int |
|
| 463 | + * @return false|string |
|
| 464 | 464 | */ |
| 465 | 465 | public static function add_group_announcement( |
| 466 | 466 | $emailTitle, |
@@ -699,7 +699,7 @@ discard block |
||
| 699 | 699 | |
| 700 | 700 | /** |
| 701 | 701 | * @param int $insert_id |
| 702 | - * @return bool |
|
| 702 | + * @return false|null |
|
| 703 | 703 | */ |
| 704 | 704 | public static function update_mail_sent($insert_id) |
| 705 | 705 | { |
@@ -719,6 +719,7 @@ discard block |
||
| 719 | 719 | * Gets all announcements from a user by course |
| 720 | 720 | * @param string course db |
| 721 | 721 | * @param int user id |
| 722 | + * @param integer $user_id |
|
| 722 | 723 | * @return array html with the content and count of announcements or false otherwise |
| 723 | 724 | */ |
| 724 | 725 | public static function get_all_annoucement_by_user_course($course_code, $user_id) |
@@ -1184,6 +1185,7 @@ discard block |
||
| 1184 | 1185 | * has been sent to |
| 1185 | 1186 | * @param string The tool (announcement, agenda, ...) |
| 1186 | 1187 | * @param int ID of the element of the corresponding type |
| 1188 | + * @param string $tool |
|
| 1187 | 1189 | * @return array Array of users and groups to whom the element has been sent |
| 1188 | 1190 | */ |
| 1189 | 1191 | public static function sent_to($tool, $id) |
@@ -1308,6 +1310,8 @@ discard block |
||
| 1308 | 1310 | * @param int attach id |
| 1309 | 1311 | * @param array uploaded file $_FILES |
| 1310 | 1312 | * @param string file comment |
| 1313 | + * @param integer $id_attach |
|
| 1314 | + * @param string $file_comment |
|
| 1311 | 1315 | * @return int |
| 1312 | 1316 | */ |
| 1313 | 1317 | public static function edit_announcement_attachment_file($id_attach, $file, $file_comment) |
@@ -1510,7 +1510,7 @@ |
||
| 1510 | 1510 | ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".implode(", ", $group_memberships).")) |
| 1511 | 1511 | ) "; |
| 1512 | 1512 | } else { |
| 1513 | - $cond_user_id = " AND ( |
|
| 1513 | + $cond_user_id = " AND ( |
|
| 1514 | 1514 | ip.to_user_id=$user_id OR (ip.to_group_id IS NULL OR ip.to_group_id IN (0, ".api_get_group_id().")) |
| 1515 | 1515 | )"; |
| 1516 | 1516 | } |
@@ -216,8 +216,8 @@ discard block |
||
| 216 | 216 | announcement.id = '$announcement_id' AND |
| 217 | 217 | toolitemproperties.tool='announcement' AND |
| 218 | 218 | ( |
| 219 | - toolitemproperties.to_user_id='" . api_get_user_id() . "' OR |
|
| 220 | - toolitemproperties.to_group_id IN ('0', '" . implode("', '", $group_list) . "') OR |
|
| 219 | + toolitemproperties.to_user_id='".api_get_user_id()."' OR |
|
| 220 | + toolitemproperties.to_group_id IN ('0', '" . implode("', '", $group_list)."') OR |
|
| 221 | 221 | toolitemproperties.to_group_id IS NULL |
| 222 | 222 | ) AND |
| 223 | 223 | toolitemproperties.visibility='1' AND |
@@ -246,13 +246,13 @@ discard block |
||
| 246 | 246 | $title = $result['title']; |
| 247 | 247 | $content = $result['content']; |
| 248 | 248 | $html .= "<table height=\"100\" width=\"100%\" cellpadding=\"5\" cellspacing=\"0\" class=\"data_table\">"; |
| 249 | - $html .= "<tr><td><h2>" . $title . "</h2></td></tr>"; |
|
| 249 | + $html .= "<tr><td><h2>".$title."</h2></td></tr>"; |
|
| 250 | 250 | |
| 251 | 251 | if (api_is_allowed_to_edit(false, true) || |
| 252 | 252 | (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous()) |
| 253 | 253 | ) { |
| 254 | - $modify_icons = "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=modify&id=" . $announcement_id . "\">" . |
|
| 255 | - Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . "</a>"; |
|
| 254 | + $modify_icons = "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=modify&id=".$announcement_id."\">". |
|
| 255 | + Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>"; |
|
| 256 | 256 | if ($result['visibility'] == 1) { |
| 257 | 257 | $image_visibility = "visible"; |
| 258 | 258 | $alt_visibility = get_lang('Hide'); |
@@ -262,12 +262,12 @@ discard block |
||
| 262 | 262 | } |
| 263 | 263 | global $stok; |
| 264 | 264 | |
| 265 | - $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&origin=" . (!empty($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : '') . "&action=showhide&id=" . $announcement_id . "&sec_token=" . $stok . "\">" . |
|
| 266 | - Display::return_icon($image_visibility . '.png', $alt_visibility, '', ICON_SIZE_SMALL) . "</a>"; |
|
| 265 | + $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&origin=".(!empty($_GET['origin']) ? Security::remove_XSS($_GET['origin']) : '')."&action=showhide&id=".$announcement_id."&sec_token=".$stok."\">". |
|
| 266 | + Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>"; |
|
| 267 | 267 | |
| 268 | 268 | if (api_is_allowed_to_edit(false, true)) { |
| 269 | - $modify_icons .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&action=delete&id=" . $announcement_id . "&sec_token=" . $stok . "\" onclick=\"javascript:if(!confirm('" . addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)) . "')) return false;\">" . |
|
| 270 | - Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . |
|
| 269 | + $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&id=".$announcement_id."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset))."')) return false;\">". |
|
| 270 | + Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL). |
|
| 271 | 271 | "</a>"; |
| 272 | 272 | } |
| 273 | 273 | $html .= "<tr><th style='text-align:right'>$modify_icons</th></tr>"; |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $content = self::parse_content($result['to_user_id'], $content, api_get_course_id(), api_get_session_id()); |
| 277 | 277 | |
| 278 | 278 | $html .= "<tr><td>$content</td></tr>"; |
| 279 | - $html .= "<tr><td class=\"announcements_datum\">" . get_lang('LastUpdateDate') . " : " . api_convert_and_format_date($result['insert_date'], DATE_TIME_FORMAT_LONG) . "</td></tr>"; |
|
| 279 | + $html .= "<tr><td class=\"announcements_datum\">".get_lang('LastUpdateDate')." : ".api_convert_and_format_date($result['insert_date'], DATE_TIME_FORMAT_LONG)."</td></tr>"; |
|
| 280 | 280 | |
| 281 | 281 | // User or group icon |
| 282 | 282 | $sent_to_icon = ''; |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $sent_to_form = self::sent_to_form($sent_to); |
| 289 | 289 | $html .= Display::tag( |
| 290 | 290 | 'td', |
| 291 | - get_lang('SentTo') . ' : ' . $sent_to_form, |
|
| 291 | + get_lang('SentTo').' : '.$sent_to_form, |
|
| 292 | 292 | array('class' => 'announcements_datum') |
| 293 | 293 | ); |
| 294 | 294 | } |
@@ -298,15 +298,15 @@ discard block |
||
| 298 | 298 | $html .= "<tr><td>"; |
| 299 | 299 | $realname = $attachment_list['path']; |
| 300 | 300 | $user_filename = $attachment_list['filename']; |
| 301 | - $full_file_name = 'download.php?'.api_get_cidreq().'&file=' . $realname; |
|
| 301 | + $full_file_name = 'download.php?'.api_get_cidreq().'&file='.$realname; |
|
| 302 | 302 | $html .= '<br/>'; |
| 303 | 303 | $html .= Display::return_icon('attachment.gif', get_lang('Attachment')); |
| 304 | - $html .= '<a href="' . $full_file_name . ' "> ' . $user_filename . ' </a>'; |
|
| 305 | - $html .= ' - <span class="forum_attach_comment" >' . $attachment_list['comment'] . '</span>'; |
|
| 304 | + $html .= '<a href="'.$full_file_name.' "> '.$user_filename.' </a>'; |
|
| 305 | + $html .= ' - <span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>'; |
|
| 306 | 306 | if (api_is_allowed_to_edit(false, true)) { |
| 307 | 307 | $html .= Display::url( |
| 308 | 308 | Display::return_icon('delete.png', get_lang('Delete'), '', 16), |
| 309 | - api_get_self() . "?" . api_get_cidreq() . "&action=delete_attachment&id_attach=" . $attachment_list['id'] . "&sec_token=" . $stok |
|
| 309 | + api_get_self()."?".api_get_cidreq()."&action=delete_attachment&id_attach=".$attachment_list['id']."&sec_token=".$stok |
|
| 310 | 310 | ); |
| 311 | 311 | } |
| 312 | 312 | $html .= '</td></tr>'; |
@@ -334,7 +334,7 @@ discard block |
||
| 334 | 334 | $order = 0; |
| 335 | 335 | if (Database::num_rows($res_max)) { |
| 336 | 336 | $row_max = Database::fetch_array($res_max); |
| 337 | - $order = intval($row_max[0])+1; |
|
| 337 | + $order = intval($row_max[0]) + 1; |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | return $order; |
@@ -754,8 +754,8 @@ discard block |
||
| 754 | 754 | $result = array(); |
| 755 | 755 | if ($num_rows > 0) { |
| 756 | 756 | while ($myrow = Database::fetch_array($rs)) { |
| 757 | - $content.= '<strong>' . $myrow['title'] . '</strong><br /><br />'; |
|
| 758 | - $content.= $myrow['content']; |
|
| 757 | + $content .= '<strong>'.$myrow['title'].'</strong><br /><br />'; |
|
| 758 | + $content .= $myrow['content']; |
|
| 759 | 759 | $i++; |
| 760 | 760 | } |
| 761 | 761 | $result['content'] = $content; |
@@ -786,7 +786,7 @@ discard block |
||
| 786 | 786 | echo "<table id=\"recipient_list\" >"; |
| 787 | 787 | echo '<tr>'; |
| 788 | 788 | echo '<td>'; |
| 789 | - echo '<label><input type="checkbox" id="send_to_all_users">'.get_lang('SendToAllUsers') . "</label>"; |
|
| 789 | + echo '<label><input type="checkbox" id="send_to_all_users">'.get_lang('SendToAllUsers')."</label>"; |
|
| 790 | 790 | echo "</td>"; |
| 791 | 791 | echo '</tr>'; |
| 792 | 792 | echo '<tr>'; |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | |
| 795 | 795 | // the form containing all the groups and all the users of the course |
| 796 | 796 | echo '<td>'; |
| 797 | - echo "<strong>" . get_lang('Users') . "</strong><br />"; |
|
| 797 | + echo "<strong>".get_lang('Users')."</strong><br />"; |
|
| 798 | 798 | |
| 799 | 799 | self::construct_not_selected_select_form($groupList, $userList, $to_already_selected); |
| 800 | 800 | echo "</td>"; |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | echo "<td>"; |
| 810 | 810 | |
| 811 | 811 | // the form containing the selected groups and users |
| 812 | - echo "<strong>" . get_lang('DestinationUsers') . "</strong><br />"; |
|
| 812 | + echo "<strong>".get_lang('DestinationUsers')."</strong><br />"; |
|
| 813 | 813 | self::construct_selected_select_form($groupList, $userList, $to_already_selected); |
| 814 | 814 | echo "</td>"; |
| 815 | 815 | echo "</tr>"; |
@@ -827,8 +827,8 @@ discard block |
||
| 827 | 827 | echo "<select id=\"not_selected_form\" name=\"not_selected_form[]\" size=5 style=\"width:200px\" multiple>"; |
| 828 | 828 | $group_users = GroupManager::getStudentsAndTutors($group_id); |
| 829 | 829 | foreach ($group_users as $user) { |
| 830 | - echo '<option value="' . $user['user_id'] . '" title="' . sprintf(get_lang('LoginX'), $user['username']) . '" >' . |
|
| 831 | - api_get_person_name($user['firstname'], $user['lastname']) . |
|
| 830 | + echo '<option value="'.$user['user_id'].'" title="'.sprintf(get_lang('LoginX'), $user['username']).'" >'. |
|
| 831 | + api_get_person_name($user['firstname'], $user['lastname']). |
|
| 832 | 832 | '</option>'; |
| 833 | 833 | } |
| 834 | 834 | echo '</select>'; |
@@ -866,12 +866,12 @@ discard block |
||
| 866 | 866 | if (!empty($groupList)) { |
| 867 | 867 | foreach ($groupList as $this_group) { |
| 868 | 868 | if (is_array($to_already_selected)) { |
| 869 | - if (!in_array("GROUP:" . $this_group['id'], $to_already_selected)) { |
|
| 869 | + if (!in_array("GROUP:".$this_group['id'], $to_already_selected)) { |
|
| 870 | 870 | // $to_already_selected is the array containing the groups (and users) that are already selected |
| 871 | - $user_label = ($this_group['userNb'] > 0) ? get_lang('Users') : get_lang('LowerCaseUser') ; |
|
| 872 | - $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled" ; |
|
| 873 | - echo "<option $user_disabled value=\"GROUP:" . $this_group['id'] . "\">", |
|
| 874 | - "G: ", $this_group['name'], " - " . $this_group['userNb'] . " " . $user_label . |
|
| 871 | + $user_label = ($this_group['userNb'] > 0) ? get_lang('Users') : get_lang('LowerCaseUser'); |
|
| 872 | + $user_disabled = ($this_group['userNb'] > 0) ? "" : "disabled=disabled"; |
|
| 873 | + echo "<option $user_disabled value=\"GROUP:".$this_group['id']."\">", |
|
| 874 | + "G: ", $this_group['name'], " - ".$this_group['userNb']." ".$user_label. |
|
| 875 | 875 | "</option>"; |
| 876 | 876 | } |
| 877 | 877 | } |
@@ -885,15 +885,15 @@ discard block |
||
| 885 | 885 | if (!empty($userList)) { |
| 886 | 886 | foreach ($userList as $user) { |
| 887 | 887 | if (is_array($to_already_selected)) { |
| 888 | - if (!in_array("USER:" . $user['user_id'], $to_already_selected)) { |
|
| 888 | + if (!in_array("USER:".$user['user_id'], $to_already_selected)) { |
|
| 889 | 889 | // $to_already_selected is the array containing the users (and groups) that are already selected |
| 890 | - echo "<option value=\"USER:" . $user['user_id'] . "\" title='" . sprintf(get_lang('LoginX'), $user['username']) . "'>", |
|
| 890 | + echo "<option value=\"USER:".$user['user_id']."\" title='".sprintf(get_lang('LoginX'), $user['username'])."'>", |
|
| 891 | 891 | "", api_get_person_name($user['firstname'], $user['lastname']), |
| 892 | 892 | "</option>"; |
| 893 | 893 | |
| 894 | 894 | if (isset($user['drh_list']) && !empty($user['drh_list'])) { |
| 895 | 895 | foreach ($user['drh_list'] as $drh) { |
| 896 | - echo "<option value=\"USER:" . $drh['user_id'] . "\" title='" . sprintf(get_lang('LoginX'), $drh['username']) . "'> ", |
|
| 896 | + echo "<option value=\"USER:".$drh['user_id']."\" title='".sprintf(get_lang('LoginX'), $drh['username'])."'> ", |
|
| 897 | 897 | "", api_get_person_name($drh['firstname'], $drh['lastname']), |
| 898 | 898 | "</option>"; |
| 899 | 899 | } |
@@ -925,16 +925,16 @@ discard block |
||
| 925 | 925 | foreach ($to_already_selected as $groupuser) { |
| 926 | 926 | list($type, $id) = explode(":", $groupuser); |
| 927 | 927 | if ($type == "GROUP") { |
| 928 | - echo "<option value=\"" . $groupuser . "\">G: " . $ref_array_groups[$id]['name'] . "</option>"; |
|
| 928 | + echo "<option value=\"".$groupuser."\">G: ".$ref_array_groups[$id]['name']."</option>"; |
|
| 929 | 929 | } else { |
| 930 | 930 | foreach ($ref_array_users as $key => $value) { |
| 931 | 931 | if ($value['user_id'] == $id) { |
| 932 | - echo "<option value=\"" . $groupuser . "\" title='" . sprintf(get_lang('LoginX'), $value['username']) . "'>" . |
|
| 933 | - api_get_person_name($value['firstname'], $value['lastname']) . "</option>"; |
|
| 932 | + echo "<option value=\"".$groupuser."\" title='".sprintf(get_lang('LoginX'), $value['username'])."'>". |
|
| 933 | + api_get_person_name($value['firstname'], $value['lastname'])."</option>"; |
|
| 934 | 934 | |
| 935 | 935 | if (isset($value['drh_list']) && !empty($value['drh_list'])) { |
| 936 | 936 | foreach ($value['drh_list'] as $drh) { |
| 937 | - echo "<option value=\"USER:" . $drh['user_id'] . "\" title='" . sprintf(get_lang('LoginX'), $drh['username']) . "'> ", |
|
| 937 | + echo "<option value=\"USER:".$drh['user_id']."\" title='".sprintf(get_lang('LoginX'), $drh['username'])."'> ", |
|
| 938 | 938 | "", api_get_person_name($drh['firstname'], $drh['lastname']), |
| 939 | 939 | "</option>"; |
| 940 | 940 | } |
@@ -950,17 +950,17 @@ discard block |
||
| 950 | 950 | if (is_array($ref_array_groups)) { |
| 951 | 951 | foreach ($ref_array_groups as $this_group) { |
| 952 | 952 | //api_display_normal_message("group " . $thisGroup[id] . $thisGroup[name]); |
| 953 | - if (!is_array($to_already_selected) || !in_array("GROUP:" . $this_group['id'], $to_already_selected)) { // $to_already_selected is the array containing the groups (and users) that are already selected |
|
| 954 | - echo "<option value=\"GROUP:" . $this_group['id'] . "\">", |
|
| 955 | - "G: ", $this_group['name'], " – " . $this_group['userNb'] . " " . get_lang('Users') . |
|
| 953 | + if (!is_array($to_already_selected) || !in_array("GROUP:".$this_group['id'], $to_already_selected)) { // $to_already_selected is the array containing the groups (and users) that are already selected |
|
| 954 | + echo "<option value=\"GROUP:".$this_group['id']."\">", |
|
| 955 | + "G: ", $this_group['name'], " – ".$this_group['userNb']." ".get_lang('Users'). |
|
| 956 | 956 | "</option>"; |
| 957 | 957 | } |
| 958 | 958 | } |
| 959 | 959 | } |
| 960 | 960 | // adding the individual users to the select form |
| 961 | 961 | foreach ($ref_array_users as $this_user) { |
| 962 | - if (!is_array($to_already_selected) || !in_array("USER:" . $this_user['user_id'], $to_already_selected)) { // $to_already_selected is the array containing the users (and groups) that are already selected |
|
| 963 | - echo "<option value=\"USER:", $this_user['user_id'], "\" title='" . sprintf(get_lang('LoginX'), $this_user['username']) . "'>", |
|
| 962 | + if (!is_array($to_already_selected) || !in_array("USER:".$this_user['user_id'], $to_already_selected)) { // $to_already_selected is the array containing the users (and groups) that are already selected |
|
| 963 | + echo "<option value=\"USER:", $this_user['user_id'], "\" title='".sprintf(get_lang('LoginX'), $this_user['username'])."'>", |
|
| 964 | 964 | "", api_get_person_name($this_user['firstname'], $this_user['lastname']), |
| 965 | 965 | "</option>"; |
| 966 | 966 | } |
@@ -1073,14 +1073,14 @@ discard block |
||
| 1073 | 1073 | switch ($to_group) { |
| 1074 | 1074 | // it was send to one specific user |
| 1075 | 1075 | case null: |
| 1076 | - $to[] = "USER:" . $row['to_user_id']; |
|
| 1076 | + $to[] = "USER:".$row['to_user_id']; |
|
| 1077 | 1077 | break; |
| 1078 | 1078 | // it was sent to everyone |
| 1079 | 1079 | case 0: |
| 1080 | 1080 | return "everyone"; |
| 1081 | 1081 | break; |
| 1082 | 1082 | default: |
| 1083 | - $to[] = "GROUP:" . $row['to_group_id']; |
|
| 1083 | + $to[] = "GROUP:".$row['to_group_id']; |
|
| 1084 | 1084 | } |
| 1085 | 1085 | } |
| 1086 | 1086 | return $to; |
@@ -1161,10 +1161,10 @@ discard block |
||
| 1161 | 1161 | $sent_to_array['groups'][0] !== 0 |
| 1162 | 1162 | ) { |
| 1163 | 1163 | $group_id = $sent_to_array['groups'][0]; |
| 1164 | - $output[] = " " . $group_names[$group_id]['name']; |
|
| 1164 | + $output[] = " ".$group_names[$group_id]['name']; |
|
| 1165 | 1165 | } |
| 1166 | 1166 | if (empty($sent_to_array['groups']) and empty($sent_to_array['users'])) { |
| 1167 | - $output[] = " " . get_lang('Everybody'); |
|
| 1167 | + $output[] = " ".get_lang('Everybody'); |
|
| 1168 | 1168 | } |
| 1169 | 1169 | } |
| 1170 | 1170 | |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | |
| 1200 | 1200 | $sql = "SELECT to_group_id, to_user_id |
| 1201 | 1201 | FROM $tbl_item_property |
| 1202 | - WHERE c_id = $course_id AND tool = '$tool' AND ref=" . $id; |
|
| 1202 | + WHERE c_id = $course_id AND tool = '$tool' AND ref=".$id; |
|
| 1203 | 1203 | $result = Database::query($sql); |
| 1204 | 1204 | |
| 1205 | 1205 | while ($row = Database::fetch_array($result)) { |
@@ -1238,8 +1238,8 @@ discard block |
||
| 1238 | 1238 | $announcement_id = intval($announcement_id); |
| 1239 | 1239 | $course_id = api_get_course_int_id(); |
| 1240 | 1240 | $row = array(); |
| 1241 | - $sql = 'SELECT id, path, filename, comment FROM ' . $tbl_announcement_attachment . ' |
|
| 1242 | - WHERE c_id = ' . $course_id . ' AND announcement_id = ' . $announcement_id . ''; |
|
| 1241 | + $sql = 'SELECT id, path, filename, comment FROM '.$tbl_announcement_attachment.' |
|
| 1242 | + WHERE c_id = ' . $course_id.' AND announcement_id = '.$announcement_id.''; |
|
| 1243 | 1243 | $result = Database::query($sql); |
| 1244 | 1244 | if (Database::num_rows($result) != 0) { |
| 1245 | 1245 | $row = Database::fetch_array($result, 'ASSOC'); |
@@ -1264,9 +1264,9 @@ discard block |
||
| 1264 | 1264 | |
| 1265 | 1265 | if (is_array($file) && $file['error'] == 0) { |
| 1266 | 1266 | // TODO: This path is obsolete. The new document repository scheme should be kept in mind here. |
| 1267 | - $courseDir = $_course['path'] . '/upload/announcements'; |
|
| 1267 | + $courseDir = $_course['path'].'/upload/announcements'; |
|
| 1268 | 1268 | $sys_course_path = api_get_path(SYS_COURSE_PATH); |
| 1269 | - $updir = $sys_course_path . $courseDir; |
|
| 1269 | + $updir = $sys_course_path.$courseDir; |
|
| 1270 | 1270 | |
| 1271 | 1271 | // Try to add an extension to the file if it hasn't one |
| 1272 | 1272 | $new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']); |
@@ -1278,7 +1278,7 @@ discard block |
||
| 1278 | 1278 | Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension')); |
| 1279 | 1279 | } else { |
| 1280 | 1280 | $new_file_name = uniqid(''); |
| 1281 | - $new_path = $updir . '/' . $new_file_name; |
|
| 1281 | + $new_path = $updir.'/'.$new_file_name; |
|
| 1282 | 1282 | move_uploaded_file($file['tmp_name'], $new_path); |
| 1283 | 1283 | |
| 1284 | 1284 | $params = [ |
@@ -1319,9 +1319,9 @@ discard block |
||
| 1319 | 1319 | |
| 1320 | 1320 | if (is_array($file) && $file['error'] == 0) { |
| 1321 | 1321 | // TODO: This path is obsolete. The new document repository scheme should be kept in mind here. |
| 1322 | - $courseDir = $_course['path'] . '/upload/announcements'; |
|
| 1322 | + $courseDir = $_course['path'].'/upload/announcements'; |
|
| 1323 | 1323 | $sys_course_path = api_get_path(SYS_COURSE_PATH); |
| 1324 | - $updir = $sys_course_path . $courseDir; |
|
| 1324 | + $updir = $sys_course_path.$courseDir; |
|
| 1325 | 1325 | |
| 1326 | 1326 | // Try to add an extension to the file if it hasn't one |
| 1327 | 1327 | $new_file_name = add_ext_on_mime(stripslashes($file['name']), $file['type']); |
@@ -1333,13 +1333,13 @@ discard block |
||
| 1333 | 1333 | Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension')); |
| 1334 | 1334 | } else { |
| 1335 | 1335 | $new_file_name = uniqid(''); |
| 1336 | - $new_path = $updir . '/' . $new_file_name; |
|
| 1336 | + $new_path = $updir.'/'.$new_file_name; |
|
| 1337 | 1337 | @move_uploaded_file($file['tmp_name'], $new_path); |
| 1338 | 1338 | $safe_file_comment = Database::escape_string($file_comment); |
| 1339 | 1339 | $safe_file_name = Database::escape_string($file_name); |
| 1340 | 1340 | $safe_new_file_name = Database::escape_string($new_file_name); |
| 1341 | 1341 | $id_attach = intval($id_attach); |
| 1342 | - $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='" . intval($file['size']) . "' |
|
| 1342 | + $sql = "UPDATE $tbl_announcement_attachment SET filename = '$safe_file_name', comment = '$safe_file_comment', path = '$safe_new_file_name', size ='".intval($file['size'])."' |
|
| 1343 | 1343 | WHERE c_id = $course_id AND id = '$id_attach'"; |
| 1344 | 1344 | $result = Database::query($sql); |
| 1345 | 1345 | if ($result === false) { |
@@ -1407,7 +1407,7 @@ discard block |
||
| 1407 | 1407 | |
| 1408 | 1408 | //if (!empty($user_id)) { |
| 1409 | 1409 | if (0) { |
| 1410 | - if (is_array($group_memberships) && count($group_memberships) > 0 ) { |
|
| 1410 | + if (is_array($group_memberships) && count($group_memberships) > 0) { |
|
| 1411 | 1411 | $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date |
| 1412 | 1412 | FROM $tbl_announcement announcement, $tbl_item_property ip |
| 1413 | 1413 | WHERE |
@@ -1456,8 +1456,8 @@ discard block |
||
| 1456 | 1456 | // A.3 you are a course admin without any group or user filter |
| 1457 | 1457 | // A.3.a you are a course admin without user or group filter but WITH studentview |
| 1458 | 1458 | // => see all the messages of all the users and groups without editing possibilities |
| 1459 | - if (isset($isStudentView) and $isStudentView=="true") { |
|
| 1460 | - $sql="SELECT |
|
| 1459 | + if (isset($isStudentView) and $isStudentView == "true") { |
|
| 1460 | + $sql = "SELECT |
|
| 1461 | 1461 | announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.insert_date |
| 1462 | 1462 | FROM $tbl_announcement announcement, $tbl_item_property ip |
| 1463 | 1463 | WHERE |
@@ -1487,7 +1487,7 @@ discard block |
||
| 1487 | 1487 | } |
| 1488 | 1488 | } else { |
| 1489 | 1489 | // STUDENT |
| 1490 | - if (is_array($group_memberships) && count($group_memberships)>0) { |
|
| 1490 | + if (is_array($group_memberships) && count($group_memberships) > 0) { |
|
| 1491 | 1491 | if ($allowUserEditSetting && !api_is_anonymous()) { |
| 1492 | 1492 | |
| 1493 | 1493 | if (api_get_group_id() == 0) { |
@@ -1591,12 +1591,12 @@ discard block |
||
| 1591 | 1591 | (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') |
| 1592 | 1592 | ) { |
| 1593 | 1593 | $html .= '<div id="no-data-view">'; |
| 1594 | - $html .= '<h3>' . get_lang('Announcements') . '</h3>'; |
|
| 1594 | + $html .= '<h3>'.get_lang('Announcements').'</h3>'; |
|
| 1595 | 1595 | $html .= Display::return_icon('valves.png', '', array(), 64); |
| 1596 | 1596 | $html .= '<div class="controls">'; |
| 1597 | 1597 | $html .= Display::url( |
| 1598 | 1598 | get_lang('AddAnnouncement'), |
| 1599 | - api_get_self() . "?" . api_get_cidreq() . "&action=add", |
|
| 1599 | + api_get_self()."?".api_get_cidreq()."&action=add", |
|
| 1600 | 1600 | array('class' => 'btn btn-primary') |
| 1601 | 1601 | ); |
| 1602 | 1602 | $html .= '</div>'; |
@@ -1613,9 +1613,9 @@ discard block |
||
| 1613 | 1613 | |
| 1614 | 1614 | $html .= '<table width="100%" class="data_table announcements-list">'; |
| 1615 | 1615 | $ths = Display::tag('th', get_lang('Title')); |
| 1616 | - $ths .= Display::tag('th', get_lang('By') ); |
|
| 1617 | - $ths .= Display::tag('th', get_lang('LastUpdateDate') ); |
|
| 1618 | - if (api_is_allowed_to_edit(false,true) OR (api_is_course_coach() && |
|
| 1616 | + $ths .= Display::tag('th', get_lang('By')); |
|
| 1617 | + $ths .= Display::tag('th', get_lang('LastUpdateDate')); |
|
| 1618 | + if (api_is_allowed_to_edit(false, true) OR (api_is_course_coach() && |
|
| 1619 | 1619 | api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id'])) |
| 1620 | 1620 | OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) { |
| 1621 | 1621 | $ths .= Display::tag('th', get_lang('Modify')); |
@@ -1637,7 +1637,7 @@ discard block |
||
| 1637 | 1637 | |
| 1638 | 1638 | // the styles |
| 1639 | 1639 | if ($myrow['visibility'] == '0') { |
| 1640 | - $style='invisible'; |
|
| 1640 | + $style = 'invisible'; |
|
| 1641 | 1641 | } else { |
| 1642 | 1642 | $style = ''; |
| 1643 | 1643 | } |
@@ -1648,8 +1648,8 @@ discard block |
||
| 1648 | 1648 | $attachment_list = AnnouncementManager::get_attachment($myrow['id']); |
| 1649 | 1649 | |
| 1650 | 1650 | $attachment_icon = ''; |
| 1651 | - if (count($attachment_list)>0) { |
|
| 1652 | - $attachment_icon = ' '.Display::return_icon('attachment.gif',get_lang('Attachment')); |
|
| 1651 | + if (count($attachment_list) > 0) { |
|
| 1652 | + $attachment_icon = ' '.Display::return_icon('attachment.gif', get_lang('Attachment')); |
|
| 1653 | 1653 | } |
| 1654 | 1654 | |
| 1655 | 1655 | /* TITLE */ |
@@ -1664,22 +1664,22 @@ discard block |
||
| 1664 | 1664 | |
| 1665 | 1665 | // we can edit if : we are the teacher OR the element belongs to |
| 1666 | 1666 | // the session we are coaching OR the option to allow users to edit is on |
| 1667 | - if (api_is_allowed_to_edit(false,true) OR |
|
| 1667 | + if (api_is_allowed_to_edit(false, true) OR |
|
| 1668 | 1668 | (api_is_course_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id'])) |
| 1669 | 1669 | OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous()) |
| 1670 | 1670 | ) { |
| 1671 | 1671 | |
| 1672 | 1672 | $modify_icons = "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=modify&id=".$myrow['id']."\">". |
| 1673 | - Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)."</a>"; |
|
| 1674 | - if ($myrow['visibility']==1) { |
|
| 1675 | - $image_visibility="visible"; |
|
| 1676 | - $alt_visibility=get_lang('Hide'); |
|
| 1673 | + Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL)."</a>"; |
|
| 1674 | + if ($myrow['visibility'] == 1) { |
|
| 1675 | + $image_visibility = "visible"; |
|
| 1676 | + $alt_visibility = get_lang('Hide'); |
|
| 1677 | 1677 | } else { |
| 1678 | - $image_visibility="invisible"; |
|
| 1679 | - $alt_visibility=get_lang('Visible'); |
|
| 1678 | + $image_visibility = "invisible"; |
|
| 1679 | + $alt_visibility = get_lang('Visible'); |
|
| 1680 | 1680 | } |
| 1681 | - $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&origin=".$origin."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">". |
|
| 1682 | - Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL)."</a>"; |
|
| 1681 | + $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&origin=".$origin."&action=showhide&id=".$myrow['id']."&sec_token=".$stok."\">". |
|
| 1682 | + Display::return_icon($image_visibility.'.png', $alt_visibility, '', ICON_SIZE_SMALL)."</a>"; |
|
| 1683 | 1683 | |
| 1684 | 1684 | // DISPLAY MOVE UP COMMAND only if it is not the top announcement |
| 1685 | 1685 | if ($iterator != 1) { |
@@ -1694,12 +1694,12 @@ discard block |
||
| 1694 | 1694 | } else { |
| 1695 | 1695 | $modify_icons .= Display::return_icon('down_na.gif', get_lang('Down')); |
| 1696 | 1696 | } |
| 1697 | - if (api_is_allowed_to_edit(false,true)) { |
|
| 1698 | - $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding()))."')) return false;\">". |
|
| 1699 | - Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL). |
|
| 1697 | + if (api_is_allowed_to_edit(false, true)) { |
|
| 1698 | + $modify_icons .= "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&id=".$myrow['id']."&sec_token=".$stok."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding()))."')) return false;\">". |
|
| 1699 | + Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL). |
|
| 1700 | 1700 | "</a>"; |
| 1701 | 1701 | } |
| 1702 | - $iterator ++; |
|
| 1702 | + $iterator++; |
|
| 1703 | 1703 | $html .= Display::tag('td', $modify_icons, array('class' => 'announcements-list-line-actions')); |
| 1704 | 1704 | } |
| 1705 | 1705 | $html .= "</tr>"; |
@@ -1717,7 +1717,7 @@ discard block |
||
| 1717 | 1717 | public static function getNumberAnnouncements() |
| 1718 | 1718 | { |
| 1719 | 1719 | // Maximum title messages to display |
| 1720 | - $maximum = '12'; |
|
| 1720 | + $maximum = '12'; |
|
| 1721 | 1721 | // Database Table Definitions |
| 1722 | 1722 | $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT); |
| 1723 | 1723 | $tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY); |
@@ -1728,7 +1728,7 @@ discard block |
||
| 1728 | 1728 | $userId = api_get_user_id(); |
| 1729 | 1729 | $condition_session = api_get_session_condition($session_id, true, true, 'announcement.session_id'); |
| 1730 | 1730 | |
| 1731 | - if (api_is_allowed_to_edit(false,true)) { |
|
| 1731 | + if (api_is_allowed_to_edit(false, true)) { |
|
| 1732 | 1732 | // check teacher status |
| 1733 | 1733 | if (empty($_GET['origin']) or $_GET['origin'] !== 'learnpath') { |
| 1734 | 1734 | |
@@ -1791,7 +1791,7 @@ discard block |
||
| 1791 | 1791 | } |
| 1792 | 1792 | |
| 1793 | 1793 | // the user is member of several groups => display personal announcements AND his group announcements AND the general announcements |
| 1794 | - if (is_array($group_memberships) && count($group_memberships)>0) { |
|
| 1794 | + if (is_array($group_memberships) && count($group_memberships) > 0) { |
|
| 1795 | 1795 | $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id |
| 1796 | 1796 | FROM $tbl_announcement announcement, $tbl_item_property ip |
| 1797 | 1797 | WHERE |
@@ -1841,7 +1841,7 @@ discard block |
||
| 1841 | 1841 | } |
| 1842 | 1842 | |
| 1843 | 1843 | // the user is not identiefied => show only the general announcements |
| 1844 | - $sql="SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id |
|
| 1844 | + $sql = "SELECT announcement.*, ip.visibility, ip.to_group_id, ip.insert_user_id |
|
| 1845 | 1845 | FROM $tbl_announcement announcement, $tbl_item_property ip |
| 1846 | 1846 | WHERE |
| 1847 | 1847 | announcement.c_id = $course_id AND |
@@ -575,7 +575,6 @@ discard block |
||
| 575 | 575 | * Also, this function provides conversion between path types, in this case the input path points inside the Chamilo area too. |
| 576 | 576 | * |
| 577 | 577 | * See $_configuration['course_folder'] in the configuration.php to alter the WEB_COURSE_PATH and SYS_COURSE_PATH parameters. |
| 578 | - * @param string $type The requested path type (a defined constant), see the examples. |
|
| 579 | 578 | * @param string $path (optional) A path which type is to be converted. Also, it may be a defined constant for a path. |
| 580 | 579 | * This parameter has meaning when $type parameter has one of the following values: TO_WEB, TO_SYS, TO_REL. Otherwise it is ignored. |
| 581 | 580 | * @return string The requested path or the converted path. |
@@ -1070,7 +1069,7 @@ discard block |
||
| 1070 | 1069 | * Checks the RFC 3986 syntax of a given URL. |
| 1071 | 1070 | * @param string $url The URL to be checked. |
| 1072 | 1071 | * @param bool $absolute Whether the URL is absolute (beginning with a scheme such as "http:"). |
| 1073 | - * @return bool Returns the URL if it is valid, FALSE otherwise. |
|
| 1072 | + * @return string|false Returns the URL if it is valid, FALSE otherwise. |
|
| 1074 | 1073 | * This function is an adaptation from the function valid_url(), Drupal CMS. |
| 1075 | 1074 | * @link http://drupal.org |
| 1076 | 1075 | * Note: The built-in function filter_var($urs, FILTER_VALIDATE_URL) has a bug for some versions of PHP. |
@@ -1650,6 +1649,7 @@ discard block |
||
| 1650 | 1649 | * Gets a course setting from the current course_setting table. Try always using integer values. |
| 1651 | 1650 | * @param string The name of the setting we want from the table |
| 1652 | 1651 | * @param string Optional: course code |
| 1652 | + * @param string $setting_name |
|
| 1653 | 1653 | * @return mixed The value of that setting in that table. Return -1 if not found. |
| 1654 | 1654 | */ |
| 1655 | 1655 | function api_get_course_setting($setting_name, $course_code = null) |
@@ -1960,7 +1960,7 @@ discard block |
||
| 1960 | 1960 | /** |
| 1961 | 1961 | * Checks a password to see wether it is OK to use. |
| 1962 | 1962 | * @param string $password |
| 1963 | - * @return true if the password is acceptable, false otherwise |
|
| 1963 | + * @return boolean if the password is acceptable, false otherwise |
|
| 1964 | 1964 | * Notes about what a password "OK to use" is: |
| 1965 | 1965 | * 1. The password should be at least 5 characters long. |
| 1966 | 1966 | * 2. Only English letters (uppercase or lowercase, it doesn't matter) and digits are allowed. |
@@ -2132,7 +2132,7 @@ discard block |
||
| 2132 | 2132 | * @author Hugues Peeters <[email protected]> |
| 2133 | 2133 | * @param string $failure_type - the type of failure |
| 2134 | 2134 | * @global array $api_failureList |
| 2135 | - * @return bolean false to stay consistent with the main script |
|
| 2135 | + * @return boolean false to stay consistent with the main script |
|
| 2136 | 2136 | */ |
| 2137 | 2137 | static function set_failure($failure_type) { |
| 2138 | 2138 | global $api_failureList; |
@@ -3199,8 +3199,8 @@ discard block |
||
| 3199 | 3199 | |
| 3200 | 3200 | /** |
| 3201 | 3201 | * Checks whether the user is allowed in a specific tool for a specific action |
| 3202 | -* @param $tool the tool we are checking if the user has a certain permission |
|
| 3203 | -* @param $action the action we are checking (add, edit, delete, move, visibility) |
|
| 3202 | +* @param string $tool the tool we are checking if the user has a certain permission |
|
| 3203 | +* @param string $action the action we are checking (add, edit, delete, move, visibility) |
|
| 3204 | 3204 | * @author Patrick Cool <[email protected]>, Ghent University |
| 3205 | 3205 | * @author Julio Montoya |
| 3206 | 3206 | * @version 1.0 |
@@ -3499,7 +3499,7 @@ discard block |
||
| 3499 | 3499 | /** |
| 3500 | 3500 | * Gets a UNIX timestamp from a database (MySQL) datetime format string |
| 3501 | 3501 | * @param $last_post_datetime standard output date in a sql query |
| 3502 | - * @return unix timestamp |
|
| 3502 | + * @return integer timestamp |
|
| 3503 | 3503 | * @author Toon Van Hoecke <[email protected]> |
| 3504 | 3504 | * @version October 2003 |
| 3505 | 3505 | * @desc convert sql date to unix timestamp |
@@ -3532,6 +3532,9 @@ discard block |
||
| 3532 | 3532 | * @param string Tool (learnpath, document, etc) |
| 3533 | 3533 | * @param int The item ID in the given tool |
| 3534 | 3534 | * @param int The session ID (optional) |
| 3535 | + * @param string $tool |
|
| 3536 | + * @param integer $user_id |
|
| 3537 | + * @param string $type |
|
| 3535 | 3538 | * @return int -1 on error, 0 if invisible, 1 if visible |
| 3536 | 3539 | */ |
| 3537 | 3540 | function api_get_item_visibility( |
@@ -3600,7 +3603,7 @@ discard block |
||
| 3600 | 3603 | * @param int $userId |
| 3601 | 3604 | * @param int $groupId |
| 3602 | 3605 | * @param int $sessionId |
| 3603 | - * @return void |
|
| 3606 | + * @return false|null |
|
| 3604 | 3607 | */ |
| 3605 | 3608 | function api_item_property_delete( |
| 3606 | 3609 | $courseInfo, |
@@ -3655,7 +3658,7 @@ discard block |
||
| 3655 | 3658 | * @param array $_course array with course properties |
| 3656 | 3659 | * @param string $tool tool id, linked to 'rubrique' of the course tool_list (Warning: language sensitive !!) |
| 3657 | 3660 | * @param int $item_id id of the item itself, linked to key of every tool ('id', ...), "*" = all items of the tool |
| 3658 | - * @param string $lastedit_type add or update action |
|
| 3661 | + * @param string $last_edit_type add or update action |
|
| 3659 | 3662 | * (1) message to be translated (in trad4all) : e.g. DocumentAdded, DocumentUpdated; |
| 3660 | 3663 | * (2) "delete" |
| 3661 | 3664 | * (3) "visible" |
@@ -3938,6 +3941,8 @@ discard block |
||
| 3938 | 3941 | * @param string tool name, linked to 'rubrique' of the course tool_list (Warning: language sensitive !!) |
| 3939 | 3942 | * @param int id of the item itself, linked to key of every tool ('id', ...), "*" = all items of the tool |
| 3940 | 3943 | * @param int $session_id |
| 3944 | + * @param string $tool |
|
| 3945 | + * @param string $course_code |
|
| 3941 | 3946 | * @return array All fields from c_item_property (all rows found) or empty array |
| 3942 | 3947 | */ |
| 3943 | 3948 | function api_get_item_property_by_tool($tool, $course_code, $session_id = null) |
@@ -4107,6 +4112,7 @@ discard block |
||
| 4107 | 4112 | * @param string tool name, linked to 'rubrique' of the course tool_list (Warning: language sensitive !!) |
| 4108 | 4113 | * @param int id of the item itself, linked to key of every tool ('id', ...), "*" = all items of the tool |
| 4109 | 4114 | * @param int $session_id |
| 4115 | + * @param string $tool |
|
| 4110 | 4116 | * @return array Array with all fields from c_item_property, empty array if not found or false if course could not be found |
| 4111 | 4117 | */ |
| 4112 | 4118 | function api_get_item_property_info($course_id, $tool, $ref, $session_id = 0) |
@@ -4192,7 +4198,7 @@ discard block |
||
| 4192 | 4198 | * Displays a form (drop down menu) so the user can select his/her preferred language. |
| 4193 | 4199 | * The form works with or without javascript |
| 4194 | 4200 | * @param boolean Hide form if only one language available (defaults to false = show the box anyway) |
| 4195 | - * @return void Display the box directly |
|
| 4201 | + * @return null|string Display the box directly |
|
| 4196 | 4202 | */ |
| 4197 | 4203 | function api_display_language_form($hide_if_no_choice = false) |
| 4198 | 4204 | { |
@@ -4470,6 +4476,7 @@ discard block |
||
| 4470 | 4476 | * and also when a user subscribes to courses (the new course is added at the end of the main category |
| 4471 | 4477 | * @author Patrick Cool <[email protected]>, Ghent University |
| 4472 | 4478 | * @param int $user_course_category: the id of the user_course_category |
| 4479 | + * @param integer $user_id |
|
| 4473 | 4480 | * @return int the value of the highest sort of the user_course_category |
| 4474 | 4481 | */ |
| 4475 | 4482 | function api_max_sort_value($user_course_category, $user_id) |
@@ -4679,6 +4686,8 @@ discard block |
||
| 4679 | 4686 | * @param the dest folder |
| 4680 | 4687 | * @param an array of excluded file_name (without extension) |
| 4681 | 4688 | * @param copied_files the returned array of copied files |
| 4689 | + * @param string $source |
|
| 4690 | + * @param string $dest |
|
| 4682 | 4691 | */ |
| 4683 | 4692 | function copyr($source, $dest, $exclude = array(), $copied_files = array()) { |
| 4684 | 4693 | if (empty($dest)) { return false; } |
@@ -4718,6 +4727,11 @@ discard block |
||
| 4718 | 4727 | } |
| 4719 | 4728 | |
| 4720 | 4729 | // TODO: Using DIRECTORY_SEPARATOR is not recommended, this is an obsolete approach. Documentation header to be added here. |
| 4730 | +/** |
|
| 4731 | + * @param string $pathname |
|
| 4732 | + * @param string $base_path_document |
|
| 4733 | + * @param integer $session_id |
|
| 4734 | + */ |
|
| 4721 | 4735 | function copy_folder_course_session( |
| 4722 | 4736 | $pathname, |
| 4723 | 4737 | $base_path_document, |
@@ -4803,6 +4817,9 @@ discard block |
||
| 4803 | 4817 | } |
| 4804 | 4818 | |
| 4805 | 4819 | // TODO: chmodr() is a better name. Some corrections are needed. Documentation header to be added here. |
| 4820 | +/** |
|
| 4821 | + * @param string $path |
|
| 4822 | + */ |
|
| 4806 | 4823 | function api_chmod_R($path, $filemode) { |
| 4807 | 4824 | if (!is_dir($path)) { |
| 4808 | 4825 | return chmod($path, $filemode); |
@@ -4885,7 +4902,7 @@ discard block |
||
| 4885 | 4902 | * version = VERSION |
| 4886 | 4903 | * @endverbatim |
| 4887 | 4904 | * </code> |
| 4888 | - * @param $filename |
|
| 4905 | + * @param string $filename |
|
| 4889 | 4906 | * The file we are parsing. Accepts file with relative or absolute path. |
| 4890 | 4907 | * @return |
| 4891 | 4908 | * The info array. |
@@ -4977,7 +4994,7 @@ discard block |
||
| 4977 | 4994 | /** |
| 4978 | 4995 | * Checks whether status given in parameter exists in the platform |
| 4979 | 4996 | * @param mixed the status (can be either int either string) |
| 4980 | - * @return true if the status exists, else returns false |
|
| 4997 | + * @return boolean if the status exists, else returns false |
|
| 4981 | 4998 | */ |
| 4982 | 4999 | function api_status_exists($status_asked) { |
| 4983 | 5000 | global $_status_list; |
@@ -4999,7 +5016,7 @@ discard block |
||
| 4999 | 5016 | |
| 5000 | 5017 | /** |
| 5001 | 5018 | * Gets the status langvars list |
| 5002 | - * @return array the list of status with their translations |
|
| 5019 | + * @return string[] the list of status with their translations |
|
| 5003 | 5020 | */ |
| 5004 | 5021 | function api_get_status_langvars() { |
| 5005 | 5022 | return array( |
@@ -5075,6 +5092,7 @@ discard block |
||
| 5075 | 5092 | * @param string The sub-variable if any (in most cases, this will remain null) |
| 5076 | 5093 | * @param string The category if any (in most cases, this will remain null) |
| 5077 | 5094 | * @param int The access_url for which this parameter is valid |
| 5095 | + * @param string $cat |
|
| 5078 | 5096 | */ |
| 5079 | 5097 | function api_set_setting($var, $value, $subvar = null, $cat = null, $access_url = 1) |
| 5080 | 5098 | { |
@@ -5172,6 +5190,8 @@ discard block |
||
| 5172 | 5190 | * @param string Value |
| 5173 | 5191 | * @param int Access URL. Optional. Defaults to 1 |
| 5174 | 5192 | * @param array Optional array of filters on field type |
| 5193 | + * @param string $category |
|
| 5194 | + * @param string $value |
|
| 5175 | 5195 | */ |
| 5176 | 5196 | function api_set_settings_category($category, $value = null, $access_url = 1, $fieldtype = array()) |
| 5177 | 5197 | { |
@@ -5418,6 +5438,10 @@ discard block |
||
| 5418 | 5438 | * @param string The subkey text |
| 5419 | 5439 | * @param int The access_url for which this parameter is valid |
| 5420 | 5440 | * @param int The changeability of this setting for non-master urls |
| 5441 | + * @param string $val |
|
| 5442 | + * @param string $var |
|
| 5443 | + * @param string $sk |
|
| 5444 | + * @param string $c |
|
| 5421 | 5445 | * @return boolean true on success, false on failure |
| 5422 | 5446 | */ |
| 5423 | 5447 | function api_add_setting($val, $var, $sk = null, $type = 'textfield', $c = null, $title = '', $com = '', $sc = null, $skt = null, $a = 1, $v = 0) { |
@@ -5683,6 +5707,7 @@ discard block |
||
| 5683 | 5707 | * @param String the tool of the element |
| 5684 | 5708 | * @param int the element id in database |
| 5685 | 5709 | * @param int the session_id to compare with element session id |
| 5710 | + * @param string $tool |
|
| 5686 | 5711 | * @return boolean true if the element is in the session, false else |
| 5687 | 5712 | */ |
| 5688 | 5713 | function api_is_element_in_the_session($tool, $element_id, $session_id = null) { |
@@ -5728,8 +5753,6 @@ discard block |
||
| 5728 | 5753 | * Replaces "forbidden" characters in a filename string. |
| 5729 | 5754 | * |
| 5730 | 5755 | * @param string $filename |
| 5731 | - * @param int $length |
|
| 5732 | - * @param bool $file_name |
|
| 5733 | 5756 | * |
| 5734 | 5757 | * @return string |
| 5735 | 5758 | */ |
@@ -5965,6 +5988,7 @@ discard block |
||
| 5965 | 5988 | * @link http://php.net/manual/en/function.getimagesize.php |
| 5966 | 5989 | * @link http://www.dokeos.com/forum/viewtopic.php?t=12345 |
| 5967 | 5990 | * @link http://www.dokeos.com/forum/viewtopic.php?t=16355 |
| 5991 | + * @return integer |
|
| 5968 | 5992 | */ |
| 5969 | 5993 | function api_getimagesize($path) { |
| 5970 | 5994 | $image = new Image($path); |
@@ -6125,6 +6149,7 @@ discard block |
||
| 6125 | 6149 | * with his user id and the access_url_id=1 |
| 6126 | 6150 | * |
| 6127 | 6151 | * @author Julio Montoya |
| 6152 | + * @param integer $user_id |
|
| 6128 | 6153 | */ |
| 6129 | 6154 | function api_is_global_platform_admin($user_id = null) |
| 6130 | 6155 | { |
@@ -6186,7 +6211,7 @@ discard block |
||
| 6186 | 6211 | * @param int $admin_id_to_check |
| 6187 | 6212 | * @param int $my_user_id |
| 6188 | 6213 | * @param bool $allow_session_admin |
| 6189 | - * @return bool |
|
| 6214 | + * @return boolean|null |
|
| 6190 | 6215 | */ |
| 6191 | 6216 | function api_protect_super_admin($admin_id_to_check, $my_user_id = null, $allow_session_admin = false) |
| 6192 | 6217 | { |
@@ -6428,6 +6453,7 @@ discard block |
||
| 6428 | 6453 | |
| 6429 | 6454 | /** |
| 6430 | 6455 | * Returns the <link> HTML tag |
| 6456 | + * @param string $file |
|
| 6431 | 6457 | */ |
| 6432 | 6458 | function api_get_css($file, $media = 'screen') { |
| 6433 | 6459 | return '<link href="'.$file.'" rel="stylesheet" media="'.$media.'" type="text/css" />'."\n"; |
@@ -6555,7 +6581,8 @@ discard block |
||
| 6555 | 6581 | * This function relies on api_get_course_info() |
| 6556 | 6582 | * @param string The course code - optional (takes it from session if not given) |
| 6557 | 6583 | * @param int The session id - optional (takes it from session if not given) |
| 6558 | - * @return mixed The URL of the course or null if something does not work |
|
| 6584 | + * @param integer $session_id |
|
| 6585 | + * @return string|null The URL of the course or null if something does not work |
|
| 6559 | 6586 | * @author Julio Montoya <[email protected]> |
| 6560 | 6587 | */ |
| 6561 | 6588 | function api_get_course_url($course_code = null, $session_id = null) |
@@ -6670,7 +6697,7 @@ discard block |
||
| 6670 | 6697 | * @param int LINK_EXERCISE, LINK_STUDENTPUBLICATION, LINK_LEARNPATH LINK_FORUM_THREAD, LINK_ATTENDANCE |
| 6671 | 6698 | * see gradebook/lib/be/linkfactory |
| 6672 | 6699 | * @param string course code |
| 6673 | - * @return boolean |
|
| 6700 | + * @return false|null |
|
| 6674 | 6701 | */ |
| 6675 | 6702 | function api_block_course_item_locked_by_gradebook($item_id, $link_type, $course_code = null) { |
| 6676 | 6703 | if (api_is_platform_admin()) { |
@@ -6711,7 +6738,7 @@ discard block |
||
| 6711 | 6738 | /** |
| 6712 | 6739 | * Returns an array of global configuration settings which should be ignored |
| 6713 | 6740 | * when printing the configuration settings screens |
| 6714 | - * @return array Array of strings, each identifying one of the excluded settings |
|
| 6741 | + * @return string[] Array of strings, each identifying one of the excluded settings |
|
| 6715 | 6742 | */ |
| 6716 | 6743 | function api_get_locked_settings() { |
| 6717 | 6744 | return array( |
@@ -6754,7 +6781,7 @@ discard block |
||
| 6754 | 6781 | * false if he isn't. If the user ID is given and is an integer, then the same |
| 6755 | 6782 | * ID is simply returned |
| 6756 | 6783 | * @param integer User ID |
| 6757 | - * @return mixed Integer User ID is logged in, or false otherwise |
|
| 6784 | + * @return boolean Integer User ID is logged in, or false otherwise |
|
| 6758 | 6785 | */ |
| 6759 | 6786 | function api_user_is_login($user_id = null) { |
| 6760 | 6787 | $user_id = empty($user_id) ? api_get_user_id() : intval($user_id); |
@@ -6789,6 +6816,7 @@ discard block |
||
| 6789 | 6816 | * Checks whether an IP is included inside an IP range |
| 6790 | 6817 | * @param string IP address |
| 6791 | 6818 | * @param string IP range |
| 6819 | + * @param string $ip |
|
| 6792 | 6820 | * @return bool True if IP is in the range, false otherwise |
| 6793 | 6821 | * @author claudiu at cnixs dot com on http://www.php.net/manual/fr/ref.network.php#55230 |
| 6794 | 6822 | * @author Yannick Warnier for improvements and managment of multiple ranges |
@@ -7172,6 +7200,7 @@ discard block |
||
| 7172 | 7200 | /** |
| 7173 | 7201 | * Tries to set memory limit, if authorized and new limit is higher than current |
| 7174 | 7202 | * @param string New memory limit |
| 7203 | + * @param string $mem |
|
| 7175 | 7204 | * @return bool True on success, false on failure or current is higher than suggested |
| 7176 | 7205 | * @assert (null) === false |
| 7177 | 7206 | * @assert (-1) === false |
@@ -7228,7 +7257,6 @@ discard block |
||
| 7228 | 7257 | |
| 7229 | 7258 | /** |
| 7230 | 7259 | * Finds all the information about a user from username instead of user id |
| 7231 | - * @param string $username |
|
| 7232 | 7260 | * |
| 7233 | 7261 | * @return array $user_info user_id, lastname, firstname, username, email, ... |
| 7234 | 7262 | * @author Yannick Warnier <[email protected]> |
@@ -7250,7 +7278,6 @@ discard block |
||
| 7250 | 7278 | |
| 7251 | 7279 | /** |
| 7252 | 7280 | * |
| 7253 | - * @param string $inputId the jquery id example: #password |
|
| 7254 | 7281 | * |
| 7255 | 7282 | * @return string |
| 7256 | 7283 | */ |
@@ -7375,6 +7402,7 @@ discard block |
||
| 7375 | 7402 | /** |
| 7376 | 7403 | * Remove tags from HTML anf return the $in_number_char first non-HTML char |
| 7377 | 7404 | * Postfix the text with "..." if it has been truncated. |
| 7405 | + * @param integer $in_number_char |
|
| 7378 | 7406 | * @return string |
| 7379 | 7407 | * @author hubert borderiou |
| 7380 | 7408 | */ |
@@ -7419,7 +7447,7 @@ discard block |
||
| 7419 | 7447 | /** |
| 7420 | 7448 | * @param string $tool |
| 7421 | 7449 | * @param string $setting |
| 7422 | - * @param mixed $defaultValue |
|
| 7450 | + * @param integer $defaultValue |
|
| 7423 | 7451 | * @return string |
| 7424 | 7452 | */ |
| 7425 | 7453 | function api_get_default_tool_setting($tool, $setting, $defaultValue) |
@@ -7544,7 +7572,7 @@ discard block |
||
| 7544 | 7572 | } |
| 7545 | 7573 | |
| 7546 | 7574 | /** |
| 7547 | - * @return true if course_code for direct course access after login is set |
|
| 7575 | + * @return boolean if course_code for direct course access after login is set |
|
| 7548 | 7576 | */ |
| 7549 | 7577 | function exist_firstpage_parameter() |
| 7550 | 7578 | { |
@@ -7836,7 +7864,7 @@ discard block |
||
| 7836 | 7864 | * @param array data file (path and filename) |
| 7837 | 7865 | * @param array data to attach a file (optional) |
| 7838 | 7866 | * @param bool True for attaching a embedded file inside content html (optional) |
| 7839 | - * @return returns true if mail was sent |
|
| 7867 | + * @return integer true if mail was sent |
|
| 7840 | 7868 | * @see class.phpmailer.php |
| 7841 | 7869 | */ |
| 7842 | 7870 | function api_mail_html( |
@@ -610,7 +610,6 @@ discard block |
||
| 610 | 610 | * The other configuration parameters have not been changed. |
| 611 | 611 | * |
| 612 | 612 | * This is how we can get most used paths, for common purpose: |
| 613 | - |
|
| 614 | 613 | * api_get_path(REL_PATH) /chamilo/ |
| 615 | 614 | * api_get_path(REL_COURSE_PATH) /chamilo/courses/ |
| 616 | 615 | * api_get_path(REL_CODE_PATH) /chamilo/main/ |
@@ -1789,7 +1788,6 @@ discard block |
||
| 1789 | 1788 | |
| 1790 | 1789 | /** |
| 1791 | 1790 | * Returns the current course info array. |
| 1792 | - |
|
| 1793 | 1791 | * Now if the course_code is given, the returned array gives info about that |
| 1794 | 1792 | * particular course, not specially the current one. |
| 1795 | 1793 | * @param int $id Numeric ID of the course |
@@ -2723,7 +2721,7 @@ discard block |
||
| 2723 | 2721 | switch ($session_user_status) { |
| 2724 | 2722 | case 0: |
| 2725 | 2723 | $session_status['status'] = 'student'; |
| 2726 | - break; |
|
| 2724 | + break; |
|
| 2727 | 2725 | case 2: |
| 2728 | 2726 | $session_status['status'] = 'coach'; |
| 2729 | 2727 | break; |
@@ -6475,7 +6473,7 @@ discard block |
||
| 6475 | 6473 | function api_get_jquery_ui_js($include_jqgrid = false) { |
| 6476 | 6474 | $libraries = array(); |
| 6477 | 6475 | if ($include_jqgrid) { |
| 6478 | - $libraries[]='jqgrid'; |
|
| 6476 | + $libraries[]='jqgrid'; |
|
| 6479 | 6477 | } |
| 6480 | 6478 | return api_get_jquery_libraries_js($libraries); |
| 6481 | 6479 | } |
@@ -6683,10 +6681,10 @@ discard block |
||
| 6683 | 6681 | } |
| 6684 | 6682 | } |
| 6685 | 6683 | /** |
| 6686 | - * Checks the PHP version installed is enough to run Chamilo |
|
| 6687 | - * @param string Include path (used to load the error page) |
|
| 6688 | - * @return void |
|
| 6689 | - */ |
|
| 6684 | + * Checks the PHP version installed is enough to run Chamilo |
|
| 6685 | + * @param string Include path (used to load the error page) |
|
| 6686 | + * @return void |
|
| 6687 | + */ |
|
| 6690 | 6688 | function api_check_php_version($my_inc_path = null) { |
| 6691 | 6689 | if (!function_exists('version_compare') || version_compare( phpversion(), REQUIRED_PHP_VERSION, '<')) { |
| 6692 | 6690 | $global_error_code = 1; |
@@ -6699,9 +6697,9 @@ discard block |
||
| 6699 | 6697 | } |
| 6700 | 6698 | } |
| 6701 | 6699 | /** |
| 6702 | - * Checks whether the Archive directory is present and writeable. If not, |
|
| 6703 | - * prints a warning message. |
|
| 6704 | - */ |
|
| 6700 | + * Checks whether the Archive directory is present and writeable. If not, |
|
| 6701 | + * prints a warning message. |
|
| 6702 | + */ |
|
| 6705 | 6703 | function api_check_archive_dir() { |
| 6706 | 6704 | if (is_dir(api_get_path(SYS_ARCHIVE_PATH)) && !is_writable(api_get_path(SYS_ARCHIVE_PATH))) { |
| 6707 | 6705 | $message = Display::return_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'),'warning'); |
@@ -6709,10 +6707,10 @@ discard block |
||
| 6709 | 6707 | } |
| 6710 | 6708 | } |
| 6711 | 6709 | /** |
| 6712 | - * Returns an array of global configuration settings which should be ignored |
|
| 6713 | - * when printing the configuration settings screens |
|
| 6714 | - * @return array Array of strings, each identifying one of the excluded settings |
|
| 6715 | - */ |
|
| 6710 | + * Returns an array of global configuration settings which should be ignored |
|
| 6711 | + * when printing the configuration settings screens |
|
| 6712 | + * @return array Array of strings, each identifying one of the excluded settings |
|
| 6713 | + */ |
|
| 6716 | 6714 | function api_get_locked_settings() { |
| 6717 | 6715 | return array( |
| 6718 | 6716 | 'server_type', |
@@ -39,19 +39,19 @@ discard block |
||
| 39 | 39 | define('PLATFORM_ADMIN', 11); |
| 40 | 40 | define('SESSION_COURSE_COACH', 12); |
| 41 | 41 | define('SESSION_GENERAL_COACH', 13); |
| 42 | -define('COURSE_STUDENT', 14); //student subscribed in a course |
|
| 43 | -define('SESSION_STUDENT', 15); //student subscribed in a session course |
|
| 42 | +define('COURSE_STUDENT', 14); //student subscribed in a course |
|
| 43 | +define('SESSION_STUDENT', 15); //student subscribed in a session course |
|
| 44 | 44 | define('COURSE_TUTOR', 16); // student is tutor of a course (NOT in session) |
| 45 | 45 | define('STUDENT_BOSS', 17); // student is boss |
| 46 | 46 | define('INVITEE', 20); |
| 47 | 47 | |
| 48 | 48 | // Table of status |
| 49 | -$_status_list[COURSEMANAGER] = 'teacher'; // 1 |
|
| 50 | -$_status_list[SESSIONADMIN] = 'session_admin'; // 3 |
|
| 51 | -$_status_list[DRH] = 'drh'; // 4 |
|
| 52 | -$_status_list[STUDENT] = 'user'; // 5 |
|
| 53 | -$_status_list[ANONYMOUS] = 'anonymous'; // 6 |
|
| 54 | -$_status_list[INVITEE] = 'invited'; // 20 |
|
| 49 | +$_status_list[COURSEMANAGER] = 'teacher'; // 1 |
|
| 50 | +$_status_list[SESSIONADMIN] = 'session_admin'; // 3 |
|
| 51 | +$_status_list[DRH] = 'drh'; // 4 |
|
| 52 | +$_status_list[STUDENT] = 'user'; // 5 |
|
| 53 | +$_status_list[ANONYMOUS] = 'anonymous'; // 6 |
|
| 54 | +$_status_list[INVITEE] = 'invited'; // 20 |
|
| 55 | 55 | |
| 56 | 56 | // COURSE VISIBILITY CONSTANTS |
| 57 | 57 | /** only visible for course admin */ |
@@ -264,14 +264,14 @@ discard block |
||
| 264 | 264 | define('IS_WINDOWS_OS', api_is_windows_os()); |
| 265 | 265 | |
| 266 | 266 | // Checks for installed optional php-extensions. |
| 267 | -define('INTL_INSTALLED', function_exists('intl_get_error_code')); // intl extension (from PECL), it is installed by default as of PHP 5.3.0 |
|
| 268 | -define('ICONV_INSTALLED', function_exists('iconv')); // iconv extension, for PHP5 on Windows it is installed by default. |
|
| 269 | -define('MBSTRING_INSTALLED', function_exists('mb_strlen')); // mbstring extension. |
|
| 267 | +define('INTL_INSTALLED', function_exists('intl_get_error_code')); // intl extension (from PECL), it is installed by default as of PHP 5.3.0 |
|
| 268 | +define('ICONV_INSTALLED', function_exists('iconv')); // iconv extension, for PHP5 on Windows it is installed by default. |
|
| 269 | +define('MBSTRING_INSTALLED', function_exists('mb_strlen')); // mbstring extension. |
|
| 270 | 270 | |
| 271 | 271 | // Patterns for processing paths. // Examples: |
| 272 | -define('REPEATED_SLASHES_PURIFIER', '/\/{2,}/'); // $path = preg_replace(REPEATED_SLASHES_PURIFIER, '/', $path); |
|
| 273 | -define('VALID_WEB_PATH', '/https?:\/\/[^\/]*(\/.*)?/i'); // $is_valid_path = preg_match(VALID_WEB_PATH, $path); |
|
| 274 | -define('VALID_WEB_SERVER_BASE', '/https?:\/\/[^\/]*/i'); // $new_path = preg_replace(VALID_WEB_SERVER_BASE, $new_base, $path); |
|
| 272 | +define('REPEATED_SLASHES_PURIFIER', '/\/{2,}/'); // $path = preg_replace(REPEATED_SLASHES_PURIFIER, '/', $path); |
|
| 273 | +define('VALID_WEB_PATH', '/https?:\/\/[^\/]*(\/.*)?/i'); // $is_valid_path = preg_match(VALID_WEB_PATH, $path); |
|
| 274 | +define('VALID_WEB_SERVER_BASE', '/https?:\/\/[^\/]*/i'); // $new_path = preg_replace(VALID_WEB_SERVER_BASE, $new_base, $path); |
|
| 275 | 275 | |
| 276 | 276 | // Constants for api_get_path() and api_get_path_type(), etc. - registered path types. |
| 277 | 277 | define('WEB_PATH', 'WEB_PATH'); |
@@ -375,19 +375,19 @@ discard block |
||
| 375 | 375 | define('LINK_HOTPOTATOES', 9); |
| 376 | 376 | |
| 377 | 377 | // Score display types constants |
| 378 | -define('SCORE_DIV', 1); // X / Y |
|
| 379 | -define('SCORE_PERCENT', 2); // XX % |
|
| 380 | -define('SCORE_DIV_PERCENT', 3); // X / Y (XX %) |
|
| 381 | -define('SCORE_AVERAGE', 4); // XX % |
|
| 382 | -define('SCORE_DECIMAL', 5); // 0.50 (X/Y) |
|
| 383 | -define('SCORE_BAR', 6); // Uses the Display::bar_progress function |
|
| 384 | -define('SCORE_SIMPLE', 7); // X |
|
| 385 | -define('SCORE_IGNORE_SPLIT', 8); // ?? |
|
| 386 | -define('SCORE_DIV_PERCENT_WITH_CUSTOM', 9); // X / Y (XX %) - Good! |
|
| 387 | -define('SCORE_CUSTOM', 10); // Good! |
|
| 388 | -define('SCORE_DIV_SIMPLE_WITH_CUSTOM', 11); // X - Good! |
|
| 389 | -define('SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS', 12); // X - Good! |
|
| 390 | -define('SCORE_ONLY_SCORE', 13); // X - Good! |
|
| 378 | +define('SCORE_DIV', 1); // X / Y |
|
| 379 | +define('SCORE_PERCENT', 2); // XX % |
|
| 380 | +define('SCORE_DIV_PERCENT', 3); // X / Y (XX %) |
|
| 381 | +define('SCORE_AVERAGE', 4); // XX % |
|
| 382 | +define('SCORE_DECIMAL', 5); // 0.50 (X/Y) |
|
| 383 | +define('SCORE_BAR', 6); // Uses the Display::bar_progress function |
|
| 384 | +define('SCORE_SIMPLE', 7); // X |
|
| 385 | +define('SCORE_IGNORE_SPLIT', 8); // ?? |
|
| 386 | +define('SCORE_DIV_PERCENT_WITH_CUSTOM', 9); // X / Y (XX %) - Good! |
|
| 387 | +define('SCORE_CUSTOM', 10); // Good! |
|
| 388 | +define('SCORE_DIV_SIMPLE_WITH_CUSTOM', 11); // X - Good! |
|
| 389 | +define('SCORE_DIV_SIMPLE_WITH_CUSTOM_LETTERS', 12); // X - Good! |
|
| 390 | +define('SCORE_ONLY_SCORE', 13); // X - Good! |
|
| 391 | 391 | |
| 392 | 392 | define('SCORE_BOTH', 1); |
| 393 | 393 | define('SCORE_ONLY_DEFAULT', 2); |
@@ -555,8 +555,8 @@ discard block |
||
| 555 | 555 | define('TIMELINE_STATUS_INACTIVE', '2'); |
| 556 | 556 | |
| 557 | 557 | // Event email template class |
| 558 | -define ('EVENT_EMAIL_TEMPLATE_ACTIVE', 1); |
|
| 559 | -define ('EVENT_EMAIL_TEMPLATE_INACTIVE', 0); |
|
| 558 | +define('EVENT_EMAIL_TEMPLATE_ACTIVE', 1); |
|
| 559 | +define('EVENT_EMAIL_TEMPLATE_INACTIVE', 0); |
|
| 560 | 560 | |
| 561 | 561 | // Course home |
| 562 | 562 | define('SHORTCUTS_HORIZONTAL', 0); |
@@ -732,7 +732,7 @@ discard block |
||
| 732 | 732 | |
| 733 | 733 | // To avoid that the api_get_access_url() function fails since global.inc.php also calls the main_api.lib.php |
| 734 | 734 | if ($path_type == WEB_PATH) { |
| 735 | - if (isset($_configuration['access_url']) && $_configuration['access_url'] != 1) { |
|
| 735 | + if (isset($_configuration['access_url']) && $_configuration['access_url'] != 1) { |
|
| 736 | 736 | //we look into the DB the function api_get_access_url |
| 737 | 737 | $url_info = api_get_access_url($_configuration['access_url']); |
| 738 | 738 | $root_web = $url_info['active'] == 1 ? $url_info['url'] : $_configuration['root_web']; |
@@ -762,8 +762,8 @@ discard block |
||
| 762 | 762 | : 'localhost'))); |
| 763 | 763 | if (isset($_SERVER['SERVER_PORT']) && !strpos($server_name, ':') |
| 764 | 764 | && (($server_protocol == 'http' |
| 765 | - && $_SERVER['SERVER_PORT'] != 80 ) || ($server_protocol == 'https' && $_SERVER['SERVER_PORT'] != 443 ))) { |
|
| 766 | - $server_name .= ":" . $_SERVER['SERVER_PORT']; |
|
| 765 | + && $_SERVER['SERVER_PORT'] != 80) || ($server_protocol == 'https' && $_SERVER['SERVER_PORT'] != 443))) { |
|
| 766 | + $server_name .= ":".$_SERVER['SERVER_PORT']; |
|
| 767 | 767 | } |
| 768 | 768 | $root_web = $server_protocol.'://'.$server_name.$root_rel; |
| 769 | 769 | $root_sys = str_replace('\\', '/', realpath(__DIR__.'/../../../')).'/'; |
@@ -937,7 +937,7 @@ discard block |
||
| 937 | 937 | $sys_course_code = |
| 938 | 938 | isset($_SESSION['_course']['sysCode']) // User is inside a course? |
| 939 | 939 | ? $_SESSION['_course']['sysCode'] // Yes, then use course's directory name. |
| 940 | - : '{SYS_COURSE_CODE}'; // No, then use a fake code, it may be processed later. |
|
| 940 | + : '{SYS_COURSE_CODE}'; // No, then use a fake code, it may be processed later. |
|
| 941 | 941 | $path = $matches[1].'courses/'.$sys_course_code.'/document/'.str_replace('//', '/', $matches[3].'/'.$matches[2]); |
| 942 | 942 | } |
| 943 | 943 | } |
@@ -981,15 +981,15 @@ discard block |
||
| 981 | 981 | { |
| 982 | 982 | global $_configuration; |
| 983 | 983 | $web_root = api_get_path(WEB_PATH); |
| 984 | - $ext = substr($web_path,strrpos($web_path,'.')); |
|
| 984 | + $ext = substr($web_path, strrpos($web_path, '.')); |
|
| 985 | 985 | if (isset($ext[2])) { // faster version of strlen to check if len>2 |
| 986 | 986 | // Check for CDN definitions |
| 987 | 987 | if (!empty($_configuration['cdn_enable']) && !empty($ext)) { |
| 988 | 988 | foreach ($_configuration['cdn'] as $host => $exts) { |
| 989 | - if (in_array($ext,$exts)) { |
|
| 989 | + if (in_array($ext, $exts)) { |
|
| 990 | 990 | //Use host as defined in $_configuration['cdn'], without |
| 991 | 991 | // trailing slash |
| 992 | - return str_replace($web_root,$host.'/',$web_path); |
|
| 992 | + return str_replace($web_root, $host.'/', $web_path); |
|
| 993 | 993 | } |
| 994 | 994 | } |
| 995 | 995 | } |
@@ -1438,10 +1438,10 @@ discard block |
||
| 1438 | 1438 | |
| 1439 | 1439 | if (isset($user['email'])) { |
| 1440 | 1440 | $result['mail'] = isset($user['email']) ? $user['email'] : null; |
| 1441 | - $result['email'] = isset($user['email'])? $user['email'] : null; |
|
| 1441 | + $result['email'] = isset($user['email']) ? $user['email'] : null; |
|
| 1442 | 1442 | } else { |
| 1443 | 1443 | $result['mail'] = isset($user['mail']) ? $user['mail'] : null; |
| 1444 | - $result['email'] = isset($user['mail'])? $user['mail'] : null; |
|
| 1444 | + $result['email'] = isset($user['mail']) ? $user['mail'] : null; |
|
| 1445 | 1445 | } |
| 1446 | 1446 | $user_id = intval($user['user_id']); |
| 1447 | 1447 | // Maintain the user_id index for backwards compatibility |
@@ -1866,7 +1866,7 @@ discard block |
||
| 1866 | 1866 | $_course['unsubscribe'] = $course_data['unsubscribe']; |
| 1867 | 1867 | |
| 1868 | 1868 | $_course['course_language'] = $course_data['course_language']; |
| 1869 | - $_course['activate_legal'] = isset($course_data['activate_legal']) ? $course_data['activate_legal'] : false;; |
|
| 1869 | + $_course['activate_legal'] = isset($course_data['activate_legal']) ? $course_data['activate_legal'] : false; ; |
|
| 1870 | 1870 | $_course['legal'] = $course_data['legal']; |
| 1871 | 1871 | $_course['show_score'] = $course_data['show_score']; //used in the work tool |
| 1872 | 1872 | $_course['department_name'] = $course_data['department_name']; |
@@ -1891,7 +1891,7 @@ discard block |
||
| 1891 | 1891 | if (file_exists(api_get_path(SYS_COURSE_PATH).$course_data['directory'].'/course-pic.png')) { |
| 1892 | 1892 | $url_image = api_get_path(WEB_COURSE_PATH).$course_data['directory'].'/course-pic.png'; |
| 1893 | 1893 | } else { |
| 1894 | - $url_image = Display::return_icon('session_default.png',null,null,null,null,true); |
|
| 1894 | + $url_image = Display::return_icon('session_default.png', null, null, null, null, true); |
|
| 1895 | 1895 | } |
| 1896 | 1896 | $_course['course_image_large'] = $url_image; |
| 1897 | 1897 | |
@@ -1921,7 +1921,7 @@ discard block |
||
| 1921 | 1921 | foreach ($param_list1 as $key => $enreg) { |
| 1922 | 1922 | list ($param_list1_keys[$key], $param_list1_vals[$key]) = explode('=', $enreg); |
| 1923 | 1923 | } |
| 1924 | - $param_list1 = array ('keys' => $param_list1_keys, 'vals' => $param_list1_vals); |
|
| 1924 | + $param_list1 = array('keys' => $param_list1_keys, 'vals' => $param_list1_vals); |
|
| 1925 | 1925 | foreach ($param_list2 as $enreg) { |
| 1926 | 1926 | $enreg = explode('=', $enreg); |
| 1927 | 1927 | $key = array_search($enreg[0], $param_list1['keys']); |
@@ -1951,7 +1951,7 @@ discard block |
||
| 1951 | 1951 | $length = 2; |
| 1952 | 1952 | } |
| 1953 | 1953 | $password = ''; |
| 1954 | - for ($i = 0; $i < $length; $i ++) { |
|
| 1954 | + for ($i = 0; $i < $length; $i++) { |
|
| 1955 | 1955 | $password .= $characters[rand() % strlen($characters)]; |
| 1956 | 1956 | } |
| 1957 | 1957 | return $password; |
@@ -1978,10 +1978,10 @@ discard block |
||
| 1978 | 1978 | $digits = 0; |
| 1979 | 1979 | $consequent_characters = 0; |
| 1980 | 1980 | $previous_character_code = 0; |
| 1981 | - for ($i = 0; $i < $password_length; $i ++) { |
|
| 1981 | + for ($i = 0; $i < $password_length; $i++) { |
|
| 1982 | 1982 | $current_character_code = api_ord(api_substr($password, $i, 1)); |
| 1983 | 1983 | if ($i && abs($current_character_code - $previous_character_code) <= 1) { |
| 1984 | - $consequent_characters ++; |
|
| 1984 | + $consequent_characters++; |
|
| 1985 | 1985 | if ($consequent_characters == 3) { |
| 1986 | 1986 | return false; |
| 1987 | 1987 | } |
@@ -1989,9 +1989,9 @@ discard block |
||
| 1989 | 1989 | $consequent_characters = 1; |
| 1990 | 1990 | } |
| 1991 | 1991 | if ($current_character_code >= 97 && $current_character_code <= 122) { |
| 1992 | - $letters ++; |
|
| 1992 | + $letters++; |
|
| 1993 | 1993 | } elseif ($current_character_code >= 48 && $current_character_code <= 57) { |
| 1994 | - $digits ++; |
|
| 1994 | + $digits++; |
|
| 1995 | 1995 | } else { |
| 1996 | 1996 | return false; |
| 1997 | 1997 | } |
@@ -2187,7 +2187,7 @@ discard block |
||
| 2187 | 2187 | if (empty($session_id)) { return null; } |
| 2188 | 2188 | } |
| 2189 | 2189 | $t = Database::get_main_table(TABLE_MAIN_SESSION); |
| 2190 | - $s = "SELECT name FROM $t WHERE id = ".(int)$session_id; |
|
| 2190 | + $s = "SELECT name FROM $t WHERE id = ".(int) $session_id; |
|
| 2191 | 2191 | $r = Database::query($s); |
| 2192 | 2192 | $c = Database::num_rows($r); |
| 2193 | 2193 | if ($c > 0) { |
@@ -2212,7 +2212,7 @@ discard block |
||
| 2212 | 2212 | $sql = "SELECT * FROM $tbl_session WHERE id = $session_id"; |
| 2213 | 2213 | $result = Database::query($sql); |
| 2214 | 2214 | |
| 2215 | - if (Database::num_rows($result)>0) { |
|
| 2215 | + if (Database::num_rows($result) > 0) { |
|
| 2216 | 2216 | $data = Database::fetch_array($result, 'ASSOC'); |
| 2217 | 2217 | } |
| 2218 | 2218 | } |
@@ -2372,9 +2372,9 @@ discard block |
||
| 2372 | 2372 | */ |
| 2373 | 2373 | function api_get_session_image($session_id, $status_id) |
| 2374 | 2374 | { |
| 2375 | - $session_id = (int)$session_id; |
|
| 2375 | + $session_id = (int) $session_id; |
|
| 2376 | 2376 | $session_img = ''; |
| 2377 | - if ((int)$status_id != 5) { //check whether is not a student |
|
| 2377 | + if ((int) $status_id != 5) { //check whether is not a student |
|
| 2378 | 2378 | if ($session_id > 0) { |
| 2379 | 2379 | $session_img = " ".Display::return_icon( |
| 2380 | 2380 | 'star.png', |
@@ -2489,7 +2489,7 @@ discard block |
||
| 2489 | 2489 | $filename = api_get_path(SYS_PATH).api_get_home_path().'header_extra_content.txt'; |
| 2490 | 2490 | if (file_exists($filename)) { |
| 2491 | 2491 | $value = file_get_contents($filename); |
| 2492 | - return $value ; |
|
| 2492 | + return $value; |
|
| 2493 | 2493 | } else { |
| 2494 | 2494 | return ''; |
| 2495 | 2495 | } |
@@ -2498,7 +2498,7 @@ discard block |
||
| 2498 | 2498 | $filename = api_get_path(SYS_PATH).api_get_home_path().'footer_extra_content.txt'; |
| 2499 | 2499 | if (file_exists($filename)) { |
| 2500 | 2500 | $value = file_get_contents($filename); |
| 2501 | - return $value ; |
|
| 2501 | + return $value; |
|
| 2502 | 2502 | } else { |
| 2503 | 2503 | return ''; |
| 2504 | 2504 | } |
@@ -2692,7 +2692,7 @@ discard block |
||
| 2692 | 2692 | } |
| 2693 | 2693 | $group_id = api_get_group_id(); |
| 2694 | 2694 | $course_id = api_get_course_int_id(); |
| 2695 | - $course_code= api_get_course_id(); |
|
| 2695 | + $course_code = api_get_course_id(); |
|
| 2696 | 2696 | $session_id = api_get_session_id(); |
| 2697 | 2697 | |
| 2698 | 2698 | //Group (in course) |
@@ -2700,7 +2700,7 @@ discard block |
||
| 2700 | 2700 | $group_status = array(); |
| 2701 | 2701 | $is_subscribed = GroupManager::is_subscribed($user_id, $group_id); |
| 2702 | 2702 | if ($is_subscribed) { |
| 2703 | - $group_status = array('id'=> $group_id , 'status' => 'student'); |
|
| 2703 | + $group_status = array('id'=> $group_id, 'status' => 'student'); |
|
| 2704 | 2704 | $is_tutor = GroupManager::is_tutor_of_group($user_id, $group_id); |
| 2705 | 2705 | if ($is_tutor) { |
| 2706 | 2706 | $group_status['status'] = 'tutor'; |
@@ -2734,7 +2734,7 @@ discard block |
||
| 2734 | 2734 | } |
| 2735 | 2735 | $status['session'] = $session_status; |
| 2736 | 2736 | |
| 2737 | - } elseif($course_id) { |
|
| 2737 | + } elseif ($course_id) { |
|
| 2738 | 2738 | //Course |
| 2739 | 2739 | $course_status = array(); |
| 2740 | 2740 | if ($course_id) { |
@@ -2742,7 +2742,7 @@ discard block |
||
| 2742 | 2742 | |
| 2743 | 2743 | if ($user_course_status) { |
| 2744 | 2744 | $course_status = array('id'=> $course_id); |
| 2745 | - switch($user_course_status) { |
|
| 2745 | + switch ($user_course_status) { |
|
| 2746 | 2746 | case 1; |
| 2747 | 2747 | $course_status['status'] = 'teacher'; |
| 2748 | 2748 | break; |
@@ -2772,7 +2772,7 @@ discard block |
||
| 2772 | 2772 | function api_is_course_session_coach($user_id, $courseId, $session_id) |
| 2773 | 2773 | { |
| 2774 | 2774 | $session_table = Database::get_main_table(TABLE_MAIN_SESSION); |
| 2775 | - $session_rel_course_rel_user_table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
| 2775 | + $session_rel_course_rel_user_table = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
| 2776 | 2776 | |
| 2777 | 2777 | $user_id = intval($user_id); |
| 2778 | 2778 | $session_id = intval($session_id); |
@@ -2846,7 +2846,7 @@ discard block |
||
| 2846 | 2846 | ORDER BY access_start_date, access_end_date, name"; |
| 2847 | 2847 | $result = Database::query($sql); |
| 2848 | 2848 | if (!empty($sessionIsCoach)) { |
| 2849 | - $sessionIsCoach = array_merge($sessionIsCoach , Database::store_result($result)); |
|
| 2849 | + $sessionIsCoach = array_merge($sessionIsCoach, Database::store_result($result)); |
|
| 2850 | 2850 | } else { |
| 2851 | 2851 | $sessionIsCoach = Database::store_result($result); |
| 2852 | 2852 | } |
@@ -3023,7 +3023,7 @@ discard block |
||
| 3023 | 3023 | return ''; |
| 3024 | 3024 | } |
| 3025 | 3025 | $sourceurl = substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], '?')); |
| 3026 | - $sourceurl = str_replace('newscorm/lp_header.php', 'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.intval($_GET['lp_id']).'&isStudentView='.($_SESSION['studentview']=='studentview' ? 'false' : 'true'), $sourceurl); |
|
| 3026 | + $sourceurl = str_replace('newscorm/lp_header.php', 'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.intval($_GET['lp_id']).'&isStudentView='.($_SESSION['studentview'] == 'studentview' ? 'false' : 'true'), $sourceurl); |
|
| 3027 | 3027 | //showinframes doesn't handle student view anyway... |
| 3028 | 3028 | //return ''; |
| 3029 | 3029 | $is_framed = true; |
@@ -3422,7 +3422,7 @@ discard block |
||
| 3422 | 3422 | } |
| 3423 | 3423 | $content .= '<div class="well_login">'; |
| 3424 | 3424 | $content .= $form->return_form(); |
| 3425 | - $content .='</div>'; |
|
| 3425 | + $content .= '</div>'; |
|
| 3426 | 3426 | if (api_is_cas_activated()) { |
| 3427 | 3427 | $content .= "</div>"; |
| 3428 | 3428 | } |
@@ -3441,7 +3441,7 @@ discard block |
||
| 3441 | 3441 | exit; |
| 3442 | 3442 | } |
| 3443 | 3443 | |
| 3444 | - if ($user_id !=0 && !api_is_anonymous()) { |
|
| 3444 | + if ($user_id != 0 && !api_is_anonymous()) { |
|
| 3445 | 3445 | $tpl->display_one_col_template(); |
| 3446 | 3446 | exit; |
| 3447 | 3447 | } |
@@ -3472,7 +3472,7 @@ discard block |
||
| 3472 | 3472 | } |
| 3473 | 3473 | $msg .= '<div class="well">'; |
| 3474 | 3474 | $msg .= $form->return_form(); |
| 3475 | - $msg .='</div>'; |
|
| 3475 | + $msg .= '</div>'; |
|
| 3476 | 3476 | if (api_is_cas_activated()) { |
| 3477 | 3477 | $msg .= "</div>"; |
| 3478 | 3478 | } |
@@ -3508,7 +3508,7 @@ discard block |
||
| 3508 | 3508 | list ($last_post_date, $last_post_time) = explode(' ', $last_post_datetime); |
| 3509 | 3509 | list ($year, $month, $day) = explode('-', $last_post_date); |
| 3510 | 3510 | list ($hour, $min, $sec) = explode(':', $last_post_time); |
| 3511 | - return mktime((int)$hour, (int)$min, (int)$sec, (int)$month, (int)$day, (int)$year); |
|
| 3511 | + return mktime((int) $hour, (int) $min, (int) $sec, (int) $month, (int) $day, (int) $year); |
|
| 3512 | 3512 | } |
| 3513 | 3513 | |
| 3514 | 3514 | /** |
@@ -3959,7 +3959,7 @@ discard block |
||
| 3959 | 3959 | c_id = $course_id AND |
| 3960 | 3960 | tool = '$tool' |
| 3961 | 3961 | $session_condition "; |
| 3962 | - $rs = Database::query($sql); |
|
| 3962 | + $rs = Database::query($sql); |
|
| 3963 | 3963 | $list = array(); |
| 3964 | 3964 | if (Database::num_rows($rs) > 0) { |
| 3965 | 3965 | while ($row = Database::fetch_array($rs, 'ASSOC')) { |
@@ -4039,7 +4039,7 @@ discard block |
||
| 4039 | 4039 | tool = '$tool' AND |
| 4040 | 4040 | ref = $ref |
| 4041 | 4041 | $sessionCondition"; |
| 4042 | - $rs = Database::query($sql); |
|
| 4042 | + $rs = Database::query($sql); |
|
| 4043 | 4043 | $item_property_id = ''; |
| 4044 | 4044 | if (Database::num_rows($rs) > 0) { |
| 4045 | 4045 | $row = Database::fetch_array($rs); |
@@ -4097,7 +4097,7 @@ discard block |
||
| 4097 | 4097 | WHERE item_property_id = $item_property_id AND course_id = $course_id |
| 4098 | 4098 | ORDER BY lastedit_date DESC"; |
| 4099 | 4099 | $result = Database::query($sql); |
| 4100 | - $result = Database::store_result($result,'ASSOC'); |
|
| 4100 | + $result = Database::store_result($result, 'ASSOC'); |
|
| 4101 | 4101 | return $result; |
| 4102 | 4102 | } |
| 4103 | 4103 | |
@@ -4140,7 +4140,7 @@ discard block |
||
| 4140 | 4140 | $rs = Database::query($sql); |
| 4141 | 4141 | $row = array(); |
| 4142 | 4142 | if (Database::num_rows($rs) > 0) { |
| 4143 | - $row = Database::fetch_array($rs,'ASSOC'); |
|
| 4143 | + $row = Database::fetch_array($rs, 'ASSOC'); |
|
| 4144 | 4144 | } |
| 4145 | 4145 | |
| 4146 | 4146 | return $row; |
@@ -4175,7 +4175,7 @@ discard block |
||
| 4175 | 4175 | $languages = $language_list['name']; |
| 4176 | 4176 | $folder = $language_list['folder']; |
| 4177 | 4177 | |
| 4178 | - $ret .= '<select name="' . $name . '" id="language_chosen">'; |
|
| 4178 | + $ret .= '<select name="'.$name.'" id="language_chosen">'; |
|
| 4179 | 4179 | foreach ($languages as $key => $value) { |
| 4180 | 4180 | if ($folder[$key] == $default) { |
| 4181 | 4181 | $selected = ' selected="selected"'; |
@@ -4228,8 +4228,8 @@ discard block |
||
| 4228 | 4228 | //--> |
| 4229 | 4229 | </script>'; |
| 4230 | 4230 | $html .= '<form id="lang_form" name="lang_form" method="post" action="'.api_get_self().'">'; |
| 4231 | - $html .= '<label style="display: none;" for="language_list">' . get_lang('Language') . '</label>'; |
|
| 4232 | - $html .= '<select id="language_list" class="selectpicker show-tick form-control" name="language_list" >'; |
|
| 4231 | + $html .= '<label style="display: none;" for="language_list">'.get_lang('Language').'</label>'; |
|
| 4232 | + $html .= '<select id="language_list" class="selectpicker show-tick form-control" name="language_list" >'; |
|
| 4233 | 4233 | |
| 4234 | 4234 | foreach ($original_languages as $key => $value) { |
| 4235 | 4235 | if ($folder[$key] == $user_selected_language) { |
@@ -4237,13 +4237,13 @@ discard block |
||
| 4237 | 4237 | } else { |
| 4238 | 4238 | $option_end = '>'; |
| 4239 | 4239 | } |
| 4240 | - $html .= '<option value="'.api_get_self().'?language='.$folder[$key].'"'.$option_end; |
|
| 4240 | + $html .= '<option value="'.api_get_self().'?language='.$folder[$key].'"'.$option_end; |
|
| 4241 | 4241 | //echo substr($value, 0, 16); // Cut string to keep 800x600 aspect. |
| 4242 | - $html .= $value.'</option>'; |
|
| 4242 | + $html .= $value.'</option>'; |
|
| 4243 | 4243 | } |
| 4244 | - $html .= '</select>'; |
|
| 4245 | - $html .= '<noscript><input type="submit" name="user_select_language" value="'.get_lang('Ok').'" /></noscript>'; |
|
| 4246 | - $html .= '</form>'; |
|
| 4244 | + $html .= '</select>'; |
|
| 4245 | + $html .= '<noscript><input type="submit" name="user_select_language" value="'.get_lang('Ok').'" /></noscript>'; |
|
| 4246 | + $html .= '</form>'; |
|
| 4247 | 4247 | return $html; |
| 4248 | 4248 | } |
| 4249 | 4249 | |
@@ -4360,7 +4360,7 @@ discard block |
||
| 4360 | 4360 | $rs = Database::query($sql); |
| 4361 | 4361 | $language_info = array(); |
| 4362 | 4362 | if (Database::num_rows($rs)) { |
| 4363 | - $language_info = Database::fetch_array($rs,'ASSOC'); |
|
| 4363 | + $language_info = Database::fetch_array($rs, 'ASSOC'); |
|
| 4364 | 4364 | } |
| 4365 | 4365 | return $language_info; |
| 4366 | 4366 | } |
@@ -4435,7 +4435,7 @@ discard block |
||
| 4435 | 4435 | * Note: Directory names (names of themes) in the file system should contain ASCII-characters only. |
| 4436 | 4436 | */ |
| 4437 | 4437 | function api_get_themes() { |
| 4438 | - $cssdir = api_get_path(SYS_CSS_PATH) . 'themes/'; |
|
| 4438 | + $cssdir = api_get_path(SYS_CSS_PATH).'themes/'; |
|
| 4439 | 4439 | $list_dir = array(); |
| 4440 | 4440 | $list_name = array(); |
| 4441 | 4441 | |
@@ -4628,7 +4628,7 @@ discard block |
||
| 4628 | 4628 | if (is_file($dirname) || is_link($dirname)) { |
| 4629 | 4629 | $res = unlink($dirname); |
| 4630 | 4630 | if ($res === false) { |
| 4631 | - error_log(__FILE__.' line '.__LINE__.': '.((bool)ini_get('track_errors') ? $php_errormsg : 'Error not recorded because track_errors is off in your php.ini'), 0); |
|
| 4631 | + error_log(__FILE__.' line '.__LINE__.': '.((bool) ini_get('track_errors') ? $php_errormsg : 'Error not recorded because track_errors is off in your php.ini'), 0); |
|
| 4632 | 4632 | } |
| 4633 | 4633 | return $res; |
| 4634 | 4634 | } |
@@ -4665,7 +4665,7 @@ discard block |
||
| 4665 | 4665 | if ($delete_only_content_in_folder == false) { |
| 4666 | 4666 | $res = rmdir($dirname); |
| 4667 | 4667 | if ($res === false) { |
| 4668 | - error_log(__FILE__.' line '.__LINE__.': '.((bool)ini_get('track_errors') ? $php_errormsg : 'error not recorded because track_errors is off in your php.ini'), 0); |
|
| 4668 | + error_log(__FILE__.' line '.__LINE__.': '.((bool) ini_get('track_errors') ? $php_errormsg : 'error not recorded because track_errors is off in your php.ini'), 0); |
|
| 4669 | 4669 | } |
| 4670 | 4670 | } |
| 4671 | 4671 | return $res; |
@@ -4743,7 +4743,7 @@ discard block |
||
| 4743 | 4743 | |
| 4744 | 4744 | $course_id = $course_info['real_id']; |
| 4745 | 4745 | |
| 4746 | - $folders = explode(DIRECTORY_SEPARATOR,str_replace($base_path_document.DIRECTORY_SEPARATOR,'',$pathname)); |
|
| 4746 | + $folders = explode(DIRECTORY_SEPARATOR, str_replace($base_path_document.DIRECTORY_SEPARATOR, '', $pathname)); |
|
| 4747 | 4747 | |
| 4748 | 4748 | $new_pathname = $base_path_document; |
| 4749 | 4749 | $path = ''; |
@@ -4761,7 +4761,7 @@ discard block |
||
| 4761 | 4761 | path = '$path' AND |
| 4762 | 4762 | filetype = 'folder' AND |
| 4763 | 4763 | session_id = '$session_id'"; |
| 4764 | - $rs1 = Database::query($sql); |
|
| 4764 | + $rs1 = Database::query($sql); |
|
| 4765 | 4765 | $num_rows = Database::num_rows($rs1); |
| 4766 | 4766 | |
| 4767 | 4767 | if ($num_rows == 0) { |
@@ -4918,7 +4918,7 @@ discard block |
||
| 4918 | 4918 | foreach (array('key', 'value1', 'value2', 'value3') as $var) { |
| 4919 | 4919 | $$var = isset($match[++$i]) ? $match[$i] : ''; |
| 4920 | 4920 | } |
| 4921 | - $value = stripslashes(substr($value1, 1, -1)) . stripslashes(substr($value2, 1, -1)) . $value3; |
|
| 4921 | + $value = stripslashes(substr($value1, 1, -1)).stripslashes(substr($value2, 1, -1)).$value3; |
|
| 4922 | 4922 | |
| 4923 | 4923 | // Parse array syntax. |
| 4924 | 4924 | $keys = preg_split('/\]?\[/', rtrim($key, ']')); |
@@ -4958,7 +4958,7 @@ discard block |
||
| 4958 | 4958 | */ |
| 4959 | 4959 | function api_get_version() { |
| 4960 | 4960 | global $_configuration; |
| 4961 | - return (string)$_configuration['system_version']; |
|
| 4961 | + return (string) $_configuration['system_version']; |
|
| 4962 | 4962 | } |
| 4963 | 4963 | |
| 4964 | 4964 | /** |
@@ -5084,7 +5084,7 @@ discard block |
||
| 5084 | 5084 | $t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT); |
| 5085 | 5085 | $var = Database::escape_string($var); |
| 5086 | 5086 | $value = Database::escape_string($value); |
| 5087 | - $access_url = (int)$access_url; |
|
| 5087 | + $access_url = (int) $access_url; |
|
| 5088 | 5088 | if (empty($access_url)) { $access_url = 1; } |
| 5089 | 5089 | $select = "SELECT id FROM $t_settings WHERE variable = '$var' "; |
| 5090 | 5090 | if (!empty($subvar)) { |
@@ -5106,7 +5106,7 @@ discard block |
||
| 5106 | 5106 | // Found item for this access_url. |
| 5107 | 5107 | $row = Database::fetch_array($res); |
| 5108 | 5108 | $sql = "UPDATE $t_settings SET selected_value = '$value' |
| 5109 | - WHERE id = ".$row['id'] ; |
|
| 5109 | + WHERE id = ".$row['id']; |
|
| 5110 | 5110 | Database::query($sql); |
| 5111 | 5111 | } else { |
| 5112 | 5112 | // Item not found for this access_url, we have to check if it exist with access_url = 1 |
@@ -5127,11 +5127,11 @@ discard block |
||
| 5127 | 5127 | $row = Database::fetch_array($res); |
| 5128 | 5128 | $insert = "INSERT INTO $t_settings (variable, subkey, type,category, selected_value, title, comment, scope, subkeytext, access_url) |
| 5129 | 5129 | VALUES |
| 5130 | - ('".$row['variable']."',".(!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL")."," . |
|
| 5131 | - "'".$row['type']."','".$row['category']."'," . |
|
| 5132 | - "'$value','".$row['title']."'," . |
|
| 5133 | - "".(!empty($row['comment']) ? "'".$row['comment']."'" : "NULL").",".(!empty($row['scope']) ? "'".$row['scope']."'" : "NULL")."," . |
|
| 5134 | - "".(!empty($row['subkeytext'])?"'".$row['subkeytext']."'":"NULL").",$access_url)"; |
|
| 5130 | + ('".$row['variable']."',".(!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL").",". |
|
| 5131 | + "'".$row['type']."','".$row['category']."',". |
|
| 5132 | + "'$value','".$row['title']."',". |
|
| 5133 | + "".(!empty($row['comment']) ? "'".$row['comment']."'" : "NULL").",".(!empty($row['scope']) ? "'".$row['scope']."'" : "NULL").",". |
|
| 5134 | + "".(!empty($row['subkeytext']) ? "'".$row['subkeytext']."'" : "NULL").",$access_url)"; |
|
| 5135 | 5135 | Database::query($insert); |
| 5136 | 5136 | } else { // Such a setting does not exist. |
| 5137 | 5137 | error_log(__FILE__.':'.__LINE__.': Attempting to update setting '.$var.' ('.$subvar.') which does not exist at all', 0); |
@@ -5151,16 +5151,16 @@ discard block |
||
| 5151 | 5151 | if ($row['access_url_changeable'] == 1) { |
| 5152 | 5152 | $insert = "INSERT INTO $t_settings (variable,subkey, type,category, selected_value,title, comment,scope, subkeytext,access_url, access_url_changeable) VALUES |
| 5153 | 5153 | ('".$row['variable']."',". |
| 5154 | - (!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL")."," . |
|
| 5155 | - "'".$row['type']."','".$row['category']."'," . |
|
| 5156 | - "'$value','".$row['title']."'," . |
|
| 5154 | + (!empty($row['subkey']) ? "'".$row['subkey']."'" : "NULL").",". |
|
| 5155 | + "'".$row['type']."','".$row['category']."',". |
|
| 5156 | + "'$value','".$row['title']."',". |
|
| 5157 | 5157 | "".(!empty($row['comment']) ? "'".$row['comment']."'" : "NULL").",". |
| 5158 | - (!empty($row['scope']) ? "'".$row['scope']."'" : "NULL")."," . |
|
| 5158 | + (!empty($row['scope']) ? "'".$row['scope']."'" : "NULL").",". |
|
| 5159 | 5159 | "".(!empty($row['subkeytext']) ? "'".$row['subkeytext']."'" : "NULL").",$access_url,".$row['access_url_changeable'].")"; |
| 5160 | 5160 | Database::query($insert); |
| 5161 | 5161 | } |
| 5162 | 5162 | } else { // Such a setting does not exist. |
| 5163 | - error_log(__FILE__.':'.__LINE__.': Attempting to update setting '.$var.' ('.$subvar.') which does not exist at all. The access_url is: '.$access_url.' ',0); |
|
| 5163 | + error_log(__FILE__.':'.__LINE__.': Attempting to update setting '.$var.' ('.$subvar.') which does not exist at all. The access_url is: '.$access_url.' ', 0); |
|
| 5164 | 5164 | } |
| 5165 | 5165 | } |
| 5166 | 5166 | } |
@@ -5186,10 +5186,10 @@ discard block |
||
| 5186 | 5186 | $value = Database::escape_string($value); |
| 5187 | 5187 | $sql = "UPDATE $t_s SET selected_value = '$value' |
| 5188 | 5188 | WHERE category = '$category' AND access_url = $access_url"; |
| 5189 | - if (is_array($fieldtype) && count($fieldtype)>0) { |
|
| 5189 | + if (is_array($fieldtype) && count($fieldtype) > 0) { |
|
| 5190 | 5190 | $sql .= " AND ( "; |
| 5191 | 5191 | $i = 0; |
| 5192 | - foreach ($fieldtype as $type){ |
|
| 5192 | + foreach ($fieldtype as $type) { |
|
| 5193 | 5193 | if ($i > 0) { |
| 5194 | 5194 | $sql .= ' OR '; |
| 5195 | 5195 | } |
@@ -5204,10 +5204,10 @@ discard block |
||
| 5204 | 5204 | } else { |
| 5205 | 5205 | $sql = "UPDATE $t_s SET selected_value = NULL |
| 5206 | 5206 | WHERE category = '$category' AND access_url = $access_url"; |
| 5207 | - if (is_array($fieldtype) && count($fieldtype)>0) { |
|
| 5207 | + if (is_array($fieldtype) && count($fieldtype) > 0) { |
|
| 5208 | 5208 | $sql .= " AND ( "; |
| 5209 | 5209 | $i = 0; |
| 5210 | - foreach ($fieldtype as $type){ |
|
| 5210 | + foreach ($fieldtype as $type) { |
|
| 5211 | 5211 | if ($i > 0) { |
| 5212 | 5212 | $sql .= ' OR '; |
| 5213 | 5213 | } |
@@ -5257,7 +5257,7 @@ discard block |
||
| 5257 | 5257 | //$table_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL); |
| 5258 | 5258 | $table = 'access_url'; |
| 5259 | 5259 | $database = $_configuration['main_database']; |
| 5260 | - $table_access_url = "" . $database . "." . $table . ""; |
|
| 5260 | + $table_access_url = "".$database.".".$table.""; |
|
| 5261 | 5261 | $sql = "SELECT url, description, active, created_by, tms |
| 5262 | 5262 | FROM $table_access_url WHERE id = '$id' "; |
| 5263 | 5263 | $res = Database::query($sql); |
@@ -5355,7 +5355,7 @@ discard block |
||
| 5355 | 5355 | function & api_get_settings_categories($exceptions = array(), $access_url = 1) { |
| 5356 | 5356 | $access_url = (int) $access_url; |
| 5357 | 5357 | $t_cs = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT); |
| 5358 | - $list = "'".implode("','",$exceptions)."'"; |
|
| 5358 | + $list = "'".implode("','", $exceptions)."'"; |
|
| 5359 | 5359 | $sql = "SELECT DISTINCT category FROM $t_cs WHERE category is NOT NULL "; |
| 5360 | 5360 | if ($list != "'',''" && $list != "''" && !empty($list)) { |
| 5361 | 5361 | $sql .= " AND category NOT IN ($list) "; |
@@ -5451,12 +5451,12 @@ discard block |
||
| 5451 | 5451 | |
| 5452 | 5452 | // Item not found for this access_url, we have to check if the whole thing is missing |
| 5453 | 5453 | // (in which case we ignore the insert) or if there *is* a record but just for access_url = 1 |
| 5454 | - $insert = "INSERT INTO $t_settings " . |
|
| 5455 | - "(variable,selected_value," . |
|
| 5456 | - "type,category," . |
|
| 5457 | - "subkey,title," . |
|
| 5458 | - "comment,scope," . |
|
| 5459 | - "subkeytext,access_url,access_url_changeable)" . |
|
| 5454 | + $insert = "INSERT INTO $t_settings ". |
|
| 5455 | + "(variable,selected_value,". |
|
| 5456 | + "type,category,". |
|
| 5457 | + "subkey,title,". |
|
| 5458 | + "comment,scope,". |
|
| 5459 | + "subkeytext,access_url,access_url_changeable)". |
|
| 5460 | 5460 | " VALUES ('$var','$val',"; |
| 5461 | 5461 | if (isset($type)) { |
| 5462 | 5462 | $type = Database::escape_string($type); |
@@ -5622,7 +5622,7 @@ discard block |
||
| 5622 | 5622 | $result = Database::query($sql); |
| 5623 | 5623 | |
| 5624 | 5624 | //if ($row = Database::fetch_array($result)) { |
| 5625 | - if (Database::num_rows($result) > 0 ) { |
|
| 5625 | + if (Database::num_rows($result) > 0) { |
|
| 5626 | 5626 | $is_courseMember = true; |
| 5627 | 5627 | $is_courseTutor = true; |
| 5628 | 5628 | $is_courseCoach = true; |
@@ -5843,8 +5843,8 @@ discard block |
||
| 5843 | 5843 | { |
| 5844 | 5844 | $tbl_rel_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); |
| 5845 | 5845 | if (!empty($user_id) && !empty($courseId)) { |
| 5846 | - $user_id = intval($user_id); |
|
| 5847 | - $courseId = intval($courseId); |
|
| 5846 | + $user_id = intval($user_id); |
|
| 5847 | + $courseId = intval($courseId); |
|
| 5848 | 5848 | $sql = 'SELECT status |
| 5849 | 5849 | FROM '.$tbl_rel_course_user.' |
| 5850 | 5850 | WHERE user_id='.$user_id.' AND c_id = '.$courseId; |
@@ -5950,7 +5950,7 @@ discard block |
||
| 5950 | 5950 | } else { |
| 5951 | 5951 | return false; |
| 5952 | 5952 | } |
| 5953 | - return strtolower(substr((string)$os, 0, 3 )) == 'win'; |
|
| 5953 | + return strtolower(substr((string) $os, 0, 3)) == 'win'; |
|
| 5954 | 5954 | } |
| 5955 | 5955 | |
| 5956 | 5956 | /** |
@@ -6475,7 +6475,7 @@ discard block |
||
| 6475 | 6475 | function api_get_jquery_ui_js($include_jqgrid = false) { |
| 6476 | 6476 | $libraries = array(); |
| 6477 | 6477 | if ($include_jqgrid) { |
| 6478 | - $libraries[]='jqgrid'; |
|
| 6478 | + $libraries[] = 'jqgrid'; |
|
| 6479 | 6479 | } |
| 6480 | 6480 | return api_get_jquery_libraries_js($libraries); |
| 6481 | 6481 | } |
@@ -6499,12 +6499,12 @@ discard block |
||
| 6499 | 6499 | |
| 6500 | 6500 | //jqgrid js and css |
| 6501 | 6501 | if (in_array('jqgrid', $libraries)) { |
| 6502 | - $languaje = 'en'; |
|
| 6502 | + $languaje = 'en'; |
|
| 6503 | 6503 | $platform_isocode = strtolower(api_get_language_isocode()); |
| 6504 | 6504 | |
| 6505 | 6505 | //languages supported by jqgrid see files in main/inc/lib/javascript/jqgrid/js/i18n |
| 6506 | 6506 | $jqgrid_langs = array( |
| 6507 | - 'bg', 'bg1251', 'cat','cn','cs','da','de','el','en','es','fa','fi','fr','gl','he','hu','is','it','ja','nl','no','pl','pt-br','pt','ro','ru','sk','sr','sv','tr','ua' |
|
| 6507 | + 'bg', 'bg1251', 'cat', 'cn', 'cs', 'da', 'de', 'el', 'en', 'es', 'fa', 'fi', 'fr', 'gl', 'he', 'hu', 'is', 'it', 'ja', 'nl', 'no', 'pl', 'pt-br', 'pt', 'ro', 'ru', 'sk', 'sr', 'sv', 'tr', 'ua' |
|
| 6508 | 6508 | ); |
| 6509 | 6509 | |
| 6510 | 6510 | if (in_array($platform_isocode, $jqgrid_langs)) { |
@@ -6525,7 +6525,7 @@ discard block |
||
| 6525 | 6525 | |
| 6526 | 6526 | // jquery datepicker |
| 6527 | 6527 | if (in_array('datepicker', $libraries)) { |
| 6528 | - $languaje = 'en-GB'; |
|
| 6528 | + $languaje = 'en-GB'; |
|
| 6529 | 6529 | $platform_isocode = strtolower(api_get_language_isocode()); |
| 6530 | 6530 | |
| 6531 | 6531 | // languages supported by jqgrid see files in main/inc/lib/javascript/jqgrid/js/i18n |
@@ -6627,7 +6627,7 @@ discard block |
||
| 6627 | 6627 | $clean_url = str_replace('/', '-', $clean_url); |
| 6628 | 6628 | $clean_url .= '/'; |
| 6629 | 6629 | |
| 6630 | - $home = 'app/home/' . $clean_url; |
|
| 6630 | + $home = 'app/home/'.$clean_url; |
|
| 6631 | 6631 | |
| 6632 | 6632 | } |
| 6633 | 6633 | |
@@ -6688,7 +6688,7 @@ discard block |
||
| 6688 | 6688 | * @return void |
| 6689 | 6689 | */ |
| 6690 | 6690 | function api_check_php_version($my_inc_path = null) { |
| 6691 | - if (!function_exists('version_compare') || version_compare( phpversion(), REQUIRED_PHP_VERSION, '<')) { |
|
| 6691 | + if (!function_exists('version_compare') || version_compare(phpversion(), REQUIRED_PHP_VERSION, '<')) { |
|
| 6692 | 6692 | $global_error_code = 1; |
| 6693 | 6693 | // Incorrect PHP version |
| 6694 | 6694 | $global_page = $my_inc_path.'global_error_message.inc.php'; |
@@ -6704,7 +6704,7 @@ discard block |
||
| 6704 | 6704 | */ |
| 6705 | 6705 | function api_check_archive_dir() { |
| 6706 | 6706 | if (is_dir(api_get_path(SYS_ARCHIVE_PATH)) && !is_writable(api_get_path(SYS_ARCHIVE_PATH))) { |
| 6707 | - $message = Display::return_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'),'warning'); |
|
| 6707 | + $message = Display::return_message(get_lang('ArchivesDirectoryNotWriteableContactAdmin'), 'warning'); |
|
| 6708 | 6708 | api_not_allowed(true, $message); |
| 6709 | 6709 | } |
| 6710 | 6710 | } |
@@ -6769,7 +6769,7 @@ discard block |
||
| 6769 | 6769 | * @author Jorge Frisancho Jibaja <[email protected]>, USIL - Some changes to allow the use of real IP using reverse proxy |
| 6770 | 6770 | * @version CEV CHANGE 24APR2012 |
| 6771 | 6771 | */ |
| 6772 | -function api_get_real_ip(){ |
|
| 6772 | +function api_get_real_ip() { |
|
| 6773 | 6773 | // Guess the IP if behind a reverse proxy |
| 6774 | 6774 | global $debug; |
| 6775 | 6775 | $ip = trim($_SERVER['REMOTE_ADDR']); |
@@ -6794,23 +6794,23 @@ discard block |
||
| 6794 | 6794 | * @author Yannick Warnier for improvements and managment of multiple ranges |
| 6795 | 6795 | * @todo check for IPv6 support |
| 6796 | 6796 | */ |
| 6797 | -function api_check_ip_in_range($ip,$range) |
|
| 6797 | +function api_check_ip_in_range($ip, $range) |
|
| 6798 | 6798 | { |
| 6799 | 6799 | if (empty($ip) or empty($range)) { |
| 6800 | 6800 | return false; |
| 6801 | 6801 | } |
| 6802 | - $ip_ip = ip2long ($ip); |
|
| 6802 | + $ip_ip = ip2long($ip); |
|
| 6803 | 6803 | // divide range param into array of elements |
| 6804 | - if (strpos($range,',')!==false) { |
|
| 6805 | - $ranges = explode(',',$range); |
|
| 6804 | + if (strpos($range, ',') !== false) { |
|
| 6805 | + $ranges = explode(',', $range); |
|
| 6806 | 6806 | } else { |
| 6807 | 6807 | $ranges = array($range); |
| 6808 | 6808 | } |
| 6809 | 6809 | foreach ($ranges as $range) { |
| 6810 | 6810 | $range = trim($range); |
| 6811 | 6811 | if (empty($range)) { continue; } |
| 6812 | - if (strpos($range,'/')===false) { |
|
| 6813 | - if (strcmp($ip,$range)===0) { |
|
| 6812 | + if (strpos($range, '/') === false) { |
|
| 6813 | + if (strcmp($ip, $range) === 0) { |
|
| 6814 | 6814 | return true; // there is a direct IP match, return OK |
| 6815 | 6815 | } |
| 6816 | 6816 | continue; //otherwise, get to the next range |
@@ -6818,7 +6818,7 @@ discard block |
||
| 6818 | 6818 | // the range contains a "/", so analyse completely |
| 6819 | 6819 | list ($net, $mask) = explode("/", $range); |
| 6820 | 6820 | |
| 6821 | - $ip_net = ip2long ($net); |
|
| 6821 | + $ip_net = ip2long($net); |
|
| 6822 | 6822 | // mask binary magic |
| 6823 | 6823 | $ip_mask = ~((1 << (32 - $mask)) - 1); |
| 6824 | 6824 | |
@@ -7178,14 +7178,14 @@ discard block |
||
| 7178 | 7178 | * @assert (0) === true |
| 7179 | 7179 | * @assert ('1G') === true |
| 7180 | 7180 | */ |
| 7181 | -function api_set_memory_limit($mem){ |
|
| 7181 | +function api_set_memory_limit($mem) { |
|
| 7182 | 7182 | //if ini_set() not available, this function is useless |
| 7183 | 7183 | if (!function_exists('ini_set') || is_null($mem) || $mem == -1) { |
| 7184 | 7184 | return false; |
| 7185 | 7185 | } |
| 7186 | 7186 | |
| 7187 | 7187 | $memory_limit = ini_get('memory_limit'); |
| 7188 | - if (api_get_bytes_memory_limit($mem) > api_get_bytes_memory_limit($memory_limit)){ |
|
| 7188 | + if (api_get_bytes_memory_limit($mem) > api_get_bytes_memory_limit($memory_limit)) { |
|
| 7189 | 7189 | ini_set('memory_limit', $mem); |
| 7190 | 7190 | return true; |
| 7191 | 7191 | } |
@@ -7202,21 +7202,21 @@ discard block |
||
| 7202 | 7202 | * @assert ('1m') === 1048576 |
| 7203 | 7203 | * @assert ('100k') === 102400 |
| 7204 | 7204 | */ |
| 7205 | -function api_get_bytes_memory_limit($mem){ |
|
| 7206 | - $size = strtolower(substr($mem,-1)); |
|
| 7205 | +function api_get_bytes_memory_limit($mem) { |
|
| 7206 | + $size = strtolower(substr($mem, -1)); |
|
| 7207 | 7207 | |
| 7208 | 7208 | switch ($size) { |
| 7209 | 7209 | case 't': |
| 7210 | - $mem = intval(substr($mem,-1))*1024*1024*1024*1024; |
|
| 7210 | + $mem = intval(substr($mem, -1)) * 1024 * 1024 * 1024 * 1024; |
|
| 7211 | 7211 | break; |
| 7212 | 7212 | case 'g': |
| 7213 | - $mem = intval(substr($mem,0,-1))*1024*1024*1024; |
|
| 7213 | + $mem = intval(substr($mem, 0, -1)) * 1024 * 1024 * 1024; |
|
| 7214 | 7214 | break; |
| 7215 | 7215 | case 'm': |
| 7216 | - $mem = intval(substr($mem,0,-1))*1024*1024; |
|
| 7216 | + $mem = intval(substr($mem, 0, -1)) * 1024 * 1024; |
|
| 7217 | 7217 | break; |
| 7218 | 7218 | case 'k': |
| 7219 | - $mem = intval(substr($mem,0,-1))*1024; |
|
| 7219 | + $mem = intval(substr($mem, 0, -1)) * 1024; |
|
| 7220 | 7220 | break; |
| 7221 | 7221 | default: |
| 7222 | 7222 | // we assume it's integer only |
@@ -7271,7 +7271,7 @@ discard block |
||
| 7271 | 7271 | get_lang('PasswordVeryStrong'), |
| 7272 | 7272 | ); |
| 7273 | 7273 | $js = api_get_js('strength/strength.js'); |
| 7274 | - $js .= "<script> |
|
| 7274 | + $js .= "<script> |
|
| 7275 | 7275 | |
| 7276 | 7276 | var verdicts = ['".implode("','", $verdicts)."']; |
| 7277 | 7277 | var errorMessages = { |
@@ -7327,7 +7327,7 @@ discard block |
||
| 7327 | 7327 | return false; |
| 7328 | 7328 | } |
| 7329 | 7329 | $minutesToBlock = api_get_setting('captcha_time_to_block'); |
| 7330 | - $time = time() + $minutesToBlock*60; |
|
| 7330 | + $time = time() + $minutesToBlock * 60; |
|
| 7331 | 7331 | UserManager::update_extra_field_value( |
| 7332 | 7332 | $userInfo['user_id'], |
| 7333 | 7333 | 'captcha_blocked_until_date', |
@@ -7400,7 +7400,7 @@ discard block |
||
| 7400 | 7400 | $out_res = str_replace('"', "''", $out_res); |
| 7401 | 7401 | } |
| 7402 | 7402 | // avoid text stuck together when tags are removed, adding a space after > |
| 7403 | - $out_res = str_replace (">", "> ", $out_res); |
|
| 7403 | + $out_res = str_replace(">", "> ", $out_res); |
|
| 7404 | 7404 | $out_res = strip_tags($out_res); |
| 7405 | 7405 | |
| 7406 | 7406 | return $out_res; |
@@ -7510,12 +7510,12 @@ discard block |
||
| 7510 | 7510 | { |
| 7511 | 7511 | // Clean query |
| 7512 | 7512 | $bt = debug_backtrace(); |
| 7513 | - $caller = array_shift($bt);; |
|
| 7513 | + $caller = array_shift($bt); ; |
|
| 7514 | 7514 | if ($dump == 1) { |
| 7515 | 7515 | $string = print_r($string, 1); |
| 7516 | 7516 | } else { |
| 7517 | 7517 | $string = str_replace(array("\r", "\n", "\t", "\10"), '', $string); |
| 7518 | - $string = str_replace(' ',' ', $string); |
|
| 7518 | + $string = str_replace(' ', ' ', $string); |
|
| 7519 | 7519 | } |
| 7520 | 7520 | |
| 7521 | 7521 | error_log("-------------------------------------"); |
@@ -7625,7 +7625,7 @@ discard block |
||
| 7625 | 7625 | $body = get_lang('PortalName').': '.api_get_path(WEB_PATH)." \n "; |
| 7626 | 7626 | $body .= get_lang('PortalLimitType').': '.$limitName." \n "; |
| 7627 | 7627 | if (isset($hostingParams[$limitName])) { |
| 7628 | - $body .= get_lang('Value') . ': ' . $hostingParams[$limitName]; |
|
| 7628 | + $body .= get_lang('Value').': '.$hostingParams[$limitName]; |
|
| 7629 | 7629 | } |
| 7630 | 7630 | api_mail_html(null, $email, $subject, $body); |
| 7631 | 7631 | } |
@@ -7753,7 +7753,7 @@ discard block |
||
| 7753 | 7753 | */ |
| 7754 | 7754 | function api_set_site_use_cookie_warning_cookie() |
| 7755 | 7755 | { |
| 7756 | - setcookie("ChamiloUsesCookies", "ok", time()+31556926); |
|
| 7756 | + setcookie("ChamiloUsesCookies", "ok", time() + 31556926); |
|
| 7757 | 7757 | } |
| 7758 | 7758 | |
| 7759 | 7759 | /** |
@@ -7801,10 +7801,10 @@ discard block |
||
| 7801 | 7801 | return false; |
| 7802 | 7802 | } |
| 7803 | 7803 | |
| 7804 | - $fullPath = $parentDirectory . api_replace_dangerous_char($name); |
|
| 7804 | + $fullPath = $parentDirectory.api_replace_dangerous_char($name); |
|
| 7805 | 7805 | |
| 7806 | 7806 | if (mkdir($fullPath, api_get_permissions_for_new_directories(), true)) { |
| 7807 | - $fp = fopen($fullPath . '/index.html', 'w'); |
|
| 7807 | + $fp = fopen($fullPath.'/index.html', 'w'); |
|
| 7808 | 7808 | |
| 7809 | 7809 | if ($fp) { |
| 7810 | 7810 | if (fwrite($fp, '<html><head></head><body></body></html>')) { |
@@ -8046,13 +8046,13 @@ discard block |
||
| 8046 | 8046 | * @param int $key key to find to compare |
| 8047 | 8047 | * |
| 8048 | 8048 | */ |
| 8049 | -function api_unique_multidim_array($array, $key){ |
|
| 8049 | +function api_unique_multidim_array($array, $key) { |
|
| 8050 | 8050 | $temp_array = array(); |
| 8051 | 8051 | $i = 0; |
| 8052 | 8052 | $key_array = array(); |
| 8053 | 8053 | |
| 8054 | - foreach($array as $val){ |
|
| 8055 | - if(!in_array($val[$key],$key_array)){ |
|
| 8054 | + foreach ($array as $val) { |
|
| 8055 | + if (!in_array($val[$key], $key_array)) { |
|
| 8056 | 8056 | $key_array[$i] = $val[$key]; |
| 8057 | 8057 | $temp_array[$i] = $val; |
| 8058 | 8058 | } |
@@ -1819,7 +1819,9 @@ discard block |
||
| 1819 | 1819 | } |
| 1820 | 1820 | |
| 1821 | 1821 | global $_course; |
| 1822 | - if ($_course == '-1') $_course = array(); |
|
| 1822 | + if ($_course == '-1') { |
|
| 1823 | + $_course = array(); |
|
| 1824 | + } |
|
| 1823 | 1825 | return $_course; |
| 1824 | 1826 | } |
| 1825 | 1827 | |
@@ -4315,17 +4317,20 @@ discard block |
||
| 4315 | 4317 | switch ($lang_type) { |
| 4316 | 4318 | case 'platform_lang': |
| 4317 | 4319 | $temp_lang = api_get_setting('platformLanguage'); |
| 4318 | - if (!empty($temp_lang)) |
|
| 4319 | - $return = $temp_lang; |
|
| 4320 | + if (!empty($temp_lang)) { |
|
| 4321 | + $return = $temp_lang; |
|
| 4322 | + } |
|
| 4320 | 4323 | break; |
| 4321 | 4324 | case 'user_profil_lang': |
| 4322 | 4325 | $_user = api_get_user_info(); |
| 4323 | - if (isset($_user['language']) && !empty($_user['language'])) |
|
| 4324 | - $return = $_user['language']; |
|
| 4326 | + if (isset($_user['language']) && !empty($_user['language'])) { |
|
| 4327 | + $return = $_user['language']; |
|
| 4328 | + } |
|
| 4325 | 4329 | break; |
| 4326 | 4330 | case 'user_selected_lang': |
| 4327 | - if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice'])) |
|
| 4328 | - $return = $_SESSION['user_language_choice']; |
|
| 4331 | + if (isset($_SESSION['user_language_choice']) && !empty($_SESSION['user_language_choice'])) { |
|
| 4332 | + $return = $_SESSION['user_language_choice']; |
|
| 4333 | + } |
|
| 4329 | 4334 | break; |
| 4330 | 4335 | case 'course_lang': |
| 4331 | 4336 | global $_course; |
@@ -4343,8 +4348,9 @@ discard block |
||
| 4343 | 4348 | } |
| 4344 | 4349 | } |
| 4345 | 4350 | $_course = api_get_course_info($cidReq); |
| 4346 | - if (isset($_course['language']) && !empty($_course['language'])) |
|
| 4347 | - $return = $_course['language']; |
|
| 4351 | + if (isset($_course['language']) && !empty($_course['language'])) { |
|
| 4352 | + $return = $_course['language']; |
|
| 4353 | + } |
|
| 4348 | 4354 | break; |
| 4349 | 4355 | default: |
| 4350 | 4356 | $return = false; |
@@ -5604,8 +5610,7 @@ discard block |
||
| 5604 | 5610 | $is_courseAdmin = false; |
| 5605 | 5611 | $is_courseCoach = true; |
| 5606 | 5612 | $is_sessionAdmin = false; |
| 5607 | - } |
|
| 5608 | - elseif ($row[0]['session_admin_id'] == $userid) { |
|
| 5613 | + } elseif ($row[0]['session_admin_id'] == $userid) { |
|
| 5609 | 5614 | $is_courseMember = false; |
| 5610 | 5615 | $is_courseTutor = false; |
| 5611 | 5616 | $is_courseAdmin = false; |
@@ -5885,7 +5890,9 @@ discard block |
||
| 5885 | 5890 | |
| 5886 | 5891 | if (!empty($course_code)) { |
| 5887 | 5892 | if (isset($_SESSION['_course']['sysCode'])) { |
| 5888 | - if ($course_code != $_SESSION['_course']['sysCode']) return false; |
|
| 5893 | + if ($course_code != $_SESSION['_course']['sysCode']) { |
|
| 5894 | + return false; |
|
| 5895 | + } |
|
| 5889 | 5896 | } else { |
| 5890 | 5897 | return false; |
| 5891 | 5898 | } |
@@ -5942,8 +5949,7 @@ discard block |
||
| 5942 | 5949 | elseif (isset($_ENV['OS'])) { |
| 5943 | 5950 | // Sometimes $_ENV['OS'] may not be present (bugs?) |
| 5944 | 5951 | $os = $_ENV['OS']; |
| 5945 | - } |
|
| 5946 | - elseif (defined('PHP_OS')) { |
|
| 5952 | + } elseif (defined('PHP_OS')) { |
|
| 5947 | 5953 | // PHP_OS means on which OS PHP was compiled, this is why |
| 5948 | 5954 | // using PHP_OS is the last choice for detection. |
| 5949 | 5955 | $os = PHP_OS; |
@@ -6007,12 +6013,10 @@ discard block |
||
| 6007 | 6013 | if ($delta_width > $delta_height) { |
| 6008 | 6014 | $result['width'] = ceil($image_width * $resize_factor_height); |
| 6009 | 6015 | $result['height'] = ceil($image_height * $resize_factor_height); |
| 6010 | - } |
|
| 6011 | - elseif ($delta_width < $delta_height) { |
|
| 6016 | + } elseif ($delta_width < $delta_height) { |
|
| 6012 | 6017 | $result['width'] = ceil($image_width * $resize_factor_width); |
| 6013 | 6018 | $result['height'] = ceil($image_height * $resize_factor_width); |
| 6014 | - } |
|
| 6015 | - else { |
|
| 6019 | + } else { |
|
| 6016 | 6020 | $result['width'] = ceil($target_width); |
| 6017 | 6021 | $result['height'] = ceil($target_height); |
| 6018 | 6022 | } |
@@ -6781,7 +6785,9 @@ discard block |
||
| 6781 | 6785 | } |
| 6782 | 6786 | $ip = trim($ip1); |
| 6783 | 6787 | } |
| 6784 | - if (!empty($debug)) error_log('Real IP: '.$ip); |
|
| 6788 | + if (!empty($debug)) { |
|
| 6789 | + error_log('Real IP: '.$ip); |
|
| 6790 | + } |
|
| 6785 | 6791 | return $ip; |
| 6786 | 6792 | } |
| 6787 | 6793 | |
@@ -18,6 +18,7 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * Constructor, init tool path for rendering |
| 20 | 20 | * @param string tool name (optional) |
| 21 | + * @param string $template_path |
|
| 21 | 22 | */ |
| 22 | 23 | public function __construct($toolname = '', $template_path=null) |
| 23 | 24 | { |
@@ -50,6 +51,7 @@ discard block |
||
| 50 | 51 | /** |
| 51 | 52 | * Set layout view sent from a controller |
| 52 | 53 | * @param string layout view |
| 54 | + * @param string $layout |
|
| 53 | 55 | */ |
| 54 | 56 | public function set_layout( $layout ) |
| 55 | 57 | { |
@@ -59,6 +61,7 @@ discard block |
||
| 59 | 61 | /** |
| 60 | 62 | * Set template view sent from a controller |
| 61 | 63 | * @param string template view |
| 64 | + * @param string $template |
|
| 62 | 65 | */ |
| 63 | 66 | public function set_template($template) |
| 64 | 67 | { |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | * Constructor, init tool path for rendering |
| 20 | 20 | * @param string tool name (optional) |
| 21 | 21 | */ |
| 22 | - public function __construct($toolname = '', $template_path=null) |
|
| 22 | + public function __construct($toolname = '', $template_path = null) |
|
| 23 | 23 | { |
| 24 | 24 | if (!empty($toolname)) { |
| 25 | 25 | if (isset($template_path)) { |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | if (is_dir($path)) { |
| 31 | 31 | $this->tool_path = $path; |
| 32 | 32 | } else { |
| 33 | - throw new ViewException('View::__construct() $path directory does not exist ' . $path); |
|
| 33 | + throw new ViewException('View::__construct() $path directory does not exist '.$path); |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | public function set_data($data) |
| 43 | 43 | { |
| 44 | 44 | if (!is_array($data)) { |
| 45 | - throw new ViewException('View::set_data() $data must to be an array, you have sent a' . gettype( $data )); |
|
| 45 | + throw new ViewException('View::set_data() $data must to be an array, you have sent a'.gettype($data)); |
|
| 46 | 46 | } |
| 47 | 47 | $this->data = $data; |
| 48 | 48 | } |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | * Set layout view sent from a controller |
| 52 | 52 | * @param string layout view |
| 53 | 53 | */ |
| 54 | - public function set_layout( $layout ) |
|
| 54 | + public function set_layout($layout) |
|
| 55 | 55 | { |
| 56 | 56 | $this->layout = $layout; |
| 57 | 57 | } |
@@ -147,6 +147,9 @@ discard block |
||
| 147 | 147 | return $customTabs; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | +/** |
|
| 151 | + * @param string $theme |
|
| 152 | + */ |
|
| 150 | 153 | function return_logo($theme) |
| 151 | 154 | { |
| 152 | 155 | $_course = api_get_course_info(); |
@@ -497,6 +500,9 @@ discard block |
||
| 497 | 500 | return $menu; |
| 498 | 501 | } |
| 499 | 502 | |
| 503 | +/** |
|
| 504 | + * @param string $nameTools |
|
| 505 | + */ |
|
| 500 | 506 | function return_breadcrumb($interbreadcrumb, $language_file, $nameTools) |
| 501 | 507 | { |
| 502 | 508 | $session_id = api_get_session_id(); |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | $navigation['mycourses']['key'] = 'my-course'; |
| 40 | 40 | |
| 41 | 41 | // My Profile |
| 42 | - $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' ); |
|
| 42 | + $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : ''); |
|
| 43 | 43 | $navigation['myprofile']['title'] = get_lang('ModifyProfile'); |
| 44 | 44 | $navigation['myprofile']['key'] = 'profile'; |
| 45 | 45 | // Link to my agenda |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | // Gradebook |
| 51 | 51 | if (api_get_setting('gradebook_enable') == 'true') { |
| 52 | - $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' ); |
|
| 52 | + $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : ''); |
|
| 53 | 53 | $navigation['mygradebook']['title'] = get_lang('MyGradebook'); |
| 54 | 54 | $navigation['mygradebook']['key'] = 'gradebook'; |
| 55 | 55 | } |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | // Reporting |
| 58 | 58 | if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) { |
| 59 | 59 | // Link to my space |
| 60 | - $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':''); |
|
| 60 | + $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh() ? 'session.php' : ''); |
|
| 61 | 61 | $navigation['session_my_space']['title'] = get_lang('MySpace'); |
| 62 | 62 | $navigation['session_my_space']['key'] = 'my-space'; |
| 63 | 63 | } else if (api_is_student_boss()) { |
| 64 | - $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH) . 'mySpace/student.php'; |
|
| 64 | + $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/student.php'; |
|
| 65 | 65 | $navigation['session_my_space']['title'] = get_lang('MySpace'); |
| 66 | 66 | $navigation['session_my_space']['key'] = 'my-space'; |
| 67 | 67 | } else { |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | // Social |
| 83 | - if (api_get_setting('allow_social_tool')=='true') { |
|
| 83 | + if (api_get_setting('allow_social_tool') == 'true') { |
|
| 84 | 84 | $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php'; |
| 85 | 85 | $navigation['social']['title'] = get_lang('SocialNetwork'); |
| 86 | 86 | $navigation['social']['key'] = 'social-network'; |
@@ -159,13 +159,13 @@ discard block |
||
| 159 | 159 | 'class' => 'img-responsive', |
| 160 | 160 | ); |
| 161 | 161 | $testServer = api_get_setting('server_type'); |
| 162 | - if ($testServer == 'test' && is_file($logoBase . 'svg')) { |
|
| 163 | - $logo = $logoBase . 'svg'; |
|
| 162 | + if ($testServer == 'test' && is_file($logoBase.'svg')) { |
|
| 163 | + $logo = $logoBase.'svg'; |
|
| 164 | 164 | $attributes['width'] = '245'; |
| 165 | 165 | $attributes['height'] = '68'; |
| 166 | 166 | $image_url = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo.svg'; |
| 167 | 167 | } else { |
| 168 | - $logo = $logoBase . 'png'; |
|
| 168 | + $logo = $logoBase.'png'; |
|
| 169 | 169 | $image_url = api_get_path(WEB_CSS_PATH).'themes/'.$theme.'/images/header-logo.png'; |
| 170 | 170 | } |
| 171 | 171 | |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | $_course = api_get_course_info(); |
| 208 | 208 | $course_id = 0; |
| 209 | 209 | if (!empty($_course)) { |
| 210 | - $course_id = $_course['code']; |
|
| 210 | + $course_id = $_course['code']; |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | $user_id = api_get_user_id(); |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | if (api_get_setting('gradebook_enable') == 'true') { |
| 305 | 305 | if (api_get_setting('show_tabs', 'my_gradebook') == 'true') { |
| 306 | 306 | $navigation['mygradebook'] = $possible_tabs['mygradebook']; |
| 307 | - } else{ |
|
| 307 | + } else { |
|
| 308 | 308 | $menu_navigation['mygradebook'] = $possible_tabs['mygradebook']; |
| 309 | 309 | } |
| 310 | 310 | } |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | if (api_get_setting('allow_social_tool') == 'true') { |
| 330 | 330 | $navigation['social'] = isset($possible_tabs['social']) ? $possible_tabs['social'] : null; |
| 331 | 331 | } |
| 332 | - } else{ |
|
| 332 | + } else { |
|
| 333 | 333 | $menu_navigation['social'] = isset($possible_tabs['social']) ? $possible_tabs['social'] : null; |
| 334 | 334 | } |
| 335 | 335 | |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) { |
| 339 | 339 | $navigation['dashboard'] = isset($possible_tabs['dashboard']) ? $possible_tabs['dashboard'] : null; |
| 340 | 340 | } |
| 341 | - } else{ |
|
| 341 | + } else { |
|
| 342 | 342 | $menu_navigation['dashboard'] = isset($possible_tabs['dashboard']) ? $possible_tabs['dashboard'] : null; |
| 343 | 343 | } |
| 344 | 344 | |
@@ -429,32 +429,32 @@ discard block |
||
| 429 | 429 | $home_top = ''; |
| 430 | 430 | |
| 431 | 431 | if (is_file($homep.$menutabs.'_'.$lang.$ext) && is_readable($homep.$menutabs.'_'.$lang.$ext)) { |
| 432 | - $home_top = @(string)file_get_contents($homep.$menutabs.'_'.$lang.$ext); |
|
| 432 | + $home_top = @(string) file_get_contents($homep.$menutabs.'_'.$lang.$ext); |
|
| 433 | 433 | } elseif (is_file($homep.$menutabs.$lang.$ext) && is_readable($homep.$menutabs.$lang.$ext)) { |
| 434 | - $home_top = @(string)file_get_contents($homep.$menutabs.$lang.$ext); |
|
| 434 | + $home_top = @(string) file_get_contents($homep.$menutabs.$lang.$ext); |
|
| 435 | 435 | } else { |
| 436 | 436 | //$errorMsg = get_lang('HomePageFilesNotReadable'); |
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top))); |
| 440 | 440 | |
| 441 | - $open = str_replace('{rel_path}',api_get_path(REL_PATH), $home_top); |
|
| 441 | + $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top); |
|
| 442 | 442 | $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open))); |
| 443 | 443 | |
| 444 | 444 | $open_mtloggedin = ''; |
| 445 | 445 | if (api_get_user_id() && !api_is_anonymous()) { |
| 446 | 446 | if (is_file($homep.$mtloggedin.'_'.$lang.$ext) && is_readable($homep.$mtloggedin.'_'.$lang.$ext)) { |
| 447 | - $home_top = @(string)file_get_contents($homep.$mtloggedin.'_'.$lang.$ext); |
|
| 447 | + $home_top = @(string) file_get_contents($homep.$mtloggedin.'_'.$lang.$ext); |
|
| 448 | 448 | $home_top = str_replace('::private', '', $home_top); |
| 449 | 449 | } elseif (is_file($homep.$mtloggedin.$lang.$ext) && is_readable($homep.$mtloggedin.$lang.$ext)) { |
| 450 | - $home_top = @(string)file_get_contents($homep.$mtloggedin.$lang.$ext); |
|
| 450 | + $home_top = @(string) file_get_contents($homep.$mtloggedin.$lang.$ext); |
|
| 451 | 451 | $home_top = str_replace('::private', '', $home_top); |
| 452 | 452 | } else { |
| 453 | 453 | //$errorMsg = get_lang('HomePageFilesNotReadable'); |
| 454 | 454 | } |
| 455 | 455 | |
| 456 | 456 | $home_top = api_to_system_encoding($home_top, api_detect_encoding(strip_tags($home_top))); |
| 457 | - $open_mtloggedin = str_replace('{rel_path}',api_get_path(REL_PATH), $home_top); |
|
| 457 | + $open_mtloggedin = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top); |
|
| 458 | 458 | $open_mtloggedin = api_to_system_encoding($open_mtloggedin, api_detect_encoding(strip_tags($open_mtloggedin))); |
| 459 | 459 | } |
| 460 | 460 | |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | if (!empty($open) OR !empty($open_mtloggedin)) { |
| 464 | 464 | if (strpos($open.$open_mtloggedin, 'show_menu') === false) { |
| 465 | 465 | if (api_is_anonymous()) { |
| 466 | - $navigation[SECTION_CAMPUS] = null; |
|
| 466 | + $navigation[SECTION_CAMPUS] = null; |
|
| 467 | 467 | } |
| 468 | 468 | } else { |
| 469 | 469 | if (api_get_user_id() && !api_is_anonymous()) { |
@@ -477,7 +477,7 @@ discard block |
||
| 477 | 477 | if (count($navigation) > 0 || !empty($lis)) { |
| 478 | 478 | $pre_lis = ''; |
| 479 | 479 | foreach ($navigation as $section => $navigation_info) { |
| 480 | - $key = (!empty($navigation_info['key'])?'tab-'.$navigation_info['key']:''); |
|
| 480 | + $key = (!empty($navigation_info['key']) ? 'tab-'.$navigation_info['key'] : ''); |
|
| 481 | 481 | if (isset($GLOBALS['this_section'])) { |
| 482 | 482 | $current = $section == $GLOBALS['this_section'] ? ' id="current" class="active '.$key.'" ' : ' class="'.$key.'"'; |
| 483 | 483 | } else { |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | |
| 522 | 522 | if (!empty($_course) && !isset($_GET['hide_course_breadcrumb'])) { |
| 523 | 523 | |
| 524 | - $navigation_item['url'] = $web_course_path . $_course['path'].'/index.php'.(!empty($session_id) ? '?id_session='.$session_id : ''); |
|
| 524 | + $navigation_item['url'] = $web_course_path.$_course['path'].'/index.php'.(!empty($session_id) ? '?id_session='.$session_id : ''); |
|
| 525 | 525 | $_course['name'] = api_htmlentities($_course['name']); |
| 526 | 526 | $course_title = cut($_course['name'], MAX_LENGTH_BREADCRUMB); |
| 527 | 527 | |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name; |
| 537 | 537 | break; |
| 538 | 538 | default: |
| 539 | - if (api_get_session_id() != -1 ) { |
|
| 539 | + if (api_get_session_id() != -1) { |
|
| 540 | 540 | $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name'].$my_session_name).' '.$course_title.$my_session_name; |
| 541 | 541 | } else { |
| 542 | 542 | $navigation_item['title'] = Display::img(api_get_path(WEB_IMG_PATH).'home.png', $_course['name']).' '.$course_title; |
@@ -570,22 +570,22 @@ discard block |
||
| 570 | 570 | // titles for shared folders |
| 571 | 571 | if ($breadcrumb_step['name'] == 'shared_folder') { |
| 572 | 572 | $navigation_item['title'] = get_lang('UserFolders'); |
| 573 | - } elseif(strstr($breadcrumb_step['name'], 'shared_folder_session_')) { |
|
| 573 | + } elseif (strstr($breadcrumb_step['name'], 'shared_folder_session_')) { |
|
| 574 | 574 | $navigation_item['title'] = get_lang('UserFolders'); |
| 575 | - } elseif(strstr($breadcrumb_step['name'], 'sf_user_')) { |
|
| 575 | + } elseif (strstr($breadcrumb_step['name'], 'sf_user_')) { |
|
| 576 | 576 | $userinfo = api_get_user_info(substr($breadcrumb_step['name'], 8)); |
| 577 | 577 | $navigation_item['title'] = $userinfo['complete_name']; |
| 578 | - } elseif($breadcrumb_step['name'] == 'chat_files') { |
|
| 578 | + } elseif ($breadcrumb_step['name'] == 'chat_files') { |
|
| 579 | 579 | $navigation_item['title'] = get_lang('ChatFiles'); |
| 580 | - } elseif($breadcrumb_step['name'] == 'images') { |
|
| 580 | + } elseif ($breadcrumb_step['name'] == 'images') { |
|
| 581 | 581 | $navigation_item['title'] = get_lang('Images'); |
| 582 | - } elseif($breadcrumb_step['name'] == 'video') { |
|
| 582 | + } elseif ($breadcrumb_step['name'] == 'video') { |
|
| 583 | 583 | $navigation_item['title'] = get_lang('Video'); |
| 584 | - } elseif($breadcrumb_step['name'] == 'audio') { |
|
| 584 | + } elseif ($breadcrumb_step['name'] == 'audio') { |
|
| 585 | 585 | $navigation_item['title'] = get_lang('Audio'); |
| 586 | - } elseif($breadcrumb_step['name'] == 'flash') { |
|
| 586 | + } elseif ($breadcrumb_step['name'] == 'flash') { |
|
| 587 | 587 | $navigation_item['title'] = get_lang('Flash'); |
| 588 | - } elseif($breadcrumb_step['name'] == 'gallery') { |
|
| 588 | + } elseif ($breadcrumb_step['name'] == 'gallery') { |
|
| 589 | 589 | $navigation_item['title'] = get_lang('Gallery'); |
| 590 | 590 | } |
| 591 | 591 | // Fixes breadcrumb title now we applied the Security::remove_XSS and |
@@ -652,35 +652,35 @@ discard block |
||
| 652 | 652 | if (!empty($final_navigation)) { |
| 653 | 653 | // $home_link.= '<span class="divider">/</span>'; |
| 654 | 654 | if (!empty($home_link)) { |
| 655 | - $lis.= Display::tag('li', $home_link); |
|
| 655 | + $lis .= Display::tag('li', $home_link); |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | foreach ($final_navigation as $bread) { |
| 659 | 659 | $bread_check = trim(strip_tags($bread)); |
| 660 | 660 | if (!empty($bread_check)) { |
| 661 | - if ($final_navigation_count-1 > $i) { |
|
| 661 | + if ($final_navigation_count - 1 > $i) { |
|
| 662 | 662 | $bread .= ''; |
| 663 | 663 | } |
| 664 | - $lis.= Display::tag('li', $bread,array('class'=>'active')); |
|
| 664 | + $lis .= Display::tag('li', $bread, array('class'=>'active')); |
|
| 665 | 665 | $i++; |
| 666 | 666 | } |
| 667 | 667 | } |
| 668 | 668 | } else { |
| 669 | 669 | if (!empty($home_link)) { |
| 670 | - $lis.= Display::tag('li', $home_link); |
|
| 670 | + $lis .= Display::tag('li', $home_link); |
|
| 671 | 671 | } |
| 672 | 672 | } |
| 673 | 673 | |
| 674 | 674 | // View as student/teacher link |
| 675 | 675 | $view = null; |
| 676 | 676 | if (!empty($view_as_student_link)) { |
| 677 | - $view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right')); |
|
| 677 | + $view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link', 'class' => 'pull-right')); |
|
| 678 | 678 | } |
| 679 | 679 | |
| 680 | 680 | if (!empty($navigation_right)) { |
| 681 | - foreach($navigation_right as $item){ |
|
| 681 | + foreach ($navigation_right as $item) { |
|
| 682 | 682 | $extra_class = isset($item['class']) ? $item['class'] : null; |
| 683 | - $lis.= Display::tag('li', $item['title'], array('class' => $extra_class.' pull-right')); |
|
| 683 | + $lis .= Display::tag('li', $item['title'], array('class' => $extra_class.' pull-right')); |
|
| 684 | 684 | } |
| 685 | 685 | } |
| 686 | 686 | |
@@ -1,10 +1,10 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /* For licensing terms, see /license.txt */ |
| 3 | 3 | /** |
| 4 | - * Code |
|
| 5 | - * @todo use globals or parameters or add this file in the template |
|
| 6 | - * @package chamilo.include |
|
| 7 | - */ |
|
| 4 | + * Code |
|
| 5 | + * @todo use globals or parameters or add this file in the template |
|
| 6 | + * @package chamilo.include |
|
| 7 | + */ |
|
| 8 | 8 | |
| 9 | 9 | /** |
| 10 | 10 | * Determines the possible tabs (=sections) that are available. |
@@ -42,20 +42,20 @@ discard block |
||
| 42 | 42 | $navigation['myprofile']['url'] = api_get_path(WEB_CODE_PATH).'auth/profile.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' ); |
| 43 | 43 | $navigation['myprofile']['title'] = get_lang('ModifyProfile'); |
| 44 | 44 | $navigation['myprofile']['key'] = 'profile'; |
| 45 | - // Link to my agenda |
|
| 45 | + // Link to my agenda |
|
| 46 | 46 | $navigation['myagenda']['url'] = api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=personal'; |
| 47 | 47 | $navigation['myagenda']['title'] = get_lang('MyAgenda'); |
| 48 | 48 | $navigation['myagenda']['key'] = 'agenda'; |
| 49 | 49 | |
| 50 | - // Gradebook |
|
| 51 | - if (api_get_setting('gradebook_enable') == 'true') { |
|
| 50 | + // Gradebook |
|
| 51 | + if (api_get_setting('gradebook_enable') == 'true') { |
|
| 52 | 52 | $navigation['mygradebook']['url'] = api_get_path(WEB_CODE_PATH).'gradebook/gradebook.php'.(!empty($_course['path']) ? '?coursePath='.$_course['path'].'&courseCode='.$_course['official_code'] : '' ); |
| 53 | 53 | $navigation['mygradebook']['title'] = get_lang('MyGradebook'); |
| 54 | 54 | $navigation['mygradebook']['key'] = 'gradebook'; |
| 55 | - } |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - // Reporting |
|
| 58 | - if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) { |
|
| 57 | + // Reporting |
|
| 58 | + if (api_is_allowed_to_create_course() || api_is_drh() || api_is_session_admin()) { |
|
| 59 | 59 | // Link to my space |
| 60 | 60 | $navigation['session_my_space']['url'] = api_get_path(WEB_CODE_PATH).'mySpace/'.(api_is_drh()?'session.php':''); |
| 61 | 61 | $navigation['session_my_space']['title'] = get_lang('MySpace'); |
@@ -79,21 +79,21 @@ discard block |
||
| 79 | 79 | $navigation['session_my_progress']['key'] = 'my-progress'; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - // Social |
|
| 83 | - if (api_get_setting('allow_social_tool')=='true') { |
|
| 82 | + // Social |
|
| 83 | + if (api_get_setting('allow_social_tool')=='true') { |
|
| 84 | 84 | $navigation['social']['url'] = api_get_path(WEB_CODE_PATH).'social/home.php'; |
| 85 | 85 | $navigation['social']['title'] = get_lang('SocialNetwork'); |
| 86 | 86 | $navigation['social']['key'] = 'social-network'; |
| 87 | - } |
|
| 87 | + } |
|
| 88 | 88 | |
| 89 | - // Dashboard |
|
| 90 | - if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) { |
|
| 89 | + // Dashboard |
|
| 90 | + if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) { |
|
| 91 | 91 | $navigation['dashboard']['url'] = api_get_path(WEB_CODE_PATH).'dashboard/index.php'; |
| 92 | 92 | $navigation['dashboard']['title'] = get_lang('Dashboard'); |
| 93 | 93 | $navigation['dashboard']['key'] = 'dashboard'; |
| 94 | - } |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - // Reports |
|
| 96 | + // Reports |
|
| 97 | 97 | /* |
| 98 | 98 | if (api_is_platform_admin() || api_is_drh() || api_is_session_admin()) { |
| 99 | 99 | $navigation['reports']['url'] = api_get_path(WEB_CODE_PATH).'reports/index.php'; |
@@ -116,14 +116,14 @@ discard block |
||
| 116 | 116 | } |
| 117 | 117 | // End Custom Tabs |
| 118 | 118 | |
| 119 | - // Platform administration |
|
| 120 | - if (api_is_platform_admin(true)) { |
|
| 119 | + // Platform administration |
|
| 120 | + if (api_is_platform_admin(true)) { |
|
| 121 | 121 | $navigation['platform_admin']['url'] = api_get_path(WEB_CODE_PATH).'admin/'; |
| 122 | 122 | $navigation['platform_admin']['title'] = get_lang('PlatformAdmin'); |
| 123 | 123 | $navigation['platform_admin']['key'] = 'admin'; |
| 124 | - } |
|
| 124 | + } |
|
| 125 | 125 | |
| 126 | - return $navigation; |
|
| 126 | + return $navigation; |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /** |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | } |
| 352 | 352 | } |
| 353 | 353 | |
| 354 | - // Reports |
|
| 354 | + // Reports |
|
| 355 | 355 | if (!empty($possible_tabs['reports'])) { |
| 356 | 356 | if (api_get_setting('show_tabs', 'reports') == 'true') { |
| 357 | 357 | if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin()) && Rights::hasRight('show_tabs:reports')) { |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | |
| 493 | 493 | $menu = null; |
| 494 | 494 | if (!empty($lis)) { |
| 495 | - $menu .= $lis; |
|
| 495 | + $menu .= $lis; |
|
| 496 | 496 | } |
| 497 | 497 | return $menu; |
| 498 | 498 | } |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | $navigation_item_my_courses['title'] = get_lang('MyCourses'); |
| 549 | 549 | $navigation_item_my_courses['url'] = api_get_path(WEB_PATH).'user_portal.php'; |
| 550 | 550 | $navigation[] = $navigation_item_my_courses; |
| 551 | - */ |
|
| 551 | + */ |
|
| 552 | 552 | $navigation[] = $navigation_item; |
| 553 | 553 | } |
| 554 | 554 | |
