chamilo / chamilo-lms

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

Indentation +1 added lines, -1 removed lines

@@ -195,7 +195,7 @@
         $parentId = !$assignment ? 0 : $assignment->getId();
 
         if (empty($session)) {
-           $dql = 'SELECT a FROM ChamiloCourseBundle:CStudentPublication a
+            $dql = 'SELECT a FROM ChamiloCourseBundle:CStudentPublication a
                    WHERE
                         a.cId = :course AND
                         a.active = :active AND

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

Indentation +745 added lines, -745 removed lines

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

main/exercise/hotpotatoes_exercise_result.class.php

Indentation +136 added lines, -136 removed lines

@@ -14,15 +14,15 @@ 
     //stores the results
     private $results = array();
 
-	/**
-	 * Gets the results of all students (or just one student if access is limited)
-	 * @param	string		The document path (for HotPotatoes retrieval)
-	 * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
-	 * @param string $document_path
-	 */
-	public function getExercisesReporting($document_path, $hotpotato_name)
+    /**
+     * Gets the results of all students (or just one student if access is limited)
+     * @param	string		The document path (for HotPotatoes retrieval)
+     * @param	integer		User ID. Optional. If no user ID is provided, we take all the results. Defauts to null
+     * @param string $document_path
+     */
+    public function getExercisesReporting($document_path, $hotpotato_name)
     {
-		$return = array();
+        $return = array();
         $TBL_USER = Database::get_main_table(TABLE_MAIN_USER);
         $TBL_TRACK_HOTPOTATOES	= Database::get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
 
@@ -34,7 +34,7 @@ 
         $hotpotato_name  = Database::escape_string($hotpotato_name);
 
         if (!empty($exercise_id)) {
-          $session_id_and .= " AND exe_exo_id = $exercise_id ";
+            $session_id_and .= " AND exe_exo_id = $exercise_id ";
         }
 
         if (empty($user_id)) {
@@ -111,25 +111,25 @@ 
         $this->results = $return;
 
         return true;
-	}
+    }
 
 
-	/**
-	 * Exports the complete report as a CSV file
-	 * @param	string		Document path inside the document tool
-	 * @param	integer		Optional user ID
-	 * @param	boolean		Whether to include user fields or not
-	 * @return	boolean		False on error
-	 */
-	public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
+    /**
+     * Exports the complete report as a CSV file
+     * @param	string		Document path inside the document tool
+     * @param	integer		Optional user ID
+     * @param	boolean		Whether to include user fields or not
+     * @return	boolean		False on error
+     */
+    public function exportCompleteReportCSV($document_path = '', $hotpotato_name)
     {
-		global $charset;
-		$this->getExercisesReporting($document_path, $hotpotato_name);
-		$filename = 'exercise_results_'.date('YmdGis').'.csv';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
-		}
-		$data = '';
+        global $charset;
+        $this->getExercisesReporting($document_path, $hotpotato_name);
+        $filename = 'exercise_results_'.date('YmdGis').'.csv';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.date('YmdGis').'.csv';
+        }
+        $data = '';
 
         if (api_is_western_name_order()) {
             if(!empty($this->results[0]['first_name'])) {
@@ -148,7 +148,7 @@ 
         }
         $data .= get_lang('Email').';';
 
-		/*if ($export_user_fields) {
+        /*if ($export_user_fields) {
 			//show user fields section with a big th colspan that spans over all fields
 			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 			$num = count($extra_user_fields);
@@ -157,25 +157,25 @@ 
 			}
 		}*/
 
-		$data .= get_lang('Title').';';
-		$data .= get_lang('StartDate').';';
-		$data .= get_lang('Score').';';
-		$data .= get_lang('Total').';';
-		$data .= "\n";
+        $data .= get_lang('Title').';';
+        $data .= get_lang('StartDate').';';
+        $data .= get_lang('Score').';';
+        $data .= get_lang('Total').';';
+        $data .= "\n";
 
-		//results
-		foreach($this->results as $row) {
+        //results
+        foreach($this->results as $row) {
             if (api_is_western_name_order()) {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
             } else {
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
-              $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['last_name']), ENT_QUOTES, $charset)).';';
+                $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset)).';';
             }
 
             $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['email']), ENT_QUOTES, $charset)).';';
 
-			/*if ($export_user_fields) {
+            /*if ($export_user_fields) {
 				//show user fields data, if any, for this user
 				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
 				foreach($user_fields_values as $value) {
@@ -183,40 +183,40 @@ 
 				}
 			}*/
 
-			$data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
-			$data .= str_replace("\r\n",'  ',$row['exe_date']).';';
-			$data .= str_replace("\r\n",'  ',$row['result']).';';
-			$data .= str_replace("\r\n",'  ',$row['max']).';';
-			$data .= "\n";
-		}
-
-		//output the results
-		$len = strlen($data);
-		header('Content-type: application/octet-stream');
-		header('Content-Type: application/force-download');
-		header('Content-length: '.$len);
-		if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-			header('Content-Disposition: filename= '.$filename);
-		} else {
-			header('Content-Disposition: attachment; filename= '.$filename);
-		}
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
-			header('Pragma: ');
-			header('Cache-Control: ');
-			header('Cache-Control: public'); // IE cannot download from sessions without a cache
-		}
-		header('Content-Description: '.$filename);
-		header('Content-transfer-encoding: binary');
-		// @todo add this utf-8 header for all csv files
-		echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
-		echo $data;
-		return true;
-	}
-
-	/**
-	 * Exports the complete report as an XLS file
-	 * @return	boolean		False on error
-	 */
+            $data .= str_replace("\r\n",'  ',api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset)).';';
+            $data .= str_replace("\r\n",'  ',$row['exe_date']).';';
+            $data .= str_replace("\r\n",'  ',$row['result']).';';
+            $data .= str_replace("\r\n",'  ',$row['max']).';';
+            $data .= "\n";
+        }
+
+        //output the results
+        $len = strlen($data);
+        header('Content-type: application/octet-stream');
+        header('Content-Type: application/force-download');
+        header('Content-length: '.$len);
+        if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
+            header('Content-Disposition: filename= '.$filename);
+        } else {
+            header('Content-Disposition: attachment; filename= '.$filename);
+        }
+        if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+            header('Pragma: ');
+            header('Cache-Control: ');
+            header('Cache-Control: public'); // IE cannot download from sessions without a cache
+        }
+        header('Content-Description: '.$filename);
+        header('Content-transfer-encoding: binary');
+        // @todo add this utf-8 header for all csv files
+        echo "\xEF\xBB\xBF";  // force utf-8 header of csv file
+        echo $data;
+        return true;
+    }
+
+    /**
+     * Exports the complete report as an XLS file
+     * @return	boolean		False on error
+     */
     public function exportCompleteReportXLS(
         $document_path = '',
         $user_id = null,
@@ -225,36 +225,36 @@ 
         $exercise_id = 0,
         $hotpotato_name = null
     ) {
-		global $charset;
-		$this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
-		$filename = 'exercise_results_'.api_get_local_time().'.xls';
-		if (!empty($user_id)) {
-			$filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
-		}
+        global $charset;
+        $this->getExercisesReporting($document_path, $user_id, $export_filter, $exercise_id, $hotpotato_name);
+        $filename = 'exercise_results_'.api_get_local_time().'.xls';
+        if (!empty($user_id)) {
+            $filename = 'exercise_results_user_'.$user_id.'_'.api_get_local_time().'.xls';
+        }
 
         $spreadsheet = new PHPExcel();
         $spreadsheet->setActiveSheetIndex(0);
         $worksheet = $spreadsheet->getActiveSheet();
 
 
-		$line = 0;
-		$column = 0; //skip the first column (row titles)
+        $line = 0;
+        $column = 0; //skip the first column (row titles)
 
-		// check if exists column 'user'
-		$with_column_user = false;
-		foreach ($this->results as $result) {
-			if (!empty($result['last_name']) && !empty($result['first_name'])) {
-				$with_column_user = true;
-				break;
-			}
-		}
+        // check if exists column 'user'
+        $with_column_user = false;
+        foreach ($this->results as $result) {
+            if (!empty($result['last_name']) && !empty($result['first_name'])) {
+                $with_column_user = true;
+                break;
+            }
+        }
 
-		if ($with_column_user) {
-		    $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Email'));
-		    $column++;
+        if ($with_column_user) {
+            $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Email'));
+            $column++;
             if (api_is_western_name_order()) {
-    			$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('FirstName'));
-    			$column++;
+                $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('FirstName'));
+                $column++;
                 $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('LastName'));
                 $column++;
             } else {
@@ -263,14 +263,14 @@ 
                 $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('FirstName'));
                 $column++;
             }
-		}
+        }
 
-		if ($export_user_fields) {
-			//show user fields section with a big th colspan that spans over all fields
-			$extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
+        if ($export_user_fields) {
+            //show user fields section with a big th colspan that spans over all fields
+            $extra_user_fields = UserManager::get_extra_fields(0,1000,5,'ASC',false, 1);
 
-			//show the fields names for user fields
-			foreach ($extra_user_fields as $field) {
+            //show the fields names for user fields
+            foreach ($extra_user_fields as $field) {
                 $worksheet->setCellValueByColumnAndRow(
                     $column,
                     $line,
@@ -280,27 +280,27 @@ 
                         $charset
                     )
                 );
-				$column++;
-			}
-		}
+                $column++;
+            }
+        }
 
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Title'));
-		$column++;
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('StartDate'));
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Title'));
+        $column++;
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('StartDate'));
         $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('EndDate'));
         $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Duration').' ('.get_lang('MinMinutes').')');
-		$column++;
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Score'));
-		$column++;
-		$worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Total'));
-		$column++;
+        $column++;
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Score'));
+        $column++;
+        $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Total'));
+        $column++;
         $worksheet->setCellValueByColumnAndRow($column, $line, get_lang('Status'));
-		$line++;
+        $line++;
 
-		foreach ($this->results as $row) {
-			$column = 0;
+        foreach ($this->results as $row) {
+            $column = 0;
 
             if ($with_column_user) {
                 $worksheet->setCellValueByColumnAndRow(
@@ -325,38 +325,38 @@ 
                     $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['first_name']), ENT_QUOTES, $charset));
                     $column++;
                 }
-			}
+            }
 
-			if ($export_user_fields) {
-				//show user fields data, if any, for this user
-				$user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
-				foreach($user_fields_values as $value) {
-					$worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
-					$column++;
-				}
-			}
+            if ($export_user_fields) {
+                //show user fields data, if any, for this user
+                $user_fields_values = UserManager::get_extra_user_data($row['user_id'],false,false, false, true);
+                foreach($user_fields_values as $value) {
+                    $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($value), ENT_QUOTES, $charset));
+                    $column++;
+                }
+            }
 
-			$worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
-			$column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['start_date']);
+            $worksheet->setCellValueByColumnAndRow($column, $line, api_html_entity_decode(strip_tags($row['title']), ENT_QUOTES, $charset));
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['start_date']);
             $column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['end_date']);
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['end_date']);
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['duration']);
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['result']);
+            $column++;
+            $worksheet->setCellValueByColumnAndRow($column, $line, $row['max']);
             $column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['duration']);
-			$column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['result']);
-			$column++;
-			$worksheet->setCellValueByColumnAndRow($column, $line, $row['max']);
-			$column++;
             $worksheet->setCellValueByColumnAndRow($column, $line, $row['status']);
-			$line++;
-		}
+            $line++;
+        }
 
         $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
         $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
         $writer->save($file);
         DocumentManager::file_send_for_download($file, true, $filename);
 
-		return true;
-	}
+        return true;
+    }
 }

main/inc/lib/tracking.lib.php

Indentation +849 added lines, -849 removed lines

@@ -314,8 +314,8 @@ 
                     $extend_link = '';
                     if (!empty($inter_num)) {
                         $extend_link = Display::url(
-                              Display::return_icon('visible.gif', get_lang('HideAttemptView')),
-                              api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix
+                                Display::return_icon('visible.gif', get_lang('HideAttemptView')),
+                                api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix
                         );
                     }
                     $title = $row['mytitle'];
@@ -1370,7 +1370,7 @@ 
                 $newDate = new DateTime('-30 days', new DateTimeZone('UTC'));
                 $condition_time = " AND (login_date >= '{$newDate->format('Y-m-d H:i:s')}'";
                 $condition_time .= "AND logout_date <= '{$today->format('Y-m-d H:i:s')}') ";
-               break;
+                break;
             case 'custom':
                 if (!empty($start_date) && !empty($end_date)) {
                     $start_date = Database::escape_string($start_date);
@@ -1380,10 +1380,10 @@ 
                 break;
         }
 
-    	$sql = 'SELECT SUM(TIMESTAMPDIFF(SECOND, login_date, logout_date)) diff
+        $sql = 'SELECT SUM(TIMESTAMPDIFF(SECOND, login_date, logout_date)) diff
     	        FROM '.$tbl_track_login.'
                 WHERE '.$userCondition.$condition_time;
-    	$rs = Database::query($sql);
+        $rs = Database::query($sql);
         $row = Database::fetch_array($rs, 'ASSOC');
         $diff = $row['diff'];
 
@@ -1405,18 +1405,18 @@ 
     public static function get_time_spent_on_the_course($user_id, $courseId, $session_id = 0)
     {
         $courseId = intval($courseId);
-    	$session_id  = intval($session_id);
-
-    	$tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
-    	if (is_array($user_id)) {
-    	    $user_id = array_map('intval', $user_id);
-    		$condition_user = " AND user_id IN (".implode(',',$user_id).") ";
-    	} else {
-    		$user_id = intval($user_id);
-    		$condition_user = " AND user_id = $user_id ";
-    	}
-
-    	$sql = "SELECT
+        $session_id  = intval($session_id);
+
+        $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+        if (is_array($user_id)) {
+            $user_id = array_map('intval', $user_id);
+            $condition_user = " AND user_id IN (".implode(',',$user_id).") ";
+        } else {
+            $user_id = intval($user_id);
+            $condition_user = " AND user_id = $user_id ";
+        }
+
+        $sql = "SELECT
     	        SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds
                 FROM $tbl_track_course
                 WHERE UNIX_TIMESTAMP(logout_course_date) > UNIX_TIMESTAMP(login_course_date) ";
@@ -1431,9 +1431,9 @@ 
 
         $sql .= $condition_user;
         $rs = Database::query($sql);
-    	$row = Database::fetch_array($rs);
+        $row = Database::fetch_array($rs);
 
-    	return $row['nb_seconds'];
+        return $row['nb_seconds'];
     }
 
     /**
@@ -1444,25 +1444,25 @@ 
      */
     public static function get_first_connection_date($student_id)
     {
-    	$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-    	$sql = 'SELECT login_date
+        $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+        $sql = 'SELECT login_date
     	        FROM ' . $tbl_track_login . '
                 WHERE login_user_id = ' . intval($student_id) . '
                 ORDER BY login_date ASC
                 LIMIT 0,1';
 
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs)>0) {
-    		if ($first_login_date = Database::result($rs, 0, 0)) {
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs)>0) {
+            if ($first_login_date = Database::result($rs, 0, 0)) {
                 return api_convert_and_format_date(
                     $first_login_date,
                     DATE_FORMAT_SHORT,
                     date_default_timezone_get()
                 );
-    		}
-    	}
+            }
+        }
 
