chamilo / chamilo-lms

main/gradebook/gradebook_add_link_select_course.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 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();
@@ -16,13 +16,13 @@ 
 $catadd = new Category();
 $catadd->set_user_id(api_get_user_id());
 $catadd->set_parent_id($_GET['selectcat']);
-$catcourse = Category :: load ($_GET['selectcat']);
+$catcourse = Category :: load($_GET['selectcat']);
 $form = new CatForm(
     CatForm :: TYPE_SELECT_COURSE,
     $catadd,
     'add_cat_form',
     null,
-    api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq()
+    api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq()
 );
 
 if ($form->validate()) {
@@ -30,11 +30,11 @@ 
     $cat = new Category();
     $cat->set_course_code($values['select_course']);
     $cat->set_name($values['name']);
-    header('location: gradebook_add_link.php?selectcat=' .Security::remove_XSS($_GET['selectcat']).'&course_code='.Security::remove_XSS($values['select_course']).'&'.api_get_cidreq());
+    header('location: gradebook_add_link.php?selectcat='.Security::remove_XSS($_GET['selectcat']).'&course_code='.Security::remove_XSS($values['select_course']).'&'.api_get_cidreq());
     exit;
 }
 
-$interbreadcrumb[] = array (
+$interbreadcrumb[] = array(
     'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq(),
     'name' => get_lang('Gradebook')
 );

main/gradebook/lib/fe/userform.class.php

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
 		}
 		if ($this->form_type == self :: TYPE_USER_INFO) {
 			$this->build_user_info_form();
-		}
-		elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
+		} elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
 			$this->build_simple_search();
 		}
 		$this->setDefaults();

Indentation +63 added lines, -63 removed lines

@@ -9,71 +9,71 @@
  */
 class UserForm extends FormValidator
 {
-	const TYPE_USER_INFO= 1;
-	const TYPE_SIMPLE_SEARCH = 3;
-	/**
-	 * Builds a form containing form items based on a given parameter
-	 * @param int form_type 1 = user_info
-	 * @param user array
-	 * @param string form name
-	 * @param method
-	 * @param action
-	 */
-	public function __construct($form_type, $user, $form_name, $method= 'post', $action= null)
-	{
-		parent :: __construct($form_name, $method, $action);
-		$this->form_type= $form_type;
-		if (isset ($user)) {
-			$this->user_info= $user;
-		}
-		if (isset ($result_object)) {
-			$this->result_object= $result_object;
-		}
-		if ($this->form_type == self :: TYPE_USER_INFO) {
-			$this->build_user_info_form();
-		}
-		elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
-			$this->build_simple_search();
-		}
-		$this->setDefaults();
-	}
+    const TYPE_USER_INFO= 1;
+    const TYPE_SIMPLE_SEARCH = 3;
+    /**
+     * Builds a form containing form items based on a given parameter
+     * @param int form_type 1 = user_info
+     * @param user array
+     * @param string form name
+     * @param method
+     * @param action
+     */
+    public function __construct($form_type, $user, $form_name, $method= 'post', $action= null)
+    {
+        parent :: __construct($form_name, $method, $action);
+        $this->form_type= $form_type;
+        if (isset ($user)) {
+            $this->user_info= $user;
+        }
+        if (isset ($result_object)) {
+            $this->result_object= $result_object;
+        }
+        if ($this->form_type == self :: TYPE_USER_INFO) {
+            $this->build_user_info_form();
+        }
+        elseif ($this->form_type == self :: TYPE_SIMPLE_SEARCH) {
+            $this->build_simple_search();
+        }
+        $this->setDefaults();
+    }
 
-	protected function build_simple_search()
-	{
-		if (isset($_GET['search']) && (!empty($_GET['search']))) {
-			$this->setDefaults(array(
-				'keyword' => Security::remove_XSS($_GET['search'])
-			));
-		}
-		$renderer =& $this->defaultRenderer();
-		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('text','keyword','');
-		$this->addButtonSearch(get_lang('Search'), 'submit');
-	}
+    protected function build_simple_search()
+    {
+        if (isset($_GET['search']) && (!empty($_GET['search']))) {
+            $this->setDefaults(array(
+                'keyword' => Security::remove_XSS($_GET['search'])
+            ));
+        }
+        $renderer =& $this->defaultRenderer();
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
+        $this->addElement('text','keyword','');
+        $this->addButtonSearch(get_lang('Search'), 'submit');
+    }
 
-	protected function build_user_info_form()
-	{
-		if (api_is_western_name_order()) {
-			$this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
-			$this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
-		} else {
-			$this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
-			$this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
-		}
-		$this->addElement('static', 'uname', get_lang('UserName'), $this->user_info['username']);
-		$this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:' . $this->user_info['email'] . '">' . $this->user_info['email'] . '</a>');
-		$this->addElement('static', 'ofcode', get_lang('OfficialCode'), $this->user_info['official_code']);
-		$this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
-		$this->addButtonSave(get_lang('Back'), 'submit');
-	}
+    protected function build_user_info_form()
+    {
+        if (api_is_western_name_order()) {
+            $this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
+            $this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
+        } else {
+            $this->addElement('static', 'lname', get_lang('LastName'), $this->user_info['lastname']);
+            $this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
+        }
+        $this->addElement('static', 'uname', get_lang('UserName'), $this->user_info['username']);
+        $this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:' . $this->user_info['email'] . '">' . $this->user_info['email'] . '</a>');
+        $this->addElement('static', 'ofcode', get_lang('OfficialCode'), $this->user_info['official_code']);
+        $this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
+        $this->addButtonSave(get_lang('Back'), 'submit');
+    }
 
-	function display()
-	{
-		parent :: display();
-	}
+    function display()
+    {
+        parent :: display();
+    }
 
-	function setDefaults($defaults= array(), $filter = null)
-	{
-		parent :: setDefaults($defaults, $filter);
-	}
+    function setDefaults($defaults= array(), $filter = null)
+    {
+        parent :: setDefaults($defaults, $filter);
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -9,7 +9,7 @@ 
  */
 class UserForm extends FormValidator
 {
-	const TYPE_USER_INFO= 1;
+	const TYPE_USER_INFO = 1;
 	const TYPE_SIMPLE_SEARCH = 3;
 	/**
 	 * Builds a form containing form items based on a given parameter
@@ -19,15 +19,15 @@ 
 	 * @param method
 	 * @param action
 	 */
-	public function __construct($form_type, $user, $form_name, $method= 'post', $action= null)
+	public function __construct($form_type, $user, $form_name, $method = 'post', $action = null)
 	{
 		parent :: __construct($form_name, $method, $action);
-		$this->form_type= $form_type;
+		$this->form_type = $form_type;
 		if (isset ($user)) {
-			$this->user_info= $user;
+			$this->user_info = $user;
 		}
 		if (isset ($result_object)) {
-			$this->result_object= $result_object;
+			$this->result_object = $result_object;
 		}
 		if ($this->form_type == self :: TYPE_USER_INFO) {
 			$this->build_user_info_form();
@@ -45,9 +45,9 @@ 
 				'keyword' => Security::remove_XSS($_GET['search'])
 			));
 		}
-		$renderer =& $this->defaultRenderer();
+		$renderer = & $this->defaultRenderer();
 		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('text','keyword','');
+		$this->addElement('text', 'keyword', '');
 		$this->addButtonSearch(get_lang('Search'), 'submit');
 	}
 
@@ -61,7 +61,7 @@ 
 			$this->addElement('static', 'fname', get_lang('FirstName'), $this->user_info['firstname']);
 		}
 		$this->addElement('static', 'uname', get_lang('UserName'), $this->user_info['username']);
-		$this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:' . $this->user_info['email'] . '">' . $this->user_info['email'] . '</a>');
+		$this->addElement('static', 'email', get_lang('Email'), '<a href="mailto:'.$this->user_info['email'].'">'.$this->user_info['email'].'</a>');
 		$this->addElement('static', 'ofcode', get_lang('OfficialCode'), $this->user_info['official_code']);
 		$this->addElement('static', 'phone', get_lang('Phone'), $this->user_info['phone']);
 		$this->addButtonSave(get_lang('Back'), 'submit');
@@ -72,7 +72,7 @@ 
 		parent :: display();
 	}
 
