chamilo / chamilo-lms

main/gradebook/gradebook_display_certificate.php

Indentation +9 added lines, -9 removed lines

@@ -162,17 +162,17 @@
 
     if ($form->validate()) {
         $officialCode = $form->getSubmitValue('filter');
-         if ($officialCode == 'all') {
+            if ($officialCode == 'all') {
             $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
         } else {
-             $userList = UserManager::getUsersByOfficialCode($officialCode);
-             if (!empty($userList)) {
-                 $certificate_list = GradebookUtils::get_list_users_certificates(
-                     $cat_id,
-                     $userList
-                 );
-             }
-         }
+                $userList = UserManager::getUsersByOfficialCode($officialCode);
+                if (!empty($userList)) {
+                    $certificate_list = GradebookUtils::get_list_users_certificates(
+                        $cat_id,
+                        $userList
+                    );
+                }
+            }
     } else {
         $certificate_list = GradebookUtils::get_list_users_certificates($cat_id);
     }

Spacing +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
  * @package chamilo.gradebook
  */
 require_once __DIR__.'/../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 if (!api_is_student_boss()) {
     api_protect_course_script(true);
@@ -16,9 +16,9 @@ 
 ini_set('max_execution_time', 0);
 
 //extra javascript functions for in html head:
-$htmlHeadXtra[] ="<script>
+$htmlHeadXtra[] = "<script>
 function confirmation() {
-	if (confirm(\" " . trim(get_lang('AreYouSureToDelete')) . " ?\")) {
+	if (confirm(\" " . trim(get_lang('AreYouSureToDelete'))." ?\")) {
 	    return true;
 	} else {
 	    return false;
@@ -31,7 +31,7 @@ 
     api_not_allowed(true);
 }
 
-$cat_id = isset($_GET['cat_id']) ? (int)$_GET['cat_id'] : null;
+$cat_id = isset($_GET['cat_id']) ? (int) $_GET['cat_id'] : null;
 $action = isset($_GET['action']) && $_GET['action'] ? $_GET['action'] : null;
 $filterOfficialCode = isset($_POST['filter']) ? Security::remove_XSS($_POST['filter']) : null;
 $filterOfficialCodeGet = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
@@ -72,8 +72,8 @@ 
 
 $course_code = api_get_course_id();
 
-$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?',	'name' => get_lang('Gradebook'));
-$interbreadcrumb[] = array('url' => '#','name' => get_lang('GradebookListOfStudentsCertificates'));
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
+$interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradebookListOfStudentsCertificates'));
 
 $this_section = SECTION_COURSES;
 
@@ -85,7 +85,7 @@ 
         $certificate = new Certificate($_GET['certificate_id']);
         $result = $certificate->delete(true);
         Security::clear_token();
-        if ($result ==true) {
+        if ($result == true) {
             Display::display_confirmation_message(get_lang('CertificateRemoved'));
         } else {
             Display::display_error_message(get_lang('CertificateNotRemoved'));
@@ -104,9 +104,9 @@ 
 
     //with this fix the teacher only can view 1 gradebook
     if (api_is_platform_admin()) {
-        $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
+        $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
     } else {
-        $stud_id= api_get_user_id();
+        $stud_id = api_get_user_id();
     }
 
     $total_weight = $cats[0]->get_weight();
@@ -115,7 +115,7 @@ 
     $alleval = $cats[0]->get_evaluations($stud_id);
     $alllink = $cats[0]->get_links($stud_id);
 
-    $datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
+    $datagen = new GradebookDataGenerator($allcat, $alleval, $alllink);
 
     $total_resource_weight = 0;
     if (!empty($datagen)) {
@@ -132,7 +132,7 @@ 
                 $newarray[] = array_slice($data, 1);
             }
 
-            foreach($newarray as $item) {
+            foreach ($newarray as $item) {
                 $total_resource_weight = $total_resource_weight + $item['2'];
             }
         }
@@ -150,7 +150,7 @@ 
 if ($filter === 'true') {
     echo '<br />';
     $options = UserManager::getOfficialCodeGrouped();
-    $options =array_merge(array('all' => get_lang('All')), $options);
+    $options = array_merge(array('all' => get_lang('All')), $options);
     $form = new FormValidator(
         'official_code_filter',
         'POST',
@@ -196,7 +196,7 @@ 
 
 echo $filterForm;
 
-if (count($certificate_list) == 0 ) {
+if (count($certificate_list) == 0) {
     echo Display::display_warning_message(get_lang('NoResultsAvailable'));
 } else {
 
@@ -219,7 +219,7 @@ 
             $certificates = Display::url(get_lang('Certificate'), $url, array('target'=>'_blank', 'class' => 'btn btn-default'));
             echo $certificates;
             echo '<a onclick="return confirmation();" href="gradebook_display_certificate.php?sec_token='.$token.'&'.api_get_cidreq().'&action=delete&cat_id='.$cat_id.'&certificate_id='.$value_certificate['id'].'">
-                    '.Display::return_icon('delete.png',get_lang('Delete')).'
+                    '.Display::return_icon('delete.png', get_lang('Delete')).'
                   </a>';
             echo '</td></tr>';
         }

main/gradebook/gradebook_scoring_system.php

Spacing +13 added lines, -13 removed lines

@@ -13,7 +13,7 @@ 
     api_not_allowed();
 }
 
-$htmlHeadXtra[]= '<script>
+$htmlHeadXtra[] = '<script>
 function plusItem(item) {
     document.getElementById(item).style.display = "inline";
     document.getElementById("plus-"+item).style.display = "none";
@@ -45,10 +45,10 @@ 
 );
 
 $select_cat = intval($_GET['selectcat']);
-$displayscore= ScoreDisplay :: instance();
+$displayscore = ScoreDisplay :: instance();
 $customdisplays = $displayscore->get_custom_score_display_settings();
 
-$nr_items = (count($customdisplays) != '0' )? count($customdisplays) : '1';
+$nr_items = (count($customdisplays) != '0') ? count($customdisplays) : '1';
 $scoreform = new ScoreDisplayForm(
     'scoring_system_form',
     api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
@@ -57,18 +57,18 @@ 
 if ($scoreform->validate()) {
     $value_export = '';
     $value_export = $scoreform->exportValues();
-    $value_export = isset($value_export) ? $scoreform->exportValues(): '';
+    $value_export = isset($value_export) ? $scoreform->exportValues() : '';
     $values = $value_export;
 
     // create new array of custom display settings
     // this loop also checks if all score ranges are unique
 
-    $scoringdisplay= array ();
+    $scoringdisplay = array();
     $ranges_ok = true;
-    $endscore= isset($values['endscore']) ? $values['endscore'] : null;
-    $displaytext=isset($values['displaytext']) ? $values['displaytext'] : null;
-    for ($counter= 1; $ranges_ok && $counter <= 20; $counter++) {
-        $setting= array ();
+    $endscore = isset($values['endscore']) ? $values['endscore'] : null;
+    $displaytext = isset($values['displaytext']) ? $values['displaytext'] : null;
+    for ($counter = 1; $ranges_ok && $counter <= 20; $counter++) {
+        $setting = array();
         $setting['score'] = $endscore[$counter];
         $setting['display'] = $displaytext[$counter];
         if (!empty($setting['score'])) {
@@ -77,12 +77,12 @@ 
                     $ranges_ok = false;
                 }
             }
-            $scoringdisplay[]= $setting;
+            $scoringdisplay[] = $setting;
         }
     }
 
     if (!$ranges_ok) {
-        header('Location: ' . api_get_self() . '?nouniqueranges=&selectcat=' . $select_cat.'&'.api_get_cidreq());
+        header('Location: '.api_get_self().'?nouniqueranges=&selectcat='.$select_cat.'&'.api_get_cidreq());
         exit;
     }
 
@@ -102,8 +102,8 @@ 
 $this_section = SECTION_COURSES;
 Display :: display_header(get_lang('ScoreEdit'));
 
-if (((isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') ||
-    (isset($_GET['selectcat']) && ($_SESSION['studentview']=='teacherview')))
+if (((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') ||
+    (isset($_GET['selectcat']) && ($_SESSION['studentview'] == 'teacherview')))
 ) {
     if (isset ($_GET['scoringupdated'])) {
         Display::display_confirmation_message(get_lang('ScoringUpdated'), false);

main/gradebook/gradebook_edit_all.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
 $submitted = isset($_POST['submitted']) ? $_POST['submitted'] : '';
 if ($submitted == 1) {
-    Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')) . '<br /><br />';
+    Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')).'<br /><br />';
     if (isset($_POST['evaluation'])) {
         $eval_log = new Evaluation();
     }

main/gradebook/my_certificates.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         'actions',
         Display::toolbarButton(
             get_lang('SearchCertificates'),
-            api_get_path(WEB_CODE_PATH) . "gradebook/search.php",
+            api_get_path(WEB_CODE_PATH)."gradebook/search.php",
             'search',
             'info'
         )

main/gradebook/user_stats.php

Spacing +13 added lines, -13 removed lines

@@ -16,7 +16,7 @@ 
 if (!$isDrhOfCourse) {
     GradebookUtils::block_students();
 }
-$interbreadcrumb[]= array (
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'],
     'name' => get_lang('Gradebook'
 ));
@@ -27,12 +27,12 @@ 
 $alllinks = $category[0]->get_links($my_user_id, true);
 
 if ($_GET['selectcat'] != null) {
-    $addparams= array (
+    $addparams = array(
         'userid' => $my_user_id,
         'selectcat' => Security::remove_XSS($_GET['selectcat'])
     );
 } else {
-    $addparams= array (
+    $addparams = array(
         'userid' => $my_user_id,
         'selecteval' => Security::remove_XSS($_GET['selecteval'])
     );
@@ -49,7 +49,7 @@ 
         $newarray[] = array_slice($data, 1);
     }
     $userinfo = api_get_user_info($my_user_id);
-    $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')';
+    $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('.api_convert_and_format_date(null, DATE_FORMAT_SHORT).' '.api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).')';
 
     if ($displayscore->is_custom()) {
         $header_names = array(
@@ -95,23 +95,23 @@ 
 $actions = '<div class="actions">';
 
 if (isset($_GET['selectcat'])) {
-    $interbreadcrumb[]= array ('url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
-    $actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '>' . Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'),'',ICON_SIZE_MEDIUM).'</a>';
+    $interbreadcrumb[] = array('url' => 'gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
+    $actions .= '<a href=gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']).'>'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
 }
 
 if (isset ($_GET['selecteval'])) {
-    $interbreadcrumb[]= array (
-        'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']),
+    $interbreadcrumb[] = array(
+        'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']),
         'name' => get_lang('ViewResult'
     ));
-    $actions.= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '>
-	'.Display::return_icon('back.png', get_lang('BackToEvaluation'),'',ICON_SIZE_MEDIUM).'</a>';
+    $actions .= '<a href=gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'>
+	'.Display::return_icon('back.png', get_lang('BackToEvaluation'), '', ICON_SIZE_MEDIUM).'</a>';
 }
 
-$actions.= '<a href="' . api_get_self() . '?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat=' . $category[0]->get_id() . '" target="_blank">
-' . Display::return_icon('pdf.png', get_lang('ExportPDF'),'',ICON_SIZE_MEDIUM).'</a>';
+$actions .= '<a href="'.api_get_self().'?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat='.$category[0]->get_id().'" target="_blank">
+' . Display::return_icon('pdf.png', get_lang('ExportPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
-$actions.='</div>';
+$actions .= '</div>';
 
 Display :: display_header(get_lang('ResultsPerUser'));
 echo $actions;

main/gradebook/gradebook.php

Braces +2 added lines, -3 removed lines

@@ -227,7 +227,7 @@ 
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
         $visibility_command= 1;
-    }else {
+    } else {
         $visibility_command= 0;
     }
     $link= LinkFactory :: load($_GET['visiblelink']);
@@ -281,8 +281,7 @@ 
     if ($number_of_selected_items == '0') {
         $warning_message = get_lang('NoItemsSelected');
         $filter_warning_msg = false;
-    }
-    else {
+    } else {
         switch ($_POST['action']) {
             case 'deleted' :
                 $number_of_deleted_categories= 0;

Spacing +118 added lines, -118 removed lines

@@ -8,7 +8,7 @@ 
 
 // $cidReset : This is the main difference with gradebook.php, here we say,
 // basically, that we are inside a course, and many things depend from that
-$cidReset= true;
+$cidReset = true;
 $_in_course = false;
 //make sure the destination for scripts is index.php instead of gradebook.php
 require_once __DIR__.'/../inc/global.inc.php';
@@ -21,7 +21,7 @@ 
     unset($_GET['course']);
 }
 
-$selectcat = isset($_GET['selectcat']) ?  (int) $_GET['selectcat'] : 0;
+$selectcat = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : 0;
 
 $htmlHeadXtra[] = '<script>
 $(document).ready( function() {
@@ -34,7 +34,7 @@ 
  </script>';
 api_block_anonymous_users();
 
-$htmlHeadXtra[]= '<script>
+$htmlHeadXtra[] = '<script>
 function confirmation () {
 	if (confirm("'.get_lang('DeleteAll').'?")) {
 	    return true;
@@ -50,10 +50,10 @@ 
 //this is called when there is no data for the course admin
 if (isset ($_GET['createallcategories'])) {
     GradebookUtils::block_students();
-    $coursecat= Category :: get_not_created_course_categories(api_get_user_id());
+    $coursecat = Category :: get_not_created_course_categories(api_get_user_id());
     if (!count($coursecat) == 0) {
         foreach ($coursecat as $row) {
-            $cat= new Category();
+            $cat = new Category();
             $cat->set_name($row[1]);
             $cat->set_course_code($row[0]);
             $cat->set_description(null);
@@ -75,26 +75,26 @@ 
     GradebookUtils::block_students();
     $cats = Category :: load($move_cat);
     if (!isset ($_GET['targetcat'])) {
-        $move_form= new CatForm(CatForm :: TYPE_MOVE,
+        $move_form = new CatForm(CatForm :: TYPE_MOVE,
             $cats[0],
             'move_cat_form',
             null,
-            api_get_self() . '?movecat=' . $move_cat. '&selectcat=' . $selectcat
+            api_get_self().'?movecat='.$move_cat.'&selectcat='.$selectcat
         );
         if ($move_form->validate()) {
-            header('Location: ' . api_get_self() . '?selectcat=' . $selectcat
-                . '&movecat=' . $move_cat
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.$selectcat
+                . '&movecat='.$move_cat
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
-        $get_target_cat=Security::remove_XSS($_GET['targetcat']);
-        $targetcat= Category :: load($get_target_cat);
+        $get_target_cat = Security::remove_XSS($_GET['targetcat']);
+        $targetcat = Category :: load($get_target_cat);
         $course_to_crsind = ($cats[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $cats[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . $selectcat);
+            header('Location: '.api_get_self().'?categorymoved=&selectcat='.$selectcat);
             exit;
         }
         unset($targetcat);
@@ -105,8 +105,8 @@ 
 //move an evaluation
 if (isset ($_GET['moveeval'])) {
     GradebookUtils::block_students();
-    $get_move_eval=Security::remove_XSS($_GET['moveeval']);
-    $evals= Evaluation :: load($get_move_eval);
+    $get_move_eval = Security::remove_XSS($_GET['moveeval']);
+    $evals = Evaluation :: load($get_move_eval);
     if (!isset ($_GET['targetcat'])) {
 
         $move_form = new EvalForm(EvalForm :: TYPE_MOVE,
@@ -114,23 +114,23 @@ 
             null,
             'move_eval_form',
             null,
-            api_get_self() . '?moveeval=' . $get_move_eval. '&selectcat=' . $selectcat
+            api_get_self().'?moveeval='.$get_move_eval.'&selectcat='.$selectcat
         );
 
         if ($move_form->validate()) {
-            header('Location: ' .api_get_self() . '?selectcat=' . $selectcat
-                . '&moveeval=' . $get_move_eval
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.$selectcat
+                . '&moveeval='.$get_move_eval
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
-        $get_target_cat=Security::remove_XSS($_GET['targetcat']);
-        $targetcat= Category :: load($get_target_cat);
+        $get_target_cat = Security::remove_XSS($_GET['targetcat']);
+        $targetcat = Category :: load($get_target_cat);
         $course_to_crsind = ($evals[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $evals[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?evaluationmoved=&selectcat=' . $selectcat);
+            header('Location: '.api_get_self().'?evaluationmoved=&selectcat='.$selectcat);
             exit;
         }
         unset ($targetcat);
@@ -141,8 +141,8 @@ 
 //move a link
 if (isset ($_GET['movelink'])) {
     GradebookUtils::block_students();
-    $get_move_link=Security::remove_XSS($_GET['movelink']);
-    $link= LinkFactory :: load($get_move_link);
+    $get_move_link = Security::remove_XSS($_GET['movelink']);
+    $link = LinkFactory :: load($get_move_link);
     $move_form = new LinkForm(
         LinkForm :: TYPE_MOVE,
         null,
@@ -152,10 +152,10 @@ 
         api_get_self().'?movelink='.$get_move_link.'&selectcat='.$selectcat
     );
     if ($move_form->validate()) {
-        $targetcat= Category :: load($move_form->exportValue('move_cat'));
+        $targetcat = Category :: load($move_form->exportValue('move_cat'));
         $link[0]->move_to_cat($targetcat[0]);
         unset ($link);
-        header('Location: ' . api_get_self(). '?linkmoved=&selectcat=' . $selectcat);
+        header('Location: '.api_get_self().'?linkmoved=&selectcat='.$selectcat);
         exit;
     }
 }
@@ -164,11 +164,11 @@ 
 if (isset ($_GET['visiblecat'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
-    $cats= Category :: load($_GET['visiblecat']);
+    $cats = Category :: load($_GET['visiblecat']);
     $cats[0]->set_visible($visibility_command);
     $cats[0]->save();
     $cats[0]->apply_visibility_to_children();
@@ -183,7 +183,7 @@ 
 }
 if (isset ($_GET['deletecat'])) {
     GradebookUtils::block_students();
-    $cats= Category :: load($_GET['deletecat']);
+    $cats = Category :: load($_GET['deletecat']);
     //delete all categories,subcategories and results
     if ($cats[0] != null) {
         if ($cats[0]->get_id() != 0) {
@@ -198,12 +198,12 @@ 
 if (isset ($_GET['visibleeval'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
 
-    $eval= Evaluation :: load($_GET['visibleeval']);
+    $eval = Evaluation :: load($_GET['visibleeval']);
     $eval[0]->set_visible($visibility_command);
     $eval[0]->save();
     unset ($eval);
@@ -217,7 +217,7 @@ 
 }
 if (isset ($_GET['deleteeval'])) {
     GradebookUtils::block_students();
-    $eval= Evaluation :: load($_GET['deleteeval']);
+    $eval = Evaluation :: load($_GET['deleteeval']);
     if ($eval[0] != null) {
         $eval[0]->delete_with_results();
     }
@@ -228,11 +228,11 @@ 
 if (isset ($_GET['visiblelink'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
-    }else {
-        $visibility_command= 0;
+        $visibility_command = 1;
+    } else {
+        $visibility_command = 0;
     }
-    $link= LinkFactory :: load($_GET['visiblelink']);
+    $link = LinkFactory :: load($_GET['visiblelink']);
     $link[0]->set_visible($visibility_command);
     $link[0]->save();
     unset ($link);
@@ -248,7 +248,7 @@ 
     GradebookUtils::block_students();
     //fixing #5229
     if (!empty($_GET['deletelink'])) {
-        $link= LinkFactory :: load($_GET['deletelink']);
+        $link = LinkFactory :: load($_GET['deletelink']);
         if ($link[0] != null) {
             $link[0]->delete();
         }
@@ -265,9 +265,9 @@ 
     }
     $button = '<form name="confirm"
                  method="post"
-                 action="'.api_get_self() .'?confirm='
-        .(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
-            : '&moveeval=' . intval($_GET['moveeval']) ).'&selectcat=' . $selectcat.'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
+                 action="'.api_get_self().'?confirm='
+        .(isset($_GET['movecat']) ? '&movecat='.Security::remove_XSS($_GET['movecat'])
+            : '&moveeval='.intval($_GET['moveeval'])).'&selectcat='.$selectcat.'&targetcat='.Security::remove_XSS($_GET['targetcat']).'">
 			   <input type="submit" value="'.'  '.get_lang('Ok').'  '.'">
 			   </form>';
 
@@ -277,7 +277,7 @@ 
 //actions on the sortabletable
 if (isset ($_POST['action'])) {
     GradebookUtils::block_students();
-    $number_of_selected_items= count($_POST['id']);
+    $number_of_selected_items = count($_POST['id']);
     if ($number_of_selected_items == '0') {
         $warning_message = get_lang('NoItemsSelected');
         $filter_warning_msg = false;
@@ -285,19 +285,19 @@ 
     else {
         switch ($_POST['action']) {
             case 'deleted' :
-                $number_of_deleted_categories= 0;
-                $number_of_deleted_evaluations= 0;
-                $number_of_deleted_links= 0;
+                $number_of_deleted_categories = 0;
+                $number_of_deleted_evaluations = 0;
+                $number_of_deleted_links = 0;
                 foreach ($_POST['id'] as $indexstr) {
                     if (api_substr($indexstr, 0, 4) == 'CATE') {
-                        $cats= Category :: load(api_substr($indexstr, 4));
+                        $cats = Category :: load(api_substr($indexstr, 4));
                         if ($cats[0] != null) {
                             $cats[0]->delete_all();
                         }
                         $number_of_deleted_categories++;
                     }
                     if (api_substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(api_substr($indexstr, 4));
+                        $eval = Evaluation :: load(api_substr($indexstr, 4));
                         if ($eval[0] != null) {
                             $eval[0]->delete_with_results();
                         }
@@ -306,7 +306,7 @@ 
                     if (api_substr($indexstr, 0, 4) == 'LINK') {
                         $id = api_substr($indexstr, 4);
                         if (!empty($id)) {
-                            $link= LinkFactory :: load();
+                            $link = LinkFactory :: load();
                             if ($link[0] != null) {
                                 $link[0]->delete();
                             }
@@ -314,7 +314,7 @@ 
                         }
                     }
                 }
-                $confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
+                $confirmation_message = get_lang('DeletedCategories').' : <b>'.$number_of_deleted_categories.'</b><br />'.get_lang('DeletedEvaluations').' : <b>'.$number_of_deleted_evaluations.'</b><br />'.get_lang('DeletedLinks').' : <b>'.$number_of_deleted_links.'</b><br /><br />'.get_lang('TotalItems').' : <b>'.$number_of_selected_items.'</b>';
                 $filter_confirm_msg = false;
                 break;
             case 'setvisible' :
@@ -366,7 +366,7 @@ 
 }
 
 if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
-    header('Location: ' . api_get_self() . '?selectcat=' . $selectcat
+    header('Location: '.api_get_self().'?selectcat='.$selectcat
         . '&search='.Security::remove_XSS($_POST['keyword']));
     exit;
 }
@@ -374,8 +374,8 @@ 
 // DISPLAY HEADERS AND MESSAGES                           -
 if (!isset($_GET['exportpdf']) && !isset($_GET['export_certificate'])) {
     if (isset ($_GET['studentoverview'])) {
-        $interbreadcrumb[]= array (
-            'url' => $_SESSION['gradebook_dest'].'?selectcat=' . $selectcat.'&'.api_get_cidreq(),
+        $interbreadcrumb[] = array(
+            'url' => $_SESSION['gradebook_dest'].'?selectcat='.$selectcat.'&'.api_get_cidreq(),
             'name' => get_lang('ToolGradebook')
         );
         Display :: display_header(get_lang('FlatView'));
@@ -386,13 +386,13 @@ 
             $gradebook_dest = Security::remove_XSS($_SESSION['gradebook_dest']);
         }
 
-        $interbreadcrumb[]= array ('url' => $gradebook_dest,'name' => get_lang('Gradebook'));
+        $interbreadcrumb[] = array('url' => $gradebook_dest, 'name' => get_lang('Gradebook'));
 
-        if ((isset($_GET['selectcat']) && $_GET['selectcat']>0)) {
+        if ((isset($_GET['selectcat']) && $_GET['selectcat'] > 0)) {
             if (!empty($_GET['course'])) {
-                $interbreadcrumb[]= array ('url' => $gradebook_dest.'selectcat='.$selectcat,'name' => get_lang('Details'));
+                $interbreadcrumb[] = array('url' => $gradebook_dest.'selectcat='.$selectcat, 'name' => get_lang('Details'));
             } else {
-                $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=0','name' => get_lang('Details'));
+                $interbreadcrumb[] = array('url' => $_SESSION['gradebook_dest'].'?selectcat=0', 'name' => get_lang('Details'));
             }
         }
         Display :: display_header('');
@@ -402,50 +402,50 @@ 
 }
 
 if (isset($_GET['categorymoved'])) {
-    Display :: display_confirmation_message(get_lang('CategoryMoved'),false);
+    Display :: display_confirmation_message(get_lang('CategoryMoved'), false);
 }
 if (isset($_GET['evaluationmoved'])) {
-    Display :: display_confirmation_message(get_lang('EvaluationMoved'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationMoved'), false);
 }
 if (isset($_GET['linkmoved'])) {
-    Display :: display_confirmation_message(get_lang('LinkMoved'),false);
+    Display :: display_confirmation_message(get_lang('LinkMoved'), false);
 }
 if (isset ($_GET['addcat'])) {
-    Display :: display_confirmation_message(get_lang('CategoryAdded'),false);
+    Display :: display_confirmation_message(get_lang('CategoryAdded'), false);
 }
 if (isset ($_GET['linkadded'])) {
-    Display :: display_confirmation_message(get_lang('LinkAdded'),false);
+    Display :: display_confirmation_message(get_lang('LinkAdded'), false);
 }
 if (isset ($_GET['addresult'])) {
-    Display :: display_confirmation_message(get_lang('ResultAdded'),false);
+    Display :: display_confirmation_message(get_lang('ResultAdded'), false);
 }
 if (isset ($_GET['editcat'])) {
-    Display :: display_confirmation_message(get_lang('CategoryEdited'),false);
+    Display :: display_confirmation_message(get_lang('CategoryEdited'), false);
 }
 if (isset ($_GET['editeval'])) {
-    Display :: display_confirmation_message(get_lang('EvaluationEdited'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationEdited'), false);
 }
 if (isset ($_GET['linkedited'])) {
-    Display :: display_confirmation_message(get_lang('LinkEdited'),false);
+    Display :: display_confirmation_message(get_lang('LinkEdited'), false);
 }
 if (isset ($_GET['nolinkitems'])) {
-    Display :: display_warning_message(get_lang('NoLinkItems'),false);
+    Display :: display_warning_message(get_lang('NoLinkItems'), false);
 }
 if (isset ($_GET['addallcat'])) {
-    Display :: display_normal_message(get_lang('AddAllCat'),false);
+    Display :: display_normal_message(get_lang('AddAllCat'), false);
 }
 if (isset ($confirmation_message)) {
-    Display :: display_confirmation_message($confirmation_message,$filter_confirm_msg);
+    Display :: display_confirmation_message($confirmation_message, $filter_confirm_msg);
 }
 if (isset ($warning_message)) {
-    Display :: display_warning_message($warning_message,$filter_warning_msg);
+    Display :: display_warning_message($warning_message, $filter_warning_msg);
 }
 if (isset ($move_form)) {
-    Display :: display_normal_message($move_form->toHtml(),false);
+    Display :: display_normal_message($move_form->toHtml(), false);
 }
 // LOAD DATA & DISPLAY TABLE                             -
-$is_platform_admin= api_is_platform_admin();
-$is_course_admin= api_is_allowed_to_edit();
+$is_platform_admin = api_is_platform_admin();
+$is_course_admin = api_is_allowed_to_edit();
 
 //load data for category, evaluation and links
 if (empty($selectcat)) {
@@ -462,7 +462,7 @@ 
     null,
     api_get_self().'?selectcat='.$selectcat
 );
-$values= $simple_search_form->exportValues();
+$values = $simple_search_form->exportValues();
 $keyword = '';
 if (isset($_GET['search']) && !empty($_GET['search'])) {
     $keyword = Security::remove_XSS($_GET['search']);
@@ -472,13 +472,13 @@ 
 }
 
 if (!empty($keyword)) {
-    $cats= Category :: load($category);
-    $allcat= array ();
-    if ((isset($_GET['selectcat']) && $_GET['selectcat']==0) && isset($_GET['search'])) {
-        $allcat= $cats[0]->get_subcategories(null);
-        $allcat_info = Category::find_category($keyword,$allcat);
-        $alleval=array();
-        $alllink=array();
+    $cats = Category :: load($category);
+    $allcat = array();
+    if ((isset($_GET['selectcat']) && $_GET['selectcat'] == 0) && isset($_GET['search'])) {
+        $allcat = $cats[0]->get_subcategories(null);
+        $allcat_info = Category::find_category($keyword, $allcat);
+        $alleval = array();
+        $alllink = array();
     } else {
         $alleval = Evaluation::find_evaluations($keyword, $cats[0]->get_id());
         $alllink = LinkFactory::find_links($keyword, $cats[0]->get_id());
@@ -486,13 +486,13 @@ 
 
 } elseif (isset ($_GET['studentoverview'])) {
     //@todo this code seems to be deprecated because the gradebook tab is off
-    $cats= Category :: load($category);
-    $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
-    $allcat= array ();
-    $alleval= $cats[0]->get_evaluations($stud_id, true);
-    $alllink= $cats[0]->get_links($stud_id, true);
+    $cats = Category :: load($category);
+    $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
+    $allcat = array();
+    $alleval = $cats[0]->get_evaluations($stud_id, true);
+    $alllink = $cats[0]->get_links($stud_id, true);
     if (isset ($_GET['exportpdf'])) {
-        $datagen = new GradebookDataGenerator ($allcat,$alleval, $alllink);
+        $datagen = new GradebookDataGenerator($allcat, $alleval, $alllink);
         $header_names = array(
             get_lang('Name'),
             get_lang('Description'),
@@ -500,18 +500,18 @@ 
             get_lang('Date'),
             get_lang('Results'),
         );
-        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME,0,null,true);
+        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME, 0, null, true);
         $newarray = array();
         foreach ($data_array as $data) {
             $newarray[] = array_slice($data, 1);
         }
-        $pdf= new Cezpdf();
+        $pdf = new Cezpdf();
         $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
         $pdf->ezSetMargins(30, 30, 50, 30);
         $pdf->ezSetY(810);
-        $pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT) . ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
-        $pdf->line(50,790,550,790);
-        $pdf->line(50,40,550,40);
+        $pdf->ezText(get_lang('FlatView').' ('.api_convert_and_format_date(null, DATE_FORMAT_SHORT).' '.api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).')', 12, array('justification'=>'center'));
+        $pdf->line(50, 790, 550, 790);
+        $pdf->line(50, 40, 550, 40);
         $pdf->ezSetY(750);
         $pdf->ezTable(
             $newarray,
@@ -528,57 +528,57 @@ 
         $pdf->ezStream();
         exit;
     }
-} elseif (!empty($_GET['export_certificate'])){
+} elseif (!empty($_GET['export_certificate'])) {
     //@todo this code seems not to be used
     $user_id = strval(intval($_GET['user']));
-    if (!api_is_allowed_to_edit(true,true)) {
+    if (!api_is_allowed_to_edit(true, true)) {
         $user_id = api_get_user_id();
     }
-    $category = Category :: load ($_GET['cat_id']);
+    $category = Category :: load($_GET['cat_id']);
     if ($category[0]->is_certificate_available($user_id)) {
         $user = api_get_user_info($user_id);
         $scoredisplay = ScoreDisplay :: instance();
         $scorecourse = $category[0]->calc_score($user_id);
-        $scorecourse_display = (isset($scorecourse) ? $scoredisplay->display_score($scorecourse,SCORE_AVERAGE) : get_lang('NoResultsAvailable'));
+        $scorecourse_display = (isset($scorecourse) ? $scoredisplay->display_score($scorecourse, SCORE_AVERAGE) : get_lang('NoResultsAvailable'));
 
         $cattotal = Category :: load(0);
-        $scoretotal= $cattotal[0]->calc_score($user_id);
-        $scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal,SCORE_PERCENT) : get_lang('NoResultsAvailable'));
+        $scoretotal = $cattotal[0]->calc_score($user_id);
+        $scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal, SCORE_PERCENT) : get_lang('NoResultsAvailable'));
 
         //prepare all necessary variables:
         $organization_name = api_get_setting('Institution');
         $portal_name = api_get_setting('siteName');
         $stud_fn = $user['firstname'];
         $stud_ln = $user['lastname'];
-        $certif_text = sprintf(get_lang('CertificateWCertifiesStudentXFinishedCourseYWithGradeZ'),$organization_name,$stud_fn.' '.$stud_ln,$category[0]->get_name(),$scorecourse_display);
-        $certif_text = str_replace("\\n","\n",$certif_text);
+        $certif_text = sprintf(get_lang('CertificateWCertifiesStudentXFinishedCourseYWithGradeZ'), $organization_name, $stud_fn.' '.$stud_ln, $category[0]->get_name(), $scorecourse_display);
+        $certif_text = str_replace("\\n", "\n", $certif_text);
         $date = api_convert_and_format_date(null, DATE_FORMAT_SHORT);
 
-        $pdf= new Cezpdf('a4','landscape');
+        $pdf = new Cezpdf('a4', 'landscape');
         $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
         $pdf->ezSetMargins(30, 30, 50, 50);
         //line Y coordinates in landscape mode are upside down (500 is on top, 10 is on the bottom)
-        $pdf->line(50,50,790,50);
-        $pdf->line(50,550,790,550);
+        $pdf->line(50, 50, 790, 50);
+        $pdf->line(50, 550, 790, 550);
         $pdf->ezSetY(450);
         $pdf->ezSetY(480);
-        $pdf->ezText($certif_text,28,array('justification'=>'center'));
+        $pdf->ezText($certif_text, 28, array('justification'=>'center'));
         //$pdf->ezSetY(750);
         $pdf->ezSetY(50);
-        $pdf->ezText($date,18,array('justification'=>'center'));
+        $pdf->ezText($date, 18, array('justification'=>'center'));
         $pdf->ezSetY(580);
-        $pdf->ezText($organization_name,22,array('justification'=>'left'));
+        $pdf->ezText($organization_name, 22, array('justification'=>'left'));
         $pdf->ezSetY(580);
-        $pdf->ezText($portal_name,22,array('justification'=>'right'));
+        $pdf->ezText($portal_name, 22, array('justification'=>'right'));
         $pdf->ezStream();
     }
     exit;
 } else {
-    $cats= Category :: load($category);
-    $stud_id= (api_is_allowed_to_edit() ? null : api_get_user_id());
-    $allcat= $cats[0]->get_subcategories($stud_id);
-    $alleval= $cats[0]->get_evaluations($stud_id);
-    $alllink= $cats[0]->get_links($stud_id);
+    $cats = Category :: load($category);
+    $stud_id = (api_is_allowed_to_edit() ? null : api_get_user_id());
+    $allcat = $cats[0]->get_subcategories($stud_id);
+    $alleval = $cats[0]->get_evaluations($stud_id);
+    $alllink = $cats[0]->get_links($stud_id);
 }
 $addparams = array('selectcat' => $cats[0]->get_id());
 if (isset($_GET['search'])) {
@@ -587,10 +587,10 @@ 
 if (isset ($_GET['studentoverview'])) {
     $addparams['studentoverview'] = '';
 }
-if (isset($allcat_info) && count($allcat_info)>=0 && (isset($_GET['selectcat']) && $_GET['selectcat']==0) && isset($_GET['search']) && strlen(trim($_GET['search']))>0 ) {
-    $allcat=$allcat_info;
+if (isset($allcat_info) && count($allcat_info) >= 0 && (isset($_GET['selectcat']) && $_GET['selectcat'] == 0) && isset($_GET['search']) && strlen(trim($_GET['search'])) > 0) {
+    $allcat = $allcat_info;
 } else {
-    $allcat=$allcat;
+    $allcat = $allcat;
 }
 $gradebooktable = new GradebookTable(
     $cats[0],
@@ -603,10 +603,10 @@ 
     api_is_course_tutor()
 ) {
     Display :: display_normal_message(
-        get_lang('GradebookWelcomeMessage') .
+        get_lang('GradebookWelcomeMessage').
         '<br /><br />
-        <form name="createcat" method="post" action="' . api_get_self() . '?createallcategories=1">
-        <input type="submit" value="' . get_lang('CreateAllCat') . '"></form>',
+        <form name="createcat" method="post" action="' . api_get_self().'?createallcategories=1">
+        <input type="submit" value="' . get_lang('CreateAllCat').'"></form>',
         false
     );
 }

main/gradebook/gradebook_add_result.php

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,9 @@
         $res->set_evaluation_id($values['evaluation_id']);
         $res->set_user_id(key($scores));
         //if no scores are given, don't set the score
-        if ((!empty ($row)) || ($row == '0')) $res->set_score($row);
+        if ((!empty ($row)) || ($row == '0')) {
+            $res->set_score($row);
+        }
         $res->add();
         next($scores);
     }

Spacing +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
  */
 //$cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 api_block_anonymous_users();
@@ -25,14 +25,14 @@ 
     $resultadd,
     'add_result_form',
     null,
-    api_get_self() . '?selectcat=' . Security::remove_XSS($category) . '&selecteval=' . $selectEval.'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.Security::remove_XSS($category).'&selecteval='.$selectEval.'&'.api_get_cidreq()
 );
 $table = $add_result_form->toHtml();
 if ($add_result_form->validate()) {
     $values = $add_result_form->exportValues();
     $nr_users = $values['nr_users'];
     if ($nr_users == '0') {
-        header('Location: gradebook_view_result.php?addresultnostudents=&selecteval=' . $selectEval.'&'.api_get_cidreq());
+        header('Location: gradebook_view_result.php?addresultnostudents=&selecteval='.$selectEval.'&'.api_get_cidreq());
         exit;
     }
     $scores = ($values['score']);
@@ -45,7 +45,7 @@ 
         $res->add();
         next($scores);
     }
-    header('Location: gradebook_view_result.php?addresult=&selecteval=' . $selectEval.'&'.api_get_cidreq());
+    header('Location: gradebook_view_result.php?addresult=&selecteval='.$selectEval.'&'.api_get_cidreq());
     exit;
 }
 $interbreadcrumb[] = array(

main/gradebook/gradebook_add_eval.php

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
     null,
     'add_eval_form',
     null,
-    api_get_self() . '?selectcat=' . $select_cat.'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
 );
 
 if ($form->validate()) {
@@ -69,23 +69,23 @@ 
             //header('Location: gradebook_add_user.php?selecteval=' . $eval->get_id());
             exit;
         } else {
-            header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq());
+            header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq());
             exit;
         }
     } else {
         $val_addresult = isset($values['addresult']) ? $values['addresult'] : null;
         if ($val_addresult == 1) {
-            header('Location: gradebook_add_result.php?selecteval=' . $eval->get_id().'&'.api_get_cidreq());
+            header('Location: gradebook_add_result.php?selecteval='.$eval->get_id().'&'.api_get_cidreq());
             exit;
         } else {
-            header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq());
+            header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq());
             exit;
         }
     }
 }
 
 $interbreadcrumb[] = array(
-    'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $select_cat.'&'.api_get_cidreq(),
+    'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$select_cat.'&'.api_get_cidreq(),
     'name' => get_lang('Gradebook'))
 ;
 $this_section = SECTION_COURSES;
@@ -96,7 +96,7 @@ 
        $("#hid_category_id option:selected").each(function () {
            var cat_id = $(this).val();
             $.ajax({
-                url: "' . api_get_path(WEB_AJAX_PATH) . 'gradebook.ajax.php?a=get_gradebook_weight",
+                url: "' . api_get_path(WEB_AJAX_PATH).'gradebook.ajax.php?a=get_gradebook_weight",
                 data: "cat_id="+cat_id,
                 success: function(return_value) {
                     if (return_value != 0 ) {

main/gradebook/lib/fe/displaygradebook.php

Indentation +1 added lines, -1 removed lines

@@ -558,7 +558,7 @@
                     $my_api_cidreq = 'cidReq=' . $my_category['course_code'];
                 }
                 if ($show_add_link && !$message_resource) {
-                   $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
+                    $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
                         Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'), '', ICON_SIZE_MEDIUM) . '</a>';
                     $cats = Category :: load($selectcat);
 

Braces +3 added lines, -2 removed lines

@@ -674,8 +674,9 @@
             $scoretotal = $cattotal[0]->calc_score(api_get_user_id());
             $scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal, SCORE_PERCENT) : get_lang('NoResultsAvailable'));
             $scoreinfo = get_lang('StatsStudent') . ' :<b> ' . $user['complete_name']. '</b><br />';
-            if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search'])))
-                $scoreinfo.= '<br />' . get_lang('TotalForThisCategory') . ' : <b>' . $scorecourse_display . '</b>';
+            if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search']))) {
+                            $scoreinfo.= '<br />' . get_lang('TotalForThisCategory') . ' : <b>' . $scorecourse_display . '</b>';
+            }
             $scoreinfo.= '<br />' . get_lang('Total') . ' : <b>' . $scoretotal_display . '</b>';
             Display :: display_normal_message($scoreinfo, false);
         }

Spacing +87 added lines, -87 removed lines

@@ -20,37 +20,37 @@ 
         if (api_is_allowed_to_edit(null, true)) {
             $header = '<div class="actions">';
             if ($page != 'statistics') {
-                $header .= '<a href="' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $selectcat . '&'.api_get_cidreq().'">' .
-                    Display::return_icon(('back.png'), get_lang('FolderView'), '', ICON_SIZE_MEDIUM) . '</a>';
+                $header .= '<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$selectcat.'&'.api_get_cidreq().'">'.
+                    Display::return_icon(('back.png'), get_lang('FolderView'), '', ICON_SIZE_MEDIUM).'</a>';
                 if ($evalobj->get_course_code() == null) {
 
                 } elseif (!$evalobj->has_results()) {
-                    $header .= '<a href="gradebook_add_result.php?'.api_get_cidreq().'&selectcat=' . $selectcat . '&selecteval=' . $evalobj->get_id() . '">
-    				' . Display::return_icon('evaluation_rate.png', get_lang('AddResult'), '', ICON_SIZE_MEDIUM) . '</a>';
+                    $header .= '<a href="gradebook_add_result.php?'.api_get_cidreq().'&selectcat='.$selectcat.'&selecteval='.$evalobj->get_id().'">
+    				' . Display::return_icon('evaluation_rate.png', get_lang('AddResult'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 if (api_is_platform_admin() || $evalobj->is_locked() == false) {
-                    $header .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&selecteval=' . $evalobj->get_id() . '&import=">' .
-                        Display::return_icon('import_evaluation.png', get_lang('ImportResult'), '', ICON_SIZE_MEDIUM) . '</a>';
+                    $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&selecteval='.$evalobj->get_id().'&import=">'.
+                        Display::return_icon('import_evaluation.png', get_lang('ImportResult'), '', ICON_SIZE_MEDIUM).'</a>';
                 }
 
                 if ($evalobj->has_results()) {
-                    $header .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&selecteval=' . $evalobj->get_id() . '&export=">' .
-                        Display::return_icon('export_evaluation.png', get_lang('ExportResult'), '', ICON_SIZE_MEDIUM) . '</a>';
+                    $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&selecteval='.$evalobj->get_id().'&export=">'.
+                        Display::return_icon('export_evaluation.png', get_lang('ExportResult'), '', ICON_SIZE_MEDIUM).'</a>';
 
                     if (api_is_platform_admin() || $evalobj->is_locked() == false) {
-                        $header .= '<a href="gradebook_edit_result.php?'.api_get_cidreq().'&selecteval=' . $evalobj->get_id() . '">' .
-                            Display::return_icon('edit.png', get_lang('EditResult'), '', ICON_SIZE_MEDIUM) . '</a>';
-                        $header .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&selecteval=' . $evalobj->get_id() . '&deleteall=" onclick="return confirmationall();">' .
-                            Display::return_icon('delete.png', get_lang('DeleteResult'), '', ICON_SIZE_MEDIUM) . '</a>';
+                        $header .= '<a href="gradebook_edit_result.php?'.api_get_cidreq().'&selecteval='.$evalobj->get_id().'">'.
+                            Display::return_icon('edit.png', get_lang('EditResult'), '', ICON_SIZE_MEDIUM).'</a>';
+                        $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&selecteval='.$evalobj->get_id().'&deleteall=" onclick="return confirmationall();">'.
+                            Display::return_icon('delete.png', get_lang('DeleteResult'), '', ICON_SIZE_MEDIUM).'</a>';
                     }
                 }
 
-                $header .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&print=&selecteval=' . $evalobj->get_id() . '" target="_blank">' .
-                    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM) . '</a>';
+                $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&print=&selecteval='.$evalobj->get_id().'" target="_blank">'.
+                    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
             } else {
-                $header .= '<a href="gradebook_view_result.php?'.api_get_cidreq().'&selecteval=' . Security::remove_XSS($_GET['selecteval']) . '"> ' .
-                    Display::return_icon(('back.png'), get_lang('FolderView'), '', ICON_SIZE_MEDIUM) . '</a>';
+                $header .= '<a href="gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.Security::remove_XSS($_GET['selecteval']).'"> '.
+                    Display::return_icon(('back.png'), get_lang('FolderView'), '', ICON_SIZE_MEDIUM).'</a>';
             }
             $header .= '</div>';
         }
@@ -69,17 +69,17 @@ 
             $score = $evalobj->calc_score();
 
             if ($score != null) {
-                $average = get_lang('Average') . ' :<b> ' . $scoredisplay->display_score($score, SCORE_AVERAGE) . '</b>';
+                $average = get_lang('Average').' :<b> '.$scoredisplay->display_score($score, SCORE_AVERAGE).'</b>';
                 $student_score = $evalobj->calc_score(api_get_user_id());
                 $student_score = Display::tag(
                     'h3',
-                    get_lang('Score') . ': ' . $scoredisplay->display_score($student_score, SCORE_DIV_PERCENT)
+                    get_lang('Score').': '.$scoredisplay->display_score($student_score, SCORE_DIV_PERCENT)
                 );
             }
         }
         $description = "";
         if (!$evalobj->get_description() == '') {
-            $description = get_lang('Description') . ' :<b> ' . $evalobj->get_description() . '</b><br>';
+            $description = get_lang('Description').' :<b> '.$evalobj->get_description().'</b><br>';
         }
 
         if ($evalobj->get_course_code() == null) {
@@ -89,17 +89,17 @@ 
         }
 
         $evalinfo = '<table width="100%" border="0"><tr><td>';
-        $evalinfo .= '<h2>' . $evalobj->get_name() . '</h2><hr>';
+        $evalinfo .= '<h2>'.$evalobj->get_name().'</h2><hr>';
         $evalinfo .= $description;
-        $evalinfo .= get_lang('Course') . ' :<b> ' . $course . '</b><br />';
-        $evalinfo .= get_lang('QualificationNumeric') . ' :<b> ' . $evalobj->get_max() . '</b><br>' . $average;
+        $evalinfo .= get_lang('Course').' :<b> '.$course.'</b><br />';
+        $evalinfo .= get_lang('QualificationNumeric').' :<b> '.$evalobj->get_max().'</b><br>'.$average;
 
         if (!api_is_allowed_to_edit()) {
             $evalinfo .= $student_score;
         }
 
         if (!$evalobj->has_results()) {
-            $evalinfo .= '<br /><i>' . get_lang('NoResultsInEvaluation') . '</i>';
+            $evalinfo .= '<br /><i>'.get_lang('NoResultsInEvaluation').'</i>';
         } elseif ($scoredisplay->is_custom() && api_get_self() != '/main/gradebook/gradebook_statistics.php') {
             if (api_is_allowed_to_edit(null, true)) {
                 if ($page != 'statistics') {
@@ -109,8 +109,8 @@ 
         }
         if ($page != 'statistics') {
             if (api_is_allowed_to_edit(null, true)) {
-                $evalinfo .= '<br /><a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . Security::remove_XSS($_GET['selecteval']) . '"> ' .
-                    Display::return_icon('statistics.png', get_lang('ViewStatistics'), '', ICON_SIZE_MEDIUM) . '</a>';
+                $evalinfo .= '<br /><a href="gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.Security::remove_XSS($_GET['selecteval']).'"> '.
+                    Display::return_icon('statistics.png', get_lang('ViewStatistics'), '', ICON_SIZE_MEDIUM).'</a>';
             }
         }
         $evalinfo .= '</td><td>'.Display::return_icon('tutorial.gif', '', ['style' => 'float:right; position:relative;']).'</td></table>';
@@ -135,14 +135,14 @@ 
             $select_cat = $catobj->get_parent_id();
             $url = 'gradebook_flatview.php';
         }
-        $header .= '<a href="' . $url . '?' . api_get_cidreq() . '&selectcat=' . $select_cat . '">' .
-            Display::return_icon('back.png', get_lang('FolderView'), '', ICON_SIZE_MEDIUM) . '</a>';
+        $header .= '<a href="'.$url.'?'.api_get_cidreq().'&selectcat='.$select_cat.'">'.
+            Display::return_icon('back.png', get_lang('FolderView'), '', ICON_SIZE_MEDIUM).'</a>';
 
         $pageNum = isset($_GET['flatviewlist_page_nr']) ? intval($_GET['flatviewlist_page_nr']) : null;
         $perPage = isset($_GET['flatviewlist_per_page']) ? intval($_GET['flatviewlist_per_page']) : null;
         $offset = isset($_GET['offset']) ? $_GET['offset'] : '0';
 
-        $exportCsvUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+        $exportCsvUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
             'export_format' => 'csv',
             'export_report' => 'export_report',
             'selectcat' => $catobj->get_id()
@@ -153,7 +153,7 @@ 
             $exportCsvUrl
         );
 
-        $exportXlsUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+        $exportXlsUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
             'export_format' => 'xls',
             'export_report' => 'export_report',
             'selectcat' => $catobj->get_id()
@@ -164,7 +164,7 @@ 
             $exportXlsUrl
         );
 
-        $exportDocUrl = api_get_self() . '?' .  api_get_cidreq() . '&' . http_build_query([
+        $exportDocUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
             'export_format' => 'doc',
             'export_report' => 'export_report',
             'selectcat' => $catobj->get_id()
@@ -175,7 +175,7 @@ 
             $exportDocUrl
         );
 
-        $exportPrintUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+        $exportPrintUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
                 'print' => '',
                 'selectcat' => $catobj->get_id(),
             ]);
@@ -186,7 +186,7 @@ 
             ['target' => '_blank']
         );
 
-        $exportPdfUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+        $exportPdfUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
             'exportpdf' => '',
             'selectcat' => $catobj->get_id(),
             'offset' => $offset,
@@ -297,7 +297,7 @@ 
                     $aditionalButtons .= isset($certificateLinkInfo['badge_link']) ? $certificateLinkInfo['badge_link'] : '';
                     $aditionalButtons .= '</div>';
                 }
-                $scoreinfo .= '<strong>' . sprintf(get_lang('TotalX'), $scorecourse_display . $aditionalButtons). '</strong>';
+                $scoreinfo .= '<strong>'.sprintf(get_lang('TotalX'), $scorecourse_display.$aditionalButtons).'</strong>';
 
             }
             Display :: display_normal_message($scoreinfo, false);
@@ -308,10 +308,10 @@ 
             $header = '<div class="actions"><table>';
             $header .= '<tr>';
             if (!$selectcat == '0') {
-                $header .= '<td><a href="' . api_get_self() . '?selectcat=' . $catobj->get_parent_id() . '">' .
-                    Display::return_icon('back.png', get_lang('BackTo') . ' ' . get_lang('RootCat'), '', ICON_SIZE_MEDIUM) . '</a></td>';
+                $header .= '<td><a href="'.api_get_self().'?selectcat='.$catobj->get_parent_id().'">'.
+                    Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('RootCat'), '', ICON_SIZE_MEDIUM).'</a></td>';
             }
-            $header .= '<td>' . get_lang('CurrentCategory') . '</td>' .
+            $header .= '<td>'.get_lang('CurrentCategory').'</td>'.
                     '<td><form name="selector"><select name="selectcat" onchange="document.selector.submit()">';
             $cats = Category :: load();
 
@@ -324,15 +324,15 @@ 
                 }
                 $line = isset($line) ? $line : '';
                 if (isset($_GET['selectcat']) && $_GET['selectcat'] == $cat[0]) {
-                    $header .= '<option selected value=' . $cat[0] . '>' . $line . ' ' . $cat[1] . '</option>';
+                    $header .= '<option selected value='.$cat[0].'>'.$line.' '.$cat[1].'</option>';
                 } else {
-                    $header .= '<option value=' . $cat[0] . '>' . $line . ' ' . $cat[1] . '</option>';
+                    $header .= '<option value='.$cat[0].'>'.$line.' '.$cat[1].'</option>';
                 }
                 $line = '';
             }
             $header .= '</select></form></td>';
             if (!empty($simple_search_form) && $message_resource === false) {
-                $header .= '<td style="vertical-align: top;">' . $simple_search_form->toHtml() . '</td>';
+                $header .= '<td style="vertical-align: top;">'.$simple_search_form->toHtml().'</td>';
             } else {
                 $header .= '<td></td>';
             }
@@ -343,9 +343,9 @@ 
             } elseif (!(isset($_GET['studentoverview']))) {
 
             } else {
-                $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank">
+                $header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&exportpdf=&selectcat='.$catobj->get_id().'" target="_blank">
 							 '.Display::return_icon('pdf.png', get_lang('ExportPDF'), [], ICON_SIZE_MEDIUM).'
-							' . get_lang('ExportPDF') . '</a>';
+							' . get_lang('ExportPDF').'</a>';
             }
             $header .= '</td></tr>';
             $header .= '</table></div>';
@@ -358,33 +358,33 @@ 
 
         if (api_is_allowed_to_edit(null, true)) {
             if (empty($grade_model_id) || $grade_model_id == -1) {
-                $actionsLeft .= '<a href="gradebook_add_cat.php?' . api_get_cidreq() . '&selectcat=' . $catobj->get_id() . '">' .
-                    Display::return_icon('new_folder.png', get_lang('AddGradebook'), array(), ICON_SIZE_MEDIUM) . '</a></td>';
+                $actionsLeft .= '<a href="gradebook_add_cat.php?'.api_get_cidreq().'&selectcat='.$catobj->get_id().'">'.
+                    Display::return_icon('new_folder.png', get_lang('AddGradebook'), array(), ICON_SIZE_MEDIUM).'</a></td>';
             }
             if ($selectcat == '0') {
 
             } else {
                 $my_category = $catobj->shows_all_information_an_category($catobj->get_id());
                 if ($my_api_cidreq == '') {
-                    $my_api_cidreq = 'cidReq=' . $my_category['course_code'];
+                    $my_api_cidreq = 'cidReq='.$my_category['course_code'];
                 }
                 if ($show_add_link && !$message_resource) {
-                   $actionsLeft .= '<a href="gradebook_add_eval.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '" >' .
-                        Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'), '', ICON_SIZE_MEDIUM) . '</a>';
+                   $actionsLeft .= '<a href="gradebook_add_eval.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'" >'.
+                        Display::return_icon('new_evaluation.png', get_lang('NewEvaluation'), '', ICON_SIZE_MEDIUM).'</a>';
                     $cats = Category :: load($selectcat);
 
                     if ($cats[0]->get_course_code() != null && !$message_resource) {
-                        $actionsLeft .= '<a href="gradebook_add_link.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
-                            Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'), '', ICON_SIZE_MEDIUM) . '</a>';
+                        $actionsLeft .= '<a href="gradebook_add_link.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
+                            Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'), '', ICON_SIZE_MEDIUM).'</a>';
                     } else {
-                        $actionsLeft .= '<a href="gradebook_add_link_select_course.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
-                            Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'), '', ICON_SIZE_MEDIUM) . '</a>';
+                        $actionsLeft .= '<a href="gradebook_add_link_select_course.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
+                            Display::return_icon('new_online_evaluation.png', get_lang('MakeLink'), '', ICON_SIZE_MEDIUM).'</a>';
                     }
                 }
 
                 if (!$message_resource) {
-                    $actionsLeft .= '<a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
-                        Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . '</a>';
+                    $actionsLeft .= '<a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
+                        Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
 
                     if ($my_category['generate_certificates'] == 1) {
                         $actionsLeft .= Display::url(
@@ -394,7 +394,7 @@ 
                                     '',
                                     ICON_SIZE_MEDIUM
                                 ),
-                                "gradebook_display_certificate.php?$my_api_cidreq&cat_id=" . $selectcat
+                                "gradebook_display_certificate.php?$my_api_cidreq&cat_id=".$selectcat
                             );
                     }
 
@@ -405,29 +405,29 @@ 
                             '',
                             ICON_SIZE_MEDIUM
                         ),
-                        "gradebook_display_summary.php?$my_api_cidreq&selectcat=" . $selectcat
+                        "gradebook_display_summary.php?$my_api_cidreq&selectcat=".$selectcat
                     );
 
                     // Right icons
-                    $actionsRight = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
-                        Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM) . '</a>';
-                    $actionsRight .= '<a href="../document/document.php?curdirpath=/certificates&' . $my_api_cidreq . '&origin=gradebook&selectcat=' . $catobj->get_id() . '">' .
-                            Display::return_icon('certificate.png', get_lang('AttachCertificate'), '', ICON_SIZE_MEDIUM) . '</a>';
+                    $actionsRight = '<a href="gradebook_edit_cat.php?editcat='.$catobj->get_id().'&amp;cidReq='.$catobj->get_course_code().'&id_session='.$catobj->get_session_id().'">'.
+                        Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM).'</a>';
+                    $actionsRight .= '<a href="../document/document.php?curdirpath=/certificates&'.$my_api_cidreq.'&origin=gradebook&selectcat='.$catobj->get_id().'">'.
+                            Display::return_icon('certificate.png', get_lang('AttachCertificate'), '', ICON_SIZE_MEDIUM).'</a>';
 
                     if (empty($categories)) {
-                        $actionsRight .= '<a href="gradebook_edit_all.php?id_session=' . api_get_session_id() . '&amp;' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
-                            Display::return_icon('percentage.png', get_lang('EditAllWeights'), '', ICON_SIZE_MEDIUM) . '</a>';
+                        $actionsRight .= '<a href="gradebook_edit_all.php?id_session='.api_get_session_id().'&amp;'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
+                            Display::return_icon('percentage.png', get_lang('EditAllWeights'), '', ICON_SIZE_MEDIUM).'</a>';
                     }
                     $score_display_custom = api_get_setting('gradebook_score_display_custom');
                     if (api_get_setting('teachers_can_change_score_settings') == 'true' && $score_display_custom['my_display_custom'] == 'true') {
-                        $actionsRight .= '<a href="gradebook_scoring_system.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
-                            Display::return_icon('ranking.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM) . '</a>';
+                        $actionsRight .= '<a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
+                            Display::return_icon('ranking.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM).'</a>';
                     }
 
                 }
             }
         } elseif (isset($_GET['search'])) {
-            echo $header = '<b>' . get_lang('SearchResults') . ' :</b>';
+            echo $header = '<b>'.get_lang('SearchResults').' :</b>';
         }
 
         $isDrhOfCourse = CourseManager::isUserSubscribedInCourseAsDrh(
@@ -436,26 +436,26 @@ 
         );
 
         if ($isDrhOfCourse) {
-            $$actionsLeft .= '<a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
-                Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . '</a>';
+            $$actionsLeft .= '<a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
+                Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
         }
 
-        if (api_is_allowed_to_edit(null, true)){
+        if (api_is_allowed_to_edit(null, true)) {
             echo $toolbar = Display::toolbarAction('gradebook-actions', array($actionsLeft, $actionsRight));
         }
 
         if (api_is_allowed_to_edit(null, true)) {
             $weight = intval($catobj->get_weight()) > 0 ? $catobj->get_weight() : 0;
-            $weight = '<strong>' . get_lang('TotalWeight') . ' : </strong>' . $weight;
+            $weight = '<strong>'.get_lang('TotalWeight').' : </strong>'.$weight;
 
             $min_certification = (intval($catobj->get_certificate_min_score() > 0) ? $catobj->get_certificate_min_score() : 0);
-            $min_certification = get_lang('CertificateMinScore') . ' : ' . $min_certification;
-            $edit_icon = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&amp;cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' .
-                Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL) . '</a>';
+            $min_certification = get_lang('CertificateMinScore').' : '.$min_certification;
+            $edit_icon = '<a href="gradebook_edit_cat.php?editcat='.$catobj->get_id().'&amp;cidReq='.$catobj->get_course_code().'&id_session='.$catobj->get_session_id().'">'.
+                Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
             //$msg = Display::tag('h3', $weight.' - '.$min_certification);
-            $msg = $weight . ' - ' . $min_certification . $edit_icon;
+            $msg = $weight.' - '.$min_certification.$edit_icon;
             //@todo show description
-            $description = (($catobj->get_description() == "" || is_null($catobj->get_description())) ? '' : '<strong>' . get_lang('GradebookDescriptionLog') . '</strong>' . ': ' . $catobj->get_description());
+            $description = (($catobj->get_description() == "" || is_null($catobj->get_description())) ? '' : '<strong>'.get_lang('GradebookDescriptionLog').'</strong>'.': '.$catobj->get_description());
             Display::display_normal_message($msg, false);
             if (!empty($description)) {
                 echo Display::div($description, array());
@@ -483,24 +483,24 @@ 
             $cattotal = Category :: load(0);
             $scoretotal = $cattotal[0]->calc_score(api_get_user_id());
             $scoretotal_display = (isset($scoretotal) ? $scoredisplay->display_score($scoretotal, SCORE_PERCENT) : get_lang('NoResultsAvailable'));
-            $scoreinfo = get_lang('StatsStudent') . ' :<b> ' . $user['complete_name']. '</b><br />';
+            $scoreinfo = get_lang('StatsStudent').' :<b> '.$user['complete_name'].'</b><br />';
             if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search'])))
-                $scoreinfo.= '<br />' . get_lang('TotalForThisCategory') . ' : <b>' . $scorecourse_display . '</b>';
-            $scoreinfo.= '<br />' . get_lang('Total') . ' : <b>' . $scoretotal_display . '</b>';
+                $scoreinfo .= '<br />'.get_lang('TotalForThisCategory').' : <b>'.$scorecourse_display.'</b>';
+            $scoreinfo .= '<br />'.get_lang('Total').' : <b>'.$scoretotal_display.'</b>';
             Display :: display_normal_message($scoreinfo, false);
         }
         // show navigation tree and buttons?
         $header = '<div class="actions">';
 
         if ($is_course_admin) {
-            $header .= '<a href="gradebook_flatview.php?' . api_get_cidreq() . '&selectcat=' . $catobj->get_id() . '">' . Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . '</a>';
-            $header .= '<a href="gradebook_scoring_system.php?' . api_get_cidreq() . '&selectcat=' . $catobj->get_id() . '">' . Display::return_icon('settings.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM) . '</a>';
+            $header .= '<a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat='.$catobj->get_id().'">'.Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
+            $header .= '<a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat='.$catobj->get_id().'">'.Display::return_icon('settings.png', get_lang('ScoreEdit'), '', ICON_SIZE_MEDIUM).'</a>';
         } elseif (!(isset($_GET['studentoverview']))) {
-            $header .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&selectcat=' . $catobj->get_id() . '">' . Display::return_icon('view_list.gif', get_lang('FlatView')) . ' ' . get_lang('FlatView') . '</a>';
+            $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat='.$catobj->get_id().'">'.Display::return_icon('view_list.gif', get_lang('FlatView')).' '.get_lang('FlatView').'</a>';
         } else {
-            $header .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank">' . Display::return_icon('pdf.png', get_lang('ExportPDF'), '', ICON_SIZE_MEDIUM) . '</a>';
+            $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&exportpdf=&selectcat='.$catobj->get_id().'" target="_blank">'.Display::return_icon('pdf.png', get_lang('ExportPDF'), '', ICON_SIZE_MEDIUM).'</a>';
         }
-        $header.='</div>';
+        $header .= '</div>';
         echo $header;
     }
 
@@ -526,8 +526,8 @@ 
             $item = $evals_links[$count];
             $score = $item->calc_score($user_id);
             $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 += $score[0] / $my_score_denom * $item->get_weight();
+            $item_total += $item->get_weight();
         }
         $item_value = number_format($item_value, 2, '.', ' ');
         $total_score = array($item_value, $item_total);
@@ -541,17 +541,17 @@ 
         $imageUrl = UserManager::getUserPicture($userid);
 
         $info = '<div class="row"><div class="col-md-3">';
-        $info .= '<div class="thumbnail"><img src="' . $imageUrl . '" /></div>';
+        $info .= '<div class="thumbnail"><img src="'.$imageUrl.'" /></div>';
         $info .= '</div>';
         $info .= '<div class="col-md-6">';
-        $info .= get_lang('Name') . ' :  <a target="_blank" href="' . api_get_path(WEB_CODE_PATH) . 'social/profile.php?u=' . $userid . '"> ' .
-            $user['complete_name'] . '</a><br />';
+        $info .= get_lang('Name').' :  <a target="_blank" href="'.api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$userid.'"> '.
+            $user['complete_name'].'</a><br />';
 
         if (api_get_setting('show_email_addresses') == 'true') {
-            $info .= get_lang('Email') . ' : <a href="mailto:' . $user['email'] . '">' . $user['email'] . '</a><br />';
+            $info .= get_lang('Email').' : <a href="mailto:'.$user['email'].'">'.$user['email'].'</a><br />';
         }
 
-        $info .= get_lang('TotalUser') . ' : <b>' . $scorecourse_display . '</b>';
+        $info .= get_lang('TotalUser').' : <b>'.$scorecourse_display.'</b>';
         $info .= '</div>';
         $info .= '</div>';