chamilo / chamilo-lms

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

Indentation +744 added lines, -744 removed lines

@@ -9,364 +9,364 @@ 
  */
 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;
-	}
-
-	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 $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;
+    }
+
+    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 $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');
@@ -382,425 +382,425 @@ 
                     '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()
-	 */
-	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()
+     */
+    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/GradebookUtils.php

Indentation +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
                     }
                 }
 
-               $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&cidReq=' . $cat->get_course_code() . '&id_session='.$cat->get_session_id().'">' .
+                $modify_icons .= '<a href="gradebook_edit_all.php?selectcat=' .$cat->get_id() . '&cidReq=' . $cat->get_course_code() . '&id_session='.$cat->get_session_id().'">' .
                     Display::return_icon(
                         'percentage.png',
                         get_lang('EditAllWeights'),

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>

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>

main/admin/user_edit.php

Indentation +92 added lines, -92 removed lines

@@ -157,27 +157,27 @@ 
 $form->addElement('hidden', 'user_id', $user_id);
 
 if (api_is_western_name_order()) {
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 } else {
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 }
 
 // Official code
@@ -199,7 +199,7 @@ 
 
 // OpenID
 if (api_get_setting('openid_authentication') == 'true') {
-	$form->addElement('text', 'openid', get_lang('OpenIDURL'));
+    $form->addElement('text', 'openid', get_lang('OpenIDURL'));
 }
 
 // Phone
@@ -225,18 +225,18 @@ 
 $form->addHidden('cropResult', '');
 
 $form->addRule(
-	'picture',
-	get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
-	'filetype',
-	$allowed_picture_types
+    'picture',
+    get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
+    'filetype',
+    $allowed_picture_types
 );
 if (strlen($user_data['picture_uri']) > 0) {
-	$form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
+    $form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
 }
 
 // Username
 if (api_get_setting('login_is_email') != 'true') {
-	$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
+    $form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
     $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
     $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
     $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
@@ -308,15 +308,15 @@ 
 
 // Platform admin
 if (api_is_platform_admin()) {
-	$group = array();
-	$group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1);
-	$group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0);
+    $group = array();
+    $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1);
+    $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0);
 
-	$user_data['status'] == 1 ? $display = 'block':$display = 'none';
+    $user_data['status'] == 1 ? $display = 'block':$display = 'none';
 
-	$form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">');
-	$form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false);
-	$form->addElement('html', '</div>');
+    $form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">');
+    $form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false);
+    $form->addElement('html', '</div>');
 }
 
 //Language
@@ -334,16 +334,16 @@ 
 $form->addElement('label', get_lang('RegistrationDate'), $date);
 
 if (!$user_data['platform_admin']) {
-	// Expiration Date
-	$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
-	$group = array ();
-	$group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
-	$group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
-	$form->addGroup($group, 'max_member_group', null, '', false);
-
-	// Active account or inactive account
-	$form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
-	$form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
+    // Expiration Date
+    $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
+    $group = array ();
+    $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
+    $group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
+    $form->addGroup($group, 'max_member_group', null, '', false);
+
+    // Active account or inactive account
+    $form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
+    $form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
 }
 
 // EXTRA FIELDS
