[svn r17877] Minor - Logic change - Fixed warning illegal offset type in isset or empty in /var/www/dokeossvn/main/inc/lib/main_api.lib.php on line 747 - see FS#3479

skala
Cristian Fasanando 16 years ago
parent 06a823df97
commit 8b1fc11c7b
  1. 10
      main/inc/lib/main_api.lib.php

@ -744,6 +744,7 @@ function api_session_register($variable) {
* @param string variable - the variable name to remove from the session * @param string variable - the variable name to remove from the session
*/ */
function api_session_unregister($variable) { function api_session_unregister($variable) {
$variable = strval($variable);
if(isset($GLOBALS[$variable])) { if(isset($GLOBALS[$variable])) {
unset ($GLOBALS[$variable]); unset ($GLOBALS[$variable]);
} }
@ -1438,14 +1439,14 @@ function is_allowed_to_edit() {
* @return boolean, true: the user has the rights to edit, false: he does not * @return boolean, true: the user has the rights to edit, false: he does not
*/ */
function api_is_allowed_to_edit($tutor=false,$coach=false) { function api_is_allowed_to_edit($tutor=false,$coach=false) {
$is_courseAdmin = api_is_course_admin() || api_is_platform_admin() || api_is_coach(); $is_courseAdmin = api_is_course_admin() || api_is_platform_admin();
if(!$is_courseAdmin && $tutor == true) { //if we also want to check if the user is a tutor... if (!$is_courseAdmin && $tutor == true) { //if we also want to check if the user is a tutor...
$is_courseAdmin = $is_courseAdmin || api_is_course_tutor(); $is_courseAdmin = $is_courseAdmin || api_is_course_tutor();
} }
if(!$is_courseAdmin && $coach == true) { //if we also want to check if the user is a coach...'; if (!$is_courseAdmin && $coach == true) { //if we also want to check if the user is a coach...';
$is_courseAdmin = $is_courseAdmin || api_is_course_coach(); $is_courseAdmin = $is_courseAdmin || api_is_course_coach();
} }
if(api_get_setting('student_view_enabled') == 'true') { //check if the student_view is enabled, and if so, if it is activated if (api_get_setting('student_view_enabled') == 'true') { //check if the student_view is enabled, and if so, if it is activated
$is_allowed = $is_courseAdmin && $_SESSION['studentview'] != "studentview"; $is_allowed = $is_courseAdmin && $_SESSION['studentview'] != "studentview";
return $is_allowed; return $is_allowed;
} else { } else {
@ -2004,6 +2005,7 @@ function api_send_mail($to, $subject, $message, $additional_headers = null, $add
return mail($to, $subject, $message, $additional_headers, $additional_parameters); return mail($to, $subject, $message, $additional_headers, $additional_parameters);
} }
/** /**
* Find the largest sort value in a given user_course_category * Find the largest sort value in a given user_course_category
* This function is used when we are moving a course to a different category * This function is used when we are moving a course to a different category

Loading…
Cancel
Save