chamilo / chamilo-lms

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

Indentation +243 added lines, -243 removed lines

@@ -8,94 +8,94 @@ 
  */
 class SurveyLink extends AbstractLink
 {
-	private $survey_table = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_SURVEY);
-	}
-
-	public function get_name()
-	{
-		$this->get_survey_data();
-		return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
-	}
-
-	public function get_description()
-	{
-		$this->get_survey_data();
-		return $this->survey_data['subtitle'];
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('Survey');
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	/**
-	 * Generates an array of all surveys available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_all_links() : course code not set');
-		}
-		$tbl_survey = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		$course_id = api_get_course_int_id();
-		$sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
+    private $survey_table = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_SURVEY);
+    }
+
+    public function get_name()
+    {
+        $this->get_survey_data();
+        return $this->survey_data['code'].': '.self::html_to_text($this->survey_data['title']);
+    }
+
+    public function get_description()
+    {
+        $this->get_survey_data();
+        return $this->survey_data['subtitle'];
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('Survey');
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    /**
+     * Generates an array of all surveys available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_all_links() : course code not set');
+        }
+        $tbl_survey = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        $course_id = api_get_course_int_id();
+        $sql = 'SELECT survey_id, title, code FROM '.$tbl_survey.'
 				WHERE c_id = '.$course_id.' AND session_id = '.intval($session_id).'';
-		$result = Database::query($sql);
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str(
-					$data['code'] . ': ' . self::html_to_text($data['title']),
-					80
-				)
-			);
-		}
-
-		return isset($links) ? $links : null;
-	}
-
-	/**
-	 * Generates an array of surveys that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT survey_id, title, code
+        $result = Database::query($sql);
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str(
+                    $data['code'] . ': ' . self::html_to_text($data['title']),
+                    80
+                )
+            );
+        }
+
+        return isset($links) ? $links : null;
+    }
+
+    /**
+     * Generates an array of surveys that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT survey_id, title, code
     			FROM '.$this->get_survey_table().' AS srv
 				WHERE survey_id NOT IN
 					(
@@ -106,28 +106,28 @@ 
 					)
 					AND srv.session_id = '.api_get_session_id();
 
-		$result = Database::query($sql);
-
-		$links = array();
-		while ($data = Database::fetch_array($result)) {
-			$links[] = array(
-				$data['survey_id'],
-				api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
-			);
-		}
-		return $links;
-	}
-
-	/**
-	 * Has anyone done this survey yet?
-	 */
-	public function has_results($stud_id=null)
-	{
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
-		$sql = "SELECT
+        $result = Database::query($sql);
+
+        $links = array();
+        while ($data = Database::fetch_array($result)) {
+            $links[] = array(
+                $data['survey_id'],
+                api_trunc_str($data['code'].': '.self::html_to_text($data['title']), 80)
+            );
+        }
+        return $links;
+    }
+
+    /**
+     * Has anyone done this survey yet?
+     */
+    public function has_results($stud_id=null)
+    {
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $sql = "SELECT
 				COUNT(i.answered)
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i ON s.code = i.survey_code
@@ -137,30 +137,30 @@ 
 					s.survey_id = $ref_id AND
 					i.session_id = $session_id";
 
-		$sql_result = Database::query($sql);
-		$data = Database::fetch_array($sql_result);
+        $sql_result = Database::query($sql);
+        $data = Database::fetch_array($sql_result);
 
-		return ($data[0] != 0);
-	}
+        return ($data[0] != 0);
+    }
 