-    	return false;
+        return false;
     }
 
     /**
@@ -1475,38 +1475,38 @@ 
      */
     public static function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false)
     {
-    	$table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
-    	$sql = 'SELECT login_date
+        $table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+        $sql = 'SELECT login_date
     	        FROM ' . $table . '
                 WHERE login_user_id = ' . intval($student_id) . '
                 ORDER BY login_date
                 DESC LIMIT 0,1';
 
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs) > 0) {
-    		if ($last_login_date = Database::result($rs, 0, 0)) {
-    			$last_login_date = api_get_local_time($last_login_date);
-    			if ($return_timestamp) {
-    				return api_strtotime($last_login_date,'UTC');
-    			} else {
-    				if (!$warning_message) {
-    					return api_format_date($last_login_date, DATE_FORMAT_SHORT);
-    				} else {
-    					$timestamp = api_strtotime($last_login_date,'UTC');
-    					$currentTimestamp = time();
-
-    					//If the last connection is > than 7 days, the text is red
-    					//345600 = 7 days in seconds
-    					if ($currentTimestamp - $timestamp > 604800) {
-    						return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>';
-    					} else {
-    						return api_format_date($last_login_date, DATE_FORMAT_SHORT);
-    					}
-    				}
-    			}
-    		}
-    	}
-    	return false;
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0) {
+            if ($last_login_date = Database::result($rs, 0, 0)) {
+                $last_login_date = api_get_local_time($last_login_date);
+                if ($return_timestamp) {
+                    return api_strtotime($last_login_date,'UTC');
+                } else {
+                    if (!$warning_message) {
+                        return api_format_date($last_login_date, DATE_FORMAT_SHORT);
+                    } else {
+                        $timestamp = api_strtotime($last_login_date,'UTC');
+                        $currentTimestamp = time();
+
+                        //If the last connection is > than 7 days, the text is red
+                        //345600 = 7 days in seconds
+                        if ($currentTimestamp - $timestamp > 604800) {
+                            return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>';
+                        } else {
+                            return api_format_date($last_login_date, DATE_FORMAT_SHORT);
+                        }
+                    }
+                }
+            }
+        }
+        return false;
     }
 
     /**
@@ -1560,30 +1560,30 @@ 
         $session_id = 0,
         $convert_date = true
     ) {
-    	$student_id  = intval($student_id);
+        $student_id  = intval($student_id);
         $courseId = intval($courseId);
-    	$session_id  = intval($session_id);
+        $session_id  = intval($session_id);
 
-    	$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
-    	$sql = 'SELECT login_course_date
+        $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+        $sql = 'SELECT login_course_date
     	        FROM '.$tbl_track_login.'
                 WHERE
                     user_id = '.$student_id.' AND
                     c_id = '.$courseId.' AND
                     session_id = '.$session_id.'
                 ORDER BY login_course_date ASC LIMIT 0,1';
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs) > 0) {
-    		if ($first_login_date = Database::result($rs, 0, 0)) {
-    			if ($convert_date) {
-    				return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT);
-    			} else {
-    				return $first_login_date;
-    			}
-    		}
-    	}
-
-    	return false;
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0) {
+            if ($first_login_date = Database::result($rs, 0, 0)) {
+                if ($convert_date) {
+                    return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT);
+                } else {
+                    return $first_login_date;
+                }
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -1599,13 +1599,13 @@ 
         $session_id = 0,
         $convert_date = true
     ) {
-    	// protect data
-    	$student_id  = intval($student_id);
+        // protect data
+        $student_id  = intval($student_id);
         $courseId = $courseInfo['real_id'];
-    	$session_id  = intval($session_id);
+        $session_id  = intval($session_id);
 
-    	$tbl_track_e_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-    	$sql = 'SELECT access_date
+        $tbl_track_e_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+        $sql = 'SELECT access_date
                 FROM '.$tbl_track_e_access.'
                 WHERE   access_user_id = '.$student_id.' AND
                         c_id = "'.$courseId.'" AND
@@ -1613,39 +1613,39 @@ 
                 ORDER BY access_date DESC
                 LIMIT 0,1';
 
-    	$rs = Database::query($sql);
-    	if (Database::num_rows($rs) > 0) {
-    		if ($last_login_date = Database::result($rs, 0, 0)) {
+        $rs = Database::query($sql);
+        if (Database::num_rows($rs) > 0) {
+            if ($last_login_date = Database::result($rs, 0, 0)) {
                 if (empty($last_login_date)) {
                     return false;
                 }
                 //see #5736
                 $last_login_date_timestamp = api_strtotime($last_login_date);
-    			$now = time();
-    			//If the last connection is > than 7 days, the text is red
-    			//345600 = 7 days in seconds
-    			if ($now - $last_login_date_timestamp > 604800) {
-    				if ($convert_date) {
+                $now = time();
+                //If the last connection is > than 7 days, the text is red
+                //345600 = 7 days in seconds
+                if ($now - $last_login_date_timestamp > 604800) {
+                    if ($convert_date) {
                         $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
                         $icon = api_is_allowed_to_edit() ?
                             '<a href="'.api_get_path(WEB_CODE_PATH).'announcements/announcements.php?action=add&remind_inactive='.$student_id.'&cidReq='.$courseInfo['code'].'" title="'.get_lang('RemindInactiveUser').'">
                               '.Display::return_icon('messagebox_warning.gif').'
                              </a>'
                             : null;
-    					return $icon. Display::label($last_login_date, 'warning');
-    				} else {
-    					return $last_login_date;
-    				}
-    			} else {
-    				if ($convert_date) {
-    					return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
-    				} else {
-    					return $last_login_date;
-    				}
-    			}
-    		}
-    	}
-    	return false;
+                        return $icon. Display::label($last_login_date, 'warning');
+                    } else {
+                        return $last_login_date;
+                    }
+                } else {
+                    if ($convert_date) {
+                        return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT);
+                    } else {
+                        return $last_login_date;
+                    }
+                }
+            }
+        }
+        return false;
     }
 
     /**
@@ -1659,11 +1659,11 @@ 
     public static function get_course_connections_count($courseId, $session_id = 0, $start = 0, $stop = null)
     {
         if ($start < 0) {
-    		$start = 0;
-    	}
-    	if (!isset($stop) or ($stop < 0)) {
-    		$stop = api_get_utc_datetime();
-    	}
+            $start = 0;
+        }
+        if (!isset($stop) or ($stop < 0)) {
+            $stop = api_get_utc_datetime();
+        }
 
         // Given we're storing in cache, round the start and end times
         // to the lower minute
@@ -1672,11 +1672,11 @@ 
         $roundedStart = Database::escape_string($roundedStart);
         $roundedStop = Database::escape_string($roundedStop);
 
-    	$month_filter = " AND login_course_date > '$roundedStart' AND login_course_date < '$roundedStop' ";
+        $month_filter = " AND login_course_date > '$roundedStart' AND login_course_date < '$roundedStop' ";
 
         $courseId = intval($courseId);
-    	$session_id  = intval($session_id);
-    	$count = 0;
+        $session_id  = intval($session_id);
+        $count = 0;
         $tbl_track_e_course_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
         $sql =  "SELECT count(*) as count_connections
                 FROM $tbl_track_e_course_access
@@ -1715,7 +1715,7 @@ 
             }
         }
 
-    	return $count;
+        return $count;
     }
 
     /**
@@ -1726,25 +1726,25 @@ 
      */
     public static function count_course_per_student($user_id, $include_sessions = true)
     {
-    	$user_id = intval($user_id);
-    	$tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-    	$tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+        $user_id = intval($user_id);
+        $tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+        $tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
 
-    	$sql = 'SELECT DISTINCT c_id
+        $sql = 'SELECT DISTINCT c_id
                 FROM ' . $tbl_course_rel_user . '
                 WHERE user_id = ' . $user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH;
-    	$rs = Database::query($sql);
-    	$nb_courses = Database::num_rows($rs);
+        $rs = Database::query($sql);
+        $nb_courses = Database::num_rows($rs);
 
-    	if ($include_sessions) {
-    		$sql = 'SELECT DISTINCT c_id
+        if ($include_sessions) {
+            $sql = 'SELECT DISTINCT c_id
                     FROM ' . $tbl_session_course_rel_user . '
                     WHERE user_id = ' . $user_id;
-    		$rs = Database::query($sql);
-    		$nb_courses += Database::num_rows($rs);
-    	}
+            $rs = Database::query($sql);
+            $nb_courses += Database::num_rows($rs);
+        }
 
-    	return $nb_courses;
+        return $nb_courses;
     }
 
     /**
@@ -1775,25 +1775,25 @@ 
         $into_lp = 0
     ) {
         $course_code = Database::escape_string($course_code);
-    	$course_info = api_get_course_info($course_code);
-    	if (!empty($course_info)) {
-    		// table definition
-    		$tbl_course_quiz     = Database::get_course_table(TABLE_QUIZ_TEST);
-    		$tbl_stats_exercise  = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-
-    		// Compose a filter based on optional exercise given
-    		$condition_quiz = "";
-    		if (!empty($exercise_id)) {
-    			$exercise_id = intval($exercise_id);
-    			$condition_quiz =" AND id = $exercise_id ";
-    		}
-
-    		// Compose a filter based on optional session id given
-    		$condition_session = "";
-    		if (isset($session_id)) {
-    			$session_id = intval($session_id);
-    			$condition_session = " AND session_id = $session_id ";
-    		}
+        $course_info = api_get_course_info($course_code);
+        if (!empty($course_info)) {
+            // table definition
+            $tbl_course_quiz     = Database::get_course_table(TABLE_QUIZ_TEST);
+            $tbl_stats_exercise  = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+
+            // Compose a filter based on optional exercise given
+            $condition_quiz = "";
+            if (!empty($exercise_id)) {
+                $exercise_id = intval($exercise_id);
+                $condition_quiz =" AND id = $exercise_id ";
+            }
+
+            // Compose a filter based on optional session id given
+            $condition_session = "";
+            if (isset($session_id)) {
+                $session_id = intval($session_id);
+                $condition_session = " AND session_id = $session_id ";
+            }
             if ($active_filter == 1) {
                 $condition_active = 'AND active <> -1';
             } elseif ($active_filter == 0) {
@@ -1809,7 +1809,7 @@ 
                 $select_lp_id = ', orig_lp_id as lp_id ';
             }
 
-    		$sql = "SELECT count(id) FROM $tbl_course_quiz
+            $sql = "SELECT count(id) FROM $tbl_course_quiz
     				WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz ";
             $count_quiz = 0;
             $countQuizResult = Database::query($sql);
@@ -1817,21 +1817,21 @@ 
                 $count_quiz = Database::fetch_row($countQuizResult);
             }
 
-    		if (!empty($count_quiz[0]) && !empty($student_id)) {
-    			if (is_array($student_id)) {
+            if (!empty($count_quiz[0]) && !empty($student_id)) {
+                if (is_array($student_id)) {
                     $student_id = array_map('intval', $student_id);
-    				$condition_user = " AND exe_user_id IN (".implode(',', $student_id).") ";
-    			} else {
+                    $condition_user = " AND exe_user_id IN (".implode(',', $student_id).") ";
+                } else {
                     $student_id = intval($student_id);
-    				$condition_user = " AND exe_user_id = '$student_id' ";
-    			}
+                    $condition_user = " AND exe_user_id = '$student_id' ";
+                }
 
-    			if (empty($exercise_id)) {
-    				$sql = "SELECT id FROM $tbl_course_quiz
+                if (empty($exercise_id)) {
+                    $sql = "SELECT id FROM $tbl_course_quiz
     						WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz";
                     $result = Database::query($sql);
                     $exercise_list = array();
-    				$exercise_id = null;
+                    $exercise_id = null;
                     if (!empty($result) && Database::num_rows($result)) {
                         while ($row = Database::fetch_array($result)) {
                             $exercise_list[] = $row['id'];
@@ -1840,11 +1840,11 @@ 
                     if (!empty($exercise_list)) {
                         $exercise_id = implode("','",$exercise_list);
                     }
-    			}
+                }
 
-    			$count_quiz = Database::fetch_row(Database::query($sql));
+                $count_quiz = Database::fetch_row(Database::query($sql));
 
-    			$sql = "SELECT
+                $sql = "SELECT
     			        SUM(exe_result/exe_weighting*100) as avg_score,
     			        COUNT(*) as num_attempts
     			        $select_lp_id
@@ -1858,20 +1858,20 @@ 
                             $condition_into_lp
                         ORDER BY exe_date DESC";
 
-    			$res = Database::query($sql);
-    			$row = Database::fetch_array($res);
-    			$quiz_avg_score = null;
+                $res = Database::query($sql);
+                $row = Database::fetch_array($res);
+                $quiz_avg_score = null;
 
-    			if (!empty($row['avg_score'])) {
-    				$quiz_avg_score = round($row['avg_score'],2);
-    			}
+                if (!empty($row['avg_score'])) {
+                    $quiz_avg_score = round($row['avg_score'],2);
+                }
 
-    			if(!empty($row['num_attempts'])) {
-    				$quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2);
-    			}
-    			if (is_array($student_id)) {
-    				$quiz_avg_score = round($quiz_avg_score / count($student_id), 2);
-    			}
+                if(!empty($row['num_attempts'])) {
+                    $quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2);
+                }
+                if (is_array($student_id)) {
+                    $quiz_avg_score = round($quiz_avg_score / count($student_id), 2);
+                }
                 if ($into_lp == 0) {
                     return $quiz_avg_score;
                 } else {
@@ -1894,9 +1894,9 @@ 
                         return array($quiz_avg_score, null);
                     }
                 }
-    		}
-    	}
-    	return null;
+            }
+        }
+        return null;
     }
 
     /**
@@ -1929,15 +1929,15 @@ 
         $find_all_lp = 0
     ) {
         $courseId = intval($courseId);
-    	$student_id  = intval($student_id);
-    	$exercise_id = intval($exercise_id);
-    	$session_id  = intval($session_id);
+        $student_id  = intval($student_id);
+        $exercise_id = intval($exercise_id);
+        $session_id  = intval($session_id);
 
-    	$lp_id = intval($lp_id);
+        $lp_id = intval($lp_id);
         $lp_item_id = intval($lp_item_id);
-    	$tbl_stats_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+        $tbl_stats_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
 
-    	$sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercises AS ex
+        $sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercises AS ex
                 WHERE  ex.c_id = $courseId
                 AND ex.exe_exo_id = $exercise_id
                 AND status = ''
@@ -1952,11 +1952,11 @@ 
                 AND orig_lp_item_id = $lp_item_id";
         }
 
-    	$rs = Database::query($sql);
-    	$row = Database::fetch_row($rs);
-    	$count_attempts = $row[0];
+        $rs = Database::query($sql);
+        $row = Database::fetch_row($rs);
+        $count_attempts = $row[0];
 
-    	return $count_attempts;
+        return $count_attempts;
     }
 
     /**
@@ -1966,7 +1966,7 @@ 
      * @param int    $user_id
      * @param int    $courseId
      * @param int    $session_id
-    */
+     */
     public static function get_exercise_student_progress($exercise_list, $user_id, $courseId, $session_id)
     {
         $courseId = intval($courseId);
@@ -3634,8 +3634,8 @@ 
 
         $condition_session = '';
         if (isset($session_id)) {
-             $session_id = intval($session_id);
-             $condition_session = ' AND f.session_id = '. $session_id;
+                $session_id = intval($session_id);
+                $condition_session = ' AND f.session_id = '. $session_id;
         }
 
         $groupId = intval($groupId);
@@ -5564,9 +5564,9 @@ 
     }
 
     /**
-    * @param FormValidator $form
-    * @return mixed
-    */
+     * @param FormValidator $form
+     * @return mixed
+     */
     public static function setUserSearchForm($form)
     {
         global $_configuration;
@@ -5961,26 +5961,26 @@ 
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
 
-    	$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-    	$table_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 
-    	$sql = "SELECT count(tool) AS total_number_of_items
+        $sql = "SELECT count(tool) AS total_number_of_items
     	        FROM $table_item_property track_resource, $table_user user
     	        WHERE
                     track_resource.c_id = $course_id AND
                     track_resource.insert_user_id = user.user_id AND
                     session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id ");
 
-    	if (isset($_GET['keyword'])) {
-    		$keyword = Database::escape_string(trim($_GET['keyword']));
-    		$sql .= " AND (
+        if (isset($_GET['keyword'])) {
+            $keyword = Database::escape_string(trim($_GET['keyword']));
+            $sql .= " AND (
     		            user.username LIKE '%".$keyword."%' OR
     		            lastedit_type LIKE '%".$keyword."%' OR
     		            tool LIKE '%".$keyword."%'
                     )";
-    	}
+        }
 
-    	$sql .= " AND tool IN (
+        $sql .= " AND tool IN (
     	            'document',
     	            'learnpath',
     	            'quiz',
@@ -5992,10 +5992,10 @@ 
     	            'thematic_advance',
     	            'thematic_plan'
                 )";
-    	$res = Database::query($sql);
-    	$obj = Database::fetch_object($res);
+        $res = Database::query($sql);
+        $obj = Database::fetch_object($res);
 