@@ -366,18 +366,18 @@ 
 $expiration_date = $user_data['expiration_date'];
 
 if (empty($expiration_date)) {
-	$user_data['radio_expiration_date'] = 0;
-	$user_data['expiration_date'] = api_get_local_time();
+    $user_data['radio_expiration_date'] = 0;
+    $user_data['expiration_date'] = api_get_local_time();
 } else {
-	$user_data['radio_expiration_date'] = 1;
-	$user_data['expiration_date'] = api_get_local_time($expiration_date);
+    $user_data['radio_expiration_date'] = 1;
+    $user_data['expiration_date'] = api_get_local_time($expiration_date);
 }
 $form->setDefaults($user_data);
 
 $error_drh = false;
 // Validate form
 if ($form->validate()) {
-	$user = $form->getSubmitValues(1);
+    $user = $form->getSubmitValues(1);
     $reset_password = intval($user['reset_password']);
     if ($reset_password == 2 && empty($user['password'])) {
         Display::addFlash(Display::return_message(get_lang('PasswordIsTooShort')));
@@ -385,18 +385,18 @@ 
         exit();
     }
 
-	$is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']);
+    $is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']);
 
-	if ($user['status'] == DRH && $is_user_subscribed_in_course) {
-		$error_drh = true;
-	} else {
-		$picture_element = $form->getElement('picture');
-		$picture = $picture_element->getValue();
+    if ($user['status'] == DRH && $is_user_subscribed_in_course) {
+        $error_drh = true;
+    } else {
+        $picture_element = $form->getElement('picture');
+        $picture = $picture_element->getValue();
 
-		$picture_uri = $user_data['picture_uri'];
-		if (isset($user['delete_picture']) && $user['delete_picture']) {
-			$picture_uri = UserManager::delete_user_picture($user_id);
-		} elseif (!empty($picture['name'])) {
+        $picture_uri = $user_data['picture_uri'];
+        if (isset($user['delete_picture']) && $user['delete_picture']) {
+            $picture_uri = UserManager::delete_user_picture($user_id);
+        } elseif (!empty($picture['name'])) {
             $picture_uri = UserManager::update_user_picture(
                 $user_id,
                 $_FILES['picture']['name'],
@@ -404,30 +404,30 @@ 
                 $user['cropResult']
                     
             );
-		}
+        }
 
-		$lastname = $user['lastname'];
-		$firstname = $user['firstname'];
+        $lastname = $user['lastname'];
+        $firstname = $user['firstname'];
         $password = $user['password'];
         $auth_source = isset($user['auth_source']) ? $user['auth_source'] : $userInfo['auth_source'];
-		$official_code = $user['official_code'];
-		$email = $user['email'];
-		$phone = $user['phone'];
-		$username = isset($user['username']) ? $user['username'] : $userInfo['username'];
-		$status = intval($user['status']);
-		$platform_admin = intval($user['platform_admin']);
-		$send_mail = intval($user['send_mail']);
-		$reset_password = intval($user['reset_password']);
-		$hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null;
-		$language = $user['language'];
-
-		if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) {
+        $official_code = $user['official_code'];
+        $email = $user['email'];
+        $phone = $user['phone'];
+        $username = isset($user['username']) ? $user['username'] : $userInfo['username'];
+        $status = intval($user['status']);
+        $platform_admin = intval($user['platform_admin']);
+        $send_mail = intval($user['send_mail']);
+        $reset_password = intval($user['reset_password']);
+        $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null;
+        $language = $user['language'];
+
+        if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) {
             $expiration_date = $user['expiration_date'];
-		} else {
-			$expiration_date = null;
-		}
+        } else {
+            $expiration_date = null;
+        }
 
-		$active = $user_data['platform_admin'] ? 1 : intval($user['active']);
+        $active = $user_data['platform_admin'] ? 1 : intval($user['active']);
 
         //If the user is set to admin the status will be overwrite by COURSEMANAGER = 1
         if ($platform_admin == 1) {
@@ -461,31 +461,31 @@ 
             $reset_password
         );
 
-		if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) {
-			$up = UserManager::update_openid($user_id, $user['openid']);
-		}
+        if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) {
+            $up = UserManager::update_openid($user_id, $user['openid']);
+        }
         $currentUserId = api_get_user_id();
-		if ($user_id != $currentUserId) {
-			if ($platform_admin == 1) {
+        if ($user_id != $currentUserId) {
+            if ($platform_admin == 1) {
                 UserManager::add_user_as_admin($user_id);
-			} else {
+            } else {
                 UserManager::remove_user_admin($user_id);
-			}
-		}
+            }
+        }
 
         $extraFieldValue = new ExtraFieldValue('user');
         $extraFieldValue->saveFieldValues($user);
 