-	/**
-	 * @param int $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		// Note: Max score is assumed to be always 1 for surveys,
-		// only student's participation is to be taken into account.
-		$max_score = 1;
+    /**
+     * @param int $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        // Note: Max score is assumed to be always 1 for surveys,
+        // only student's participation is to be taken into account.
+        $max_score = 1;
 
-		$ref_id = intval($this->get_ref_id());
-		$session_id = api_get_session_id();
-		$tbl_survey = Database::get_course_table(TABLE_SURVEY);
-		$tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
+        $ref_id = intval($this->get_ref_id());
+        $session_id = api_get_session_id();
+        $tbl_survey = Database::get_course_table(TABLE_SURVEY);
+        $tbl_survey_invitation = Database::get_course_table(TABLE_SURVEY_INVITATION);
 
-		$get_individual_score = !is_null($stud_id);
+        $get_individual_score = !is_null($stud_id);
 
-		$sql = "SELECT i.answered
+        $sql = "SELECT i.answered
 				FROM $tbl_survey AS s
 				JOIN $tbl_survey_invitation AS i
 				ON s.code = i.survey_code
@@ -171,131 +171,131 @@ 
 					i.session_id = $session_id
 				";
 
-		if ($get_individual_score) {
-			$sql .= ' AND i.user = '.intval($stud_id);
-		}
-
-		$sql_result = Database::query($sql);
-
-		if ($get_individual_score) {
-			// for 1 student
-			if ($data = Database::fetch_array($sql_result)) {
-				return array($data['answered'] ? $max_score : 0, $max_score);
-			}
-			return array(0, $max_score);
-		} else {
-			// for all the students -> get average
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			while ($data = Database::fetch_array($sql_result)) {
-				$sum += $data['answered'] ? $max_score : 0;
-				$rescount++;
-				if ($data['answered'] > $bestResult) {
-					$bestResult = $data['answered'];
-					$weight = $assignment['qualification'];
-				}
-			}
-			$sum = $sum / $max_score;
-
-			if ($rescount == 0) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $rescount);
-					break;
-				case 'average':
-					return array($sum, $rescount);
-					break;
-				case 'ranking':
-					return null;
-					break;
-				default:
-					return array($sum, $rescount);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Lazy load function to get the database table of the surveys
-	 */
-	private function get_survey_table()
-	{
-		$this->survey_table = Database :: get_course_table(TABLE_SURVEY);
-		return $this->survey_table;
-	}
-
-	/**
-	 * Check if this still links to a survey
-	 */
-	public function is_valid_link()
-	{
-		$session_id = api_get_session_id();
-		$sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
+        if ($get_individual_score) {
+            $sql .= ' AND i.user = '.intval($stud_id);
+        }
+
+        $sql_result = Database::query($sql);
+
+        if ($get_individual_score) {
+            // for 1 student
+            if ($data = Database::fetch_array($sql_result)) {
+                return array($data['answered'] ? $max_score : 0, $max_score);
+            }
+            return array(0, $max_score);
+        } else {
+            // for all the students -> get average
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            while ($data = Database::fetch_array($sql_result)) {
+                $sum += $data['answered'] ? $max_score : 0;
+                $rescount++;
+                if ($data['answered'] > $bestResult) {
+                    $bestResult = $data['answered'];
+                    $weight = $assignment['qualification'];
+                }
+            }
+            $sum = $sum / $max_score;
+
+            if ($rescount == 0) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $rescount);
+                    break;
+                case 'average':
+                    return array($sum, $rescount);
+                    break;
+                case 'ranking':
+                    return null;
+                    break;
+                default:
+                    return array($sum, $rescount);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Lazy load function to get the database table of the surveys
+     */
+    private function get_survey_table()
+    {
+        $this->survey_table = Database :: get_course_table(TABLE_SURVEY);
+        return $this->survey_table;
+    }
+
+    /**
+     * Check if this still links to a survey
+     */
+    public function is_valid_link()
+    {
+        $session_id = api_get_session_id();
+        $sql = 'SELECT count(survey_id) FROM '.$this->get_survey_table().'
         		 WHERE
         		 	c_id = '.$this->course_id.' AND
         		 	survey_id = '.intval($this->get_ref_id()).' AND
         		 	session_id='.intval($session_id).'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
-
-	public function get_link()
-	{
-		if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
-			$tbl_name = $this->get_survey_table();
-			$session_id = api_get_session_id();
-			if ($tbl_name != '') {
-				$sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        if (api_is_allowed_to_edit()) { // Let students make access only through "Surveys" tool.
+            $tbl_name = $this->get_survey_table();
+            $session_id = api_get_session_id();
+            if ($tbl_name != '') {
+                $sql = 'SELECT survey_id FROM '.$this->get_survey_table().'
     					WHERE
     						c_id = '.$this->course_id.' AND
     						survey_id = '.intval($this->get_ref_id()).' AND
     						session_id = '.intval($session_id).' ';
-				$result = Database::query($sql);
-				$row = Database::fetch_array($result, 'ASSOC');
-				$survey_id = $row['survey_id'];
-				return api_get_path(WEB_PATH).'main/survey/reporting.php?cidReq='.$this->get_course_code().'&survey_id='.$survey_id;
-			}
-		}
-		return null;
-	}
-
-	private function get_survey_data()
-	{
-		$tbl_name = $this->get_survey_table();
-		$session_id = api_get_session_id();
-		if ($tbl_name == '') {
-			return false;
-		} elseif (!isset($this->survey_data)) {
-			$sql = 'SELECT * FROM '.$tbl_name.'
+                $result = Database::query($sql);
+                $row = Database::fetch_array($result, 'ASSOC');
+                $survey_id = $row['survey_id'];
+                return api_get_path(WEB_PATH).'main/survey/reporting.php?cidReq='.$this->get_course_code().'&survey_id='.$survey_id;
+            }
+        }
+        return null;
+    }
+
+    private function get_survey_data()
+    {
+        $tbl_name = $this->get_survey_table();
+        $session_id = api_get_session_id();
+        if ($tbl_name == '') {
+            return false;
+        } elseif (!isset($this->survey_data)) {
+            $sql = 'SELECT * FROM '.$tbl_name.'
 					WHERE
 						c_id = '.$this->course_id.' AND
 						survey_id = '.intval($this->get_ref_id()).' AND
 						session_id='.intval($session_id).'';
-			$query = Database::query($sql);
-			$this->survey_data = Database::fetch_array($query);
-		}
-		return $this->survey_data;
-	}
-
-	public function get_icon_name()
-	{
-		return 'survey';
-	}
-
-	private static function html_to_text($string)
-	{
-		return strip_tags($string);
-		//return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
-	}
+            $query = Database::query($sql);
+            $this->survey_data = Database::fetch_array($query);
+        }
+        return $this->survey_data;
+    }
+
+    public function get_icon_name()
+    {
+        return 'survey';
+    }
+
+    private static function html_to_text($string)
+    {
+        return strip_tags($string);
+        //return trim(api_html_entity_decode(strip_tags(str_ireplace(array('<p>', '</p>', '<br />', '<br/>', '<br>'), array('', ' ', ' ', ' ', ' '), $string)), ENT_QUOTES));
+    }
 }

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