-	function setDefaults($defaults= array(), $filter = null)
+	function setDefaults($defaults = array(), $filter = null)
 	{
 		parent :: setDefaults($defaults, $filter);
 	}

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 +121 added lines, -121 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>';
@@ -127,8 +127,8 @@ 
     public function display_header_flatview($catobj, $showeval, $showlink, $simple_search_form)
     {
         $header = '<table border="0" cellpadding="5">';
-        $header .= '<td style="vertical-align: top;"><a href="' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . Security::remove_XSS($_GET['selectcat']) . '">' . Display::return_icon('gradebook.gif') . get_lang('Gradebook') . '</a></td>';
-        $header .= '<td style="vertical-align: top;">' . get_lang('FilterCategory') . '</td><td style="vertical-align: top;"><form name="selector"><select name="selectcat" onchange="document.selector.submit()">';
+        $header .= '<td style="vertical-align: top;"><a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.Security::remove_XSS($_GET['selectcat']).'">'.Display::return_icon('gradebook.gif').get_lang('Gradebook').'</a></td>';
+        $header .= '<td style="vertical-align: top;">'.get_lang('FilterCategory').'</td><td style="vertical-align: top;"><form name="selector"><select name="selectcat" onchange="document.selector.submit()">';
         $cats = Category :: load();
         $tree = $cats[0]->get_tree();
         unset($cats);
@@ -137,35 +137,35 @@ 
                 $line .= '&mdash;';
             }
             if ($_GET['selectcat'] == $cat[0]) {
-                $header .= '<option selected="selected" value=' . $cat[0] . '>' . $line . ' ' . $cat[1] . '</option>';
+                $header .= '<option selected="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 .= '</td></select></form>';
         if (!$catobj->get_id() == '0') {
-            $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?selectcat=' . $catobj->get_parent_id() . '">';
+            $header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?selectcat='.$catobj->get_parent_id().'">';
             $header .= Display::return_icon('gradebook.gif', get_lang('Up'));
             $header .= '</a></td>';
         }
-        $header .= '<td style="vertical-align: top;">' . $simple_search_form->toHtml() . '</td>';
+        $header .= '<td style="vertical-align: top;">'.$simple_search_form->toHtml().'</td>';
         $header .= '<td style="vertical-align: top;">
-                    <a href="' . api_get_self() . '?exportpdf=&offset=' . Security::remove_XSS($_GET['offset']) . '&search=' . Security::remove_XSS($_GET['search']) . '&selectcat=' . $catobj->get_id() . '">
+                    <a href="' . api_get_self().'?exportpdf=&offset='.Security::remove_XSS($_GET['offset']).'&search='.Security::remove_XSS($_GET['search']).'&selectcat='.$catobj->get_id().'">
                      '.Display::return_icon('pdf.png', get_lang('ExportPDF'), [], ICON_SIZE_MEDIUM).'
-                    ' . get_lang('ExportPDF') . '</a>';
+                    ' . get_lang('ExportPDF').'</a>';
         $header .= '<td style="vertical-align: top;">
-                    <a href="' . api_get_self() . '?print=&selectcat=' . $catobj->get_id() . '" target="_blank">
+                    <a href="' . api_get_self().'?print=&selectcat='.$catobj->get_id().'" target="_blank">
                      '.Display::return_icon('printer.png', get_lang('Print'), [], ICON_SIZE_MEDIUM).'
-                    ' . get_lang('Print') . '</a>';
+                    ' . get_lang('Print').'</a>';
         $header .= '</td></tr></table>';
         if (!$catobj->get_id() == '0') {
-            $header .= '<table border="0" cellpadding="5"><tr><td><form name="itemfilter" method="post" action="' . api_get_self() . '?selectcat=' . $catobj->get_id() . '">
-            <input type="checkbox" name="showeval" onclick="document.itemfilter.submit()" ' . (($showeval == '1') ? 'checked' : '') . '>Show Evaluations &nbsp;';
-            $header .= '<input type="checkbox" name="showlink" onclick="document.itemfilter.submit()" ' . (($showlink == '1') ? 'checked' : '') . '>' . get_lang('ShowLinks') . '</form></td></tr></table>';
+            $header .= '<table border="0" cellpadding="5"><tr><td><form name="itemfilter" method="post" action="'.api_get_self().'?selectcat='.$catobj->get_id().'">
+            <input type="checkbox" name="showeval" onclick="document.itemfilter.submit()" ' . (($showeval == '1') ? 'checked' : '').'>Show Evaluations &nbsp;';
+            $header .= '<input type="checkbox" name="showlink" onclick="document.itemfilter.submit()" '.(($showlink == '1') ? 'checked' : '').'>'.get_lang('ShowLinks').'</form></td></tr></table>';
         }
         if (isset($_GET['search'])) {
-            $header .= '<b>' . get_lang('SearchResults') . ' :</b>';
+            $header .= '<b>'.get_lang('SearchResults').' :</b>';
         }
         echo $header;
     }
@@ -186,14 +186,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()
@@ -204,7 +204,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()
@@ -215,7 +215,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()
@@ -226,7 +226,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(),
             ]);
@@ -237,7 +237,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,
@@ -290,8 +290,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);
@@ -300,9 +300,9 @@ 
             $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> ' . api_get_person_name($user['firstname'], $user['lastname']) . '</b><br />';
+            $scoreinfo = get_lang('StatsStudent').' :<b> '.api_get_person_name($user['firstname'], $user['lastname']).'</b><br />';
             if ((!$catobj->get_id() == '0') && (!isset($_GET['studentoverview'])) && (!isset($_GET['search']))) {
-                $scoreinfo.= '<h2>' . get_lang('Total') . ' : ' . $scorecourse_display . '</h2>';
+                $scoreinfo .= '<h2>'.get_lang('Total').' : '.$scorecourse_display.'</h2>';
             }
             Display :: display_normal_message($scoreinfo, false);
         }
@@ -312,9 +312,9 @@ 
         if (($showtree == '1') || (isset($_GET['studentoverview']))) {
             $header .= '<tr>';
             if (!$selectcat == '0') {
-                $header .= '<td style=" "><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 style=" "><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 style=" ">' . get_lang('CurrentCategory') . '</td>' .
+            $header .= '<td style=" ">'.get_lang('CurrentCategory').'</td>'.
                     '<td style=" "><form name="selector"><select name="selectcat" onchange="document.selector.submit()">';
             $cats = Category :: load();
 
@@ -327,15 +327,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>';
             }
@@ -345,13 +345,13 @@ 
             } 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>';
+        $header .= '</table></div>';
 
         // for course admin & platform admin add item buttons are added to the header
         $header .= '<div class="actions">';
@@ -371,7 +371,7 @@ 
                 $my_category = $catobj->shows_all_information_an_category($catobj->get_id());
                 $my_api_cidreq = api_get_cidreq();
                 if ($my_api_cidreq == '') {
-                    $my_api_cidreq = 'cidReq=' . $my_category['course_code'];
+                    $my_api_cidreq = 'cidReq='.$my_category['course_code'];
                 }
 
                 if (!$message_resource) {
@@ -380,24 +380,24 @@ 
                     $my_course_id = api_get_course_id();
                     $my_file = substr($_SESSION['gradebook_dest'], 0, 5);
 
-                    $header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?' . $my_api_cidreq . '&selectcat=' . $catobj->get_id() . '">' .
-                        Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM) . '</a>';
-                    $header .= '<td style="vertical-align: top;"><a href="gradebook_display_certificate.php?' . $my_api_cidreq . '&amp;cat_id=' . (int) $_GET['selectcat'] . '">' .
-                        Display::return_icon('certificate_list.png', get_lang('GradebookSeeListOfStudentsCertificates'), '', ICON_SIZE_MEDIUM) . '</a>';
+                    $header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat='.$catobj->get_id().'">'.
+                        Display::return_icon('stats.png', get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
+                    $header .= '<td style="vertical-align: top;"><a href="gradebook_display_certificate.php?'.$my_api_cidreq.'&amp;cat_id='.(int) $_GET['selectcat'].'">'.
+                        Display::return_icon('certificate_list.png', get_lang('GradebookSeeListOfStudentsCertificates'), '', ICON_SIZE_MEDIUM).'</a>';
 
                     $visibility_icon = ($catobj->is_visible() == 0) ? 'invisible' : 'visible';
                     $visibility_command = ($catobj->is_visible() == 0) ? 'set_visible' : 'set_invisible';
 
                     //Right icons
-                    $modify_icons = '<a href="gradebook_edit_cat.php?editcat=' . $catobj->get_id() . '&cidReq=' . $catobj->get_course_code() . '&id_session='.$catobj->get_session_id(). '">' . Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM) . '</a>';
+                    $modify_icons = '<a href="gradebook_edit_cat.php?editcat='.$catobj->get_id().'&cidReq='.$catobj->get_course_code().'&id_session='.$catobj->get_session_id().'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_MEDIUM).'</a>';
                     if ($catobj->get_name() != api_get_course_id()) {
-                        $modify_icons .= '&nbsp;<a  href="' . api_get_self() . '?deletecat=' . $catobj->get_id() . '&amp;selectcat=0&amp;cidReq=' . $catobj->get_course_code() . '" onclick="return confirmation();">' . Display::return_icon('delete.png', get_lang('DeleteAll'), '', ICON_SIZE_MEDIUM) . '</a>';
+                        $modify_icons .= '&nbsp;<a  href="'.api_get_self().'?deletecat='.$catobj->get_id().'&amp;selectcat=0&amp;cidReq='.$catobj->get_course_code().'" onclick="return confirmation();">'.Display::return_icon('delete.png', get_lang('DeleteAll'), '', ICON_SIZE_MEDIUM).'</a>';
                     }
                     $header .= Display::div($modify_icons, array('class' => 'right'));
                 }
             }
         } elseif (isset($_GET['search'])) {
-            $header .= '<b>' . get_lang('SearchResults') . ' :</b>';
+            $header .= '<b>'.get_lang('SearchResults').' :</b>';
         }
         $header .= '</div>';
         echo $header;