-    	return $obj->total_number_of_items;
+        return $obj->total_number_of_items;
     }
 
     /**
@@ -6010,12 +6010,12 @@ 
         $session_id = api_get_session_id();
         $course_id = api_get_course_int_id();
 
-    	$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
-    	$table_user = Database :: get_main_table(TABLE_MAIN_USER);
-    	$table_session = Database :: get_main_table(TABLE_MAIN_SESSION);
-    	$session_id = intval($session_id);
+        $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
+        $table_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $table_session = Database :: get_main_table(TABLE_MAIN_SESSION);
+        $session_id = intval($session_id);
 
-    	$sql = "SELECT
+        $sql = "SELECT
                     tool as col0,
                     lastedit_type as col1,
                     ref as ref,
@@ -6029,16 +6029,16 @@ 
                   track_resource.insert_user_id = user.user_id AND
                   session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id ");
 
-    	if (isset($_GET['keyword'])) {
-    		$keyword = Database::escape_string(trim($_GET['keyword']));
-    		$sql .= " AND (
+        if (isset($_GET['keyword'])) {
+            $keyword = Database::escape_string(trim($_GET['keyword']));
+            $sql .= " AND (
     		            user.username LIKE '%".$keyword."%' OR
     		            lastedit_type LIKE '%".$keyword."%' OR
     		            tool LIKE '%".$keyword."%'
                      ) ";
-    	}
+        }
 
-    	$sql .= " AND tool IN (
+        $sql .= " AND tool IN (
     	            'document',
     	            'learnpath',
     	            'quiz',
@@ -6051,41 +6051,41 @@ 
     	            'thematic_plan'
                 )";
 
-    	if ($column == 0) {
-    		$column = '0';
-    	}
-    	if ($column != '' && $direction != '') {
-    		if ($column != 2 && $column != 4) {
-    			$sql .= " ORDER BY col$column $direction";
-    		}
-    	} else {
-    		$sql .= " ORDER BY col5 DESC ";
-    	}
+        if ($column == 0) {
+            $column = '0';
+        }
+        if ($column != '' && $direction != '') {
+            if ($column != 2 && $column != 4) {
+                $sql .= " ORDER BY col$column $direction";
+            }
+        } else {
+            $sql .= " ORDER BY col5 DESC ";
+        }
 
         $from = intval($from);
         $number_of_items = intval($number_of_items);
 
-    	$sql .= " LIMIT $from, $number_of_items ";
-
-    	$res = Database::query($sql);
-    	$resources = array();
-    	$thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan');
-    	while ($row = Database::fetch_array($res)) {
-    		$ref = $row['ref'];
-    		$table_name = TrackingCourseLog::get_tool_name_table($row['col0']);
-    		$table_tool = Database :: get_course_table($table_name['table_name']);
+        $sql .= " LIMIT $from, $number_of_items ";
 
-    		$id = $table_name['id_tool'];
-    		$recorset = false;
-
-    		if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) {
-    			$tbl_thematic = Database :: get_course_table(TABLE_THEMATIC);
-    			$sql = "SELECT thematic_id FROM $table_tool
+        $res = Database::query($sql);
+        $resources = array();
+        $thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan');
+        while ($row = Database::fetch_array($res)) {
+            $ref = $row['ref'];
+            $table_name = TrackingCourseLog::get_tool_name_table($row['col0']);
+            $table_tool = Database :: get_course_table($table_name['table_name']);
+
+            $id = $table_name['id_tool'];
+            $recorset = false;
+
+            if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) {
+                $tbl_thematic = Database :: get_course_table(TABLE_THEMATIC);
+                $sql = "SELECT thematic_id FROM $table_tool
     			        WHERE c_id = $course_id AND id = $ref";
-    			$rs_thematic  = Database::query($sql);
-    			if (Database::num_rows($rs_thematic)) {
-    				$row_thematic = Database::fetch_array($rs_thematic);
-    				$thematic_id = $row_thematic['thematic_id'];
+                $rs_thematic  = Database::query($sql);
+                if (Database::num_rows($rs_thematic)) {
+                    $row_thematic = Database::fetch_array($rs_thematic);
+                    $thematic_id = $row_thematic['thematic_id'];
 
                     $sql = "SELECT session.id, session.name, user.username
                             FROM $tbl_thematic t, $table_session session, $table_user user
@@ -6094,9 +6094,9 @@ 
                               t.session_id = session.id AND
                               session.id_coach = user.user_id AND
                               t.id = $thematic_id";
-    				$recorset = Database::query($sql);
-    			}
-    		} else {
+                    $recorset = Database::query($sql);
+                }
+            } else {
                 $sql = "SELECT session.id, session.name, user.username
                           FROM $table_tool tool, $table_session session, $table_user user
     			          WHERE
@@ -6104,134 +6104,134 @@ 
     			              tool.session_id = session.id AND
     			              session.id_coach = user.user_id AND
     			              tool.$id = $ref";
-    			$recorset = Database::query($sql);
-    		}
-
-    		if (!empty($recorset)) {
-    			$obj = Database::fetch_object($recorset);
-
-    			$name_session = '';
-    			$coach_name = '';
-    			if (!empty($obj)) {
-    				$name_session = $obj->name;
-    				$coach_name   = $obj->username;
-    			}
-
-    			$url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool'];
-    			$row[0] = '';
-    			if ($row['col6'] != 2) {
-    				if (in_array($row['col0'], $thematic_tools)) {
-
-    					$exp_thematic_tool = explode('_', $row['col0']);
-    					$thematic_tool_title = '';
-    					if (is_array($exp_thematic_tool)) {
-    						foreach ($exp_thematic_tool as $exp) {
-    							$thematic_tool_title .= api_ucfirst($exp);
-    						}
-    					} else {
-    						$thematic_tool_title = api_ucfirst($row['col0']);
-    					}
-
-    					$row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'&action=thematic_details">'.get_lang($thematic_tool_title).'</a>';
-    				} else {
-    					$row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'">'.get_lang('Tool'.api_ucfirst($row['col0'])).'</a>';
-    				}
-    			} else {
-    				$row[0] = api_ucfirst($row['col0']);
-    			}
-    			$row[1] = get_lang($row[1]);
-    			$row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get());
-    			$row[5] = '';
-    			//@todo Improve this code please
-    			switch ($table_name['table_name']) {
-    				case 'document':
-    					$sql = "SELECT tool.title as title FROM $table_tool tool
+                $recorset = Database::query($sql);
+            }
+
+            if (!empty($recorset)) {
+                $obj = Database::fetch_object($recorset);
+
+                $name_session = '';
+                $coach_name = '';
+                if (!empty($obj)) {
+                    $name_session = $obj->name;
+                    $coach_name   = $obj->username;
+                }
+
+                $url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool'];
+                $row[0] = '';
+                if ($row['col6'] != 2) {
+                    if (in_array($row['col0'], $thematic_tools)) {
+
+                        $exp_thematic_tool = explode('_', $row['col0']);
+                        $thematic_tool_title = '';
+                        if (is_array($exp_thematic_tool)) {
+                            foreach ($exp_thematic_tool as $exp) {
+                                $thematic_tool_title .= api_ucfirst($exp);
+                            }
+                        } else {
+                            $thematic_tool_title = api_ucfirst($row['col0']);
+                        }
+
+                        $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'&action=thematic_details">'.get_lang($thematic_tool_title).'</a>';
+                    } else {
+                        $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'">'.get_lang('Tool'.api_ucfirst($row['col0'])).'</a>';
+                    }
+                } else {
+                    $row[0] = api_ucfirst($row['col0']);
+                }
+                $row[1] = get_lang($row[1]);
+                $row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get());
+                $row[5] = '';
+                //@todo Improve this code please
+                switch ($table_name['table_name']) {
+                    case 'document':
+                        $sql = "SELECT tool.title as title FROM $table_tool tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'announcement':
+                        break;
+                    case 'announcement':
                         $sql = "SELECT title FROM $table_tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'glossary':
+                        break;
+                    case 'glossary':
                         $sql = "SELECT name FROM $table_tool
     					        WHERE c_id = $course_id AND glossary_id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->name;
                         }
-    					break;
-    				case 'lp':
+                        break;
+                    case 'lp':
                         $sql = "SELECT name
                                 FROM $table_tool WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
-    					$row[5] = $obj_document->name;
-    					break;
-    				case 'quiz':
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
+                        $row[5] = $obj_document->name;
+                        break;
+                    case 'quiz':
                         $sql = "SELECT title FROM $table_tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'course_description':
+                        break;
+                    case 'course_description':
                         $sql = "SELECT title FROM $table_tool
                                 WHERE c_id = $course_id AND id = $ref";
-    					$rs_document = Database::query($sql);
-    					$obj_document = Database::fetch_object($rs_document);
+                        $rs_document = Database::query($sql);
+                        $obj_document = Database::fetch_object($rs_document);
                         if ($obj_document) {
                             $row[5] = $obj_document->title;
                         }
-    					break;
-    				case 'thematic':
-    					$rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-    					if (Database::num_rows($rs) > 0) {
-    						$obj = Database::fetch_object($rs);
+                        break;
+                    case 'thematic':
+                        $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
                             if ($obj) {
                                 $row[5] = $obj->title;
                             }
-    					}
-    					break;
-    				case 'thematic_advance':
-    					$rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-    					if (Database::num_rows($rs) > 0) {
-    						$obj = Database::fetch_object($rs);
+                        }
+                        break;
+                    case 'thematic_advance':
+                        $rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
                             if ($obj) {
                                 $row[5] = $obj->content;
                             }
-    					}
-    					break;
-    				case 'thematic_plan':
-    					$rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
-    					if (Database::num_rows($rs) > 0) {
-    						$obj = Database::fetch_object($rs);
+                        }
+                        break;
+                    case 'thematic_plan':
+                        $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref");
+                        if (Database::num_rows($rs) > 0) {
+                            $obj = Database::fetch_object($rs);
                             if ($obj) {
                                 $row[5] = $obj->title;
                             }
-    					}
-    					break;
-    				default:
-    					break;
-    			}
-
-    			$row2 = $name_session;
-    			if (!empty($coach_name)) {
-    				$row2 .= '<br />'.get_lang('Coach').': '.$coach_name;
-    			}
-    			$row[2] = $row2;
+                        }
+                        break;
+                    default:
+                        break;
+                }
+
+                $row2 = $name_session;
+                if (!empty($coach_name)) {
+                    $row2 .= '<br />'.get_lang('Coach').': '.$coach_name;
+                }
+                $row[2] = $row2;
                 if (!empty($row['col3'])) {
                     $userInfo = api_get_user_info($row['user_id']);
                     $row['col3'] = Display::url(
@@ -6247,11 +6247,11 @@ 
                     $row[4] = $ip;
                 }
 
-    			$resources[] = $row;
-    		}
-    	}
+                $resources[] = $row;
+            }
+        }
 
-    	return $resources;
+        return $resources;
     }
 
     /**
@@ -6261,63 +6261,63 @@ 
      */
     public static function get_tool_name_table($tool)
     {
-    	switch ($tool) {
-    		case 'document':
-    			$table_name = TABLE_DOCUMENT;
-    			$link_tool = 'document/document.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'learnpath':
-    			$table_name = TABLE_LP_MAIN;
-    			$link_tool = 'lp/lp_controller.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'quiz':
-    			$table_name = TABLE_QUIZ_TEST;
-    			$link_tool = 'exercise/exercise.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'glossary':
-    			$table_name = TABLE_GLOSSARY;
-    			$link_tool = 'glossary/index.php';
-    			$id_tool = 'glossary_id';
-    			break;
-    		case 'link':
-    			$table_name = TABLE_LINK;
-    			$link_tool = 'link/link.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'course_description':
-    			$table_name = TABLE_COURSE_DESCRIPTION;
-    			$link_tool = 'course_description/';
-    			$id_tool = 'id';
-    			break;
-    		case 'announcement':
-    			$table_name = TABLE_ANNOUNCEMENT;
-    			$link_tool = 'announcements/announcements.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'thematic':
-    			$table_name = TABLE_THEMATIC;
-    			$link_tool = 'course_progress/index.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'thematic_advance':
-    			$table_name = TABLE_THEMATIC_ADVANCE;
-    			$link_tool = 'course_progress/index.php';
-    			$id_tool = 'id';
-    			break;
-    		case 'thematic_plan':
-    			$table_name = TABLE_THEMATIC_PLAN;
-    			$link_tool = 'course_progress/index.php';
-    			$id_tool = 'id';
-    			break;
-    		default:
-    			$table_name = $tool;
-    		break;
-    	}
-
-    	return array(
+        switch ($tool) {
+            case 'document':
+                $table_name = TABLE_DOCUMENT;
+                $link_tool = 'document/document.php';
+                $id_tool = 'id';
+                break;
+            case 'learnpath':
+                $table_name = TABLE_LP_MAIN;
+                $link_tool = 'lp/lp_controller.php';
+                $id_tool = 'id';
+                break;
+            case 'quiz':
+                $table_name = TABLE_QUIZ_TEST;
+                $link_tool = 'exercise/exercise.php';
+                $id_tool = 'id';
+                break;
+            case 'glossary':
+                $table_name = TABLE_GLOSSARY;
+                $link_tool = 'glossary/index.php';
+                $id_tool = 'glossary_id';
+                break;
+            case 'link':
+                $table_name = TABLE_LINK;
+                $link_tool = 'link/link.php';
+                $id_tool = 'id';
+                break;
+            case 'course_description':
+                $table_name = TABLE_COURSE_DESCRIPTION;
+                $link_tool = 'course_description/';
+                $id_tool = 'id';
+                break;
+            case 'announcement':
+                $table_name = TABLE_ANNOUNCEMENT;
+                $link_tool = 'announcements/announcements.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic':
+                $table_name = TABLE_THEMATIC;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic_advance':
+                $table_name = TABLE_THEMATIC_ADVANCE;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            case 'thematic_plan':
+                $table_name = TABLE_THEMATIC_PLAN;
+                $link_tool = 'course_progress/index.php';
+                $id_tool = 'id';
+                break;
+            default:
+                $table_name = $tool;
+            break;
+        }
+
+        return array(
             'table_name' => $table_name,
             'link_tool' => $link_tool,
             'id_tool' => $id_tool
@@ -6326,45 +6326,45 @@ 
 
     public static function display_additional_profile_fields()
     {
-    	// getting all the extra profile fields that are defined by the platform administrator
-    	$extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC');
-
-    	// creating the form
-    	$return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">';
-
-    	// the select field with the additional user profile fields (= this is where we select the field of which we want to see
-    	// the information the users have entered or selected.
-    	$return .= '<select name="additional_profile_field">';
-    	$return .= '<option value="-">'.get_lang('SelectFieldToAdd').'</option>';
-    	$extra_fields_to_show = 0;
-    	foreach ($extra_fields as $key=>$field) {
-    		// show only extra fields that are visible + and can be filtered, added by J.Montoya
-    		if ($field[6]==1 && $field[8] == 1) {
-    			if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) {
-    				$selected = 'selected="selected"';
-    			} else {
-    				$selected = '';
-    			}
-    			$extra_fields_to_show++;
-    			$return .= '<option value="'.$field[0].'" '.$selected.'>'.$field[3].'</option>';
-    		}
-    	}
-    	$return .= '</select>';
-
-    	// the form elements for the $_GET parameters (because the form is passed through GET
-    	foreach ($_GET as $key=>$value){
-    		if ($key <> 'additional_profile_field')    {
-    			$return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />';
-    		}
-    	}
-    	// the submit button
-    	$return .= '<button class="save" type="submit">'.get_lang('AddAdditionalProfileField').'</button>';
-    	$return .= '</form>';
-    	if ($extra_fields_to_show > 0) {
-    		return $return;
-    	} else {
-    		return '';
-    	}
+        // getting all the extra profile fields that are defined by the platform administrator
+        $extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC');
+
+        // creating the form
+        $return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">';
+
+        // the select field with the additional user profile fields (= this is where we select the field of which we want to see
+        // the information the users have entered or selected.
+        $return .= '<select name="additional_profile_field">';
+        $return .= '<option value="-">'.get_lang('SelectFieldToAdd').'</option>';
+        $extra_fields_to_show = 0;
+        foreach ($extra_fields as $key=>$field) {
+            // show only extra fields that are visible + and can be filtered, added by J.Montoya
+            if ($field[6]==1 && $field[8] == 1) {
+                if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) {
+                    $selected = 'selected="selected"';
+                } else {
+                    $selected = '';
+                }
+                $extra_fields_to_show++;
+                $return .= '<option value="'.$field[0].'" '.$selected.'>'.$field[3].'</option>';
+            }
+        }
+        $return .= '</select>';
+
+        // the form elements for the $_GET parameters (because the form is passed through GET
+        foreach ($_GET as $key=>$value){
+            if ($key <> 'additional_profile_field')    {
+                $return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />';
+            }
+        }
+        // the submit button
+        $return .= '<button class="save" type="submit">'.get_lang('AddAdditionalProfileField').'</button>';
+        $return .= '</form>';
+        if ($extra_fields_to_show > 0) {
+            return $return;
+        } else {
+            return '';
+        }
     }
 
     /**
@@ -6383,31 +6383,31 @@ 
      */
     public static function get_addtional_profile_information_of_field_by_user($field_id, $users)
     {
-    	// Database table definition
-    	$table_user = Database::get_main_table(TABLE_MAIN_USER);
-    	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+        // Database table definition
+        $table_user = Database::get_main_table(TABLE_MAIN_USER);
+        $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
         $extraField = Database::get_main_table(TABLE_EXTRA_FIELD);
-    	$result_extra_field = UserManager::get_extra_field_information($field_id);
-
-    	if (!empty($users)) {
-    		if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) {
-    			foreach($users as $user_id) {
-    				$user_result = UserManager::get_user_tags($user_id, $field_id);
-    				$tag_list = array();
-    				foreach($user_result as $item) {
-    					$tag_list[] = $item['tag'];
-    				}
-    				$return[$user_id][] = implode(', ',$tag_list);
-    			}
-    		} else {
-    			$new_user_array = array();
-    			foreach ($users as $user_id) {
-    				$new_user_array[]= "'".$user_id."'";
-    			}
-    			$users = implode(',',$new_user_array);
+        $result_extra_field = UserManager::get_extra_field_information($field_id);
+
+        if (!empty($users)) {
+            if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) {
+                foreach($users as $user_id) {
+                    $user_result = UserManager::get_user_tags($user_id, $field_id);
+                    $tag_list = array();
+                    foreach($user_result as $item) {
+                        $tag_list[] = $item['tag'];
+                    }
+                    $return[$user_id][] = implode(', ',$tag_list);
+                }
+            } else {
+                $new_user_array = array();
+                foreach ($users as $user_id) {
+                    $new_user_array[]= "'".$user_id."'";
+                }
+                $users = implode(',',$new_user_array);
                 $extraFieldType = EntityExtraField::USER_FIELD_TYPE;
-    			// Selecting only the necessary information NOT ALL the user list
-    			$sql = "SELECT user.user_id, v.value
+                // Selecting only the necessary information NOT ALL the user list
+                $sql = "SELECT user.user_id, v.value
     			        FROM $table_user user
     			        INNER JOIN $table_user_field_values v
                         ON (user.user_id = v.item_id)
@@ -6418,27 +6418,27 @@ 
                             v.field_id=".intval($field_id)." AND
                             user.user_id IN ($users)";
 
-    			$result = Database::query($sql);
-    			while($row = Database::fetch_array($result)) {
-    				// get option value for field type double select by id
-    				if (!empty($row['value'])) {
-    					if ($result_extra_field['field_type'] ==
+                $result = Database::query($sql);
+                while($row = Database::fetch_array($result)) {
+                    // get option value for field type double select by id
+                    if (!empty($row['value'])) {
+                        if ($result_extra_field['field_type'] ==
                             ExtraField::FIELD_TYPE_DOUBLE_SELECT
                         ) {
-    						$id_double_select = explode(';', $row['value']);
-    						if (is_array($id_double_select)) {
-    							$value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
-    							$value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
-    							$row['value'] = ($value1.';'.$value2);
-    						}
-    					}
-    				}
-    				// get other value from extra field
-    				$return[$row['user_id']][] = $row['value'];
-    			}
-    		}
-    	}
-    	return $return;
+                            $id_double_select = explode(';', $row['value']);
+                            if (is_array($id_double_select)) {
+                                $value1 = $result_extra_field['options'][$id_double_select[0]]['option_value'];
+                                $value2 = $result_extra_field['options'][$id_double_select[1]]['option_value'];
+                                $row['value'] = ($value1.';'.$value2);
+                            }
+                        }
+                    }
+                    // get other value from extra field
+                    $return[$row['user_id']][] = $row['value'];
+                }
+            }
+        }
+        return $return;
     }
 
     /**
@@ -6447,18 +6447,18 @@ 
      */
     public function count_student_in_course()
     {
-    	global $nbStudents;
-    	return $nbStudents;
+        global $nbStudents;
+        return $nbStudents;
     }
 
     public function sort_users($a, $b)
     {
-    	return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']])));
+        return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']])));
     }
 
     public function sort_users_desc($a, $b)
     {
-    	return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
+        return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']])));
     }
 
     /**
@@ -6467,8 +6467,8 @@ 
      */
     public static function get_number_of_users()
     {
-    	global $user_ids;
-    	return count($user_ids);
+        global $user_ids;
+        return count($user_ids);
     }
 
     /**
@@ -6484,37 +6484,37 @@ 
     {
         global $user_ids, $course_code, $additional_user_profile_info, $export_csv, $is_western_name_order, $csv_content, $session_id;
 
-    	$course_code = Database::escape_string($course_code);
-    	$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
-    	$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $course_code = Database::escape_string($course_code);
+        $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
-    	$access_url_id = api_get_current_access_url_id();
+        $access_url_id = api_get_current_access_url_id();
 
-    	// get all users data from a course for sortable with limit
-    	if (is_array($user_ids)) {
-    		$user_ids = array_map('intval', $user_ids);
-    		$condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") ";
-    	} else {
-    		$user_ids = intval($user_ids);
-    		$condition_user = " WHERE user.user_id = $user_ids ";
-    	}
+        // get all users data from a course for sortable with limit
+        if (is_array($user_ids)) {
+            $user_ids = array_map('intval', $user_ids);
+            $condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") ";
+        } else {
+            $user_ids = intval($user_ids);
+            $condition_user = " WHERE user.user_id = $user_ids ";
+        }
 
-    	if (!empty($_GET['user_keyword'])) {
-    		$keyword = trim(Database::escape_string($_GET['user_keyword']));
-    		$condition_user .=  " AND (
+        if (!empty($_GET['user_keyword'])) {
+            $keyword = trim(Database::escape_string($_GET['user_keyword']));
+            $condition_user .=  " AND (
                 user.firstname LIKE '%".$keyword."%' OR
                 user.lastname LIKE '%".$keyword."%'  OR
                 user.username LIKE '%".$keyword."%'  OR
                 user.email LIKE '%".$keyword."%'
              ) ";
-    	}
+        }
 
         $url_table = null;
         $url_condition = null;
-    	if (api_is_multiple_url_enabled()) {
-    		$url_table = ", ".$tbl_url_rel_user." as url_users";
-    		$url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'";
-    	}
+        if (api_is_multiple_url_enabled()) {
+            $url_table = ", ".$tbl_url_rel_user." as url_users";
+            $url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'";
+        }
 
         $invitedUsersCondition = '';
 
@@ -6522,7 +6522,7 @@ 
             $invitedUsersCondition = " AND user.status != " . INVITEE;
         }
 
-    	$sql = "SELECT  user.user_id as user_id,
+        $sql = "SELECT  user.user_id as user_id,
                     user.official_code  as col0,
                     user.lastname       as col1,
                     user.firstname      as col2,
@@ -6530,16 +6530,16 @@ 
                 FROM $tbl_user as user $url_table
     	        $condition_user $url_condition $invitedUsersCondition";
 
-    	if (!in_array($direction, array('ASC','DESC'))) {
-    		$direction = 'ASC';
-    	}
+        if (!in_array($direction, array('ASC','DESC'))) {
+            $direction = 'ASC';
+        }
 
-    	$column = intval($column);
-    	$from = intval($from);
-    	$number_of_items = intval($number_of_items);
+        $column = intval($column);
+        $from = intval($from);
+        $number_of_items = intval($number_of_items);
 
-    	$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);
         $users = array();
@@ -6573,7 +6573,7 @@ 
             }
         }
 
-    	while ($user = Database::fetch_array($res, 'ASSOC')) {
+        while ($user = Database::fetch_array($res, 'ASSOC')) {
             $courseInfo = api_get_course_info($course_code);
             $courseId = $courseInfo['real_id'];
 
@@ -6604,10 +6604,10 @@ 
                 $session_id
             );
 
-    		if (empty($avg_student_progress)) {
+            if (empty($avg_student_progress)) {
                 $avg_student_progress = 0;
-    		}
-    		$user['average_progress'] = $avg_student_progress.'%';
+            }
+            $user['average_progress'] = $avg_student_progress.'%';
 
             $total_user_exercise = Tracking::get_exercise_student_progress(
                 $total_exercises,
@@ -6627,11 +6627,11 @@ 
 
             $user['exercise_average_best_attempt'] = $total_user_exercise;
 
-    		if (is_numeric($avg_student_score)) {
-    			$user['student_score']  = $avg_student_score.'%';
-    		} else {
-    			$user['student_score']  = $avg_student_score;
-    		}
+            if (is_numeric($avg_student_score)) {
+                $user['student_score']  = $avg_student_score.'%';
+            } else {
+                $user['student_score']  = $avg_student_score;
+            }
 
             $user['count_assignments'] = Tracking::count_student_assignments(
                 $user['user_id'],
@@ -6654,29 +6654,29 @@ 
                 $session_id
             );
 
-    		// we need to display an additional profile field
-    		$user['additional'] = '';
+            // we need to display an additional profile field
+            $user['additional'] = '';
 
-    		if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) {
-    			if (isset($additional_user_profile_info[$user['user_id']]) &&
+            if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) {
+                if (isset($additional_user_profile_info[$user['user_id']]) &&
                     is_array($additional_user_profile_info[$user['user_id']])
                 ) {
-    				$user['additional'] = implode(', ', $additional_user_profile_info[$user['user_id']]);
-    			}
-    		}
+                    $user['additional'] = implode(', ', $additional_user_profile_info[$user['user_id']]);
+                }
+            }
 
             if (empty($session_id)) {
                 $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0) .' / '.$total_surveys;
             }
 
-    		$user['link'] = '<center>
+            $user['link'] = '<center>
                              <a href="../mySpace/myStudents.php?student='.$user['user_id'].'&details=true&course='.$course_code.'&origin=tracking_course&id_session='.$session_id.'">
     		                 '.Display::return_icon('2rightarrow.png').'
     		                 </a>
                          </center>';
 
-    		// store columns in array $users
-    		$is_western_name_order = api_is_western_name_order();
+            // store columns in array $users
+            $is_western_name_order = api_is_western_name_order();
             $user_row = array();
             $user_row[]= $user['official_code']; //0
             if ($is_western_name_order) {
@@ -6712,21 +6712,21 @@ 
 
             $users[] = $user_row;
 
-    		if ($export_csv) {
-    		    if (empty($session_id)) {
+            if ($export_csv) {
+                if (empty($session_id)) {
                     $user_row = array_map('strip_tags', $user_row);
-    			    unset($user_row[14]);
-    			    unset($user_row[15]);
+                    unset($user_row[14]);
+                    unset($user_row[15]);
                 } else {
                     $user_row = array_map('strip_tags', $user_row);
                     unset($user_row[13]);
                     unset($user_row[14]);
                 }
 
-    			$csv_content[] = $user_row;
-    		}
-    	}
-    	return $users;
+                $csv_content[] = $user_row;
+            }
+        }
+        return $users;
     }
 }
 
@@ -6744,18 +6744,18 @@ 
      */
     public static function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
     {
-    	$MonthsLong = $GLOBALS['MonthsLong'];
-
-    	// protected data
-    	$user_id = intval($user_id);
-    	$session_id = intval($session_id);
-    	$course_id = Database::escape_string($course_id);
-
-    	$track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-    	$tempView = $view;
-    	if(substr($view,0,1) == '1') {
-    		$new_view = substr_replace($view,'0',0,1);
-    		echo "
+        $MonthsLong = $GLOBALS['MonthsLong'];
+
+        // protected data
+        $user_id = intval($user_id);
+        $session_id = intval($session_id);
+        $course_id = Database::escape_string($course_id);
+
+        $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+        $tempView = $view;
+        if(substr($view,0,1) == '1') {
+            $new_view = substr_replace($view,'0',0,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font>" .
@@ -6763,9 +6763,9 @@ 
                     </td>
                 </tr>
                 ";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsDetails')."<br>";
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsDetails')."<br>";
 
-    		$sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
+            $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
                         FROM $track_access_table
                         WHERE access_user_id = $user_id
                         AND c_id = $course_id
@@ -6773,11 +6773,11 @@ 
                         GROUP BY YEAR(access_date),MONTH(access_date)
                         ORDER BY YEAR(access_date),MONTH(access_date) ASC";
 
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = getManyResults3Col($sql);
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = getManyResults3Col($sql);
 
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
-    		echo "<tr>
+            echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
+            echo "<tr>
                     <td class='secLine'>
                     ".get_lang('LoginsTitleMonthColumn')."
                     </td>
@@ -6785,36 +6785,36 @@ 
                     ".get_lang('LoginsTitleCountColumn')."
                     </td>
                 </tr>";
-    		$total = 0;
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				echo "<tr>";
-    				echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>";
-    				echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>";
-    				echo"</tr>";
-    				$total = $total + $results[$j][1];
-    			}
-    			echo "<tr>";
-    			echo "<td>".get_lang('Total')."</td>";
-    			echo "<td align='right' class='content'>".$total."</td>";
-    			echo"</tr>";
-    		} else {
-    			echo "<tr>";
-    			echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',0,1);
-    		echo "
+            $total = 0;
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    echo "<tr>";
+                    echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>";
+                    echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>";
+                    echo"</tr>";
+                    $total = $total + $results[$j][1];
+                }
+                echo "<tr>";
+                echo "<td>".get_lang('Total')."</td>";
+                echo "<td align='right' class='content'>".$total."</td>";
+                echo"</tr>";
+            } else {
+                echo "<tr>";
+                echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',0,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".$user_id."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('LoginsAndAccessTools')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6827,38 +6827,38 @@ 
      */
     public static function display_exercise_tracking_info($view, $user_id, $courseCode)
     {
-    	global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong;
+        global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong;
         $courseId = api_get_course_int_id($courseCode);
-    	if(substr($view,1,1) == '1') {
-    		$new_view = substr_replace($view,'0',1,1);
-    		echo "<tr>
+        if(substr($view,1,1) == '1') {
+            $new_view = substr_replace($view,'0',1,1);
+            echo "<tr>
                     <td valign='top'>
                         <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('ExercicesResults')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=01000'>".get_lang('ExportAsCSV')."</a>]
                     </td>
                 </tr>";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('ExercicesDetails')."<br />";
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('ExercicesDetails')."<br />";
 
-    		$sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                     FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te
                     WHERE te.c_id = $courseId
                         AND te.exe_user_id = ".intval($user_id)."
                         AND te.exe_exo_id = ce.id
                     ORDER BY ce.title ASC, te.exe_date ASC";
 
-    		$hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                         FROM $TBL_TRACK_HOTPOTATOES AS te
                         WHERE te.exe_user_id = '".intval($user_id)."' AND te.c_id = $courseId
                         ORDER BY te.c_id ASC, te.exe_date ASC";
 
-    		$hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
+            $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
 
-    		$NoTestRes = 0;
-    		$NoHPTestRes = 0;
+            $NoTestRes = 0;
+            $NoHPTestRes = 0;
 
-    		echo "<tr>\n<td style='padding-left : 40px;padding-right : 40px;'>\n";
-    		$results = StatsUtils::getManyResultsXCol($sql, 4);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>\n";
-    		echo "
+            echo "<tr>\n<td style='padding-left : 40px;padding-right : 40px;'>\n";
+            $results = StatsUtils::getManyResultsXCol($sql, 4);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>\n";
+            echo "
                 <tr bgcolor='#E6E6E6'>
                     <td>
                     ".get_lang('ExercicesTitleExerciceColumn')."
@@ -6871,28 +6871,28 @@ 
                     </td>
                 </tr>";
 
-    		if (is_array($results)) {
-    			for($i = 0; $i < sizeof($results); $i++) {
-    				$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
-    				echo "<tr>\n";
-    				echo "<td class='content'>".$results[$i][0]."</td>\n";
-    				echo "<td class='content'>".$display_date."</td>\n";
-    				echo "<td valign='top' align='right' class='content'>".$results[$i][1]." / ".$results[$i][2]."</td>\n";
-    				echo "</tr>\n";
-    			}
-    		} else {
-    			// istvan begin
-    			$NoTestRes = 1;
-    		}
-
-    		// The Result of Tests
-    		if (is_array($hpresults)) {
-    			for($i = 0; $i < sizeof($hpresults); $i++) {
-    				$title = GetQuizName($hpresults[$i][0],'');
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
-    				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
-    				?>
+            if (is_array($results)) {
+                for($i = 0; $i < sizeof($results); $i++) {
+                    $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
+                    echo "<tr>\n";
+                    echo "<td class='content'>".$results[$i][0]."</td>\n";
+                    echo "<td class='content'>".$display_date."</td>\n";
+                    echo "<td valign='top' align='right' class='content'>".$results[$i][1]." / ".$results[$i][2]."</td>\n";
+                    echo "</tr>\n";
+                }
+            } else {
+                // istvan begin
+                $NoTestRes = 1;
+            }
+
+            // The Result of Tests
+            if (is_array($hpresults)) {
+                for($i = 0; $i < sizeof($hpresults); $i++) {
+                    $title = GetQuizName($hpresults[$i][0],'');
+                    if ($title == '')
+                    $title = basename($hpresults[$i][0]);
+                    $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
+                    ?>
                     <tr>
                         <td class="content"><?php echo $title; ?></td>
                         <td class="content" align="center"><?php echo $display_date; ?></td>
@@ -6902,26 +6902,26 @@ 
 
                     <?php
                 }
-    		} else {
-    			$NoHPTestRes = 1;
-    		}
-
-    		if ($NoTestRes == 1 && $NoHPTestRes == 1) {
-    			echo "<tr>\n";
-    			echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>\n";
-    			echo "</tr>\n";
-    		}
-    		echo "</table>";
-    		echo "</td>\n</tr>\n";
-    	} else {
-    		$new_view = substr_replace($view,'1',1,1);
-    		echo "
+            } else {
+                $NoHPTestRes = 1;
+            }
+
+            if ($NoTestRes == 1 && $NoHPTestRes == 1) {
+                echo "<tr>\n";
+                echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>\n";
+                echo "</tr>\n";
+            }
+            echo "</table>";
+            echo "</td>\n</tr>\n";
+        } else {
+            $new_view = substr_replace($view,'1',1,1);
+            echo "
                 <tr>
                     <td valign='top'>
                         +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=$user_id&view=".$new_view."' class='specialLink'>".get_lang('ExercicesResults')."</a>
                     </td>
                 </tr>";
-    	}
+        }
     }
 
     /**
@@ -6930,27 +6930,27 @@ 
      */
     public static function display_student_publications_tracking_info($view, $user_id, $course_id)
     {
-    	global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
+        global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
         $_course = api_get_course_info_by_id($course_id);
 
-    	if (substr($view,2,1) == '1') {
-    		$new_view = substr_replace($view,'0',2,1);
-    		echo "<tr>
+        if (substr($view,2,1) == '1') {
+            $new_view = substr_replace($view,'0',2,1);
+            echo "<tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('WorkUploads')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00100'>".get_lang('ExportAsCSV')."</a>]
                     </td>
                 </tr>";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('WorksDetails')."<br>";
-    		$sql = "SELECT u.upload_date, w.title, w.author,w.url
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('WorksDetails')."<br>";
+            $sql = "SELECT u.upload_date, w.title, w.author,w.url
                     FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w
                     WHERE u.upload_work_id = w.id
                         AND u.upload_user_id = '".intval($user_id)."'
                         AND u.c_id = '".intval($course_id)."'
                     ORDER BY u.upload_date DESC";
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResultsXCol($sql,4);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
-    		echo "<tr>
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = StatsUtils::getManyResultsXCol($sql,4);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
+            echo "<tr>
                     <td class='secLine' width='40%'>
                     ".get_lang('WorkTitle')."
                     </td>
@@ -6961,35 +6961,35 @@ 
                     ".get_lang('Date')."
                     </td>
                 </tr>";
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
-    				$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
-    				echo "<tr>";
-    				echo "<td class='content'>"
-    				."<a href ='".$pathToFile."'>".$results[$j][1]."</a>"
-    				."</td>";
-    				echo "<td class='content'>".$results[$j][2]."</td>";
-    				echo "<td class='content'>".$beautifulDate."</td>";
-    				echo"</tr>";
-    			}
-    		} else {
-    			echo "<tr>";
-    			echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',2,1);
-    		echo "
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
+                    $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
+                    echo "<tr>";
+                    echo "<td class='content'>"
+                    ."<a href ='".$pathToFile."'>".$results[$j][1]."</a>"
+                    ."</td>";
+                    echo "<td class='content'>".$results[$j][2]."</td>";
+                    echo "<td class='content'>".$beautifulDate."</td>";
+                    echo"</tr>";
+                }
+            } else {
+                echo "<tr>";
+                echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',2,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('WorkUploads')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -6998,55 +6998,55 @@ 
      */
     public static function display_links_tracking_info($view, $user_id, $courseCode)
     {
-    	global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
+        global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
         $courseId = api_get_course_int_id($courseCode);
-    	if (substr($view,3,1) == '1') {
-    		$new_view = substr_replace($view,'0',3,1);
-    		echo "
+        if (substr($view,3,1) == '1') {
+            $new_view = substr_replace($view,'0',3,1);
+            echo "
                 <tr>
                         <td valign='top'>
                         <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('LinksAccess')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00010'>".get_lang('ExportAsCSV')."</a>]
                         </td>
                 </tr>
             ";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LinksDetails')."<br>";
-    		$sql = "SELECT cl.title, cl.url
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LinksDetails')."<br>";
+            $sql = "SELECT cl.title, cl.url
                     FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
                     WHERE sl.links_link_id = cl.id
                         AND sl.c_id = $courseId
                         AND sl.links_user_id = ".intval($user_id)."
                     GROUP BY cl.title, cl.url";
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResults2Col($sql);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
-    		echo "<tr>
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = StatsUtils::getManyResults2Col($sql);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align=center>";
+            echo "<tr>
                     <td class='secLine'>
                     ".get_lang('LinksTitleLinkColumn')."
                     </td>
                 </tr>";
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				echo "<tr>";
-    				echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>";
-    				echo"</tr>";
-    			}
-    		} else {
-    			echo "<tr>";
-    			echo "<td ><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',3,1);
-    		echo "
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    echo "<tr>";
+                    echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>";
+                    echo"</tr>";
+                }
+            } else {
+                echo "<tr>";
+                echo "<td ><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',3,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('LinksAccess')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -7059,61 +7059,61 @@ 
      */
     public static function display_document_tracking_info($view, $user_id, $course_code, $session_id = 0)
     {
-    	// protect data
+        // protect data
         $user_id = intval($user_id);
         $courseId = api_get_course_int_id($course_code);
-    	$session_id = intval($session_id);
+        $session_id = intval($session_id);
 
-    	$downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
-    	if(substr($view,4,1) == '1') {
-    		$new_view = substr_replace($view,'0',4,1);
-    		echo "
+        $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
+        if(substr($view,4,1) == '1') {
+            $new_view = substr_replace($view,'0',4,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     <font color='#0000FF'>-&nbsp;&nbsp;&nbsp;</font><b>".get_lang('DocumentsAccess')."</b>&nbsp;&nbsp;&nbsp;[<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>]&nbsp;&nbsp;&nbsp;[<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00001'>".get_lang('ExportAsCSV')."</a>]
                     </td>
                 </tr>
             ";
-    		echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('DocumentsDetails')."<br>";
+            echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('DocumentsDetails')."<br>";
 
-    		$sql = "SELECT down_doc_path
+            $sql = "SELECT down_doc_path
                     FROM $downloads_table
                     WHERE c_id = $courseId
                         AND down_user_id = $user_id
                         AND down_session_id = $session_id
                     GROUP BY down_doc_path";
 
-    		echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
-    		$results = StatsUtils::getManyResults1Col($sql);
-    		echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>";
-    		echo "<tr>
+            echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>";
+            $results = StatsUtils::getManyResults1Col($sql);
+            echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>";
+            echo "<tr>
                     <td class='secLine'>
                     ".get_lang('DocumentsTitleDocumentColumn')."
                     </td>
                 </tr>";
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				echo "<tr>";
-    				echo "<td class='content'>".$results[$j]."</td>";
-    				echo"</tr>";
-    			}
-    		} else {
-    			echo "<tr>";
-    			echo "<td><center>".get_lang('NoResult')."</center></td>";
-    			echo"</tr>";
-    		}
-    		echo "</table>";
-    		echo "</td></tr>";
-    	} else {
-    		$new_view = substr_replace($view,'1',4,1);
-    		echo "
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    echo "<tr>";
+                    echo "<td class='content'>".$results[$j]."</td>";
+                    echo"</tr>";
+                }
+            } else {
+                echo "<tr>";
+                echo "<td><center>".get_lang('NoResult')."</center></td>";
+                echo"</tr>";
+            }
+            echo "</table>";
+            echo "</td></tr>";
+        } else {
+            $new_view = substr_replace($view,'1',4,1);
+            echo "
                 <tr>
                     <td valign='top'>
                     +<font color='#0000FF'>&nbsp;&nbsp;</font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('DocumentsAccess')."</a>
                     </td>
                 </tr>
             ";
-    	}
+        }
     }
 
     /**
@@ -7170,43 +7170,43 @@ 
      */
     public function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0)
     {
-    	$MonthsLong = $GLOBALS['MonthsLong'];
-    	$track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
-
-    	// protected data
-    	$user_id    = intval($user_id);
-    	$session_id = intval($session_id);
-    	$course_id  = intval($course_id);
-
-    	$tempView = $view;
-    	if (substr($view,0,1) == '1') {
-    		$new_view = substr_replace($view,'0',0,1);
-    		$title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
-    		$sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
+        $MonthsLong = $GLOBALS['MonthsLong'];
+        $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
+
+        // protected data
+        $user_id    = intval($user_id);
+        $session_id = intval($session_id);
+        $course_id  = intval($course_id);
+
+        $tempView = $view;
+        if (substr($view,0,1) == '1') {
+            $new_view = substr_replace($view,'0',0,1);
+            $title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails');
+            $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date)
                     FROM $track_access_table
                     WHERE access_user_id = $user_id
                     AND c_id = $course_id
                     AND access_session_id = $session_id
                     GROUP BY YEAR(access_date),MONTH(access_date)
                     ORDER BY YEAR(access_date),MONTH(access_date) ASC";
-    		//$results = getManyResults2Col($sql);
-    		$results = getManyResults3Col($sql);
-    		$title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
-    		$line='';
-    		$total = 0;
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				$line .= $results[$j][0].';'.$results[$j][1]."\n";
-    				$total = $total + $results[$j][1];
-    			}
-    			$line .= get_lang('Total').";".$total."\n";
-    		} else {
-    			$line= get_lang('NoResult')."</center></td>";
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',0,1);
-    	}
-    	return array($title_line, $line);
+            //$results = getManyResults2Col($sql);
+            $results = getManyResults3Col($sql);
+            $title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n";
+            $line='';
+            $total = 0;
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    $line .= $results[$j][0].';'.$results[$j][1]."\n";
+                    $total = $total + $results[$j][1];
+                }
+                $line .= get_lang('Total').";".$total."\n";
+            } else {
+                $line= get_lang('NoResult')."</center></td>";
+            }
+        } else {
+            $new_view = substr_replace($view,'1',0,1);
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7219,67 +7219,67 @@ 
      */
     public function display_exercise_tracking_info($view, $userId, $courseCode)
     {
-    	global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong;
+        global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong;
         $courseId = api_get_course_int_id($courseCode);
         $userId = intval($userId);
-    	if (substr($view,1,1) == '1') {
-    		$new_view = substr_replace($view,'0',1,1);
-    		$title[1] = get_lang('ExercicesDetails');
-    		$line = '';
-    		$sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+        if (substr($view,1,1) == '1') {
+            $new_view = substr_replace($view,'0',1,1);
+            $title[1] = get_lang('ExercicesDetails');
+            $line = '';
+            $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                     FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te
                     WHERE te.c_id = $courseId
                         AND te.exe_user_id = $userId
                         AND te.exe_exo_id = ce.id
                     ORDER BY ce.title ASC, te.exe_date ASC";
 
-    		$hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
+            $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date)
                         FROM $TABLETRACK_HOTPOTATOES AS te
                         WHERE te.exe_user_id = '$userId' AND te.c_id = $courseId
                         ORDER BY te.c_id ASC, te.exe_date ASC";
 
-    		$hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
+            $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4);
 
-    		$NoTestRes = 0;
-    		$NoHPTestRes = 0;
+            $NoTestRes = 0;
+            $NoHPTestRes = 0;
 
-    		$results = StatsUtils::getManyResultsXCol($sql, 4);
-    		$title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n";
+            $results = StatsUtils::getManyResultsXCol($sql, 4);
+            $title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n";
 
-    		if (is_array($results)) {
-    			for($i = 0; $i < sizeof($results); $i++)
-    			{
-    				$display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
-    				$line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n";
-    			}
-    		} else {
+            if (is_array($results)) {
+                for($i = 0; $i < sizeof($results); $i++)
+                {
+                    $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get());
+                    $line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n";
+                }
+            } else {
                 // istvan begin
-    			$NoTestRes = 1;
-    		}
-
-    		// The Result of Tests
-    		if (is_array($hpresults)) {
-    			for($i = 0; $i < sizeof($hpresults); $i++) {
-    				$title = GetQuizName($hpresults[$i][0],'');
-
-    				if ($title == '')
-    				$title = basename($hpresults[$i][0]);
-
-    				$display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
-
-    				$line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n";
-    			}
-    		} else {
-    			$NoHPTestRes = 1;
-    		}
-
-    		if ($NoTestRes == 1 && $NoHPTestRes == 1) {
-    			$line=get_lang('NoResult');
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',1,1);
-    	}
-    	return array($title_line, $line);
+                $NoTestRes = 1;
+            }
+
+            // The Result of Tests
+            if (is_array($hpresults)) {
+                for($i = 0; $i < sizeof($hpresults); $i++) {
+                    $title = GetQuizName($hpresults[$i][0],'');
+
+                    if ($title == '')
+                    $title = basename($hpresults[$i][0]);
+
+                    $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get());
+
+                    $line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n";
+                }
+            } else {
+                $NoHPTestRes = 1;
+            }
+
+            if ($NoTestRes == 1 && $NoHPTestRes == 1) {
+                $line=get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view,'1',1,1);
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7288,37 +7288,37 @@ 
      */
     public function display_student_publications_tracking_info($view, $user_id, $course_id)
     {
-    	global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
+        global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK;
         $_course = api_get_course_info();
         $user_id = intval($user_id);
         $course_id = intval($course_id);
 
-    	if (substr($view,2,1) == '1') {
-    		$sql = "SELECT u.upload_date, w.title, w.author, w.url
+        if (substr($view,2,1) == '1') {
+            $sql = "SELECT u.upload_date, w.title, w.author, w.url
                     FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w
                     WHERE
                         u.upload_work_id = w.id AND
                         u.upload_user_id = '$user_id' AND
                         u.c_id = '$course_id'
                     ORDER BY u.upload_date DESC";
-    		$results = StatsUtils::getManyResultsXCol($sql,4);
-
-    		$title[1]=get_lang('WorksDetails');
-    		$line='';
-    		$title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
-
-    		if (is_array($results)) {
-    			for($j = 0 ; $j < count($results) ; $j++) {
-    				$pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
-    				$beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
-    				$line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n";
-    			}
-
-    		} else {
-    			$line= get_lang('NoResult');
-    		}
-    	}
-    	return array($title_line, $line);
+            $results = StatsUtils::getManyResultsXCol($sql,4);
+
+            $title[1]=get_lang('WorksDetails');
+            $line='';
+            $title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n";
+
+            if (is_array($results)) {
+                for($j = 0 ; $j < count($results) ; $j++) {
+                    $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3];
+                    $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get());
+                    $line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n";
+                }
+
+            } else {
+                $line= get_lang('NoResult');
+            }
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7327,32 +7327,32 @@ 
      */
     public function display_links_tracking_info($view, $userId, $courseCode)
     {
-    	global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
+        global $TABLETRACK_LINKS, $TABLECOURSE_LINKS;
         $courseId = api_get_course_int_id($courseCode);
         $userId = intval($userId);
         $line = null;
-    	if (substr($view,3,1) == '1') {
-    		$new_view = substr_replace($view,'0',3,1);
-    		$title[1]=get_lang('LinksDetails');
-    		$sql = "SELECT cl.title, cl.url
+        if (substr($view,3,1) == '1') {
+            $new_view = substr_replace($view,'0',3,1);
+            $title[1]=get_lang('LinksDetails');
+            $sql = "SELECT cl.title, cl.url
                         FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl
                         WHERE sl.links_link_id = cl.id
                             AND sl.c_id = $courseId
                             AND sl.links_user_id = $userId
                         GROUP BY cl.title, cl.url";
-    		$results = StatsUtils::getManyResults2Col($sql);
-    		$title_line= get_lang('LinksTitleLinkColumn')."\n";
-    		if (is_array($results)) {
-    			for ($j = 0 ; $j < count($results) ; $j++) {
-    				$line .= $results[$j][0]."\n";
-    			}
-    		} else {
-    			$line=get_lang('NoResult');
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',3,1);
-    	}
-    	return array($title_line, $line);
+            $results = StatsUtils::getManyResults2Col($sql);
+            $title_line= get_lang('LinksTitleLinkColumn')."\n";
+            if (is_array($results)) {
+                for ($j = 0 ; $j < count($results) ; $j++) {
+                    $line .= $results[$j][0]."\n";
+                }
+            } else {
+                $line=get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view,'1',3,1);
+        }
+        return array($title_line, $line);
     }
 
     /**
@@ -7365,38 +7365,38 @@ 
      */
     public function display_document_tracking_info($view, $user_id, $courseCode, $session_id = 0)
     {
-    	// protect data
-    	$user_id     = intval($user_id);
+        // protect data
+        $user_id     = intval($user_id);
         $courseId = api_get_course_int_id($courseCode);
-    	$session_id = intval($session_id);
+        $session_id = intval($session_id);
 
-    	$downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
+        $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS);
 
-    	if (substr($view,4,1) == '1') {
-    		$new_view = substr_replace($view,'0',4,1);
-    		$title[1]= get_lang('DocumentsDetails');
+        if (substr($view,4,1) == '1') {
+            $new_view = substr_replace($view,'0',4,1);
+            $title[1]= get_lang('DocumentsDetails');
 
-    		$sql = "SELECT down_doc_path
+            $sql = "SELECT down_doc_path
                         FROM $downloads_table
                         WHERE c_id = $courseId
                             AND down_user_id = $user_id
                             AND down_session_id = $session_id
                         GROUP BY down_doc_path";
 
-    		$results = StatsUtils::getManyResults1Col($sql);
-    		$title_line = get_lang('DocumentsTitleDocumentColumn')."\n";
+            $results = StatsUtils::getManyResults1Col($sql);
+            $title_line = get_lang('DocumentsTitleDocumentColumn')."\n";
             $line = null;
-    		if (is_array($results)) {
-    			for ($j = 0 ; $j < count($results) ; $j++) {
-    				$line .= $results[$j]."\n";
-    			}
-    		} else {
-    			$line = get_lang('NoResult');
-    		}
-    	} else {
-    		$new_view = substr_replace($view,'1',4,1);
-    	}
-    	return array($title_line, $line);
+            if (is_array($results)) {
+                for ($j = 0 ; $j < count($results) ; $j++) {
+                    $line .= $results[$j]."\n";
+                }
+            } else {
+                $line = get_lang('NoResult');
+            }
+        } else {
+            $new_view = substr_replace($view,'1',4,1);
+        }
+        return array($title_line, $line);
     }
 
     /**

main/exercise/hotspot_actionscript.as.php

Indentation +27 added lines, -27 removed lines

@@ -32,10 +32,10 @@ 
 
 // Query db for answers
 if ($answer_type==HOT_SPOT_DELINEATION) {
-	$sql = "SELECT iid, id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
+    $sql = "SELECT iid, id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
 	        WHERE c_id = $course_id AND question_id = ".intval($questionId)." AND hotspot_type = 'delineation' ORDER BY iid";
 } else {
-	$sql = "SELECT iid, id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
+    $sql = "SELECT iid, id, answer, hotspot_coordinates, hotspot_type, ponderation FROM $TBL_ANSWERS
 	        WHERE c_id = $course_id AND question_id = ".intval($questionId)." ORDER BY iid";
 }
 $result = Database::query($sql);
@@ -77,37 +77,37 @@ 
     $hotSpot['iid'] = $hotspot['iid'];
     $hotSpot['answer'] = $hotspot['answer'];
 
-	// Square or rectancle
-	if ($hotspot['hotspot_type'] == 'square' )
-	{
+    // Square or rectancle
+    if ($hotspot['hotspot_type'] == 'square' )
+    {
         $hotSpot['type'] = 'square';
-	}
-	// Circle or ovale
-	if ($hotspot['hotspot_type'] == 'circle')
-	{
+    }
+    // Circle or ovale
+    if ($hotspot['hotspot_type'] == 'circle')
+    {
         $hotSpot['type'] = 'circle';
-	}
-	// Polygon
-	if ($hotspot['hotspot_type'] == 'poly')
-	{
+    }
+    // Polygon
+    if ($hotspot['hotspot_type'] == 'poly')
+    {
         $hotSpot['type'] = 'poly';
-	}
-	// Delineation
-	if ($hotspot['hotspot_type'] == 'delineation')
-	{
+    }
+    // Delineation
+    if ($hotspot['hotspot_type'] == 'delineation')
+    {
         $hotSpot['type'] = 'delineation';
-	}
-	// No error
-	if ($hotspot['hotspot_type'] == 'noerror')
-	{
+    }
+    // No error
+    if ($hotspot['hotspot_type'] == 'noerror')
+    {
         $hotSpot['type'] = 'noerror';
-	}
+    }
 
-	// This is a good answer, count + 1 for nmbr of clicks
-	if ($hotspot['hotspot_type'] > 0)
-	{
-		$nmbrTries++;
-	}
+    // This is a good answer, count + 1 for nmbr of clicks
+    if ($hotspot['hotspot_type'] > 0)
+    {
+        $nmbrTries++;
+    }
 
     $hotSpot['coord'] = $hotspot['hotspot_coordinates'];
 

src/Chamilo/CoreBundle/Entity/ExtraField.php

Indentation +3 added lines, -3 removed lines

@@ -253,9 +253,9 @@
         return $this;
     }
 
-     /**
-     * @return boolean
-     */
+        /**
+         * @return boolean
+         */
     public function isChangeable()
     {
         return $this->changeable;

main/inc/lib/nusoap/class.soap_server.php

Indentation +1020 added lines, -1020 removed lines

@@ -12,1079 +12,1079 @@ 
 */

 class nusoap_server extends nusoap_base

 {

-	/**

-	 * HTTP headers of request

-	 * @var array

-	 * @access private

-	 */

-	var $headers = array();

-	/**

-	 * HTTP request

-	 * @var string

-	 * @access private

-	 */

-	var $request = '';

-	/**

-	 * SOAP headers from request (incomplete namespace resolution; special characters not escaped) (text)

-	 * @var string

-	 * @access public

-	 */

-	var $requestHeaders = '';

-	/**

-	 * SOAP Headers from request (parsed)

-	 * @var mixed

-	 * @access public

-	 */

-	var $requestHeader = NULL;

-	/**

-	 * SOAP body request portion (incomplete namespace resolution; special characters not escaped) (text)

-	 * @var string

-	 * @access public

-	 */

-	var $document = '';

-	/**

-	 * SOAP payload for request (text)

-	 * @var string

-	 * @access public

-	 */

-	var $requestSOAP = '';

-	/**

-	 * requested method namespace URI

-	 * @var string

-	 * @access private

-	 */

-	var $methodURI = '';

-	/**

-	 * name of method requested

-	 * @var string

-	 * @access private

-	 */

-	var $methodname = '';

-	/**

-	 * method parameters from request

-	 * @var array

-	 * @access private

-	 */

-	var $methodparams = array();

-	/**

-	 * SOAP Action from request

-	 * @var string

-	 * @access private

-	 */

-	var $SOAPAction = '';

-	/**

-	 * character set encoding of incoming (request) messages

-	 * @var string

-	 * @access public

-	 */

-	var $xml_encoding = '';

-	/**

-	 * toggles whether the parser decodes element content w/ utf8_decode()

-	 * @var boolean

-	 * @access public

-	 */

+    /**

+     * HTTP headers of request

+     * @var array

+     * @access private

+     */

+    var $headers = array();

+    /**

+     * HTTP request

+     * @var string

+     * @access private

+     */

+    var $request = '';

+    /**

+     * SOAP headers from request (incomplete namespace resolution; special characters not escaped) (text)

+     * @var string

+     * @access public

+     */

+    var $requestHeaders = '';

+    /**

+     * SOAP Headers from request (parsed)

+     * @var mixed

+     * @access public

+     */

+    var $requestHeader = NULL;

+    /**

+     * SOAP body request portion (incomplete namespace resolution; special characters not escaped) (text)

+     * @var string

+     * @access public

+     */

+    var $document = '';

+    /**

+     * SOAP payload for request (text)

+     * @var string

+     * @access public

+     */

+    var $requestSOAP = '';

+    /**

+     * requested method namespace URI

+     * @var string

+     * @access private

+     */

+    var $methodURI = '';

+    /**

+     * name of method requested

+     * @var string

+     * @access private

+     */

+    var $methodname = '';

+    /**

+     * method parameters from request

+     * @var array

+     * @access private

+     */

+    var $methodparams = array();

+    /**

+     * SOAP Action from request

+     * @var string

+     * @access private

+     */

+    var $SOAPAction = '';

+    /**

+     * character set encoding of incoming (request) messages

+     * @var string

+     * @access public

+     */

+    var $xml_encoding = '';

+    /**

+     * toggles whether the parser decodes element content w/ utf8_decode()

+     * @var boolean

+     * @access public

+     */

     var $decode_utf8 = true;

 

-	/**

-	 * HTTP headers of response

-	 * @var array

-	 * @access public

-	 */

-	var $outgoing_headers = array();

-	/**

-	 * HTTP response

-	 * @var string

-	 * @access private

-	 */

-	var $response = '';

-	/**

-	 * SOAP headers for response (text or array of soapval or associative array)

-	 * @var mixed

-	 * @access public

-	 */

-	var $responseHeaders = '';

-	/**

-	 * SOAP payload for response (text)

-	 * @var string

-	 * @access private

-	 */

-	var $responseSOAP = '';

-	/**

-	 * method return value to place in response

-	 * @var mixed

-	 * @access private

-	 */

-	var $methodreturn = false;

-	/**

-	 * whether $methodreturn is a string of literal XML

-	 * @var boolean

-	 * @access public

-	 */

-	var $methodreturnisliteralxml = false;

-	/**

-	 * SOAP fault for response (or false)

-	 * @var mixed

-	 * @access private

-	 */

-	var $fault = false;

-	/**

-	 * text indication of result (for debugging)

-	 * @var string

-	 * @access private

-	 */

-	var $result = 'successful';

+    /**

+     * HTTP headers of response

+     * @var array

+     * @access public

+     */

+    var $outgoing_headers = array();

+    /**

+     * HTTP response

+     * @var string

+     * @access private

+     */

+    var $response = '';

+    /**

+     * SOAP headers for response (text or array of soapval or associative array)

+     * @var mixed

+     * @access public

+     */

+    var $responseHeaders = '';

+    /**

+     * SOAP payload for response (text)

+     * @var string

+     * @access private

+     */

+    var $responseSOAP = '';

+    /**

+     * method return value to place in response

+     * @var mixed

+     * @access private

+     */

+    var $methodreturn = false;

+    /**

+     * whether $methodreturn is a string of literal XML

+     * @var boolean

+     * @access public

+     */

+    var $methodreturnisliteralxml = false;

+    /**

+     * SOAP fault for response (or false)

+     * @var mixed

+     * @access private

+     */

+    var $fault = false;

+    /**

+     * text indication of result (for debugging)

+     * @var string

+     * @access private

+     */

+    var $result = 'successful';

 

-	/**

-	 * assoc array of operations => opData; operations are added by the register()

-	 * method or by parsing an external WSDL definition

-	 * @var array

-	 * @access private

-	 */

-	var $operations = array();

-	/**

-	 * wsdl instance (if one)

-	 * @var mixed

-	 * @access private

-	 */

-	var $wsdl = false;

-	/**

-	 * URL for WSDL (if one)

-	 * @var mixed

-	 * @access private

-	 */

-	var $externalWSDLURL = false;

-	/**

-	 * whether to append debug to response as XML comment

-	 * @var boolean

-	 * @access public

-	 */

-	var $debug_flag = false;

+    /**

+     * assoc array of operations => opData; operations are added by the register()

+     * method or by parsing an external WSDL definition

+     * @var array

+     * @access private

+     */

+    var $operations = array();

+    /**

+     * wsdl instance (if one)

+     * @var mixed

+     * @access private

+     */

+    var $wsdl = false;

+    /**

+     * URL for WSDL (if one)

+     * @var mixed

+     * @access private

+     */

+    var $externalWSDLURL = false;

+    /**

+     * whether to append debug to response as XML comment

+     * @var boolean

+     * @access public

+     */

+    var $debug_flag = false;

 

 

-	/**

-	* constructor

-    * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.

-	*

-    * @param mixed $wsdl file path or URL (string), or wsdl instance (object)

-	* @access   public

-	*/

-	function __construct($wsdl=false)

+    /**

+     * constructor

+     * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.

+     *

+     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)

+     * @access   public

+     */

+    function __construct($wsdl=false)

     {

-		parent::__construct();

-		// turn on debugging?

-		global $debug;

-		global $HTTP_SERVER_VARS;

+        parent::__construct();

+        // turn on debugging?

+        global $debug;

+        global $HTTP_SERVER_VARS;

 

-		if (isset($_SERVER)) {

-			$this->debug("_SERVER is defined:");

-			$this->appendDebug($this->varDump($_SERVER));

-		} elseif (isset($HTTP_SERVER_VARS)) {

-			$this->debug("HTTP_SERVER_VARS is defined:");

-			$this->appendDebug($this->varDump($HTTP_SERVER_VARS));

-		} else {

-			$this->debug("Neither _SERVER nor HTTP_SERVER_VARS is defined.");

-		}

+        if (isset($_SERVER)) {

+            $this->debug("_SERVER is defined:");

+            $this->appendDebug($this->varDump($_SERVER));

+        } elseif (isset($HTTP_SERVER_VARS)) {

+            $this->debug("HTTP_SERVER_VARS is defined:");

+            $this->appendDebug($this->varDump($HTTP_SERVER_VARS));

+        } else {

+            $this->debug("Neither _SERVER nor HTTP_SERVER_VARS is defined.");

+        }

 

-		if (isset($debug)) {

-			$this->debug("In nusoap_server, set debug_flag=$debug based on global flag");

-			$this->debug_flag = $debug;

-		} elseif (isset($_SERVER['QUERY_STRING'])) {

-			$qs = explode('&', $_SERVER['QUERY_STRING']);

-			foreach ($qs as $v) {

-				if (substr($v, 0, 6) == 'debug=') {

-					$this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #1");

-					$this->debug_flag = substr($v, 6);

-				}

-			}

-		} elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {

-			$qs = explode('&', $HTTP_SERVER_VARS['QUERY_STRING']);

-			foreach ($qs as $v) {

-				if (substr($v, 0, 6) == 'debug=') {

-					$this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #2");

-					$this->debug_flag = substr($v, 6);

-				}

-			}

-		}

+        if (isset($debug)) {

+            $this->debug("In nusoap_server, set debug_flag=$debug based on global flag");

+            $this->debug_flag = $debug;

+        } elseif (isset($_SERVER['QUERY_STRING'])) {

+            $qs = explode('&', $_SERVER['QUERY_STRING']);

+            foreach ($qs as $v) {

+                if (substr($v, 0, 6) == 'debug=') {

+                    $this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #1");

+                    $this->debug_flag = substr($v, 6);

+                }

+            }

+        } elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {

+            $qs = explode('&', $HTTP_SERVER_VARS['QUERY_STRING']);

+            foreach ($qs as $v) {

+                if (substr($v, 0, 6) == 'debug=') {

+                    $this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #2");

+                    $this->debug_flag = substr($v, 6);

+                }

+            }

+        }

 

-		// wsdl

-		if($wsdl){

-			$this->debug("In nusoap_server, WSDL is specified");

-			if (is_object($wsdl) && (get_class($wsdl) == 'wsdl')) {

-				$this->wsdl = $wsdl;

+        // wsdl

+        if($wsdl){

+            $this->debug("In nusoap_server, WSDL is specified");

+            if (is_object($wsdl) && (get_class($wsdl) == 'wsdl')) {

+                $this->wsdl = $wsdl;

                 $this->wsdl->soap_defencoding = $this->soap_defencoding;

-				$this->externalWSDLURL = $this->wsdl->wsdl;

-				$this->debug('Use existing wsdl instance from ' . $this->externalWSDLURL);

-			} else {

-				$this->debug('Create wsdl from ' . $wsdl);

-				$this->wsdl = new wsdl($wsdl);

+                $this->externalWSDLURL = $this->wsdl->wsdl;

+                $this->debug('Use existing wsdl instance from ' . $this->externalWSDLURL);

+            } else {

+                $this->debug('Create wsdl from ' . $wsdl);

+                $this->wsdl = new wsdl($wsdl);

                 $this->wsdl->soap_defencoding = $this->soap_defencoding;

-				$this->externalWSDLURL = $wsdl;

-			}

-			$this->appendDebug($this->wsdl->getDebug());

-			$this->wsdl->clearDebug();

-			if($err = $this->wsdl->getError()){

-				die('WSDL ERROR: '.$err);

-			}

-		}

-	}

+                $this->externalWSDLURL = $wsdl;

+            }

+            $this->appendDebug($this->wsdl->getDebug());

+            $this->wsdl->clearDebug();

+            if($err = $this->wsdl->getError()){

+                die('WSDL ERROR: '.$err);

+            }

+        }

+    }

 

-	/**

-	* processes request and returns response

-	*

-	* @param    string $data usually is the value of $HTTP_RAW_POST_DATA

-	* @access   public

-	*/

-	function service($data){

-		global $HTTP_SERVER_VARS;

+    /**

+     * processes request and returns response

+     *

+     * @param    string $data usually is the value of $HTTP_RAW_POST_DATA

+     * @access   public

+     */

+    function service($data){

+        global $HTTP_SERVER_VARS;

 

-		if (isset($_SERVER['REQUEST_METHOD'])) {

-			$rm = $_SERVER['REQUEST_METHOD'];

-		} elseif (isset($HTTP_SERVER_VARS['REQUEST_METHOD'])) {

-			$rm = $HTTP_SERVER_VARS['REQUEST_METHOD'];

-		} else {

-			$rm = '';

-		}

+        if (isset($_SERVER['REQUEST_METHOD'])) {

+            $rm = $_SERVER['REQUEST_METHOD'];

+        } elseif (isset($HTTP_SERVER_VARS['REQUEST_METHOD'])) {

+            $rm = $HTTP_SERVER_VARS['REQUEST_METHOD'];

+        } else {

+            $rm = '';

+        }

 

-		if (isset($_SERVER['QUERY_STRING'])) {

-			$qs = $_SERVER['QUERY_STRING'];

-		} elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {

-			$qs = $HTTP_SERVER_VARS['QUERY_STRING'];

-		} else {

-			$qs = '';

-		}

-		$this->debug("In service, request method=$rm query string=$qs strlen(\$data)=" . strlen($data));

+        if (isset($_SERVER['QUERY_STRING'])) {

+            $qs = $_SERVER['QUERY_STRING'];

+        } elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {

+            $qs = $HTTP_SERVER_VARS['QUERY_STRING'];

+        } else {

+            $qs = '';

+        }

+        $this->debug("In service, request method=$rm query string=$qs strlen(\$data)=" . strlen($data));

 

-		if ($rm == 'POST') {

-			$this->debug("In service, invoke the request");

-			$this->parse_request($data);

-			if (! $this->fault) {

-				$this->invoke_method();

-			}

-			if (! $this->fault) {

-				$this->serialize_return();

-			}

-			$this->send_response();

-		} elseif (preg_match('/wsdl/', $qs) ){

-			$this->debug("In service, this is a request for WSDL");

-			if ($this->externalWSDLURL){

-              if (strpos($this->externalWSDLURL, "http://") !== false) { // assume URL

-				$this->debug("In service, re-direct for WSDL");

-				header('Location: '.$this->externalWSDLURL);

-              } else { // assume file

-				$this->debug("In service, use file passthru for WSDL");

+        if ($rm == 'POST') {

+            $this->debug("In service, invoke the request");

+            $this->parse_request($data);

+            if (! $this->fault) {

+                $this->invoke_method();

+            }

+            if (! $this->fault) {

+                $this->serialize_return();

+            }

+            $this->send_response();

+        } elseif (preg_match('/wsdl/', $qs) ){

+            $this->debug("In service, this is a request for WSDL");

+            if ($this->externalWSDLURL){

+                if (strpos($this->externalWSDLURL, "http://") !== false) { // assume URL

+                $this->debug("In service, re-direct for WSDL");

+                header('Location: '.$this->externalWSDLURL);

+                } else { // assume file

+                $this->debug("In service, use file passthru for WSDL");

                 header("Content-Type: text/xml\r\n");

-				$pos = strpos($this->externalWSDLURL, "file://");

-				if ($pos === false) {

-					$filename = $this->externalWSDLURL;

-				} else {

-					$filename = substr($this->externalWSDLURL, $pos + 7);

-				}

+                $pos = strpos($this->externalWSDLURL, "file://");

+                if ($pos === false) {

+                    $filename = $this->externalWSDLURL;

+                } else {

+                    $filename = substr($this->externalWSDLURL, $pos + 7);

+                }

                 $fp = fopen($this->externalWSDLURL, 'r');

                 fpassthru($fp);

-              }

-			} elseif ($this->wsdl) {

-				$this->debug("In service, serialize WSDL");

+                }

+            } elseif ($this->wsdl) {

+                $this->debug("In service, serialize WSDL");

                 header("Content-Type: text/xml; charset=".$this->soap_defencoding."\r\n");

-				print $this->wsdl->serialize($this->debug_flag);

-				if ($this->debug_flag) {

-					$this->debug('wsdl:');

-					$this->appendDebug($this->varDump($this->wsdl));

-					print $this->getDebugAsXMLComment();

-				}

-			} else {

-				$this->debug("In service, there is no WSDL");

+                print $this->wsdl->serialize($this->debug_flag);

+                if ($this->debug_flag) {

+                    $this->debug('wsdl:');

+                    $this->appendDebug($this->varDump($this->wsdl));

+                    print $this->getDebugAsXMLComment();

+                }

+            } else {

+                $this->debug("In service, there is no WSDL");

                 header("Content-Type: text/html; charset=".$this->soap_defencoding."\r\n");

-				print "This service does not provide WSDL";

-			}

-		} elseif ($this->wsdl) {

-			$this->debug("In service, return Web description");

-			print $this->wsdl->webDescription();

-		} else {

-			$this->debug("In service, no Web description");

-			header("Content-Type: text/html; charset=ISO-8859-1\r\n");

-			print "This service does not provide a Web description";

-		}

-	}

+                print "This service does not provide WSDL";

+            }

+        } elseif ($this->wsdl) {

+            $this->debug("In service, return Web description");

+            print $this->wsdl->webDescription();

+        } else {

+            $this->debug("In service, no Web description");

+            header("Content-Type: text/html; charset=ISO-8859-1\r\n");

+            print "This service does not provide a Web description";

+        }

+    }

 

-	/**

-	* parses HTTP request headers.

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* headers

-	* request

-	* xml_encoding

-	* SOAPAction

-	*

-	* @access   private

-	*/

-	function parse_http_headers() {

-		global $HTTP_SERVER_VARS;

+    /**

+     * parses HTTP request headers.

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * headers

+     * request

+     * xml_encoding

+     * SOAPAction

+     *

+     * @access   private

+     */

+    function parse_http_headers() {

+        global $HTTP_SERVER_VARS;

 

-		$this->request = '';

-		$this->SOAPAction = '';

-		if(function_exists('getallheaders')){

-			$this->debug("In parse_http_headers, use getallheaders");

-			$headers = getallheaders();

-			foreach($headers as $k=>$v){

-				$k = strtolower($k);

-				$this->headers[$k] = $v;

-				$this->request .= "$k: $v\r\n";

-				$this->debug("$k: $v");

-			}

-			// get SOAPAction header

-			if(isset($this->headers['soapaction'])){

-				$this->SOAPAction = str_replace('"','',$this->headers['soapaction']);

-			}

-			// get the character encoding of the incoming request

-			if(isset($this->headers['content-type']) && strpos($this->headers['content-type'],'=')){

-				$enc = str_replace('"','',substr(strstr($this->headers["content-type"],'='),1));

-				if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){

-					$this->xml_encoding = strtoupper($enc);

-				} else {

-					$this->xml_encoding = 'US-ASCII';

-				}

-			} else {

-				// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

-				$this->xml_encoding = 'ISO-8859-1';

-			}

-		} elseif(isset($_SERVER) && is_array($_SERVER)){

-			$this->debug("In parse_http_headers, use _SERVER");

-			foreach ($_SERVER as $k => $v) {

-				if (substr($k, 0, 5) == 'HTTP_') {

-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5))));

-				} else {

-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k)));