Indentation +317 added lines, -317 removed lines

@@ -8,102 +8,102 @@ 
  */
 class StudentPublicationLink extends AbstractLink
 {
-	private $studpub_table = null;
-	private $itemprop_table = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_STUDENTPUBLICATION);
-	}
-
-	/**
-	 *
-	 * Returns the URL of a document
-	 * This function is loaded when using a gradebook as a tab (gradebook = -1)
-	 * see issue #2705
-	 *
-	 */
-	public function get_view_url($stud_id)
-	{
-		// find a file uploaded by the given student,
-		// with the same title as the evaluation name
-
-		$eval = $this->get_evaluation();
-		$stud_id = intval($stud_id);
-
-		$sql = 'SELECT pub.url
+    private $studpub_table = null;
+    private $itemprop_table = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_STUDENTPUBLICATION);
+    }
+
+    /**
+     *
+     * Returns the URL of a document
+     * This function is loaded when using a gradebook as a tab (gradebook = -1)
+     * see issue #2705
+     *
+     */
+    public function get_view_url($stud_id)
+    {
+        // find a file uploaded by the given student,
+        // with the same title as the evaluation name
+
+        $eval = $this->get_evaluation();
+        $stud_id = intval($stud_id);
+
+        $sql = 'SELECT pub.url
 				FROM '.$this->get_itemprop_table().' prop, '.$this->get_studpub_table().' pub'
-			." WHERE
+            ." WHERE
 					prop.c_id = ".$this->course_id." AND
 					pub.c_id = ".$this->course_id." AND
 					prop.tool = 'work'"
-			.' AND prop.insert_user_id = '.$stud_id
-			.' AND prop.ref = pub.id'
-			." AND pub.title = '".Database::escape_string($eval->get_name())."' AND pub.session_id=".api_get_session_id()."";
-
-		$result = Database::query($sql);
-		if ($fileurl = Database::fetch_row($result)) {
-			return null;
-		} else {
-			return null;
-		}
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('Works');
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	/**
-	 * Generate an array of exercises that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT id, url from '.$this->get_studpub_table()
-			.' pup WHERE c_id = '.$this->course_id.' AND has_properties != '."''".' AND id NOT IN'
-			.' (SELECT ref_id FROM '.$tbl_grade_links
-			.' WHERE type = '.LINK_STUDENTPUBLICATION
-			." AND course_code = '".Database::escape_string($this->get_course_code())."'"
-			.') AND pub.session_id='.api_get_session_id().'';
-
-		$result = Database::query($sql);
-
-		$cats=array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['url']);
-		}
-		return $cats;
-	}
-
-	/**
-	 * Generate an array of all exercises available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code)) {
-			die('Error in get_not_created_links() : course code not set');
-		}
-		$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-
-		$session_id = api_get_session_id();
-		/*
+            .' AND prop.insert_user_id = '.$stud_id
+            .' AND prop.ref = pub.id'
+            ." AND pub.title = '".Database::escape_string($eval->get_name())."' AND pub.session_id=".api_get_session_id()."";
+
+        $result = Database::query($sql);
+        if ($fileurl = Database::fetch_row($result)) {
+            return null;
+        } else {
+            return null;
+        }
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('Works');
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    /**
+     * Generate an array of exercises that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT id, url from '.$this->get_studpub_table()
+            .' pup WHERE c_id = '.$this->course_id.' AND has_properties != '."''".' AND id NOT IN'
+            .' (SELECT ref_id FROM '.$tbl_grade_links
+            .' WHERE type = '.LINK_STUDENTPUBLICATION
+            ." AND course_code = '".Database::escape_string($this->get_course_code())."'"
+            .') AND pub.session_id='.api_get_session_id().'';
+
+        $result = Database::query($sql);
+
+        $cats=array();
+        while ($data=Database::fetch_array($result)) {
+            $cats[] = array ($data['id'], $data['url']);
+        }
+        return $cats;
+    }
+
+    /**
+     * Generate an array of all exercises available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code)) {
+            die('Error in get_not_created_links() : course code not set');
+        }
+        $tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+
+        $session_id = api_get_session_id();
+        /*
         if (empty($session_id)) {
             $session_condition = api_get_session_condition(0, true);
         } else {
@@ -112,68 +112,68 @@ 
         $sql = "SELECT id, url, title FROM $tbl_grade_links
                 WHERE c_id = {$this->course_id}  AND filetype='folder' AND active = 1 $session_condition ";*/
 
-		//Only show works from the session
-		//AND has_properties != ''
-		$sql = "SELECT id, url, title FROM $tbl_grade_links
+        //Only show works from the session
+        //AND has_properties != ''
+        $sql = "SELECT id, url, title FROM $tbl_grade_links
 				WHERE
 					c_id = {$this->course_id} AND
 					active = 1 AND
 					filetype='folder' AND
 					session_id = ".api_get_session_id()."";
 
-		$result = Database::query($sql);
-		while ($data = Database::fetch_array($result)) {
-			$work_name = $data['title'];
-			if (empty($work_name)) {
-				$work_name = basename($data['url']);
-			}
-			$cats[] = array ($data['id'], $work_name);
-		}
-		$cats=isset($cats) ? $cats : array();
-		return $cats;
-	}
-
-	/**
-	 * Has anyone done this exercise yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-		$sql = 'SELECT count(*) AS number FROM '.$tbl_grade_links."
+        $result = Database::query($sql);
+        while ($data = Database::fetch_array($result)) {
+            $work_name = $data['title'];
+            if (empty($work_name)) {
+                $work_name = basename($data['url']);
+            }
+            $cats[] = array ($data['id'], $work_name);
+        }
+        $cats=isset($cats) ? $cats : array();
+        return $cats;
+    }
+
+    /**
+     * Has anyone done this exercise yet ?
+     */
+    public function has_results()
+    {
+        $tbl_grade_links = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+        $sql = 'SELECT count(*) AS number FROM '.$tbl_grade_links."
 				WHERE 	c_id 		= {$this->course_id} AND
 						parent_id 	= '".intval($this->get_ref_id())."' AND
 						session_id	=".api_get_session_id()."";
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * @param null $stud_id
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
-		$stud_id = intval($stud_id);
-		$table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
-		$sql = 'SELECT * FROM '.$table."
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    /**
+     * @param null $stud_id
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
+        $stud_id = intval($stud_id);
+        $table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
+        $sql = 'SELECT * FROM '.$table."
     			WHERE
     				c_id = {$this->course_id} AND
     				id  = '".intval($this->get_ref_id())."' AND
     				session_id	= ".api_get_session_id()."
 				"
-		;
+        ;
 
-		$query = Database::query($sql);
-		$assignment = Database::fetch_array($query);
+        $query = Database::query($sql);
+        $assignment = Database::fetch_array($query);
 
-		if (count($assignment) == 0) {
-			$parentId = '0';
-		} else {
-			$parentId = $assignment['id'];
-		}
+        if (count($assignment) == 0) {
+            $parentId = '0';
+        } else {
+            $parentId = $assignment['id'];
+        }
 
-		$sql = 'SELECT * FROM '.$table.'
+        $sql = 'SELECT * FROM '.$table.'
     			WHERE
     				c_id = '.$this->course_id.' AND
     				active = 1 AND
@@ -181,190 +181,190 @@ 
     				session_id = '.api_get_session_id() .' AND
     				qualificator_id <> 0
 				';
-		if (!empty($stud_id)) {
-			$sql .= " AND user_id = $stud_id ";
-		}
-
-		$order = api_get_setting('student_publication_to_take_in_gradebook');
-
-		switch ($order) {
-			case 'last':
-				// latest attempt
-				$sql .= ' ORDER BY sent_date DESC';
-				break;
-			case 'first':
-			default:
-				// first attempt
-				$sql .= ' ORDER BY id';
-				break;
-		}
-
-		$scores = Database::query($sql);
-
-		// for 1 student
-		if (!empty($stud_id)) {
-			if ($data = Database::fetch_array($scores)) {
-				return array(
-					$data['qualification'],
-					$assignment['qualification']
-				);
-			} else {
-				return '';
-			}
-		} else {
-			$students = array();  // user list, needed to make sure we only
-			// take first attempts into account
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			$sumResult = 0;
-			$myResult = 0;
-
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					if ($assignment['qualification'] != 0) {
-						$students[$data['user_id']] = $data['qualification'];
-						$rescount++;
-						$sum += $data['qualification'] / $assignment['qualification'];
-						$sumResult += $data['qualification'];
-
-						if ($data['qualification'] > $bestResult) {
-							$bestResult = $data['qualification'];
-						}
-						$weight = $assignment['qualification'];
-					}
-				}
-			}
-
-			if ($rescount == 0) {
-				return null;
-			} else {
-				switch ($type) {
-					case 'best':
-						return array($bestResult, $weight);
-						break;
-					case 'average':
-						return array($sumResult/$rescount, $weight);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_studpub_table()
-	{
-		return $this->studpub_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
-	}
-
-	/**
-	 * Lazy load function to get the database table of the item properties
-	 */
-	private function get_itemprop_table()
-	{
-		return $this->itemprop_table = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function get_name()
-	{
-		$this->get_exercise_data();
-		return (isset($this->exercise_data['title']) && !empty($this->exercise_data['title'])) ? $this->exercise_data['title'] : get_lang('Untitled');
-	}
-
-	public function get_description()
-	{
-		$this->get_exercise_data();
-		return isset($this->exercise_data['description']) ? $this->exercise_data['description'] : null;
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
-
-	public function get_link()
-	{
-		$session_id = api_get_session_id();
-		$url = api_get_path(WEB_PATH).'main/work/work.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&id='.$this->exercise_data['id'].'&gradebook=view';
-		return $url;
-	}
-
-	private function get_exercise_data()
-	{
-		$tbl_name = $this->get_studpub_table();
-		$course_info = api_get_course_info($this->get_course_code());
-		if ($tbl_name=='') {
-			return false;
-		} elseif (!isset($this->exercise_data)) {
-			$sql = 'SELECT * FROM '.$this->get_studpub_table()."
+        if (!empty($stud_id)) {
+            $sql .= " AND user_id = $stud_id ";
+        }
+
+        $order = api_get_setting('student_publication_to_take_in_gradebook');
+
+        switch ($order) {
+            case 'last':
+                // latest attempt
+                $sql .= ' ORDER BY sent_date DESC';
+                break;
+            case 'first':
+            default:
+                // first attempt
+                $sql .= ' ORDER BY id';
+                break;
+        }
+
+        $scores = Database::query($sql);
+
+        // for 1 student
+        if (!empty($stud_id)) {
+            if ($data = Database::fetch_array($scores)) {
+                return array(
+                    $data['qualification'],
+                    $assignment['qualification']
+                );
+            } else {
+                return '';
+            }
+        } else {
+            $students = array();  // user list, needed to make sure we only
+            // take first attempts into account
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            $sumResult = 0;
+            $myResult = 0;
+
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    if ($assignment['qualification'] != 0) {
+                        $students[$data['user_id']] = $data['qualification'];
+                        $rescount++;
+                        $sum += $data['qualification'] / $assignment['qualification'];
+                        $sumResult += $data['qualification'];
+
+                        if ($data['qualification'] > $bestResult) {
+                            $bestResult = $data['qualification'];
+                        }
+                        $weight = $assignment['qualification'];
+                    }
+                }
+            }
+
+            if ($rescount == 0) {
+                return null;
+            } else {
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, $weight);
+                        break;
+                    case 'average':
+                        return array($sumResult/$rescount, $weight);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_studpub_table()
+    {
+        return $this->studpub_table = Database :: get_course_table(TABLE_STUDENT_PUBLICATION);
+    }
+
+    /**
+     * Lazy load function to get the database table of the item properties
+     */
+    private function get_itemprop_table()
+    {
+        return $this->itemprop_table = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function get_name()
+    {
+        $this->get_exercise_data();
+        return (isset($this->exercise_data['title']) && !empty($this->exercise_data['title'])) ? $this->exercise_data['title'] : get_lang('Untitled');
+    }
+
+    public function get_description()
+    {
+        $this->get_exercise_data();
+        return isset($this->exercise_data['description']) ? $this->exercise_data['description'] : null;
+    }
+
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        $session_id = api_get_session_id();
+        $url = api_get_path(WEB_PATH).'main/work/work.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&id='.$this->exercise_data['id'].'&gradebook=view';
+        return $url;
+    }
+
+    private function get_exercise_data()
+    {
+        $tbl_name = $this->get_studpub_table();
+        $course_info = api_get_course_info($this->get_course_code());
+        if ($tbl_name=='') {
+            return false;
+        } elseif (!isset($this->exercise_data)) {
+            $sql = 'SELECT * FROM '.$this->get_studpub_table()."
 					WHERE
 					 	c_id ='".$course_info['real_id']."' AND
 					 	id = '".intval($this->get_ref_id())."' ";
-			$query = Database::query($sql);
-			$this->exercise_data = Database::fetch_array($query);
-		}
-		return $this->exercise_data;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	public function is_valid_link()
-	{
-		$sql = 'SELECT count(id) FROM '.$this->get_studpub_table().'
+            $query = Database::query($sql);
+            $this->exercise_data = Database::fetch_array($query);
+        }
+        return $this->exercise_data;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    public function is_valid_link()
+    {
+        $sql = 'SELECT count(id) FROM '.$this->get_studpub_table().'
     			WHERE c_id = "'.$this->course_id.'" AND id = '.intval($this->get_ref_id()).'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_icon_name()
-	{
-		return 'studentpublication';
-	}
-
-	public function save_linked_data()
-	{
-		$weight = (float)$this->get_weight();
-		$ref_id = $this->get_ref_id();
-
-		if (!empty($ref_id)) {
-			//Cleans works
-			$sql = 'UPDATE '.$this->get_studpub_table().' SET weight= '.$weight.'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    public function get_icon_name()
+    {
+        return 'studentpublication';
+    }
+
+    public function save_linked_data()
+    {
+        $weight = (float)$this->get_weight();
+        $ref_id = $this->get_ref_id();
+
+        if (!empty($ref_id)) {
+            //Cleans works
+            $sql = 'UPDATE '.$this->get_studpub_table().' SET weight= '.$weight.'
                     WHERE c_id = '.$this->course_id.' AND id ='.$ref_id;
-			Database::query($sql);
-		}
-	}
-
-	public function delete_linked_data()
-	{
-		$ref_id = $this->get_ref_id();
-		if (!empty($ref_id)) {
-			//Cleans works
-			$sql = 'UPDATE '.$this->get_studpub_table().' SET weight=0
+            Database::query($sql);
+        }
+    }
+
+    public function delete_linked_data()
+    {
+        $ref_id = $this->get_ref_id();
+        if (!empty($ref_id)) {
+            //Cleans works
+            $sql = 'UPDATE '.$this->get_studpub_table().' SET weight=0
                     WHERE c_id = '.$this->course_id.' AND id ='.$ref_id;
-			Database::query($sql);
-		}
-	}
+            Database::query($sql);
+        }
+    }
 }

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/legal_add.php

Indentation +104 added lines, -104 removed lines

@@ -18,93 +18,93 @@ 
 
 $defaults = array();
 $term_preview = array(
-	'type' => 0,
-	'content' => '',
-	'changes' => '',
+    'type' => 0,
+    'content' => '',
+    'changes' => '',
 );
 if ($form->validate()) {
-	$check = Security::check_token('post');
-	if ($check) {
-		$values  = $form->getSubmitValues();
-		$lang 	 = $values['language'];
-		//language id
-		$lang = api_get_language_id($lang);
-
-		if (isset($values['type'])) {
-			$type 	 = $values['type'];
-		} else {
-			$type = 0;
-		}
-		if (isset($values['content'])) {
-			$content = $values['content'];
-		} else {
-			$content = '';
-		}
-		if (isset($values['changes'])) {
-			$changes = $values['changes'];
-		} else {
-			$changes = '';
-		}
-		$navigator_info = api_get_navigator();
-
-		if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
-			if (isset($values['preview'])) {
-				$submit	='preview';
-			} elseif (isset($values['save'])) {
-				$submit	='save';
-			} elseif (isset($values['back'])) {
-				$submit	='back';
-			}
-		} else {
-			$submit  = $values['send'];
-		}
-
-		$default['content'] = $content;
-		if (isset($values['language'])) {
-			if ($submit == 'back') {
-				header('Location: legal_add.php');
-				exit;
-			} elseif ($submit == 'save') {
-				$insert_result = LegalManager::add($lang, $content, $type, $changes);
-				if ($insert_result ) {
-					$message = get_lang('TermAndConditionSaved');
-				} else {
-					$message = get_lang('TermAndConditionNotSaved');
-				}
-				Security::clear_token();
-				$tok = Security::get_token();
-				header('Location: legal_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
-				exit();
-			} elseif ($submit=='preview') {
-				$defaults['type'] = $type;
-				$defaults['content'] = $content;
-				$defaults['changes'] = $changes;
-				$term_preview = $defaults;
-				$term_preview['type'] = intval($_POST['type']);
-			} else {
-				$my_lang = $_POST['language'];
-				if (isset($_POST['language'])){
-					$all_langs = api_get_languages();
-					if (in_array($my_lang, $all_langs['folder'])){
-						$language = api_get_language_id($my_lang);
-						$term_preview = LegalManager::get_last_condition($language);
-						$defaults = $term_preview;
-						if (!$term_preview) {
-							// there are not terms and conditions
-							$term_preview['type']=-1;
-							$defaults['type']=0;
-						}
-					}
-				}
-			}
-		}
-	}
+    $check = Security::check_token('post');
+    if ($check) {
+        $values  = $form->getSubmitValues();
+        $lang 	 = $values['language'];
+        //language id
+        $lang = api_get_language_id($lang);
+
+        if (isset($values['type'])) {
+            $type 	 = $values['type'];
+        } else {
+            $type = 0;
+        }
+        if (isset($values['content'])) {
+            $content = $values['content'];
+        } else {
+            $content = '';
+        }
+        if (isset($values['changes'])) {
+            $changes = $values['changes'];
+        } else {
+            $changes = '';
+        }
+        $navigator_info = api_get_navigator();
+
+        if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
+            if (isset($values['preview'])) {
+                $submit	='preview';
+            } elseif (isset($values['save'])) {
+                $submit	='save';
+            } elseif (isset($values['back'])) {
+                $submit	='back';
+            }
+        } else {
+            $submit  = $values['send'];
+        }
+
+        $default['content'] = $content;
+        if (isset($values['language'])) {
+            if ($submit == 'back') {
+                header('Location: legal_add.php');
+                exit;
+            } elseif ($submit == 'save') {
+                $insert_result = LegalManager::add($lang, $content, $type, $changes);
+                if ($insert_result ) {
+                    $message = get_lang('TermAndConditionSaved');
+                } else {
+                    $message = get_lang('TermAndConditionNotSaved');
+                }
+                Security::clear_token();
+                $tok = Security::get_token();
+                header('Location: legal_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
+                exit();
+            } elseif ($submit=='preview') {
+                $defaults['type'] = $type;
+                $defaults['content'] = $content;
+                $defaults['changes'] = $changes;
+                $term_preview = $defaults;
+                $term_preview['type'] = intval($_POST['type']);
+            } else {
+                $my_lang = $_POST['language'];
+                if (isset($_POST['language'])){
+                    $all_langs = api_get_languages();
+                    if (in_array($my_lang, $all_langs['folder'])){
+                        $language = api_get_language_id($my_lang);
+                        $term_preview = LegalManager::get_last_condition($language);
+                        $defaults = $term_preview;
+                        if (!$term_preview) {
+                            // there are not terms and conditions
+                            $term_preview['type']=-1;
+                            $defaults['type']=0;
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
 $form->setDefaults($defaults);
 
 if (isset($_POST['send'])) {
-	Security::clear_token();
+    Security::clear_token();
 }
 $token = Security::get_token();
 
@@ -115,34 +115,34 @@ 
 
 if (isset($_POST['language'])) {
 
-	$form->addElement('static', Security::remove_XSS($_POST['language']));
-	$form->addElement('hidden', 'language',Security::remove_XSS($_POST['language']));
-	$form->addHtmlEditor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250'));
+    $form->addElement('static', Security::remove_XSS($_POST['language']));
+    $form->addElement('hidden', 'language',Security::remove_XSS($_POST['language']));
+    $form->addHtmlEditor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250'));
 
-	$form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0');
-	$form->addElement('radio', 'type', '', get_lang('PageLink') ,'1');
-	$form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20'));
+    $form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0');
+    $form->addElement('radio', 'type', '', get_lang('PageLink') ,'1');
+    $form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20'));
 
-	$preview = LegalManager::show_last_condition($term_preview);
+    $preview = LegalManager::show_last_condition($term_preview);
 
-	if ($term_preview['type']!=-1) {
-		$form->addElement('label', get_lang('Preview'),  $preview);
-	}
+    if ($term_preview['type']!=-1) {
+        $form->addElement('label', get_lang('Preview'),  $preview);
+    }
 
-	// Submit & preview button
+    // Submit & preview button
     $navigator_info = api_get_navigator();
 
     //ie6 fix
-	if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
-		$buttons = '<div class="row" align="center">
+    if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
+        $buttons = '<div class="row" align="center">
 				<div class="formw">
 				<input type="submit" name="back"  value="'.get_lang('Back').'"/>
 				<input type="submit" name="preview"  value="'.get_lang('Preview').'"/>
 				<input type="submit" name="save"  value="'.get_lang('Save').'"/>
 				</div>
 			</div>';
-			$form->addElement('html',$buttons);
-	} else {
+            $form->addElement('html',$buttons);
+    } else {
         $buttons = '<div class="row" align="center">
 					<div class="formw">
 					<button type="submit" class="back" 	 name="send" value="back">'.get_lang('Back').'</button>
@@ -150,11 +150,11 @@ 
 					<button type="submit" class="save" 	 name="send" value="save">'.get_lang('Save').'</button>
 					</div>
 				</div>';
-		$form->addElement('html',$buttons);
-	}
+        $form->addElement('html',$buttons);
+    }
 } else {
-	$form->addElement('select_language', 'language', get_lang('Language'),null,array());
-	$form->addElement('button', 'send', get_lang('Load'));
+    $form->addElement('select_language', 'language', get_lang('Language'),null,array());
+    $form->addElement('button', 'send', get_lang('Load'));
 
 }
 
@@ -176,11 +176,11 @@ 
 echo '</div>';
 
 if (isset ($_GET['action'])) {
-	switch ($_GET['action']) {
-		case 'show_message' :
-			Display :: display_normal_message(stripslashes($_GET['message']));
-			break;
-	}
+    switch ($_GET['action']) {
+        case 'show_message' :
+            Display :: display_normal_message(stripslashes($_GET['message']));
+            break;
+    }
 }
 
 $form->setDefaults($defaults);

main/admin/subscribe_class2course.php

Indentation +4 added lines, -4 removed lines

@@ -90,8 +90,8 @@ 
     <select name="firstLetterClass" onchange="javascript:document.formulaire.formSent.value='2'; document.formulaire.submit();">
      <option value="">--</option>
      <?php
-     echo Display::get_alphabet_options($first_letter_class);
-     ?>
+        echo Display::get_alphabet_options($first_letter_class);
+        ?>
     </select>
    </td>
    <td width="20%">&nbsp;</td>
@@ -102,8 +102,8 @@ 
     <select name="firstLetterCourse" onchange="javascript:document.formulaire.formSent.value='2'; document.formulaire.submit();">
      <option value="">--</option>
      <?php
-     echo Display::get_alphabet_options($first_letter_course);
-     ?>
+        echo Display::get_alphabet_options($first_letter_course);
+        ?>
     </select>
    </td>
   </tr>

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">