Browse Source

Minor - fixing PHP warnings.

Julio Montoya 11 years ago
parent
commit
7026425ca8

+ 117 - 108
main/gradebook/lib/fe/displaygradebook.php

@@ -19,7 +19,7 @@ class DisplayGradebook
 	*/
 	static function display_header_result($evalobj, $selectcat, $page) {
 		if (api_is_allowed_to_edit(null, true)) {
-			$header = '<div class="actions">';			
+			$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>';
     			if ($evalobj->get_course_code() == null) {
@@ -27,22 +27,22 @@ class DisplayGradebook
     				//$header .= '<a href="gradebook_add_user.php?selecteval=' . $evalobj->get_id() . '"><img src="../img/add_user_big.gif" alt="' . get_lang('AddStudent') . '" align="absmiddle" /> ' . get_lang('AddStudent') . '</a>';
     			} 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>';				
+    				'.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>';
-                    
+
                     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="' . 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>';
@@ -57,59 +57,59 @@ class DisplayGradebook
 		}
 
 		$scoredisplay = ScoreDisplay :: instance();
-        
+
         $student_score = '';
-        
+
 		if (($evalobj->has_results())){ // TODO this check needed ?
 			$score = $evalobj->calc_score();
-        
+
 			if ($score != null) {
                 $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));                            
-            }				
+                $student_score = Display::tag('h3', get_lang('Score').': '.$scoredisplay->display_score($student_score, SCORE_DIV_PERCENT));
+            }
 		}
-		
+
 		if (!$evalobj->get_description() == '') {
 			$description= get_lang('Description') . ' :<b> ' . $evalobj->get_description() . '</b><br>';
 		}
-        
+
 		if ($evalobj->get_course_code() == null) {
 			$course= get_lang('CourseIndependent');
 		} else {
 			$course= get_course_name_from_code($evalobj->get_course_code());
 		}
-    
+
 		$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 />';
 		//'<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;
-        
+
         if (!api_is_allowed_to_edit()) {
             $evalinfo .= $student_score;
         }
-                
+
 		if (!$evalobj->has_results()) {
 			$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') {    
+                if ($page != 'statistics') {
                     //$evalinfo .= '<br /><br /><a href="gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'"> '.Display::return_icon(('evaluation_rate.png'),get_lang('ViewResult'),'',ICON_SIZE_MEDIUM) . '</a>';
                 }
             }
         }
