chamilo / chamilo-lms

main/gradebook/gradebook_add_eval.php

Spacing +6 added lines, -6 removed lines

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

main/gradebook/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

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 UserForm($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 UserForm($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 UserForm($form_type, $user, $form_name, $method= 'post', $action= null)
+	public function UserForm($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);
 	}

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();

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);
 

Spacing +123 added lines, -123 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 . '">' .
-                    Display::return_icon(('back.png'), get_lang('FolderView'), '', ICON_SIZE_MEDIUM) . '</a>';
+                $header .= '<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$selectcat.'">'.
+                    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?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?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() . '?&selecteval=' . $evalobj->get_id() . '&import=">' .
-                        Display::return_icon('import_evaluation.png', get_lang('ImportResult'), '', ICON_SIZE_MEDIUM) . '</a>';
+                    $header .= '<a href="'.api_get_self().'?&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() . '?&selecteval=' . $evalobj->get_id() . '&export=">' .
-                        Display::return_icon('export_evaluation.png', get_lang('ExportResult'), '', ICON_SIZE_MEDIUM) . '</a>';
+                    $header .= '<a href="'.api_get_self().'?&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?selecteval=' . $evalobj->get_id() . '">' .
-                            Display::return_icon('edit.png', get_lang('EditResult'), '', ICON_SIZE_MEDIUM) . '</a>';
-                        $header .= '<a href="' . api_get_self() . '?&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?selecteval='.$evalobj->get_id().'">'.
+                            Display::return_icon('edit.png', get_lang('EditResult'), '', ICON_SIZE_MEDIUM).'</a>';
+                        $header .= '<a href="'.api_get_self().'?&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() . '?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().'?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?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?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,18 +89,18 @@ 
         }
 
         $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('Course').' :<b> '.$course.'</b><br />';
         //'<br>' . get_lang('Weight') . ' :<b> ' . $evalobj->get_weight() . '</b><br>' . get_lang('Visible') . ' :<b> ' . $visible . '</b>
-        $evalinfo .= get_lang('QualificationNumeric') . ' :<b> ' . $evalobj->get_max() . '</b><br>' . $average;
+        $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') {
@@ -110,7 +110,7 @@ 
         }
         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><img style="float:right; position:relative;" src="../img/tutorial.gif"></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,26 +137,26 @@ 
                 $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() . '"><img src="../img/gradebook.gif" border="0" alt="' . get_lang('Up') . '" /></a></td>';
+            $header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?selectcat='.$catobj->get_parent_id().'"><img src="../img/gradebook.gif" border="0" alt="'.get_lang('Up').'" /></a></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() . '"><img src=../img/icons/32/pdf.png alt=' . get_lang('ExportPDF') . '/> ' . get_lang('ExportPDF') . '</a>';
-        $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?print=&selectcat=' . $catobj->get_id() . '" target="_blank"><img src="../img/icons/32/printer.png" alt=' . get_lang('Print') . '/> ' . get_lang('Print') . '</a>';
+        $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().'"><img src=../img/icons/32/pdf.png alt='.get_lang('ExportPDF').'/> '.get_lang('ExportPDF').'</a>';
+        $header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?print=&selectcat='.$catobj->get_id().'" target="_blank"><img src="../img/icons/32/printer.png" alt='.get_lang('Print').'/> '.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;
     }
@@ -177,23 +177,23 @@ 
             $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']) : '';
         $perPage = isset($_GET['flatviewlist_per_page']) ? intval($_GET['flatviewlist_per_page']) : '';
         $offset = isset($_GET['offset']) ? $_GET['offset'] : '0';
 
-        $header .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&export_format=csv&export_report=export_report&selectcat=' . $catobj->get_id() . '">' .
-            Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM) . '</a>';
-        $header .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&export_format=xls&export_report=export_report&selectcat=' . $catobj->get_id() . '">' .
-            Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM) . '</a>';
-        $header .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&export_format=doc&export_report=export_report&selectcat=' . $catobj->get_id() . '">' .
-            Display::return_icon('export_doc.png', get_lang('ExportAsDOC'), '', ICON_SIZE_MEDIUM) . '</a>';
-        $header .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&print=&selectcat=' . $catobj->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().'&exportpdf=&selectcat=' . $catobj->get_id().'&offset='.$offset.'&flatviewlist_page_nr='.$pageNum.'&flatviewlist_per_page='.$perPage.'" >' .
-            Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM) . '</a>';
+        $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&export_format=csv&export_report=export_report&selectcat='.$catobj->get_id().'">'.
+            Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
+        $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&export_format=xls&export_report=export_report&selectcat='.$catobj->get_id().'">'.
+            Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>';
+        $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&export_format=doc&export_report=export_report&selectcat='.$catobj->get_id().'">'.
+            Display::return_icon('export_doc.png', get_lang('ExportAsDOC'), '', ICON_SIZE_MEDIUM).'</a>';
+        $header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&print=&selectcat='.$catobj->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().'&exportpdf=&selectcat='.$catobj->get_id().'&offset='.$offset.'&flatviewlist_page_nr='.$pageNum.'&flatviewlist_per_page='.$perPage.'" >'.
+            Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
         $header .= '</div>';
         echo $header;
     }
@@ -234,8 +234,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);
@@ -244,9 +244,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);
         }
@@ -256,9 +256,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();
 
@@ -271,15 +271,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>';
             }
@@ -293,11 +293,11 @@ 
                     //$header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat=' . $catobj->get_id() . '"><img src="../img/view_list.gif" alt="' . get_lang('FlatView') . '" /> ' . get_lang('FlatView') . '</a>';
                 }
             } else {
-                $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank"><img src="../img/icons/32/pdf.png" alt="' . get_lang('ExportPDF') . '" /> ' . get_lang('ExportPDF') . '</a>';
+                $header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&exportpdf=&selectcat='.$catobj->get_id().'" target="_blank"><img src="../img/icons/32/pdf.png" alt="'.get_lang('ExportPDF').'" /> '.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">';
@@ -327,7 +327,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 ($show_add_link && !$message_resource) {
                     //$header .= '<td><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>';
@@ -346,28 +346,28 @@ 
                     $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>';
                     //$modify_icons .= '<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>';
                     //hide or delete are not options available
                     //$modify_icons .= '&nbsp;<a  href="' . api_get_self() . '?visiblecat=' . $catobj->get_id() . '&amp;' . $visibility_command . '=&amp;selectcat=0 ">'.Display::return_icon($visibility_icon.'.png', get_lang('Visible'),'',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;
@@ -479,7 +479,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);
@@ -490,10 +490,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();
 
@@ -506,15 +506,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>';
             }