-		$tok = Security::get_token();
-		header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')).'&sec_token='.$tok);
-		exit();
-	}
+        $tok = Security::get_token();
+        header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')).'&sec_token='.$tok);
+        exit();
+    }
 }
 
 $message = null;
 if ($error_drh) {
-	$err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager');
-	$message = Display::return_message($err_msg, 'error');
+    $err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager');
+    $message = Display::return_message($err_msg, 'error');
 }
 
 $content = null;

main/admin/add_courses_to_usergroup.php

Indentation +11 added lines, -11 removed lines

@@ -229,31 +229,31 @@ 
   <td align="center">
   <div id="content_source">
       <?php
-      if (!($add_type=='multiple')) {
+        if (!($add_type=='multiple')) {
         ?>
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
         <div id="ajax_list_users_single"></div>
         <?php
-      } else {
-      ?>
+        } else {
+        ?>
       <div id="ajax_list_multiple">
         <?php echo Display::select('elements_not_in_name', $elements_not_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
       </div>
     <?php
-      }
-     ?>
+        }
+        ?>
   </div>
   </td>
   <td width="10%" valign="middle" align="center">
   <?php
-  if ($ajax_search) {
-  ?>
+    if ($ajax_search) {
+    ?>
     <button class="btn bt-default" type="button" onclick="remove_item(document.getElementById('elements_in'))" >
         <em class="fa fa-arrow-left"></em>
     </button>
   <?php
-  } else {
-  ?>
+    } else {
+    ?>
     <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))">
         <em class="fa fa-arrow-right"></em>
     </button>
@@ -262,8 +262,8 @@ 
         <em class="fa fa-arrow-left"></em>
     </button>
     <?php
-  }
-  ?>
+    }
+    ?>
     <br /><br /><br /><br /><br /><br />
   </td>
   <td align="center">

main/admin/course_export.php

Indentation +21 added lines, -21 removed lines

@@ -46,7 +46,7 @@ 
         $courses = $course_list;
     }
 
-	if (!empty($courses)) {
+    if (!empty($courses)) {
 
         $archiveFile = 'export_courses_list_'.api_get_local_time();
 
@@ -98,13 +98,13 @@ 
                 Export::arrayToXls($listToExport, $archiveFile);
                 break;
         }
-	} else {
+    } else {
         Display::addFlash(
             Display::return_message(
                 get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty')
             )
         );
-	}
+    }
 }
 
 
@@ -114,29 +114,29 @@ 
 $form->addHeader($tool_name);
 $form->addHidden('formSent', 1);
 $form->addElement(
-	'radio',
-	'select_type',
-	get_lang('Option'),
-	get_lang('ExportAllCoursesList'),
-	 '1',
-	 ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"]
+    'radio',
+    'select_type',
+    get_lang('Option'),
+    get_lang('ExportAllCoursesList'),
+        '1',
+        ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"]
 );
 
 $form->addElement(
-	'radio',
-	'select_type',
-	'',
-	get_lang('ExportSelectedCoursesFromCoursesList'),
-	'2',
-	['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"]
+    'radio',
+    'select_type',
+    '',
+    get_lang('ExportSelectedCoursesFromCoursesList'),
+    '2',
+    ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"]
 );
 
 if (!empty($course_list)) {
-	$form->addHtml('<div id="div-course-list" style="display:none">');
-	$coursesInList = [];
-	foreach ($course_list as $course) {
-		$coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')';
-	}
+    $form->addHtml('<div id="div-course-list" style="display:none">');
+    $coursesInList = [];
+    foreach ($course_list as $course) {
+        $coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')';
+    }
 
     $form->addSelect(
         'course_code',
@@ -145,7 +145,7 @@ 
         ['multiple' => 'multiple']
     );
 
-	$form->addHtml('</div>');
+    $form->addHtml('</div>');
 }
 
 $form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null);

main/admin/ldap_form_add_users_group.php

Indentation +41 added lines, -41 removed lines