@@ -509,7 +509,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);
@@ -520,10 +520,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();
 
@@ -536,15 +536,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>';
             }
@@ -555,9 +555,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>';
@@ -572,33 +572,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(
@@ -608,7 +608,7 @@ 
                                         '',
                                         ICON_SIZE_MEDIUM
                                         ),
-                                "gradebook_display_certificate.php?$my_api_cidreq&cat_id=" . intval($_GET['selectcat'])
+                                "gradebook_display_certificate.php?$my_api_cidreq&cat_id=".intval($_GET['selectcat'])
                             );
                     }
 
@@ -619,29 +619,29 @@ 
                                 '',
                                 ICON_SIZE_MEDIUM
                                 ),
-                        "gradebook_display_summary.php?$my_api_cidreq&selectcat=" . intval($_GET['selectcat'])
+                        "gradebook_display_summary.php?$my_api_cidreq&selectcat=".intval($_GET['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(
@@ -650,26 +650,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());
@@ -697,24 +697,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;
     }
 
@@ -741,8 +741,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();
             //$row[] = $scoredisplay->display_score($score,SCORE_DIV_PERCENT);
         }
         $item_value = number_format($item_value, 2, '.', ' ');
@@ -757,17 +757,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>';
 

main/gradebook/lib/fe/linkform.class.php

Spacing +7 added lines, -7 removed lines

@@ -56,17 +56,17 @@ 
 
 	protected function build_move()
 	{
-		$renderer =& $this->defaultRenderer();
+		$renderer = & $this->defaultRenderer();
 		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
-		$this->addElement('static',null,null,get_lang('MoveTo').' : ');
-		$select = $this->addElement('select','move_cat',null,null);
+		$this->addElement('static', null, null, '"'.$this->link_object->get_name().'" ');
+		$this->addElement('static', null, null, get_lang('MoveTo').' : ');
+		$select = $this->addElement('select', 'move_cat', null, null);
 		$line = '';
 		foreach ($this->link_object->get_target_categories() as $cat) {
-			for ($i=0;$i<$cat[2];$i++) {
+			for ($i = 0; $i < $cat[2]; $i++) {
 				$line .= '&mdash;';
 			}
-			$select->addoption($line.' '.$cat[1],$cat[0]);
+			$select->addoption($line.' '.$cat[1], $cat[0]);
 			$line = '';
 		}
 		$this->addElement('submit', null, get_lang('Ok'));
@@ -133,7 +133,7 @@ 
 		$link = LinkFactory::create($link);
 		if (!empty($courseCode)) {
 			$link->set_course_code($courseCode);
-		} elseif(!empty($_GET['course_code'])) {
+		} elseif (!empty($_GET['course_code'])) {
 			$link->set_course_code(Database::escape_string($_GET['course_code'], null, false));
 		}
 

Indentation +117 added lines, -117 removed lines

@@ -10,133 +10,133 @@
  */
 class LinkForm extends FormValidator
 {
-	const TYPE_CREATE = 1;
-	const TYPE_MOVE = 2;
-	/** @var Category */
-	private $category_object;
-	private $link_object;
-	private $extra;
+    const TYPE_CREATE = 1;
+    const TYPE_MOVE = 2;
+    /** @var Category */
+    private $category_object;
+    private $link_object;
+    private $extra;
 
-	/**
-	 * Builds a form containing form items based on a given parameter
-	 * @param int form_type 1=choose link
-	 * @param obj cat_obj the category object
-	 * @param string form name
-	 * @param method
-	 * @param action
-	 */
-	public function __construct(
-		$form_type,
-		$category_object,
-		$link_object,
-		$form_name,
-		$method = 'post',
-		$action = null,
-		$extra = null
-	) {
-		parent :: __construct($form_name, $method, $action);
+    /**
+     * Builds a form containing form items based on a given parameter
+     * @param int form_type 1=choose link
+     * @param obj cat_obj the category object
+     * @param string form name
+     * @param method
+     * @param action
+     */
+    public function __construct(
+        $form_type,
+        $category_object,
+        $link_object,
+        $form_name,
+        $method = 'post',
+        $action = null,
+        $extra = null
+    ) {
+        parent :: __construct($form_name, $method, $action);
 
-		if (isset ($category_object)) {
-			$this->category_object = $category_object;
-		} else {
-			if (isset($link_object)) {
-				$this->link_object = $link_object;
-			}
-		}
+        if (isset ($category_object)) {
+            $this->category_object = $category_object;
+        } else {
+            if (isset($link_object)) {
+                $this->link_object = $link_object;
+            }
+        }
 
-		if (isset ($extra)) {
-			$this->extra = $extra;
-		}
-		if ($form_type == self :: TYPE_CREATE) {
-			$this->build_create();
-		} elseif ($form_type == self :: TYPE_MOVE) {
-			$this->build_move();
-		}
-	}
+        if (isset ($extra)) {
+            $this->extra = $extra;
+        }
+        if ($form_type == self :: TYPE_CREATE) {
+            $this->build_create();
+        } elseif ($form_type == self :: TYPE_MOVE) {
+            $this->build_move();
+        }
+    }
 
-	protected function build_move()
-	{
-		$renderer =& $this->defaultRenderer();
-		$renderer->setCustomElementTemplate('<span>{element}</span> ');
-		$this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
-		$this->addElement('static',null,null,get_lang('MoveTo').' : ');
-		$select = $this->addElement('select','move_cat',null,null);
-		$line = '';
-		foreach ($this->link_object->get_target_categories() as $cat) {
-			for ($i=0;$i<$cat[2];$i++) {
-				$line .= '&mdash;';
-			}
-			$select->addoption($line.' '.$cat[1],$cat[0]);
-			$line = '';
-		}
-		$this->addElement('submit', null, get_lang('Ok'));
-	}
+    protected function build_move()
+    {
+        $renderer =& $this->defaultRenderer();
+        $renderer->setCustomElementTemplate('<span>{element}</span> ');
+        $this->addElement('static',null,null,'"'.$this->link_object->get_name().'" ');
+        $this->addElement('static',null,null,get_lang('MoveTo').' : ');
+        $select = $this->addElement('select','move_cat',null,null);
+        $line = '';
+        foreach ($this->link_object->get_target_categories() as $cat) {
+            for ($i=0;$i<$cat[2];$i++) {
+                $line .= '&mdash;';
+            }
+            $select->addoption($line.' '.$cat[1],$cat[0]);
+            $line = '';
+        }
+        $this->addElement('submit', null, get_lang('Ok'));
+    }
 
-	/**
-	 * Builds the form
-	 */
-	protected function build_create()
-	{
-		$this->addElement('header', get_lang('MakeLink'));
-		$select = $this->addElement(
-			'select',
-			'select_link',
-			get_lang('ChooseLink'),
-			null,
-			array('onchange' => 'document.create_link.submit()')
-		);
+    /**
+     * Builds the form
+     */
+    protected function build_create()
+    {
+        $this->addElement('header', get_lang('MakeLink'));
+        $select = $this->addElement(
+            'select',
+            'select_link',
+            get_lang('ChooseLink'),
+            null,
+            array('onchange' => 'document.create_link.submit()')
+        );
 
-		$linkTypes = LinkFactory::get_all_types();
+        $linkTypes = LinkFactory::get_all_types();
 
-		$select->addoption('['.get_lang('ChooseLink').']', 0);
+        $select->addoption('['.get_lang('ChooseLink').']', 0);
 
-		$courseCode = $this->category_object->get_course_code();
+        $courseCode = $this->category_object->get_course_code();
 
-		foreach ($linkTypes as $linkType) {
-			// The hot potatoe link will be added "inside" the exercise option.
-			if ($linkType == LINK_HOTPOTATOES) {
-				continue;
-			}
-			$link = $this->createLink($linkType, $courseCode);
-			// disable this element if the link works with a dropdownlist
-			// and if there are no links left
-			if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') {
-				$select->addoption($link->get_type_name(), $linkType, 'disabled');
-			} else {
-				if ($link->get_type() == LINK_EXERCISE) {
-					// Adding exercise
-					$select->addoption($link->get_type_name(), $linkType);
-					// Adding hot potatoes
-					$linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode);
-					$select->addoption(
-						'&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
-						LINK_HOTPOTATOES
-					);
-				} else {
-					$select->addoption($link->get_type_name(), $linkType);
-				}
-			}
-		}
+        foreach ($linkTypes as $linkType) {
+            // The hot potatoe link will be added "inside" the exercise option.
+            if ($linkType == LINK_HOTPOTATOES) {
+                continue;
+            }
+            $link = $this->createLink($linkType, $courseCode);
+            // disable this element if the link works with a dropdownlist
+            // and if there are no links left
+            if (!$link->needs_name_and_description() && count($link->get_all_links()) == '0') {
+                $select->addoption($link->get_type_name(), $linkType, 'disabled');
+            } else {
+                if ($link->get_type() == LINK_EXERCISE) {
+                    // Adding exercise
+                    $select->addoption($link->get_type_name(), $linkType);
+                    // Adding hot potatoes
+                    $linkHot = $this->createLink(LINK_HOTPOTATOES, $courseCode);
+                    $select->addoption(
+                        '&nbsp;&nbsp;&nbsp;'.$linkHot->get_type_name(),
+                        LINK_HOTPOTATOES
+                    );
+                } else {
+                    $select->addoption($link->get_type_name(), $linkType);
+                }
+            }
+        }
 
-		if (isset($this->extra)) {
-			$this->setDefaults(array('select_link' => $this->extra));
-		}
-	}
+        if (isset($this->extra)) {
+            $this->setDefaults(array('select_link' => $this->extra));
+        }
+    }
 
-	/**
-	 * @param integer $link
-	 * @param null|string $courseCode
-	 * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink
-	 */
-	private function createLink($link, $courseCode)
-	{
-		$link = LinkFactory::create($link);
-		if (!empty($courseCode)) {
-			$link->set_course_code($courseCode);
-		} elseif(!empty($_GET['course_code'])) {
-			$link->set_course_code(Database::escape_string($_GET['course_code'], null, false));
-		}
+    /**
+     * @param integer $link
+     * @param null|string $courseCode
+     * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink
+     */
+    private function createLink($link, $courseCode)
+    {
+        $link = LinkFactory::create($link);
+        if (!empty($courseCode)) {
+            $link->set_course_code($courseCode);
+        } elseif(!empty($_GET['course_code'])) {
+            $link->set_course_code(Database::escape_string($_GET['course_code'], null, false));
+        }
 
-		return $link;
-	}
+        return $link;
+    }
 }