@@ -531,11 +531,11 @@ 
                     //$header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat=' . $catobj->get_id() . '"><img src="../img/view_list.gif" alt="' . get_lang('FlatView') . '" /> ' . get_lang('FlatView') . '</a>';
                 }
             } else {
-                $header .= '<td style="vertical-align: top;"><a href="' . api_get_self() . '?' . api_get_cidreq() . '&studentoverview=&exportpdf=&selectcat=' . $catobj->get_id() . '" target="_blank">
-							<img src="../img/icons/32/pdf.png" alt="' . get_lang('ExportPDF') . '" /> ' . get_lang('ExportPDF') . '</a>';
+                $header .= '<td style="vertical-align: top;"><a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&exportpdf=&selectcat='.$catobj->get_id().'" target="_blank">
+							<img src="../img/icons/32/pdf.png" alt="' . get_lang('ExportPDF').'" /> '.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
@@ -547,33 +547,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(
@@ -583,7 +583,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'])
                             );
                     }
 
@@ -594,30 +594,30 @@ 
                                     '',
                                     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(
@@ -626,26 +626,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)){
-            echo $toolbar = Display::toolbarAction('gradebook-actions', array(0 => $actionsLeft, 1 => $actionsRight ));
+        if (api_is_allowed_to_edit(null, true)) {
+            echo $toolbar = Display::toolbarAction('gradebook-actions', array(0 => $actionsLeft, 1 => $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());
@@ -673,24 +673,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;
     }
 
@@ -717,8 +717,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, '.', ' ');
@@ -733,17 +733,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>';
 

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);
         }

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/resulttable.class.php

Indentation +149 added lines, -149 removed lines