@@ -11,58 +11,58 @@
  */
 $nbre=0;
 echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">';
-	if($statut==1)
-	{
-		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
-	}
-	else
-	{
-		echo '<input type="hidden" name="mailling" value="1">';
-	}
+    if($statut==1)
+    {
+        echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
+    }
+    else
+    {
+        echo '<input type="hidden" name="mailling" value="1">';
+    }
 if(!empty($course))
 {
-	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
+    echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
 }
 elseif(!empty($id_session))
 {
-	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
+    echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
 }
 $is_western_name_order = api_is_western_name_order();
 echo '<input type="hidden" name="confirmed" value="yes">';
 echo '<table border="0" cellspacing="0" width="100%">';
 echo '<tr align="center" id="header3">' .
-		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
-		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
-		($is_western_name_order
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
-			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
-		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
-	  '</tr>'."\n";
+        '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
+        '<td width="40%"><b>'.get_lang('Email').'</b></td>' .
+        ($is_western_name_order
+            ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
+            '<td width="15%"><b>'.get_lang('Name').'</b></td>'
+            : '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
+            '<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
+        '<td width="15%"><b>'.get_lang('Login').'</b></td>' .
+        '</tr>'."\n";
 while (list ($key, $val) = each($nom_form)) {
-	$nbre=$nbre+1;
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
-	echo '<tr align="center" id="header'.$ndiv.'">';
-	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
-	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
-	if ($is_western_name_order)
-	{
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-	}
-	else
-	{
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
-	}
-	echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
-	echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
-	echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
-	echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
-	echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
-	echo '</td>';
-	echo '</tr>';
+    $nbre=$nbre+1;
+    if($nbre & 1) $ndiv=2; else $ndiv=3;
+    echo '<tr align="center" id="header'.$ndiv.'">';
+    echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
+    echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
+    if ($is_western_name_order)
+    {
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+    }
+    else
+    {
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+    }
+    echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
+    echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
+    echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
+    echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
+    echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
+    echo '</td>';
+    echo '</tr>';
 }
 echo '</table>';
 echo '<br />';

main/admin/user_list.php

Indentation +131 added lines, -131 removed lines

@@ -239,8 +239,8 @@ 
         if (isset($keywordListValues['keyword_status']) &&
             $keywordListValues['keyword_status'] == PLATFORM_ADMIN
         ) {
-           $query_admin_table = " , $admin_table a ";
-           $keyword_admin = ' AND a.user_id = u.id ';
+            $query_admin_table = " , $admin_table a ";
+            $keyword_admin = ' AND a.user_id = u.id ';
             $keywordListValues['keyword_status'] = '%';
         }
 
@@ -306,13 +306,13 @@ 
     $firstname = $userInfo['firstname'];
     $lastname = $userInfo['lastname'];
 
-	if (api_is_western_name_order()) {
-		$message = sprintf(get_lang('AttemptingToLoginAs'),$firstname,$lastname, $userId);
-	} else {
-		$message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
-	}
+    if (api_is_western_name_order()) {
+        $message = sprintf(get_lang('AttemptingToLoginAs'),$firstname,$lastname, $userId);
+    } else {
+        $message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
+    }
 
-	if ($userId) {
+    if ($userId) {
 
         // Logout the current user
         LoginDelete(api_get_user_id());
@@ -347,7 +347,7 @@ 
         Display :: display_footer();
         exit;
 
-	}
+    }
 }
 
 /**
@@ -385,7 +385,7 @@ 
     }*/
 
     if (!in_array($direction, array('ASC','DESC'))) {
-    	$direction = 'ASC';
+        $direction = 'ASC';
     }
     $column = intval($column);
     $from 	= intval($from);
@@ -396,23 +396,23 @@ 
         $sql .= " WHERE u.creator_id = ".api_get_user_id();
     }
 