-				}

-				if ($k == 'soapaction') {

-					// get SOAPAction header

-					$k = 'SOAPAction';

-					$v = str_replace('"', '', $v);

-					$v = str_replace('\\', '', $v);

-					$this->SOAPAction = $v;

-				} else if ($k == 'content-type') {

-					// get the character encoding of the incoming request

-					if (strpos($v, '=')) {

-						$enc = substr(strstr($v, '='), 1);

-						$enc = str_replace('"', '', $enc);

-						$enc = str_replace('\\', '', $enc);

-						if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)) {

-							$this->xml_encoding = strtoupper($enc);

-						} else {

-							$this->xml_encoding = 'US-ASCII';

-						}

-					} else {

-						// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

-						$this->xml_encoding = 'ISO-8859-1';

-					}

-				}

-				$this->headers[$k] = $v;

-				$this->request .= "$k: $v\r\n";

-				$this->debug("$k: $v");

-			}

-		} elseif (is_array($HTTP_SERVER_VARS)) {

-			$this->debug("In parse_http_headers, use HTTP_SERVER_VARS");

-			foreach ($HTTP_SERVER_VARS as $k => $v) {

-				if (substr($k, 0, 5) == 'HTTP_') {

-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5)))); 	                                         $k = strtolower(substr($k, 5));