@@ -10,162 +10,162 @@
  */
 class ResultTable extends SortableTable
 {
-	private $datagen;
-	private $evaluation;
-	private $allresults;
-	private $iscourse;
-
-	/**
-	 * Constructor
-	 */
+    private $datagen;
+    private $evaluation;
+    private $allresults;
+    private $iscourse;
+
+    /**
+     * Constructor
+     */
     public function ResultTable ($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
-	{
-    	parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
-
-		$this->datagen = new ResultsDataGenerator($evaluation, $results, true);
-
-		$this->evaluation = $evaluation;
-		$this->iscourse = $iscourse;
-		$this->forprint = $forprint;
-
-		if (isset ($addparams))  {
-			$this->set_additional_parameters($addparams);
-		}
-		$scoredisplay = ScoreDisplay :: instance();
-		$column= 0;
-		if ($this->iscourse == '1') {
-			$this->set_header($column++, '', false);
-			$this->set_form_actions(array (
-					'delete' => get_lang('Delete')
-			));
-		}
-		if (api_is_western_name_order()) {
-			$this->set_header($column++, get_lang('FirstName'));
-			$this->set_header($column++, get_lang('LastName'));
-		} else {
-			$this->set_header($column++, get_lang('LastName'));
-			$this->set_header($column++, get_lang('FirstName'));
-		}
-		$this->set_header($column++, get_lang('Score'));
-		if ($scoredisplay->is_custom()) {
-			$this->set_header($column++, get_lang('Display'));
-		}
-		if (!$this->forprint) {
-			$this->set_header($column++, get_lang('Modify'),false);
-		}
+    {
+        parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
+
+        $this->datagen = new ResultsDataGenerator($evaluation, $results, true);
+
+        $this->evaluation = $evaluation;
+        $this->iscourse = $iscourse;
+        $this->forprint = $forprint;
+
+        if (isset ($addparams))  {
+            $this->set_additional_parameters($addparams);
+        }
+        $scoredisplay = ScoreDisplay :: instance();
+        $column= 0;
+        if ($this->iscourse == '1') {
+            $this->set_header($column++, '', false);
+            $this->set_form_actions(array (
+                    'delete' => get_lang('Delete')
+            ));
+        }
+        if (api_is_western_name_order()) {
+            $this->set_header($column++, get_lang('FirstName'));
+            $this->set_header($column++, get_lang('LastName'));
+        } else {
+            $this->set_header($column++, get_lang('LastName'));
+            $this->set_header($column++, get_lang('FirstName'));
+        }
+        $this->set_header($column++, get_lang('Score'));
+        if ($scoredisplay->is_custom()) {
+            $this->set_header($column++, get_lang('Display'));
+        }
+        if (!$this->forprint) {
+            $this->set_header($column++, get_lang('Modify'),false);
+        }
     }
 
 
-	/**
-	 * Function used by SortableTable to get total number of items in the table
-	 */
-	function get_total_number_of_items () {
-		return $this->datagen->get_total_results_count();
-	}
-
-	/**
-	 * Function used by SortableTable to generate the data to display
-	 */
-	function get_table_data ($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
-
-		$is_western_name_order = api_is_western_name_order();
-		$scoredisplay = ScoreDisplay :: instance();
-
-		// determine sorting type
-		$col_adjust = $this->iscourse == '1' ? 1 : 0;
-
-		switch ($this->column) {
-			// first name or last name
-			case (0 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				}
-				break;
+    /**
+     * Function used by SortableTable to get total number of items in the table
+     */
+    function get_total_number_of_items () {
+        return $this->datagen->get_total_results_count();
+    }
+
+    /**
+     * Function used by SortableTable to generate the data to display
+     */
+    function get_table_data ($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
+
+        $is_western_name_order = api_is_western_name_order();
+        $scoredisplay = ScoreDisplay :: instance();
+
+        // determine sorting type
+        $col_adjust = $this->iscourse == '1' ? 1 : 0;
+
+        switch ($this->column) {
             // first name or last name
-			case (1 + $col_adjust):
-				if ($is_western_name_order) {
-					$sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
-				} else {
-					$sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
-				}
-				break;
+            case (0 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                }
+                break;
+            // first name or last name
+            case (1 + $col_adjust):
+                if ($is_western_name_order) {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_LASTNAME;
+                } else {
+                    $sorting = ResultsDataGenerator :: RDG_SORT_FIRSTNAME;
+                }
+                break;
             //Score
-			case (2 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
-				break;
-			case (3 + $col_adjust):
-				$sorting = ResultsDataGenerator :: RDG_SORT_MASK;
-				break;
-		}
-
-		if ($this->direction == 'DESC') {
-			$sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
-		} else {
-			$sorting |= ResultsDataGenerator :: RDG_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 $item) {
-			$row = array ();
-			if ($this->iscourse == '1') {
-				 $row[] = $item['result_id'];
-			}
-			if ($is_western_name_order) {
-				$row[] = $item['firstname'];
-				$row[] = $item['lastname'];
-			} else {
-				$row[] = $item['lastname'];
-				$row[] = $item['firstname'];
-			}
-
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+            case (2 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_SCORE;
+                break;
+            case (3 + $col_adjust):
+                $sorting = ResultsDataGenerator :: RDG_SORT_MASK;
+                break;
+        }
+
+        if ($this->direction == 'DESC') {
+            $sorting |= ResultsDataGenerator :: RDG_SORT_DESC;
+        } else {
+            $sorting |= ResultsDataGenerator :: RDG_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 $item) {
+            $row = array ();
+            if ($this->iscourse == '1') {
+                    $row[] = $item['result_id'];
+            }
+            if ($is_western_name_order) {
+                $row[] = $item['firstname'];
+                $row[] = $item['lastname'];
+            } else {
+                $row[] = $item['lastname'];
+                $row[] = $item['firstname'];
+            }
+
+            $row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
-			if ($scoredisplay->is_custom()) {
-				$row[] = $item['display'];
-			}
-			if (!$this->forprint) {
-				$row[] = $this->build_edit_column ($item);
-			}
-			$sortable_data[] = $row;
-		}
-
-		return $sortable_data;
-	}
-
-	private function build_edit_column ($item)
-	{
-		$status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
-		$locked_status = $this->evaluation->get_locked();
-		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
-			//api_is_course_admin()
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
-		}
-		if ($this->evaluation->get_course_code() == null) {
-			$edit_column.= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">
+            if ($scoredisplay->is_custom()) {
+                $row[] = $item['display'];
+            }
+            if (!$this->forprint) {
+                $row[] = $this->build_edit_column ($item);
+            }
+            $sortable_data[] = $row;
+        }
+
+        return $sortable_data;
+    }
+
+    private function build_edit_column ($item)
+    {
+        $status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
+        $locked_status = $this->evaluation->get_locked();
+        if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
+            //api_is_course_admin()
+            $edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
+            $edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+                Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+        }
+        if ($this->evaluation->get_course_code() == null) {
+            $edit_column.= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">
 			<img src="../img/delete.gif" border="0" title="' . get_lang('Delete') . '" alt="" /></a>';
-		    $edit_column.= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">
+            $edit_column.= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">
 		    <img src="../img/statistics.gif" width="17px" border="0" title="' . get_lang('Statistics') . '" alt="" /></a>';
-		}
-		// Evaluation's origin is a link
-		if ($this->evaluation->get_category_id() < 0) {
-			$link = LinkFactory :: get_evaluation_link ($this->evaluation->get_id());
-
-			$doc_url = $link->get_view_url($item['id']);
-
-			if ($doc_url != null) {
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">'
-								.'<img src="'. api_get_path(WEB_CODE_PATH) . 'img/link.gif" border="0" title="' . get_lang('OpenDocument') . '" alt="" />'
-								.'</a>';
-			}
-		}
-		return $edit_column;
-	}
+        }
+        // Evaluation's origin is a link
+        if ($this->evaluation->get_category_id() < 0) {
+            $link = LinkFactory :: get_evaluation_link ($this->evaluation->get_id());
+
+            $doc_url = $link->get_view_url($item['id']);
+
+            if ($doc_url != null) {
+                $edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">'
+                                .'<img src="'. api_get_path(WEB_CODE_PATH) . 'img/link.gif" border="0" title="' . get_lang('OpenDocument') . '" alt="" />'
+                                .'</a>';
+            }
+        }
+        return $edit_column;
+    }
 }

Spacing +24 added lines, -24 removed lines

@@ -18,9 +18,9 @@ 
 	/**
 	 * Constructor
 	 */
-    public function ResultTable ($evaluation, $results = array(), $iscourse, $addparams = null,$forprint = false)
+    public function ResultTable($evaluation, $results = array(), $iscourse, $addparams = null, $forprint = false)
 	{
-    	parent :: __construct ('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
+    	parent :: __construct('resultlist', null, null, (api_is_western_name_order() xor api_sort_by_first_name()) ? 2 : 1);
 
 		$this->datagen = new ResultsDataGenerator($evaluation, $results, true);
 
@@ -28,14 +28,14 @@ 
 		$this->iscourse = $iscourse;
 		$this->forprint = $forprint;
 
-		if (isset ($addparams))  {
+		if (isset ($addparams)) {
 			$this->set_additional_parameters($addparams);
 		}
 		$scoredisplay = ScoreDisplay :: instance();
-		$column= 0;
+		$column = 0;
 		if ($this->iscourse == '1') {
 			$this->set_header($column++, '', false);
-			$this->set_form_actions(array (
+			$this->set_form_actions(array(
 					'delete' => get_lang('Delete')
 			));
 		}
@@ -51,7 +51,7 @@ 
 			$this->set_header($column++, get_lang('Display'));
 		}
 		if (!$this->forprint) {
-			$this->set_header($column++, get_lang('Modify'),false);
+			$this->set_header($column++, get_lang('Modify'), false);
 		}
     }
 
@@ -59,14 +59,14 @@ 
 	/**
 	 * Function used by SortableTable to get total number of items in the table
 	 */
-	function get_total_number_of_items () {
+	function get_total_number_of_items() {
 		return $this->datagen->get_total_results_count();
 	}
 
 	/**
 	 * Function used by SortableTable to generate the data to display
 	 */
-	function get_table_data ($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
+	function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null) {
 
 		$is_western_name_order = api_is_western_name_order();
 		$scoredisplay = ScoreDisplay :: instance();
@@ -111,7 +111,7 @@ 
 		// generate the data to display
 		$sortable_data = array();
 		foreach ($data_array as $item) {
-			$row = array ();
+			$row = array();
 			if ($this->iscourse == '1') {
 				 $row[] = $item['result_id'];
 			}
@@ -123,13 +123,13 @@ 
 				$row[] = $item['firstname'];
 			}
 
-			$row[] =  Display::bar_progress($item['percentage_score'], false, $item['score']);
+			$row[] = Display::bar_progress($item['percentage_score'], false, $item['score']);
             //$row[] =  Display::bar_progress($item['percentage_score'], true);
 			if ($scoredisplay->is_custom()) {
 				$row[] = $item['display'];
 			}
 			if (!$this->forprint) {
-				$row[] = $this->build_edit_column ($item);
+				$row[] = $this->build_edit_column($item);
 			}
 			$sortable_data[] = $row;
 		}
@@ -137,32 +137,32 @@ 
 		return $sortable_data;
 	}
 
-	private function build_edit_column ($item)
+	private function build_edit_column($item)
 	{
-		$status=CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
+		$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
 		$locked_status = $this->evaluation->get_locked();
 		if (api_is_allowed_to_edit(null, true) && $locked_status == 0) {
 			//api_is_course_admin()
-			$edit_column = '<a href="' . api_get_self() . '?editres=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('edit.png', get_lang('Modify'),'','22').'</a>';
-			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id().'&'.api_get_cidreq().'">'.
-				Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
+			$edit_column = '<a href="'.api_get_self().'?editres='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+				Display::return_icon('edit.png', get_lang('Modify'), '', '22').'</a>';
+			$edit_column .= ' <a href="'.api_get_self().'?delete_mark='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">'.
+				Display::return_icon('delete.png', get_lang('Delete'), '', '22').'</a>';
 		}
 		if ($this->evaluation->get_course_code() == null) {
-			$edit_column.= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">
-			<img src="../img/delete.gif" border="0" title="' . get_lang('Delete') . '" alt="" /></a>';
-		    $edit_column.= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">
-		    <img src="../img/statistics.gif" width="17px" border="0" title="' . get_lang('Statistics') . '" alt="" /></a>';
+			$edit_column .= '&nbsp;<a href="'.api_get_self().'?resultdelete='.$item['result_id'].'&selecteval='.$this->evaluation->get_id().'" onclick="return confirmationuser();">
+			<img src="../img/delete.gif" border="0" title="' . get_lang('Delete').'" alt="" /></a>';
+		    $edit_column .= '&nbsp;<a href="user_stats.php?userid='.$item['id'].'&selecteval='.$this->evaluation->get_id().'&'.api_get_cidreq().'">
+		    <img src="../img/statistics.gif" width="17px" border="0" title="' . get_lang('Statistics').'" alt="" /></a>';
 		}
 		// Evaluation's origin is a link
 		if ($this->evaluation->get_category_id() < 0) {
-			$link = LinkFactory :: get_evaluation_link ($this->evaluation->get_id());
+			$link = LinkFactory :: get_evaluation_link($this->evaluation->get_id());
 
 			$doc_url = $link->get_view_url($item['id']);
 
 			if ($doc_url != null) {
-				$edit_column .= '&nbsp;<a href="'. $doc_url . '" target="_blank">'
-								.'<img src="'. api_get_path(WEB_CODE_PATH) . 'img/link.gif" border="0" title="' . get_lang('OpenDocument') . '" alt="" />'
+				$edit_column .= '&nbsp;<a href="'.$doc_url.'" target="_blank">'
+								.'<img src="'.api_get_path(WEB_CODE_PATH).'img/link.gif" border="0" title="'.get_lang('OpenDocument').'" alt="" />'
 								.'</a>';
 			}
 		}

main/gradebook/lib/fe/exportgradebook.php

Spacing +33 added lines, -33 removed lines

@@ -11,8 +11,8 @@ 
  * @param	string	View to print as a title for the table
  * @param	string	Course name to print as title for the table
  */
-function print_table ($data_array,$header_names,$view,$coursename) {
-	$printdata= '<!DOCTYPE html
+function print_table($data_array, $header_names, $view, $coursename) {
+	$printdata = '<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.api_get_language_isocode().'" lang="'.api_get_language_isocode().'">
@@ -97,7 +97,7 @@ 
 
 	$mpdf = new mPDF('UTF-8', 'A4-L', '', '', 15, 10, 35, 20, 4, 2, 'L');
 	$mpdf->useOnlyCoreFonts = true;
-	$mpdf->mirrorMargins = 0;      // Use different Odd/Even headers and footers and mirror margins
+	$mpdf->mirrorMargins = 0; // Use different Odd/Even headers and footers and mirror margins
 
 	if (is_array($headers_pdf)) {
 		// preparing headers pdf
@@ -144,13 +144,13 @@ 
 		$css = '';
 	}
 
-	if(count($data_table) > 30)
-		$items_per_page = (count($data_table)/2);
+	if (count($data_table) > 30)
+		$items_per_page = (count($data_table) / 2);
 	else
 		$items_per_page = count($data_table);
 
 	$count_pages = ceil(count($data_table) / $items_per_page);
-	for ($x = 0; $x<$count_pages; $x++) {
+	for ($x = 0; $x < $count_pages; $x++) {
 		$content_table .= '<table width="100%" border="1" style="border-collapse:collapse">';
 		// header table
 		$content_table .= '<tr>';
@@ -159,7 +159,7 @@ 
 
 			foreach ($headers_table as $head_table) {
 				if (!empty($head_table[0])) {
-					$width = (!empty($head_table[1])?$head_table[1].'%':'');
+					$width = (!empty($head_table[1]) ? $head_table[1].'%' : '');
 					$content_table .= '<th width="'.$width.'">'.$head_table[0].'</th>';
 					$i++;
 				}
@@ -168,16 +168,16 @@ 
 		$content_table .= '</tr>';
 		// body table
 		if (is_array($data_table) && count($data_table) > 0) {
-			$offset = $x*$items_per_page;
-			$data_table = array_slice ($data_table, $offset, count($data_table));
+			$offset = $x * $items_per_page;
+			$data_table = array_slice($data_table, $offset, count($data_table));
 			$i = 1;
-			$item = $offset+1;
+			$item = $offset + 1;
 			foreach ($data_table as $data) {
 				$content_table .= '<tr>';
-				$content_table .= '<td>'.($item<10?'0'.$item:$item).'</td>';
+				$content_table .= '<td>'.($item < 10 ? '0'.$item : $item).'</td>';
 				foreach ($data as  $key => $content) {
 					if (isset($content)) {
-						$key == 1 ? $align='align="left"':$align='align="center"';
+						$key == 1 ? $align = 'align="left"' : $align = 'align="center"';
 						$content_table .= '<td '.$align.' style="padding:4px;" >'.$content.'</td>';
 					}
 				}
@@ -226,12 +226,12 @@ 
 		// preparing headers pdf
 		$header = '<br/><br/><table width="100%" cellspacing="1" cellpadding="5" border="0" class="strong">
 					        <tr><td width="100%" style="text-align: center;" class="title" colspan="4"><h1>'.$title_pdf.'</h1></td></tr>';
-		foreach($headers_pdf as $header_pdf) {
+		foreach ($headers_pdf as $header_pdf) {
 			if (!empty($header_pdf[0]) && !empty($header_pdf[1])) {
-				$header.= '<tr><td><strong>'.$header_pdf[0].'</strong> </td><td>'.$header_pdf[1].'</td></tr>';
+				$header .= '<tr><td><strong>'.$header_pdf[0].'</strong> </td><td>'.$header_pdf[1].'</td></tr>';
 			}
 		}
-		$header.='</table><br />';
+		$header .= '</table><br />';
 	}
 
 	// preparing footer pdf
@@ -255,7 +255,7 @@ 
 	}
 	$items_per_page = 30;
 	$count_pages = ceil(count($data_table) / $items_per_page);
-	for ($x = 0; $x<$count_pages; $x++) {
+	for ($x = 0; $x < $count_pages; $x++) {
 		$content_table .= '<table width="100%" border="1" style="border-collapse:collapse">';
 		// header table
 		$content_table .= '<tr>';
@@ -263,7 +263,7 @@ 
 		if (is_array($headers_table)) {
 			foreach ($headers_table as $head_table) {
 				if (!empty($head_table[0])) {
-					$width = (!empty($head_table[1])?$head_table[1].'%':'');
+					$width = (!empty($head_table[1]) ? $head_table[1].'%' : '');
 					$content_table .= '<th width="'.$width.'">'.$head_table[0].'</th>';
 					$i++;
 				}
@@ -273,16 +273,16 @@ 
 		// body table
 
 		if (is_array($data_table) && count($data_table) > 0) {
-			$offset = $x*$items_per_page;
-			$data_table = array_slice ($data_table, $offset, count($data_table));
+			$offset = $x * $items_per_page;
+			$data_table = array_slice($data_table, $offset, count($data_table));
 			$i = 1;
-			$item = $offset+1;
+			$item = $offset + 1;
 			foreach ($data_table as $data) {
 				$content_table .= '<tr>';
-				$content_table .= '<td>'.($item<10?'0'.$item:$item).'</td>';
+				$content_table .= '<td>'.($item < 10 ? '0'.$item : $item).'</td>';
 				foreach ($data as  $key => $content) {
 					if (isset($content)) {
-						$key == 1 ? $align='align="left"':$align='align="center"';
+						$key == 1 ? $align = 'align="left"' : $align = 'align="center"';
 						$content_table .= '<td '.$align.' style="padding:4px;" >'.$content.'</td>';
 					}
 				}
@@ -300,7 +300,7 @@ 
 	$pdf = new PDF();
 	$pdf->set_custom_footer($footer);
 	$pdf->set_custom_header($headers_in_pdf);
-	$pdf->content_to_pdf($header.$content_table, $css, $title_pdf );
+	$pdf->content_to_pdf($header.$content_table, $css, $title_pdf);
 	exit;
 
 }
@@ -312,21 +312,21 @@ 
  * @param	array		Table headers
  * @param	string		Format (portrait or landscape)
  */
-function export_pdf($pdf,$newarray,$header_names,$format) {
+function export_pdf($pdf, $newarray, $header_names, $format) {
 	$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
-	$pdf->ezSetCmMargins(0,0,0,0);
-	$pdf->ezSetY(($format=='portrait')?'820':'570');
+	$pdf->ezSetCmMargins(0, 0, 0, 0);
+	$pdf->ezSetY(($format == 'portrait') ? '820' : '570');
 	$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
 	//$pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
-	if ($format=='portrait') {
-		$pdf->line(40,790,540,790);
-		$pdf->line(40,40,540,40);
+	if ($format == 'portrait') {
+		$pdf->line(40, 790, 540, 790);
+		$pdf->line(40, 40, 540, 40);
 	} else {
-		$pdf->line(40,540,790,540);
-		$pdf->line(40,40,790,40);
+		$pdf->line(40, 540, 790, 540);
+		$pdf->line(40, 40, 790, 40);
 	}
-	$pdf->ezSetY(($format=='portrait')?'750':'520');
-	$pdf->ezTable($newarray,$header_names,'',array('showHeadings'=>1,'shaded'=>1,'showLines'=>1,'rowGap'=>3,'width'=>(($format=='portrait')?'500':'750')));
+	$pdf->ezSetY(($format == 'portrait') ? '750' : '520');
+	$pdf->ezTable($newarray, $header_names, '', array('showHeadings'=>1, 'shaded'=>1, 'showLines'=>1, 'rowGap'=>3, 'width'=>(($format == 'portrait') ? '500' : '750')));
 	$pdf->ezStream();
 
 }

Braces +5 added lines, -4 removed lines

@@ -144,10 +144,11 @@
 		$css = '';
 	}
 
-	if(count($data_table) > 30)
-		$items_per_page = (count($data_table)/2);
-	else
-		$items_per_page = count($data_table);
+	if(count($data_table) > 30) {
+			$items_per_page = (count($data_table)/2);
+	} else {
+			$items_per_page = count($data_table);
+	}
 
 	$count_pages = ceil(count($data_table) / $items_per_page);
 	for ($x = 0; $x<$count_pages; $x++) {

Indentation +192 added lines, -192 removed lines

@@ -12,7 +12,7 @@ 
  * @param	string	Course name to print as title for the table
  */
 function print_table ($data_array,$header_names,$view,$coursename) {
-	$printdata= '<!DOCTYPE html
+    $printdata= '<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.api_get_language_isocode().'" lang="'.api_get_language_isocode().'">
@@ -64,24 +64,24 @@ 
 </head>
 <body dir="'.api_get_text_direction().'"><div id="main">';
 
-	$printdata .= '<h2>'.$view.' : '.$coursename.'</h2>';
-	//@todo not necessary here
-	//$printdata .= '<h3>'.get_lang('Date').' : '.api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).'</h3>';
-	$printdata .= '<table border="1" width="90%" cellspacing="1" cellpadding="1">';
-	foreach ($header_names as $header) {
-		$printdata .= '<th>'.$header.'</th>';
-	}
+    $printdata .= '<h2>'.$view.' : '.$coursename.'</h2>';
+    //@todo not necessary here
+    //$printdata .= '<h3>'.get_lang('Date').' : '.api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).'</h3>';
+    $printdata .= '<table border="1" width="90%" cellspacing="1" cellpadding="1">';
+    foreach ($header_names as $header) {
+        $printdata .= '<th>'.$header.'</th>';
+    }
 
-	foreach ($data_array as $data) {
-		$printdata .= '<tr>';
-		foreach ($data as $rowdata) {
-			$printdata .= '<td>'.$rowdata.'</td>';
-		}
-		$printdata .= '</tr>';
+    foreach ($data_array as $data) {
+        $printdata .= '<tr>';
+        foreach ($data as $rowdata) {
+            $printdata .= '<td>'.$rowdata.'</td>';
+        }
+        $printdata .= '</tr>';
 
-	}
-	$printdata .= '</table></div></body></html>';
-	return $printdata;
+    }
+    $printdata .= '</table></div></body></html>';
+    return $printdata;
 }
 
 
@@ -95,13 +95,13 @@ 
  */
 function export_pdf_attendance($headers_table, $data_table, $headers_pdf, $footers_pdf, $title_pdf) {
 
-	$mpdf = new mPDF('UTF-8', 'A4-L', '', '', 15, 10, 35, 20, 4, 2, 'L');
-	$mpdf->useOnlyCoreFonts = true;
-	$mpdf->mirrorMargins = 0;      // Use different Odd/Even headers and footers and mirror margins
+    $mpdf = new mPDF('UTF-8', 'A4-L', '', '', 15, 10, 35, 20, 4, 2, 'L');
+    $mpdf->useOnlyCoreFonts = true;
+    $mpdf->mirrorMargins = 0;      // Use different Odd/Even headers and footers and mirror margins
 
-	if (is_array($headers_pdf)) {
-		// preparing headers pdf
-		$header = '<table width="100%"  cellspacing="1" cellpadding="1" border="0" class="strong">
+    if (is_array($headers_pdf)) {
+        // preparing headers pdf
+        $header = '<table width="100%"  cellspacing="1" cellpadding="1" border="0" class="strong">
                                 <tr>
                                    <td ROWSPAN="3" style="text-align: left;" class="title"><img src="'.api_get_path(WEB_CSS_PATH).api_get_setting('stylesheets').'/images/header-logo.png"></td><td  colspan="3"><h1>'.$title_pdf.'</h1></td>
                                 <tr>
@@ -121,92 +121,92 @@ 
                                     <td><strong>'.$headers_pdf[5][0].'</strong> </td><td> <strong>'.$headers_pdf[5][1].'</strong></td>
                                 </tr>
                             </table>';
-	}
+    }
 
-	// preparing footer pdf
-	$footer = '<table width="100%" cellspacing="2" cellpadding="10" border="0">';
-	if (is_array($footers_pdf)) {
-		$footer .= '<tr>';
-		foreach ($footers_pdf as $foot_pdf) {
-			$footer .= '<td width="33%" style="text-align: center;">'.$foot_pdf.'</td>';
-		}
-		$footer .= '</tr>';
-	}
-	$footer .= '</table>';
+    // preparing footer pdf
+    $footer = '<table width="100%" cellspacing="2" cellpadding="10" border="0">';
+    if (is_array($footers_pdf)) {
+        $footer .= '<tr>';
+        foreach ($footers_pdf as $foot_pdf) {
+            $footer .= '<td width="33%" style="text-align: center;">'.$foot_pdf.'</td>';
+        }
+        $footer .= '</tr>';
+    }
+    $footer .= '</table>';
 
-	$footer .= '<div align="right" style="font-weight: bold;">{PAGENO}/{nb}</div>';
+    $footer .= '<div align="right" style="font-weight: bold;">{PAGENO}/{nb}</div>';
 
-	// preparing content pdf
-	$css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css';
-	if (file_exists($css_file)) {
-		$css = @file_get_contents($css_file);
-	} else {
-		$css = '';
-	}
+    // preparing content pdf
+    $css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css';
+    if (file_exists($css_file)) {
+        $css = @file_get_contents($css_file);
+    } else {
+        $css = '';
+    }
 
-	if(count($data_table) > 30)
-		$items_per_page = (count($data_table)/2);
-	else
-		$items_per_page = count($data_table);
+    if(count($data_table) > 30)
+        $items_per_page = (count($data_table)/2);
+    else
+        $items_per_page = count($data_table);
 
-	$count_pages = ceil(count($data_table) / $items_per_page);
-	for ($x = 0; $x<$count_pages; $x++) {
-		$content_table .= '<table width="100%" border="1" style="border-collapse:collapse">';
-		// header table
-		$content_table .= '<tr>';
-		$i = 0;
-		if (is_array($headers_table)) {
+    $count_pages = ceil(count($data_table) / $items_per_page);
+    for ($x = 0; $x<$count_pages; $x++) {
+        $content_table .= '<table width="100%" border="1" style="border-collapse:collapse">';
+        // header table
+        $content_table .= '<tr>';
+        $i = 0;
+        if (is_array($headers_table)) {
 
-			foreach ($headers_table as $head_table) {
-				if (!empty($head_table[0])) {
-					$width = (!empty($head_table[1])?$head_table[1].'%':'');
-					$content_table .= '<th width="'.$width.'">'.$head_table[0].'</th>';
-					$i++;
-				}
-			}
-		}
-		$content_table .= '</tr>';
-		// body table
-		if (is_array($data_table) && count($data_table) > 0) {
-			$offset = $x*$items_per_page;
-			$data_table = array_slice ($data_table, $offset, count($data_table));
-			$i = 1;
-			$item = $offset+1;
-			foreach ($data_table as $data) {
-				$content_table .= '<tr>';
-				$content_table .= '<td>'.($item<10?'0'.$item:$item).'</td>';
-				foreach ($data as  $key => $content) {
-					if (isset($content)) {
-						$key == 1 ? $align='align="left"':$align='align="center"';
-						$content_table .= '<td '.$align.' style="padding:4px;" >'.$content.'</td>';
-					}
-				}
-				$content_table .= '</tr>';
-				$i++;
-				$item++;
-				if ($i > $items_per_page) { break; }
-			}
-		} else {
-			$content_table .= '<tr colspan="'.$i.'"><td>'.get_lang('Empty').'</td></tr>';
-		}
-		$content_table .= '</table>';
-		if ($x < ($count_pages - 1)) { $content_table .= '<pagebreak />'; }
-	}
+            foreach ($headers_table as $head_table) {
+                if (!empty($head_table[0])) {
+                    $width = (!empty($head_table[1])?$head_table[1].'%':'');
+                    $content_table .= '<th width="'.$width.'">'.$head_table[0].'</th>';
+                    $i++;
+                }
+            }
+        }
+        $content_table .= '</tr>';
+        // body table
+        if (is_array($data_table) && count($data_table) > 0) {
+            $offset = $x*$items_per_page;
+            $data_table = array_slice ($data_table, $offset, count($data_table));
+            $i = 1;
+            $item = $offset+1;
+            foreach ($data_table as $data) {
+                $content_table .= '<tr>';
+                $content_table .= '<td>'.($item<10?'0'.$item:$item).'</td>';
+                foreach ($data as  $key => $content) {
+                    if (isset($content)) {
+                        $key == 1 ? $align='align="left"':$align='align="center"';
+                        $content_table .= '<td '.$align.' style="padding:4px;" >'.$content.'</td>';
+                    }
+                }
+                $content_table .= '</tr>';
+                $i++;
+                $item++;
+                if ($i > $items_per_page) { break; }
+            }
+        } else {
+            $content_table .= '<tr colspan="'.$i.'"><td>'.get_lang('Empty').'</td></tr>';
+        }
+        $content_table .= '</table>';
+        if ($x < ($count_pages - 1)) { $content_table .= '<pagebreak />'; }
+    }
 
-	$html = $content_table;
+    $html = $content_table;
 
 
-	// set attributes for pdf
-	$mpdf->SetHTMLHeader($header);
-	$mpdf->SetHTMLFooter($footer);
-	if (!empty($css)) {
-		$mpdf->WriteHTML($css, 1);
-		$mpdf->WriteHTML($html, 2);
-	} else {
-		$mpdf->WriteHTML($html);
-	}
-	$mpdf->Output(api_replace_dangerous_char($title_pdf.'.pdf'), 'D');
-	exit;
+    // set attributes for pdf
+    $mpdf->SetHTMLHeader($header);
+    $mpdf->SetHTMLFooter($footer);
+    if (!empty($css)) {
+        $mpdf->WriteHTML($css, 1);
+        $mpdf->WriteHTML($html, 2);
+    } else {
+        $mpdf->WriteHTML($html);
+    }
+    $mpdf->Output(api_replace_dangerous_char($title_pdf.'.pdf'), 'D');
+    exit;
 }
 
 
@@ -220,88 +220,88 @@ 
  */
 function export_pdf_with_html($headers_table, $data_table, $headers_pdf, $footers_pdf, $title_pdf)
 {
-	$headers_in_pdf = '<img src="'.api_get_path(WEB_CSS_PATH).api_get_setting('stylesheets').'/images/header-logo.png">';
+    $headers_in_pdf = '<img src="'.api_get_path(WEB_CSS_PATH).api_get_setting('stylesheets').'/images/header-logo.png">';
 
-	if (is_array($headers_pdf)) {
-		// preparing headers pdf
-		$header = '<br/><br/><table width="100%" cellspacing="1" cellpadding="5" border="0" class="strong">
+    if (is_array($headers_pdf)) {
+        // preparing headers pdf
+        $header = '<br/><br/><table width="100%" cellspacing="1" cellpadding="5" border="0" class="strong">
 					        <tr><td width="100%" style="text-align: center;" class="title" colspan="4"><h1>'.$title_pdf.'</h1></td></tr>';
-		foreach($headers_pdf as $header_pdf) {
-			if (!empty($header_pdf[0]) && !empty($header_pdf[1])) {
-				$header.= '<tr><td><strong>'.$header_pdf[0].'</strong> </td><td>'.$header_pdf[1].'</td></tr>';
-			}
-		}
-		$header.='</table><br />';
-	}
+        foreach($headers_pdf as $header_pdf) {
+            if (!empty($header_pdf[0]) && !empty($header_pdf[1])) {
+                $header.= '<tr><td><strong>'.$header_pdf[0].'</strong> </td><td>'.$header_pdf[1].'</td></tr>';
+            }
+        }
+        $header.='</table><br />';
+    }
 
-	// preparing footer pdf
-	$footer = '<table width="100%" cellspacing="2" cellpadding="10" border="0">';
-	if (is_array($footers_pdf)) {
-		$footer .= '<tr>';
-		foreach ($footers_pdf as $foot_pdf) {
-			$footer .= '<td width="33%" style="text-align: center;">'.$foot_pdf.'</td>';
-		}
-		$footer .= '</tr>';
-	}
-	$footer .= '</table>';
-	$footer .= '<div align="right" style="font-weight: bold;">{PAGENO}/{nb}</div>';
+    // preparing footer pdf
+    $footer = '<table width="100%" cellspacing="2" cellpadding="10" border="0">';
+    if (is_array($footers_pdf)) {
+        $footer .= '<tr>';
+        foreach ($footers_pdf as $foot_pdf) {
+            $footer .= '<td width="33%" style="text-align: center;">'.$foot_pdf.'</td>';
+        }
+        $footer .= '</tr>';
+    }
+    $footer .= '</table>';
+    $footer .= '<div align="right" style="font-weight: bold;">{PAGENO}/{nb}</div>';
 
-	// preparing content pdf
-	$css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css';
-	if (file_exists($css_file)) {
-		$css = @file_get_contents($css_file);
-	} else {
-		$css = '';
-	}
-	$items_per_page = 30;
-	$count_pages = ceil(count($data_table) / $items_per_page);
-	for ($x = 0; $x<$count_pages; $x++) {
-		$content_table .= '<table width="100%" border="1" style="border-collapse:collapse">';
-		// header table
-		$content_table .= '<tr>';
-		$i = 0;
-		if (is_array($headers_table)) {
-			foreach ($headers_table as $head_table) {
-				if (!empty($head_table[0])) {
-					$width = (!empty($head_table[1])?$head_table[1].'%':'');
-					$content_table .= '<th width="'.$width.'">'.$head_table[0].'</th>';
-					$i++;
-				}
-			}
-		}
-		$content_table .= '</tr>';
-		// body table
+    // preparing content pdf
+    $css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css';
+    if (file_exists($css_file)) {
+        $css = @file_get_contents($css_file);
+    } else {
+        $css = '';
+    }
+    $items_per_page = 30;
+    $count_pages = ceil(count($data_table) / $items_per_page);
+    for ($x = 0; $x<$count_pages; $x++) {
+        $content_table .= '<table width="100%" border="1" style="border-collapse:collapse">';
+        // header table
+        $content_table .= '<tr>';
+        $i = 0;
+        if (is_array($headers_table)) {
+            foreach ($headers_table as $head_table) {
+                if (!empty($head_table[0])) {
+                    $width = (!empty($head_table[1])?$head_table[1].'%':'');
+                    $content_table .= '<th width="'.$width.'">'.$head_table[0].'</th>';
+                    $i++;
+                }
+            }
+        }
+        $content_table .= '</tr>';
+        // body table
 
-		if (is_array($data_table) && count($data_table) > 0) {
-			$offset = $x*$items_per_page;
-			$data_table = array_slice ($data_table, $offset, count($data_table));
-			$i = 1;
-			$item = $offset+1;
-			foreach ($data_table as $data) {
-				$content_table .= '<tr>';
-				$content_table .= '<td>'.($item<10?'0'.$item:$item).'</td>';
-				foreach ($data as  $key => $content) {
-					if (isset($content)) {
-						$key == 1 ? $align='align="left"':$align='align="center"';
-						$content_table .= '<td '.$align.' style="padding:4px;" >'.$content.'</td>';
-					}
-				}
-				$content_table .= '</tr>';
-				$i++;
-				$item++;
-				if ($i > $items_per_page) { break; }
-			}
-		} else {
-			$content_table .= '<tr colspan="'.$i.'"><td>'.get_lang('Empty').'</td></tr>';
-		}
-		$content_table .= '</table>';
-		if ($x < ($count_pages - 1)) { $content_table .= '<pagebreak />'; }
-	}
-	$pdf = new PDF();
-	$pdf->set_custom_footer($footer);
-	$pdf->set_custom_header($headers_in_pdf);
-	$pdf->content_to_pdf($header.$content_table, $css, $title_pdf );
-	exit;
+        if (is_array($data_table) && count($data_table) > 0) {
+            $offset = $x*$items_per_page;
+            $data_table = array_slice ($data_table, $offset, count($data_table));
+            $i = 1;
+            $item = $offset+1;
+            foreach ($data_table as $data) {
+                $content_table .= '<tr>';
+                $content_table .= '<td>'.($item<10?'0'.$item:$item).'</td>';
+                foreach ($data as  $key => $content) {
+                    if (isset($content)) {
+                        $key == 1 ? $align='align="left"':$align='align="center"';
+                        $content_table .= '<td '.$align.' style="padding:4px;" >'.$content.'</td>';
+                    }
+                }
+                $content_table .= '</tr>';
+                $i++;
+                $item++;
+                if ($i > $items_per_page) { break; }
+            }
+        } else {
+            $content_table .= '<tr colspan="'.$i.'"><td>'.get_lang('Empty').'</td></tr>';
+        }
+        $content_table .= '</table>';
+        if ($x < ($count_pages - 1)) { $content_table .= '<pagebreak />'; }
+    }
+    $pdf = new PDF();
+    $pdf->set_custom_footer($footer);
+    $pdf->set_custom_header($headers_in_pdf);
+    $pdf->content_to_pdf($header.$content_table, $css, $title_pdf );
+    exit;
 
 }
 
@@ -313,20 +313,20 @@ 
  * @param	string		Format (portrait or landscape)
  */
 function export_pdf($pdf,$newarray,$header_names,$format) {
-	$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
-	$pdf->ezSetCmMargins(0,0,0,0);
-	$pdf->ezSetY(($format=='portrait')?'820':'570');
-	$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
-	//$pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
-	if ($format=='portrait') {
-		$pdf->line(40,790,540,790);
-		$pdf->line(40,40,540,40);
-	} else {
-		$pdf->line(40,540,790,540);
-		$pdf->line(40,40,790,40);
-	}
-	$pdf->ezSetY(($format=='portrait')?'750':'520');
-	$pdf->ezTable($newarray,$header_names,'',array('showHeadings'=>1,'shaded'=>1,'showLines'=>1,'rowGap'=>3,'width'=>(($format=='portrait')?'500':'750')));
-	$pdf->ezStream();
+    $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
+    $pdf->ezSetCmMargins(0,0,0,0);
+    $pdf->ezSetY(($format=='portrait')?'820':'570');
+    $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
+    //$pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
+    if ($format=='portrait') {
+        $pdf->line(40,790,540,790);
+        $pdf->line(40,40,540,40);
+    } else {
+        $pdf->line(40,540,790,540);
+        $pdf->line(40,40,790,40);
+    }
+    $pdf->ezSetY(($format=='portrait')?'750':'520');
+    $pdf->ezTable($newarray,$header_names,'',array('showHeadings'=>1,'shaded'=>1,'showLines'=>1,'rowGap'=>3,'width'=>(($format=='portrait')?'500':'750')));
+    $pdf->ezStream();
 
 }

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

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 LinkAddEditForm(
-		$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 LinkAddEditForm(
+        $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);
+    }
 }

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

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++;
             }