-	$sql .= " ORDER BY col$column $direction ";
-	$sql .= " LIMIT $from,$number_of_items";
+    $sql .= " ORDER BY col$column $direction ";
+    $sql .= " LIMIT $from,$number_of_items";
 
-	$res = Database::query($sql);
+    $res = Database::query($sql);
 
-	$users = array ();
+    $users = array ();
     $t = time();
-	while ($user = Database::fetch_row($res)) {
-		$userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
-		$photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
+    while ($user = Database::fetch_row($res)) {
+        $userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
+        $photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
 
         if ($user[7] == 1 && !empty($user[10])) {
             // check expiration date
             $expiration_time = convert_sql_date($user[10]);
             // if expiration date is passed, store a special value for active field
             if ($expiration_time < $t) {
-        	   $user[7] = '-1';
+                $user[7] = '-1';
             }
         }
 
@@ -430,9 +430,9 @@ 
             api_get_local_time($user[9]),
             $user[0]
         );
-	}
+    }
 
-	return $users;
+    return $users;
 }
 
 /**
@@ -441,7 +441,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function email_filter($email) {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 
 /**
@@ -450,7 +450,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function user_filter($name, $params, $row) {
-	return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
+    return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
 }
 
 /**
@@ -461,84 +461,84 @@ 
  * @return string Some HTML-code with modify-buttons
  */
 function modify_filter($user_id, $url_params, $row) {
-	global $charset, $_admins_list;
-	$is_admin   = in_array($user_id,$_admins_list);
-	$statusname = api_get_status_langvars();
-	$user_is_anonymous = false;
+    global $charset, $_admins_list;
+    $is_admin   = in_array($user_id,$_admins_list);
+    $statusname = api_get_status_langvars();
+    $user_is_anonymous = false;
     $current_user_status_label = $row['7'];
 
-	if ($current_user_status_label == $statusname[ANONYMOUS]) {
-		$user_is_anonymous =true;
-	}
-	$result = '';
-	if (!$user_is_anonymous) {
-		$icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
+    if ($current_user_status_label == $statusname[ANONYMOUS]) {
+        $user_is_anonymous =true;
+    }
+    $result = '';
+    if (!$user_is_anonymous) {
+        $icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
+        $result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
 			        '.$icon.'
 					<div class="blackboard_hide" id="div_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
 
         $icon = Display::return_icon('session.png', get_lang('Sessions'), array('onmouseout' => 'clear_session_list (\'div_s_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
+        $result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
 					'.$icon.'
 					<div class="blackboard_hide" id="div_s_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
-	} else {
-		$result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
-		$result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
-	}
+    } else {
+        $result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
+    }
 
-	if (api_is_platform_admin()) {
-		if (!$user_is_anonymous) {
-			$result .= '<a href="user_information.php?user_id='.$user_id.'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>&nbsp;&nbsp;';
-		} else {
-			$result .= Display::return_icon('synthese_view_na.gif', get_lang('Info')).'&nbsp;&nbsp;';
-		}
-	}
+    if (api_is_platform_admin()) {
+        if (!$user_is_anonymous) {
+            $result .= '<a href="user_information.php?user_id='.$user_id.'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>&nbsp;&nbsp;';
+        } else {
+            $result .= Display::return_icon('synthese_view_na.gif', get_lang('Info')).'&nbsp;&nbsp;';
+        }
+    }
 
     //only allow platform admins to login_as, or session admins only for students (not teachers nor other admins)
     if (api_is_platform_admin() || (api_is_session_admin() && $current_user_status_label == $statusname[STUDENT])) {
-    	if (!$user_is_anonymous) {
+        if (!$user_is_anonymous) {
             if (api_global_admin_can_edit_admin($user_id)) {
                 $result .= '<a href="user_list.php?action=login_as&user_id='.$user_id.'&sec_token='.$_SESSION['sec_token'].'">'.Display::return_icon('login_as.png', get_lang('LoginAs')).'</a>&nbsp;&nbsp;';
             } else {
                 $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
             }
-    	} else {
-    		$result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
-    	}
+        } else {
+            $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
+        }
     } else {
-    	$result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
     }
 
-	if ($current_user_status_label != $statusname[STUDENT]) {
-		$result .= Display::return_icon('statistics_na.gif', get_lang('Reporting')).'&nbsp;&nbsp;';
-	} else {
-		$result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;&nbsp;';
-	}
+    if ($current_user_status_label != $statusname[STUDENT]) {
+        $result .= Display::return_icon('statistics_na.gif', get_lang('Reporting')).'&nbsp;&nbsp;';
+    } else {
+        $result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;&nbsp;';
+    }
 
-	if (api_is_platform_admin(true)) {
+    if (api_is_platform_admin(true)) {
         $editProfileUrl = Display::getProfileEditionLink($user_id, true);
 
         if (!$user_is_anonymous && api_global_admin_can_edit_admin($user_id, null, true)) {
             $result .= '<a href="' . $editProfileUrl . '">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-		} else {
+        } else {
             $result .= Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-		}
-	}
+        }
+    }
 
-	if ($is_admin) {
-		$result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
-	} else {
-		$result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
-	}
+    if ($is_admin) {
+        $result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
+    } else {
+        $result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
+    }
 
-	// actions for assigning sessions, courses or users
-	if (api_is_session_admin()) {
-		/*if ($row[0] == api_get_user_id()) {
+    // actions for assigning sessions, courses or users
+    if (api_is_session_admin()) {
+        /*if ($row[0] == api_get_user_id()) {
 			$result .= '<a href="dashboard_add_sessions_to_user.php?user='.$user_id.'">'.Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')).'</a>&nbsp;&nbsp;';
 		}*/
-	} else {
+    } else {
         if ($current_user_status_label == $statusname[SESSIONADMIN]) {
             $result .= Display::url(
                 Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')),
@@ -568,7 +568,7 @@ 
                 );
             }
         }
-	}
+    }
 
     if (api_is_platform_admin()) {
         $result .= ' <a href="'.api_get_path(WEB_AJAX_PATH).'agenda.ajax.php?a=get_user_agenda&user_id='.$user_id.'&modal_size=lg" class="agenda_opener ajax">'.
@@ -586,7 +586,7 @@ 
             }
         }
     }
