From 9b8eb632d7b03e02db7664d3a29160d367cd2898 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 25 Sep 2013 15:30:53 +0200
Subject: [PATCH] Minor - format code

---
 main/cron/import_csv.php |   6 +-
 main/gradebook/index.php | 128 +++++++++++++++++++--------------------
 2 files changed, 68 insertions(+), 66 deletions(-)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index 7ea40ada00..431b26eb3f 100644
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -705,10 +705,12 @@ $import->run();
 
 /*
 
-$command = "sudo find ".api_get_path(SYS_COURSE_PATH)." -type d -exec chmod 777";
+$command = "sudo find ".api_get_path(SYS_COURSE_PATH)." -type d -exec chmod 777 {} \; ";
+echo "Executing: ".$command.PHP_EOL;
 system($command);
 
-$command = "sudo find ".api_get_path(SYS_CODE_PATH)."upload/users  -type d -exec chmod 777";
+$command = "sudo find ".api_get_path(SYS_CODE_PATH)."upload/users  -type d -exec chmod 777 {} \;";
+echo "Executing: ".$command.PHP_EOL;
 system($command);
 
 */
diff --git a/main/gradebook/index.php b/main/gradebook/index.php
index d62927006c..ca1c4c9c57 100644
--- a/main/gradebook/index.php
+++ b/main/gradebook/index.php
@@ -45,7 +45,7 @@ $htmlHeadXtra[] = api_get_js('jqplot/jquery.jqplot.min.js');
 $htmlHeadXtra[] = api_get_js('jqplot/plugins/jqplot.donutRenderer.min.js');*/
 
 $htmlHeadXtra[] = '<script>
-    
+
 var show_icon = "../img/view_more_stats.gif";
 var hide_icon = "../img/view_less_stats.gif";
 