main/gradebook/lib/fe/catform.class.php

Spacing +10 added lines, -10 removed lines

@@ -52,15 +52,15 @@ 
      */
     protected function build_move_form()
     {
-        $renderer =& $this->defaultRenderer();
+        $renderer = & $this->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement(
             'static',
             null,
             null,
-            '"' . $this->category_object->get_name() . '" '
+            '"'.$this->category_object->get_name().'" '
         );
-        $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
+        $this->addElement('static', null, null, get_lang('MoveTo').' : ');
         $select = $this->addElement('select', 'move_cat', null, null);
         $line = null;
         foreach ($this->category_object->get_target_categories() as $cat) {
@@ -68,9 +68,9 @@ 
                 $line .= '--';
             }
             if ($cat[0] != $this->category_object->get_parent_id()) {
-                $select->addoption($line . ' ' . $cat[1], $cat[0]);
+                $select->addoption($line.' '.$cat[1], $cat[0]);
             } else {
-                $select->addoption($line . ' ' . $cat[1], $cat[0], 'disabled');
+                $select->addoption($line.' '.$cat[1], $cat[0], 'disabled');
             }
             $line = '';
         }
@@ -153,7 +153,7 @@ 
         $grade_model_id = $this->category_object->get_grade_model_id();
 
         if (empty($links)) {
-            $grade_model_id    = 0;
+            $grade_model_id = 0;
         }
 
         $category_name = $this->category_object->get_name();
@@ -242,7 +242,7 @@ 
                     [
                         'id' => 'skills',
                         'multiple' => 'multiple',
-                        'url' => api_get_path(WEB_AJAX_PATH) . 'skill.ajax.php?a=search_skills'
+                        'url' => api_get_path(WEB_AJAX_PATH).'skill.ajax.php?a=search_skills'
                     ]
                 );
 
@@ -400,14 +400,14 @@ 
         //only return courses that are not yet created by the teacher
 
         foreach ($coursecat as $row) {
-            $select->addoption($row[1],$row[0]);
+            $select->addoption($row[1], $row[0]);
         }
         $this->setDefaults(array(
             'hid_user_id' => $this->category_object->get_user_id(),
             'hid_parent_id' => $this->category_object->get_parent_id()
         ));
-        $this->addElement('hidden','hid_user_id');
-        $this->addElement('hidden','hid_parent_id');
+        $this->addElement('hidden', 'hid_user_id');
+        $this->addElement('hidden', 'hid_parent_id');
         $this->addElement('submit', null, get_lang('Ok'));
     }
 

main/gradebook/lib/fe/linkaddeditform.class.php

Spacing +14 added lines, -14 removed lines