-	return $result;
+    return $result;
 }
 
 
@@ -619,10 +619,10 @@ 
     if ($action == 'edit') {
         $result = Display::return_icon($image.'.png', get_lang('AccountExpired'), array(), 16);
     } elseif ($row['0']<>$_user['user_id']) {
-    	// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
-	}
-	return $result;
+        // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
+        $result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
+    }
+    return $result;
 }
 
 /**
@@ -635,8 +635,8 @@ 
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  */
 function status_filter($status) {
-	$statusname = api_get_status_langvars();
-	return $statusname[$status];
+    $statusname = api_get_status_langvars();
+    return $statusname[$status];
 }
 
 if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
@@ -652,8 +652,8 @@ 
 
 if (!empty($action)) {
     $check = Security::check_token('get');
-	if ($check) {
-		switch ($action) {
+    if ($check) {
+        switch ($action) {
             case 'add_user_to_my_url':
                 $user_id = $_REQUEST["user_id"];
                 $result = UrlManager::add_user_to_url($user_id, $current_access_url_id);
@@ -663,7 +663,7 @@ 
                     $message  = Display::return_message($message, 'confirmation');
                 }
                 break;
-			case 'show_message' :
+            case 'show_message' :
                 if (!empty($_GET['warn'])) {
                     // to prevent too long messages
                     if ($_GET['warn'] == 'session_message') {
@@ -681,46 +681,46 @@ 
                     $message .= Display::return_message(stripslashes($_GET['message']), 'confirmation');
                 }
 
-				break;
-			case 'delete_user' :
-				if (api_is_platform_admin()) {
+                break;
+            case 'delete_user' :
+                if (api_is_platform_admin()) {
                     $user_to_delete = $_GET['user_id'];
                     $current_user_id = api_get_user_id();
 
-					if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
-						if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
-							$message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
-						} else {
-							$message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
-						}
-					} else {
-						$message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
-					}
-				}
-				break;
+                    if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
+                        if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
+                            $message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
+                        } else {
+                            $message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
+                        }
+                    } else {
+                        $message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
+                    }
+                }
+                break;
             case 'delete' :
-				if (api_is_platform_admin()) {
-					$number_of_selected_users = count($_POST['id']);
-					$number_of_deleted_users = 0;
-					if (is_array($_POST['id'])) {
-						foreach ($_POST['id'] as $index => $user_id) {
-							if($user_id != $_user['user_id']) {
-								if(UserManager :: delete_user($user_id)) {
-									$number_of_deleted_users++;
-								}
-							}
-						}
-					}
-					if ($number_of_selected_users == $number_of_deleted_users) {
+                if (api_is_platform_admin()) {
+                    $number_of_selected_users = count($_POST['id']);
+                    $number_of_deleted_users = 0;
+                    if (is_array($_POST['id'])) {
+                        foreach ($_POST['id'] as $index => $user_id) {
+                            if($user_id != $_user['user_id']) {
+                                if(UserManager :: delete_user($user_id)) {
+                                    $number_of_deleted_users++;
+                                }
+                            }
+                        }
+                    }
+                    if ($number_of_selected_users == $number_of_deleted_users) {
                         $message = Display :: return_message(get_lang('SelectedUsersDeleted'), 'confirmation');
-					} else {
+                    } else {
                         $message = Display :: return_message(get_lang('SomeUsersNotDeleted'), 'error');
-					}
-				}
-				break;
-		}
-		Security::clear_token();
-	}
+                    }
+                }
+                break;
+        }
+        Security::clear_token();
+    }
 }
 
 // Create a search-box
