chamilo / chamilo-lms

main/gradebook/lib/be/result.class.php

Spacing +29 added lines, -29 removed lines

@@ -90,23 +90,23 @@ 
         if (is_null($id) && is_null($user_id) && !is_null($evaluation_id)) {
             // Verified_if_exist_evaluation
             $sql = 'SELECT COUNT(*) AS count
-                    FROM ' . $tbl_grade_results . '
-                    WHERE evaluation_id="' . Database::escape_string($evaluation_id) . '";';
+                    FROM ' . $tbl_grade_results.'
+                    WHERE evaluation_id="' . Database::escape_string($evaluation_id).'";';
             $result = Database::query($sql);
             $existEvaluation = Database::result($result, 0, 0);
 
             if ($existEvaluation != 0) {
                 if ($sessionId) {
                     $sql = 'SELECT c_id, user_id as user_id, status
-                            FROM ' . $tbl_session_rel_course_user . '
+                            FROM ' . $tbl_session_rel_course_user.'
 							WHERE
 							    status= 0 AND
-							    c_id = "' . api_get_course_int_id() . '" AND
+							    c_id = "' . api_get_course_int_id().'" AND
 							    session_id = ' . $sessionId;
                 } else {
                     $sql = 'SELECT c_id, user_id, status
-                            FROM ' . $tbl_course_rel_course . '
-                            WHERE status ="' . STUDENT . '" AND c_id = "' . api_get_course_int_id() . '" ';
+                            FROM ' . $tbl_course_rel_course.'
+                            WHERE status ="' . STUDENT.'" AND c_id = "'.api_get_course_int_id().'" ';
                 }
 
                 $res_course_rel_user = Database::query($sql);
@@ -116,15 +116,15 @@ 
                 $current_date = api_get_utc_datetime();
                 for ($i = 0; $i < count($list_user_course_list); $i++) {
                     $sql_verified = 'SELECT COUNT(*) AS count
-                                    FROM ' . $tbl_grade_results . '
+                                    FROM ' . $tbl_grade_results.'
                                     WHERE
-                                        user_id="' . intval($list_user_course_list[$i]['user_id']) . '" AND
-                                        evaluation_id="' . intval($evaluation_id) . '";';
+                                        user_id="' . intval($list_user_course_list[$i]['user_id']).'" AND
+                                        evaluation_id="' . intval($evaluation_id).'";';
                     $res_verified = Database::query($sql_verified);
                     $info_verified = Database::result($res_verified, 0, 0);
                     if ($info_verified == 0) {
-                        $sql_insert = 'INSERT INTO ' . $tbl_grade_results . '(user_id,evaluation_id,created_at,score)
-									   VALUES ("' . intval($list_user_course_list[$i]['user_id']) . '","' . intval($evaluation_id) . '","' . $current_date . '",0);';
+                        $sql_insert = 'INSERT INTO '.$tbl_grade_results.'(user_id,evaluation_id,created_at,score)
+									   VALUES ("' . intval($list_user_course_list[$i]['user_id']).'","'.intval($evaluation_id).'","'.$current_date.'",0);';
                         Database::query($sql_insert);
                     }
                 }
@@ -148,16 +148,16 @@ 
 
         $paramcount = 0;
         if (!empty($id)) {
-            $sql.= ' WHERE gr.id = ' . intval($id);
-            $paramcount ++;
+            $sql .= ' WHERE gr.id = '.intval($id);
+            $paramcount++;
         }
         if (!empty($user_id)) {
             if ($paramcount != 0)
                 $sql .= ' AND';
             else
                 $sql .= ' WHERE';
-            $sql .= ' gr.user_id = ' . intval($user_id);
-            $paramcount ++;
+            $sql .= ' gr.user_id = '.intval($user_id);
+            $paramcount++;
         }
         if (!empty($evaluation_id)) {
             if ($paramcount != 0) {
@@ -165,8 +165,8 @@ 
             } else {
                 $sql .= ' WHERE';
             }
-            $sql .= ' gr.evaluation_id = ' . intval($evaluation_id);
-            $paramcount ++;
+            $sql .= ' gr.evaluation_id = '.intval($evaluation_id);
+            $paramcount++;
         }
         $sql .= ' ORDER BY u.lastname, u.firstname';
         $result = Database::query($sql);
@@ -191,17 +191,17 @@ 
     {
         if (isset($this->user_id) && isset($this->evaluation)) {
             $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-            $sql = "INSERT INTO " . $tbl_grade_results
+            $sql = "INSERT INTO ".$tbl_grade_results
                 . " (user_id, evaluation_id,
 					created_at";
             if (isset($this->score)) {
                 $sql .= ",score";
             }
             $sql .= ") VALUES
-					(" . (int) $this->get_user_id() . ", " . (int) $this->get_evaluation_id()
-                . ", '" . $this->get_date() . "' ";
+					(" . (int) $this->get_user_id().", ".(int) $this->get_evaluation_id()
+                . ", '".$this->get_date()."' ";
             if (isset($this->score)) {
-                $sql .= ", " . $this->get_score();
+                $sql .= ", ".$this->get_score();
             }
             $sql .= ")";
             Database::query($sql);
@@ -222,16 +222,16 @@ 
             $arr_result = $result->load(null, $userid, $evaluationid);
             $arr = get_object_vars($arr_result[0]);
 
-            $sql = 'INSERT INTO ' . $tbl_grade_results_log
+            $sql = 'INSERT INTO '.$tbl_grade_results_log
                 . ' (id_result,user_id, evaluation_id,created_at';
             if (isset($arr['score'])) {
                 $sql .= ',score';
             }
             $sql .= ') VALUES
-					(' . (int) $arr['id'] . ',' . (int) $arr['user_id'] . ', ' . (int) $arr['evaluation']
-                . ", '" . api_get_utc_datetime() . "'";
+					(' . (int) $arr['id'].','.(int) $arr['user_id'].', '.(int) $arr['evaluation']
+                . ", '".api_get_utc_datetime()."'";
             if (isset($arr['score'])) {
-                $sql .= ', ' . $arr['score'];
+                $sql .= ', '.$arr['score'];
             }
             $sql .= ')';
 
@@ -247,16 +247,16 @@ 
     public function save()
     {
         $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-        $sql = 'UPDATE ' . $tbl_grade_results . '
+        $sql = 'UPDATE '.$tbl_grade_results.'
                 SET user_id = ' . $this->get_user_id()
-            . ', evaluation_id = ' . $this->get_evaluation_id()
+            . ', evaluation_id = '.$this->get_evaluation_id()
             . ', score = ';
         if (isset($this->score)) {
             $sql .= $this->get_score();
         } else {
             $sql .= 'null';
         }
-        $sql .= ' WHERE id = ' . $this->id;
+        $sql .= ' WHERE id = '.$this->id;
         // no need to update creation date
         Database::query($sql);
     }
@@ -267,7 +267,7 @@ 
     public function delete()
     {
         $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-        $sql = 'DELETE FROM ' . $tbl_grade_results . ' WHERE id = ' . $this->id;
+        $sql = 'DELETE FROM '.$tbl_grade_results.' WHERE id = '.$this->id;
         Database::query($sql);
     }
 }

Braces +5 added lines, -4 removed lines

@@ -152,10 +152,11 @@
             $paramcount ++;
         }
         if (!empty($user_id)) {
-            if ($paramcount != 0)
-                $sql .= ' AND';
-            else
-                $sql .= ' WHERE';
+            if ($paramcount != 0) {
+                            $sql .= ' AND';
+            } else {
+                            $sql .= ' WHERE';
+            }
             $sql .= ' gr.user_id = ' . intval($user_id);
             $paramcount ++;
         }

main/gradebook/lib/be/evaluation.class.php

Spacing +27 added lines, -27 removed lines

@@ -223,36 +223,36 @@ 
 		$paramcount = 0;
 
 		if (isset ($id)) {
-			$sql.= ' WHERE id = '.intval($id);
-			$paramcount ++;
+			$sql .= ' WHERE id = '.intval($id);
+			$paramcount++;
 		}
 
 		if (isset ($user_id)) {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= ' user_id = '.intval($user_id);
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($course_code) && $course_code <> '-1') {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= " course_code = '".Database::escape_string($course_code)."'";
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($category_id)) {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= ' category_id = '.intval($category_id);
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($visible)) {
 			if ($paramcount != 0) $sql .= ' AND';
 			else $sql .= ' WHERE';
 			$sql .= ' visible = '.intval($visible);
-			$paramcount ++;
+			$paramcount++;
 		}
 
 		if (isset ($locked)) {
@@ -278,7 +278,7 @@ 
 		$alleval = array();
 		if (Database::num_rows($result)) {
 			while ($data = Database::fetch_array($result)) {
-				$eval= new Evaluation();
+				$eval = new Evaluation();
 				$eval->set_id($data['id']);
 				$eval->set_name($data['name']);
 				$eval->set_description($data['description']);
@@ -363,7 +363,7 @@ 
 			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
 			$tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
 			$eval = new Evaluation();
-			$dateobject = $eval->load($idevaluation,null,null,null,null);
+			$dateobject = $eval->load($idevaluation, null, null, null, null);
 			$arreval = get_object_vars($dateobject[0]);
 			if (!empty($arreval['id'])) {
 				$sql = 'SELECT weight from '.$tbl_grade_evaluations.'
@@ -397,7 +397,7 @@ 
 			.', description = ';
 		if (isset($this->description)) {
 			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
+		} else {
 			$sql .= 'null';
 		}
 		$sql .= ', user_id = '.intval($this->get_user_id())
@@ -468,17 +468,17 @@ 
 				$sql .= ' AND user_id = '.api_get_user_id();
 			}
 
-		}else {
+		} else {
 			$sql .= ' AND user_id = '.api_get_user_id();
 		}
 
 		if (!isset ($parent)) {
-			$sql.= ' AND category_id is null';
+			$sql .= ' AND category_id is null';
 		} else {
-			$sql.= ' AND category_id = '.intval($parent);
+			$sql .= ' AND category_id = '.intval($parent);
 		}
 		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
+		$number = Database::fetch_row($result);
 
 		return $number[0] != 0;
 	}
@@ -494,7 +494,7 @@ 
 				FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
 		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
+		$number = Database::fetch_row($result);
 
 		return ($number[0] != 0);
 	}
@@ -544,7 +544,7 @@ 
             $results = isset($data[$key]) ? $data[$key] : null;
 
             if ($useSession == false) {
-                $results  = null;
+                $results = null;
             }
 			if (empty($results)) {
 				$results = Result::load(null, $stud_id, $this->id);
@@ -570,7 +570,7 @@ 
             $data = Session::read('calc_score');
             $allResults = isset($data[$key]) ? $data[$key] : null;
             if ($useSession == false) {
-                $allResults  = null;
+                $allResults = null;
             }
 			if (empty($allResults)) {
 				$allResults = Result::load(null, null, $this->id);
@@ -602,7 +602,7 @@ 
 					return array($bestResult, $weight);
 					break;
 				case 'average':
-					return array($sumResult/$count, $weight);
+					return array($sumResult / $count, $weight);
 					break;
 				case 'ranking':
                     $students = array();
@@ -640,17 +640,17 @@ 
 		$targets[] = $root;
 
 		if (isset($this->course_code) && !empty($this->course_code)) {
-			$crscats = Category::load(null,null,$this->course_code,0);
+			$crscats = Category::load(null, null, $this->course_code, 0);
 			foreach ($crscats as $cat) {
-				$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-				$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+				$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+				$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
 			}
 		}
 
-		$indcats = Category::load(null,$user,0,0);
+		$indcats = Category::load(null, $user, 0, 0);
 		foreach ($indcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+			$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+			$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
 		}
 
 		return $targets;
@@ -661,10 +661,10 @@ 
 	 */
 	private function add_target_subcategories($targets, $level, $catid)
 	{
-		$subcats = Category::load(null,null,null,$catid);
+		$subcats = Category::load(null, null, null, $catid);
 		foreach ($subcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+			$targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
+			$targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
 		}
 		return $targets;
 	}
@@ -743,7 +743,7 @@ 
 	 * @return array evaluation objects matching the search criterium
 	 * @todo can be written more efficiently using a new (but very complex) sql query
 	 */
-	public function find_evaluations($name_mask,$selectcat)
+	public function find_evaluations($name_mask, $selectcat)
 	{
 		$rootcat = Category::load($selectcat);
 		$evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);

Braces +27 added lines, -12 removed lines

@@ -228,36 +228,51 @@ 
 		}
 
 		if (isset ($user_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' user_id = '.intval($user_id);
 			$paramcount ++;
 		}
 
 		if (isset ($course_code) && $course_code <> '-1') {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= " course_code = '".Database::escape_string($course_code)."'";
 			$paramcount ++;
 		}
 
 		if (isset ($category_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' category_id = '.intval($category_id);
 			$paramcount ++;
 		}
 
 		if (isset ($visible)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' visible = '.intval($visible);
 			$paramcount ++;
 		}
 
 		if (isset ($locked)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
+			if ($paramcount != 0) {
+			    $sql .= ' AND';
+			} else {
+			    $sql .= ' WHERE';
+			}
 			$sql .= ' locked = '.intval($locked);
 		}
 
@@ -397,7 +412,7 @@ 
 			.', description = ';
 		if (isset($this->description)) {
 			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
+		} else {
 			$sql .= 'null';
 		}
 		$sql .= ', user_id = '.intval($this->get_user_id())
@@ -468,7 +483,7 @@ 
 				$sql .= ' AND user_id = '.api_get_user_id();
 			}
 
-		}else {
+		} else {
 			$sql .= ' AND user_id = '.api_get_user_id();
 		}
 

Doc Comments +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
 
 
 	/**
-	 * @param array $result
+	 * @param Doctrine\DBAL\Driver\Statement|null $result
 	 * @return array
 	 */
 	private static function create_evaluation_objects_from_sql_result($result)

Indentation +748 added lines, -748 removed lines

@@ -9,367 +9,367 @@ 
  */
 class Evaluation implements GradebookItem
 {
-	private $id;
-	private $name;
-	private $description;
-	private $user_id;
-	private $course_code;
-	/** @var Category */
-	private $category;
-	private $created_at;
-	private $weight;
-	private $eval_max;
-	private $visible;
-	private $sessionId;
-	public $studentList;
-
-	/**
-	 * Construct
-	 */
-	public function __construct()
-	{
-	}
-
-	/**
-	 * @return Category
-	 */
-	public function getCategory()
-	{
-		return $this->category;
-	}
-
-	/**
-	 * @param Category $category
-	 */
-	public function setCategory($category)
-	{
-		$this->category = $category;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_category_id()
-	{
-		return $this->category->get_id();
-	}
-
-	/**
-	 * @param int $category_id
-	 */
-	public function set_category_id($category_id)
-	{
-		$categories = Category::load($category_id);
-		if (isset($categories[0])) {
-			$this->setCategory($categories[0]);
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_id()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_description()
-	{
-		return $this->description;
-	}
-
-	public function get_user_id()
-	{
-		return $this->user_id;
-	}
-
-	public function get_course_code()
-	{
-		return $this->course_code;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getSessionId()
-	{
-		return $this->sessionId;
-	}
-
-	/**
-	 * @param int $sessionId
-	 */
-	public function setSessionId($sessionId)
-	{
-		$this->sessionId = intval($sessionId);
-	}
-
-	public function get_date()
-	{
-		return $this->created_at;
-	}
-
-	public function get_weight()
-	{
-		return $this->weight;
-	}
-
-	public function get_max()
-	{
-		return $this->eval_max;
-	}
-
-	public function get_type()
-	{
-		return $this->type;
-	}
-
-	public function is_visible()
-	{
-		return $this->visible;
-	}
-
-	public function get_locked()
-	{
-		return $this->locked;
-	}
-
-	public function is_locked()
-	{
-		return isset($this->locked) && $this->locked == 1 ? true : false;
-	}
-
-	public function set_id($id)
-	{
-		$this->id = $id;
-	}
-
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
-
-	public function set_description($description)
-	{
-		$this->description = $description;
-	}
-
-	public function set_user_id($user_id)
-	{
-		$this->user_id = $user_id;
-	}
-
-	public function set_course_code($course_code)
-	{
-		$this->course_code = $course_code;
-	}
-
-	public function set_date($date)
-	{
-		$this->created_at = $date;
-	}
-
-	public function set_weight($weight)
-	{
-		$this->weight = $weight;
-	}
-
-	public function set_max($max)
-	{
-		$this->eval_max = $max;
-	}
-
-	public function set_visible($visible)
-	{
-		$this->visible = $visible;
-	}
-
-	public function set_type($type)
-	{
-		$this->type = $type;
-	}
-
-	public function set_locked($locked)
-	{
-		$this->locked = $locked;
-	}
-
-	/**
-	 * Retrieve evaluations and return them as an array of Evaluation objects
-	 * @param int $id evaluation id
-	 * @param int $user_id user id (evaluation owner)
-	 * @param string $course_code course code
-	 * @param int $category_id parent category
-	 * @param integer $visible visible
-	 */
-	public static function load(
-		$id = null,
-		$user_id = null,
-		$course_code = null,
-		$category_id = null,
-		$visible = null,
-		$locked = null
-	) {
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations;
-		$paramcount = 0;
-
-		if (isset ($id)) {
-			$sql.= ' WHERE id = '.intval($id);
-			$paramcount ++;
-		}
-
-		if (isset ($user_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' user_id = '.intval($user_id);
-			$paramcount ++;
-		}
-
-		if (isset ($course_code) && $course_code <> '-1') {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= " course_code = '".Database::escape_string($course_code)."'";
-			$paramcount ++;
-		}
-
-		if (isset ($category_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' category_id = '.intval($category_id);
-			$paramcount ++;
-		}
-
-		if (isset ($visible)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' visible = '.intval($visible);
-			$paramcount ++;
-		}
-
-		if (isset ($locked)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' locked = '.intval($locked);
-		}
-
-		$result = Database::query($sql);
-		$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $alleval;
-	}
-
-
-
-	/**
-	 * @param array $result
-	 * @return array
-	 */
-	private static function create_evaluation_objects_from_sql_result($result)
-	{
-		$alleval = array();
-		if (Database::num_rows($result)) {
-			while ($data = Database::fetch_array($result)) {
-				$eval= new Evaluation();
-				$eval->set_id($data['id']);
-				$eval->set_name($data['name']);
-				$eval->set_description($data['description']);
-				$eval->set_user_id($data['user_id']);
-				$eval->set_course_code($data['course_code']);
-				$eval->set_category_id($data['category_id']);
-				$eval->set_date(api_get_local_time($data['created_at']));
-				$eval->set_weight($data['weight']);
-				$eval->set_max($data['max']);
-				$eval->set_visible($data['visible']);
-				$eval->set_type($data['type']);
-				$eval->set_locked($data['locked']);
-				$eval->setSessionId(api_get_session_id());
-
-				$alleval[] = $eval;
-			}
-		}
-
-		return $alleval;
-	}
-
-	/**
-	 * Insert this evaluation into the database
-	 */
-	public function add()
-	{
-		if (isset($this->name) &&
-			isset($this->user_id) &&
-			isset($this->weight) &&
-			isset ($this->eval_max) &&
-			isset($this->visible)
-		) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-
-			$sql = 'INSERT INTO '.$tbl_grade_evaluations
-				.' (name, user_id, weight, max, visible';
-			if (isset($this->description)) {
-				$sql .= ',description';
-			}
-			if (isset($this->course_code)) {
-				$sql .= ', course_code';
-			}
-			if (isset($this->category)) {
-				$sql .= ', category_id';
-			}
-			$sql .= ', created_at';
-			$sql .= ',type';
-			$sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
-				.','.intval($this->get_user_id())
-				.','.floatval($this->get_weight())
-				.','.intval($this->get_max())
-				.','.intval($this->is_visible());
-			if (isset($this->description)) {
-				$sql .= ",'".Database::escape_string($this->get_description())."'";
-			}
-			if (isset($this->course_code)) {
-				$sql .= ",'".Database::escape_string($this->get_course_code())."'";
-			}
-			if (isset($this->category)) {
-				$sql .= ','.intval($this->get_category_id());
-			}
-			if (empty($this->type)) {
-				$this->type = 'evaluation';
-			}
-			$sql .= ", '".api_get_utc_datetime()."'";
-			$sql .= ',\''.Database::escape_string($this->type).'\'';
-			$sql .= ")";
-
-			Database::query($sql);
-			$this->set_id(Database::insert_id());
-		} else {
-			die('Error in Evaluation add: required field empty');
-		}
-	}
-
-	/**
-	 * @param int $idevaluation
-	 */
-	public function add_evaluation_log($idevaluation)
-	{
-		if (!empty($idevaluation)) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-			$tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
-			$eval = new Evaluation();
-			$dateobject = $eval->load($idevaluation,null,null,null,null);
-			$arreval = get_object_vars($dateobject[0]);
-			if (!empty($arreval['id'])) {
-				$sql = 'SELECT weight from '.$tbl_grade_evaluations.'
+    private $id;
+    private $name;
+    private $description;
+    private $user_id;
+    private $course_code;
+    /** @var Category */
+    private $category;
+    private $created_at;
+    private $weight;
+    private $eval_max;
+    private $visible;
+    private $sessionId;
+    public $studentList;
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * @return Category
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+     * @param Category $category
+     */
+    public function setCategory($category)
+    {
+        $this->category = $category;
+    }
+
+    /**
+     * @return int
+     */
+    public function get_category_id()
+    {
+        return $this->category->get_id();
+    }
+
+    /**
+     * @param int $category_id
+     */
+    public function set_category_id($category_id)
+    {
+        $categories = Category::load($category_id);
+        if (isset($categories[0])) {
+            $this->setCategory($categories[0]);
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function get_id()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return $this->description;
+    }
+
+    public function get_user_id()
+    {
+        return $this->user_id;
+    }
+
+    public function get_course_code()
+    {
+        return $this->course_code;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSessionId()
+    {
+        return $this->sessionId;
+    }
+
+    /**
+     * @param int $sessionId
+     */
+    public function setSessionId($sessionId)
+    {
+        $this->sessionId = intval($sessionId);
+    }
+
+    public function get_date()
+    {
+        return $this->created_at;
+    }
+
+    public function get_weight()
+    {
+        return $this->weight;
+    }
+
+    public function get_max()
+    {
+        return $this->eval_max;
+    }
+
+    public function get_type()
+    {
+        return $this->type;
+    }
+
+    public function is_visible()
+    {
+        return $this->visible;
+    }
+
+    public function get_locked()
+    {
+        return $this->locked;
+    }
+
+    public function is_locked()
+    {
+        return isset($this->locked) && $this->locked == 1 ? true : false;
+    }
+
+    public function set_id($id)
+    {
+        $this->id = $id;
+    }
+
+    public function set_name($name)
+    {
+        $this->name = $name;
+    }
+
+    public function set_description($description)
+    {
+        $this->description = $description;
+    }
+
+    public function set_user_id($user_id)
+    {
+        $this->user_id = $user_id;
+    }
+
+    public function set_course_code($course_code)
+    {
+        $this->course_code = $course_code;
+    }
+
+    public function set_date($date)
+    {
+        $this->created_at = $date;
+    }
+
+    public function set_weight($weight)
+    {
+        $this->weight = $weight;
+    }
+
+    public function set_max($max)
+    {
+        $this->eval_max = $max;
+    }
+
+    public function set_visible($visible)
+    {
+        $this->visible = $visible;
+    }
+
+    public function set_type($type)
+    {
+        $this->type = $type;
+    }
+
+    public function set_locked($locked)
+    {
+        $this->locked = $locked;
+    }
+
+    /**
+     * Retrieve evaluations and return them as an array of Evaluation objects
+     * @param int $id evaluation id
+     * @param int $user_id user id (evaluation owner)
+     * @param string $course_code course code
+     * @param int $category_id parent category
+     * @param integer $visible visible
+     */
+    public static function load(
+        $id = null,
+        $user_id = null,
+        $course_code = null,
+        $category_id = null,
+        $visible = null,
+        $locked = null
+    ) {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations;
+        $paramcount = 0;
+
+        if (isset ($id)) {
+            $sql.= ' WHERE id = '.intval($id);
+            $paramcount ++;
+        }
+
+        if (isset ($user_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' user_id = '.intval($user_id);
+            $paramcount ++;
+        }
+
+        if (isset ($course_code) && $course_code <> '-1') {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= " course_code = '".Database::escape_string($course_code)."'";
+            $paramcount ++;
+        }
+
+        if (isset ($category_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' category_id = '.intval($category_id);
+            $paramcount ++;
+        }
+
+        if (isset ($visible)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' visible = '.intval($visible);
+            $paramcount ++;
+        }
+
+        if (isset ($locked)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' locked = '.intval($locked);
+        }
+
+        $result = Database::query($sql);
+        $alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $alleval;
+    }
+
+
+
+    /**
+     * @param array $result
+     * @return array
+     */
+    private static function create_evaluation_objects_from_sql_result($result)
+    {
+        $alleval = array();
+        if (Database::num_rows($result)) {
+            while ($data = Database::fetch_array($result)) {
+                $eval= new Evaluation();
+                $eval->set_id($data['id']);
+                $eval->set_name($data['name']);
+                $eval->set_description($data['description']);
+                $eval->set_user_id($data['user_id']);
+                $eval->set_course_code($data['course_code']);
+                $eval->set_category_id($data['category_id']);
+                $eval->set_date(api_get_local_time($data['created_at']));
+                $eval->set_weight($data['weight']);
+                $eval->set_max($data['max']);
+                $eval->set_visible($data['visible']);
+                $eval->set_type($data['type']);
+                $eval->set_locked($data['locked']);
+                $eval->setSessionId(api_get_session_id());
+
+                $alleval[] = $eval;
+            }
+        }
+
+        return $alleval;
+    }
+
+    /**
+     * Insert this evaluation into the database
+     */
+    public function add()
+    {
+        if (isset($this->name) &&
+            isset($this->user_id) &&
+            isset($this->weight) &&
+            isset ($this->eval_max) &&
+            isset($this->visible)
+        ) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+
+            $sql = 'INSERT INTO '.$tbl_grade_evaluations
+                .' (name, user_id, weight, max, visible';
+            if (isset($this->description)) {
+                $sql .= ',description';
+            }
+            if (isset($this->course_code)) {
+                $sql .= ', course_code';
+            }
+            if (isset($this->category)) {
+                $sql .= ', category_id';
+            }
+            $sql .= ', created_at';
+            $sql .= ',type';
+            $sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
+                .','.intval($this->get_user_id())
+                .','.floatval($this->get_weight())
+                .','.intval($this->get_max())
+                .','.intval($this->is_visible());
+            if (isset($this->description)) {
+                $sql .= ",'".Database::escape_string($this->get_description())."'";
+            }
+            if (isset($this->course_code)) {
+                $sql .= ",'".Database::escape_string($this->get_course_code())."'";
+            }
+            if (isset($this->category)) {
+                $sql .= ','.intval($this->get_category_id());
+            }
+            if (empty($this->type)) {
+                $this->type = 'evaluation';
+            }
+            $sql .= ", '".api_get_utc_datetime()."'";
+            $sql .= ',\''.Database::escape_string($this->type).'\'';
+            $sql .= ")";
+
+            Database::query($sql);
+            $this->set_id(Database::insert_id());
+        } else {
+            die('Error in Evaluation add: required field empty');
+        }
+    }
+
+    /**
+     * @param int $idevaluation
+     */
+    public function add_evaluation_log($idevaluation)
+    {
+        if (!empty($idevaluation)) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+            $tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
+            $eval = new Evaluation();
+            $dateobject = $eval->load($idevaluation,null,null,null,null);
+            $arreval = get_object_vars($dateobject[0]);
+            if (!empty($arreval['id'])) {
+                $sql = 'SELECT weight from '.$tbl_grade_evaluations.'
                         WHERE id='.$arreval['id'];
                 $rs = Database::query($sql);
                 $row_old_weight = Database::fetch_array($rs, 'ASSOC');
@@ -385,426 +385,426 @@ 
                     'user_id_log' => api_get_user_id()
                 ];
                 Database::insert($tbl_grade_linkeval_log, $params);
-			}
-		}
-	}
-
-	/**
-	 * Update the properties of this evaluation in the database
-	 */
-	public function save()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'UPDATE '.$tbl_grade_evaluations
-			." SET name = '".Database::escape_string($this->get_name())."'"
-			.', description = ';
-		if (isset($this->description)) {
-			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
-			$sql .= 'null';
-		}
-		$sql .= ', user_id = '.intval($this->get_user_id())
-			.', course_code = ';
-		if (isset($this->course_code)) {
-			$sql .= "'".Database::escape_string($this->get_course_code())."'";
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', category_id = ';
-		if (isset($this->category)) {
-			$sql .= intval($this->get_category_id());
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
-			.', max = '.intval($this->get_max())
-			.', visible = '.intval($this->is_visible())
-			.' WHERE id = '.intval($this->id);
-		//recorded history
-
-		$eval_log = new Evaluation();
-		$eval_log->add_evaluation_log($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Delete this evaluation from the database
-	 */
-	public function delete()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Check if an evaluation name (with the same parent category) already exists
-	 * @param $name name to check (if not given, the name property of this object will be checked)
-	 * @param $parent parent category
-	 */
-	public function does_name_exist($name, $parent)
-	{
-		if (!isset ($name)) {
-			$name = $this->name;
-			$parent = $this->category;
-		}
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT count(id) AS number'
-			.' FROM '.$tbl_grade_evaluations
-			." WHERE name = '".Database::escape_string($name)."'";
-
-		if (api_is_allowed_to_edit()) {
-			$parent = Category::load($parent);
-			$code = $parent[0]->get_course_code();
-			$courseInfo = api_get_course_info($code);
-			$courseId = $courseInfo['real_id'];
-
-			if (isset($code) && $code != '0') {
-				$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-				$sql .= ' AND user_id IN (
+            }
+        }
+    }
+
+    /**
+     * Update the properties of this evaluation in the database
+     */
+    public function save()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'UPDATE '.$tbl_grade_evaluations
+            ." SET name = '".Database::escape_string($this->get_name())."'"
+            .', description = ';
+        if (isset($this->description)) {
+            $sql .= "'".Database::escape_string($this->get_description())."'";
+        }else {
+            $sql .= 'null';
+        }
+        $sql .= ', user_id = '.intval($this->get_user_id())
+            .', course_code = ';
+        if (isset($this->course_code)) {
+            $sql .= "'".Database::escape_string($this->get_course_code())."'";
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', category_id = ';
+        if (isset($this->category)) {
+            $sql .= intval($this->get_category_id());
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
+            .', max = '.intval($this->get_max())
+            .', visible = '.intval($this->is_visible())
+            .' WHERE id = '.intval($this->id);
+        //recorded history
+
+        $eval_log = new Evaluation();
+        $eval_log->add_evaluation_log($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Delete this evaluation from the database
+     */
+    public function delete()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Check if an evaluation name (with the same parent category) already exists
+     * @param $name name to check (if not given, the name property of this object will be checked)
+     * @param $parent parent category
+     */
+    public function does_name_exist($name, $parent)
+    {
+        if (!isset ($name)) {
+            $name = $this->name;
+            $parent = $this->category;
+        }
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT count(id) AS number'
+            .' FROM '.$tbl_grade_evaluations
+            ." WHERE name = '".Database::escape_string($name)."'";
+
+        if (api_is_allowed_to_edit()) {
+            $parent = Category::load($parent);
+            $code = $parent[0]->get_course_code();
+            $courseInfo = api_get_course_info($code);
+            $courseId = $courseInfo['real_id'];
+
+            if (isset($code) && $code != '0') {
+                $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+                $sql .= ' AND user_id IN (
 					 SELECT user_id FROM '.$main_course_user_table.'
 					 WHERE
 						c_id = '.$courseId.' AND
 						status = '.COURSEMANAGER.'
 					)';
-			} else {
-				$sql .= ' AND user_id = '.api_get_user_id();
-			}
-
-		}else {
-			$sql .= ' AND user_id = '.api_get_user_id();
-		}
-
-		if (!isset ($parent)) {
-			$sql.= ' AND category_id is null';
-		} else {
-			$sql.= ' AND category_id = '.intval($parent);
-		}
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return $number[0] != 0;
-	}
-
-	/**
-	 * Are there any results for this evaluation yet ?
-	 * The 'max' property should not be changed then.
-	 */
-	public function has_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'SELECT count(id) AS number
+            } else {
+                $sql .= ' AND user_id = '.api_get_user_id();
+            }
+
+        }else {
+            $sql .= ' AND user_id = '.api_get_user_id();
+        }
+
+        if (!isset ($parent)) {
+            $sql.= ' AND category_id is null';
+        } else {
+            $sql.= ' AND category_id = '.intval($parent);
+        }
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return $number[0] != 0;
+    }
+
+    /**
+     * Are there any results for this evaluation yet ?
+     * The 'max' property should not be changed then.
+     */
+    public function has_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'SELECT count(id) AS number
 				FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * Delete all results for this evaluation
-	 */
-	public function delete_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'DELETE FROM '.$tbl_grade_results.'
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return ($number[0] != 0);
+    }
+
+    /**
+     * Delete all results for this evaluation
+     */
+    public function delete_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'DELETE FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Delete this evaluation and all underlying results.
-	 */
-	public function delete_with_results()
-	{
-		$this->delete_results();
-		$this->delete();
-	}
-
-	/**
-	 * Check if the given score is possible for this evaluation
-	 */
-	public function is_valid_score($score)
-	{
-		return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
-	}
-
-	/**
-	 * Calculate the score of this evaluation
-	 * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
-	 * @param string $type (best, average, ranking)
-	 * @return	array (score, max) if student is given
-	 * 			array (sum of scores, number of scores) otherwise
-	 * 			or null if no scores available
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
+        Database::query($sql);
+    }
+
+    /**
+     * Delete this evaluation and all underlying results.
+     */
+    public function delete_with_results()
+    {
+        $this->delete_results();
+        $this->delete();
+    }
+
+    /**
+     * Check if the given score is possible for this evaluation
+     */
+    public function is_valid_score($score)
+    {
+        return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
+    }
+
+    /**
+     * Calculate the score of this evaluation
+     * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
+     * @param string $type (best, average, ranking)
+     * @return	array (score, max) if student is given
+     * 			array (sum of scores, number of scores) otherwise
+     * 			or null if no scores available
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
         $useSession = true;
-		if (isset($stud_id) && empty($type)) {
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
-			$data = Session::read('calc_score');
+        if (isset($stud_id) && empty($type)) {
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
+            $data = Session::read('calc_score');
             $results = isset($data[$key]) ? $data[$key] : null;
 
             if ($useSession == false) {
                 $results  = null;
             }
-			if (empty($results)) {
-				$results = Result::load(null, $stud_id, $this->id);
-				Session::write('calc_score', array($key => $results));
-			}
-
-			$score = 0;
-			/** @var Result $res */
-			foreach ($results as $res) {
-				$score = $res->get_score();
-			}
-
-			return array($score, $this->get_max());
-		} else {
-
-			$count = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			$sumResult = 0;
-
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
+            if (empty($results)) {
+                $results = Result::load(null, $stud_id, $this->id);
+                Session::write('calc_score', array($key => $results));
+            }
+
+            $score = 0;
+            /** @var Result $res */
+            foreach ($results as $res) {
+                $score = $res->get_score();
+            }
+
+            return array($score, $this->get_max());
+        } else {
+
+            $count = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            $sumResult = 0;
+
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
             $data = Session::read('calc_score');
             $allResults = isset($data[$key]) ? $data[$key] : null;
             if ($useSession == false) {
                 $allResults  = null;
             }
-			if (empty($allResults)) {
-				$allResults = Result::load(null, null, $this->id);
-				Session::write($key, $allResults);
-			}
-
-			$students = array();
-			/** @var Result $res */
-			foreach ($allResults as $res) {
-				$score = $res->get_score();
-				if (!empty($score) || $score == '0') {
-					$count++;
-					$sum += $score / $this->get_max();
-					$sumResult += $score;
-					if ($score > $bestResult) {
-						$bestResult = $score;
-					}
-					$weight = $this->get_max();
-				}
-				$students[$res->get_user_id()] = $score;
-			}
-
-			if (empty($count)) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $weight);
-					break;
-				case 'average':
-					return array($sumResult/$count, $weight);
-					break;
-				case 'ranking':
+            if (empty($allResults)) {
+                $allResults = Result::load(null, null, $this->id);
+                Session::write($key, $allResults);
+            }
+
+            $students = array();
+            /** @var Result $res */
+            foreach ($allResults as $res) {
+                $score = $res->get_score();
+                if (!empty($score) || $score == '0') {
+                    $count++;
+                    $sum += $score / $this->get_max();
+                    $sumResult += $score;
+                    if ($score > $bestResult) {
+                        $bestResult = $score;
+                    }
+                    $weight = $this->get_max();
+                }
+                $students[$res->get_user_id()] = $score;
+            }
+
+            if (empty($count)) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $weight);
+                    break;
+                case 'average':
+                    return array($sumResult/$count, $weight);
+                    break;
+                case 'ranking':
                     $students = array();
                     /** @var Result $res */
                     foreach ($allResults as $res) {
                         $score = $res->get_score();
                         $students[$res->get_user_id()] = $score;
                     }
-					return AbstractLink::getCurrentUserRanking($stud_id, $students);
-					break;
-				default:
-					return array($sum, $count);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Generate an array of possible categories where this evaluation can be moved to.
-	 * Notice: its own parent will be included in the list: it's up to the frontend
-	 * to disable this element.
-	 * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
-	 */
-	public function get_target_categories()
-	{
-		// - course independent evaluation
-		//   -> movable to root or other course independent categories
-		// - evaluation inside a course
-		//   -> movable to root, independent categories or categories inside the course
-		$user = (api_is_platform_admin() ? null : api_get_user_id());
-		$targets = array();
-		$level = 0;
-
-		$root = array(0, get_lang('RootCat'), $level);
-		$targets[] = $root;
-
-		if (isset($this->course_code) && !empty($this->course_code)) {
-			$crscats = Category::load(null,null,$this->course_code,0);
-			foreach ($crscats as $cat) {
-				$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-				$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-			}
-		}
-
-		$indcats = Category::load(null,$user,0,0);
-		foreach ($indcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-
-		return $targets;
-	}
-
-	/**
-	 * Internal function used by get_target_categories()
-	 * @param integer $level
-	 */
-	private function add_target_subcategories($targets, $level, $catid)
-	{
-		$subcats = Category::load(null,null,null,$catid);
-		foreach ($subcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-		return $targets;
-	}
-
-	/**
-	 * Move this evaluation to the given category.
-	 * If this evaluation moves from inside a course to outside,
-	 * its course code is also changed.
-	 */
-	public function move_to_cat($cat)
-	{
-		$this->set_category_id($cat->get_id());
-		if ($this->get_course_code() != $cat->get_course_code()) {
-			$this->set_course_code($cat->get_course_code());
-		}
-		$this->save();
-	}
-
-	/**
-	 * Retrieve evaluations where a student has results for
-	 * and return them as an array of Evaluation objects
-	 * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
-	 * @param int $stud_id student id
-	 */
-	public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
+                    return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                    break;
+                default:
+                    return array($sum, $count);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Generate an array of possible categories where this evaluation can be moved to.
+     * Notice: its own parent will be included in the list: it's up to the frontend
+     * to disable this element.
+     * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
+     */
+    public function get_target_categories()
+    {
+        // - course independent evaluation
+        //   -> movable to root or other course independent categories
+        // - evaluation inside a course
+        //   -> movable to root, independent categories or categories inside the course
+        $user = (api_is_platform_admin() ? null : api_get_user_id());
+        $targets = array();
+        $level = 0;
+
+        $root = array(0, get_lang('RootCat'), $level);
+        $targets[] = $root;
+
+        if (isset($this->course_code) && !empty($this->course_code)) {
+            $crscats = Category::load(null,null,$this->course_code,0);
+            foreach ($crscats as $cat) {
+                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+                $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+            }
+        }
+
+        $indcats = Category::load(null,$user,0,0);
+        foreach ($indcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+
+        return $targets;
+    }
+
+    /**
+     * Internal function used by get_target_categories()
+     * @param integer $level
+     */
+    private function add_target_subcategories($targets, $level, $catid)
+    {
+        $subcats = Category::load(null,null,null,$catid);
+        foreach ($subcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+        return $targets;
+    }
+
+    /**
+     * Move this evaluation to the given category.
+     * If this evaluation moves from inside a course to outside,
+     * its course code is also changed.
+     */
+    public function move_to_cat($cat)
+    {
+        $this->set_category_id($cat->get_id());
+        if ($this->get_course_code() != $cat->get_course_code()) {
+            $this->set_course_code($cat->get_course_code());
+        }
+        $this->save();
+    }
+
+    /**
+     * Retrieve evaluations where a student has results for
+     * and return them as an array of Evaluation objects
+     * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
+     * @param int $stud_id student id
+     */
+    public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
 				WHERE id IN (
 					SELECT evaluation_id FROM '.$tbl_grade_results.'
 					WHERE user_id = '.intval($stud_id).' AND score IS NOT NULL
 				)';
-		if (!api_is_allowed_to_edit()) {
-			$sql .= ' AND visible = 1';
-		}
-		if (isset($cat_id)) {
-			$sql .= ' AND category_id = '.intval($cat_id);
-		} else {
-			$sql .= ' AND category_id >= 0';
-		}
-
-		$result = Database::query($sql);
-		$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $alleval;
-	}
-
-	/**
-	 * Get a list of students that do not have a result record for this evaluation
-	 */
-	public function get_not_subscribed_students($first_letter_user = '')
-	{
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
-			." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
-			.' AND status = '.STUDENT
-			.' AND user_id NOT IN'
-			.' (SELECT user_id FROM '.$tbl_grade_results
-			.' WHERE evaluation_id = '.intval($this->id)
-			.' )'
-			.' ORDER BY lastname';
-
-		$result = Database::query($sql);
-		$users = Database::store_result($result);
-
-		return $users;
-	}
-
-	/**
-	 * Find evaluations by name
-	 * @param string $name_mask search string
-	 * @return array evaluation objects matching the search criterium
-	 * @todo can be written more efficiently using a new (but very complex) sql query
-	 */
-	public function find_evaluations($name_mask,$selectcat)
-	{
-		$rootcat = Category::load($selectcat);
-		$evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
-		$foundevals = array();
-		foreach ($evals as $eval) {
-			if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
-				$foundevals[] = $eval;
-			}
-		}
-		return $foundevals;
-	}
-
-	public function get_item_type()
-	{
-		return 'E';
-	}
-
-	public function get_icon_name()
-	{
-		return $this->has_results() ? 'evalnotempty' : 'evalempty';
-	}
-
-	/**
-	 * Locks an evaluation, only one who can unlock it is the platform administrator.
-	 * @param int locked 1 or unlocked 0
-	 *
-	 **/
-	function lock($locked)
-	{
-		$table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
-		Database::query($sql);
-	}
-
-	function check_lock_permissions()
-	{
-		if (api_is_platform_admin()) {
-			return true;
-		} else {
-			if ($this->is_locked()) {
-				api_not_allowed();
-			}
-		}
-	}
-
-	function delete_linked_data()
-	{
-
-	}
+        if (!api_is_allowed_to_edit()) {
+            $sql .= ' AND visible = 1';
+        }
+        if (isset($cat_id)) {
+            $sql .= ' AND category_id = '.intval($cat_id);
+        } else {
+            $sql .= ' AND category_id >= 0';
+        }
+
+        $result = Database::query($sql);
+        $alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $alleval;
+    }
+
+    /**
+     * Get a list of students that do not have a result record for this evaluation
+     */
+    public function get_not_subscribed_students($first_letter_user = '')
+    {
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
+            ." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
+            .' AND status = '.STUDENT
+            .' AND user_id NOT IN'
+            .' (SELECT user_id FROM '.$tbl_grade_results
+            .' WHERE evaluation_id = '.intval($this->id)
+            .' )'
+            .' ORDER BY lastname';
+
+        $result = Database::query($sql);
+        $users = Database::store_result($result);
+
+        return $users;
+    }
+
+    /**
+     * Find evaluations by name
+     * @param string $name_mask search string
+     * @return array evaluation objects matching the search criterium
+     * @todo can be written more efficiently using a new (but very complex) sql query
+     */
+    public function find_evaluations($name_mask,$selectcat)
+    {
+        $rootcat = Category::load($selectcat);
+        $evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
+        $foundevals = array();
+        foreach ($evals as $eval) {
+            if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
+                $foundevals[] = $eval;
+            }
+        }
+        return $foundevals;
+    }
+
+    public function get_item_type()
+    {
+        return 'E';
+    }
+
+    public function get_icon_name()
+    {
+        return $this->has_results() ? 'evalnotempty' : 'evalempty';
+    }
+
+    /**
+     * Locks an evaluation, only one who can unlock it is the platform administrator.
+     * @param int locked 1 or unlocked 0
+     *
+     **/
+    function lock($locked)
+    {
+        $table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
+        Database::query($sql);
+    }
+
+    function check_lock_permissions()
+    {
+        if (api_is_platform_admin()) {
+            return true;
+        } else {
+            if ($this->is_locked()) {
+                api_not_allowed();
+            }
+        }
+    }
+
+    function delete_linked_data()
+    {
+
+    }
 
     public function getStudentList()
     {
         return $this->studentList;
     }
 
-	public function setStudentList($list)
-	{
-		$this->studentList = $list;
-	}
+    public function setStudentList($list)
+    {
+        $this->studentList = $list;
+    }
 }

main/gradebook/lib/results_data_generator.class.php

Spacing +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * Get total number of results (rows)
      */
-    public function get_total_results_count ()
+    public function get_total_results_count()
     {
         return count($this->results);
     }
@@ -53,12 +53,12 @@ 
      * 4 ['score']     : student's score
      * 5 ['display']   : custom score display (only if custom scoring enabled)
      */
-    public function get_data ($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf=false)
+    public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf = false)
     {
         // do some checks on count, redefine if invalid value
         $number_decimals = api_get_setting('gradebook_number_decimals');
         if (!isset($count)) {
-            $count = count ($this->results) - $start;
+            $count = count($this->results) - $start;
         }
         if ($count < 0) {
             $count = 0;
@@ -66,11 +66,11 @@ 
         $scoredisplay = ScoreDisplay :: instance();
         // generate actual data array
         $table = array();
-        foreach($this->results as $result) {
+        foreach ($this->results as $result) {
             $user = array();
             $info = api_get_user_info($result->get_user_id());
             $user['id'] = $result->get_user_id();
-            if ($pdf){
+            if ($pdf) {
                 $user['username'] = $info['username'];
             }
             $user['result_id'] = $result->get_id();
@@ -92,7 +92,7 @@ 
                 true
             )
             );
-            if ($pdf && $number_decimals == null){
+            if ($pdf && $number_decimals == null) {
                 $user['scoreletter'] = $result->get_score();
             }
             if ($scoredisplay->is_custom()) {
@@ -132,13 +132,13 @@ 
      * @param bool  Whether we want to ignore the score color
      * @result string The score as we want to show it
      */
-    private function get_score_display ($score, $realscore, $ignore_score_color = false)
+    private function get_score_display($score, $realscore, $ignore_score_color = false)
     {
         if ($score != null) {
             $scoredisplay = ScoreDisplay :: instance();
             $type = SCORE_CUSTOM;
             if ($realscore === true) {
-                $type = SCORE_DIV_PERCENT ;
+                $type = SCORE_DIV_PERCENT;
             }
 
             return $scoredisplay->display_score(
@@ -172,10 +172,10 @@ 
         }
     }
 
-    function sort_by_mask ($item1, $item2)
+    function sort_by_mask($item1, $item2)
     {
-        $score1 = (isset($item1['score']) ? array($item1['score'],$this->evaluation->get_max()) : null);
-        $score2 = (isset($item2['score']) ? array($item2['score'],$this->evaluation->get_max()) : null);
+        $score1 = (isset($item1['score']) ? array($item1['score'], $this->evaluation->get_max()) : null);
+        $score2 = (isset($item2['score']) ? array($item2['score'], $this->evaluation->get_max()) : null);
         return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2);
     }
 }

main/gradebook/lib/flatview_data_generator.class.php

Spacing +44 added lines, -44 removed lines

@@ -114,10 +114,10 @@ 
             isset($this->params['only_subcat']) &&
             $this->params['only_subcat'] == $this->category->get_id()
         ) {
-            $main_weight  = $this->category->get_weight();
+            $main_weight = $this->category->get_weight();
             $grade_model_id = $this->category->get_grade_model_id();
         } else {
-            $main_cat  = Category::load($parent_id, null, null);
+            $main_cat = Category::load($parent_id, null, null);
             $main_weight = $main_cat[0]->get_weight();
             $grade_model_id = $main_cat[0]->get_grade_model_id();
         }
@@ -199,7 +199,7 @@ 
                     $list = [];
                     $list['items'] = $finalList;
                     $list['header'] = '<center>'.$mainHeader.'</center>';
-                    $headers[]= $list;
+                    $headers[] = $list;
                 } else {
                     $headers[] = '<center>'.$mainHeader.'</center>';
                 }
@@ -209,7 +209,7 @@ 
                 (isset($this->params['only_total_category']) &&
                     $this->params['only_total_category'] == false)
             ) {
-                for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) {
+                for ($count = 0; ($count < $items_count) && ($items_start + $count < count($this->evals_links)); $count++) {
                     /** @var AbstractLink $item */
                     $item = $this->evals_links[$count + $items_start];
                     $weight = round(100 * $item->get_weight() / $main_weight, 1);
@@ -227,7 +227,7 @@ 
                     !in_array($item->get_id(), $evaluationsAdded)
                 ) {
                     $weight = round(100 * $item->get_weight() / $main_weight, 1);
-                    $headers[] = $item->get_name() . ' ' . $weight . ' % ';
+                    $headers[] = $item->get_name().' '.$weight.' % ';
                 }
             }
         }
@@ -266,7 +266,7 @@ 
         if (!isset($items_count)) {
             $items_count = count($this->evals_links) - $items_start;
         }
-        for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) {
+        for ($count = 0; ($count < $items_count) && ($items_start + $count < count($this->evals_links)); $count++) {
             $item = $this->evals_links [$count + $items_start];
             $headers[] = $item->get_name();
         }
@@ -293,13 +293,13 @@ 
     ) {
         // Do some checks on users/items counts, redefine if invalid values
         if (!isset($users_count)) {
-            $users_count = count ($this->users) - $users_start;
+            $users_count = count($this->users) - $users_start;
         }
         if ($users_count < 0) {
             $users_count = 0;
         }
         if (!isset($items_count)) {
-            $items_count = count ($this->evals) + count ($this->links) - $items_start;
+            $items_count = count($this->evals) + count($this->links) - $items_start;
         }
         if ($items_count < 0) {
             $items_count = 0;
@@ -312,10 +312,10 @@ 
 
         // sort users array
         if ($users_sorting & self :: FVDG_SORT_LASTNAME) {
-            usort($userTable, array('FlatViewDataGenerator','sort_by_last_name'));
+            usort($userTable, array('FlatViewDataGenerator', 'sort_by_last_name'));
 
         } elseif ($users_sorting & self :: FVDG_SORT_FIRSTNAME) {
-            usort($userTable, array('FlatViewDataGenerator','sort_by_first_name'));
+            usort($userTable, array('FlatViewDataGenerator', 'sort_by_first_name'));
         }
 
         if ($users_sorting & self :: FVDG_SORT_DESC) {
@@ -356,10 +356,10 @@ 
         $parent_id = $this->category->get_parent_id();
 
         if ($parent_id == 0 or $this->params['only_subcat'] == $this->category->get_id()) {
-            $main_weight  = $this->category->get_weight();
+            $main_weight = $this->category->get_weight();
             $grade_model_id = $this->category->get_grade_model_id();
         } else {
-            $main_cat  = Category::load($parent_id, null, null);
+            $main_cat = Category::load($parent_id, null, null);
             $main_weight = $main_cat[0]->get_weight();
             $grade_model_id = $main_cat[0]->get_grade_model_id();
         }
@@ -471,11 +471,11 @@ 
                     $divide = $score[1] == 0 ? 1 : $score[1];
 
                     $sub_cat_percentage = $sum_categories_weight_array[$sub_cat->get_id()];
-                    $item_value  = $score[0]/$divide*$main_weight;
+                    $item_value = $score[0] / $divide * $main_weight;
 
                     // Fixing total when using one or multiple gradebooks
-                    $percentage = $sub_cat->get_weight()/($sub_cat_percentage) * $sub_cat_percentage/$this->category->get_weight();
-                    $item_value = $percentage*$item_value;
+                    $percentage = $sub_cat->get_weight() / ($sub_cat_percentage) * $sub_cat_percentage / $this->category->get_weight();
+                    $item_value = $percentage * $item_value;
                     $item_total += $sub_cat->get_weight();
                     /*
                         if ($convert_using_the_global_weight) {
@@ -521,7 +521,7 @@ 
                 if ($convert_using_the_global_weight) {
                     //$item_total = $main_weight;
                 }
-            } else  {
+            } else {
                 // All evaluations
                 $result = $this->parseEvaluations(
                     $user_id,
@@ -628,7 +628,7 @@ 
             // Sub cat weight
             //$sub_cat_percentage = $sum_categories_weight_array[$item->get_category_id()];
 
-            $item_value = isset($score[0]) ? $score[0]/$divide : 0;
+            $item_value = isset($score[0]) ? $score[0] / $divide : 0;
 
             // Fixing total when using one or multiple gradebooks.
             if (empty($parentCategoryIdFilter)) {
@@ -710,11 +710,11 @@ 
         $data = array();
 
         foreach ($selected_users as $user) {
-            $row = array ();
-            for ($count=0;$count < count($this->evals_links); $count++) {
+            $row = array();
+            for ($count = 0; $count < count($this->evals_links); $count++) {
                 $item = $this->evals_links [$count];
                 $score = $item->calc_score($user[0]);
-                $porcent_score = isset($score[1]) &&  $score[1] > 0 ? ($score[0]*100)/$score[1] :0;
+                $porcent_score = isset($score[1]) && $score[1] > 0 ? ($score[0] * 100) / $score[1] : 0;
                 $row[$item->get_name()] = $porcent_score;
             }
             $data[$user[0]] = $row;
@@ -726,7 +726,7 @@ 
             $tmp = array();
             foreach ($items as $item => $value) {
                 $tmp[] = $item;
-                if (in_array($item,$tmp)) {
+                if (in_array($item, $tmp)) {
                     $data_by_item[$item][$uid] = $value;
                 }
             }
@@ -737,7 +737,7 @@ 
         */
         $result = array();
         foreach ($data_by_item as $k => $v) {
-            $average = round(array_sum($v)/count($v));
+            $average = round(array_sum($v) / count($v));
             arsort($v);
             $maximum = array_shift($v);
             $minimum = array_pop($v);
@@ -746,7 +746,7 @@ 
                 $minimum = 0;
             }
 
-            $summary= array(
+            $summary = array(
                 'max' => $maximum,
                 'min' => $minimum,
                 'avg' => $average
@@ -763,32 +763,32 @@ 
     public function get_data_to_graph()
     {
         // do some checks on users/items counts, redefine if invalid values
-        $usertable = array ();
+        $usertable = array();
         foreach ($this->users as $user) {
             $usertable[] = $user;
         }
         // sort users array
-        usort($usertable, array ('FlatViewDataGenerator','sort_by_first_name'));
+        usort($usertable, array('FlatViewDataGenerator', 'sort_by_first_name'));
 
-        $data = array ();
+        $data = array();
 
         $selected_users = $usertable;
         foreach ($selected_users as $user) {
-            $row = array ();
-            $row[] = $user[0];    // user id
+            $row = array();
+            $row[] = $user[0]; // user id
             $item_value = 0;
             $item_total = 0;
 
-            for ($count=0;$count < count($this->evals_links); $count++) {
+            for ($count = 0; $count < count($this->evals_links); $count++) {
                 $item = $this->evals_links[$count];
                 $score = $item->calc_score($user[0]);
 
-                $divide =( ($score[1])==0 ) ? 1 : $score[1];
-                $item_value += $score[0]/$divide*$item->get_weight();
+                $divide = (($score[1]) == 0) ? 1 : $score[1];
+                $item_value += $score[0] / $divide * $item->get_weight();
                 $item_total += $item->get_weight();
 
 
-                $score_denom = ($score[1]==0) ? 1 : $score[1];
+                $score_denom = ($score[1] == 0) ? 1 : $score[1];
                 $score_final = ($score[0] / $score_denom) * 100;
                 $row[] = $score_final;
             }
@@ -814,15 +814,15 @@ 
             $usertable[] = $user;
         }
         // sort users array
-        usort($usertable, array ('FlatViewDataGenerator','sort_by_first_name'));
+        usort($usertable, array('FlatViewDataGenerator', 'sort_by_first_name'));
 
         // generate actual data array
         $scoredisplay = ScoreDisplay :: instance();
         $data = array();
         $selected_users = $usertable;
         foreach ($selected_users as $user) {
-            $row = array ();
-            $row[] = $user[0];    // user id
+            $row = array();
+            $row[] = $user[0]; // user id
             $item_value = 0;
             $item_total = 0;
             $final_score = 0;
@@ -843,8 +843,8 @@ 
                     $divide = $score[1] == 0 ? 1 : $score[1];
 
                     //$sub_cat_percentage = $sum_categories_weight_array[$sub_cat->get_id()];
-                    $item_value     = $score[0]/$divide*$main_weight;
-                    $item_total        += $sub_cat->get_weight();
+                    $item_value = $score[0] / $divide * $main_weight;
+                    $item_total += $sub_cat->get_weight();
 
                     $row[] = array(
                         $item_value,
@@ -861,23 +861,23 @@ 
                     trim($scoredisplay->display_score($total_score, SCORE_CUSTOM, null, true))
                 );
             } else {
-                for ($count=0;$count < count($this->evals_links); $count++) {
+                for ($count = 0; $count < count($this->evals_links); $count++) {
                     $item = $this->evals_links [$count];
                     $score = $item->calc_score($user[0]);
                     $divide = ($score[1]) == 0 ? 1 : $score[1];
                     $item_value += $score[0] / $divide * $item->get_weight();
-                    $item_total+=$item->get_weight();
-                    $score_denom=($score[1]==0) ? 1 : $score[1];
+                    $item_total += $item->get_weight();
+                    $score_denom = ($score[1] == 0) ? 1 : $score[1];
                     $score_final = ($score[0] / $score_denom) * 100;
-                    $row[] = array ($score_final, trim($scoredisplay->display_score($score, SCORE_CUSTOM,null, true)));
+                    $row[] = array($score_final, trim($scoredisplay->display_score($score, SCORE_CUSTOM, null, true)));
 
                 }
-                $total_score=array($item_value,$item_total);
+                $total_score = array($item_value, $item_total);
                 $score_final = ($item_value / $item_total) * 100;
                 if ($displayWarning) {
-                    Display::display_warning_message( Display::display_warning_message($total_score[1]));
+                    Display::display_warning_message(Display::display_warning_message($total_score[1]));
                 }
-                $row[] =array ($score_final, trim($scoredisplay->display_score($total_score, SCORE_CUSTOM, null, true)));
+                $row[] = array($score_final, trim($scoredisplay->display_score($total_score, SCORE_CUSTOM, null, true)));
             }
 
             $data[] = $row;

main/admin/grade_models.php

Indentation +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
                         array('name'=>'name',           'index'=>'name',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'description',    'index'=>'description', 'width'=>'500',  'align'=>'left','sortable'=>'false'),
                         array('name'=>'actions',        'index'=>'actions',     'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
-                       );
+                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
 //height auto
@@ -89,8 +89,8 @@ 
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
                          return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
-                         '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
-                         '\';
+                            '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+                            '\';
                  }';
 ?>
 <script>

Spacing +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
 $htmlHeadXtra[] = api_get_jqgrid_js();
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $action = isset($_GET['action']) ? $_GET['action'] : null;
 
@@ -28,16 +28,16 @@ 
 $token = Security::get_token();
 
 if ($action == 'add') {
-    $interbreadcrumb[]=array('url' => 'grade_models.php','name' => get_lang('GradeModel'));
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add'));
+    $interbreadcrumb[] = array('url' => 'grade_models.php', 'name' => get_lang('GradeModel'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add'));
 } elseif ($action == 'edit') {
-    $interbreadcrumb[]=array('url' => 'grade_models.php','name' => get_lang('GradeModel'));
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit'));
+    $interbreadcrumb[] = array('url' => 'grade_models.php', 'name' => get_lang('GradeModel'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
 } else {
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('GradeModel'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradeModel'));
 }
 
-$htmlHeadXtra[]= '<script>
+$htmlHeadXtra[] = '<script>
 
 function plusItem(item) {
         if (item != 1) {
@@ -77,9 +77,9 @@ 
 
 //Column config
 $column_model   = array(
-                        array('name'=>'name',           'index'=>'name',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'description',    'index'=>'description', 'width'=>'500',  'align'=>'left','sortable'=>'false'),
-                        array('name'=>'actions',        'index'=>'actions',     'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
+                        array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left', 'sortable'=>'false'),
+                        array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false')
                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
@@ -88,8 +88,8 @@ 
 
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
-                         return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
-                         '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
+                         return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
+                         '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'.
                          '\';
                  }';
 ?>
@@ -97,7 +97,7 @@ 
 $(function() {
 <?php
     // grid definition see the $obj->display() function
-    echo Display::grid_js('grade_model',  $url, $columns, $column_model, $extra_params, array(), $action_links,true);
+    echo Display::grid_js('grade_model', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
 ?>
 });
 </script>
@@ -125,7 +125,7 @@ 
             $obj->display();
         } else {
             echo '<div class="actions">';
-            echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+            echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '</div>';
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(array('sec_token' => $token));
@@ -147,7 +147,7 @@ 
             $obj->display();
         } else {
             echo '<div class="actions">';
-            echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+            echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '</div>';
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(array('sec_token' => $token));

main/admin/ldap_import_students.php

Spacing +17 added lines, -17 removed lines

@@ -9,7 +9,7 @@ 
  * Code
  */
 // resetting the course id
-$cidReset=true;
+$cidReset = true;
 require_once('../inc/global.inc.php');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -18,11 +18,11 @@ 
 api_protect_admin_script();
 require('../auth/ldap/authldap.php');
 
-$annee_base=date('Y');
+$annee_base = date('Y');
 
 $tool_name = get_lang('LDAPImport');
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $htmlHeadXtra[] = '<script language="JavaScript" type="text/javascript">
 var buttoncheck = 1;
@@ -48,7 +48,7 @@ 
 
 $annee = $_GET['annee'];
 $composante = $_GET['composante'];
-$etape =  $_GET['etape'];
+$etape = $_GET['etape'];
 $course = $_POST['course'];
 
 
@@ -198,7 +198,7 @@ 
 	echo '</div>';
 }
 */
-elseif(!empty($annee) && empty($course))
+elseif (!empty($annee) && empty($course))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
@@ -206,7 +206,7 @@ 
 	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
 	echo '<select name="course">';
 	$courses = CourseManager::get_courses_list();
-	foreach($courses as $row)
+	foreach ($courses as $row)
 	{
 		echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
 	}
@@ -239,7 +239,7 @@ 
 
 		$info = ldap_get_entries($ds, $sr);
 
-		for ($key = 0; $key < $info["count"]; $key ++) {
+		for ($key = 0; $key < $info["count"]; $key++) {
 			$nom_form[] = $info[$key]["sn"][0];
 			$prenom_form[] = $info[$key]["givenname"][0];
 			$email_form[] = $info[$key]["mail"][0];
@@ -259,7 +259,7 @@ 
 		asort($nom_form);
 		reset($nom_form);
 
-		$statut=5;
+		$statut = 5;
 		include ('ldap_form_add_users_group.php');
 	} else {
 		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
@@ -270,25 +270,25 @@ 
     echo '</div>';
 
 }
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
+elseif (!empty($annee) && !empty($course) && ($_POST['confirmed'] == 'yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
+	$id = $_POST['username_form'];
+	$UserList = array();
 	$userid_match_login = array();
 	foreach ($id as $form_index=>$user_id)
 	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
 		{
 			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
+			$UserList[] = $tmp;
 			$userid_match_login[$tmp] = $user_id;
 		}
 	}
 	if (!empty($_POST['course']))
 	{
-		foreach($UserList as $user_id)
+		foreach ($UserList as $user_id)
 		{
-			CourseManager::add_user_to_course($user_id,$_POST['course']);
+			CourseManager::add_user_to_course($user_id, $_POST['course']);
 		}
 		header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
 	}
@@ -314,8 +314,8 @@ 
 	else
 	{
 		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
+		$message = get_lang('NoUserAdded');
+		Display :: display_normal_message($message, false);
 	}
 	echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';

Braces +1 added lines, -2 removed lines

@@ -269,8 +269,7 @@
     echo '<br /><br />';
     echo '</div>';
 
-}
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
+} elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
 {
 	$id=$_POST['username_form'];
 	$UserList=array();

Indentation +101 added lines, -101 removed lines

@@ -56,19 +56,19 @@ 
 //if ($annee == "" && $composante == "" && $etape == "") {
 if (empty($annee) && empty($course))
 {
-		Display::display_header($tool_name);
-		echo '<div style="align:center">';
-		Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU'));
-		echo get_lang('LDAPSelectFilterOnUsersOU');
-		//echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />';
-		///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />';
-
-		echo '<form method="get" action="'.api_get_self().'"><br />';
-		echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
-		echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />';
-		echo '<input type="submit" value="'.get_lang('Submit').'">';
-		echo '</form>';
-		echo '</div>';
+        Display::display_header($tool_name);
+        echo '<div style="align:center">';
+        Display::display_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU'));
+        echo get_lang('LDAPSelectFilterOnUsersOU');
+        //echo '<em>'.get_lang('ToDoThisYouMustEnterYearComponentAndComponentStep').'</em><br />';
+        ///echo get_lang('FollowEachOfTheseStepsStepByStep').'<br />';
+
+        echo '<form method="get" action="'.api_get_self().'"><br />';
+        echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
+        echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"><br />';
+        echo '<input type="submit" value="'.get_lang('Submit').'">';
+        echo '</form>';
+        echo '</div>';
 
 }
 /*
@@ -200,71 +200,71 @@ 
 */
 elseif(!empty($annee) && empty($course))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align:center">';
-	echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
-	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
-	echo '<select name="course">';
-	$courses = CourseManager::get_courses_list();
-	foreach($courses as $row)
-	{
-		echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
-	}
-	echo '</select>';
-	echo '<input type="submit" value="'.get_lang('Submit').'">';
-	echo '</form>';
-	echo '</div>';
+    Display::display_header($tool_name);
+    echo '<div style="align:center">';
+    echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
+    echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
+    echo '<select name="course">';
+    $courses = CourseManager::get_courses_list();
+    foreach($courses as $row)
+    {
+        echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
+    }
+    echo '</select>';
+    echo '<input type="submit" value="'.get_lang('Submit').'">';
+    echo '</form>';
+    echo '</div>';
 }
 // form4  annee != 0; composante != 0 etape != 0
 //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') {
 elseif (!empty($annee) && !empty($course) && empty($_POST['confirmed']))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align: center;">';
-	echo '<br />';
-	echo '<br />';
-	echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
-	//echo "Connection ...";
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-
-	if ($ds) {
-
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-
-		//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
-		//echo "(ou=*$annee,ou=$composante)";
-		$sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
-
-		$info = ldap_get_entries($ds, $sr);
-
-		for ($key = 0; $key < $info["count"]; $key ++) {
-			$nom_form[] = $info[$key]["sn"][0];
-			$prenom_form[] = $info[$key]["givenname"][0];
-			$email_form[] = $info[$key]["mail"][0];
-			// Get uid from dn
-			//$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-			//$username_form[] = $dn_array[0]; // uid is first key
-			$username_form[] = $info[$key]['uid'][0];
-			$outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
-			//$val = ldap_get_values_len($ds, $entry, "userPassword");
-			//$password_form[] = $val[0];
-			$password_form[] = $info[$key]['userPassword'][0];
-		}
-		ldap_unbind($ds);
-
-		/*-----------------------------------------------*/
-
-		asort($nom_form);
-		reset($nom_form);
-
-		$statut=5;
-		include ('ldap_form_add_users_group.php');
-	} else {
-		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
-	}
-	echo '<br /><br />';
+    Display::display_header($tool_name);
+    echo '<div style="align: center;">';
+    echo '<br />';
+    echo '<br />';
+    echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
+    //echo "Connection ...";
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+
+    if ($ds) {
+
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+
+        //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
+        //echo "(ou=*$annee,ou=$composante)";
+        $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
+
+        $info = ldap_get_entries($ds, $sr);
+
+        for ($key = 0; $key < $info["count"]; $key ++) {
+            $nom_form[] = $info[$key]["sn"][0];
+            $prenom_form[] = $info[$key]["givenname"][0];
+            $email_form[] = $info[$key]["mail"][0];
+            // Get uid from dn
+            //$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+            //$username_form[] = $dn_array[0]; // uid is first key
+            $username_form[] = $info[$key]['uid'][0];
+            $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
+            //$val = ldap_get_values_len($ds, $entry, "userPassword");
+            //$password_form[] = $val[0];
+            $password_form[] = $info[$key]['userPassword'][0];
+        }
+        ldap_unbind($ds);
+
+        /*-----------------------------------------------*/
+
+        asort($nom_form);
+        reset($nom_form);
+
+        $statut=5;
+        include ('ldap_form_add_users_group.php');
+    } else {
+        echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
     echo '</div>';
@@ -272,27 +272,27 @@ 
 }
 elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
-	$userid_match_login = array();
-	foreach ($id as $form_index=>$user_id)
-	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
-		{
-			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
-			$userid_match_login[$tmp] = $user_id;
-		}
-	}
-	if (!empty($_POST['course']))
-	{
-		foreach($UserList as $user_id)
-		{
-			CourseManager::add_user_to_course($user_id,$_POST['course']);
-		}
-		header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
-	}
-	/*
+    $id=$_POST['username_form'];
+    $UserList=array();
+    $userid_match_login = array();
+    foreach ($id as $form_index=>$user_id)
+    {
+        if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+        {
+            $tmp = ldap_add_user($user_id);
+            $UserList[]= $tmp;
+            $userid_match_login[$tmp] = $user_id;
+        }
+    }
+    if (!empty($_POST['course']))
+    {
+        foreach($UserList as $user_id)
+        {
+            CourseManager::add_user_to_course($user_id,$_POST['course']);
+        }
+        header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
+    }
+    /*
 	else
 	{
 		Display :: display_header($tool_name);
@@ -311,13 +311,13 @@ 
 		Display :: display_normal_message($message,false);
 	}
 	*/
-	else
-	{
-		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
-	}
-	echo '<br /><br />';
+    else
+    {
+        Display::display_header($tool_name);
+        $message=get_lang('NoUserAdded');
+        Display :: display_normal_message($message,false);
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
 }

main/admin/access_url_add_usergroup_to_url.php

Indentation +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
                   <?php
                     echo Display::get_alphabet_options($firstLetterUserGroup);
                     echo Display::get_numeric_options(0, 9, $firstLetterUserGroup);
-                  ?>
+                    ?>
             </select>
         </td>
         <td width="20%">&nbsp;</td>

Spacing +4 added lines, -4 removed lines

@@ -30,8 +30,8 @@ 
 $tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
 
 $tool_name = get_lang('AddUserGroupToURL');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 Display::display_header($tool_name);
 
@@ -46,8 +46,8 @@ 
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
-    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array() ;
-    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array();
+    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array();
     $firstLetterUserGroup = $_POST['first_letter_user_group'];
 
     if ($form_sent == 1) {

Braces +8 added lines, -2 removed lines

@@ -99,7 +99,10 @@ 
         <td width="40%" align="center">
         <select name="user_group_list[]" multiple="multiple" size="20" style="width:400px;">
 		<?php foreach ($dbUserGroups as $item) { ?>
-			<option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) echo 'selected="selected"'; ?>><?php echo $item['name']; ?>
+			<option value="<?php echo $item['id']; ?>" <?php if (in_array($item['id'], $courses)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $item['name']; ?>
             </option>
         <?php } ?>
     </select>
@@ -110,7 +113,10 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:300px;">
 		<?php foreach ($db_urls as $url_obj) { ?>
-        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
+        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $url_obj['url']; ?>
         </option>
 		<?php } ?>
     </select>

main/admin/course_request_rejected.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
     $from = intval($from);
     $number_of_items = intval($number_of_items);
     $column = intval($column);
-    $direction = !in_array(strtolower(trim($direction)), ['asc','desc']) ? 'asc' : $direction;
+    $direction = !in_array(strtolower(trim($direction)), ['asc', 'desc']) ? 'asc' : $direction;
 
     $sql = "SELECT
                 id AS col0,

main/admin/event_controller.php

Spacing +6 added lines, -6 removed lines

@@ -67,12 +67,12 @@ 
 
 //Column config
 $column_model   = array(
-                        array('name'=>'subject',        'index'=>'subject',        'width'=>'80',   'align'=>'left'),
+                        array('name'=>'subject', 'index'=>'subject', 'width'=>'80', 'align'=>'left'),
 //                        array('name'=>'message',        'index'=>'message', 'width'=>'500',  'align'=>'left','sortable'=>'false'),
-                        array('name'=>'event_type_name',        'index'=>'event_type_name',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'language_id',        'index'=>'language_id',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'activated',        'index'=>'activated',        'width'=>'80',   'align'=>'left'),
-                        array('name'=>'actions',        'index'=>'actions',     'width'=>'100')
+                        array('name'=>'event_type_name', 'index'=>'event_type_name', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'language_id', 'index'=>'language_id', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'activated', 'index'=>'activated', 'width'=>'80', 'align'=>'left'),
+                        array('name'=>'actions', 'index'=>'actions', 'width'=>'100')
                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
@@ -82,7 +82,7 @@ 
 $htmlHeadXtra[] = api_get_jqgrid_js();
 $htmlHeadXtra[] = '<script>
 $(function() {
-    '.Display::grid_js('event_email_template',  $url,$columns,$column_model,$extra_params, array(), $action_links,true).'
+    '.Display::grid_js('event_email_template', $url, $columns, $column_model, $extra_params, array(), $action_links, true).'
 });
 </script>';
 

Indentation +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     }
 
     public function deleteAction($id) {
-         $event_email_template = new EventEmailTemplate();
+            $event_email_template = new EventEmailTemplate();
         return $event_email_template->delete($id);
     }
 }
@@ -73,7 +73,7 @@ 
                         array('name'=>'language_id',        'index'=>'language_id',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'activated',        'index'=>'activated',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'actions',        'index'=>'actions',     'width'=>'100')
-                       );
+                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
 //height auto