@@ -53,28 +53,28 @@ $(document).ready(function() {
 
     $(".view_children").live("click", function() {
         var id = $(this).attr("data-cat-id");
-        $(".hidden_"+id).removeClass("hidden");    
-        $(this).removeClass("view_children");        
-        $(this).find("img").attr("src", hide_icon);        
+        $(".hidden_"+id).removeClass("hidden");
+        $(this).removeClass("view_children");
+        $(this).find("img").attr("src", hide_icon);
         $(this).attr("class", "hide_children");
     });
 
-    $(".hide_children").live("click", function(event) {    
-        var id = $(this).attr("data-cat-id");        
-        $(".hidden_"+id).addClass("hidden");    
+    $(".hide_children").live("click", function(event) {
+        var id = $(this).attr("data-cat-id");
+        $(".hidden_"+id).addClass("hidden");
         $(this).removeClass("hide_children");
         $(this).addClass("view_children");
         $(this).find("img").attr("src", show_icon);
     });
- 
-    
-    
+
+
+
 
 /*
   var s1 = [["a",25]];
   var s2 = [["a", 0], ["a", 10], ["a", 10], ["a", 5]];
-     
-  var plot3 = $.jqplot("chart3", [s1, s2], {        
+
+  var plot3 = $.jqplot("chart3", [s1, s2], {
   colors: ["#000", "#fff"],
     seriesDefaults: {
       // make this a donut chart.
@@ -88,7 +88,7 @@ $(document).ready(function() {
         // By default, data labels show the percentage of the donut/pie.
         // You can show the data "value" or data "label" instead.
         dataLabels: "value"
-        
+
       }
     }
   });*/
@@ -120,7 +120,7 @@ $filter_warning_msg = true;
 
 ///direct access to one evaluation
 $cats = Category :: load(null, null, $course_code, null, null, $session_id, false); //already init
-$first_time = null; 
+$first_time = null;
 if (empty($cats)) {
 	$cats = Category :: load(0, null, $course_code, null, null, $session_id, false);//first time
 	$first_time=1;
@@ -139,8 +139,8 @@ if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['st
 	//Introduction tool: student view
 	Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
 
-	$category= $_GET['selectcat'];		
-	
+	$category= $_GET['selectcat'];
+
 	$cats = Category :: load ($category, null, null, null, null, null, false);
 	$allcat= $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
 	$alleval= $cats[0]->get_evaluations($stud_id);
@@ -312,7 +312,7 @@ if (isset($_GET['deletecat'])) {
 		}
 	}
 	$confirmation_message = get_lang('CategoryDeleted');
-	$filter_confirm_msg = false;   
+	$filter_confirm_msg = false;
 }
 //parameters for evaluations
 if (isset ($_GET['visibleeval'])) {
@@ -349,8 +349,8 @@ if (isset($_GET['lockedeval'])) {
 	if ($eval[0] != null) {
 		$eval[0]->lock($type_locked);
 	}
-	
-	$filter_confirm_msg = false;	
+
+	$filter_confirm_msg = false;
 
 }
 if (isset ($_GET['deleteeval'])) {
@@ -395,11 +395,11 @@ if (isset ($_GET['deletelink'])) {
 		$link= LinkFactory :: load($get_delete_link);
 		if ($link[0] != null) {
 			// clean forum qualify
-			$sql = 'UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify="" 
+			$sql = 'UPDATE '.$tbl_forum_thread.' SET thread_qualify_max=0,thread_weight=0,thread_title_qualify=""
 					WHERE c_id = '.$course_id.' AND thread_id = (SELECT ref_id FROM '.$tbl_grade_links.' WHERE id='.$get_delete_link.' AND type = '.LINK_FORUM_THREAD.');';
 			Database::query($sql);
 			// clean attendance
-			$sql = 'UPDATE '.$tbl_attendance.' SET attendance_qualify_max=0, attendance_weight = 0, attendance_qualify_title="" 
+			$sql = 'UPDATE '.$tbl_attendance.' SET attendance_qualify_max=0, attendance_weight = 0, attendance_qualify_title=""
 				 	WHERE c_id = '.$course_id.' AND id = (SELECT ref_id FROM '.$tbl_grade_links.' WHERE id='.$get_delete_link.' AND type = '.LINK_ATTENDANCE.');';
 			Database::query($sql);
 			$link[0]->delete();
@@ -441,7 +441,7 @@ switch ($action) {
             $category_to_lock[0]->lock_all_items(0);
             $confirmation_message = get_lang('EvaluationHasBeenUnLocked');
         }
-        break;    
+        break;
 }
 
 //actions on the sortabletable
@@ -454,7 +454,7 @@ if (isset ($_POST['action'])) {
 		$filter_warning_msg = false;
 	} else {
 		switch ($_POST['action']) {
- 
+
 			case 'deleted' :
 				$number_of_deleted_categories= 0;
 				$number_of_deleted_evaluations= 0;
@@ -620,8 +620,8 @@ if (empty ($_GET['selectcat'])) {
 }
 $simple_search_form='';
 
-if (isset($_GET['studentoverview'])) {    
-    //@todo this code also seems to be deprecated ...    
+if (isset($_GET['studentoverview'])) {
+    //@todo this code also seems to be deprecated ...
 	$cats= Category :: load($category);
 	$stud_id= (api_is_allowed_to_edit() ? null : $stud_id);
 	$allcat= array ();
@@ -635,7 +635,7 @@ if (isset($_GET['studentoverview'])) {
 		foreach ($data_array as $data) {
 			$newarray[] = array_slice($data, 1);
 		}
-		$pdf= new Cezpdf(); 
+		$pdf= new Cezpdf();
 		$pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
 		$pdf->ezSetMargins(30, 30, 50, 30);
 		$pdf->ezSetY(810);
@@ -649,15 +649,15 @@ if (isset($_GET['studentoverview'])) {
     }
 } else {
     //Student view
-    
+
     //in any other case (no search, no pdf), print the available gradebooks
     // Important note: loading a category will actually load the *contents* of
     // this category. This means that, to show the categories of a course,
     // we have to show the root category and show its subcategories that
     // are inside this course. This is done at the time of calling
     // $cats[0]->get_subcategories(), not at the time of doing Category::load()
-    // $category comes from GET['selectcat']    
-    
+    // $category comes from GET['selectcat']
+
     //if $category = 0 (which happens when GET['selectcat'] is undefined)
     // then Category::load() will create a new 'root' category with empty
     // course and session fields in memory (Category::create_root_category())
@@ -676,8 +676,8 @@ if (isset($_GET['studentoverview'])) {
 	    $cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
         if (empty($cats)) {
             // There is no category for this course+session, so create one
-            $cat= new Category();     
-            if (!empty($session_id)) {            	
+            $cat= new Category();
+            if (!empty($session_id)) {
                 $s_name = api_get_session_name($session_id);
             	$cat->set_name($course_code.' - '.get_lang('Session').' '.$s_name);
                 $cat->set_session_id($session_id);
@@ -707,7 +707,7 @@ if (isset($_GET['studentoverview'])) {
     } else {
     	$stud_id = $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);
@@ -735,14 +735,14 @@ if ($category != '0') {
 	$category_id   = intval($_GET['selectcat']);
 	$course_id     = Database::get_course_by_category($category_id);
 	$show_message  = $cat->show_message_resource_delete($course_id);
-    
+
 	if ($show_message == '') {
 		//student
 		if (!api_is_allowed_to_edit()) {
             $certificate_html = Category::register_user_certificate($category_id, $stud_id);
             if ($certificate_html) {
                 echo $certificate_html;
-            }            
+            }
 		} //end hack
 	}
 }
@@ -751,45 +751,45 @@ if (api_is_allowed_to_edit(null, true)) {
 	// Tool introduction
 	Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
 
-	if ( (isset ($_GET['selectcat']) && $_GET['selectcat']<>0) ) {	    
+	if ( (isset ($_GET['selectcat']) && $_GET['selectcat']<>0) ) {
 	//
-	} else {	    
+	} else {
         if (((isset ($_GET['selectcat']) && $_GET['selectcat']==0) || ((isset($_GET['cidReq']) && $_GET['cidReq']!==''))) || isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') {
-            $cats = Category :: load(null, null, $course_code, null, null, $session_id, false);		
+            $cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
 		}
 	}
 }
 
 if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
 	echo '<meta http-equiv="refresh" content="0;url='.api_get_self().'?cidReq='.$course_code.'" />';
-} else {    
+} else {
     $cats = Category :: load(null, null, $course_code, null, null, $session_id, false); //already init
-    
+
 	if (!empty($cats)) {
-        
-        if ( (api_get_setting('gradebook_enable_grade_model') == 'true') && 
+
+        if ( (api_get_setting('gradebook_enable_grade_model') == 'true') &&
              (api_is_platform_admin() || (api_is_allowed_to_edit(null, true) && api_get_setting('teachers_can_change_grade_model_settings') == 'true'))) {
-            
+
             //Getting grade models
             $obj = new GradeModel();
             $grade_models = $obj->get_all();
             $grade_model_id = $cats[0]->get_grade_model_id();
-                                    
+
             //No children
             if ( (count($cats) == 1 && empty($grade_model_id)) || (count($cats) == 1 && $grade_model_id != -1) ) {
-                if (!empty($grade_models)) {                   
-                    $form_grade = new FormValidator('grade_model_settings');                    
+                if (!empty($grade_models)) {
+                    $form_grade = new FormValidator('grade_model_settings');
                     $obj->fill_grade_model_select_in_form($form_grade, 'grade_model_id', $grade_model_id);
                     $form_grade->addElement('style_submit_button', 'submit', get_lang('Save'), 'class="save"');
-                    
+
                     if ($form_grade->validate()) {
                         $value = $form_grade->exportValue('grade_model_id');
-                        
+
                         $gradebook = new Gradebook();
-                        $gradebook->update(array('id'=> $cats[0]->get_id(), 'grade_model_id' => $value), true);                 
+                        $gradebook->update(array('id'=> $cats[0]->get_id(), 'grade_model_id' => $value), true);
 
-                        //do something                        
-                        $obj = new GradeModel();                             
+                        //do something
+                        $obj = new GradeModel();
                         $components = $obj->get_components($value);
 
                         foreach ($components as $component) {
@@ -810,34 +810,34 @@ if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
                         //Reloading cats
                         $cats = Category :: load(null, null, $course_code, null, null, $session_id, false);
                     } else {
-                        $form_grade->display();   
+                        $form_grade->display();
                     }
                 }
             }
         }
-        
+
 		$i = 0;
-        
-		foreach ($cats as $cat) {			
-			$allcat  = $cat->get_subcategories($stud_id, $course_code, $session_id);            
+
+		foreach ($cats as $cat) {
+			$allcat  = $cat->get_subcategories($stud_id, $course_code, $session_id);
 			$alleval = $cat->get_evaluations($stud_id);
 			$alllink = $cat->get_links($stud_id,true);
-			
+
 			if ($cat->get_parent_id() != 0 ) {
 				$i++;
 			} else {
-				//This is the father				
+				//This is the father
 				//Create gradebook/add gradebook links
-                DisplayGradebook::display_header_gradebook($cat, 0, $cat->get_id(), $is_course_admin, $is_platform_admin, $simple_search_form, false, true);				
-				
+                DisplayGradebook::display_header_gradebook($cat, 0, $cat->get_id(), $is_course_admin, $is_platform_admin, $simple_search_form, false, true);
+
 				if (api_is_allowed_to_edit(null,true) && api_get_setting('gradebook_enable_grade_model') == 'true') {
 					//Showing the grading system
-					if (!empty($grade_models[$grade_model_id])) {             
+					if (!empty($grade_models[$grade_model_id])) {
                         Display::display_normal_message(get_lang('GradeModel').': '.$grade_models[$grade_model_id]['name']);
-                    }					
-				}                                
-				$gradebooktable = new GradebookTable($cat, $allcat, $alleval, $alllink, $addparams);                
-				$gradebooktable->display();				
+                    }
+				}
+				$gradebooktable = new GradebookTable($cat, $allcat, $alleval, $alllink, $addparams);
+				$gradebooktable->display();
 			}
 		}
 	}