@@ -31,7 +31,7 @@ 
 		if (isset($link_object)) {
 			$link = $link_object;
 		} elseif (isset($link_type) && isset($category_object)) {
-			$link = LinkFactory :: create ($link_type);
+			$link = LinkFactory :: create($link_type);
 			$link->set_course_code(api_get_course_id());
 			$link->set_category_id($category_object[0]->get_id());
 		} else {
@@ -52,12 +52,12 @@ 
 			} else {
 				$select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
 				foreach ($link->get_all_links() as $newlink) {
-					$select->addoption($newlink[1],$newlink[0]);
+					$select->addoption($newlink[1], $newlink[0]);
 				}
 			}
 		} else {
-			$this->addElement('label',get_lang('Name'),  '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
-			$this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
+			$this->addElement('label', get_lang('Name'), '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
+			$this->addElement('hidden', 'name_link', $link->get_name(), array('id'=>'name_link'));
 		}
 
 		if (count($category_object) == 1) {
@@ -80,7 +80,7 @@ 
 						$grade_model_id = $my_cat->get_grade_model_id();
 						if (empty($grade_model_id)) {
 
-							if ($my_cat->get_parent_id() == 0 ) {
+							if ($my_cat->get_parent_id() == 0) {
 								$default_weight = $my_cat->get_weight();
 								$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
 							} else {
@@ -119,8 +119,8 @@ 
             'class' => 'span1'
         ));*/
 
-		$this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric');
-		$this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+		$this->addRule('weight_mask', get_lang('OnlyNumbers'), 'numeric');
+		$this->addRule(array('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
 		if ($form_type == self :: TYPE_EDIT) {
 			$parent_cat = Category :: load($link->get_category_id());
 
@@ -133,20 +133,20 @@ 
 				//var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
 				//$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
 				//$values['weight'] = $weight;
-				$values['weight'] = $link->get_weight() ;
+				$values['weight'] = $link->get_weight();
 			}
-			$defaults['weight_mask'] = $values['weight'] ;
+			$defaults['weight_mask'] = $values['weight'];
 			$defaults['select_gradebook'] = $link->get_category_id();
 
 		}
 		// ELEMENT: max
 		if ($link->needs_max()) {
 			if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
-				$this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
+				$this->addText('max', get_lang('QualificationNumeric'), false, array('size' => '4', 'maxlength' => '5', 'disabled' => 'disabled'));
 			} else {
-				$this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
+				$this->addText('max', get_lang('QualificationNumeric'), true, array('size' => '4', 'maxlength' => '5'));
 				$this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
-				$this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+				$this->addRule(array('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
 			}
 			if ($form_type == self :: TYPE_EDIT) {
 				$defaults['max'] = $link->get_max();
@@ -155,7 +155,7 @@ 
 
 		// ELEMENT: description
 		if ($link->needs_name_and_description()) {
-			$this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
+			$this->addElement('textarea', 'description', get_lang('Description'), array('rows' => '3', 'cols' => '34'));
 			if ($form_type == self :: TYPE_EDIT) {
 				$defaults['description'] = $link->get_description();
 			}
@@ -185,7 +185,7 @@ 
 			if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
 				$visibility_default = 0;
 			}
-			$defaults['visible']  = $visibility_default;
+			$defaults['visible'] = $visibility_default;
 		}
 
 		// set default values

Indentation +174 added lines, -174 removed lines

@@ -9,108 +9,108 @@ 
  */
 class LinkAddEditForm extends FormValidator
 {
-	const TYPE_ADD  = 1;
-	const TYPE_EDIT = 2;
-
-	/**
-	 * Constructor
-	 * To add link, define category_object and link_type
-	 * To edit link, define link_object
-	 */
-	public function __construct(
-		$form_type,
-		$category_object,
-		$link_type,
-		$link_object,
-		$form_name,
-		$action = null
-	) {
-		parent :: __construct($form_name, 'post', $action);
-
-		// set or create link object
-		if (isset($link_object)) {
-			$link = $link_object;
-		} elseif (isset($link_type) && isset($category_object)) {
-			$link = LinkFactory :: create ($link_type);
-			$link->set_course_code(api_get_course_id());
-			$link->set_category_id($category_object[0]->get_id());
-		} else {
-			die ('LinkAddEditForm error: define link_type/category_object or link_object');
-		}
-
-		$defaults = array();
-		$this->addElement('hidden', 'zero', 0);
-
-		if (!empty($_GET['editlink'])) {
-			$this->addElement('header', '', get_lang('EditLink'));
-		}
-
-		// ELEMENT: name
-		if ($form_type == self :: TYPE_ADD || $link->is_allowed_to_change_name()) {
-			if ($link->needs_name_and_description()) {
-				$this->addText('name', get_lang('Name'), true, array('size'=>'40', 'maxlength'=>'40'));
-			} else {
-				$select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
-				foreach ($link->get_all_links() as $newlink) {
-					$select->addoption($newlink[1],$newlink[0]);
-				}
-			}
-		} else {
-			$this->addElement('label',get_lang('Name'),  '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
-			$this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
-		}
-
-		if (count($category_object) == 1) {
-			$this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id());
-		} else {
-			$select_gradebook = $this->addElement(
-				'select',
-				'select_gradebook',
-				get_lang('SelectGradebook'),
-				array(),
-				array('id' => 'hide_category_id')
-			);
-			$this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero');
-
-			$default_weight = 0;
-			if (!empty($category_object)) {
-				foreach ($category_object as $my_cat) {
-
-					if ($my_cat->get_course_code() == api_get_course_id()) {
-						$grade_model_id = $my_cat->get_grade_model_id();
-						if (empty($grade_model_id)) {
-
-							if ($my_cat->get_parent_id() == 0 ) {
-								$default_weight = $my_cat->get_weight();
-								$select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
-							} else {
-								$select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id());
-							}
-						} else {
-							$select_gradebook->addoption(get_lang('Select'), 0);
-						}
-						if ($link->get_category_id() == $my_cat->get_id()) {
-							$default_weight = $my_cat->get_weight();
-						}
-					}
-				}
-			}
-		}
-
-		$this->addText(
-			'weight_mask',
-			array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$category_object[0]->get_weight().'</span>] '),
-			true,
-			array(
-				'size' => '4',
-				'maxlength' => '5',
-				'class' => 'span1'
-			)
-		);
-
-		$this->addElement('hidden', 'weight');
-
-		/*
+    const TYPE_ADD  = 1;
+    const TYPE_EDIT = 2;
+
+    /**
+     * Constructor
+     * To add link, define category_object and link_type
+     * To edit link, define link_object
+     */
+    public function __construct(
+        $form_type,
+        $category_object,
+        $link_type,
+        $link_object,
+        $form_name,
+        $action = null
+    ) {
+        parent :: __construct($form_name, 'post', $action);
+
+        // set or create link object
+        if (isset($link_object)) {
+            $link = $link_object;
+        } elseif (isset($link_type) && isset($category_object)) {
+            $link = LinkFactory :: create ($link_type);
+            $link->set_course_code(api_get_course_id());
+            $link->set_category_id($category_object[0]->get_id());
+        } else {
+            die ('LinkAddEditForm error: define link_type/category_object or link_object');
+        }
+
+        $defaults = array();
+        $this->addElement('hidden', 'zero', 0);
+
+        if (!empty($_GET['editlink'])) {
+            $this->addElement('header', '', get_lang('EditLink'));
+        }
+
+        // ELEMENT: name
+        if ($form_type == self :: TYPE_ADD || $link->is_allowed_to_change_name()) {
+            if ($link->needs_name_and_description()) {
+                $this->addText('name', get_lang('Name'), true, array('size'=>'40', 'maxlength'=>'40'));
+            } else {
+                $select = $this->addElement('select', 'select_link', get_lang('ChooseItem'));
+                foreach ($link->get_all_links() as $newlink) {
+                    $select->addoption($newlink[1],$newlink[0]);
+                }
+            }
+        } else {
+            $this->addElement('label',get_lang('Name'),  '<span class="freeze">'.$link->get_name().' ['.$link->get_type_name().']</span>');
+            $this->addElement('hidden','name_link',$link->get_name(),array('id'=>'name_link'));
+        }
+
+        if (count($category_object) == 1) {
+            $this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id());
+        } else {
+            $select_gradebook = $this->addElement(
+                'select',
+                'select_gradebook',
+                get_lang('SelectGradebook'),
+                array(),
+                array('id' => 'hide_category_id')
+            );
+            $this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero');
+
+            $default_weight = 0;
+            if (!empty($category_object)) {
+                foreach ($category_object as $my_cat) {
+
+                    if ($my_cat->get_course_code() == api_get_course_id()) {
+                        $grade_model_id = $my_cat->get_grade_model_id();
+                        if (empty($grade_model_id)) {
+
+                            if ($my_cat->get_parent_id() == 0 ) {
+                                $default_weight = $my_cat->get_weight();
+                                $select_gradebook->addoption(get_lang('Default'), $my_cat->get_id());
+                            } else {
+                                $select_gradebook->addoption($my_cat->get_name(), $my_cat->get_id());
+                            }
+                        } else {
+                            $select_gradebook->addoption(get_lang('Select'), 0);
+                        }
+                        if ($link->get_category_id() == $my_cat->get_id()) {
+                            $default_weight = $my_cat->get_weight();
+                        }
+                    }
+                }
+            }
+        }
+
+        $this->addText(
+            'weight_mask',
+            array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$category_object[0]->get_weight().'</span>] '),
+            true,
+            array(
+                'size' => '4',
+                'maxlength' => '5',
+                'class' => 'span1'
+            )
+        );
+
+        $this->addElement('hidden', 'weight');
+
+        /*
 
         // ELEMENT: weight
         $this->addText('weight', array(get_lang('Weight'), null, '/ <span id="max_weight">'.$default_weight.'</span>'), true, array (
@@ -119,76 +119,76 @@ 
             'class' => 'span1'
         ));*/
 
-		$this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric');
-		$this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
-		if ($form_type == self :: TYPE_EDIT) {
-			$parent_cat = Category :: load($link->get_category_id());
-
-			if ($parent_cat[0]->get_parent_id() == 0) {
-				$values['weight'] = $link->get_weight();
-			} else {
-				$cat = Category :: load($parent_cat[0]->get_parent_id());
-				//$global_weight = $cat[0]->get_weight();
-				//$values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight;
-				//var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
-				//$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
-				//$values['weight'] = $weight;
-				$values['weight'] = $link->get_weight() ;
-			}
-			$defaults['weight_mask'] = $values['weight'] ;
-			$defaults['select_gradebook'] = $link->get_category_id();
-
-		}
-		// ELEMENT: max
-		if ($link->needs_max()) {
-			if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
-				$this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
-			} else {
-				$this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
-				$this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
-				$this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
-			}
-			if ($form_type == self :: TYPE_EDIT) {
-				$defaults['max'] = $link->get_max();
-			}
-		}
-
-		// ELEMENT: description
-		if ($link->needs_name_and_description()) {
-			$this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
-			if ($form_type == self :: TYPE_EDIT) {
-				$defaults['description'] = $link->get_description();
-			}
-		}
-
-		// ELEMENT: visible
-		$visible = ($form_type == self :: TYPE_EDIT && $link->is_visible()) ? '1' : '0';
-		$this->addElement('checkbox', 'visible', null, get_lang('Visible'), $visible);
-		if ($form_type == self :: TYPE_EDIT) {
-			$defaults['visible'] = $link->is_visible();
-		}
-
-		// ELEMENT: add results
-		if ($form_type == self :: TYPE_ADD && $link->needs_results()) {
-			$this->addElement('checkbox', 'addresult', get_lang('AddResult'));
-		}
-		// submit button
-		if ($form_type == self :: TYPE_ADD) {
-			$this->addButtonCreate(get_lang('CreateLink'));
-		} else {
-			$this->addButtonUpdate(get_lang('LinkMod'));
-		}
-
-		if ($form_type == self :: TYPE_ADD) {
-			$setting = api_get_setting('tool_visible_by_default_at_creation');
-			$visibility_default = 1;
-			if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
-				$visibility_default = 0;
-			}
-			$defaults['visible']  = $visibility_default;
-		}
-
-		// set default values
-		$this->setDefaults($defaults);
-	}
+        $this->addRule('weight_mask',get_lang('OnlyNumbers'),'numeric');
+        $this->addRule(array ('weight_mask', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+        if ($form_type == self :: TYPE_EDIT) {
+            $parent_cat = Category :: load($link->get_category_id());
+
+            if ($parent_cat[0]->get_parent_id() == 0) {
+                $values['weight'] = $link->get_weight();
+            } else {
+                $cat = Category :: load($parent_cat[0]->get_parent_id());
+                //$global_weight = $cat[0]->get_weight();
+                //$values['weight'] = $link->get_weight()/$parent_cat[0]->get_weight()*$global_weight;
+                //var_dump($global_weight, $link->get_weight(), $parent_cat[0]->get_weight());
+                //$weight = $parent_cat[0]->get_weight()* $link->get_weight() / $global_weight;
+                //$values['weight'] = $weight;
+                $values['weight'] = $link->get_weight() ;
+            }
+            $defaults['weight_mask'] = $values['weight'] ;
+            $defaults['select_gradebook'] = $link->get_category_id();
+
+        }
+        // ELEMENT: max
+        if ($link->needs_max()) {
+            if ($form_type == self :: TYPE_EDIT && $link->has_results()) {
+                $this->addText('max', get_lang('QualificationNumeric'), false, array ('size' => '4','maxlength' => '5', 'disabled' => 'disabled'));
+            } else {
+                $this->addText('max', get_lang('QualificationNumeric'), true, array ('size' => '4','maxlength' => '5'));
+                $this->addRule('max', get_lang('OnlyNumbers'), 'numeric');
+                $this->addRule(array ('max', 'zero'), get_lang('NegativeValue'), 'compare', '>=');
+            }
+            if ($form_type == self :: TYPE_EDIT) {
+                $defaults['max'] = $link->get_max();
+            }
+        }
+
+        // ELEMENT: description
+        if ($link->needs_name_and_description()) {
+            $this->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3','cols' => '34'));
+            if ($form_type == self :: TYPE_EDIT) {
+                $defaults['description'] = $link->get_description();
+            }
+        }
+
+        // ELEMENT: visible
+        $visible = ($form_type == self :: TYPE_EDIT && $link->is_visible()) ? '1' : '0';
+        $this->addElement('checkbox', 'visible', null, get_lang('Visible'), $visible);
+        if ($form_type == self :: TYPE_EDIT) {
+            $defaults['visible'] = $link->is_visible();
+        }
+
+        // ELEMENT: add results
+        if ($form_type == self :: TYPE_ADD && $link->needs_results()) {
+            $this->addElement('checkbox', 'addresult', get_lang('AddResult'));
+        }
+        // submit button
+        if ($form_type == self :: TYPE_ADD) {
+            $this->addButtonCreate(get_lang('CreateLink'));
+        } else {
+            $this->addButtonUpdate(get_lang('LinkMod'));
+        }
+
+        if ($form_type == self :: TYPE_ADD) {
+            $setting = api_get_setting('tool_visible_by_default_at_creation');
+            $visibility_default = 1;
+            if (isset($setting['gradebook']) && $setting['gradebook'] == 'false') {
+                $visibility_default = 0;
+            }
+            $defaults['visible']  = $visibility_default;
+        }
+
+        // set default values
+        $this->setDefaults($defaults);
+    }
 }

main/gradebook/lib/fe/flatviewtable.class.php

Spacing +15 added lines, -15 removed lines

@@ -201,9 +201,9 @@ 
             $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1)));
             $chartHash = $myCache->getHash($dataSet);
             if ($myCache->isInCache($chartHash)) {
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             } else {
                 /* Create the pChart object */
                 $widthSize = 480;
@@ -230,7 +230,7 @@ 
                 /* Set the default font */
                 $myPicture->setFontProperties(
                     array(
-                        'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                        'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                         'FontSize' => 10
                     )
                 );
@@ -302,11 +302,11 @@ 
                 /* Render the picture (choose the best way) */
 
                 $myCache->writeToCache($chartHash, $myPicture);
-                $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
                 $myCache->saveFromCache($chartHash, $imgPath);
-                $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+                $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
             }
