diff --git a/main/attendance/index.php b/main/attendance/index.php index 51fa4f04f9..4ebde100c0 100755 --- a/main/attendance/index.php +++ b/main/attendance/index.php @@ -285,12 +285,16 @@ switch ($action) { } break; case 'calendar_add': + //no break case 'calendar_edit': + //no break case 'calendar_all_delete': + //no break case 'calendar_delete': if (!api_is_allowed_to_edit(null, true)) { api_not_allowed(); } + //no break case 'calendar_list': $attendanceController->attendance_calendar($action, $attendance_id, $calendar_id); break; diff --git a/main/auth/cas/cas_var.inc.php b/main/auth/cas/cas_var.inc.php index 512a2d24ac..b4fbfb9ed5 100755 --- a/main/auth/cas/cas_var.inc.php +++ b/main/auth/cas/cas_var.inc.php @@ -20,7 +20,7 @@ switch (api_get_setting('cas_protocol')) { case 'SAML': $cas_auth_ver = SAML_VERSION_1_1; break; - default : + default: $cas_auth_ver = CAS_VERSION_2_0; break; } diff --git a/main/auth/cas/lib/CAS.php b/main/auth/cas/lib/CAS.php index 3ef0065f4f..03954fa543 100755 --- a/main/auth/cas/lib/CAS.php +++ b/main/auth/cas/lib/CAS.php @@ -1013,7 +1013,7 @@ class phpCAS self::trace('user is not authenticated, redirecting to the CAS server'); $PHPCAS_CLIENT->forceAuthentication(); } else { - self::trace('no need to authenticate (user `' . phpCAS:: getUser() . '\' is already authenticated)'); + self::trace('no need to authenticate (user `' . self::getUser() . '\' is already authenticated)'); } self::traceEnd(); diff --git a/main/exercise/export/exercise_import.php b/main/exercise/export/exercise_import.php index d931d740a0..da10f58f9b 100755 --- a/main/exercise/export/exercise_import.php +++ b/main/exercise/export/exercise_import.php @@ -34,20 +34,18 @@ $cmd = (isset($_REQUEST['cmd'])? $_REQUEST['cmd'] : 'show_import'); switch ($cmd) { case 'show_import': - $display = '

' - . get_lang('Imported exercises must consist of a zip or an XML file (IMS-QTI) and be compatible with your Claroline version.') . '
' - . '

' - . '
' - . '' - . '

' - . get_lang('Import exercise') . ' : ' - . ' ' - . claro_html_button( $_SERVER['PHP_SELF'], get_lang('Cancel')) - . '

' - . '' . get_lang('Max file size') . ' : 2 MB' - . '
'; - + . get_lang('Imported exercises must consist of a zip or an XML file (IMS-QTI) and be compatible with your Claroline version.') . '
' + . '

' + . '
' + . '' + . '

' + . get_lang('Import exercise') . ' : ' + . ' ' + . claro_html_button( $_SERVER['PHP_SELF'], get_lang('Cancel')) + . '

' + . '' . get_lang('Max file size') . ' : 2 MB' + . '
'; break; case 'import': //include needed librabries for treatment diff --git a/main/gradebook/lib/gradebook_data_generator.class.php b/main/gradebook/lib/gradebook_data_generator.class.php index 85f9eb14f0..11a00977a5 100755 --- a/main/gradebook/lib/gradebook_data_generator.class.php +++ b/main/gradebook/lib/gradebook_data_generator.class.php @@ -213,7 +213,7 @@ class GradebookDataGenerator api_get_session_id() ); - $scoreDisplay = ScoreDisplay :: instance(); + $scoreDisplay = ScoreDisplay::instance(); $display = $scoreDisplay->display_score($score, SCORE_DIV_PERCENT_WITH_CUSTOM, SCORE_BOTH, true); $type = $item->get_item_type(); if ($type == 'L' && get_class($item) == 'ExerciseLink') { @@ -234,7 +234,7 @@ class GradebookDataGenerator private function buildAverageResultColumn(GradebookItem $item) { $score = $item->calc_score(null, 'average'); - $scoreDisplay = ScoreDisplay :: instance(); + $scoreDisplay = ScoreDisplay::instance(); $display = $scoreDisplay->display_score($score, SCORE_DIV_PERCENT_WITH_CUSTOM, SCORE_BOTH, true); $type = $item->get_item_type(); diff --git a/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php b/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php index e90ec98397..1c5b943119 100755 --- a/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php +++ b/main/inc/lib/access_url_edit_courses_to_url_functions.lib.php @@ -45,7 +45,7 @@ class Accessurleditcoursestourl ' LIMIT 11'; $rs = Database::query($sql); $i=0; - while ($course = Database :: fetch_array($rs)) { + while ($course = Database::fetch_array($rs)) { $i++; if ($i<=10) { $return .= ''.$course['title'].' ('.$course['code'].')
'; diff --git a/main/inc/lib/add_many_session_to_category_functions.lib.php b/main/inc/lib/add_many_session_to_category_functions.lib.php index 676d397f13..d6f631d417 100755 --- a/main/inc/lib/add_many_session_to_category_functions.lib.php +++ b/main/inc/lib/add_many_session_to_category_functions.lib.php @@ -24,7 +24,7 @@ class AddManySessionToCategoryFunctions */ function search_courses($needle,$type) { - $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); + $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION); $xajax_response = new xajaxResponse(); $return = ''; if (!empty($needle) && !empty($type)) { @@ -36,7 +36,7 @@ class AddManySessionToCategoryFunctions $rs = Database::query($sql); $course_list = array(); $return .= '