diff --git a/main/gradebook/lib/be/exerciselink.class.php b/main/gradebook/lib/be/exerciselink.class.php index cb609e3696..57368d09c9 100755 --- a/main/gradebook/lib/be/exerciselink.class.php +++ b/main/gradebook/lib/be/exerciselink.class.php @@ -144,7 +144,7 @@ class ExerciseLink extends AbstractLink foreach ($exerciseInLP as $exercise) { if (in_array($exercise['iid'], $allExercises)) { - continue; + continue; } $allExercises[] = $exercise['iid']; //$lpName = strip_tags($exercise['lp_name']); @@ -155,7 +155,7 @@ class ExerciseLink extends AbstractLink ];*/ $cats[] = [ $exercise['iid'], - strip_tags(Exercise::get_formated_title_variable($exercise['title'])) + strip_tags(Exercise::get_formated_title_variable($exercise['title'])), ]; } } diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php index 05b7ec7fa2..35b16d133f 100755 --- a/main/gradebook/lib/fe/displaygradebook.php +++ b/main/gradebook/lib/fe/displaygradebook.php @@ -1,4 +1,5 @@ '. Display::return_icon('back.png', get_lang('FolderView'), '', ICON_SIZE_MEDIUM).''; - $pageNum = isset($_GET['flatviewlist_page_nr']) ? intval($_GET['flatviewlist_page_nr']) : null; - $perPage = isset($_GET['flatviewlist_per_page']) ? intval($_GET['flatviewlist_per_page']) : null; + $pageNum = isset($_GET['flatviewlist_page_nr']) ? (int) $_GET['flatviewlist_page_nr'] : null; + $perPage = isset($_GET['flatviewlist_per_page']) ? (int) $_GET['flatviewlist_per_page'] : null; $offset = isset($_GET['offset']) ? $_GET['offset'] : '0'; $exportCsvUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([ @@ -484,7 +485,7 @@ class DisplayGradebook ).'&cidReq='.$catobj->get_course_code().'&id_session='.$catobj->get_session_id().'">'. Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM).''; - if (api_get_plugin_setting('customcertificate', 'enable_plugin_customcertificate') == 'true' && + if (api_get_plugin_setting('customcertificate', 'enable_plugin_customcertificate') === 'true' && api_get_course_setting('customcertificate_course_enable') == 1 ) { $actionsRight .= ''; if ($is_course_admin) { - $header .= ''.Display::return_icon('statistics.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).''; - $header .= ''.Display::return_icon('settings.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM).''; + $header .= ''. + Display::return_icon('statistics.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).''; + $header .= ''. + Display::return_icon('settings.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM).''; } elseif (!(isset($_GET['studentoverview']))) { - $header .= ''.Display::return_icon('view_list.gif', get_lang('FlatView')).' '.get_lang('FlatView').''; + $header .= ''. + Display::return_icon('view_list.gif', get_lang('FlatView')).' '.get_lang('FlatView').''; } else { - $header .= ''.Display::return_icon('pdf.png', get_lang('ExportPDF'), '', ICON_SIZE_MEDIUM).''; + $header .= ''. + Display::return_icon('pdf.png', get_lang('ExportPDF'), '', ICON_SIZE_MEDIUM).''; } $header .= ''; echo $header; @@ -674,8 +679,11 @@ class DisplayGradebook for ($count = 0; $count < count($evals_links); $count++) { $item = $evals_links[$count]; $score = $item->calc_score($userId); - $my_score_denom = ($score[1] == 0) ? 1 : $score[1]; - $item_value += $score[0] / $my_score_denom * $item->get_weight(); + if ($score) { + $my_score_denom = ($score[1] == 0) ? 1 : $score[1]; + $item_value += $score[0] / $my_score_denom * $item->get_weight(); + } + $item_total += $item->get_weight(); } $item_value = api_number_format($item_value, 2); @@ -688,7 +696,7 @@ class DisplayGradebook $info .= '