-				} else {

-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k))); 	                                         $k = strtolower($k);

-				}

-				if ($k == 'soapaction') {

-					// get SOAPAction header

-					$k = 'SOAPAction';

-					$v = str_replace('"', '', $v);

-					$v = str_replace('\\', '', $v);

-					$this->SOAPAction = $v;

-				} else if ($k == 'content-type') {

-					// get the character encoding of the incoming request

-					if (strpos($v, '=')) {

-						$enc = substr(strstr($v, '='), 1);

-						$enc = str_replace('"', '', $enc);

-						$enc = str_replace('\\', '', $enc);

-						if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)) {

-							$this->xml_encoding = strtoupper($enc);

-						} else {

-							$this->xml_encoding = 'US-ASCII';

-						}

-					} else {

-						// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

-						$this->xml_encoding = 'ISO-8859-1';

-					}

-				}

-				$this->headers[$k] = $v;

-				$this->request .= "$k: $v\r\n";

-				$this->debug("$k: $v");

-			}

-		} else {

-			$this->debug("In parse_http_headers, HTTP headers not accessible");

-			$this->setError("HTTP headers not accessible");

-		}

-	}

+        $this->request = '';

+        $this->SOAPAction = '';

+        if(function_exists('getallheaders')){

+            $this->debug("In parse_http_headers, use getallheaders");

+            $headers = getallheaders();

+            foreach($headers as $k=>$v){

+                $k = strtolower($k);

+                $this->headers[$k] = $v;

+                $this->request .= "$k: $v\r\n";

+                $this->debug("$k: $v");

+            }

+            // get SOAPAction header

+            if(isset($this->headers['soapaction'])){

+                $this->SOAPAction = str_replace('"','',$this->headers['soapaction']);

+            }

+            // get the character encoding of the incoming request

+            if(isset($this->headers['content-type']) && strpos($this->headers['content-type'],'=')){

+                $enc = str_replace('"','',substr(strstr($this->headers["content-type"],'='),1));

+                if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){

+                    $this->xml_encoding = strtoupper($enc);

+                } else {

+                    $this->xml_encoding = 'US-ASCII';

+                }

+            } else {

+                // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

+                $this->xml_encoding = 'ISO-8859-1';

+            }