-            echo '<img src="' . $imgPath . '" >';
+            echo '<img src="'.$imgPath.'" >';
             if ($i % 2 == 0 && $i != 0) {
                 echo '<br /><br />';
             } else {
@@ -349,10 +349,10 @@ 
             // previous X
             $header .= '<td style="width:100%;">';
             if ($this->offset >= GRADEBOOK_ITEM_LIMIT) {
-                $header .= '<a href="' . api_get_self()
-                    . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                    . '&offset=' . (($this->offset) - GRADEBOOK_ITEM_LIMIT)
-                    . (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
+                $header .= '<a href="'.api_get_self()
+                    . '?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                    . '&offset='.(($this->offset) - GRADEBOOK_ITEM_LIMIT)
+                    . (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
                     . Display::return_icon('action_prev.png', get_lang('PreviousPage'), array(), 32)
                     . '</a>';
             } else {
@@ -364,10 +364,10 @@ 
                 ($totalitems - (GRADEBOOK_ITEM_LIMIT + $this->offset)) : GRADEBOOK_ITEM_LIMIT;
 
             if ($calcnext > 0) {
-                $header .= '<a href="' . api_get_self()
-                    . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                    . '&offset=' . ($this->offset + GRADEBOOK_ITEM_LIMIT)
-                    . (isset($_GET['search']) ? '&search=' . Security::remove_XSS($_GET['search']) : '') . '">'
+                $header .= '<a href="'.api_get_self()
+                    . '?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                    . '&offset='.($this->offset + GRADEBOOK_ITEM_LIMIT)
+                    . (isset($_GET['search']) ? '&search='.Security::remove_XSS($_GET['search']) : '').'">'
                     . Display::return_icon('action_next.png', get_lang('NextPage'), array(), 32)
                     . '</a>';
             } else {
@@ -475,6 +475,6 @@ 
      */
     private function build_name_link($user_id, $name)
     {
-        return '<a href="user_stats.php?userid=' . $user_id . '&selectcat=' . $this->selectcat->get_id() . '&'.api_get_cidreq().'">' . $name . '</a>';
+        return '<a href="user_stats.php?userid='.$user_id.'&selectcat='.$this->selectcat->get_id().'&'.api_get_cidreq().'">'.$name.'</a>';
     }
 }

Braces +3 added lines, -2 removed lines

@@ -149,8 +149,9 @@
                 }
 
                 foreach ($customdisplays as $display) {
-                    if (!in_array($display['display'], $key_list))
-                        $resource_list[$key][$display['display']] = 0;
+                    if (!in_array($display['display'], $key_list)) {
+                                            $resource_list[$key][$display['display']] = 0;
+                    }
                 }
                 $i++;
             }

main/gradebook/lib/fe/usertable.class.php

Spacing +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
 	 */
 	public function UserTable($userid, $evals = array(), $links = array(), $addparams = null)
 	{
-		parent :: __construct ('userlist', null, null, 0);
+		parent :: __construct('userlist', null, null, 0);
 		$this->userid = $userid;
 		$this->datagen = new UserDataGenerator($userid, $evals, $links);
 		if (isset($addparams)) {
@@ -87,8 +87,8 @@ 
 		// generate the data to display
 		$sortable_data = array();
 		foreach ($data_array as $data) {
-			if ($data[2]!="") {//filter by course removed
-				$row = array ();
+			if ($data[2] != "") {//filter by course removed
+				$row = array();
 				$row[] = $this->build_type_column($data[0]);
 				$row[] = $this->build_name_link($data[0]);
 				$row[] = $data[2];
@@ -123,15 +123,15 @@ 
 			// evaluation
 			case 'E' :
 				return ' '
-				. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+				. '<a href="gradebook_view_result.php?selecteval='.$item->get_id().'">'
 				. $item->get_name()
 				. '</a>';
 			// link
 			case 'L' :
-				return '&nbsp;<a href="' . $item->get_link() . '">'
+				return '&nbsp;<a href="'.$item->get_link().'">'
 				. $item->get_name()
 				. '</a>'
-				. '&nbsp;[' . $item->get_type_name() . ']';
+				. '&nbsp;['.$item->get_type_name().']';
 		}
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -95,8 +95,9 @@
 				$row[] = $data[3];
 				$row[] = $data[4];
 				$row[] = $data[5];
-				if ($scoredisplay->is_custom())
-					$row[] = $data[6];
+				if ($scoredisplay->is_custom()) {
+									$row[] = $data[6];
+				}
 				$sortable_data[] = $row;
 			}
 		}

Indentation +116 added lines, -116 removed lines

@@ -10,128 +10,128 @@
  */
 class UserTable extends SortableTable
 {
-	private $userid;
-	private $datagen;
+    private $userid;
+    private $datagen;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct($userid, $evals = array(), $links = array(), $addparams = null)
-	{
-		parent :: __construct ('userlist', null, null, 0);
-		$this->userid = $userid;
-		$this->datagen = new UserDataGenerator($userid, $evals, $links);
-		if (isset($addparams)) {
-			$this->set_additional_parameters($addparams);
-		}
-		$column = 0;
-		$this->set_header($column++, get_lang('Type'));
-		$this->set_header($column++, get_lang('Evaluation'));
-		$this->set_header($column++, get_lang('Course'));
-		$this->set_header($column++, get_lang('Category'));
-		$this->set_header($column++, get_lang('EvaluationAverage'));
-		$this->set_header($column++, get_lang('Result'));
+    /**
+     * Constructor
+     */
+    public function __construct($userid, $evals = array(), $links = array(), $addparams = null)
+    {
+        parent :: __construct ('userlist', null, null, 0);
+        $this->userid = $userid;
+        $this->datagen = new UserDataGenerator($userid, $evals, $links);
+        if (isset($addparams)) {
+            $this->set_additional_parameters($addparams);
+        }
+        $column = 0;
+        $this->set_header($column++, get_lang('Type'));
+        $this->set_header($column++, get_lang('Evaluation'));
+        $this->set_header($column++, get_lang('Course'));
+        $this->set_header($column++, get_lang('Category'));
+        $this->set_header($column++, get_lang('EvaluationAverage'));
+        $this->set_header($column++, get_lang('Result'));
 
-		$scoredisplay = ScoreDisplay :: instance();
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-	}
+        $scoredisplay = ScoreDisplay :: instance();
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+    }
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	function get_total_number_of_items()
-	{
-		return $this->datagen->get_total_items_count();
-	}
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    function get_total_number_of_items()
+    {
+        return $this->datagen->get_total_items_count();
+    }
 
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
-	{
-		$scoredisplay = ScoreDisplay :: instance();
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
+    {
+        $scoredisplay = ScoreDisplay :: instance();
 
-		// determine sorting type
-		switch ($this->column) {
-			// Type
-			case 0:
-				$sorting = UserDataGenerator :: UDG_SORT_TYPE;
-				break;
-			case 1:
-				$sorting = UserDataGenerator :: UDG_SORT_NAME;
-				break;
-			case 2:
-				$sorting = UserDataGenerator :: UDG_SORT_COURSE;
-				break;
-			case 3:
-				$sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
-				break;
-			case 4:
-				$sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
-				break;
-			case 5:
-				$sorting = UserDataGenerator :: UDG_SORT_SCORE;
-				break;
-			case 6:
-				$sorting = UserDataGenerator :: UDG_SORT_MASK;
-				break;
-		}
-		if ($this->direction == 'DESC') {
-			$sorting |= UserDataGenerator :: UDG_SORT_DESC;
-		} else {
-			$sorting |= UserDataGenerator :: UDG_SORT_ASC;
-		}
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
-		// generate the data to display
-		$sortable_data = array();
-		foreach ($data_array as $data) {
-			if ($data[2]!="") {//filter by course removed
-				$row = array ();
-				$row[] = $this->build_type_column($data[0]);
-				$row[] = $this->build_name_link($data[0]);
-				$row[] = $data[2];
-				$row[] = $data[3];
-				$row[] = $data[4];
-				$row[] = $data[5];
-				if ($scoredisplay->is_custom())
-					$row[] = $data[6];
-				$sortable_data[] = $row;
-			}
-		}
+        // determine sorting type
+        switch ($this->column) {
+            // Type
+            case 0:
+                $sorting = UserDataGenerator :: UDG_SORT_TYPE;
+                break;
+            case 1:
+                $sorting = UserDataGenerator :: UDG_SORT_NAME;
+                break;
+            case 2:
+                $sorting = UserDataGenerator :: UDG_SORT_COURSE;
+                break;
+            case 3:
+                $sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
+                break;
+            case 4:
+                $sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
+                break;
+            case 5:
+                $sorting = UserDataGenerator :: UDG_SORT_SCORE;
+                break;
+            case 6:
+                $sorting = UserDataGenerator :: UDG_SORT_MASK;
+                break;
+        }
+        if ($this->direction == 'DESC') {
+            $sorting |= UserDataGenerator :: UDG_SORT_DESC;
+        } else {
+            $sorting |= UserDataGenerator :: UDG_SORT_ASC;
+        }
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
+        // generate the data to display
+        $sortable_data = array();
+        foreach ($data_array as $data) {
+            if ($data[2]!="") {//filter by course removed
+                $row = array ();
+                $row[] = $this->build_type_column($data[0]);
+                $row[] = $this->build_name_link($data[0]);
+                $row[] = $data[2];
+                $row[] = $data[3];
+                $row[] = $data[4];
+                $row[] = $data[5];
+                if ($scoredisplay->is_custom())
+                    $row[] = $data[6];
+                $sortable_data[] = $row;
+            }
+        }
 
-		return $sortable_data;
-	}
+        return $sortable_data;
+    }
 
-	/**
-	 * @param $item
-	 * @return string
-	 */
-	private function build_type_column($item)
-	{
-		return GradebookUtils::build_type_icon_tag($item->get_icon_name());
-	}
+    /**
+     * @param $item
+     * @return string
+     */
+    private function build_type_column($item)
+    {
+        return GradebookUtils::build_type_icon_tag($item->get_icon_name());
+    }
 
-	/**
-	 * @param $item
-	 * @return string
-	 */
-	private function build_name_link($item)
-	{
-		switch ($item->get_item_type()) {
-			// evaluation
-			case 'E' :
-				return ' '
-				. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
-				. $item->get_name()
-				. '</a>';
-			// link
-			case 'L' :
-				return '&nbsp;<a href="' . $item->get_link() . '">'
-				. $item->get_name()
-				. '</a>'
-				. '&nbsp;[' . $item->get_type_name() . ']';
-		}
-	}
+    /**
+     * @param $item
+     * @return string
+     */
+    private function build_name_link($item)
+    {
+        switch ($item->get_item_type()) {
+            // evaluation
+            case 'E' :
+                return '&nbsp;'
+                . '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
+                . $item->get_name()
+                . '</a>';
+            // link
+            case 'L' :
+                return '&nbsp;<a href="' . $item->get_link() . '">'
+                . $item->get_name()
+                . '</a>'
+                . '&nbsp;[' . $item->get_type_name() . ']';
+        }
+    }
 }

main/gradebook/lib/fe/evalform.class.php

Spacing +52 added lines, -52 removed lines

@@ -91,7 +91,7 @@ 
             'onchange' => 'document.add_users_to_evaluation.submit()'
         ));
         $select->addOption('', '');
-        for ($i = 65; $i <= 90; $i ++) {
+        for ($i = 65; $i <= 90; $i++) {
             $letter = chr($i);
             if (isset($this->extra) && $this->extra == $letter) {
                 $select->addOption($letter, $letter, 'selected');
@@ -106,7 +106,7 @@ 
         ));
         foreach ($this->evaluation_object->get_not_subscribed_students() as $user) {
             if ((!isset($this->extra)) || empty($this->extra) || api_strtoupper(api_substr($user[1], 0, 1)) == $this->extra) {
-                $select->addoption($user[1] . ' ' . $user[2] . ' (' . $user[3] . ')', $user[0]);
+                $select->addoption($user[1].' '.$user[2].' ('.$user[3].')', $user[0]);
             }
         }
         $this->addButtonCreate(get_lang('AddUserToEval'), 'submit_button');
@@ -134,21 +134,21 @@ 
         if (api_is_western_name_order()) {
             $renderer->setHeaderTemplate(
                     '<tr>
-    		       <th>' . get_lang('OfficialCode') . '</th>
-    		      <th>' . get_lang('UserName') . '</th>
-    		      <th>' . get_lang('FirstName') . '</th>
-    		      <th>' . get_lang('LastName') . '</th>
-    		      <th>' . get_lang('Qualify') . '</th>
+    		       <th>' . get_lang('OfficialCode').'</th>
+    		      <th>' . get_lang('UserName').'</th>
+    		      <th>' . get_lang('FirstName').'</th>
+    		      <th>' . get_lang('LastName').'</th>
+    		      <th>' . get_lang('Qualify').'</th>
     		   </tr>'
             );
         } else {
             $renderer->setHeaderTemplate(
                     '<tr>
-                   <th>' . get_lang('OfficialCode') . '</th>
-                  <th>' . get_lang('UserName') . '</th>
-                  <th>' . get_lang('LastName') . '</th>
-                  <th>' . get_lang('FirstName') . '</th>
-                  <th>' . get_lang('Qualify') . '</th>
+                   <th>' . get_lang('OfficialCode').'</th>
+                  <th>' . get_lang('UserName').'</th>
+                  <th>' . get_lang('LastName').'</th>
+                  <th>' . get_lang('FirstName').'</th>
+                  <th>' . get_lang('Qualify').'</th>
                </tr>'
             );
         }
@@ -174,33 +174,33 @@ 
             $result = $result_and_user['result'];
 
             $renderer = &$this->defaultRenderer();
-            $this->addText('score[' . $result->get_id() . ']', $this->build_stud_label($user['user_id'], $user['username'], $user['lastname'], $user['firstname']), false, array('class' => "span2",
+            $this->addText('score['.$result->get_id().']', $this->build_stud_label($user['user_id'], $user['username'], $user['lastname'], $user['firstname']), false, array('class' => "span2",
                 'maxlength' => 5));
 
-            $this->addRule('score[' . $result->get_id() . ']', get_lang('OnlyNumbers'), 'numeric');
+            $this->addRule('score['.$result->get_id().']', get_lang('OnlyNumbers'), 'numeric');
             $this->addRule(array(
-                'score[' . $result->get_id() . ']', 'maxvalue'), get_lang('OverMax'), 'compare', '<=');
+                'score['.$result->get_id().']', 'maxvalue'), get_lang('OverMax'), 'compare', '<=');
             $this->addRule(array(
-                'score[' . $result->get_id() . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
-            $defaults['score[' . $result->get_id() . ']'] = $result->get_score();
+                'score['.$result->get_id().']', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
+            $defaults['score['.$result->get_id().']'] = $result->get_score();
 
             if (api_is_western_name_order()) {
-                $user_info = '<td align="left" >' . $user['firstname'] . '</td>';
-                $user_info .= '<td align="left" >' . $user['lastname'] . '</td>';
+                $user_info = '<td align="left" >'.$user['firstname'].'</td>';
+                $user_info .= '<td align="left" >'.$user['lastname'].'</td>';
             } else {
-                $user_info = '<td align="left" >' . $user['lastname'] . '</td>';
-                $user_info .= '<td align="left" >' . $user['firstname'] . '</td>';
+                $user_info = '<td align="left" >'.$user['lastname'].'</td>';
+                $user_info .= '<td align="left" >'.$user['firstname'].'</td>';
             }
 
             $template = '<tr>
-		      <td align="left" >' . $user['official_code'] . '</td>
-		      <td align="left" >' . $user['username'] . '</td>
-		      ' . $user_info . '
-		       <td align="left">{element} / ' . $this->evaluation_object->get_max() . '
+		      <td align="left" >' . $user['official_code'].'</td>
+		      <td align="left" >' . $user['username'].'</td>
+		      ' . $user_info.'
+		       <td align="left">{element} / ' . $this->evaluation_object->get_max().'
 		         <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
 		      </td>
 		   </tr>';
-            $renderer->setElementTemplate($template, 'score[' . $result->get_id() . ']');
+            $renderer->setElementTemplate($template, 'score['.$result->get_id().']');
         }
         $this->setDefaults($defaults);
         $this->addButtonSave(get_lang('EditResult'), 'submit');
@@ -215,15 +215,15 @@ 
     {
         $renderer = & $this->defaultRenderer();
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
-        $this->addElement('static', null, null, '"' . $this->evaluation_object->get_name() . '" ');
-        $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
+        $this->addElement('static', null, null, '"'.$this->evaluation_object->get_name().'" ');
+        $this->addElement('static', null, null, get_lang('MoveTo').' : ');
         $select = $this->addElement('select', 'move_cat', null, null);
         $line = '';
         foreach ($this->evaluation_object->get_target_categories() as $cat) {
             for ($i = 0; $i < $cat[2]; $i++) {
                 $line .= '&mdash;';
             }
-            $select->addoption($line . ' ' . $cat[1], $cat[0]);
+            $select->addoption($line.' '.$cat[1], $cat[0]);
             $line = '';
         }
         $this->addButtonSave(get_lang('Ok'), 'submit');
@@ -253,21 +253,21 @@ 
         if (api_is_western_name_order()) {
             $renderer->setHeaderTemplate(
                     '<tr>
-                   <th>' . get_lang('OfficialCode') . '</th>
-                  <th>' . get_lang('UserName') . '</th>
-                  <th>' . get_lang('FirstName') . '</th>
-                  <th>' . get_lang('LastName') . '</th>
-                  <th>' . get_lang('Qualify') . '</th>
+                   <th>' . get_lang('OfficialCode').'</th>
+                  <th>' . get_lang('UserName').'</th>
+                  <th>' . get_lang('FirstName').'</th>
+                  <th>' . get_lang('LastName').'</th>
+                  <th>' . get_lang('Qualify').'</th>
                </tr>'
             );
         } else {
             $renderer->setHeaderTemplate(
                     '<tr>
-                   <th>' . get_lang('OfficialCode') . '</th>
-                  <th>' . get_lang('UserName') . '</th>
-                  <th>' . get_lang('LastName') . '</th>
-                  <th>' . get_lang('FirstName') . '</th>
-                  <th>' . get_lang('Qualify') . '</th>
+                   <th>' . get_lang('OfficialCode').'</th>
+                  <th>' . get_lang('UserName').'</th>
+                  <th>' . get_lang('LastName').'</th>
+                  <th>' . get_lang('FirstName').'</th>
+                  <th>' . get_lang('Qualify').'</th>
                </tr>'
             );
         }
@@ -275,7 +275,7 @@ 
         $firstUser = true;
         foreach ($tblusers as $user) {
 
-            $element_name = 'score[' . $user[0] . ']';
+            $element_name = 'score['.$user[0].']';
 
             $scoreColumnProperties = array('maxlength' => 5);
             if ($firstUser) {
@@ -290,19 +290,19 @@ 
             $this->addRule(array($element_name, 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
 
             if (api_is_western_name_order()) {
-                $user_info = '<td align="left" >' . $user[3] . '</td>';
-                $user_info .= '<td align="left" >' . $user[2] . '</td>';
+                $user_info = '<td align="left" >'.$user[3].'</td>';
+                $user_info .= '<td align="left" >'.$user[2].'</td>';
             } else {
-                $user_info = '<td align="left" >' . $user[2] . '</td>';
-                $user_info .= '<td align="left" >' . $user[3] . '</td>';
+                $user_info = '<td align="left" >'.$user[2].'</td>';
+                $user_info .= '<td align="left" >'.$user[3].'</td>';
             }
             $nr_users++;
 
             $template = '<tr>
-		      <td align="left" >' . $user[4] . '</td>
-		      <td align="left" >' . $user[1] . '</td>
-		      ' . $user_info . '
-		       <td align="left">{element} / ' . $this->evaluation_object->get_max() . '
+		      <td align="left" >' . $user[4].'</td>
+		      <td align="left" >' . $user[1].'</td>
+		      ' . $user_info.'
+		       <td align="left">{element} / ' . $this->evaluation_object->get_max().'
 		         <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
 		      </td>
             </tr>';
@@ -336,7 +336,7 @@ 
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
         $this->addElement('label', get_lang('User'), $userinfo['complete_name']);
 
-        $this->addText('score', array(get_lang('Score'), null, '/ ' . $this->evaluation_object->get_max()), false, array(
+        $this->addText('score', array(get_lang('Score'), null, '/ '.$this->evaluation_object->get_max()), false, array(
             'size' => '4',
             'class' => 'span1',
             'maxlength' => '5'
@@ -471,7 +471,7 @@ 
             }
         }
 
-        $this->addText('weight_mask', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">' . $all_categories[0]->get_weight() . '</span>] '), true, array(
+        $this->addText('weight_mask', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$all_categories[0]->get_weight().'</span>] '), true, array(
             'size' => '4',
             'maxlength' => '5',
             'class' => 'span1'
@@ -543,11 +543,11 @@ 
             $link = LinkFactory :: get_evaluation_link($this->evaluation_object->get_id());
             $doc_url = $link->get_view_url($id);
             if ($doc_url != null) {
-                $opendocurl_start .= '<a href="' . $doc_url . '" target="_blank">';
+                $opendocurl_start .= '<a href="'.$doc_url.'" target="_blank">';
                 $opendocurl_end = '</a>';
             }
         }
-        return $opendocurl_start . api_get_person_name($firstname, $lastname) . ' (' . $username . ')' . $opendocurl_end;
+        return $opendocurl_start.api_get_person_name($firstname, $lastname).' ('.$username.')'.$opendocurl_end;
     }
 
     function sort_by_user($item1, $item2)