@@ -740,24 +740,24 @@ 
 
 $actions  = '';
 if (api_is_platform_admin()) {
-	$actions .= '<div style="float:right;">'.
-		 '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
-         Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
-		 '</div>';
+    $actions .= '<div style="float:right;">'.
+            '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
+            Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
+            '</div>';
 }
 $actions .= $form->return_form();
 
 if (isset ($_GET['keyword'])) {
-	$parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
+    $parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
 } elseif (isset ($_GET['keyword_firstname'])) {
-	$parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
-	$parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
-	$parameters['keyword_username']	 	= Security::remove_XSS($_GET['keyword_username']);
-	$parameters['keyword_email'] 	 	= Security::remove_XSS($_GET['keyword_email']);
-	$parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
-	$parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
-	$parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
-	$parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
+    $parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
+    $parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
+    $parameters['keyword_username']	 	= Security::remove_XSS($_GET['keyword_username']);
+    $parameters['keyword_email'] 	 	= Security::remove_XSS($_GET['keyword_email']);
+    $parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
+    $parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
+    $parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
+    $parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
 }
 // Create a sortable table with user-data
 $parameters['sec_token'] = Security::get_token();
@@ -768,7 +768,7 @@ 
 $res_admin = Database::query($sql_admin);
 $_admins_list = array();
 while ($row_admin = Database::fetch_row($res_admin)) {
-	$_admins_list[] = $row_admin[0];
+    $_admins_list[] = $row_admin[0];
 }
 
 // Display Advanced search form.
@@ -824,11 +824,11 @@ 
 $table->set_header(2, get_lang('OfficialCode'));
 
 if (api_is_western_name_order()) {
-	$table->set_header(3, get_lang('FirstName'));
-	$table->set_header(4, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
+    $table->set_header(4, get_lang('LastName'));
 } else {
-	$table->set_header(3, get_lang('LastName'));
-	$table->set_header(4, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
+    $table->set_header(4, get_lang('FirstName'));
 }
 $table->set_header(5, get_lang('LoginName'));
 $table->set_header(6, get_lang('Email'));