+        } elseif(isset($_SERVER) && is_array($_SERVER)){

+            $this->debug("In parse_http_headers, use _SERVER");

+            foreach ($_SERVER as $k => $v) {

+                if (substr($k, 0, 5) == 'HTTP_') {

+                    $k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5))));

+                } else {

+                    $k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k)));

+                }

+                if ($k == 'soapaction') {

+                    // get SOAPAction header

+                    $k = 'SOAPAction';

+                    $v = str_replace('"', '', $v);

+                    $v = str_replace('\\', '', $v);

+                    $this->SOAPAction = $v;

+                } else if ($k == 'content-type') {

+                    // get the character encoding of the incoming request

+                    if (strpos($v, '=')) {

+                        $enc = substr(strstr($v, '='), 1);

+                        $enc = str_replace('"', '', $enc);

+                        $enc = str_replace('\\', '', $enc);

+                        if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)) {

+                            $this->xml_encoding = strtoupper($enc);

+                        } else {

+                            $this->xml_encoding = 'US-ASCII';

+                        }

+                    } else {

+                        // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

+                        $this->xml_encoding = 'ISO-8859-1';

+                    }

+                }

+                $this->headers[$k] = $v;

+                $this->request .= "$k: $v\r\n";

+                $this->debug("$k: $v");

+            }

+        } elseif (is_array($HTTP_SERVER_VARS)) {

+            $this->debug("In parse_http_headers, use HTTP_SERVER_VARS");

+            foreach ($HTTP_SERVER_VARS as $k => $v) {

+                if (substr($k, 0, 5) == 'HTTP_') {

+                    $k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5)))); 	                                         $k = strtolower(substr($k, 5));

+                } else {

+                    $k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k))); 	                                         $k = strtolower($k);

+                }

+                if ($k == 'soapaction') {

+                    // get SOAPAction header

+                    $k = 'SOAPAction';

+                    $v = str_replace('"', '', $v);

+                    $v = str_replace('\\', '', $v);

+                    $this->SOAPAction = $v;

+                } else if ($k == 'content-type') {

+                    // get the character encoding of the incoming request

+                    if (strpos($v, '=')) {

+                        $enc = substr(strstr($v, '='), 1);

+                        $enc = str_replace('"', '', $enc);

+                        $enc = str_replace('\\', '', $enc);

+                        if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)) {

+                            $this->xml_encoding = strtoupper($enc);

+                        } else {

+                            $this->xml_encoding = 'US-ASCII';

+                        }

+                    } else {

+                        // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

+                        $this->xml_encoding = 'ISO-8859-1';

+                    }

+                }

+                $this->headers[$k] = $v;

+                $this->request .= "$k: $v\r\n";

+                $this->debug("$k: $v");

+            }

+        } else {

+            $this->debug("In parse_http_headers, HTTP headers not accessible");

+            $this->setError("HTTP headers not accessible");

+        }

+    }

 

-	/**

-	* parses a request

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* headers

-	* request

-	* xml_encoding

-	* SOAPAction

-	* request

-	* requestSOAP

-	* methodURI

-	* methodname

-	* methodparams

-	* requestHeaders

-	* document

-	*

-	* This sets the fault field on error

-	*

-	* @param    string $data XML string

-	* @access   private

-	*/

-	function parse_request($data='') {

-		$this->debug('entering parse_request()');

-		$this->parse_http_headers();

-		$this->debug('got character encoding: '.$this->xml_encoding);

-		// uncompress if necessary

-		if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] != '') {

-			$this->debug('got content encoding: ' . $this->headers['content-encoding']);

-			if ($this->headers['content-encoding'] == 'deflate' || $this->headers['content-encoding'] == 'gzip') {

-		    	// if decoding works, use it. else assume data wasn't gzencoded

-				if (function_exists('gzuncompress')) {

-					if ($this->headers['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {

-						$data = $degzdata;

-					} elseif ($this->headers['content-encoding'] == 'gzip' && $degzdata = gzinflate(substr($data, 10))) {

-						$data = $degzdata;

-					} else {

-						$this->fault('SOAP-ENV:Client', 'Errors occurred when trying to decode the data');

-						return;

-					}

-				} else {

-					$this->fault('SOAP-ENV:Client', 'This Server does not support compressed data');

-					return;

-				}

-			}

-		}

-		$this->request .= "\r\n".$data;

-		$data = $this->parseRequest($this->headers, $data);

-		$this->requestSOAP = $data;

-		$this->debug('leaving parse_request');

-	}

+    /**

+     * parses a request

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * headers

+     * request

+     * xml_encoding

+     * SOAPAction

+     * request

+     * requestSOAP

+     * methodURI

+     * methodname

+     * methodparams

+     * requestHeaders

+     * document

+     *

+     * This sets the fault field on error

+     *

+     * @param    string $data XML string

+     * @access   private

+     */

+    function parse_request($data='') {

+        $this->debug('entering parse_request()');

+        $this->parse_http_headers();

+        $this->debug('got character encoding: '.$this->xml_encoding);

+        // uncompress if necessary

+        if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] != '') {

+            $this->debug('got content encoding: ' . $this->headers['content-encoding']);

+            if ($this->headers['content-encoding'] == 'deflate' || $this->headers['content-encoding'] == 'gzip') {

+                // if decoding works, use it. else assume data wasn't gzencoded

+                if (function_exists('gzuncompress')) {

+                    if ($this->headers['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {

+                        $data = $degzdata;

+                    } elseif ($this->headers['content-encoding'] == 'gzip' && $degzdata = gzinflate(substr($data, 10))) {

+                        $data = $degzdata;

+                    } else {

+                        $this->fault('SOAP-ENV:Client', 'Errors occurred when trying to decode the data');

+                        return;

+                    }

+                } else {

+                    $this->fault('SOAP-ENV:Client', 'This Server does not support compressed data');

+                    return;

+                }

+            }

+        }

+        $this->request .= "\r\n".$data;

+        $data = $this->parseRequest($this->headers, $data);

+        $this->requestSOAP = $data;

+        $this->debug('leaving parse_request');

+    }

 

-	/**

-	* invokes a PHP function for the requested SOAP method

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* methodreturn

-	*

-	* Note that the PHP function that is called may also set the following

-	* fields to affect the response sent to the client

-	*

-	* responseHeaders

-	* outgoing_headers

-	*

-	* This sets the fault field on error

-	*

-	* @access   private

-	*/

-	function invoke_method() {

-		$this->debug('in invoke_method, methodname=' . $this->methodname . ' methodURI=' . $this->methodURI . ' SOAPAction=' . $this->SOAPAction);

+    /**

+     * invokes a PHP function for the requested SOAP method

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * methodreturn

+     *

+     * Note that the PHP function that is called may also set the following

+     * fields to affect the response sent to the client

+     *

+     * responseHeaders

+     * outgoing_headers

+     *

+     * This sets the fault field on error

+     *

+     * @access   private

+     */

+    function invoke_method() {

+        $this->debug('in invoke_method, methodname=' . $this->methodname . ' methodURI=' . $this->methodURI . ' SOAPAction=' . $this->SOAPAction);

 

-		//

-		// if you are debugging in this area of the code, your service uses a class to implement methods,

-		// you use SOAP RPC, and the client is .NET, please be aware of the following...

-		// when the .NET wsdl.exe utility generates a proxy, it will remove the '.' or '..' from the

-		// method name.  that is fine for naming the .NET methods.  it is not fine for properly constructing

-		// the XML request and reading the XML response.  you need to add the RequestElementName and

-		// ResponseElementName to the System.Web.Services.Protocols.SoapRpcMethodAttribute that wsdl.exe

-		// generates for the method.  these parameters are used to specify the correct XML element names

-		// for .NET to use, i.e. the names with the '.' in them.

-		//

-		$orig_methodname = $this->methodname;

-		if ($this->wsdl) {

-			if ($this->opData = $this->wsdl->getOperationData($this->methodname)) {

-				$this->debug('in invoke_method, found WSDL operation=' . $this->methodname);

-				$this->appendDebug('opData=' . $this->varDump($this->opData));

-			} elseif ($this->opData = $this->wsdl->getOperationDataForSoapAction($this->SOAPAction)) {

-				// Note: hopefully this case will only be used for doc/lit, since rpc services should have wrapper element

-				$this->debug('in invoke_method, found WSDL soapAction=' . $this->SOAPAction . ' for operation=' . $this->opData['name']);

-				$this->appendDebug('opData=' . $this->varDump($this->opData));

-				$this->methodname = $this->opData['name'];

-			} else {

-				$this->debug('in invoke_method, no WSDL for operation=' . $this->methodname);

-				$this->fault('SOAP-ENV:Client', "Operation '" . $this->methodname . "' is not defined in the WSDL for this service");

-				return;

-			}

-		} else {

-			$this->debug('in invoke_method, no WSDL to validate method');

-		}

+        //

+        // if you are debugging in this area of the code, your service uses a class to implement methods,

+        // you use SOAP RPC, and the client is .NET, please be aware of the following...

+        // when the .NET wsdl.exe utility generates a proxy, it will remove the '.' or '..' from the

+        // method name.  that is fine for naming the .NET methods.  it is not fine for properly constructing

+        // the XML request and reading the XML response.  you need to add the RequestElementName and

+        // ResponseElementName to the System.Web.Services.Protocols.SoapRpcMethodAttribute that wsdl.exe

+        // generates for the method.  these parameters are used to specify the correct XML element names

+        // for .NET to use, i.e. the names with the '.' in them.

+        //

+        $orig_methodname = $this->methodname;

+        if ($this->wsdl) {

+            if ($this->opData = $this->wsdl->getOperationData($this->methodname)) {

+                $this->debug('in invoke_method, found WSDL operation=' . $this->methodname);

+                $this->appendDebug('opData=' . $this->varDump($this->opData));

+            } elseif ($this->opData = $this->wsdl->getOperationDataForSoapAction($this->SOAPAction)) {

+                // Note: hopefully this case will only be used for doc/lit, since rpc services should have wrapper element

+                $this->debug('in invoke_method, found WSDL soapAction=' . $this->SOAPAction . ' for operation=' . $this->opData['name']);

+                $this->appendDebug('opData=' . $this->varDump($this->opData));

+                $this->methodname = $this->opData['name'];

+            } else {

+                $this->debug('in invoke_method, no WSDL for operation=' . $this->methodname);

+                $this->fault('SOAP-ENV:Client', "Operation '" . $this->methodname . "' is not defined in the WSDL for this service");

+                return;

+            }

+        } else {

+            $this->debug('in invoke_method, no WSDL to validate method');

+        }

 

-		// if a . is present in $this->methodname, we see if there is a class in scope,

-		// which could be referred to. We will also distinguish between two deliminators,

-		// to allow methods to be called a the class or an instance

-		if (strpos($this->methodname, '..') > 0) {

-			$delim = '..';

-		} else if (strpos($this->methodname, '.') > 0) {

-			$delim = '.';

-		} else {

-			$delim = '';

-		}

-		$this->debug("in invoke_method, delim=$delim");

+        // if a . is present in $this->methodname, we see if there is a class in scope,

+        // which could be referred to. We will also distinguish between two deliminators,

+        // to allow methods to be called a the class or an instance

+        if (strpos($this->methodname, '..') > 0) {

+            $delim = '..';

+        } else if (strpos($this->methodname, '.') > 0) {

+            $delim = '.';

+        } else {

+            $delim = '';

+        }

+        $this->debug("in invoke_method, delim=$delim");

 

-		$class = '';

-		$method = '';

-		if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) {

-			$try_class = substr($this->methodname, 0, strpos($this->methodname, $delim));

-			if (class_exists($try_class)) {

-				// get the class and method name

-				$class = $try_class;

-				$method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim));

-				$this->debug("in invoke_method, class=$class method=$method delim=$delim");

-			} else {

-				$this->debug("in invoke_method, class=$try_class not found");

-			}

-		} else {

-			$try_class = '';

-			$this->debug("in invoke_method, no class to try");

-		}

+        $class = '';

+        $method = '';

+        if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) {

+            $try_class = substr($this->methodname, 0, strpos($this->methodname, $delim));

+            if (class_exists($try_class)) {

+                // get the class and method name

+                $class = $try_class;

+                $method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim));

+                $this->debug("in invoke_method, class=$class method=$method delim=$delim");

+            } else {

+                $this->debug("in invoke_method, class=$try_class not found");

+            }

+        } else {

+            $try_class = '';

+            $this->debug("in invoke_method, no class to try");

+        }

 

-		// does method exist?

-		if ($class == '') {

-			if (!function_exists($this->methodname)) {

-				$this->debug("in invoke_method, function '$this->methodname' not found!");

-				$this->result = 'fault: method not found';

-				$this->fault('SOAP-ENV:Client',"method '$this->methodname'('$orig_methodname') not defined in service('$try_class' '$delim')");

-				return;

-			}

-		} else {

-			$method_to_compare = (substr(phpversion(), 0, 2) == '4.') ? strtolower($method) : $method;

-			if (!in_array($method_to_compare, get_class_methods($class))) {

-				$this->debug("in invoke_method, method '$this->methodname' not found in class '$class'!");

-				$this->result = 'fault: method not found';

-				$this->fault('SOAP-ENV:Client',"method '$this->methodname'/'$method_to_compare'('$orig_methodname') not defined in service/'$class'('$try_class' '$delim')");

-				return;

-			}

-		}

+        // does method exist?

+        if ($class == '') {

+            if (!function_exists($this->methodname)) {

+                $this->debug("in invoke_method, function '$this->methodname' not found!");

+                $this->result = 'fault: method not found';

+                $this->fault('SOAP-ENV:Client',"method '$this->methodname'('$orig_methodname') not defined in service('$try_class' '$delim')");

+                return;

+            }

+        } else {

+            $method_to_compare = (substr(phpversion(), 0, 2) == '4.') ? strtolower($method) : $method;

+            if (!in_array($method_to_compare, get_class_methods($class))) {

+                $this->debug("in invoke_method, method '$this->methodname' not found in class '$class'!");

+                $this->result = 'fault: method not found';

+                $this->fault('SOAP-ENV:Client',"method '$this->methodname'/'$method_to_compare'('$orig_methodname') not defined in service/'$class'('$try_class' '$delim')");

+                return;

+            }

+        }

 

-		// evaluate message, getting back parameters

-		// verify that request parameters match the method's signature

-		if(! $this->verify_method($this->methodname,$this->methodparams)){

-			// debug

-			$this->debug('ERROR: request not verified against method signature');

-			$this->result = 'fault: request failed validation against method signature';

-			// return fault

-			$this->fault('SOAP-ENV:Client',"Operation '$this->methodname' not defined in service.");

-			return;

-		}

+        // evaluate message, getting back parameters

+        // verify that request parameters match the method's signature

+        if(! $this->verify_method($this->methodname,$this->methodparams)){

+            // debug

+            $this->debug('ERROR: request not verified against method signature');

+            $this->result = 'fault: request failed validation against method signature';

+            // return fault

+            $this->fault('SOAP-ENV:Client',"Operation '$this->methodname' not defined in service.");

+            return;

+        }

 

-		// if there are parameters to pass

-		$this->debug('in invoke_method, params:');

-		$this->appendDebug($this->varDump($this->methodparams));

-		$this->debug("in invoke_method, calling '$this->methodname'");

-		if (!function_exists('call_user_func_array')) {

-			if ($class == '') {

-				$this->debug('in invoke_method, calling function using eval()');

-				$funcCall = "\$this->methodreturn = $this->methodname(";

-			} else {

-				if ($delim == '..') {

-					$this->debug('in invoke_method, calling class method using eval()');

-					$funcCall = "\$this->methodreturn = ".$class."::".$method."(";

-				} else {

-					$this->debug('in invoke_method, calling instance method using eval()');

-					// generate unique instance name

-					$instname = "\$inst_".time();

-					$funcCall = $instname." = new ".$class."(); ";

-					$funcCall .= "\$this->methodreturn = ".$instname."->".$method."(";

-				}

-			}

-			if ($this->methodparams) {

-				foreach ($this->methodparams as $param) {

-					if (is_array($param) || is_object($param)) {

-						$this->fault('SOAP-ENV:Client', 'NuSOAP does not handle complexType parameters correctly when using eval; call_user_func_array must be available');

-						return;

-					}

-					$funcCall .= "\"$param\",";

-				}

-				$funcCall = substr($funcCall, 0, -1);

-			}

-			$funcCall .= ');';

-			$this->debug('in invoke_method, function call: '.$funcCall);

-			@eval($funcCall);

-		} else {

-			if ($class == '') {

-				$this->debug('in invoke_method, calling function using call_user_func_array()');

-				$call_arg = "$this->methodname";	// straight assignment changes $this->methodname to lower case after call_user_func_array()

-			} elseif ($delim == '..') {

-				$this->debug('in invoke_method, calling class method using call_user_func_array()');

-				$call_arg = array ($class, $method);

-			} else {

-				$this->debug('in invoke_method, calling instance method using call_user_func_array()');

-				$instance = new $class ();

-				$call_arg = array(&$instance, $method);

-			}

-			if (is_array($this->methodparams)) {

-				$this->methodreturn = call_user_func_array($call_arg, array_values($this->methodparams));

-			} else {

-				$this->methodreturn = call_user_func_array($call_arg, array());

-			}

-		}

+        // if there are parameters to pass

+        $this->debug('in invoke_method, params:');

+        $this->appendDebug($this->varDump($this->methodparams));

+        $this->debug("in invoke_method, calling '$this->methodname'");

+        if (!function_exists('call_user_func_array')) {

+            if ($class == '') {

+                $this->debug('in invoke_method, calling function using eval()');

+                $funcCall = "\$this->methodreturn = $this->methodname(";

+            } else {

+                if ($delim == '..') {

+                    $this->debug('in invoke_method, calling class method using eval()');

+                    $funcCall = "\$this->methodreturn = ".$class."::".$method."(";

+                } else {

+                    $this->debug('in invoke_method, calling instance method using eval()');

+                    // generate unique instance name

+                    $instname = "\$inst_".time();

+                    $funcCall = $instname." = new ".$class."(); ";

+                    $funcCall .= "\$this->methodreturn = ".$instname."->".$method."(";

+                }

+            }

+            if ($this->methodparams) {

+                foreach ($this->methodparams as $param) {

+                    if (is_array($param) || is_object($param)) {

+                        $this->fault('SOAP-ENV:Client', 'NuSOAP does not handle complexType parameters correctly when using eval; call_user_func_array must be available');

+                        return;

+                    }

+                    $funcCall .= "\"$param\",";

+                }

+                $funcCall = substr($funcCall, 0, -1);

+            }

+            $funcCall .= ');';

+            $this->debug('in invoke_method, function call: '.$funcCall);

+            @eval($funcCall);

+        } else {

+            if ($class == '') {

+                $this->debug('in invoke_method, calling function using call_user_func_array()');

+                $call_arg = "$this->methodname";	// straight assignment changes $this->methodname to lower case after call_user_func_array()

+            } elseif ($delim == '..') {

+                $this->debug('in invoke_method, calling class method using call_user_func_array()');

+                $call_arg = array ($class, $method);

+            } else {

+                $this->debug('in invoke_method, calling instance method using call_user_func_array()');

+                $instance = new $class ();

+                $call_arg = array(&$instance, $method);

+            }

+            if (is_array($this->methodparams)) {

+                $this->methodreturn = call_user_func_array($call_arg, array_values($this->methodparams));

+            } else {

+                $this->methodreturn = call_user_func_array($call_arg, array());

+            }

+        }

         $this->debug('in invoke_method, methodreturn:');

         $this->appendDebug($this->varDump($this->methodreturn));

-		$this->debug("in invoke_method, called method $this->methodname, received data of type ".gettype($this->methodreturn));

-	}

+        $this->debug("in invoke_method, called method $this->methodname, received data of type ".gettype($this->methodreturn));

+    }

 

-	/**

-	* serializes the return value from a PHP function into a full SOAP Envelope

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* responseSOAP

-	*

-	* This sets the fault field on error

-	*

-	* @access   private

-	*/

