chamilo / chamilo-lms

main/gradebook/gradebook_statistics.php

Spacing +17 added lines, -17 removed lines

@@ -9,21 +9,21 @@ 
 
 api_block_anonymous_users();
 
-$eval= Evaluation :: load($_GET['selecteval']);
+$eval = Evaluation :: load($_GET['selecteval']);
 if ($eval[0]->get_category_id() < 0) {
     // if category id is negative, then the evaluation's origin is a link
-    $link= LinkFactory :: get_evaluation_link($eval[0]->get_id());
+    $link = LinkFactory :: get_evaluation_link($eval[0]->get_id());
     $currentcat = Category :: load($link->get_category_id());
 } else {
     $currentcat = Category :: load($eval[0]->get_category_id());
 }
 
-$interbreadcrumb[]= array (
-    'url' => $_SESSION['gradebook_dest'].'?selectcat=' . $currentcat[0]->get_id(), 'name' => get_lang('ToolGradebook'));
+$interbreadcrumb[] = array(
+    'url' => $_SESSION['gradebook_dest'].'?selectcat='.$currentcat[0]->get_id(), 'name' => get_lang('ToolGradebook'));
 
 if (api_is_allowed_to_edit()) {
-    $interbreadcrumb[]= array (
-        'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(),
+    $interbreadcrumb[] = array(
+        'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'&'.api_get_cidreq(),
         'name' => get_lang('ViewResult')
     );
 }
@@ -37,10 +37,10 @@ 
 
 if (!$displayscore->is_custom() || empty($displays)) {
     if (api_is_platform_admin() || api_is_course_admin()) {
-        Display :: display_error_message(get_lang('PleaseEnableScoringSystem'),false);
+        Display :: display_error_message(get_lang('PleaseEnableScoringSystem'), false);
     }
 } else {
-    $allresults = Result::load(null,null,$eval[0]->get_id());
+    $allresults = Result::load(null, null, $eval[0]->get_id());
     $nr_items = array();
     foreach ($displays as $itemsdisplay) {
         $nr_items[$itemsdisplay['display']] = 0;
@@ -68,19 +68,19 @@ 
     }
 
     // Generate table
-    $stattable= '<table class="data_table" cellspacing="0" cellpadding="3">';
-    $stattable .= '<tr><th>' . get_lang('ScoringSystem') . '</th>';
-    $stattable .= '<th>' . get_lang('Percentage') . '</th>';
-    $stattable .= '<th>' . get_lang('CountUsers') . '</th>';
+    $stattable = '<table class="data_table" cellspacing="0" cellpadding="3">';
+    $stattable .= '<tr><th>'.get_lang('ScoringSystem').'</th>';
+    $stattable .= '<th>'.get_lang('Percentage').'</th>';
+    $stattable .= '<th>'.get_lang('CountUsers').'</th>';
     //$stattable .= '<th>' . get_lang('Statistics') . '</th></tr>';
-    $counter=0;
+    $counter = 0;
     foreach ($keys as $key) {
-        $bar = ($highest_ratio > 0?($nr_items[$key] / $highest_ratio) * 100:0);
-        $stattable .= '<tr class="row_' . ($counter % 2 == 0 ? 'odd' : 'even') . '">';
-        $stattable .= '<td width="150">' . $key . '</td>';
+        $bar = ($highest_ratio > 0 ? ($nr_items[$key] / $highest_ratio) * 100 : 0);
+        $stattable .= '<tr class="row_'.($counter % 2 == 0 ? 'odd' : 'even').'">';
+        $stattable .= '<td width="150">'.$key.'</td>';
 
         $stattable .= '<td width="550">'.Display::bar_progress($bar).'</td>';
-        $stattable .= '<td align="right">' . $nr_items[$key] . '</td>';
+        $stattable .= '<td align="right">'.$nr_items[$key].'</td>';
         $counter++;
     }
     $stattable .= '</tr></table>';

main/gradebook/gradebook_edit_result.php

Spacing +8 added lines, -8 removed lines

@@ -7,12 +7,12 @@ 
 require_once '../inc/global.inc.php';
 api_block_anonymous_users();
 GradebookUtils::block_students();
-$select_eval=Security::remove_XSS($_GET['selecteval']);
+$select_eval = Security::remove_XSS($_GET['selecteval']);
 if (empty($select_eval)) {
     api_not_allowed();
 }
-$resultedit = Result :: load (null,null,$select_eval);
-$evaluation = Evaluation :: load ($select_eval);
+$resultedit = Result :: load(null, null, $select_eval);
+$evaluation = Evaluation :: load($select_eval);
 
 $evaluation[0]->check_lock_permissions();
 
@@ -29,9 +29,9 @@ 
     $values = $edit_result_form->exportValues();
     $scores = ($values['score']);
     foreach ($scores as $row) {
-        $resultedit = Result :: load (key($scores));
+        $resultedit = Result :: load(key($scores));
         $row_value = $row;
-        if ($row_value != '' ) {
+        if ($row_value != '') {
             $resultedit[0]->set_score(floatval(number_format($row_value, api_get_setting('gradebook_number_decimals'))));
             $resultedit[0]->save();
         }
@@ -41,15 +41,15 @@ 
     exit;
 }
 
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => $_SESSION['gradebook_dest'],
     'name' => get_lang('Gradebook')
 );
-$interbreadcrumb[]= array (
+$interbreadcrumb[] = array(
     'url' => 'gradebook_view_result.php?selecteval='.$select_eval.'&'.api_get_cidreq(),
     'name' => get_lang('ViewResult')
 );
 Display :: display_header(get_lang('EditResult'));
-DisplayGradebook::display_header_result($evaluation[0],null,0,0);
+DisplayGradebook::display_header_result($evaluation[0], null, 0, 0);
 echo $table;
 Display :: display_footer();

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/gradebook_showlog_link.php

Spacing +11 added lines, -11 removed lines

@@ -11,9 +11,9 @@ 
 api_block_anonymous_users();
 GradebookUtils::block_students();
 
-$interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?','name' => get_lang('Gradebook'));
-$interbreadcrumb[] = array ('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));
-$interbreadcrumb[] = array ('url' => 'gradebook_showlog_link.php?visiblelink='.Security::remove_XSS($_GET['visiblelink']).'&selectcat='.Security::remove_XSS($_GET['selectcat']),	'name' => get_lang('GradebookQualifyLog'));
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?', 'name' => get_lang('Gradebook'));
+$interbreadcrumb[] = array('url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('Details'));
+$interbreadcrumb[] = array('url' => 'gradebook_showlog_link.php?visiblelink='.Security::remove_XSS($_GET['visiblelink']).'&selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('GradebookQualifyLog'));
 $this_section = SECTION_COURSES;
 Display :: display_header('');
 echo '<div class="actions">';
@@ -22,21 +22,21 @@ 
 
 $t_user     = Database :: get_main_table(TABLE_MAIN_USER);
 $t_link_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
-$visible_link=Security::remove_XSS($_GET['visiblelink']);
+$visible_link = Security::remove_XSS($_GET['visiblelink']);
 $evaledit   = EvalLink :: load($visible_link);
 $sql = "SELECT lk.name,lk.description,lk.weight,lk.visible,lk.type,lk.created_at,us.username
         FROM ".$t_link_log." lk inner join ".$t_user." us
         ON lk.user_id_log=us.user_id
         WHERE lk.id_linkeval_log=".$evaledit[0]->get_id()." AND lk.type='link';";
-$result=Database::query($sql);
-$list_info=array();
-while ($row=Database::fetch_row($result)) {
+$result = Database::query($sql);
+$list_info = array();
+while ($row = Database::fetch_row($result)) {
     $list_info[] = $row;
 }
 
-foreach($list_info as $key => $info_log) {
-    $list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
-    $list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
+foreach ($list_info as $key => $info_log) {
+    $list_info[$key][5] = ($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
+    $list_info[$key][3] = ($info_log[3] == 1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
 }
 
 $parameters = array(
@@ -44,7 +44,7 @@ 
     'selectcat' => Security::remove_XSS($_GET['selectcat']),
 );
 
-$table = new SortableTableFromArrayConfig($list_info, 1,20,'gradebooklink');
+$table = new SortableTableFromArrayConfig($list_info, 1, 20, 'gradebooklink');
 $table->set_additional_parameters($parameters);
 $table->set_header(0, get_lang('GradebookNameLog'));
 $table->set_header(1, get_lang('GradebookDescriptionLog'));

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 +119 added lines, -119 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 '../inc/global.inc.php';
@@ -32,7 +32,7 @@ 
  </script>';
 api_block_anonymous_users();
 
-$htmlHeadXtra[]= '<script>
+$htmlHeadXtra[] = '<script>
 function confirmation () {
 	if (confirm("'.get_lang('DeleteAll').'?")) {
 	    return true;
@@ -48,10 +48,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);
@@ -67,33 +67,33 @@ 
     exit;
 }
 //move a category
-$selectcat = isset($_GET['selectcat']) ?  (int) $_GET['selectcat'] : '';
+$selectcat = isset($_GET['selectcat']) ? (int) $_GET['selectcat'] : '';
 
 if (isset($_GET['movecat'])) {
     $move_cat = Security::remove_XSS($_GET['movecat']);
     GradebookUtils::block_students();
-    $cats= Category :: load($move_cat);
+    $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);
@@ -104,8 +104,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,
@@ -113,23 +113,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);
@@ -140,8 +140,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,
@@ -151,10 +151,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;
     }
 }
@@ -163,11 +163,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();
@@ -182,7 +182,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) {
@@ -197,12 +197,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);
@@ -216,7 +216,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();
     }
@@ -227,11 +227,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);
@@ -247,7 +247,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();
         }
@@ -264,9 +264,9 @@ 
     }
     $button = '<form name="confirm"
                  method="post"
-                 action="'.api_get_self() .'?confirm='
-        .(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
-            : '&moveeval=' . Security::remove_XSS($_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='.Security::remove_XSS($_GET['moveeval'])).'&selectcat='.$selectcat.'&targetcat='.Security::remove_XSS($_GET['targetcat']).'">
 			   <input type="submit" value="'.'  '.get_lang('Ok').'  '.'">
 			   </form>';
 
@@ -276,7 +276,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;
@@ -284,19 +284,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();
                         }
@@ -305,7 +305,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();
                             }
@@ -313,7 +313,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' :
@@ -365,7 +365,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;
 }
@@ -373,8 +373,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'));
@@ -385,13 +385,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('');
@@ -401,50 +401,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)) {
@@ -461,7 +461,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']);
@@ -471,13 +471,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());
@@ -485,13 +485,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'),
@@ -499,18 +499,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,
@@ -527,57 +527,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'])) {
@@ -586,10 +586,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],
@@ -602,10 +602,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 '../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 ) {