-        if ($page != 'statistics') {    
+        if ($page != 'statistics') {
             if (api_is_allowed_to_edit(null, true)) {
                 $evalinfo .= '<br /><a href="gradebook_statistics.php?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>';        
+        $evalinfo .= '</td><td><img style="float:right; position:relative;" src="../img/tutorial.gif"></td></table>';
 		echo $evalinfo;
 		echo $header;
 	}
-    
+
 	/**
 	* Displays the header for the flatview page containing filters
 	* @param $catobj
@@ -166,9 +166,9 @@ class DisplayGradebook
         } else {
             $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>';
+
 
 		// this MUST be a GET variable not a POST
 		if (isset($_GET['show'])) {
@@ -181,25 +181,25 @@ class DisplayGradebook
 		$header .= '<a href="' . api_get_self() . '?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() . '?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() . '?exportpdf=&selectcat=' . $catobj->get_id() . '" >'.Display::return_icon('pdf.png', get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a>';
-		$header .= '</div>';		
+		$header .= '</div>';
 		echo $header;
-	}	
-	
+	}
+
 	function display_header_gradebook_per_gradebook($catobj, $showtree, $selectcat, $is_course_admin, $is_platform_admin, $simple_search_form, $show_add_qualification = true, $show_add_link = true) {
 		// Student
 		$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
 		$objcat = new Category();
 		$course_id = Database::get_course_by_category($selectcat);
 		$message_resource=$objcat->show_message_resource_delete($course_id);
-		
+
 		if (!$is_course_admin && $status<>1 && $selectcat<>0) {
 			$user_id = api_get_user_id();
 			$user= get_user_info_from_id($user_id);
-		
+
 			$catcourse= Category :: load($catobj->get_id());
 			$scoredisplay = ScoreDisplay :: instance();
 			$scorecourse = $catcourse[0]->calc_score($user_id);
-		
+
 			// generating the total score for a course
 			$allevals= $catcourse[0]->get_evaluations($user_id,true);
 			$alllinks= $catcourse[0]->get_links($user_id,true);
@@ -211,23 +211,23 @@ class DisplayGradebook
 				$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_total+=$item->get_weight();
 			}
 			$item_value = number_format($item_value, 2, '.', ' ');
 			$total_score=array($item_value,$item_total);
 			$scorecourse_display = $scoredisplay->display_score($total_score, SCORE_DIV_PERCENT);
-		
+
 			$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 />';
 			if ((!$catobj->get_id() == '0') && (!isset ($_GET['studentoverview'])) && (!isset ($_GET['search']))) {
 				$scoreinfo.= '<h2>'.get_lang('Total') . ' : ' . $scorecourse_display . '</h2>';
-			}		
+			}
 			Display :: display_normal_message($scoreinfo, false);
 		}
-        
-		// show navigation tree and buttons?		
+
+		// show navigation tree and buttons?
 		$header = '<div class="actions"><table border=0>';
 		if (($showtree == '1') || (isset ($_GET['studentoverview']))) {
 			$header .= '<tr>';
@@ -237,10 +237,10 @@ class DisplayGradebook
 			$header .= '<td style=" ">' . get_lang('CurrentCategory') . '</td>' .
 							'<td style=" "><form name="selector"><select name="selectcat" onchange="document.selector.submit()">';
 			$cats= Category :: load();
-		
+
 			$tree= $cats[0]->get_tree();
 			unset ($cats);
-				
+
 			foreach ($tree as $cat) {
 				for ($i= 0; $i < $cat[2]; $i++) {
 					$line .= '&mdash;';
@@ -274,20 +274,20 @@ class DisplayGradebook
 			$header .= '</td></tr>';
 		}
 		$header.='</table></div>';
-		
+
 		// for course admin & platform admin add item buttons are added to the header
 		$header .= '<div class="actions">';
-		
+
 		$my_category = $catobj->shows_all_information_an_category($catobj->get_id());
 		$user_id     = api_get_user_id();
 		$course_code = $my_category['course_code'];
 		$status_user = api_get_status_of_user_in_course ($user_id,$course_code);
-		
+
 		//$header .= '<a href="gradebook_add_cat.php?'.api_get_cidreq().'&selectcat=0"><img src="../img/folder_new.gif" alt="' . get_lang('AddGradebook') . '" /></a></td>';
-		
+
 		if (api_is_allowed_to_edit(null, true)) {
 			if ($selectcat == '0') {
-				if ($show_add_qualification === true) {						
+				if ($show_add_qualification === true) {
 				}
 				if ($show_add_link) {
 					//$header .= '<td><a href="gradebook_add_eval.php?'.api_get_cidreq().'"><img src="../img/filenew.gif" alt="' . get_lang('NewEvaluation') . '" /> ' . get_lang('NewEvaluation') . '</a>';
@@ -307,45 +307,45 @@ class DisplayGradebook
 					if ($cats[0]->get_course_code() != null && !$message_resource) {
 						//$header .= '<td><a href="gradebook_add_link.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>';
 						//$header .= '<td><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 {
 					//	$header .= '<td><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) {
 					$myname = $catobj->shows_all_information_an_category($catobj->get_id());
-		
+
 					$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>';
-						
+
 					$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().'">'.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>';	
-	
+					//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>';
-					}					 
+					}
 					$header .= Display::div($modify_icons, array('class'=>'right'));
-						
+
 				}
 			}
 		} elseif (isset ($_GET['search'])) {
 			$header .= '<b>'.get_lang('SearchResults').' :</b>';
 		}
 		$header .= '</div>';
-		echo $header;		
+		echo $header;
 	}
-    
+
 	/**
 	 * Displays the header for the gradebook containing the navigation tree and links
 	 * @param category_object $currentcat
@@ -356,21 +356,30 @@ class DisplayGradebook
      * @param boolean Whether to show or not the link to add a new item inside the qualification (we hide it in case of the course-embedded tool where we have only one calification per course or session)
      * @return void Everything is printed on screen upon closing
 	 */
-	static function display_header_gradebook($catobj, $showtree, $selectcat, $is_course_admin, $is_platform_admin, $simple_search_form, $show_add_qualification = true, $show_add_link = true) {
-		//student
+	static function display_header_gradebook(
+        $catobj,
+        $showtree,
+        $selectcat,
+        $is_course_admin,
+        $is_platform_admin,
+        $simple_search_form,
+        $show_add_qualification = true,
+        $show_add_link = true
+    ) {
+		// Student.
 		$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
 		$objcat = new Category();
 		$course_id = Database::get_course_by_category($selectcat);
 		$message_resource = $objcat->show_message_resource_delete($course_id);
-        
         $grade_model_id = $catobj->get_grade_model_id();
-        
+        $header = null;
+
         //@todo move these in a function
         $sum_categories_weight_array = array();
-        if (isset($catobj) && !empty($catobj)) {            
+        if (isset($catobj) && !empty($catobj)) {
             $categories = Category::load(null, null, null, $catobj->get_id());
             if (!empty($categories)) {
-                foreach ($categories as $category) {                  
+                foreach ($categories as $category) {
                     $sum_categories_weight_array[$category->get_id()] = $category->get_weight();
                 }
             } else {
@@ -382,30 +391,30 @@ class DisplayGradebook
 			$user_id = api_get_user_id();
 			$catcourse	  = Category::load($catobj->get_id());
             $main_weight = $catcourse[0]->get_weight();
-			$scoredisplay = ScoreDisplay :: instance();			
+			$scoredisplay = ScoreDisplay :: instance();
 
 			// generating the total score for a course
 			$allevals= $catcourse[0]->get_evaluations($user_id,true);
 			$alllinks= $catcourse[0]->get_links($user_id,true);
 			$evals_links = array_merge($allevals, $alllinks);
-            
+
 			$item_value =0;
 			$item_total = 0;
-            $item_total_value = 0;     
-            
+            $item_total_value = 0;
+
 			for ($count=0; $count < count($evals_links); $count++) {
 				$item           = $evals_links[$count];
 				$score          = $item->calc_score($user_id);
                 $divide			= ( ($score[1])==0 ) ? 1 : $score[1];
-                
-                $sub_cat_percentage = $sum_categories_weight_array[$item->get_category_id()];                
+
+                $sub_cat_percentage = $sum_categories_weight_array[$item->get_category_id()];
                 //$item_value     = $score[0]/$divide;
                 $item_value     = $score[0]/$divide*$item->get_weight()*$sub_cat_percentage/$main_weight;
                 $item_value_total +=$item_value;
-			}            
+			}
             $item_total = $main_weight;
-            
-			$total_score = array($item_value_total, $item_total);       
+
+			$total_score = array($item_value_total, $item_total);
 			$scorecourse_display = $scoredisplay->display_score($total_score, SCORE_DIV_PERCENT);
 
 			if ((!$catobj->get_id() == '0') && (!isset ($_GET['studentoverview'])) && (!isset ($_GET['search']))) {
@@ -413,10 +422,10 @@ class DisplayGradebook
 			}
 			Display :: display_normal_message($scoreinfo, false);
 		}
-        
-		// show navigation tree and buttons?		
+
+		// show navigation tree and buttons?
 		if (($showtree == '1') || (isset ($_GET['studentoverview']))) {
-            $header = '<div class="actions"><table>';            
+            $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>';
@@ -425,14 +434,14 @@ class DisplayGradebook
 					'<td><form name="selector"><select name="selectcat" onchange="document.selector.submit()">';
 			$cats= Category :: load();
 
-			$tree= $cats[0]->get_tree();            
+			$tree= $cats[0]->get_tree();
 			unset ($cats);
-			
+
 			foreach ($tree as $cat) {
 				for ($i= 0; $i < $cat[2]; $i++) {
 					$line .= '&mdash;';
 				}
-				$line=isset($line) ? $line : '';
+				$line = isset($line) ? $line : '';
 				if (isset($_GET['selectcat']) && $_GET['selectcat'] == $cat[0]) {
 					$header .= '<option selected value=' . $cat[0] . '>' . $line . ' ' . $cat[1] . '</option>';
 				} else {
@@ -461,25 +470,25 @@ class DisplayGradebook
 			}
 			$header .= '</td></tr>';
             $header.='</table></div>';
-		}		
+		}
 
 		// for course admin & platform admin add item buttons are added to the header
 		$header .= '<div class="actions">';
-		
+
 		$my_category = $catobj->shows_all_information_an_category($catobj->get_id());
 		$user_id     = api_get_user_id();
-        
-		//$course_code = $my_category['course_code'];        
+
+		//$course_code = $my_category['course_code'];
 		//$status_user = api_get_status_of_user_in_course ($user_id,$course_code);
-		
+
 		if (api_is_allowed_to_edit(null, true)) {
-            
+
             if (empty($grade_model_id) || $grade_model_id == -1) {
-                $header .= '<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>';			
+                $header .= '<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') {
-                if ($show_add_qualification === true) {				   
+                if ($show_add_qualification === true) {
                 }
                 if ($show_add_link) {
 				    //$header .= '<td><a href="gradebook_add_eval.php?'.api_get_cidreq().'"><img src="../img/filenew.gif" alt="' . get_lang('NewEvaluation') . '" /> ' . get_lang('NewEvaluation') . '</a>';
@@ -489,14 +498,14 @@ class DisplayGradebook
     				//$header .= '<a href="gradebook_add_cat.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '" ><img src="../img/folder_new.gif" alt="' . get_lang('NewSubCategory') . '" align="absmiddle" /> ' . get_lang('NewSubCategory') . '</a></td>';
                 }
                 $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'];
 				}
                 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>';
-                    $cats = Category :: load($selectcat);                    
+                    $cats = Category :: load($selectcat);
                     if ($cats[0]->get_course_code() != null && !$message_resource) {
                         //$header .= '<td><a href="gradebook_add_link.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '"><img src="../img/link.gif" alt="' . get_lang('MakeLink') . '" align="absmiddle" /> ' . get_lang('MakeLink') . '</a>';
                         $header .= '<td><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>';
@@ -507,50 +516,50 @@ class DisplayGradebook
 
                 if (!$message_resource) {
                 	//$myname = $catobj->shows_all_information_an_category($catobj->get_id());
-                 	
+
                 	//$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_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().'&amp;cidReq='.$catobj->get_course_code().'">'.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>';
-            		
+
                     if (empty($categories)) {
                         $modify_icons .= '<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') {
                         $modify_icons .= '<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>';
                     }
-            		$header .= Display::div($modify_icons, array('class'=>'right'));					
+            		$header .= Display::div($modify_icons, array('class'=>'right'));
                 }
 			}
 		} elseif (isset ($_GET['search'])) {
 			$header .= '<b>'.get_lang('SearchResults').' :</b>';
 		}
 		$header .= '</div>';
-        
-		echo $header;		
-		
+
+		echo $header;
+
 		if (api_is_allowed_to_edit(null, true)) {
-    	    $weight = ((intval($catobj->get_weight())>0) ? $catobj->get_weight() : 0);                        			
+    	    $weight = ((intval($catobj->get_weight())>0) ? $catobj->get_weight() : 0);
     		$weight            = get_lang('TotalWeight').' : '.$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 class="right_link" href="gradebook_edit_cat.php?editcat='.$catobj->get_id().'&amp;cidReq='.$catobj->get_course_code().'">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
             //$msg = Display::tag('h3', $weight.' - '.$min_certification);
             $msg = Display::tag('h4', $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());
@@ -617,7 +626,7 @@ class DisplayGradebook
 		$item_value = number_format($item_value, 2, '.', ' ');
 		$total_score=array($item_value,$item_total);
 		$scorecourse_display = $scoredisplay->display_score($total_score,SCORE_DIV_PERCENT);
-		
+
 		//$scorecourse_display = (isset($scorecourse) ? $scoredisplay->display_score($scorecourse,SCORE_AVERAGE) : get_lang('NoResultsAvailable'));
 		$cattotal = Category :: load(0);
 		$scoretotal= $cattotal[0]->calc_score($user_id);
@@ -633,16 +642,16 @@ class DisplayGradebook
 		 //limit display width to 200px
  			$img_attributes .= 'width="200" ';
 		}
-		$info = '<div class="row"><div class="span3">';        
+		$info = '<div class="row"><div class="span3">';
         $info .= '<div class="thumbnail"><img ' . $img_attributes . '/></div>';
-        $info .= '</div>';        
+        $info .= '</div>';
         $info .= '<div class="span6">';
 		$info .= get_lang('Name') . ' :  <a target="_blank" href="'.api_get_path(WEB_CODE_PATH).'social/profile.php?u=' . $userid . '"> ' . api_get_person_name($user['firstname'], $user['lastname']) . '</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('TotalUser') . ' : <b>' . $scorecourse_display . '</b>';
 		$info .= '</div>';
         $info .= '</div>';
@@ -651,6 +660,6 @@ class DisplayGradebook
 		//$scoreinfo.= '<br />'.get_lang('Total') . ' : <b>' . $scorecourse_display . '</b>';
 
 		//$scoreinfo.= '<br />'.get_lang('Total') . ' : <b>' . $scoretotal_display . '</b>';
-        echo $info;		
+        echo $info;
 	}
 }

+ 113 - 113
main/gradebook/lib/fe/gradebooktable.class.php

@@ -32,21 +32,21 @@ class GradebookTable extends SortableTable {
     	parent :: __construct ('gradebooklist', null, null, (api_is_allowed_to_edit()?1:0));
 		$this->evals_links = array_merge($evals, $links);
 		$this->currentcat = $currentcat;
-        $this->cats = $cats;		
-		$this->datagen = new GradebookDataGenerator($cats, $evals, $links);								
-        
+        $this->cats = $cats;
+		$this->datagen = new GradebookDataGenerator($cats, $evals, $links);
+
 		if (isset($addparams)) {
 			$this->set_additional_parameters($addparams);
 		}
-		
+
 		$column= 0;
 		if (api_is_allowed_to_edit(null, true)) {
 			$this->set_header($column++,'','','width="25px"');
 		}
-		
+
 		$this->set_header($column++, get_lang('Type'),'','width="35px"');
 		$this->set_header($column++, get_lang('Name'), false);
-        
+
         $this->set_header($column++, get_lang('Description'), false);
 
 		if (api_is_allowed_to_edit(null, true)) {
@@ -54,26 +54,26 @@ class GradebookTable extends SortableTable {
 		} else {
 			$this->set_header($column++, get_lang('Weight'), false);
 			$this->set_header($column++, get_lang('Result'), false);
-                        
+
             if (!empty($cats)) {
                 $this->set_header($column++, get_lang('Actions'), false);
-            }            
+            }
 		}
         //Desactivates the odd/even alt rows in order that the +/- buttons work see #4047
-        
+
         $this->odd_even_rows_enabled = false;
-		
+
 		/*if (api_is_allowed_to_edit(null, true)) {
 			//$this->set_header($column++, get_lang('CreationDate'),true, 'width="100px"');
 		} elseif (($status<>1)  && !api_is_allowed_to_edit() && (!isset($_GET['selectcat']) || $_GET['selectcat']==0)) {
 			//$this->set_header($column++, get_lang('Date'),true, 'width="100px"');
 		}*/
-		
+
 		//admins get an edit column
 		if (api_is_allowed_to_edit(null, true)) {
 			$this->set_header($column++, get_lang('Modify'), false, 'width="195px"');
 			//actions on multiple selected documents
-			$this->set_form_actions(array (				
+			$this->set_form_actions(array (
 				'setvisible' => get_lang('SetVisible'),
 				'setinvisible' => get_lang('SetInvisible'),
                 'deleted' => get_lang('DeleteSelected')
@@ -82,14 +82,14 @@ class GradebookTable extends SortableTable {
 	 	    if (empty($_GET['selectcat']) &&  !api_is_allowed_to_edit()) {
 			    $this->set_header($column++, get_lang('Certificates'),false);
 	 	    } else {
-	 	    	//$evals_links = array_merge($evals, $links);	 	    	
+	 	    	//$evals_links = array_merge($evals, $links);
 	 	    	//if (count($evals_links)>0) {
              	    //$this->set_header($column++, get_lang('Results'), false);
              	//}
 	 	    }
 		}
     }
-    
+
     function get_data() {
         return $this->datagen;
     }
@@ -105,15 +105,15 @@ class GradebookTable extends SortableTable {
      * 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) {
-            
+
         //variables load in index.php
         global $my_score_in_gradebook, $certificate_min_score;
         $scoretotal = 0;
         // determine sorting type
         $col_adjust = (api_is_allowed_to_edit() ? 1 : 0);
-        // By id        
+        // By id
         $this->column = 5;
-        
+
         switch ($this->column) {
             // Type
             case (0 + $col_adjust) :
@@ -130,45 +130,45 @@ class GradebookTable extends SortableTable {
                 break;
             case (4 + $col_adjust) :
                 $sorting = GradebookDataGenerator :: GDG_SORT_DATE;
-            case (5 + $col_adjust) :                
-                $sorting = GradebookDataGenerator :: GDG_SORT_ID;                
+            case (5 + $col_adjust) :
+                $sorting = GradebookDataGenerator :: GDG_SORT_ID;
                 break;
         }
-        
+
         if ($this->direction == 'DESC') {
             $sorting |= GradebookDataGenerator :: GDG_SORT_DESC;
         } else {
             $sorting |= GradebookDataGenerator :: GDG_SORT_ASC;
         }
-        
+
         //status of user in course
         $user_id        = api_get_user_id();
         $course_code    = api_get_course_id();
         $session_id     = api_get_session_id();
         $status_user    = api_get_status_of_user_in_course($user_id, $course_code);
-        
-        $data_array     = $this->datagen->get_data($sorting, $from, $this->per_page);        
+
+        $data_array     = $this->datagen->get_data($sorting, $from, $this->per_page);
 
         // generate the data to display
         $sortable_data = array();
         $weight_total_links = 0;
-        
-        $main_categories = array();        
+
+        $main_categories = array();
         $main_cat =  Category :: load(null, null, $course_code, null, null, $session_id, false);
-        
-        $total_categories_weight = 0;        
+
+        $total_categories_weight = 0;
         $scoredisplay = ScoreDisplay :: instance();
-        
+
         //Categories
-        
+
         foreach ($data_array as $data) {
-            
+
             // list of items inside the gradebook (exercises, lps, forums, etc)
             $row  = array();
             $item = $item_category = $data[0];
-            
-            $id   = $item->get_id();                            
-                        
+
+            $id   = $item->get_id();
+
             //if the item is invisible, wrap it in a span with class invisible
             $invisibility_span_open  = (api_is_allowed_to_edit() && $item->is_visible() == '0') ? '<span class="invisible">' : '';
             $invisibility_span_close = (api_is_allowed_to_edit() && $item->is_visible() == '0') ? '</span>' : '';
@@ -177,47 +177,47 @@ class GradebookTable extends SortableTable {
                 //id
                 $row[] = $this->build_id_column($item);
             }
-            
+
             //Type
             $row[] = $this->build_type_column($item);
-            
+
             //Name
             if (get_class($item) == 'Category') {
                 $row[] = $invisibility_span_open.'<h3>'.$item->get_name().'</h3>'.$invisibility_span_close;
-                $main_categories[$item->get_id()]['name'] = $item->get_name();                
+                $main_categories[$item->get_id()]['name'] = $item->get_name();
             } else {
                 $row[] = $invisibility_span_open.$this->build_name_link($item) . $invisibility_span_close;
-                $main_categories[$item->get_id()]['name'] = $this->build_name_link($item);                
+                $main_categories[$item->get_id()]['name'] = $this->build_name_link($item);
             }
-            
+
             $main_categories[$item->get_id()]['weight']= $item->get_weight();
             $total_categories_weight += $item->get_weight();
-            
+
             //Description
-            $row[] = $invisibility_span_open.$data[2].$invisibility_span_close;            
-                        
+            $row[] = $invisibility_span_open.$data[2].$invisibility_span_close;
+
             //Weight
-            //$row[] = $invisibility_span_open .Display::tag('h4', $data['3'] .' / '.$this->currentcat->get_weight()).$invisibility_span_close;        
+            //$row[] = $invisibility_span_open .Display::tag('h4', $data['3'] .' / '.$this->currentcat->get_weight()).$invisibility_span_close;
             //$average = $data['3']/$this->currentcat->get_weight()*100;
-                    
+
             $average = $scoredisplay->display_score(array($data['3'], $this->currentcat->get_weight()), SCORE_SIMPLE, SCORE_BOTH, true);
-            
+
             if (api_is_allowed_to_edit(null, true)) {
-                $row[] = $invisibility_span_open .Display::tag('h4', $average).$invisibility_span_close;        
+                $row[] = $invisibility_span_open .Display::tag('h4', $average).$invisibility_span_close;
             } else {
-                $row[] = $invisibility_span_open .$average.$invisibility_span_close;        
+                $row[] = $invisibility_span_open .$average.$invisibility_span_close;
             }
-            
+
             $category_weight = $item->get_weight();
-                
+
             if (api_is_allowed_to_edit(null, true)) {
                 $weight_total_links += $data[3];
             } else {
                 $cattotal   = Category :: load($_GET['selectcat']);
-                $scoretotal = $cattotal[0]->calc_score(api_get_user_id());                
+                $scoretotal = $cattotal[0]->calc_score(api_get_user_id());
                 $item_value = $scoredisplay->display_score($scoretotal, SCORE_SIMPLE);
             }
-                        
+
             //Date
             //$row[] = $invisibility_span_open.$data[4].$invisibility_span_close;
 
@@ -226,102 +226,102 @@ class GradebookTable extends SortableTable {
                 $cat = new Category();
                 $show_message = $cat->show_message_resource_delete($item->get_course_code());
                 if ($show_message === false) {
-                    $row[] = $this->build_edit_column($item); 
+                    $row[] = $this->build_edit_column($item);
                 }
             } else {
-                //students get the results and certificates columns                
-                if (count($this->evals_links) > 0 && $status_user != 1) {                    
-                    $value_data = isset($data[4]) ? $data[4] : null;                    
-                    if (!is_null($value_data)) {                        
+                //students get the results and certificates columns
+                if (count($this->evals_links) > 0 && $status_user != 1) {
+                    $value_data = isset($data[4]) ? $data[4] : null;
+                    if (!is_null($value_data)) {
                         $row[] = Display::tag('h4', $value_data);
-                    } else {                        
-                        $row[] = $this->build_edit_column($item);     
+                    } else {
+                        $row[] = $this->build_edit_column($item);
                     }
-                } else {     
-                    $score = $item->calc_score(api_get_user_id());                    
+                } else {
+                    $score = $item->calc_score(api_get_user_id());
                     if (!empty($score[1])) {
                         $complete_score = $scoredisplay->display_score($score, SCORE_DIV_PERCENT);
-                        $score = $score[0]/$score[1]*$item->get_weight();                    
+                        $score = $score[0]/$score[1]*$item->get_weight();
                         $score = $scoredisplay->display_score(array($score, null), SCORE_SIMPLE);
                         $row[] = Display::tip($score, $complete_score);
                     } else {
                         $row[] = '-';
                     }
-                    
+
                     if (!empty($this->cats)) {
                         $row[] = $this->build_edit_column($item);
                     }
                 }
             }
-            
+
             //Category added
             $sortable_data[] = $row;
-                        
+
             // Loading childrens
-            
+
             if (get_class($item) == 'Category') {
-                
+
                 $stud_id        = api_get_user_id();
                 $course_code    = api_get_course_id();
                 $session_id        = api_get_session_id();
                 $parent_id      = $item->get_id();
-                
+
                 $cats = Category :: load ($parent_id, null, null, null, null, null);
-            
-                $allcat  = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);                
-                $alleval = $cats[0]->get_evaluations($stud_id);            
+
+                $allcat  = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
+                $alleval = $cats[0]->get_evaluations($stud_id);
                 $alllink = $cats[0]->get_links($stud_id);
-                
+
                 $sub_cat_info = new GradebookDataGenerator($allcat, $alleval, $alllink);
-                $data_array  =  $sub_cat_info->get_data($sorting, $from, $this->per_page);                
-                
+                $data_array  =  $sub_cat_info->get_data($sorting, $from, $this->per_page);
+
                 $total_weight = 0;
-                
+
                 //Links
-                
+
                 foreach ($data_array as $data) {
                     $row  = array();
                     $item = $data[0];
-                    $id   = $item->get_id();                            
-                                
+                    $id   = $item->get_id();
+
                     //if the item is invisible, wrap it in a span with class invisible
                     $invisibility_span_open  = (api_is_allowed_to_edit() && $item->is_visible() == '0') ? '<span class="invisible">' : '';
-                    $invisibility_span_close = (api_is_allowed_to_edit() && $item->is_visible() == '0') ? '</span>' : '';        
-                    
+                    $invisibility_span_close = (api_is_allowed_to_edit() && $item->is_visible() == '0') ? '</span>' : '';
+
                     $main_categories[$parent_id]['children'][$item->get_id()]['name']   = $item->get_name();
                     $main_categories[$parent_id]['children'][$item->get_id()]['weight'] = $item->get_weight();
-                    
+
                     if (api_is_allowed_to_edit(null, true)) {
                         $row[] = $this->build_id_column($item);
                     }
-                    
+
                     $row[] = $this->build_type_column($item, array('style' => 'padding-left:5px'));
-                    
+
                     //Name
                     $row[] = $invisibility_span_open."&nbsp;&nbsp;&nbsp;  ".$this->build_name_link($item) . $invisibility_span_close;
-                    
+
                     //Description
-                    $row[] = $invisibility_span_open.$data[2].$invisibility_span_close;            
-                    
-                    //Weight                    
-                    //$weight = $data[3]/$category_weight*$main_cat[0]->get_weight();                    
-                    /*$weight = $category_weight * $data[3] / $main_cat[0]->get_weight();        
+                    $row[] = $invisibility_span_open.$data[2].$invisibility_span_close;
+
+                    //Weight
+                    //$weight = $data[3]/$category_weight*$main_cat[0]->get_weight();
+                    /*$weight = $category_weight * $data[3] / $main_cat[0]->get_weight();
                     $weight = $main_cat[0]->get_weight()*$weight/$category_weight;*/
-                    
+
                     $weight = $data[3];
-                    
+
                     //$extra = " - $data[3]  $category_weight -".$main_cat[0]->get_weight();
-                                                
+
                     $total_weight += $weight;
-                    
-                    $row[] = $invisibility_span_open.$weight.$extra.$invisibility_span_close;
-                    
-                    if (api_is_allowed_to_edit(null, true)) {                    
+
+                    $row[] = $invisibility_span_open.$weight.$invisibility_span_close;
+
+                    if (api_is_allowed_to_edit(null, true)) {
                         //$weight_total_links += intval($data[3]);
                     } else {
                         $cattotal   = Category :: load($_GET['selectcat']);
-                        $scoretotal = $cattotal[0]->calc_score(api_get_user_id());                    
-                        $item_value = $scoretotal[0];                        
+                        $scoretotal = $cattotal[0]->calc_score(api_get_user_id());
+                        $item_value = $scoretotal[0];
                     }
 
                     //Date
@@ -397,7 +397,7 @@ class GradebookTable extends SortableTable {
                 $weight_category = intval($this->build_weight($category[0]));
                 $course_code = $this->build_course_code($category[0]);
                 $weight_total_links  = round($weight_total_links);
-                
+
                 if ($weight_total_links > $weight_category || $weight_total_links < $weight_category || $weight_total_links > $weight_category) {
                     $warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category);
                     $modify_icons  = '<a class="right_link" href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'">'.Display::return_icon('edit.png', $warning_message, array(), ICON_SIZE_SMALL).'</a>';
@@ -454,20 +454,20 @@ class GradebookTable extends SortableTable {
                     }
                 }
             }
-        }        
+        }
         return $sortable_data;
     }
 
     // Other functions
-    
+
     private function build_certificate_min_score ($item) {
         return $item->get_certificate_min_score();
     }
-    
+
     private function build_weight ($item) {
         return $item->get_weight();
     }
-    
+
     private function build_course_code ($item) {
     	return $item->get_course_code();
     }
@@ -489,9 +489,9 @@ class GradebookTable extends SortableTable {
 	private function build_type_column ($item, $attributes = array()) {
 		return build_type_icon_tag($item->get_icon_name(), $attributes);
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * Generate name column
 	 * @param unknown_type $item
 	 * @return string
@@ -518,9 +518,9 @@ class GradebookTable extends SortableTable {
 				 		. ($item->is_course() ? ' &nbsp;[' . $item->get_course_code() . ']'.$show_message : '');
 			// evaluation
 			case 'E' :
-				$cat = new Category();				
+				$cat = new Category();
 				$course_id = Database::get_course_by_category($_GET['selectcat']);
-                
+
 				$show_message = $cat->show_message_resource_delete($course_id);
 
 				// course/platform admin can go to the view_results page
@@ -530,7 +530,7 @@ class GradebookTable extends SortableTable {
 						return '&nbsp;'
 							. '<a href="gradebook_view_result.php?cidReq='.$course_id.'&amp;selecteval=' . $item->get_id() . '">'
 							. $item->get_name()
-							. '</a>';						
+							. '</a>';
 					} else {
 						return '&nbsp;'
 							. '<a href="gradebook_view_result.php?cidReq='.$course_id.'&amp;selecteval=' . $item->get_id() . '">'
@@ -555,13 +555,13 @@ class GradebookTable extends SortableTable {
 				}
 			// link
 			case 'L' :
-				$cat 			= new Category();				
-				$course_id	 	= Database::get_course_by_category($_GET['selectcat']);				
-				$show_message	= $cat->show_message_resource_delete($course_id);				
+				$cat 			= new Category();
+				$course_id	 	= Database::get_course_by_category($_GET['selectcat']);
+				$show_message	= $cat->show_message_resource_delete($course_id);
 
 				$url = $item->get_link();
-				
-				if (isset($url) && $show_message===false) {	                    
+
+				if (isset($url) && $show_message===false) {
 					$text = '&nbsp;<a href="' . $item->get_link() . '">'
 							. $item->get_name()
 							. '</a>';
@@ -577,8 +577,8 @@ class GradebookTable extends SortableTable {
 				return $text;
 		}
 	}
-	
-	private function build_edit_column($item) {        
+
+	private function build_edit_column($item) {
 		switch ($item->get_item_type()) {
 			// category
 			case 'C' :

+ 4 - 2
main/gradebook/lib/gradebook_functions.inc.php

@@ -199,11 +199,12 @@ function get_icon_file_name($type) {
  * @param object $cat category object
  * @param int $selectcat id of selected category
  */
-function build_edit_icons_cat($cat, $selectcat) {
+function build_edit_icons_cat($cat, $selectcat)
+{
     $show_message = $cat->show_message_resource_delete($cat->get_course_code());
     $grade_model_id = $selectcat->get_grade_model_id();
-
     $selectcat = $selectcat->get_id();
+    $modify_icons = null;
 
     if ($show_message === false) {
         $visibility_icon = ($cat->is_visible() == 0) ? 'invisible' : 'visible';
@@ -258,6 +259,7 @@ function build_edit_icons_cat($cat, $selectcat) {
                 $modify_icons .= '&nbsp;<a href="' . api_get_self() . '?deletecat=' . $cat->get_id() . '&amp;selectcat=' . $selectcat . '&amp;cidReq=' . $cat->get_course_code() . '" onclick="return confirmation();">' . Display::return_icon('delete.png', get_lang('DeleteAll'), '', ICON_SIZE_SMALL) . '</a>';
             }
         }
+
         return $modify_icons;
     }
 }