-	function serialize_return() {

-		$this->debug('Entering serialize_return methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI);

-		// if fault

-		if (isset($this->methodreturn) && is_object($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {

-			$this->debug('got a fault object from method');

-			$this->fault = $this->methodreturn;

-			return;

-		} elseif ($this->methodreturnisliteralxml) {

-			$return_val = $this->methodreturn;

-		// returned value(s)

-		} else {

-			$this->debug('got a(n) '.gettype($this->methodreturn).' from method');

-			$this->debug('serializing return value');

-			if($this->wsdl){

-				$opParams = "";

-				if (sizeof($this->opData['output']['parts']) > 1) {

-					$this->debug('more than one output part, so use the method return unchanged');

-			    	$opParams = $this->methodreturn;

-			    } elseif (sizeof($this->opData['output']['parts']) == 1) {

-					$this->debug('exactly one output part, so wrap the method return in a simple array');

-					// TODO: verify that it is not already wrapped!

-			    	//foreach ($this->opData['output']['parts'] as $name => $type) {

-					//	$this->debug('wrap in element named ' . $name);

-			    	//}

-			    	$opParams = array($this->methodreturn);

-			    }

-			    $return_val = $this->wsdl->serializeRPCParameters($this->methodname,'output',$opParams);

-			    $this->appendDebug($this->wsdl->getDebug());

-			    $this->wsdl->clearDebug();

-				if($errstr = $this->wsdl->getError()){

-					$this->debug('got wsdl error: '.$errstr);

-					$this->fault('SOAP-ENV:Server', 'unable to serialize result');

-					return;

-				}

-			} else {

-				if (isset($this->methodreturn)) {

-					$return_val = $this->serialize_val($this->methodreturn, 'return');

-				} else {

-					$return_val = '';

-					$this->debug('in absence of WSDL, assume void return for backward compatibility');

-				}

-			}

-		}

-		$this->debug('return value:');

-		$this->appendDebug($this->varDump($return_val));

+    /**

+     * serializes the return value from a PHP function into a full SOAP Envelope

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * responseSOAP

+     *

+     * This sets the fault field on error

+     *

+     * @access   private

+     */

+    function serialize_return() {

+        $this->debug('Entering serialize_return methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI);

+        // if fault

+        if (isset($this->methodreturn) && is_object($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {

+            $this->debug('got a fault object from method');

+            $this->fault = $this->methodreturn;

+            return;

+        } elseif ($this->methodreturnisliteralxml) {

+            $return_val = $this->methodreturn;

+        // returned value(s)

+        } else {

+            $this->debug('got a(n) '.gettype($this->methodreturn).' from method');

+            $this->debug('serializing return value');

+            if($this->wsdl){

+                $opParams = "";

+                if (sizeof($this->opData['output']['parts']) > 1) {

+                    $this->debug('more than one output part, so use the method return unchanged');

+                    $opParams = $this->methodreturn;

+                } elseif (sizeof($this->opData['output']['parts']) == 1) {

+                    $this->debug('exactly one output part, so wrap the method return in a simple array');

+                    // TODO: verify that it is not already wrapped!

+                    //foreach ($this->opData['output']['parts'] as $name => $type) {

+                    //	$this->debug('wrap in element named ' . $name);

+                    //}

+                    $opParams = array($this->methodreturn);

+                }

+                $return_val = $this->wsdl->serializeRPCParameters($this->methodname,'output',$opParams);

+                $this->appendDebug($this->wsdl->getDebug());

+                $this->wsdl->clearDebug();

+                if($errstr = $this->wsdl->getError()){

+                    $this->debug('got wsdl error: '.$errstr);

+                    $this->fault('SOAP-ENV:Server', 'unable to serialize result');

+                    return;

+                }

+            } else {

+                if (isset($this->methodreturn)) {

+                    $return_val = $this->serialize_val($this->methodreturn, 'return');

+                } else {

+                    $return_val = '';

+                    $this->debug('in absence of WSDL, assume void return for backward compatibility');

+                }

+            }

+        }

+        $this->debug('return value:');

+        $this->appendDebug($this->varDump($return_val));

 

-		$this->debug('serializing response');

-		if ($this->wsdl) {

-			$this->debug('have WSDL for serialization: style is ' . $this->opData['style']);

-			if ($this->opData['style'] == 'rpc') {

-				$this->debug('style is rpc for serialization: use is ' . $this->opData['output']['use']);

-				if ($this->opData['output']['use'] == 'literal') {

-					// http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace

-					if ($this->methodURI) {

-						$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

-					} else {

-						$payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';

-					}

-				} else {

-					if ($this->methodURI) {

-						$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

-					} else {

-						$payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';

-					}

-				}

-			} else {

-				$this->debug('style is not rpc for serialization: assume document');

-				$payload = $return_val;

-			}

-		} else {

-			$this->debug('do not have WSDL for serialization: assume rpc/encoded');

-			$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

-		}

-		$this->result = 'successful';

-		if($this->wsdl){

-			//if($this->debug_flag){

-            	$this->appendDebug($this->wsdl->getDebug());

+        $this->debug('serializing response');

+        if ($this->wsdl) {

+            $this->debug('have WSDL for serialization: style is ' . $this->opData['style']);

+            if ($this->opData['style'] == 'rpc') {

+                $this->debug('style is rpc for serialization: use is ' . $this->opData['output']['use']);

+                if ($this->opData['output']['use'] == 'literal') {

+                    // http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace

+                    if ($this->methodURI) {

+                        $payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

+                    } else {

+                        $payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';

+                    }

+                } else {

+                    if ($this->methodURI) {

+                        $payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

+                    } else {

+                        $payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';

+                    }

+                }

+            } else {

+                $this->debug('style is not rpc for serialization: assume document');

+                $payload = $return_val;

+            }

+        } else {

+            $this->debug('do not have WSDL for serialization: assume rpc/encoded');

+            $payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";

+        }

+        $this->result = 'successful';

+        if($this->wsdl){

+            //if($this->debug_flag){

+                $this->appendDebug($this->wsdl->getDebug());

             //	}

-			if (isset($this->opData['output']['encodingStyle'])) {

-				$encodingStyle = $this->opData['output']['encodingStyle'];

-			} else {

-				$encodingStyle = '';

-			}

-			// Added: In case we use a WSDL, return a serialized env. WITH the usedNamespaces.

-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders,$this->wsdl->usedNamespaces,$this->opData['style'],$this->opData['output']['use'],$encodingStyle);

-		} else {

-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders);

-		}

-		$this->debug("Leaving serialize_return");

-	}

+            if (isset($this->opData['output']['encodingStyle'])) {

+                $encodingStyle = $this->opData['output']['encodingStyle'];

+            } else {

+                $encodingStyle = '';

+            }

+            // Added: In case we use a WSDL, return a serialized env. WITH the usedNamespaces.

+            $this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders,$this->wsdl->usedNamespaces,$this->opData['style'],$this->opData['output']['use'],$encodingStyle);

+        } else {

+            $this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders);

+        }

+        $this->debug("Leaving serialize_return");

+    }

 

-	/**

-	* sends an HTTP response

-	*

-	* The following fields are set by this function (when successful)

-	*

-	* outgoing_headers

-	* response

-	*

-	* @access   private

-	*/

-	function send_response() {

-		$this->debug('Enter send_response');

-		if ($this->fault) {

-			$payload = $this->fault->serialize();

-			$this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error";

-			$this->outgoing_headers[] = "Status: 500 Internal Server Error";

-		} else {

-			$payload = $this->responseSOAP;

-			// Some combinations of PHP+Web server allow the Status

-			// to come through as a header.  Since OK is the default

-			// just do nothing.

-			// $this->outgoing_headers[] = "HTTP/1.0 200 OK";

-			// $this->outgoing_headers[] = "Status: 200 OK";

-		}

+    /**

+     * sends an HTTP response

+     *

+     * The following fields are set by this function (when successful)

+     *

+     * outgoing_headers

+     * response

+     *

+     * @access   private

+     */

+    function send_response() {

+        $this->debug('Enter send_response');

+        if ($this->fault) {

+            $payload = $this->fault->serialize();

+            $this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error";

+            $this->outgoing_headers[] = "Status: 500 Internal Server Error";

+        } else {

+            $payload = $this->responseSOAP;

+            // Some combinations of PHP+Web server allow the Status

+            // to come through as a header.  Since OK is the default

+            // just do nothing.

+            // $this->outgoing_headers[] = "HTTP/1.0 200 OK";

+            // $this->outgoing_headers[] = "Status: 200 OK";

+        }

         // add debug data if in debug mode

-		if(isset($this->debug_flag) && $this->debug_flag){

-        	$payload .= $this->getDebugAsXMLComment();

+        if(isset($this->debug_flag) && $this->debug_flag){

+            $payload .= $this->getDebugAsXMLComment();

+        }

+        $this->outgoing_headers[] = "Server: $this->title Server v$this->version";

+        preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);

+        $this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".$rev[1].")";

+        // Let the Web server decide about this

+        //$this->outgoing_headers[] = "Connection: Close\r\n";

+        $payload = $this->getHTTPBody($payload);

+        $type = $this->getHTTPContentType();

+        $charset = $this->getHTTPContentTypeCharset();

+        $this->outgoing_headers[] = "Content-Type: $type" . ($charset ? '; charset=' . $charset : '');

+        //begin code to compress payload - by John

+        // NOTE: there is no way to know whether the Web server will also compress

+        // this data.

+        if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {

+            if (strstr($this->headers['accept-encoding'], 'gzip')) {

+                if (function_exists('gzencode')) {

+                    if (isset($this->debug_flag) && $this->debug_flag) {

+                        $payload .= "<!-- Content being gzipped -->";

+                    }

+                    $this->outgoing_headers[] = "Content-Encoding: gzip";

+                    $payload = gzencode($payload);

+                } else {

+                    if (isset($this->debug_flag) && $this->debug_flag) {

+                        $payload .= "<!-- Content will not be gzipped: no gzencode -->";

+                    }

+                }

+            } elseif (strstr($this->headers['accept-encoding'], 'deflate')) {

+                // Note: MSIE requires gzdeflate output (no Zlib header and checksum),

+                // instead of gzcompress output,

+                // which conflicts with HTTP 1.1 spec (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.5)

+                if (function_exists('gzdeflate')) {

+                    if (isset($this->debug_flag) && $this->debug_flag) {

+                        $payload .= "<!-- Content being deflated -->";

+                    }

+                    $this->outgoing_headers[] = "Content-Encoding: deflate";

+                    $payload = gzdeflate($payload);

+                } else {

+                    if (isset($this->debug_flag) && $this->debug_flag) {

+                        $payload .= "<!-- Content will not be deflated: no gzcompress -->";

+                    }

+                }

+            }

         }

-		$this->outgoing_headers[] = "Server: $this->title Server v$this->version";

-		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);

-		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".$rev[1].")";

-		// Let the Web server decide about this

-		//$this->outgoing_headers[] = "Connection: Close\r\n";

-		$payload = $this->getHTTPBody($payload);

-		$type = $this->getHTTPContentType();

-		$charset = $this->getHTTPContentTypeCharset();

-		$this->outgoing_headers[] = "Content-Type: $type" . ($charset ? '; charset=' . $charset : '');

-		//begin code to compress payload - by John

-		// NOTE: there is no way to know whether the Web server will also compress

-		// this data.

-		if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {

-			if (strstr($this->headers['accept-encoding'], 'gzip')) {

-				if (function_exists('gzencode')) {

-					if (isset($this->debug_flag) && $this->debug_flag) {

-						$payload .= "<!-- Content being gzipped -->";

-					}

-					$this->outgoing_headers[] = "Content-Encoding: gzip";

-					$payload = gzencode($payload);

-				} else {

-					if (isset($this->debug_flag) && $this->debug_flag) {

-						$payload .= "<!-- Content will not be gzipped: no gzencode -->";

-					}

-				}

-			} elseif (strstr($this->headers['accept-encoding'], 'deflate')) {

-				// Note: MSIE requires gzdeflate output (no Zlib header and checksum),

-				// instead of gzcompress output,

-				// which conflicts with HTTP 1.1 spec (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.5)

-				if (function_exists('gzdeflate')) {

-					if (isset($this->debug_flag) && $this->debug_flag) {

-						$payload .= "<!-- Content being deflated -->";

-					}

-					$this->outgoing_headers[] = "Content-Encoding: deflate";

-					$payload = gzdeflate($payload);

-				} else {

-					if (isset($this->debug_flag) && $this->debug_flag) {

-						$payload .= "<!-- Content will not be deflated: no gzcompress -->";

-					}

-				}

-			}

-		}

-		//end code

-		$this->outgoing_headers[] = "Content-Length: ".strlen($payload);

-		reset($this->outgoing_headers);

-		foreach($this->outgoing_headers as $hdr){

-			header($hdr, false);

-		}

-		print $payload;

-		$this->response = join("\r\n",$this->outgoing_headers)."\r\n\r\n".$payload;

-	}

+        //end code

+        $this->outgoing_headers[] = "Content-Length: ".strlen($payload);

+        reset($this->outgoing_headers);

+        foreach($this->outgoing_headers as $hdr){

+            header($hdr, false);

+        }

+        print $payload;

+        $this->response = join("\r\n",$this->outgoing_headers)."\r\n\r\n".$payload;

+    }

 

-	/**

-	* takes the value that was created by parsing the request

-	* and compares to the method's signature, if available.

-	*

-	* @param	string	$operation	The operation to be invoked

-	* @param	array	$request	The array of parameter values

-	* @return	boolean	Whether the operation was found

-	* @access   private

-	*/

-	function verify_method($operation,$request){

-		if(isset($this->wsdl) && is_object($this->wsdl)){

-			if($this->wsdl->getOperationData($operation)){

-				return true;

-			}

-	    } elseif(isset($this->operations[$operation])){

-			return true;

-		}

-		return false;

-	}

+    /**

+     * takes the value that was created by parsing the request

+     * and compares to the method's signature, if available.

+     *

+     * @param	string	$operation	The operation to be invoked

+     * @param	array	$request	The array of parameter values

+     * @return	boolean	Whether the operation was found

+     * @access   private

+     */

+    function verify_method($operation,$request){

+        if(isset($this->wsdl) && is_object($this->wsdl)){

+            if($this->wsdl->getOperationData($operation)){

+                return true;

+            }

+        } elseif(isset($this->operations[$operation])){

+            return true;

+        }

+        return false;

+    }

 

-	/**

-	* processes SOAP message received from client

-	*

-	* @param	array	$headers	The HTTP headers

-	* @param	string	$data		unprocessed request data from client

-	* @return	mixed	value of the message, decoded into a PHP type

-	* @access   private

-	*/

+    /**

+     * processes SOAP message received from client

+     *

+     * @param	array	$headers	The HTTP headers

+     * @param	string	$data		unprocessed request data from client

+     * @return	mixed	value of the message, decoded into a PHP type

+     * @access   private

+     */

     function parseRequest($headers, $data) {

-		$this->debug('Entering parseRequest() for data of length ' . strlen($data) . ' headers:');

-		$this->appendDebug($this->varDump($headers));

-    	if (!isset($headers['content-type'])) {

-			$this->setError('Request not of type text/xml (no content-type header)');

-			return false;

-    	}

-		if (!strstr($headers['content-type'], 'text/xml')) {

-			$this->setError('Request not of type text/xml');

-			return false;

-		}

-		if (strpos($headers['content-type'], '=')) {

-			$enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));

-			$this->debug('Got response encoding: ' . $enc);

-			if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){

-				$this->xml_encoding = strtoupper($enc);

-			} else {

-				$this->xml_encoding = 'US-ASCII';

-			}

-		} else {

-			// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

-			$this->xml_encoding = 'ISO-8859-1';

-		}

-		$this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');

-		// parse response, get soap parser obj

-		$parser = new nusoap_parser($data,$this->xml_encoding,'',$this->decode_utf8);

+        $this->debug('Entering parseRequest() for data of length ' . strlen($data) . ' headers:');

+        $this->appendDebug($this->varDump($headers));

+        if (!isset($headers['content-type'])) {

+            $this->setError('Request not of type text/xml (no content-type header)');

+            return false;

+        }

+        if (!strstr($headers['content-type'], 'text/xml')) {

+            $this->setError('Request not of type text/xml');

+            return false;

+        }

+        if (strpos($headers['content-type'], '=')) {

+            $enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));

+            $this->debug('Got response encoding: ' . $enc);

+            if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){

+                $this->xml_encoding = strtoupper($enc);

+            } else {

+                $this->xml_encoding = 'US-ASCII';

+            }

+        } else {

+            // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1

+            $this->xml_encoding = 'ISO-8859-1';

+        }

+        $this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');

+        // parse response, get soap parser obj

+        $parser = new nusoap_parser($data,$this->xml_encoding,'',$this->decode_utf8);

 

-		// parser debug

-		$this->debug("parser debug: \n".$parser->getDebug());

-		// if fault occurred during message parsing

-		if($err = $parser->getError()){

-			$this->result = 'fault: error in msg parsing: '.$err;

-			$this->fault('SOAP-ENV:Client',"error in msg parsing:\n".$err);

-		// else successfully parsed request into soapval object

-		} else {

-			// get/set methodname

-			$this->methodURI = $parser->root_struct_namespace;

-			$this->methodname = $parser->root_struct_name;

-			$this->debug('methodname: '.$this->methodname.' methodURI: '.$this->methodURI);

-			$this->debug('calling parser->get_soapbody()');

-			$this->methodparams = $parser->get_soapbody();

-			// get SOAP headers

-			$this->requestHeaders = $parser->getHeaders();

-			// get SOAP Header

-			$this->requestHeader = $parser->get_soapheader();

+        // parser debug

+        $this->debug("parser debug: \n".$parser->getDebug());

+        // if fault occurred during message parsing

+        if($err = $parser->getError()){

+            $this->result = 'fault: error in msg parsing: '.$err;

+            $this->fault('SOAP-ENV:Client',"error in msg parsing:\n".$err);

+        // else successfully parsed request into soapval object

+        } else {

+            // get/set methodname

+            $this->methodURI = $parser->root_struct_namespace;

+            $this->methodname = $parser->root_struct_name;

+            $this->debug('methodname: '.$this->methodname.' methodURI: '.$this->methodURI);

+            $this->debug('calling parser->get_soapbody()');

+            $this->methodparams = $parser->get_soapbody();

+            // get SOAP headers

+            $this->requestHeaders = $parser->getHeaders();

+            // get SOAP Header

+            $this->requestHeader = $parser->get_soapheader();

             // add document for doclit support

             $this->document = $parser->document;

-		}

-	 }

+        }

+        }

 

-	/**

-	* gets the HTTP body for the current response.

-	*

-	* @param string $soapmsg The SOAP payload

-	* @return string The HTTP body, which includes the SOAP payload

-	* @access private

-	*/

-	function getHTTPBody($soapmsg) {

-		return $soapmsg;

-	}

+    /**

+     * gets the HTTP body for the current response.

+     *

+     * @param string $soapmsg The SOAP payload

+     * @return string The HTTP body, which includes the SOAP payload

+     * @access private

+     */

+    function getHTTPBody($soapmsg) {

+        return $soapmsg;

+    }

 

-	/**

-	* gets the HTTP content type for the current response.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type for the current response.

-	* @access private

-	*/

-	function getHTTPContentType() {

-		return 'text/xml';

-	}

+    /**

+     * gets the HTTP content type for the current response.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type for the current response.

+     * @access private

+     */

+    function getHTTPContentType() {

+        return 'text/xml';

+    }

 

-	/**

-	* gets the HTTP content type charset for the current response.

-	* returns false for non-text content types.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type charset for the current response.

-	* @access private

-	*/

-	function getHTTPContentTypeCharset() {

-		return $this->soap_defencoding;

-	}

+    /**

+     * gets the HTTP content type charset for the current response.

+     * returns false for non-text content types.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type charset for the current response.

+     * @access private

+     */

+    function getHTTPContentTypeCharset() {

+        return $this->soap_defencoding;

+    }

 

-	/**

-	* add a method to the dispatch map (this has been replaced by the register method)

-	*

-	* @param    string $methodname

-	* @param    string $in array of input values

-	* @param    string $out array of output values

-	* @access   public

-	* @deprecated

-	*/

-	function add_to_map($methodname,$in,$out){

-			$this->operations[$methodname] = array('name' => $methodname,'in' => $in,'out' => $out);

-	}

+    /**

+     * add a method to the dispatch map (this has been replaced by the register method)

+     *

+     * @param    string $methodname

+     * @param    string $in array of input values

+     * @param    string $out array of output values

+     * @access   public

+     * @deprecated

+     */

+    function add_to_map($methodname,$in,$out){

+            $this->operations[$methodname] = array('name' => $methodname,'in' => $in,'out' => $out);

+    }

 

-	/**

-	* register a service function with the server

-	*

-	* @param    string $name the name of the PHP function, class.method or class..method

-	* @param    array $in assoc array of input values: key = param name, value = param type

-	* @param    array $out assoc array of output values: key = param name, value = param type

-	* @param	mixed $namespace the element namespace for the method or false

-	* @param	mixed $soapaction the soapaction for the method or false

-	* @param	mixed $style optional (rpc|document) or false Note: when 'document' is specified, parameter and return wrappers are created for you automatically

-	* @param	mixed $use optional (encoded|literal) or false

-	* @param	string $documentation optional Description to include in WSDL

-	* @param	string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)

-	* @access   public

-	*/

-	function register($name,$in=array(),$out=array(),$namespace=false,$soapaction=false,$style=false,$use=false,$documentation='',$encodingStyle=''){

-		global $HTTP_SERVER_VARS;

+    /**

+     * register a service function with the server

+     *

+     * @param    string $name the name of the PHP function, class.method or class..method

+     * @param    array $in assoc array of input values: key = param name, value = param type

+     * @param    array $out assoc array of output values: key = param name, value = param type

+     * @param	mixed $namespace the element namespace for the method or false

+     * @param	mixed $soapaction the soapaction for the method or false

+     * @param	mixed $style optional (rpc|document) or false Note: when 'document' is specified, parameter and return wrappers are created for you automatically

+     * @param	mixed $use optional (encoded|literal) or false

+     * @param	string $documentation optional Description to include in WSDL

+     * @param	string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)

+     * @access   public

+     */

+    function register($name,$in=array(),$out=array(),$namespace=false,$soapaction=false,$style=false,$use=false,$documentation='',$encodingStyle=''){

+        global $HTTP_SERVER_VARS;

 

-		if($this->externalWSDLURL){

-			die('You cannot bind to an external WSDL file, and register methods outside of it! Please choose either WSDL or no WSDL.');

-		}

-		if (! $name) {

-			die('You must specify a name when you register an operation');

-		}

-		if (!is_array($in)) {

-			die('You must provide an array for operation inputs');

-		}

-		if (!is_array($out)) {

-			die('You must provide an array for operation outputs');

-		}

-		if(false == $namespace) {

-		}

-		if(false == $soapaction) {

-			if (isset($_SERVER)) {

-				$SERVER_NAME = $_SERVER['SERVER_NAME'];

-				$SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];

-				$HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');

-			} elseif (isset($HTTP_SERVER_VARS)) {

-				$SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];

-				$SCRIPT_NAME = isset($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_SERVER_VARS['SCRIPT_NAME'];

-				$HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';

-			} else {

-				$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");

-			}

-        	if ($HTTPS == '1' || $HTTPS == 'on') {

-        		$SCHEME = 'https';

-        	} else {

-        		$SCHEME = 'http';

-        	}

-			$soapaction = "$SCHEME://$SERVER_NAME$SCRIPT_NAME/$name";

-		}

-		if(false == $style) {

-			$style = "rpc";

-		}

-		if(false == $use) {

-			$use = "encoded";

-		}

-		if ($use == 'encoded' && $encodingStyle == '') {

-			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

-		}

+        if($this->externalWSDLURL){

+            die('You cannot bind to an external WSDL file, and register methods outside of it! Please choose either WSDL or no WSDL.');

+        }

+        if (! $name) {

+            die('You must specify a name when you register an operation');

+        }

+        if (!is_array($in)) {

+            die('You must provide an array for operation inputs');

+        }

+        if (!is_array($out)) {

+            die('You must provide an array for operation outputs');

+        }

+        if(false == $namespace) {

+        }

+        if(false == $soapaction) {

+            if (isset($_SERVER)) {

+                $SERVER_NAME = $_SERVER['SERVER_NAME'];

+                $SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];

+                $HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');

+            } elseif (isset($HTTP_SERVER_VARS)) {

+                $SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];

+                $SCRIPT_NAME = isset($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_SERVER_VARS['SCRIPT_NAME'];

+                $HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';

+            } else {

+                $this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");

+            }

+            if ($HTTPS == '1' || $HTTPS == 'on') {

+                $SCHEME = 'https';

+            } else {

+                $SCHEME = 'http';

+            }

+            $soapaction = "$SCHEME://$SERVER_NAME$SCRIPT_NAME/$name";

+        }

+        if(false == $style) {

+            $style = "rpc";

+        }

+        if(false == $use) {

+            $use = "encoded";

+        }

+        if ($use == 'encoded' && $encodingStyle == '') {

+            $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';

+        }

 

-		$this->operations[$name] = array(

-	    'name' => $name,

-	    'in' => $in,

-	    'out' => $out,

-	    'namespace' => $namespace,

-	    'soapaction' => $soapaction,

-	    'style' => $style);

+        $this->operations[$name] = array(

+        'name' => $name,

+        'in' => $in,

+        'out' => $out,

+        'namespace' => $namespace,

+        'soapaction' => $soapaction,

+        'style' => $style);

         if($this->wsdl){

-        	$this->wsdl->addOperation($name,$in,$out,$namespace,$soapaction,$style,$use,$documentation,$encodingStyle);

-	    }

-		return true;

-	}

+            $this->wsdl->addOperation($name,$in,$out,$namespace,$soapaction,$style,$use,$documentation,$encodingStyle);

+        }

+        return true;

+    }

 

-	/**

-	* Specify a fault to be returned to the client.

-	* This also acts as a flag to the server that a fault has occured.

-	*

-	* @param	string $faultcode

-	* @param	string $faultstring

-	* @param	string $faultactor

-	* @param	string $faultdetail

-	* @access   public

-	*/

-	function fault($faultcode,$faultstring,$faultactor='',$faultdetail=''){

-		if ($faultdetail == '' && $this->debug_flag) {

-			$faultdetail = $this->getDebug();

-		}

-		$this->fault = new nusoap_fault($faultcode,$faultactor,$faultstring,$faultdetail);

-		$this->fault->soap_defencoding = $this->soap_defencoding;

-	}

+    /**

+     * Specify a fault to be returned to the client.

+     * This also acts as a flag to the server that a fault has occured.

+     *

+     * @param	string $faultcode

+     * @param	string $faultstring

+     * @param	string $faultactor

+     * @param	string $faultdetail

+     * @access   public

+     */

+    function fault($faultcode,$faultstring,$faultactor='',$faultdetail=''){

+        if ($faultdetail == '' && $this->debug_flag) {

+            $faultdetail = $this->getDebug();

+        }

+        $this->fault = new nusoap_fault($faultcode,$faultactor,$faultstring,$faultdetail);

+        $this->fault->soap_defencoding = $this->soap_defencoding;

+    }

 

     /**

-    * Sets up wsdl object.

-    * Acts as a flag to enable internal WSDL generation

-    *

-    * @param string $serviceName, name of the service

-    * @param mixed $namespace optional 'tns' service namespace or false

-    * @param mixed $endpoint optional URL of service endpoint or false

-    * @param string $style optional (rpc|document) WSDL style (also specified by operation)

-    * @param string $transport optional SOAP transport

-    * @param mixed $schemaTargetNamespace optional 'types' targetNamespace for service schema or false

-    */

+     * Sets up wsdl object.

+     * Acts as a flag to enable internal WSDL generation

+     *

+     * @param string $serviceName, name of the service

+     * @param mixed $namespace optional 'tns' service namespace or false

+     * @param mixed $endpoint optional URL of service endpoint or false

+     * @param string $style optional (rpc|document) WSDL style (also specified by operation)

+     * @param string $transport optional SOAP transport

+     * @param mixed $schemaTargetNamespace optional 'types' targetNamespace for service schema or false

+     */

     function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style='rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false)

     {

-    	global $HTTP_SERVER_VARS;

+        global $HTTP_SERVER_VARS;

 

-		if (isset($_SERVER)) {

-			$SERVER_NAME = $_SERVER['SERVER_NAME'];

-			$SERVER_PORT = $_SERVER['SERVER_PORT'];

-			$SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];

-			$HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');

-		} elseif (isset($HTTP_SERVER_VARS)) {

-			$SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];

-			$SERVER_PORT = $HTTP_SERVER_VARS['SERVER_PORT'];

-			$SCRIPT_NAME = isset($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_SERVER_VARS['SCRIPT_NAME'];

-			$HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';

-		} else {

-			$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");

-		}

-		// If server name has port number attached then strip it (else port number gets duplicated in WSDL output) (occurred using lighttpd and FastCGI)

-		$colon = strpos($SERVER_NAME,":");

-		if ($colon) {

-		    $SERVER_NAME = substr($SERVER_NAME, 0, $colon);

-		}

-		if ($SERVER_PORT == 80) {

-			$SERVER_PORT = '';

-		} else {

-			$SERVER_PORT = ':' . $SERVER_PORT;

-		}

+        if (isset($_SERVER)) {

+            $SERVER_NAME = $_SERVER['SERVER_NAME'];

+            $SERVER_PORT = $_SERVER['SERVER_PORT'];

+            $SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];

+            $HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');

+        } elseif (isset($HTTP_SERVER_VARS)) {

+            $SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];

+            $SERVER_PORT = $HTTP_SERVER_VARS['SERVER_PORT'];

+            $SCRIPT_NAME = isset($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_SERVER_VARS['SCRIPT_NAME'];

+            $HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';

+        } else {

+            $this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");

+        }

+        // If server name has port number attached then strip it (else port number gets duplicated in WSDL output) (occurred using lighttpd and FastCGI)

+        $colon = strpos($SERVER_NAME,":");

+        if ($colon) {

+            $SERVER_NAME = substr($SERVER_NAME, 0, $colon);

+        }

+        if ($SERVER_PORT == 80) {

+            $SERVER_PORT = '';

+        } else {

+            $SERVER_PORT = ':' . $SERVER_PORT;

+        }

         if(false == $namespace) {

             $namespace = "http://$SERVER_NAME/soap/$serviceName";

         }

 

         if(false == $endpoint) {

-        	if ($HTTPS == '1' || $HTTPS == 'on') {

-        		$SCHEME = 'https';

-        	} else {

-        		$SCHEME = 'http';

-        	}

+            if ($HTTPS == '1' || $HTTPS == 'on') {

+                $SCHEME = 'https';

+            } else {

+                $SCHEME = 'http';

+            }

             $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME";

         }

 

@@ -1094,28 +1094,28 @@ 
 

         $this->wsdl = new wsdl();

         $this->wsdl->soap_defencoding = $this->soap_defencoding;

-		$this->wsdl->serviceName = $serviceName;

+        $this->wsdl->serviceName = $serviceName;

         $this->wsdl->endpoint = $endpoint;

-		$this->wsdl->namespaces['tns'] = $namespace;

-		$this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/';

-		$this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/';

-		if ($schemaTargetNamespace != $namespace) {

-			$this->wsdl->namespaces['types'] = $schemaTargetNamespace;

-		}

+        $this->wsdl->namespaces['tns'] = $namespace;

+        $this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/';

+        $this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/';

+        if ($schemaTargetNamespace != $namespace) {

+            $this->wsdl->namespaces['types'] = $schemaTargetNamespace;

+        }

         $this->wsdl->schemas[$schemaTargetNamespace][0] = new nusoap_xmlschema('', '', $this->wsdl->namespaces);

         if ($style == 'document') {

-	        $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaInfo['elementFormDefault'] = 'qualified';

+            $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaInfo['elementFormDefault'] = 'qualified';

         }

         $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaTargetNamespace = $schemaTargetNamespace;

         $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/soap/encoding/'][0] = array('location' => '', 'loaded' => true);

         $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/wsdl/'][0] = array('location' => '', 'loaded' => true);

         $this->wsdl->bindings[$serviceName.'Binding'] = array(

-        	'name'=>$serviceName.'Binding',

+            'name'=>$serviceName.'Binding',

             'style'=>$style,

             'transport'=>$transport,

             'portType'=>$serviceName.'PortType');

         $this->wsdl->ports[$serviceName.'Port'] = array(

-        	'binding'=>$serviceName.'Binding',

+            'binding'=>$serviceName.'Binding',

             'location'=>$endpoint,

             'bindingType'=>'http://schemas.xmlsoap.org/wsdl/soap/');

     }

main/webservices/webservice_session.php

Indentation +361 added lines, -361 removed lines

@@ -14,177 +14,177 @@ 
 class WSSession extends WS
 {
 
-	/**
-	 * Creates a session (helper method)
-	 *
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 * @return mixed Generated id in case of success, WSError otherwise
-	 */
-	protected function createSessionHelper(
-		$name,
-		$start_date,
-		$end_date,
-		$nb_days_access_before,
-		$nb_days_access_after,
-		$nolimit,
-		$visibility,
-		$user_id_field_name,
-		$user_id_value,
-		$session_id_field_name,
-		$session_id_value,
-		$extras
-	) {
-		// Verify that coach exists and get its id
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if ($user_id instanceof WSError) {
-			return $user_id;
-		}
+    /**
+     * Creates a session (helper method)
+     *
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     * @return mixed Generated id in case of success, WSError otherwise
+     */
+    protected function createSessionHelper(
+        $name,
+        $start_date,
+        $end_date,
+        $nb_days_access_before,
+        $nb_days_access_after,
+        $nolimit,
+        $visibility,
+        $user_id_field_name,
+        $user_id_value,
+        $session_id_field_name,
+        $session_id_value,
+        $extras
+    ) {
+        // Verify that coach exists and get its id
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if ($user_id instanceof WSError) {
+            return $user_id;
+        }
 
-		$coachStartDate = null;
-		if (!empty($nb_days_access_before)) {
-			$day = intval($nb_days_access_before);
-			$coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
-		}
+        $coachStartDate = null;
+        if (!empty($nb_days_access_before)) {
+            $day = intval($nb_days_access_before);
+            $coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
+        }
 
-		$coachEndDate = null;
-		if (!empty($nb_days_access_after)) {
-			$day = intval($nb_days_access_after);
-			$coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
-		}
+        $coachEndDate = null;
+        if (!empty($nb_days_access_after)) {
+            $day = intval($nb_days_access_after);
+            $coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
+        }
 
-		// Try to create the session
-		$session_id = SessionManager::create_session(
-			$name,
-			$start_date,
-			$end_date,
-			$start_date,
-			$end_date,
-			$coachStartDate,
-			$coachEndDate,
-			$user_id,
-			0,
-			$visibility
-		);
-		if(!is_int($session_id)) {
-			return new WSError(301, 'Could not create the session');
-		} else {
-			// Add the Original session id to the extra fields
-			$extras_associative = array();
-			if($session_id_field_name != "chamilo_session_id") {
-				$extras_associative[$session_id_field_name] = $session_id_value;
-			}
-			foreach($extras as $extra) {
-				$extras_associative[$extra['field_name']] = $extra['field_value'];
-			}
-			// Create the extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				SessionManager::create_session_extra_field($fname, 1, $fname);
-				SessionManager::update_session_extra_field_value(
-					$session_id,
-					$fname,
-					$fvalue
-				);
-			}
-			return $session_id;
-		}
-	}
+        // Try to create the session
+        $session_id = SessionManager::create_session(
+            $name,
+            $start_date,
+            $end_date,
+            $start_date,
+            $end_date,
+            $coachStartDate,
+            $coachEndDate,
+            $user_id,
+            0,
+            $visibility
+        );
+        if(!is_int($session_id)) {
+            return new WSError(301, 'Could not create the session');
+        } else {
+            // Add the Original session id to the extra fields
+            $extras_associative = array();
+            if($session_id_field_name != "chamilo_session_id") {
+                $extras_associative[$session_id_field_name] = $session_id_value;
+            }
+            foreach($extras as $extra) {
+                $extras_associative[$extra['field_name']] = $extra['field_value'];
+            }
+            // Create the extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                SessionManager::create_session_extra_field($fname, 1, $fname);
+                SessionManager::update_session_extra_field_value(
+                    $session_id,
+                    $fname,
+                    $fvalue
+                );
+            }
+            return $session_id;
+        }
+    }
 
-	/**
-	 * Creates a session
-	 *
-	 * @param string API secret key
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 * @return int Session id generated
-	 */
-	public function CreateSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$session_id = $this->createSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id instanceof WSError) {
-				$this->handleError($session_id);
-			} else {
-				return $session_id;
-			}
-		}
-	}
+    /**
+     * Creates a session
+     *
+     * @param string API secret key
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     * @return int Session id generated
+     */
+    public function CreateSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $session_id = $this->createSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
+            if($session_id instanceof WSError) {
+                $this->handleError($session_id);
+            } else {
+                return $session_id;
+            }
+        }
+    }
 
-	/**
-	 * Deletes a session (helper method)
-	 *
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	protected function deleteSessionHelper($session_id_field_name, $session_id_value) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			SessionManager::delete($session_id, true);
-			return true;
-		}
-	}
+    /**
+     * Deletes a session (helper method)
+     *
+     * @param string Session id field name
+     * @param string Session id value
+     * @return mixed True in case of success, WSError otherwise
+     */
+    protected function deleteSessionHelper($session_id_field_name, $session_id_value) {
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            SessionManager::delete($session_id, true);
+            return true;
+        }
+    }
 
-	/**
-	 * Deletes a session
-	 *
-	 * @param string API secret key
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function DeleteSession($secret_key, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteSessionHelper($session_id_field_name, $session_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a session
+     *
+     * @param string API secret key
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function DeleteSession($secret_key, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteSessionHelper($session_id_field_name, $session_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Edits a session (helper method)
-	 *
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 * @return mixed True on success, WSError otherwise
-	 */
+    /**
+     * Edits a session (helper method)
+     *
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     * @return mixed True on success, WSError otherwise
+     */
     protected function editSessionHelper(
         $name,
         $start_date,
@@ -199,15 +199,15 @@ 
         $session_id_value,
         $extras
     ) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			// Verify that coach exists and get its id
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if ($user_id instanceof WSError) {
-				return $user_id;
-			}
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            // Verify that coach exists and get its id
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if ($user_id instanceof WSError) {
+                return $user_id;
+            }
 
             $coachStartDate = null;
             if (!empty($nb_days_access_before)) {
@@ -234,127 +234,127 @@ 
                 0,
                 (int)$visibility
             );
-			if(!is_int($result_id)) {
-				return new WSError(302, 'Could not edit the session');
-			} else {
-				if(!empty($extras)) {
-					$extras_associative = array();
-					foreach($extras as $extra) {
-						$extras_associative[$extra['field_name']] = $extra['field_value'];
-					}
-					// Create the extra fields
-					foreach($extras_associative as $fname => $fvalue) {
-						SessionManager::create_session_extra_field($fname, 1, $fname);
-						SessionManager::update_session_extra_field_value($session_id, $fname, $fvalue);
-					}
-				}
-				return true;
-			}
-		}
-	}
+            if(!is_int($result_id)) {
+                return new WSError(302, 'Could not edit the session');
+            } else {
+                if(!empty($extras)) {
+                    $extras_associative = array();
+                    foreach($extras as $extra) {
+                        $extras_associative[$extra['field_name']] = $extra['field_value'];
+                    }
+                    // Create the extra fields
+                    foreach($extras_associative as $fname => $fvalue) {
+                        SessionManager::create_session_extra_field($fname, 1, $fname);
+                        SessionManager::update_session_extra_field_value($session_id, $fname, $fvalue);
+                    }
+                }
+                return true;
+            }
+        }
+    }
 
-	/**
-	 * Edits a session
-	 *
-	 * @param string API secret key
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 */
-	public function EditSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->editSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id_value instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Edits a session
+     *
+     * @param string API secret key
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     */
+    public function EditSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->editSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
+            if($session_id_value instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Change user subscription (helper method)
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @param int State (1 to subscribe, 0 to unsubscribe)
-	 * @return mixed True on success, WSError otherwise
-	 */
-	protected function changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $state) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				if($state  == 1) {
-					SessionManager::subscribe_users_to_session($session_id, array($user_id));
-				} else {
-					$result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
-					if (!$result) {
-						return new WSError(303, 'There was an error unsubscribing this user from the session');
-					}
-				}
-				return true;
-			}
-		}
-	}
+    /**
+     * Change user subscription (helper method)
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @param string Session id field name
+     * @param string Session id value
+     * @param int State (1 to subscribe, 0 to unsubscribe)
+     * @return mixed True on success, WSError otherwise
+     */
+    protected function changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $state) {
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                if($state  == 1) {
+                    SessionManager::subscribe_users_to_session($session_id, array($user_id));
+                } else {
+                    $result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
+                    if (!$result) {
+                        return new WSError(303, 'There was an error unsubscribing this user from the session');
+                    }
+                }
+                return true;
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a session
-	 *
-	 * @param string API secret key
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function SubscribeUserToSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a session
+     *
+     * @param string API secret key
+     * @param string User id field name
+     * @param string User id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function SubscribeUserToSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 1);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a session
-	 *
-	 * @param string API secret key
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function UnsubscribeUserFromSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a session
+     *
+     * @param string API secret key
+     * @param string User id field name
+     * @param string User id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function UnsubscribeUserFromSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
     
     /**
      * Change Teacher subscription (helper method)
@@ -446,79 +446,79 @@ 
     }
 
     /**
-	 * Change course subscription
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @param int State (1 to subscribe, 0 to unsubscribe)
-	 * @return mixed True on success, WSError otherwise
-	 */
-	protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				if($state  == 1) {
-					SessionManager::add_courses_to_session($session_id, array($course_id));
-					return true;
-				} else {
-					$result = SessionManager::unsubscribe_course_from_session($session_id, $course_id);
-					if ($result) {
-						return true;
-					} else {
-						return new WSError(304, 'Error unsubscribing course from session');
-					}
-				}
-			}
-		}
+     * Change course subscription
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Session id field name
+     * @param string Session id value
+     * @param int State (1 to subscribe, 0 to unsubscribe)
+     * @return mixed True on success, WSError otherwise
+     */
+    protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                if($state  == 1) {
+                    SessionManager::add_courses_to_session($session_id, array($course_id));
+                    return true;
+                } else {
+                    $result = SessionManager::unsubscribe_course_from_session($session_id, $course_id);
+                    if ($result) {
+                        return true;
+                    } else {
+                        return new WSError(304, 'Error unsubscribing course from session');
+                    }
+                }
+            }
+        }
     }
 
-	/**
-	 * Subscribe course to session
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function SubscribeCourseToSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe course to session
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function SubscribeCourseToSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 1);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Unsubscribe course from session
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function UnsubscribeCourseFromSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Unsubscribe course from session
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function UnsubscribeCourseFromSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
 }

main/messages/download.php

Indentation +15 added lines, -15 removed lines

@@ -50,11 +50,11 @@ 
 $message_uid = '';
 $message_type = array('inbox','outbox');
 if (in_array($_GET['type'],$message_type)) {
-	if ($_GET['type'] == 'inbox') {
-		$message_uid = $row_users['user_receiver_id'];
-	} else {
-		$message_uid = $row_users['user_sender_id'];
-	}
+    if ($_GET['type'] == 'inbox') {
+        $message_uid = $row_users['user_receiver_id'];
+    } else {
+        $message_uid = $row_users['user_sender_id'];
+    }
 }
 
 // allow to the correct user for download this file
@@ -62,19 +62,19 @@ 
 $userGroup = new UserGroup();
 
 if (!empty($row_users['group_id'])) {
-	$users_group = $userGroup->get_all_users_by_group($row_users['group_id']);
-	if (!in_array($current_uid,array_keys($users_group))) {
-		$not_allowed_to_edit = true;
-	}
+    $users_group = $userGroup->get_all_users_by_group($row_users['group_id']);
+    if (!in_array($current_uid,array_keys($users_group))) {
+        $not_allowed_to_edit = true;
+    }
 } else {
-	if ($current_uid != $message_uid) {
-		$not_allowed_to_edit = true;
-	}
+    if ($current_uid != $message_uid) {
+        $not_allowed_to_edit = true;
+    }
 }
 
 if ($not_allowed_to_edit) {
-	api_not_allowed(true);
-	exit;
+    api_not_allowed(true);
+    exit;
 }
 
 // set the path directory file
@@ -85,7 +85,7 @@ 
         true
     );
 } else {
-	$path_user_info['dir'] = UserManager::getUserPathById($message_uid, 'system');
+    $path_user_info['dir'] = UserManager::getUserPathById($message_uid, 'system');
 }
 
 $full_file_name = $path_user_info['dir'].'message_attachments/'.$file_url;