chamilo / chamilo-lms

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

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 
 	/**
 	 * Get the progress of this learnpath. Only the last attempt are taken into account.
-	 * @param $stud_id student id (default: all students who have results - then the average is returned)
+	 * @param integer $stud_id student id (default: all students who have results - then the average is returned)
 	 * @return	array (score, max) if student is given
 	 * 			array (sum of scores, number of scores) otherwise
 	 * 			or null if no scores available

Braces +12 added lines, -8 removed lines

@@ -29,8 +29,9 @@ 
 	public function get_not_created_links()
 	{
 		return false;
-		if (empty($this->course_code))
-			die('Error in get_not_created_links() : course code not set');
+		if (empty($this->course_code)) {
+					die('Error in get_not_created_links() : course code not set');
+		}
 
 		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
 
@@ -57,8 +58,9 @@ 
 	 */
 	public function get_all_links()
 	{
-		if (empty($this->course_code))
-			die('Error in get_not_created_links() : course code not set');
+		if (empty($this->course_code)) {
+					die('Error in get_not_created_links() : course code not set');
+		}
 
 		$session_id = api_get_session_id();
 		if (empty($session_id)) {
@@ -111,8 +113,9 @@ 
                     lp_id = ".$this->get_ref_id()." AND
                     session_id = $session_id ";
 
-		if (isset($stud_id))
-			$sql .= ' AND user_id = '.intval($stud_id);
+		if (isset($stud_id)) {
+					$sql .= ' AND user_id = '.intval($stud_id);
+		}
 
 		// order by id, that way the student's first attempt is accessed first
 		$sql .= ' ORDER BY view_count DESC';
@@ -122,8 +125,9 @@ 
 		if (isset($stud_id)) {
 			if ($data = Database::fetch_array($scores)) {
 				return array ($data['progress'], 100);
-			} else
-				return null;
+			} else {
+							return null;
+			}
 		} else {
 			// all students -> get average
 			$students = array();  // user list, needed to make sure we only

Indentation +243 added lines, -243 removed lines

@@ -9,261 +9,261 @@
  */
 class LearnpathLink extends AbstractLink
 {
-	private $course_info = null;
-	private $learnpath_table = null;
-	private $learnpath_data = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_LEARNPATH);
-	}
-
-	/**
-	 * Generate an array of learnpaths that a teacher hasn't created a link for.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_not_created_links()
-	{
-		return false;
-		if (empty($this->course_code))
-			die('Error in get_not_created_links() : course code not set');
-
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
-
-		$sql = 'SELECT id, name from '.$this->get_learnpath_table().' lp
+    private $course_info = null;
+    private $learnpath_table = null;
+    private $learnpath_data = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_LEARNPATH);
+    }
+
+    /**
+     * Generate an array of learnpaths that a teacher hasn't created a link for.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_not_created_links()
+    {
+        return false;
+        if (empty($this->course_code))
+            die('Error in get_not_created_links() : course code not set');
+
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
+
+        $sql = 'SELECT id, name from '.$this->get_learnpath_table().' lp
 				WHERE c_id = '.$this->course_id.' AND id NOT IN '
-			.' (SELECT ref_id FROM '.$tbl_grade_links
-			.' WHERE type = '.LINK_LEARNPATH
-			." AND course_code = '".$this->get_course_code()."'"
-			.') AND lp.session_id='.api_get_session_id().'';
-
-		$result = Database::query($sql);
-
-		$cats=array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['name']);
-		}
-
-		return $cats;
-	}
-
-	/**
-	 * Generate an array of all learnpaths available.
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
-	 */
-	public function get_all_links()
-	{
-		if (empty($this->course_code))
-			die('Error in get_not_created_links() : course code not set');
-
-		$session_id = api_get_session_id();
-		if (empty($session_id)) {
-			$session_condition = api_get_session_condition(0, true);
-		} else {
-			$session_condition = api_get_session_condition($session_id, true, true);
-		}
-
-		$sql = 'SELECT id, name FROM '.$this->get_learnpath_table().'
+            .' (SELECT ref_id FROM '.$tbl_grade_links
+            .' WHERE type = '.LINK_LEARNPATH
+            ." AND course_code = '".$this->get_course_code()."'"
+            .') AND lp.session_id='.api_get_session_id().'';
+
+        $result = Database::query($sql);
+
+        $cats=array();
+        while ($data=Database::fetch_array($result)) {
+            $cats[] = array ($data['id'], $data['name']);
+        }
+
+        return $cats;
+    }
+
+    /**
+     * Generate an array of all learnpaths available.
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
+     */
+    public function get_all_links()
+    {
+        if (empty($this->course_code))
+            die('Error in get_not_created_links() : course code not set');
+
+        $session_id = api_get_session_id();
+        if (empty($session_id)) {
+            $session_condition = api_get_session_condition(0, true);
+        } else {
+            $session_condition = api_get_session_condition($session_id, true, true);
+        }
+
+        $sql = 'SELECT id, name FROM '.$this->get_learnpath_table().'
                 WHERE c_id = '.$this->course_id.' '.$session_condition.' ';
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		$cats = array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['name']);
-		}
+        $cats = array();
+        while ($data=Database::fetch_array($result)) {
+            $cats[] = array ($data['id'], $data['name']);
+        }
 
-		return $cats;
-	}
+        return $cats;
+    }
 
 
-	/**
-	 * Has anyone used this learnpath yet ?
-	 */
-	public function has_results()
-	{
-		$tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
-		$sql = "SELECT count(id) AS number FROM $tbl_stats
+    /**
+     * Has anyone used this learnpath yet ?
+     */
+    public function has_results()
+    {
+        $tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
+        $sql = "SELECT count(id) AS number FROM $tbl_stats
 				WHERE c_id = ".$this->course_id." AND lp_id = ".$this->get_ref_id();
-		$result = Database::query($sql);
-		$number = Database::fetch_array($result,'NUM');
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * Get the progress of this learnpath. Only the last attempt are taken into account.
-	 * @param $stud_id student id (default: all students who have results - then the average is returned)
-	 * @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)
-	{
-		$tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
-		$session_id = api_get_session_id();
-
-		$sql = "SELECT * FROM $tbl_stats
+        $result = Database::query($sql);
+        $number = Database::fetch_array($result,'NUM');
+        return ($number[0] != 0);
+    }
+
+    /**
+     * Get the progress of this learnpath. Only the last attempt are taken into account.
+     * @param $stud_id student id (default: all students who have results - then the average is returned)
+     * @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)
+    {
+        $tbl_stats = Database::get_course_table(TABLE_LP_VIEW);
+        $session_id = api_get_session_id();
+
+        $sql = "SELECT * FROM $tbl_stats
                 WHERE
                 	c_id = ".$this->course_id." AND
                     lp_id = ".$this->get_ref_id()." AND
                     session_id = $session_id ";
 
-		if (isset($stud_id))
-			$sql .= ' AND user_id = '.intval($stud_id);
-
-		// order by id, that way the student's first attempt is accessed first
-		$sql .= ' ORDER BY view_count DESC';
-
-		$scores = Database::query($sql);
-		// for 1 student
-		if (isset($stud_id)) {
-			if ($data = Database::fetch_assoc($scores)) {
-				return array ($data['progress'], 100);
-			} else
-				return null;
-		} else {
-			// all students -> get average
-			$students = array();  // user list, needed to make sure we only
-			// take first attempts into account
-			$rescount = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$sumResult = 0;
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					$students[$data['user_id']] = $data['progress'];
-					$rescount++;
-					$sum += $data['progress'] / 100;
-					$sumResult += $data['progress'];
-
-					if ($data['progress'] > $bestResult) {
-						$bestResult = $data['progress'];
-					}
-				}
-			}
-
-			if ($rescount == 0) {
-				return null;
-			} else {
-
-				switch ($type) {
-					case 'best':
-						return array($bestResult, 100);
-						break;
-					case 'average':
-						return array($sumResult/$rescount, 100);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $rescount);
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get URL where to go to if the user clicks on the link.
-	 */
-	public function get_link()
-	{
-		$session_id = api_get_session_id();
-		$url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
-
-		if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
-			$url .= '&action=view&lp_id='.$this->get_ref_id();
-		} else {
-			$url .= '&action=build&lp_id='.$this->get_ref_id();
-		}
-		return $url;
-	}
-
-	/**
-	 * Get name to display: same as learnpath title
-	 */
-	public function get_name()
-	{
-		$data = $this->get_learnpath_data();
-		return $data['name'];
-	}
-
-	/**
-	 * Get description to display: same as learnpath description
-	 */
-	public function get_description()
-	{
-		$data = $this->get_learnpath_data();
-		return $data['description'];
-	}
-
-	/**
-	 * Check if this still links to a learnpath
-	 */
-	public function is_valid_link() {
-		$sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
+        if (isset($stud_id))
+            $sql .= ' AND user_id = '.intval($stud_id);
+
+        // order by id, that way the student's first attempt is accessed first
+        $sql .= ' ORDER BY view_count DESC';
+
+        $scores = Database::query($sql);
+        // for 1 student
+        if (isset($stud_id)) {
+            if ($data = Database::fetch_assoc($scores)) {
+                return array ($data['progress'], 100);
+            } else
+                return null;
+        } else {
+            // all students -> get average
+            $students = array();  // user list, needed to make sure we only
+            // take first attempts into account
+            $rescount = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $sumResult = 0;
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    $students[$data['user_id']] = $data['progress'];
+                    $rescount++;
+                    $sum += $data['progress'] / 100;
+                    $sumResult += $data['progress'];
+
+                    if ($data['progress'] > $bestResult) {
+                        $bestResult = $data['progress'];
+                    }
+                }
+            }
+
+            if ($rescount == 0) {
+                return null;
+            } else {
+
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, 100);
+                        break;
+                    case 'average':
+                        return array($sumResult/$rescount, 100);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $rescount);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Get URL where to go to if the user clicks on the link.
+     */
+    public function get_link()
+    {
+        $session_id = api_get_session_id();
+        $url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
+
+        if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
+            $url .= '&action=view&lp_id='.$this->get_ref_id();
+        } else {
+            $url .= '&action=build&lp_id='.$this->get_ref_id();
+        }
+        return $url;
+    }
+
+    /**
+     * Get name to display: same as learnpath title
+     */
+    public function get_name()
+    {
+        $data = $this->get_learnpath_data();
+        return $data['name'];
+    }
+
+    /**
+     * Get description to display: same as learnpath description
+     */
+    public function get_description()
+    {
+        $data = $this->get_learnpath_data();
+        return $data['description'];
+    }
+
+    /**
+     * Check if this still links to a learnpath
+     */
+    public function is_valid_link() {
+        $sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
                 WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result,'NUM');
-		return ($number[0] != 0);
-	}
-
-	public function get_type_name()
-	{
-		return get_lang('LearningPaths');
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
-
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	// INTERNAL FUNCTIONS
-
-	/**
-	 * Lazy load function to get the database table of the learnpath
-	 */
-	private function get_learnpath_table()
-	{
-		$this->learnpath_table = Database :: get_course_table(TABLE_LP_MAIN);
-		return $this->learnpath_table;
-	}
-
-	/**
-	 * Lazy load function to get the database contents of this learnpath
-	 */
-	private function get_learnpath_data()
-	{
-		if (!isset($this->learnpath_data)) {
-			$sql = 'SELECT * FROM '.$this->get_learnpath_table().'
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result,'NUM');
+        return ($number[0] != 0);
+    }
+
+    public function get_type_name()
+    {
+        return get_lang('LearningPaths');
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
+
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    // INTERNAL FUNCTIONS
+
+    /**
+     * Lazy load function to get the database table of the learnpath
+     */
+    private function get_learnpath_table()
+    {
+        $this->learnpath_table = Database :: get_course_table(TABLE_LP_MAIN);
+        return $this->learnpath_table;
+    }
+
+    /**
+     * Lazy load function to get the database contents of this learnpath
+     */
+    private function get_learnpath_data()
+    {
+        if (!isset($this->learnpath_data)) {
+            $sql = 'SELECT * FROM '.$this->get_learnpath_table().'
                     WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
-			$result = Database::query($sql);
-			$this->learnpath_data = Database::fetch_array($result);
-		}
-		return $this->learnpath_data;
-	}
-
-	public function get_icon_name()
-	{
-		return 'learnpath';
-	}
+            $result = Database::query($sql);
+            $this->learnpath_data = Database::fetch_array($result);
+        }
+        return $this->learnpath_data;
+    }
+
+    public function get_icon_name()
+    {
+        return 'learnpath';
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -43,9 +43,9 @@ 
 
 		$result = Database::query($sql);
 
-		$cats=array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['name']);
+		$cats = array();
+		while ($data = Database::fetch_array($result)) {
+			$cats[] = array($data['id'], $data['name']);
 		}
 
 		return $cats;
@@ -72,8 +72,8 @@ 
 		$result = Database::query($sql);
 
 		$cats = array();
-		while ($data=Database::fetch_array($result)) {
-			$cats[] = array ($data['id'], $data['name']);
+		while ($data = Database::fetch_array($result)) {
+			$cats[] = array($data['id'], $data['name']);
 		}
 
 		return $cats;
@@ -89,7 +89,7 @@ 
 		$sql = "SELECT count(id) AS number FROM $tbl_stats
 				WHERE c_id = ".$this->course_id." AND lp_id = ".$this->get_ref_id();
 		$result = Database::query($sql);
-		$number = Database::fetch_array($result,'NUM');
+		$number = Database::fetch_array($result, 'NUM');
 		return ($number[0] != 0);
 	}
 
@@ -121,12 +121,12 @@ 
 		// for 1 student
 		if (isset($stud_id)) {
 			if ($data = Database::fetch_assoc($scores)) {
-				return array ($data['progress'], 100);
+				return array($data['progress'], 100);
 			} else
 				return null;
 		} else {
 			// all students -> get average
-			$students = array();  // user list, needed to make sure we only
+			$students = array(); // user list, needed to make sure we only
 			// take first attempts into account
 			$rescount = 0;
 			$sum = 0;
@@ -154,7 +154,7 @@ 
 						return array($bestResult, 100);
 						break;
 					case 'average':
-						return array($sumResult/$rescount, 100);
+						return array($sumResult / $rescount, 100);
 						break;
 					case 'ranking':
 						return AbstractLink::getCurrentUserRanking($stud_id, $students);
@@ -173,7 +173,7 @@ 
 	public function get_link()
 	{
 		$session_id = api_get_session_id();
-		$url = api_get_path(WEB_CODE_PATH) . 'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
+		$url = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq_params($this->get_course_code(), $session_id).'&gradebook=view';
 
 		if (!api_is_allowed_to_edit() || $this->calc_score(api_get_user_id()) == null) {
 			$url .= '&action=view&lp_id='.$this->get_ref_id();
@@ -208,7 +208,7 @@ 
 		$sql = 'SELECT count(id) FROM '.$this->get_learnpath_table().'
                 WHERE c_id = '.$this->course_id.' AND id = '.$this->get_ref_id().' ';
 		$result = Database::query($sql);
-		$number = Database::fetch_row($result,'NUM');
+		$number = Database::fetch_row($result, 'NUM');
 		return ($number[0] != 0);
 	}
 

main/gradebook/lib/fe/gradebooktable.class.php

Doc Comments +3 added lines, -1 removed lines

@@ -32,6 +32,8 @@ 
      * @param array $evals
      * @param array $links
      * @param null $addparams
+     * @param boolean $showTeacherView
+     * @param integer $userId
      */
     public function __construct(
         $currentcat,
@@ -895,7 +897,7 @@ 
 
     /**
      * @param $item
-     * @return mixed
+     * @return string|null
      */
     private function build_course_code($item)
     {

Braces +3 added lines, -2 removed lines

@@ -256,10 +256,11 @@
         }
 
         // Categories.
-        if (!empty($data_array))
-        foreach ($data_array as $data) {
+        if (!empty($data_array)) {
+                foreach ($data_array as $data) {
             // list of items inside the gradebook (exercises, lps, forums, etc)
             $row  = array();
+        }
             /** @var AbstractLink $item */
             $item = $mainCategory = $data[0];
 

Spacing +37 added lines, -37 removed lines

@@ -71,7 +71,7 @@ 
             $this->set_additional_parameters($addparams);
         }
 
-        $column= 0;
+        $column = 0;
         if ($this->teacherView) {
             if ($this->exportToPdf == false) {
                 $this->set_header($column++, '', '', 'width="25px"');
@@ -281,13 +281,13 @@ 
                 $main_categories[$item->get_id()]['name'] = $item->get_name();
             } else {
                 $name = $this->build_name_link($item, $type);
-                $row[] = $invisibility_span_open.$name. $invisibility_span_close;
+                $row[] = $invisibility_span_open.$name.$invisibility_span_close;
                 $main_categories[$item->get_id()]['name'] = $name;
             }
 
             $this->dataForGraph['categories'][] = $item->get_name();
 
-            $main_categories[$item->get_id()]['weight']= $item->get_weight();
+            $main_categories[$item->get_id()]['weight'] = $item->get_weight();
             $total_categories_weight += $item->get_weight();
 
             // Description.
@@ -307,9 +307,9 @@ 
             );
 
             if ($this->teacherView) {
-                $row[] = $invisibility_span_open .Display::tag('p', $weight, array('class' => 'score')).$invisibility_span_close;
+                $row[] = $invisibility_span_open.Display::tag('p', $weight, array('class' => 'score')).$invisibility_span_close;
             } else {
-                $row[] = $invisibility_span_open .$weight.$invisibility_span_close;
+                $row[] = $invisibility_span_open.$weight.$invisibility_span_close;
             }
 
             $category_weight = $item->get_weight();
@@ -335,7 +335,7 @@ 
 
                 if (!empty($score[1])) {
                     $completeScore = $scoredisplay->display_score($score, SCORE_DIV_PERCENT);
-                    $score = $score[0]/$score[1]*$item->get_weight();
+                    $score = $score[0] / $score[1] * $item->get_weight();
                     $score = $scoredisplay->display_score(array($score, null), SCORE_SIMPLE);
                     $scoreToDisplay = Display::tip($score, $completeScore);
                 } else {
@@ -371,7 +371,7 @@ 
                     $totalResultAverageValue = strip_tags($scoredisplay->display_score($totalResult, SCORE_AVERAGE));
                     $this->dataForGraph['my_result'][] = str_replace('%', '', $totalResultAverageValue);
                     $totalAverageValue = strip_tags($scoredisplay->display_score($totalAverage, SCORE_AVERAGE));
-                    $this->dataForGraph['average'][] =  str_replace('%', '', $totalAverageValue);
+                    $this->dataForGraph['average'][] = str_replace('%', '', $totalAverageValue);
                     // Ranking
                     $row[] = $ranking;
                     // Best
@@ -453,7 +453,7 @@ 
                         $row[] = $this->build_type_column($item, array('style' => 'padding-left:5px'));
 
                         // Name.
-                        $row[] = $invisibility_span_open."     ".$this->build_name_link($item, $type) . $invisibility_span_close;
+                        $row[] = $invisibility_span_open."     ".$this->build_name_link($item, $type).$invisibility_span_close;
 
                         // Description.
                         if ($this->exportToPdf == false) {
@@ -491,7 +491,7 @@ 
                             // Students get the results and certificates columns
                             $eval_n_links = array_merge($alleval, $alllink);
 
-                            if (count($eval_n_links)> 0) {
+                            if (count($eval_n_links) > 0) {
                                 $value_data = isset($data[4]) ? $data[4] : null;
 
                                 if (!is_null($value_data)) {
@@ -589,7 +589,7 @@ 
                 $row = array(
                     null,
                     null,
-                    '<strong>' . get_lang('Total') . '</strong>',
+                    '<strong>'.get_lang('Total').'</strong>',
                     null,
                     $total
                 );
@@ -659,7 +659,7 @@ 
                 if ($this->exportToPdf) {
                     $row = array(
                         null,
-                        '<h3>' . get_lang('Total') . '</h3>',
+                        '<h3>'.get_lang('Total').'</h3>',
                         $main_weight,
                         $totalResult,
                         $totalRanking,
@@ -669,7 +669,7 @@ 
                 } else {
                     $row = array(
                         null,
-                        '<h3>' . get_lang('Total') . '</h3>',
+                        '<h3>'.get_lang('Total').'</h3>',
                         null,
                         $main_weight,
                         $totalResult,
@@ -684,7 +684,7 @@ 
         }
 
         // Warning messages
-        $view = isset($_GET['view']) ? $_GET['view']: null;
+        $view = isset($_GET['view']) ? $_GET['view'] : null;
 
         if ($this->teacherView) {
             if (isset($_GET['selectcat']) &&
@@ -695,14 +695,14 @@ 
                 $category = Category::load($id_cat);
                 $weight_category = intval($this->build_weight($category[0]));
                 $course_code = $this->build_course_code($category[0]);
-                $weight_total_links  = round($weight_total_links);
+                $weight_total_links = round($weight_total_links);
 
                 if ($weight_total_links > $weight_category ||
                     $weight_total_links < $weight_category ||
                     $weight_total_links > $weight_category
                 ) {
                     $warning_message = sprintf(get_lang('TotalWeightMustBeX'), $weight_category);
-                    $modify_icons  = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
+                    $modify_icons = '<a href="gradebook_edit_cat.php?editcat='.$id_cat.'&cidReq='.$course_code.'&id_session='.api_get_session_id().'">'.
                         Display::return_icon('edit.png', $warning_message, array(), ICON_SIZE_SMALL).'</a>';
                     $warning_message .= $modify_icons;
                     Display::display_warning_message($warning_message, false);
@@ -757,7 +757,7 @@ 
                         if (empty($certificate_min_score) ||
                             ($certificate_min_score > $weight_category)
                         ) {
-                            $warning_message .= $course_code .'&nbsp;-&nbsp;'.get_lang('CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan').'&nbsp;'.$weight_category.'<br />';
+                            $warning_message .= $course_code.'&nbsp;-&nbsp;'.get_lang('CertificateMinimunScoreIsRequiredAndMustNotBeMoreThan').'&nbsp;'.$weight_category.'<br />';
                         }
                     }
 
@@ -806,12 +806,12 @@ 
             $pChart->Antialias = false;
 
             /* Add a border to the picture */
-            $pChart->drawRectangle(0,0,$xSize-10,$ySize-10,array("R"=>0,"G"=>0,"B"=>0));
-            $pChart->drawText(10,16,get_lang('Results'),array("FontSize"=>11,"Align"=> TEXT_ALIGN_BOTTOMMIDDLE));
-            $pChart->setGraphArea(50, 30, $xSize-50, $ySize-50);
+            $pChart->drawRectangle(0, 0, $xSize - 10, $ySize - 10, array("R"=>0, "G"=>0, "B"=>0));
+            $pChart->drawText(10, 16, get_lang('Results'), array("FontSize"=>11, "Align"=> TEXT_ALIGN_BOTTOMMIDDLE));
+            $pChart->setGraphArea(50, 30, $xSize - 50, $ySize - 50);
             $pChart->setFontProperties(
                 array(
-                    'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     'FontSize' => 10,
                 )
             );
@@ -859,13 +859,13 @@ 
             $chartHash = $myCache->getHash($dataSet);
 
             $myCache->writeToCache($chartHash, $pChart);
-            $imgSysPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgSysPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgSysPath);
-            $imgWebPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgWebPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
 
             if (file_exists($imgSysPath)) {
                 $result = '<div id="contentArea" style="text-align: center;" >';
-                $result .= '<img src="' . $imgWebPath.'" >';
+                $result .= '<img src="'.$imgWebPath.'" >';
                 $result .= '</div>';
                 return $result;
             }
@@ -910,13 +910,13 @@ 
         switch ($item->get_item_type()) {
             // category
             case 'C':
-                return 'CATE' . $item->get_id();
+                return 'CATE'.$item->get_id();
             // evaluation
             case 'E':
-                return 'EVAL' . $item->get_id();
+                return 'EVAL'.$item->get_id();
             // link
             case 'L':
-                return 'LINK' . $item->get_id();
+                return 'LINK'.$item->get_id();
         }
     }
 
@@ -944,11 +944,11 @@ 
         switch ($item->get_item_type()) {
             // category
             case 'C':
-                $prms_uri='?selectcat=' . $item->get_id() . '&amp;view='.$view;
+                $prms_uri = '?selectcat='.$item->get_id().'&amp;view='.$view;
 
                 if (isset($_GET['isStudentView'])) {
-                    if ( isset($is_student) || (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) {
-                        $prms_uri=$prms_uri.'&amp;isStudentView='.Security::remove_XSS($_GET['isStudentView']);
+                    if (isset($is_student) || (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'studentview')) {
+                        $prms_uri = $prms_uri.'&amp;isStudentView='.Security::remove_XSS($_GET['isStudentView']);
                     }
                 }
 
@@ -957,7 +957,7 @@ 
                 return '&nbsp;<a href="'.Security::remove_XSS($_SESSION['gradebook_dest']).$prms_uri.'">'
                 . $item->get_name()
                 . '</a>'
-                . ($item->is_course() ? ' &nbsp;[' . $item->get_course_code() . ']'.$show_message : '');
+                . ($item->is_course() ? ' &nbsp;['.$item->get_course_code().']'.$show_message : '');
                 // evaluation
             case 'E':
                 $cat = new Category();
@@ -965,10 +965,10 @@ 
                 $show_message = $cat->show_message_resource_delete($course_id);
 
                 // course/platform admin can go to the view_results page
-                if (api_is_allowed_to_edit() && $show_message===false) {
+                if (api_is_allowed_to_edit() && $show_message === false) {
                     if ($item->get_type() == 'presence') {
                         return '&nbsp;'
-                        . '<a href="gradebook_view_result.php?'.api_get_cidreq().'&selecteval=' . $item->get_id() . '">'
+                        . '<a href="gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
                         . $item->get_name()
                         . '</a>';
                     } else {
@@ -977,20 +977,20 @@ 
                             $extra = '';
                         }
                         return '&nbsp;'
-                        . '<a href="gradebook_view_result.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">'
+                        . '<a href="gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
                         . $item->get_name()
                         . '</a>&nbsp;'.$extra;
                     }
-                } elseif (ScoreDisplay :: instance()->is_custom() && $show_message===false) {
+                } elseif (ScoreDisplay :: instance()->is_custom() && $show_message === false) {
                     // students can go to the statistics page (if custom display enabled)
                     return '&nbsp;'
-                    . '<a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">'
+                    . '<a href="gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
                     . $item->get_name()
                     . '</a>';
 
                 } elseif ($show_message === false && !api_is_allowed_to_edit() && !ScoreDisplay :: instance()->is_custom()) {
                     return '&nbsp;'
-                    . '<a href="gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $item->get_id() . '">'
+                    . '<a href="gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$item->get_id().'">'
                     . $item->get_name()
                     . '</a>';
                 } else {
@@ -1005,7 +1005,7 @@ 
                 $url = $item->get_link();
 
                 if (isset($url) && $show_message === false) {
-                    $text = '&nbsp;<a href="' . $item->get_link() . '">'
+                    $text = '&nbsp;<a href="'.$item->get_link().'">'
                         . $item->get_name()
                         . '</a>';
                 } else {

main/inc/lib/diagnoser.lib.php

Doc Comments +6 added lines

@@ -351,6 +351,12 @@
 
     /**
      * Additional functions needed for fast integration
+     * @param integer $status
+     * @param string $section
+     * @param string $title
+     * @param string $url
+     * @param string|null $formatter
+     * @param string $comment
      */
     public function build_setting($status, $section, $title, $url, $current_value, $expected_value, $formatter, $comment, $img_path = null) {
         switch ($status) {

Indentation +13 added lines, -13 removed lines

@@ -401,19 +401,19 @@
 
     public function format_yes_no_optional($value)
     {
-    	$return = '';
-    	switch($value) {
-     		case 0:
-     			$return = get_lang('No');
-     			break;
-     		case 1:
-     			$return = get_lang('Yes');
-     			break;
-			case 2:
-				$return = get_lang('Optional');
-				break;
-    	}
-    	return $return;
+        $return = '';
+        switch($value) {
+                case 0:
+                 $return = get_lang('No');
+                    break;
+                case 1:
+                 $return = get_lang('Yes');
+                    break;
+            case 2:
+                $return = get_lang('Optional');
+                break;
+        }
+        return $return;
 
     }
 

Braces +13 added lines, -9 removed lines

@@ -158,8 +158,9 @@ 
         $array[] = $this->build_setting($status, '[INI]', 'display_errors', 'http://www.php.net/manual/en/ini.core.php#ini.display_errors', $setting, $req_setting, 'on_off', get_lang('DisplayErrorsInfo'));
 
         $setting = ini_get('default_charset');
-        if ($setting == '')
-            $setting = null;
+        if ($setting == '') {
+                    $setting = null;
+        }
         $req_setting = null;
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR;
         $array[] = $this->build_setting($status, '[INI]', 'default_charset', 'http://www.php.net/manual/en/ini.core.php#ini.default-charset', $setting, $req_setting, null, get_lang('DefaultCharsetInfo'));
@@ -177,22 +178,25 @@ 
         $setting = ini_get('memory_limit');
         $req_setting = '>= '.REQUIRED_MIN_MEMORY_LIMIT.'M';
         $status = self :: STATUS_ERROR;
-        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT)
-            $status = self :: STATUS_OK;
+        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT) {
+                    $status = self :: STATUS_OK;
+        }
         $array[] = $this->build_setting($status, '[INI]', 'memory_limit', 'http://www.php.net/manual/en/ini.core.php#ini.memory-limit', $setting, $req_setting, null, get_lang('MemoryLimitInfo'));
 
         $setting = ini_get('post_max_size');
         $req_setting = '>= '.REQUIRED_MIN_POST_MAX_SIZE.'M';
         $status = self :: STATUS_ERROR;
-        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE)
-            $status = self :: STATUS_OK;
+        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE) {
+                    $status = self :: STATUS_OK;
+        }
         $array[] = $this->build_setting($status, '[INI]', 'post_max_size', 'http://www.php.net/manual/en/ini.core.php#ini.post-max-size', $setting, $req_setting, null, get_lang('PostMaxSizeInfo'));
 
         $setting = ini_get('upload_max_filesize');
         $req_setting = '>= '.REQUIRED_MIN_UPLOAD_MAX_FILESIZE.'M';
         $status = self :: STATUS_ERROR;
-        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE)
-            $status = self :: STATUS_OK;
+        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE) {
+                    $status = self :: STATUS_OK;
+        }
         $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo'));
 
         $setting = ini_get('variables_order');
@@ -205,7 +209,7 @@ 
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
         $array[] = $this->build_setting($status, '[SESSION]', 'session.gc_maxlifetime', 'http://www.php.net/manual/en/ini.core.php#session.gc-maxlifetime', $setting, $req_setting, null, get_lang('SessionGCMaxLifetimeInfo'));
 
-        if (api_check_browscap()){$setting = true;}else{$setting=false;}
+        if (api_check_browscap()){$setting = true;} else{$setting=false;}
         $req_setting = true;
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
         $array[] = $this->build_setting($status, '[INI]', 'browscap', 'http://www.php.net/manual/en/misc.configuration.php#ini.browscap', $setting, $req_setting, 'on_off', get_lang('BrowscapInfo'));

Spacing +21 added lines, -21 removed lines

@@ -15,7 +15,7 @@ 
 {
     const STATUS_OK = 1;
     const STATUS_WARNING = 2;
-    const STATUS_ERROR 	= 3;
+    const STATUS_ERROR = 3;
     const STATUS_INFORMATION = 4;
 
     /**
@@ -45,12 +45,12 @@ 
                 $html .= '<li>';
             }
             $params['section'] = $section;
-            $html .='<a href="system_status.php?section='.$section.'">'.get_lang($section).'</a></li>';
+            $html .= '<a href="system_status.php?section='.$section.'">'.get_lang($section).'</a></li>';
         }
 
         $html .= '</ul><div class="tab-pane">';
 
-        $data = call_user_func(array($this, 'get_' . $currentSection . '_data'));
+        $data = call_user_func(array($this, 'get_'.$currentSection.'_data'));
         echo $html;
 
         if ($currentSection != 'paths') {
@@ -117,11 +117,11 @@ 
     {
         $array = array();
         $writable_folders = array(
-            api_get_path(SYS_APP_PATH) .'cache',
+            api_get_path(SYS_APP_PATH).'cache',
             api_get_path(SYS_COURSE_PATH),
-            api_get_path(SYS_APP_PATH) .'home',
-            api_get_path(SYS_APP_PATH) .'upload/users/',
-            api_get_path(SYS_PATH) .'main/default_course_document/images/',
+            api_get_path(SYS_APP_PATH).'home',
+            api_get_path(SYS_APP_PATH).'upload/users/',
+            api_get_path(SYS_PATH).'main/default_course_document/images/',
         );
         foreach ($writable_folders as $index => $folder) {
             $writable = is_writable($folder);
@@ -140,7 +140,7 @@ 
 
         $exists = file_exists(api_get_path(SYS_CODE_PATH).'install');
         $status = $exists ? self :: STATUS_WARNING : self :: STATUS_OK;
-        $array[] = $this->build_setting($status, '[FILES]', get_lang('DirectoryExists') . ': /install', 'http://be2.php.net/file_exists', $exists, 0, 'yes_no', get_lang('DirectoryShouldBeRemoved'));
+        $array[] = $this->build_setting($status, '[FILES]', get_lang('DirectoryExists').': /install', 'http://be2.php.net/file_exists', $exists, 0, 'yes_no', get_lang('DirectoryShouldBeRemoved'));
 
         //$app_version = api_get_setting('chamilo_database_version');
         //$array[] = $this->build_setting(self :: STATUS_INFORMATION, '[DB]', 'chamilo_database_version', '#', $app_version, 0, null,  'Chamilo DB version');
@@ -155,7 +155,7 @@ 
                     $message2 .= get_lang('SpaceUsedOnSystemCannotBeMeasuredOnWindows');
                 } else {
                     $dir = api_get_path(SYS_PATH);
-                    $du = exec('du -sh ' . $dir, $err);
+                    $du = exec('du -sh '.$dir, $err);
                     list($size, $none) = explode("\t", $du);
                     $limit = $_configuration[$access_url_id]['hosting_limit_disk_space'];
                     $message2 .= sprintf(get_lang('TotalSpaceUsedByPortalXLimitIsYMB'), $size, $limit);
@@ -239,33 +239,33 @@ 
         $array[] = $this->build_setting($status, '[INI]', 'default_charset', 'http://www.php.net/manual/en/ini.core.php#ini.default-charset', $setting, $req_setting, null, get_lang('DefaultCharsetInfo'));
 
         $setting = ini_get('max_execution_time');
-        $req_setting = '300 (' . get_lang('Minimum') . ')';
+        $req_setting = '300 ('.get_lang('Minimum').')';
         $status = $setting >= 300 ? self :: STATUS_OK : self :: STATUS_WARNING;
         $array[] = $this->build_setting($status, '[INI]', 'max_execution_time', 'http://www.php.net/manual/en/ini.core.php#ini.max-execution-time', $setting, $req_setting, null, get_lang('MaxExecutionTimeInfo'));
 
         $setting = ini_get('max_input_time');
-        $req_setting = '300 (' . get_lang('Minimum') . ')';
+        $req_setting = '300 ('.get_lang('Minimum').')';
         $status = $setting >= 300 ? self :: STATUS_OK : self :: STATUS_WARNING;
         $array[] = $this->build_setting($status, '[INI]', 'max_input_time', 'http://www.php.net/manual/en/ini.core.php#ini.max-input-time', $setting, $req_setting, null, get_lang('MaxInputTimeInfo'));
 
         $setting = ini_get('memory_limit');
         $req_setting = '>= '.REQUIRED_MIN_MEMORY_LIMIT.'M';
         $status = self :: STATUS_ERROR;
-        if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT)
+        if ((float) $setting >= REQUIRED_MIN_MEMORY_LIMIT)
             $status = self :: STATUS_OK;
         $array[] = $this->build_setting($status, '[INI]', 'memory_limit', 'http://www.php.net/manual/en/ini.core.php#ini.memory-limit', $setting, $req_setting, null, get_lang('MemoryLimitInfo'));
 
         $setting = ini_get('post_max_size');
         $req_setting = '>= '.REQUIRED_MIN_POST_MAX_SIZE.'M';
         $status = self :: STATUS_ERROR;
-        if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE)
+        if ((float) $setting >= REQUIRED_MIN_POST_MAX_SIZE)
             $status = self :: STATUS_OK;
         $array[] = $this->build_setting($status, '[INI]', 'post_max_size', 'http://www.php.net/manual/en/ini.core.php#ini.post-max-size', $setting, $req_setting, null, get_lang('PostMaxSizeInfo'));
 
         $setting = ini_get('upload_max_filesize');
         $req_setting = '>= '.REQUIRED_MIN_UPLOAD_MAX_FILESIZE.'M';
         $status = self :: STATUS_ERROR;
-        if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE)
+        if ((float) $setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE)
             $status = self :: STATUS_OK;
         $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo'));
 
@@ -279,7 +279,7 @@ 
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
         $array[] = $this->build_setting($status, '[SESSION]', 'session.gc_maxlifetime', 'http://www.php.net/manual/en/ini.core.php#session.gc-maxlifetime', $setting, $req_setting, null, get_lang('SessionGCMaxLifetimeInfo'));
 
-        if (api_check_browscap()){$setting = true;}else{$setting=false;}
+        if (api_check_browscap()) {$setting = true; } else {$setting = false; }
         $req_setting = true;
         $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING;
         $array[] = $this->build_setting($status, '[INI]', 'browscap', 'http://www.php.net/manual/en/misc.configuration.php#ini.browscap', $setting, $req_setting, 'on_off', get_lang('BrowscapInfo'));
@@ -345,7 +345,7 @@ 
 
             $loaded = extension_loaded($extension);
             $status = $loaded ? self :: STATUS_OK : self :: STATUS_ERROR;
-            $array[] = $this->build_setting($status, '[EXTENSION]', get_lang('LoadedExtension') . ': ' . $extension, $url, $loaded, $expected_value, 'yes_no_optional', $comment);
+            $array[] = $this->build_setting($status, '[EXTENSION]', get_lang('LoadedExtension').': '.$extension, $url, $loaded, $expected_value, 'yes_no_optional', $comment);
         }
 
         return $array;
@@ -468,9 +468,9 @@ 
         $formatted_expected_value = $expected_value;
 
         if ($formatter) {
-            if (method_exists($this, 'format_' . $formatter)) {
-                $formatted_current_value = call_user_func(array($this, 'format_' . $formatter), $current_value);
-                $formatted_expected_value = call_user_func(array($this, 'format_' . $formatter), $expected_value);
+            if (method_exists($this, 'format_'.$formatter)) {
+                $formatted_current_value = call_user_func(array($this, 'format_'.$formatter), $current_value);
+                $formatted_expected_value = call_user_func(array($this, 'format_'.$formatter), $expected_value);
             }
         }
 
@@ -485,13 +485,13 @@ 
      */
     public function get_link($title, $url)
     {
-        return '<a href="' . $url . '" target="about:bank">' . $title . '</a>';
+        return '<a href="'.$url.'" target="about:bank">'.$title.'</a>';
     }
 
     public function format_yes_no_optional($value)
     {
     	$return = '';
-    	switch($value) {
+    	switch ($value) {
      		case 0:
      			$return = get_lang('No');
      			break;

main/inc/lib/exercise.lib.php

Doc Comments +9 added lines, -6 removed lines

@@ -1255,6 +1255,7 @@ 
 
     /**
      * Validates the time control key
+     * @param integer $exercise_id
      */
     public static function exercise_time_control_is_valid(
         $exercise_id,
@@ -1388,7 +1389,7 @@ 
      * @param int $in_direction
      * @param string $in_hotpot_path
      * @param bool $in_get_count
-     * @param null $where_condition
+     * @param string $where_condition
      * @return array|int
      */
     public static function get_exam_results_hotpotatoes_data(
@@ -2179,7 +2180,7 @@ 
     /**
      * Return true if pass_pourcentage activated (we use the pass pourcentage feature
      * return false if pass_percentage = 0 (we don't use the pass pourcentage feature
-     * @param $in_pass_pourcentage
+     * @param string $in_pass_pourcentage
      * @return boolean
      * In this version, pass_percentage and show_success_message are disabled if
      * pass_percentage is set to 0
@@ -2192,7 +2193,7 @@ 
     /**
      * Converts a numeric value in a percentage example 0.66666 to 66.67 %
      * @param $value
-     * @return float Converted number
+     * @return string Converted number
      */
     public static function convert_to_percentage($value)
     {
@@ -2208,7 +2209,7 @@ 
      * @param   float $score
      * @param   float $weight
      * @deprecated seem not to be used
-     * @return  float   the score rounded converted to the new range
+     * @return  string|null   the score rounded converted to the new range
      */
     public static function convert_score($score, $weight)
     {
@@ -2759,6 +2760,7 @@ 
      * @param    int        exercise id
      * @param    int    $courseId
      * @param    int        session id
+     * @param integer $user_count
      * @return    float    Best average score
      */
     public static function get_best_average_score_by_exercise(
@@ -3198,8 +3200,9 @@ 
     }
 
     /**
-     * @param array $answer
+     * @param string|null $answer
      * @param string $user_answer
+     * @param string|null $current_answer
      * @return array
      */
     public static function check_fill_in_blanks($answer, $user_answer, $current_answer)
@@ -3805,7 +3808,7 @@ 
 
     /**
      * @param int $countLetter
-     * @return mixed
+     * @return string
      */
     public static function detectInputAppropriateClass($countLetter)
     {

Spacing +115 added lines, -115 removed lines

@@ -66,7 +66,7 @@ 
                 if ($show_title) {
                     TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
                     echo Display::div(
-                        $current_item . '. ' . $objQuestionTmp->selectTitle(),
+                        $current_item.'. '.$objQuestionTmp->selectTitle(),
                         array('class' => 'question_title')
                     );
                 }
@@ -110,7 +110,7 @@ 
                         <div class="clearfix">
                         <ul class="exercise-draggable-answer ui-helper-reset ui-helper-clearfix list-inline">';
                 } else {
-                    $s .= '<div id="drag' . $questionId . '_question" class="drag_question">
+                    $s .= '<div id="drag'.$questionId.'_question" class="drag_question">
                            <table class="data_table">';
                 }
 
@@ -157,12 +157,12 @@ 
             } elseif ($answerType == FREE_ANSWER) {
                 $fck_content = isset($user_choice[0]) && !empty($user_choice[0]['answer']) ? $user_choice[0]['answer'] : null;
 
-                $form = new FormValidator('free_choice_' . $questionId);
+                $form = new FormValidator('free_choice_'.$questionId);
                 $config = array(
                     'ToolbarSet' => 'TestFreeAnswer'
                 );
-                $form->addHtmlEditor("choice[" . $questionId . "]", null, false, false, $config);
-                $form->setDefaults(array("choice[" . $questionId . "]" => $fck_content));
+                $form->addHtmlEditor("choice[".$questionId."]", null, false, false, $config);
+                $form->setDefaults(array("choice[".$questionId."]" => $fck_content));
                 $s .= $form->returnForm();
             } elseif ($answerType == ORAL_EXPRESSION) {
                 // Add nanog
@@ -189,11 +189,11 @@ 
                     echo $objQuestionTmp->returnRecorder();
                 }
 
-                $form = new FormValidator('free_choice_' . $questionId);
+                $form = new FormValidator('free_choice_'.$questionId);
                 $config = array(
                     'ToolbarSet' => 'TestFreeAnswer'
                 );
-                $form->addHtmlEditor("choice[" . $questionId . "]", null, false, false, $config);
+                $form->addHtmlEditor("choice[".$questionId."]", null, false, false, $config);
                 //$form->setDefaults(array("choice[" . $questionId . "]" => $fck_content));
                 $s .= $form->returnForm();
             }
@@ -278,7 +278,7 @@ 
                     case UNIQUE_ANSWER_NO_OPTION:
                         //no break
                     case UNIQUE_ANSWER_IMAGE:
-                        $input_id = 'choice-' . $questionId . '-' . $answerId;
+                        $input_id = 'choice-'.$questionId.'-'.$answerId;
 
                         if (isset($user_choice[0]['answer']) && $user_choice[0]['answer'] == $numAnswer) {
                             $attributes = array(
@@ -304,14 +304,14 @@ 
                         if ($answerType == UNIQUE_ANSWER_IMAGE) {
                             if ($show_comment) {
                                 if (empty($comment)) {
-                                    $s .= '<div id="answer' . $questionId . $numAnswer . '" '
+                                    $s .= '<div id="answer'.$questionId.$numAnswer.'" '
                                         . 'class="exercise-unique-answer-image" style="text-align: center">';
                                 } else {
-                                    $s .= '<div id="answer' . $questionId . $numAnswer . '" '
+                                    $s .= '<div id="answer'.$questionId.$numAnswer.'" '
                                         . 'class="exercise-unique-answer-image col-xs-6 col-sm-12" style="text-align: center">';
                                 }
                             } else {
-                                $s .= '<div id="answer' . $questionId . $numAnswer . '" '
+                                $s .= '<div id="answer'.$questionId.$numAnswer.'" '
                                     . 'class="exercise-unique-answer-image col-xs-6 col-md-3" style="text-align: center">';
                             }
                         }
@@ -320,7 +320,7 @@ 
 
                         $s .= Display::input(
                             'hidden',
-                            'choice2[' . $questionId . ']',
+                            'choice2['.$questionId.']',
                             '0'
                         );
 
@@ -328,13 +328,13 @@ 
 
                         if ($answerType == UNIQUE_ANSWER_IMAGE) {
                             $attributes['style'] = 'display: none;';
-                            $answer = '<div class="thumbnail">' . $answer . '</div>';
+                            $answer = '<div class="thumbnail">'.$answer.'</div>';
                         }
 
                         $answer_input .= '<label class="radio">';
                         $answer_input .= Display::input(
                             'radio',
-                            'choice[' . $questionId . ']',
+                            'choice['.$questionId.']',
                             $numAnswer,
                             $attributes
                         );
@@ -361,7 +361,7 @@ 
                     case MULTIPLE_ANSWER_TRUE_FALSE:
                         //no break
                     case GLOBAL_MULTIPLE_ANSWER:
-                        $input_id = 'choice-' . $questionId . '-' . $answerId;
+                        $input_id = 'choice-'.$questionId.'-'.$answerId;
                         $answer = Security::remove_XSS($answer, STUDENT);
 
                         if (in_array($numAnswer, $user_choice_array)) {
@@ -382,12 +382,12 @@ 
                         }
 
                         if ($answerType == MULTIPLE_ANSWER || $answerType == GLOBAL_MULTIPLE_ANSWER) {
-                            $s .= '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />';
+                            $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
 
                             $answer_input = '<label class="checkbox">';
                             $answer_input .= Display::input(
                                 'checkbox',
-                                'choice[' . $questionId . '][' . $numAnswer . ']',
+                                'choice['.$questionId.']['.$numAnswer.']',
                                 $numAnswer,
                                 $attributes
                             );
@@ -440,7 +440,7 @@ 
                                         'td',
                                         Display::input(
                                             'radio',
-                                            'choice[' . $questionId . '][' . $numAnswer . ']',
+                                            'choice['.$questionId.']['.$numAnswer.']',
                                             $id,
                                             $attributes
                                         ),
@@ -459,7 +459,7 @@ 
                         break;
                     case MULTIPLE_ANSWER_COMBINATION:
                         // multiple answers
-                        $input_id = 'choice-' . $questionId . '-' . $answerId;
+                        $input_id = 'choice-'.$questionId.'-'.$answerId;
 
                         if (in_array($numAnswer, $user_choice_array)) {
                             $attributes = array(
@@ -479,11 +479,11 @@ 
                         }
 
                         $answer = Security::remove_XSS($answer, STUDENT);
-                        $answer_input = '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />';
+                        $answer_input = '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
                         $answer_input .= '<label class="checkbox">';
                         $answer_input .= Display::input(
                             'checkbox',
-                            'choice[' . $questionId . '][' . $numAnswer . ']',
+                            'choice['.$questionId.']['.$numAnswer.']',
                             1,
                             $attributes
                         );
@@ -504,7 +504,7 @@ 
                         }
                         break;
                     case MULTIPLE_ANSWER_COMBINATION_TRUE_FALSE:
-                        $s .= '<input type="hidden" name="choice2[' . $questionId . ']" value="0" />';
+                        $s .= '<input type="hidden" name="choice2['.$questionId.']" value="0" />';
 
                         $my_choice = array();
                         if (!empty($user_choice_array)) {
@@ -539,7 +539,7 @@ 
                                 'td',
                                 Display::input(
                                     'radio',
-                                    'choice[' . $questionId . '][' . $numAnswer . ']',
+                                    'choice['.$questionId.']['.$numAnswer.']',
                                     $key,
                                     $attributes
                                 )
@@ -596,7 +596,7 @@ 
                                     // may be "" if student viewed the question, but did not fill the blanks
                                     $correctItem = $studentAnswerList[$i];
                                 }
-                                $attributes["style"] = "width:" . $listAnswerInformations["tabinputsize"][$i] . "px";
+                                $attributes["style"] = "width:".$listAnswerInformations["tabinputsize"][$i]."px";
                                 $answer .= FillBlanks::getFillTheBlankHtml($separatorStartRegexp, $separatorEndRegexp, $correctItemRegexp, $questionId, $correctItem, $attributes, $answer, $listAnswerInformations, $displayForStudent, $i);
                             }
                             // display the last common word
@@ -610,7 +610,7 @@ 
                                 // display the common words
                                 $answer .= $listAnswerInformations["commonwords"][$i];
                                 // display the blank word
-                                $attributes["style"] = "width:" . $listAnswerInformations["tabinputsize"][$i] . "px";
+                                $attributes["style"] = "width:".$listAnswerInformations["tabinputsize"][$i]."px";
                                 $correctItem = $listAnswerInformations["tabwords"][$i];
                                 $correctItemRegexp = $correctItem;
                                 // replace / with \/ to allow the preg_replace bellow and all the regexp char
@@ -634,8 +634,8 @@ 
                         if ($origin !== null) {
                             global $exe_id;
                             $trackAttempts = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-                            $sql = 'SELECT answer FROM ' . $trackAttempts . '
-                                    WHERE exe_id=' . $exe_id . ' AND question_id=' . $questionId;
+                            $sql = 'SELECT answer FROM '.$trackAttempts.'
+                                    WHERE exe_id=' . $exe_id.' AND question_id='.$questionId;
                             $rsLastAttempt = Database::query($sql);
                             $rowLastAttempt = Database::fetch_array($rsLastAttempt);
                             $answer = $rowLastAttempt['answer'];
@@ -692,7 +692,7 @@ 
                                     '',
                                     $answerCorrected
                                 );
-                                $answerCorrected = '[' . $answerCorrected . ']';
+                                $answerCorrected = '['.$answerCorrected.']';
                                 $studentAnswerList[] = $answerCorrected;
                             }
                         }
@@ -713,7 +713,7 @@ 
                         */
                         $tabComments = api_preg_split(
                             '/\[[^]]+\]/',
-                            ' ' . $answer . ' '
+                            ' '.$answer.' '
                         );
                         if (!empty($correctAnswerList) && !empty($studentAnswerList)) {
                             $answer = "";
@@ -730,7 +730,7 @@ 
                                     $size
                                 );
 
-                                $answer .= $tabComments[$i] .
+                                $answer .= $tabComments[$i].
                                     Display::input(
                                         'text',
                                         "choice[$questionId][]",
@@ -777,12 +777,12 @@ 
                             $s .= '<tr><td width="45%" valign="top">';
                             $parsed_answer = $answer;
                             //left part questions
-                            $s .= '<p class="indent">' . $lines_count . '.&nbsp;' . $parsed_answer . '</p></td>';
+                            $s .= '<p class="indent">'.$lines_count.'.&nbsp;'.$parsed_answer.'</p></td>';
                             //middle part (matches selects)
 
                             $s .= '<td width="10%" valign="top" align="center" >
                                 <div class="select-matching">
-                                <select name="choice[' . $questionId . '][' . $numAnswer . ']">';
+                                <select name="choice[' . $questionId.']['.$numAnswer.']">';
 
                             // fills the list-box
                             foreach ($select_items as $key => $val) {
@@ -798,14 +798,14 @@ 
                                 if (isset($user_choice_array_position[$numAnswer]) && $val['id'] == $user_choice_array_position[$numAnswer]) {
                                     $selected = 'selected="selected"';
                                 }
-                                $s .= '<option value="' . $val['id'] . '" ' . $selected . '>' . $val['letter'] . '</option>';
+                                $s .= '<option value="'.$val['id'].'" '.$selected.'>'.$val['letter'].'</option>';
 
                             }  // end foreach()
 
                             $s .= '</select></div></td><td width="5%" class="separate">&nbsp;</td>';
                             $s .= '<td width="40%" valign="top" >';
                             if (isset($select_items[$lines_count])) {
-                                $s .= '<div class="text-right"><p class="indent">' . $select_items[$lines_count]['letter'] . '.&nbsp; ' . $select_items[$lines_count]['answer'] . '</p></div>';
+                                $s .= '<div class="text-right"><p class="indent">'.$select_items[$lines_count]['letter'].'.&nbsp; '.$select_items[$lines_count]['answer'].'</p></div>';
                             } else {
                                 $s .= '&nbsp;';
                             }
@@ -820,7 +820,7 @@ 
                                     $s .= '<tr>
                                       <td colspan="2"></td>
                                       <td valign="top">';
-                                    $s .= '<b>' . $select_items[$lines_count]['letter'] . '.</b> ' . $select_items[$lines_count]['answer'];
+                                    $s .= '<b>'.$select_items[$lines_count]['letter'].'.</b> '.$select_items[$lines_count]['answer'];
                                     $s .= "</td>
                                 </tr>";
                                     $lines_count++;
@@ -837,9 +837,9 @@ 
                             $data = $objAnswerTmp->getAnswerByAutoId($data['correct']);
                             $lines_count = $data['answer'];*/
 
-                            $windowId = $questionId . '_' . $lines_count;
+                            $windowId = $questionId.'_'.$lines_count;
 
-                            $s .= '<li class="touch-items" id="' . $windowId . '">';
+                            $s .= '<li class="touch-items" id="'.$windowId.'">';
                             $s .= Display::div(
                                 $parsed_answer,
                                 [
@@ -897,7 +897,7 @@ 
                                     Display::tag(
                                         'b',
                                         $select_items[$lines_count]['letter']
-                                    ) . $select_items[$lines_count]['answer'],
+                                    ).$select_items[$lines_count]['answer'],
                                     [
                                         'id' => "window_{$windowId}_answer",
                                         'style' => 'display: none;'
@@ -1068,7 +1068,7 @@ 
 
                 for ($answerId = 1; $answerId <= $nbrAnswers; $answerId++) {
                     $answerCorrect = $objAnswerTmp->isCorrect($answerId);
-                    $windowId = $questionId . '_' . $counterAnswer;
+                    $windowId = $questionId.'_'.$counterAnswer;
 
                     if ($answerCorrect) {
                         $s .= Display::div(
@@ -1117,7 +1117,7 @@ 
                 $course = api_get_course_info();
                 $doc_id = DocumentManager::get_document_id(
                     $course,
-                    '/images/' . $pictureName
+                    '/images/'.$pictureName
                 );
                 if (is_numeric($doc_id)) {
                     $images_folder_visibility = api_get_item_visibility(
@@ -1142,7 +1142,7 @@ 
                 echo "
                     <script>
                         $(document).on('ready', function () {
-                            new " . ($answerType == HOT_SPOT ? "HotspotQuestion" : "DelineationQuestion") . "({
+                            new " . ($answerType == HOT_SPOT ? "HotspotQuestion" : "DelineationQuestion")."({
                                 questionId: $questionId,
                                 exerciseId: $exerciseId,
                                 selector: '#hotspot-preview-$questionId',
@@ -1176,7 +1176,7 @@ 
             if ($answerType != HOT_SPOT_DELINEATION) {
                 $answerList = '
                     <div class="well well-sm">
-                        <h5 class="page-header">' . get_lang('HotspotZones') . '</h5>
+                        <h5 class="page-header">' . get_lang('HotspotZones').'</h5>
                         <ol>
                 ';
 
@@ -1201,7 +1201,7 @@ 
             if (!$only_questions) {
                 if ($show_title) {
                     TestCategory::displayCategoryAndTitle($objQuestionTmp->id);
-                    echo '<div class="question_title">' . $current_item . '. ' . $questionName . '</div>';
+                    echo '<div class="question_title">'.$current_item.'. '.$questionName.'</div>';
                 }
                 //@todo I need to the get the feedback type
                 echo <<<HOTSPOT
@@ -1218,7 +1218,7 @@ 
                                 <div class=\"hotspot-image\"></div>
                                 <script>
                                     $(document).on('ready', function () {
-                                        new " . ($answerType == HOT_SPOT_DELINEATION ? 'DelineationQuestion' : 'HotspotQuestion') . "({
+                                        new " . ($answerType == HOT_SPOT_DELINEATION ? 'DelineationQuestion' : 'HotspotQuestion')."({
                                             questionId: $questionId,
                                             exerciseId: $exe_id,
                                             selector: '#question_div_' + $questionId + ' .hotspot-image',
@@ -1339,11 +1339,11 @@ 
         $lp_id = intval($lp_id);
         $lp_item_id = intval($lp_item_id);
         return
-            api_get_course_int_id() . '_' .
-            api_get_session_id() . '_' .
-            $exercise_id . '_' .
-            api_get_user_id() . '_' .
-            $lp_id . '_' .
+            api_get_course_int_id().'_'.
+            api_get_session_id().'_'.
+            $exercise_id.'_'.
+            api_get_user_id().'_'.
+            $lp_id.'_'.
             $lp_item_id;
     }
 
@@ -1457,14 +1457,14 @@ 
         $res = Database::query($sql);
         $result = array();
         $apiIsAllowedToEdit = api_is_allowed_to_edit();
-        $urlBase = api_get_path(WEB_CODE_PATH) .
-            'exercise/hotpotatoes_exercise_report.php?action=delete&' .
-            api_get_cidreq() . '&id=';
+        $urlBase = api_get_path(WEB_CODE_PATH).
+            'exercise/hotpotatoes_exercise_report.php?action=delete&'.
+            api_get_cidreq().'&id=';
         while ($data = Database::fetch_array($res)) {
             $actions = null;
 
             if ($apiIsAllowedToEdit) {
-                $url = $urlBase . $data['id'] . '&path=' . $data['exe_name'];
+                $url = $urlBase.$data['id'].'&path='.$data['exe_name'];
                 $actions = Display::url(
                     Display::return_icon('delete.png', get_lang('Delete')),
                     $url
@@ -1480,7 +1480,7 @@ 
                     GroupManager::get_user_group_name($data['user_id'])
                 ),
                 'exe_date' => $data['exe_date'],
-                'score' => $data['exe_result'] . ' / ' . $data['exe_weighting'],
+                'score' => $data['exe_result'].' / '.$data['exe_weighting'],
                 'actions' => $actions,
             );
         }
@@ -1564,18 +1564,18 @@ 
         $TBL_TRACK_HOTPOTATOES = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_HOTPOTATOES);
         $TBL_TRACK_ATTEMPT_RECORDING = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
 
-        $session_id_and = ' AND te.session_id = ' . $sessionId . ' ';
+        $session_id_and = ' AND te.session_id = '.$sessionId.' ';
         $exercise_id = intval($exercise_id);
 
         $exercise_where = '';
         if (!empty($exercise_id)) {
-            $exercise_where .= ' AND te.exe_exo_id = ' . $exercise_id . '  ';
+            $exercise_where .= ' AND te.exe_exo_id = '.$exercise_id.'  ';
         }
 
         $hotpotatoe_where = '';
         if (!empty($_GET['path'])) {
             $hotpotatoe_path = Database::escape_string($_GET['path']);
-            $hotpotatoe_where .= ' AND exe_name = "' . $hotpotatoe_path . '"  ';
+            $hotpotatoe_where .= ' AND exe_name = "'.$hotpotatoe_path.'"  ';
         }
 
         // sql for chamilo-type tests for teacher / tutor view
@@ -1587,7 +1587,7 @@ 
             WHERE
                 c_id = $course_id AND
                 exe_exo_id = $exercise_id AND
-                ttte.session_id = " . $sessionId . "
+                ttte.session_id = ".$sessionId."
         )";
 
         if ($is_allowedToEdit) {
@@ -1610,9 +1610,9 @@ 
                         g.id as group_id
                     FROM $TBL_USER u
                     INNER JOIN $TBL_GROUP_REL_USER gru
-                    ON (gru.user_id = u.user_id AND gru.c_id=" . $course_id . ")
+                    ON (gru.user_id = u.user_id AND gru.c_id=".$course_id.")
                     INNER JOIN $TBL_GROUP g
-                    ON (gru.group_id = g.id AND g.c_id=" . $course_id . ")
+                    ON (gru.group_id = g.id AND g.c_id=".$course_id.")
                 )";
             }
 
@@ -1673,9 +1673,9 @@ 
                     g.id as group_id
                 FROM $TBL_USER u
                 LEFT OUTER JOIN $TBL_GROUP_REL_USER gru
-                ON ( gru.user_id = u.user_id AND gru.c_id=" . $course_id . " )
+                ON ( gru.user_id = u.user_id AND gru.c_id=".$course_id." )
                 LEFT OUTER JOIN $TBL_GROUP g
-                ON (gru.group_id = g.id AND g.c_id = " . $course_id . ")
+                ON (gru.group_id = g.id AND g.c_id = ".$course_id.")
             )";
             }
 
@@ -1688,12 +1688,12 @@ 
             (
                 SELECT u.user_id, firstname, lastname, email, username, ' ' as group_name, '' as group_id, official_code
                 FROM $TBL_USER u
-                WHERE u.status NOT IN(" . api_get_users_status_ignored_in_reports('string') . ")
+                WHERE u.status NOT IN(".api_get_users_status_ignored_in_reports('string').")
             )";
             }
 
             $sqlFromOption = " , $TBL_GROUP_REL_USER AS gru ";
-            $sqlWhereOption = "  AND gru.c_id = " . $course_id . " AND gru.user_id = user.user_id ";
+            $sqlWhereOption = "  AND gru.c_id = ".$course_id." AND gru.user_id = user.user_id ";
             $first_and_last_name = api_is_western_name_order() ? "firstname, lastname" : "lastname, firstname";
 
             if ($get_count) {
@@ -1730,9 +1730,9 @@ 
                 ON (user.user_id = exe_user_id)
                 WHERE
                     te.status != 'incomplete' AND
-                    te.c_id = " . $course_id . " $session_id_and AND
+                    te.c_id = ".$course_id." $session_id_and AND
                     ce.active <>-1 AND 
-                    ce.c_id = " . $course_id . "
+                    ce.c_id = ".$course_id."
                     $exercise_where
                     $extra_where_conditions
                 ";
@@ -1759,10 +1759,10 @@ 
                     $sqlFromOption
                 WHERE
                     user.user_id=tth.exe_user_id
-                    AND tth.c_id = " . $course_id . "
+                    AND tth.c_id = ".$course_id."
                     $hotpotatoe_where
                     $sqlWhereOption
-                    AND user.status NOT IN(" . api_get_users_status_ignored_in_reports('string') . ")
+                    AND user.status NOT IN(".api_get_users_status_ignored_in_reports('string').")
                 ORDER BY
                     tth.c_id ASC,
                     tth.exe_date DESC";
@@ -1835,12 +1835,12 @@ 
 
                     if ($from_gradebook && ($is_allowedToEdit)) {
                         if (in_array(
-                            $results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname'],
+                            $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname'],
                             $users_array_id
                         )) {
                             continue;
                         }
-                        $users_array_id[] = $results[$i]['username'] . $results[$i]['firstname'] . $results[$i]['lastname'];
+                        $users_array_id[] = $results[$i]['username'].$results[$i]['firstname'].$results[$i]['lastname'];
                     }
 
                     $lp_obj = isset($results[$i]['orig_lp_id']) && isset($lp_list[$results[$i]['orig_lp_id']]) ? $lp_list[$results[$i]['orig_lp_id']] : null;
@@ -1849,7 +1849,7 @@ 
                     if ($lp_obj) {
                         $url = api_get_path(
                                 WEB_CODE_PATH
-                            ) . 'lp/lp_controller.php?' . api_get_cidreq() . '&action=view&lp_id=' . $results[$i]['orig_lp_id'];
+                            ).'lp/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$results[$i]['orig_lp_id'];
                         $lp_name = Display::url(
                             $lp_obj['lp_name'],
                             $url,
@@ -1867,7 +1867,7 @@ 
                         );
 
                         foreach ($group_list as $id) {
-                            $group_name_list .= $clean_group_list[$id] . '<br/>';
+                            $group_name_list .= $clean_group_list[$id].'<br/>';
                         }
                         $results[$i]['group_name'] = $group_name_list;
                     }
@@ -1923,7 +1923,7 @@ 
                                 }
                             }
                             if ($revised) {
-                                $actions .= "<a href='exercise_show.php?" . api_get_cidreq() . "&action=edit&id=$id'>" .
+                                $actions .= "<a href='exercise_show.php?".api_get_cidreq()."&action=edit&id=$id'>".
                                     Display:: return_icon(
                                         'edit.png',
                                         get_lang('Edit'),
@@ -1932,7 +1932,7 @@ 
                                     );
                                 $actions .= '&nbsp;';
                             } else {
-                                $actions .= "<a href='exercise_show.php?" . api_get_cidreq() . "&action=qualify&id=$id'>" .
+                                $actions .= "<a href='exercise_show.php?".api_get_cidreq()."&action=qualify&id=$id'>".
                                     Display:: return_icon(
                                         'quiz.png',
                                         get_lang('Qualify')
@@ -1942,11 +1942,11 @@ 
                             $actions .= "</a>";
 
                             if ($filter == 2) {
-                                $actions .= ' <a href="exercise_history.php?' . api_get_cidreq() . '&exe_id=' . $id . '">' .
+                                $actions .= ' <a href="exercise_history.php?'.api_get_cidreq().'&exe_id='.$id.'">'.
                                     Display:: return_icon(
                                         'history.png',
                                         get_lang('ViewHistoryChange')
-                                    ) . '</a>';
+                                    ).'</a>';
                             }
 
                             //Admin can always delete the attempt
@@ -1956,13 +1956,13 @@ 
                                     date('Y-m-d h:i:s'),
                                     false
                                 );
-                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip=' . $ip . '" target="_blank">
-                                ' . Display::return_icon('info.png', $ip) . '
+                                $actions .= '<a href="http://www.whatsmyip.org/ip-geo-location/?ip='.$ip.'" target="_blank">
+                                ' . Display::return_icon('info.png', $ip).'
                                 </a>';
 
 
-                                $recalculateUrl = api_get_path(WEB_CODE_PATH) . 'exercise/recalculate.php?' .
-                                    api_get_cidreq() . '&' .
+                                $recalculateUrl = api_get_path(WEB_CODE_PATH).'exercise/recalculate.php?'.
+                                    api_get_cidreq().'&'.
                                     http_build_query([
                                         'id' => $id,
                                         'exercise' => $exercise_id,
@@ -1979,27 +1979,27 @@ 
                                     ]
                                 );
 
-                                $delete_link = '<a href="exercise_report.php?' . api_get_cidreq() . '&filter_by_user=' . intval($_GET['filter_by_user']) . '&filter=' . $filter . '&exerciseId=' . $exercise_id . '&delete=delete&did=' . $id . '"
+                                $delete_link = '<a href="exercise_report.php?'.api_get_cidreq().'&filter_by_user='.intval($_GET['filter_by_user']).'&filter='.$filter.'&exerciseId='.$exercise_id.'&delete=delete&did='.$id.'"
                                 onclick="javascript:if(!confirm(\'' . sprintf(
                                         get_lang('DeleteAttempt'),
                                         $results[$i]['username'],
                                         $dt
-                                    ) . '\')) return false;">' . Display:: return_icon(
+                                    ).'\')) return false;">'.Display:: return_icon(
                                         'delete.png',
                                         get_lang('Delete')
-                                    ) . '</a>';
+                                    ).'</a>';
                                 $delete_link = utf8_encode($delete_link);
 
                                 if (api_is_drh() && !api_is_platform_admin()) {
                                     $delete_link = null;
                                 }
-                                $actions .= $delete_link . '&nbsp;';
+                                $actions .= $delete_link.'&nbsp;';
                             }
 
                         } else {
                             $attempt_url = api_get_path(
                                     WEB_CODE_PATH
-                                ) . 'exercise/result.php?' . api_get_cidreq() . '&id=' . $results[$i]['exe_id'] . '&id_session=' . $sessionId;
+                                ).'exercise/result.php?'.api_get_cidreq().'&id='.$results[$i]['exe_id'].'&id_session='.$sessionId;
                             $attempt_link = Display::url(
                                 get_lang('Show'),
                                 $attempt_url,
@@ -2058,7 +2058,7 @@ 
                     $hp_result = round(
                             ($hpresults[$i][4] / ($hpresults[$i][5] != 0 ? $hpresults[$i][5] : 1)) * 100,
                             2
-                        ) . '% (' . $hpresults[$i][4] . ' / ' . $hpresults[$i][5] . ')';
+                        ).'% ('.$hpresults[$i][4].' / '.$hpresults[$i][5].')';
                     if ($is_allowedToEdit) {
                         $list_info[] = array(
                             $hpresults[$i][0],
@@ -2132,13 +2132,13 @@ 
 
         $html = null;
         if ($show_percentage) {
-            $parent = '(' . $score . ' / ' . $weight . ')';
-            $html = $percentage . "%  $parent";
+            $parent = '('.$score.' / '.$weight.')';
+            $html = $percentage."%  $parent";
             if ($show_only_percentage) {
-                $html = $percentage . "% ";
+                $html = $percentage."% ";
             }
         } else {
-            $html = $score . ' / ' . $weight;
+            $html = $score.' / '.$weight;
         }
         $html = Display::span($html, array('class' => 'score_exercise'));
 
@@ -2232,7 +2232,7 @@ 
     {
         $return = '-';
         if ($value != '') {
-            $return = float_format($value * 100, 1) . ' %';
+            $return = float_format($value * 100, 1).' %';
         }
         return $return;
     }
@@ -2311,7 +2311,7 @@ 
         }
 
         $needle_where = !empty($search) ? " AND title LIKE '?' " : '';
-        $needle = !empty($search) ? "%" . $search . "%" : '';
+        $needle = !empty($search) ? "%".$search."%" : '';
 
         // Show courses by active status
         $active_sql = '';
@@ -2326,7 +2326,7 @@ 
         if ($search_all_sessions == true) {
             $conditions = array(
                 'where' => array(
-                    $active_sql . ' c_id = ? ' . $needle_where . $time_conditions => array(
+                    $active_sql.' c_id = ? '.$needle_where.$time_conditions => array(
                         $course_id,
                         $needle
                     )
@@ -2337,7 +2337,7 @@ 
             if ($session_id == 0) {
                 $conditions = array(
                     'where' => array(
-                        $active_sql . ' session_id = ? AND c_id = ? ' . $needle_where . $time_conditions => array(
+                        $active_sql.' session_id = ? AND c_id = ? '.$needle_where.$time_conditions => array(
                             $session_id,
                             $course_id,
                             $needle
@@ -2348,7 +2348,7 @@ 
             } else {
                 $conditions = array(
                     'where' => array(
-                        $active_sql . ' (session_id = 0 OR session_id = ? ) AND c_id = ? ' . $needle_where . $time_conditions => array(
+                        $active_sql.' (session_id = 0 OR session_id = ? ) AND c_id = ? '.$needle_where.$time_conditions => array(
                             $session_id,
                             $course_id,
                             $needle
@@ -2529,7 +2529,7 @@ 
 
             if ($return_string) {
                 if (!empty($position) && !empty($my_ranking)) {
-                    $return_value = $position . '/' . count($my_ranking);
+                    $return_value = $position.'/'.count($my_ranking);
                 } else {
                     $return_value = '-';
                 }
@@ -2610,7 +2610,7 @@ 
 
             if ($return_string) {
                 if (!empty($position) && !empty($my_ranking)) {
-                    return $position . '/' . count($my_ranking);
+                    return $position.'/'.count($my_ranking);
                 }
             }
             return $return_value;
@@ -3015,7 +3015,7 @@ 
             $courseCondition = "
             INNER JOIN $courseUser cu
             ON cu.c_id = c.id AND cu.user_id  = exe_user_id";
-            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT;
+            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT;
         } else {
             $courseCondition = "
             INNER JOIN $courseUserSession cu
@@ -3091,7 +3091,7 @@ 
             $courseCondition = "
             INNER JOIN $courseUser cu
             ON cu.c_id = c.id AND cu.user_id  = exe_user_id";
-            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT;
+            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT;
         } else {
             $courseCondition = "
             INNER JOIN $courseUserSession cu
@@ -3184,7 +3184,7 @@ 
             $courseCondition = "
             INNER JOIN $courseUser cu
             ON cu.c_id = c.id AND cu.user_id  = exe_user_id";
-            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = " . STUDENT;
+            $courseConditionWhere = " AND relation_type <> 2 AND cu.status = ".STUDENT;
         } else {
             $courseCondition = "
             INNER JOIN $courseUserSession cu
@@ -3366,7 +3366,7 @@ 
                 }
             }
             // adds the correct word, followed by ] to close the blank
-            $answer .= ' / <font color="green"><b>' . $real_correct_tags[$i] . '</b></font>]';
+            $answer .= ' / <font color="green"><b>'.$real_correct_tags[$i].'</b></font>]';
             if (isset ($real_text[$i + 1])) {
                 $answer .= $real_text[$i + 1];
             }
@@ -3426,13 +3426,13 @@ 
         // check the default value of option
         $tabSelected = array($in_default => " selected='selected' ");
         $res = "";
-        $res .= "<select name='$in_name' id='$in_name' onchange='" . $in_onchange . "' >";
-        $res .= "<option value='-1'" . $tabSelected["-1"] . ">-- " . get_lang(
+        $res .= "<select name='$in_name' id='$in_name' onchange='".$in_onchange."' >";
+        $res .= "<option value='-1'".$tabSelected["-1"].">-- ".get_lang(
                 'AllGroups'
-            ) . " --</option>";
-        $res .= "<option value='0'" . $tabSelected["0"] . ">- " . get_lang(
+            )." --</option>";
+        $res .= "<option value='0'".$tabSelected["0"].">- ".get_lang(
                 'NotInAGroup'
-            ) . " -</option>";
+            )." -</option>";
         $tabGroups = GroupManager::get_group_list();
         $currentCatId = 0;
         for ($i = 0; $i < count($tabGroups); $i++) {
@@ -3440,10 +3440,10 @@ 
                 $tabGroups[$i]['iid']
             );
             if ($tabCategory["id"] != $currentCatId) {
-                $res .= "<option value='-1' disabled='disabled'>" . $tabCategory["title"] . "</option>";
+                $res .= "<option value='-1' disabled='disabled'>".$tabCategory["title"]."</option>";
                 $currentCatId = $tabCategory["id"];
             }
-            $res .= "<option " . $tabSelected[$tabGroups[$i]["id"]] . "style='margin-left:40px' value='" . $tabGroups[$i]["id"] . "'>" . $tabGroups[$i]["name"] . "</option>";
+            $res .= "<option ".$tabSelected[$tabGroups[$i]["id"]]."style='margin-left:40px' value='".$tabGroups[$i]["id"]."'>".$tabGroups[$i]["name"]."</option>";
         }
         $res .= "</select>";
         return $res;
@@ -3678,14 +3678,14 @@ 
                 if ($show_results) {
                     $comnt = Event::get_comments($exe_id, $questionId);
                     if (!empty($comnt)) {
-                        echo '<b>' . get_lang('Feedback') . '</b>';
-                        echo '<div id="question_feedback">' . $comnt . '</div>';
+                        echo '<b>'.get_lang('Feedback').'</b>';
+                        echo '<div id="question_feedback">'.$comnt.'</div>';
                     }
                 }
 
                 if ($show_results) {
                     $score = array(
-                        'result' => get_lang('Score') . " : " . self::show_score(
+                        'result' => get_lang('Score')." : ".self::show_score(
                                 $my_total_score,
                                 $my_total_weight,
                                 false,
@@ -3753,9 +3753,9 @@ 
         }
 
         if ($show_all_but_expected_answer) {
-            $exercise_content .= "<div class='normal-message'>" . get_lang(
+            $exercise_content .= "<div class='normal-message'>".get_lang(
                     "ExerciseWithFeedbackWithoutCorrectionComment"
-                ) . "</div>";
+                )."</div>";
         }
         // Remove audio auto play from questions on results page - refs BT#7939
         $exercise_content = preg_replace(
@@ -3855,11 +3855,11 @@ 
                     $ribbon_total_success_or_error = ' ribbon-total-error';
                 }
             }
-            $ribbon .= '<div class="total ' . $ribbon_total_success_or_error . '">';
+            $ribbon .= '<div class="total '.$ribbon_total_success_or_error.'">';
         } else {
             $ribbon .= '<div class="total">';
         }
-        $ribbon .= '<h3>' . get_lang('YourTotalScore') . ":&nbsp;";
+        $ribbon .= '<h3>'.get_lang('YourTotalScore').":&nbsp;";
         $ribbon .= self::show_score($score, $weight, false, true);
         $ribbon .= '</h3>';
         $ribbon .= '</div>';

main/inc/lib/formvalidator/Rule/MaxFileSize.php

Doc Comments -1 removed lines

@@ -9,7 +9,6 @@
 {
 	/**
 	 * @param $value array     Uploaded file info (from $_FILES)
-	 * @param null $options
 	 * @return bool
 	 */
 	public function validate($elementValue, $maxSize)

Indentation +17 added lines, -17 removed lines

@@ -7,22 +7,22 @@
  */
 class HTML_QuickForm_Rule_MaxFileSize extends HTML_QuickForm_Rule
 {
-	/**
-	 * @param $value array     Uploaded file info (from $_FILES)
-	 * @param null $options
-	 * @return bool
-	 */
-	public function validate($elementValue, $maxSize)
-	{
-		if (!empty($elementValue['error']) &&
-			(UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error'])
-		) {
-			return false;
-		}
-		if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
-			return true;
-		}
+    /**
+     * @param $value array     Uploaded file info (from $_FILES)
+     * @param null $options
+     * @return bool
+     */
+    public function validate($elementValue, $maxSize)
+    {
+        if (!empty($elementValue['error']) &&
+            (UPLOAD_ERR_FORM_SIZE == $elementValue['error'] || UPLOAD_ERR_INI_SIZE == $elementValue['error'])
+        ) {
+            return false;
+        }
+        if (!HTML_QuickForm_file::_ruleIsUploadedFile($elementValue)) {
+            return true;
+        }
 
-		return ($maxSize >= @filesize($elementValue['tmp_name']));
-	}
+        return ($maxSize >= @filesize($elementValue['tmp_name']));
+    }
 }

main/inc/lib/formvalidator/Rule/MobilePhoneNumber.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      *
      * @param string Mobile phone number to be validated
      * @param string Not using it. Just to respect the declaration
-     * @return boolean Returns true if valid, false otherwise.
+     * @return integer Returns true if valid, false otherwise.
      */
     function validate($mobilePhoneNumber, $options = null)
     {

main/inc/lib/hook/HookManagement.php

Doc Comments +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
 
     /**
      * Return a list an associative array where keys are the active hook observer class name
-     * @param $eventName
+     * @param string $eventName
      *
      * @return array
      */

Spacing +14 added lines, -14 removed lines

@@ -145,10 +145,10 @@ 
     public function listHookObservers($eventName)
     {
         $array = array();
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
-            ' ON hc.hook_event_id = he.id ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
+            ' ON hc.hook_event_id = he.id '.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
             ' ON hc.hook_observer_id = ho.id ';
         $columns = 'ho.class_name, ho.path, ho.plugin_name, hc.enabled';
         $where = array('where' => array('he.class_name = ? ' => $eventName, 'AND hc.enabled = ? ' => 1));
@@ -202,10 +202,10 @@ 
     public function listAllHookCalls()
     {
         $array = array();
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
-            ' ON hc.hook_event_id = he.id ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
+            ' ON hc.hook_event_id = he.id '.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
             ' ON hc.hook_observer_id = ho.id ';
         $columns = 'he.class_name AS event_class_name, ho.class_name AS observer_class_name, hc.id AS id, hc.type AS type';
         $rows = Database::select($columns, $joinTable);
@@ -231,7 +231,7 @@ 
         if (isset($eventName) && !isset($this->hookEvents[$eventName])) {
             $attributes = array(
                 'class_name' => $eventName,
-                'description' => get_lang('HookDescription' . $eventName),
+                'description' => get_lang('HookDescription'.$eventName),
             );
             $id = Database::insert($this->tables[TABLE_HOOK_EVENT], $attributes);
             $this->hookEvents[$eventName] = $id;
@@ -240,7 +240,7 @@ 
         // Check if exists hook observer
         if (isset($observerClassName) &&
             !isset($this->hookObservers[$observerClassName])
-        ){
+        ) {
             $object = $observerClassName::create();
             $attributes = array(
                 'class_name' => $observerClassName,
@@ -338,10 +338,10 @@ 
         $eventName = Database::escape_string($eventName);
         $observerClassName($observerClassName);
         $type = Database::escape_string($type);
-        $joinTable = $this->tables[TABLE_HOOK_CALL] . ' hc' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_EVENT] . ' he' .
-            ' ON hc.hook_event_id = he.id ' .
-            ' INNER JOIN ' . $this->tables[TABLE_HOOK_OBSERVER] . ' ho ' .
+        $joinTable = $this->tables[TABLE_HOOK_CALL].' hc'.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_EVENT].' he'.
+            ' ON hc.hook_event_id = he.id '.
+            ' INNER JOIN '.$this->tables[TABLE_HOOK_OBSERVER].' ho '.
             ' ON hc.hook_observer_id = ho.id ';
         $row = Database::select(
             'id',

main/inc/lib/model.lib.php

Doc Comments +1 added lines

@@ -25,6 +25,7 @@
 
     /**
      * Useful finder - experimental akelos like only use in notification.lib.php send function
+     * @param string $type
      */
     public function find($type, $options = null)
     {

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

Doc Comments +7 added lines, -7 removed lines

@@ -306,7 +306,7 @@ 
 	/**

 	* gets the current debug data for this instance

 	*

-	* @return   debug data

+	* @return   string data

 	* @access   public

 	*/

 	function &getDebug() {

@@ -319,7 +319,7 @@ 
 	* gets the current debug data for this instance as an XML comment

 	* this may change the contents of the debug data

 	*

-	* @return   debug data as an XML comment

+	* @return   string data as an XML comment

 	* @access   public

 	*/

 	function &getDebugAsXMLComment() {

@@ -352,7 +352,7 @@ 
 	/**

 	* returns error string if present

 	*

-	* @return   mixed error string or false

+	* @return   string|false error string or false

 	* @access   public

 	*/

 	function getError(){

@@ -365,7 +365,7 @@ 
 	/**

 	* sets error string

 	*

-	* @return   boolean $string error string

+	* @return   boolean|null $string error string

 	* @access   private

 	*/

 	function setError($str){

@@ -801,7 +801,7 @@ 
     * returns false, if not prefixed

     *

     * @param string $str The prefixed string

-    * @return mixed The prefix or false if there is no prefix

+    * @return string|false The prefix or false if there is no prefix

     * @access public

     */

 	function getPrefix($str){

@@ -832,7 +832,7 @@ 
     * or false if no prefixes registered for the given namespace

     *

     * @param string $ns The namespace

-    * @return mixed The prefix, false if the namespace has no prefixes

+    * @return string The prefix, false if the namespace has no prefixes

     * @access public

     */

 	function getPrefixFromNamespace($ns) {

@@ -898,7 +898,7 @@ 
 *

 * @param    int $timestamp Unix time stamp

 * @param	boolean $utc Whether the time stamp is UTC or local

-* @return	mixed ISO 8601 date string or false

+* @return	string|false ISO 8601 date string or false

 * @access   public

 */

 function timestamp_to_iso8601($timestamp,$utc=true){

Spacing +115 added lines, -115 removed lines

@@ -183,26 +183,26 @@ 
 	*/

 	var $typemap = array(

 	'http://www.w3.org/2001/XMLSchema' => array(

-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',

-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',

-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',

+		'string'=>'string', 'boolean'=>'boolean', 'float'=>'double', 'double'=>'double', 'decimal'=>'double',

+		'duration'=>'', 'dateTime'=>'string', 'time'=>'string', 'date'=>'string', 'gYearMonth'=>'',

+		'gYear'=>'', 'gMonthDay'=>'', 'gDay'=>'', 'gMonth'=>'', 'hexBinary'=>'string', 'base64Binary'=>'string',

 		// abstract "any" types

-		'anyType'=>'string','anySimpleType'=>'string',

+		'anyType'=>'string', 'anySimpleType'=>'string',

 		// derived datatypes

-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',

-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',

-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',

-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),

+		'normalizedString'=>'string', 'token'=>'string', 'language'=>'', 'NMTOKEN'=>'', 'NMTOKENS'=>'', 'Name'=>'', 'NCName'=>'', 'ID'=>'',

+		'IDREF'=>'', 'IDREFS'=>'', 'ENTITY'=>'', 'ENTITIES'=>'', 'integer'=>'integer', 'nonPositiveInteger'=>'integer',

+		'negativeInteger'=>'integer', 'long'=>'integer', 'int'=>'integer', 'short'=>'integer', 'byte'=>'integer', 'nonNegativeInteger'=>'integer',

+		'unsignedLong'=>'', 'unsignedInt'=>'', 'unsignedShort'=>'', 'unsignedByte'=>'', 'positiveInteger'=>''),

 	'http://www.w3.org/2000/10/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',

+		'float'=>'double', 'dateTime'=>'string',

+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),

 	'http://www.w3.org/1999/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+		'i4'=>'', 'int'=>'integer', 'boolean'=>'boolean', 'string'=>'string', 'double'=>'double',

+		'float'=>'double', 'dateTime'=>'string',

+		'timeInstant'=>'string', 'base64Binary'=>'string', 'base64'=>'string', 'ur-type'=>'array'),

 	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),

-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),

+	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string', 'array'=>'array', 'Array'=>'array'),

     'http://xml.apache.org/xml-soap' => array('Map')

 	);

 

@@ -214,8 +214,8 @@ 
 	* @deprecated

 	* @see	expandEntities

 	*/

-	var $xmlEntities = array('quot' => '"','amp' => '&',

-		'lt' => '<','gt' => '>','apos' => "'");

+	var $xmlEntities = array('quot' => '"', 'amp' => '&',

+		'lt' => '<', 'gt' => '>', 'apos' => "'");

 

 	/**

 	* constructor

@@ -272,7 +272,7 @@ 
 	* @param    string $string debug data

 	* @access   private

 	*/

-	function debug($string){

+	function debug($string) {

 		if ($this->debugLevel > 0) {

 			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");

 		}

@@ -284,7 +284,7 @@ 
 	* @param    string $string debug data

 	* @access   public

 	*/

-	function appendDebug($string){

+	function appendDebug($string) {

 		if ($this->debugLevel > 0) {

 			// it would be nice to use a memory stream here to use

 			// memory more efficiently

@@ -328,7 +328,7 @@ 
 		while (strpos($this->debug_str, '--')) {

 			$this->debug_str = str_replace('--', '- -', $this->debug_str);

 		}

-		$ret = "<!--\n" . $this->debug_str . "\n-->";

+		$ret = "<!--\n".$this->debug_str."\n-->";

     	return $ret;

 	}

 

@@ -355,8 +355,8 @@ 
 	* @return   mixed error string or false

 	* @access   public

 	*/

-	function getError(){

-		if($this->error_str != ''){

+	function getError() {

+		if ($this->error_str != '') {

 			return $this->error_str;

 		}

 		return false;

@@ -368,7 +368,7 @@ 
 	* @return   boolean $string error string

 	* @access   private

 	*/

-	function setError($str){

+	function setError($str) {

 		$this->error_str = $str;

 	}

 

@@ -404,12 +404,12 @@ 
 	* @return	string	The serialized element, possibly with child elements

     * @access	public

 	*/

-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {

+	function serialize_val($val, $name = false, $type = false, $name_ns = false, $type_ns = false, $attributes = false, $use = 'encoded', $soapval = false) {

 		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");

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

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

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

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

 

-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {

+    	if (is_object($val) && get_class($val) == 'soapval' && (!$soapval)) {

     		$this->debug("serialize_val: serialize soapval");

         	$xml = $val->serialize($use);

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

@@ -419,30 +419,30 @@ 
         }

 		// force valid name if necessary

 		if (is_numeric($name)) {

-			$name = '__numeric_' . $name;

-		} elseif (! $name) {

+			$name = '__numeric_'.$name;

+		} elseif (!$name) {

 			$name = 'noname';

 		}

 		// if name has ns, add ns prefix to name

 		$xmlns = '';

-        if($name_ns){

-			$prefix = 'nu'.rand(1000,9999);

+        if ($name_ns) {

+			$prefix = 'nu'.rand(1000, 9999);

 			$name = $prefix.':'.$name;

 			$xmlns .= " xmlns:$prefix=\"$name_ns\"";

 		}

 		// if type is prefixed, create type prefix

-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){

+		if ($type_ns != '' && $type_ns == $this->namespaces['xsd']) {

 			// need to fix this. shouldn't default to xsd if no ns specified

 		    // w/o checking against typemap

 			$type_prefix = 'xsd';

-		} elseif($type_ns){

-			$type_prefix = 'ns'.rand(1000,9999);

+		} elseif ($type_ns) {

+			$type_prefix = 'ns'.rand(1000, 9999);

 			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";

 		}

 		// serialize attributes if present

 		$atts = '';

-		if($attributes){

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

+		if ($attributes) {

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

 				$atts .= " $k=\"".$this->expandEntities($v).'"';

 			}

 		}

@@ -466,12 +466,12 @@ 
         	}

 		}

         // serialize if an xsd built-in primitive type

-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){

+        if ($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])) {

     		$this->debug("serialize_val: serialize xsd built-in primitive type");

         	if (is_bool($val)) {

         		if ($type == 'boolean') {

 	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

+	        	} elseif (!$val) {

 	        		$val = 0;

 	        	}

 			} else if (is_string($val)) {

@@ -489,12 +489,12 @@ 
         }

 		// detect type and serialize

 		$xml = '';

-		switch(true) {

+		switch (true) {

 			case (is_bool($val) || $type == 'boolean'):

 		   		$this->debug("serialize_val: serialize boolean");

         		if ($type == 'boolean') {

 	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

+	        	} elseif (!$val) {

 	        		$val = 0;

 	        	}

 				if ($use == 'literal') {

@@ -511,7 +511,7 @@ 
 					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";

 				}

 				break;

-			case (is_float($val)|| is_double($val) || $type == 'float'):

+			case (is_float($val) || is_double($val) || $type == 'float'):

 		   		$this->debug("serialize_val: serialize float");

 				if ($use == 'literal') {

 					$xml .= "<$name$xmlns$atts>$val</$name>";

@@ -536,17 +536,17 @@ 
 					$this->appendDebug($val->getDebug());

 					$val->clearDebug();

 		        } else {

-					if (! $name) {

+					if (!$name) {

 						$name = get_class($val);

 						$this->debug("In serialize_val, used class name $name as element name");

 					} else {

-						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));

+						$this->debug("In serialize_val, do not override name $name for element name for class ".get_class($val));

 					}

-					foreach(get_object_vars($val) as $k => $v){

-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);

+					foreach (get_object_vars($val) as $k => $v) {

+						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v, $k, false, false, false, false, $use) : $this->serialize_val($v, $k, false, false, false, false, $use);

 					}

 				}

-				if(isset($type) && isset($type_prefix)){

+				if (isset($type) && isset($type_prefix)) {

 					$type_str = " xsi:type=\"$type_prefix:$type\"";

 				} else {

 					$type_str = '';

@@ -561,12 +561,12 @@ 
 			case (is_array($val) || $type):

 				// detect if struct or array

 				$valueType = $this->isArraySimpleOrStruct($val);

-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){

+                if ($valueType == 'arraySimple' || preg_match('/^ArrayOf/', $type)) {

 			   		$this->debug("serialize_val: serialize array");

 					$i = 0;

-					if(is_array($val) && count($val)> 0){

-						foreach($val as $v){

-	                    	if(is_object($v) && get_class($v) ==  'soapval'){

+					if (is_array($val) && count($val) > 0) {

+						foreach ($val as $v) {

+	                    	if (is_object($v) && get_class($v) == 'soapval') {

 								$tt_ns = $v->type_ns;

 								$tt = $v->type;

 							} elseif (is_array($v)) {

@@ -576,26 +576,26 @@ 
 	                        }

 							$array_types[$tt] = 1;

 							// TODO: for literal, the name should be $name

-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);

+							$xml .= $this->serialize_val($v, 'item', false, false, false, false, $use);

 							++$i;

 						}

-						if(count($array_types) > 1){

+						if (count($array_types) > 1) {

 							$array_typename = 'xsd:anyType';

-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

+						} elseif (isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

 							if ($tt == 'integer') {

 								$tt = 'int';

 							}

 							$array_typename = 'xsd:'.$tt;

-						} elseif(isset($tt) && $tt == 'arraySimple'){

+						} elseif (isset($tt) && $tt == 'arraySimple') {

 							$array_typename = 'SOAP-ENC:Array';

-						} elseif(isset($tt) && $tt == 'arrayStruct'){

+						} elseif (isset($tt) && $tt == 'arrayStruct') {

 							$array_typename = 'unnamed_struct_use_soapval';

 						} else {

 							// if type is prefixed, create type prefix

-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){

-								 $array_typename = 'xsd:' . $tt;

+							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']) {

+								 $array_typename = 'xsd:'.$tt;

 							} elseif ($tt_ns) {

-								$tt_prefix = 'ns' . rand(1000, 9999);

+								$tt_prefix = 'ns'.rand(1000, 9999);

 								$array_typename = "$tt_prefix:$tt";

 								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";

 							} else {

@@ -625,7 +625,7 @@ 
 				} else {

 					// got a struct

 			   		$this->debug("serialize_val: serialize struct");

-					if(isset($type) && isset($type_prefix)){

+					if (isset($type) && isset($type_prefix)) {

 						$type_str = " xsi:type=\"$type_prefix:$type\"";

 					} else {

 						$type_str = '';

@@ -635,15 +635,15 @@ 
 					} else {

 						$xml .= "<$name$xmlns$type_str$atts>";

 					}

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

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

 						// Apache Map

 						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {

 							$xml .= '<item>';

-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);

-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);

+							$xml .= $this->serialize_val($k, 'key', false, false, false, false, $use);

+							$xml .= $this->serialize_val($v, 'value', false, false, false, false, $use);

 							$xml .= '</item>';

 						} else {

-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);

+							$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);

 						}

 					}

 					$xml .= "</$name>";

@@ -670,12 +670,12 @@ 
     * @return string the message

     * @access public

     */

-    function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){

+    function serializeEnvelope($body, $headers = false, $namespaces = array(), $style = 'rpc', $use = 'encoded', $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/') {

     // TODO: add an option to automatically run utf8_encode on $body and $headers

     // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows

     // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1

 

-	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");

+	$this->debug("In serializeEnvelope length=".strlen($body)." body (max 1000 characters)=".substr($body, 0, 1000)." style=$style use=$use encodingStyle=$encodingStyle");

 	$this->debug("headers:");

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

 	$this->debug("namespaces:");

@@ -683,15 +683,15 @@ 
 

 	// serialize namespaces

     $ns_string = '';

-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){

+	foreach (array_merge($this->namespaces, $namespaces) as $k => $v) {

 		$ns_string .= " xmlns:$k=\"$v\"";

 	}

-	if($encodingStyle) {

+	if ($encodingStyle) {

 		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";

 	}

 

 	// serialize headers

-	if($headers){

+	if ($headers) {

 		if (is_array($headers)) {

 			$xml = '';

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

@@ -708,7 +708,7 @@ 
 	}

 	// serialize envelope

 	return

-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".

+	'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?'.">".

 	'<SOAP-ENV:Envelope'.$ns_string.">".

 	$headers.

 	"<SOAP-ENV:Body>".

@@ -725,7 +725,7 @@ 
 	 * @access public

 	 * @deprecated

 	 */

-    function formatDump($str){

+    function formatDump($str) {

 		$str = htmlspecialchars($str);

 		return nl2br($str);

     }

@@ -737,7 +737,7 @@ 
 	* @return	string contracted qname

 	* @access   private

 	*/

-	function contractQname($qname){

+	function contractQname($qname) {

 		// get element namespace

 		//$this->xdebug("Contract $qname");

 		if (strrpos($qname, ':')) {

@@ -747,7 +747,7 @@ 
 			$ns = substr($qname, 0, strrpos($qname, ':'));

 			$p = $this->getPrefixFromNamespace($ns);

 			if ($p) {

-				return $p . ':' . $name;

+				return $p.':'.$name;

 			}

 			return $qname;

 		} else {

@@ -762,14 +762,14 @@ 
 	* @return	string expanded qname

 	* @access   private

 	*/

-	function expandQname($qname){

+	function expandQname($qname) {

 		// get element prefix

-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){

+		if (strpos($qname, ':') && !preg_match('/^http:\/\//', $qname)) {

 			// get unqualified name

-			$name = substr(strstr($qname,':'),1);

+			$name = substr(strstr($qname, ':'), 1);

 			// get ns prefix

-			$prefix = substr($qname,0,strpos($qname,':'));

-			if(isset($this->namespaces[$prefix])){

+			$prefix = substr($qname, 0, strpos($qname, ':'));

+			if (isset($this->namespaces[$prefix])) {

 				return $this->namespaces[$prefix].':'.$name;

 			} else {

 				return $qname;

@@ -787,10 +787,10 @@ 
     * @return string The local part

     * @access public

     */

-	function getLocalPart($str){

-		if($sstr = strrchr($str,':')){

+	function getLocalPart($str) {

+		if ($sstr = strrchr($str, ':')) {

 			// get unqualified name

-			return substr( $sstr, 1 );

+			return substr($sstr, 1);

 		} else {

 			return $str;

 		}

@@ -804,10 +804,10 @@ 
     * @return mixed The prefix or false if there is no prefix

     * @access public

     */

-	function getPrefix($str){

-		if($pos = strrpos($str,':')){

+	function getPrefix($str) {

+		if ($pos = strrpos($str, ':')) {

 			// get prefix

-			return substr($str,0,$pos);

+			return substr($str, 0, $pos);

 		}

 		return false;

 	}

@@ -819,7 +819,7 @@ 
     * @return mixed The namespace, false if no namespace has the specified prefix

     * @access public

     */

-	function getNamespaceFromPrefix($prefix){

+	function getNamespaceFromPrefix($prefix) {

 		if (isset($this->namespaces[$prefix])) {

 			return $this->namespaces[$prefix];

 		}

@@ -860,7 +860,7 @@ 
 			$sec = time();

 			$usec = 0;

 		}

-		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);

+		return strftime('%Y-%m-%d %H:%M:%S', $sec).'.'.sprintf('%06d', $usec);

 	}

 

 	/**

@@ -901,31 +901,31 @@ 
 * @return	mixed ISO 8601 date string or false

 * @access   public

 */

-function timestamp_to_iso8601($timestamp,$utc=true){

-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);

+function timestamp_to_iso8601($timestamp, $utc = true) {

+	$datestr = date('Y-m-d\TH:i:sO', $timestamp);

 	$pos = strrpos($datestr, "+");

 	if ($pos === FALSE) {

 		$pos = strrpos($datestr, "-");

 	}

 	if ($pos !== FALSE) {

 		if (strlen($datestr) == $pos + 5) {

-			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);

+			$datestr = substr($datestr, 0, $pos + 3).':'.substr($datestr, -2);

 		}

 	}

-	if($utc){

+	if ($utc) {

 		$pattern = '/'.

-		'([0-9]{4})-'.	// centuries & years CCYY-

-		'([0-9]{2})-'.	// months MM-

-		'([0-9]{2})'.	// days DD

-		'T'.			// separator T

-		'([0-9]{2}):'.	// hours hh:

-		'([0-9]{2}):'.	// minutes mm:

-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...

-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+		'([0-9]{4})-'.// centuries & years CCYY-

+		'([0-9]{2})-'.// months MM-

+		'([0-9]{2})'.// days DD

+		'T'.// separator T

+		'([0-9]{2}):'.// hours hh:

+		'([0-9]{2}):'.// minutes mm:

+		'([0-9]{2})(\.[0-9]*)?'.// seconds ss.ss...

+		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'.// Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

 		'/';

 

-		if(preg_match($pattern,$datestr,$regs)){

-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);

+		if (preg_match($pattern, $datestr, $regs)) {

+			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ', $regs[1], $regs[2], $regs[3], $regs[4], $regs[5], $regs[6]);

 		}

 		return false;

 	} else {

@@ -940,27 +940,27 @@ 
 * @return	mixed Unix timestamp (int) or false

 * @access   public

 */

-function iso8601_to_timestamp($datestr){

+function iso8601_to_timestamp($datestr) {

 	$pattern = '/'.

-	'([0-9]{4})-'.	// centuries & years CCYY-

-	'([0-9]{2})-'.	// months MM-

-	'([0-9]{2})'.	// days DD

-	'T'.			// separator T

-	'([0-9]{2}):'.	// hours hh:

-	'([0-9]{2}):'.	// minutes mm:

-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...

-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+	'([0-9]{4})-'.// centuries & years CCYY-

+	'([0-9]{2})-'.// months MM-

+	'([0-9]{2})'.// days DD

+	'T'.// separator T

+	'([0-9]{2}):'.// hours hh:

+	'([0-9]{2}):'.// minutes mm:

+	'([0-9]{2})(\.[0-9]+)?'.// seconds ss.ss...

+	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'.// Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

 	'/';

-	if(preg_match($pattern,$datestr,$regs)){

+	if (preg_match($pattern, $datestr, $regs)) {

 		// not utc

-		if($regs[8] != 'Z'){

-			$op = substr($regs[8],0,1);

-			$h = substr($regs[8],1,2);

-			$m = substr($regs[8],strlen($regs[8])-2,2);

-			if($op == '-'){

+		if ($regs[8] != 'Z') {

+			$op = substr($regs[8], 0, 1);

+			$h = substr($regs[8], 1, 2);

+			$m = substr($regs[8], strlen($regs[8]) - 2, 2);

+			if ($op == '-') {

 				$regs[4] = $regs[4] + $h;

 				$regs[5] = $regs[5] + $m;

-			} elseif($op == '+'){

+			} elseif ($op == '+') {

 				$regs[4] = $regs[4] - $h;

 				$regs[5] = $regs[5] - $m;

 			}

Indentation +845 added lines, -845 removed lines

@@ -84,810 +84,810 @@ 
 */

 class nusoap_base

 {

-	/**

-	 * Identification for HTTP headers.

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $title = 'NuSOAP';

-	/**

-	 * Version for HTTP headers.

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $version = '0.9.5';

-	/**

-	 * CVS revision for HTTP headers.

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $revision = '$Revision: 1.56 $';

+    /**

+     * Identification for HTTP headers.

+     *

+     * @var string

+     * @access private

+     */

+    var $title = 'NuSOAP';

+    /**

+     * Version for HTTP headers.

+     *

+     * @var string

+     * @access private

+     */

+    var $version = '0.9.5';

+    /**

+     * CVS revision for HTTP headers.

+     *

+     * @var string

+     * @access private

+     */

+    var $revision = '$Revision: 1.56 $';

     /**

      * Current error string (manipulated by getError/setError)

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $error_str = '';

+     *

+     * @var string

+     * @access private

+     */

+    var $error_str = '';

     /**

      * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)

-	 *

-	 * @var string

-	 * @access private

-	 */

+     *

+     * @var string

+     * @access private

+     */

     var $debug_str = '';

     /**

-	 * toggles automatic encoding of special characters as entities

-	 * (should always be true, I think)

-	 *

-	 * @var boolean

-	 * @access private

-	 */

-	var $charencoding = true;

-	/**

-	 * the debug level for this instance

-	 *

-	 * @var	integer

-	 * @access private

-	 */

-	var $debugLevel;

-

-    /**

-	* set schema version

-	*

-	* @var      string

-	* @access   public

-	*/

-	var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';

-

-    /**

-	* charset encoding for outgoing messages

-	*

-	* @var      string

-	* @access   public

-	*/

+     * toggles automatic encoding of special characters as entities

+     * (should always be true, I think)

+     *

+     * @var boolean

+     * @access private

+     */

+    var $charencoding = true;

+    /**

+     * the debug level for this instance

+     *

+     * @var	integer

+     * @access private

+     */

+    var $debugLevel;

+

+    /**

+     * set schema version

+     *

+     * @var      string

+     * @access   public

+     */

+    var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';

+

+    /**

+     * charset encoding for outgoing messages

+     *

+     * @var      string

+     * @access   public

+     */

     var $soap_defencoding = 'ISO-8859-1';

-	//var $soap_defencoding = 'UTF-8';

-

-	/**

-	* namespaces in an array of prefix => uri

-	*

-	* this is "seeded" by a set of constants, but it may be altered by code

-	*

-	* @var      array

-	* @access   public

-	*/

-	var $namespaces = array(

-		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',

-		'xsd' => 'http://www.w3.org/2001/XMLSchema',

-		'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',

-		'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'

-		);

-

-	/**

-	* namespaces used in the current context, e.g. during serialization

-	*

-	* @var      array

-	* @access   private

-	*/

-	var $usedNamespaces = array();

-

-	/**

-	* XML Schema types in an array of uri => (array of xml type => php type)

-	* is this legacy yet?

-	* no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.

-	* @var      array

-	* @access   public

-	*/

-	var $typemap = array(

-	'http://www.w3.org/2001/XMLSchema' => array(

-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',

-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',

-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',

-		// abstract "any" types

-		'anyType'=>'string','anySimpleType'=>'string',

-		// derived datatypes

-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',

-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',

-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',

-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),

-	'http://www.w3.org/2000/10/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

-	'http://www.w3.org/1999/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

-	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),

-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),

+    //var $soap_defencoding = 'UTF-8';

+

+    /**

+     * namespaces in an array of prefix => uri

+     *

+     * this is "seeded" by a set of constants, but it may be altered by code

+     *

+     * @var      array

+     * @access   public

+     */

+    var $namespaces = array(

+        'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',

+        'xsd' => 'http://www.w3.org/2001/XMLSchema',

+        'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',

+        'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'

+        );

+

+    /**

+     * namespaces used in the current context, e.g. during serialization

+     *

+     * @var      array

+     * @access   private

+     */

+    var $usedNamespaces = array();

+

+    /**

+     * XML Schema types in an array of uri => (array of xml type => php type)

+     * is this legacy yet?

+     * no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.

+     * @var      array

+     * @access   public

+     */

+    var $typemap = array(

+    'http://www.w3.org/2001/XMLSchema' => array(

+        'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',

+        'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',

+        'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',

+        // abstract "any" types

+        'anyType'=>'string','anySimpleType'=>'string',

+        // derived datatypes

+        'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',

+        'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',

+        'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',

+        'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),

+    'http://www.w3.org/2000/10/XMLSchema' => array(

+        'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

+        'float'=>'double','dateTime'=>'string',

+        'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+    'http://www.w3.org/1999/XMLSchema' => array(

+        'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

+        'float'=>'double','dateTime'=>'string',

+        'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+    'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),

+    'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),

     'http://xml.apache.org/xml-soap' => array('Map')

-	);

-

-	/**

-	* XML entities to convert

-	*

-	* @var      array

-	* @access   public

-	* @deprecated

-	* @see	expandEntities

-	*/

-	var $xmlEntities = array('quot' => '"','amp' => '&',

-		'lt' => '<','gt' => '>','apos' => "'");

-

-	/**

-	* constructor

-	*

-	* @access	public

-	*/

-	public function __construct()

+    );

+

+    /**

+     * XML entities to convert

+     *

+     * @var      array

+     * @access   public

+     * @deprecated

+     * @see	expandEntities

+     */

+    var $xmlEntities = array('quot' => '"','amp' => '&',

+        'lt' => '<','gt' => '>','apos' => "'");

+

+    /**

+     * constructor

+     *

+     * @access	public

+     */

+    public function __construct()

     {

-		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

-	}

-

-	/**

-	* gets the global debug level, which applies to future instances

-	*

-	* @return	integer	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function getGlobalDebugLevel() {

-		return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

-	}

-

-	/**

-	* sets the global debug level, which applies to future instances

-	*

-	* @param	int	$level	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function setGlobalDebugLevel($level) {

-		$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;

-	}

-

-	/**

-	* gets the debug level for this instance

-	*

-	* @return	int	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function getDebugLevel() {

-		return $this->debugLevel;

-	}

-

-	/**

-	* sets the debug level for this instance

-	*

-	* @param	int	$level	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function setDebugLevel($level) {

-		$this->debugLevel = $level;

-	}

-

-	/**

-	* adds debug data to the instance debug string with formatting

-	*

-	* @param    string $string debug data

-	* @access   private

-	*/

-	function debug($string){

-		if ($this->debugLevel > 0) {

-			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");

-		}

-	}

-

-	/**

-	* adds debug data to the instance debug string without formatting

-	*

-	* @param    string $string debug data

-	* @access   public

-	*/

-	function appendDebug($string){

-		if ($this->debugLevel > 0) {

-			// it would be nice to use a memory stream here to use

-			// memory more efficiently

-			$this->debug_str .= $string;

-		}

-	}

-

-	/**

-	* clears the current debug data for this instance

-	*

-	* @access   public

-	*/

-	function clearDebug() {

-		// it would be nice to use a memory stream here to use

-		// memory more efficiently

-		$this->debug_str = '';

-	}

-

-	/**

-	* gets the current debug data for this instance

-	*

-	* @return   debug data

-	* @access   public

-	*/

-	function &getDebug() {

-		// it would be nice to use a memory stream here to use

-		// memory more efficiently

-		return $this->debug_str;

-	}

-

-	/**

-	* gets the current debug data for this instance as an XML comment

-	* this may change the contents of the debug data

-	*

-	* @return   debug data as an XML comment

-	* @access   public

-	*/

-	function &getDebugAsXMLComment() {

-		// it would be nice to use a memory stream here to use

-		// memory more efficiently

-		while (strpos($this->debug_str, '--')) {

-			$this->debug_str = str_replace('--', '- -', $this->debug_str);

-		}

-		$ret = "<!--\n" . $this->debug_str . "\n-->";

-    	return $ret;

-	}

-

-	/**

-	* expands entities, e.g. changes '<' to '&lt;'.

-	*

-	* @param	string	$val	The string in which to expand entities.

-	* @access	private

-	*/

-	function expandEntities($val) {

-		if ($this->charencoding) {

-	    	$val = str_replace('&', '&amp;', $val);

-	    	$val = str_replace("'", '&apos;', $val);

-	    	$val = str_replace('"', '&quot;', $val);

-	    	$val = str_replace('<', '&lt;', $val);

-	    	$val = str_replace('>', '&gt;', $val);

-	    }

-	    return $val;

-	}

-

-	/**

-	* returns error string if present

-	*

-	* @return   mixed error string or false

-	* @access   public

-	*/

-	function getError(){

-		if($this->error_str != ''){

-			return $this->error_str;

-		}

-		return false;

-	}

-

-	/**

-	* sets error string

-	*

-	* @return   boolean $string error string

-	* @access   private

-	*/

-	function setError($str){

-		$this->error_str = $str;

-	}

-

-	/**

-	* detect if array is a simple array or a struct (associative array)

-	*

-	* @param	mixed	$val	The PHP array

-	* @return	string	(arraySimple|arrayStruct)

-	* @access	private

-	*/

-	function isArraySimpleOrStruct($val) {

+        $this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

+    }

+

+    /**

+     * gets the global debug level, which applies to future instances

+     *

+     * @return	integer	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function getGlobalDebugLevel() {

+        return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

+    }

+

+    /**

+     * sets the global debug level, which applies to future instances

+     *

+     * @param	int	$level	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function setGlobalDebugLevel($level) {

+        $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;

+    }

+

+    /**

+     * gets the debug level for this instance

+     *

+     * @return	int	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function getDebugLevel() {

+        return $this->debugLevel;

+    }

+

+    /**

+     * sets the debug level for this instance

+     *

+     * @param	int	$level	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function setDebugLevel($level) {

+        $this->debugLevel = $level;

+    }

+

+    /**

+     * adds debug data to the instance debug string with formatting

+     *

+     * @param    string $string debug data

+     * @access   private

+     */

+    function debug($string){

+        if ($this->debugLevel > 0) {

+            $this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");

+        }

+    }

+

+    /**

+     * adds debug data to the instance debug string without formatting

+     *

+     * @param    string $string debug data

+     * @access   public

+     */

+    function appendDebug($string){

+        if ($this->debugLevel > 0) {

+            // it would be nice to use a memory stream here to use

+            // memory more efficiently

+            $this->debug_str .= $string;

+        }

+    }

+

+    /**

+     * clears the current debug data for this instance

+     *

+     * @access   public

+     */

+    function clearDebug() {

+        // it would be nice to use a memory stream here to use

+        // memory more efficiently

+        $this->debug_str = '';

+    }

+

+    /**

+     * gets the current debug data for this instance

+     *

+     * @return   debug data

+     * @access   public

+     */

+    function &getDebug() {

+        // it would be nice to use a memory stream here to use

+        // memory more efficiently

+        return $this->debug_str;

+    }

+

+    /**

+     * gets the current debug data for this instance as an XML comment

+     * this may change the contents of the debug data

+     *

+     * @return   debug data as an XML comment

+     * @access   public

+     */

+    function &getDebugAsXMLComment() {

+        // it would be nice to use a memory stream here to use

+        // memory more efficiently

+        while (strpos($this->debug_str, '--')) {

+            $this->debug_str = str_replace('--', '- -', $this->debug_str);

+        }

+        $ret = "<!--\n" . $this->debug_str . "\n-->";

+        return $ret;

+    }

+

+    /**

+     * expands entities, e.g. changes '<' to '&lt;'.

+     *

+     * @param	string	$val	The string in which to expand entities.

+     * @access	private

+     */

+    function expandEntities($val) {

+        if ($this->charencoding) {

+            $val = str_replace('&', '&amp;', $val);

+            $val = str_replace("'", '&apos;', $val);

+            $val = str_replace('"', '&quot;', $val);

+            $val = str_replace('<', '&lt;', $val);

+            $val = str_replace('>', '&gt;', $val);

+        }

+        return $val;

+    }

+

+    /**

+     * returns error string if present

+     *

+     * @return   mixed error string or false

+     * @access   public

+     */

+    function getError(){

+        if($this->error_str != ''){

+            return $this->error_str;

+        }

+        return false;

+    }

+

+    /**

+     * sets error string

+     *

+     * @return   boolean $string error string

+     * @access   private

+     */

+    function setError($str){

+        $this->error_str = $str;

+    }

+

+    /**

+     * detect if array is a simple array or a struct (associative array)

+     *

+     * @param	mixed	$val	The PHP array

+     * @return	string	(arraySimple|arrayStruct)

+     * @access	private

+     */

+    function isArraySimpleOrStruct($val) {

         $keyList = array_keys($val);

-		foreach ($keyList as $keyListValue) {

-			if (!is_int($keyListValue)) {

-				return 'arrayStruct';

-			}

-		}

-		return 'arraySimple';

-	}

-

-	/**

-	* serializes PHP values in accordance w/ section 5. Type information is

-	* not serialized if $use == 'literal'.

-	*

-	* @param	mixed	$val	The value to serialize

-	* @param	string	$name	The name (local part) of the XML element

-	* @param	string	$type	The XML schema type (local part) for the element

-	* @param	string	$name_ns	The namespace for the name of the XML element

-	* @param	string	$type_ns	The namespace for the type of the element

-	* @param	array	$attributes	The attributes to serialize as name=>value pairs

-	* @param	string	$use	The WSDL "use" (encoded|literal)

-	* @param	boolean	$soapval	Whether this is called from soapval.

-	* @return	string	The serialized element, possibly with child elements

-    * @access	public

-	*/

-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {

-		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");

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

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

-

-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {

-    		$this->debug("serialize_val: serialize soapval");

-        	$xml = $val->serialize($use);

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

-			$val->clearDebug();

-			$this->debug("serialize_val of soapval returning $xml");

-			return $xml;

+        foreach ($keyList as $keyListValue) {

+            if (!is_int($keyListValue)) {

+                return 'arrayStruct';

+            }

+        }

+        return 'arraySimple';

+    }

+

+    /**

+     * serializes PHP values in accordance w/ section 5. Type information is

+     * not serialized if $use == 'literal'.

+     *

+     * @param	mixed	$val	The value to serialize

+     * @param	string	$name	The name (local part) of the XML element

+     * @param	string	$type	The XML schema type (local part) for the element

+     * @param	string	$name_ns	The namespace for the name of the XML element

+     * @param	string	$type_ns	The namespace for the type of the element

+     * @param	array	$attributes	The attributes to serialize as name=>value pairs

+     * @param	string	$use	The WSDL "use" (encoded|literal)

+     * @param	boolean	$soapval	Whether this is called from soapval.

+     * @return	string	The serialized element, possibly with child elements

+     * @access	public

+     */

+    function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {

+        $this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");

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

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

+

+        if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {

+            $this->debug("serialize_val: serialize soapval");

+            $xml = $val->serialize($use);

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

+            $val->clearDebug();

+            $this->debug("serialize_val of soapval returning $xml");

+            return $xml;

         }

-		// force valid name if necessary

-		if (is_numeric($name)) {

-			$name = '__numeric_' . $name;

-		} elseif (! $name) {

-			$name = 'noname';

-		}

-		// if name has ns, add ns prefix to name

-		$xmlns = '';

+        // force valid name if necessary

+        if (is_numeric($name)) {

+            $name = '__numeric_' . $name;

+        } elseif (! $name) {

+            $name = 'noname';

+        }

+        // if name has ns, add ns prefix to name

+        $xmlns = '';

         if($name_ns){

-			$prefix = 'nu'.rand(1000,9999);

-			$name = $prefix.':'.$name;

-			$xmlns .= " xmlns:$prefix=\"$name_ns\"";

-		}

-		// if type is prefixed, create type prefix

-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){

-			// need to fix this. shouldn't default to xsd if no ns specified

-		    // w/o checking against typemap

-			$type_prefix = 'xsd';

-		} elseif($type_ns){

-			$type_prefix = 'ns'.rand(1000,9999);

-			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";

-		}

-		// serialize attributes if present

-		$atts = '';

-		if($attributes){

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

-				$atts .= " $k=\"".$this->expandEntities($v).'"';

-			}

-		}

-		// serialize null value

-		if (is_null($val)) {

-    		$this->debug("serialize_val: serialize null");

-			if ($use == 'literal') {

-				// TODO: depends on minOccurs

-				$xml = "<$name$xmlns$atts/>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	} else {

-				if (isset($type) && isset($type_prefix)) {

-					$type_str = " xsi:type=\"$type_prefix:$type\"";

-				} else {

-					$type_str = '';

-				}

-				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	}

-		}

+            $prefix = 'nu'.rand(1000,9999);

+            $name = $prefix.':'.$name;

+            $xmlns .= " xmlns:$prefix=\"$name_ns\"";

+        }

+        // if type is prefixed, create type prefix

+        if($type_ns != '' && $type_ns == $this->namespaces['xsd']){

+            // need to fix this. shouldn't default to xsd if no ns specified

+            // w/o checking against typemap

+            $type_prefix = 'xsd';

+        } elseif($type_ns){

+            $type_prefix = 'ns'.rand(1000,9999);

+            $xmlns .= " xmlns:$type_prefix=\"$type_ns\"";

+        }

+        // serialize attributes if present

+        $atts = '';

+        if($attributes){

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

+                $atts .= " $k=\"".$this->expandEntities($v).'"';

+            }

+        }

+        // serialize null value

+        if (is_null($val)) {

+            $this->debug("serialize_val: serialize null");

+            if ($use == 'literal') {

+                // TODO: depends on minOccurs

+                $xml = "<$name$xmlns$atts/>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            } else {

+                if (isset($type) && isset($type_prefix)) {

+                    $type_str = " xsi:type=\"$type_prefix:$type\"";

+                } else {

+                    $type_str = '';

+                }

+                $xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            }

+        }

         // serialize if an xsd built-in primitive type

         if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){

-    		$this->debug("serialize_val: serialize xsd built-in primitive type");

-        	if (is_bool($val)) {

-        		if ($type == 'boolean') {

-	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

-	        		$val = 0;

-	        	}

-			} else if (is_string($val)) {

-				$val = $this->expandEntities($val);

-			}

-			if ($use == 'literal') {

-				$xml = "<$name$xmlns$atts>$val</$name>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	} else {

-				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	}

+            $this->debug("serialize_val: serialize xsd built-in primitive type");

+            if (is_bool($val)) {

+                if ($type == 'boolean') {

+                    $val = $val ? 'true' : 'false';

+                } elseif (! $val) {

+                    $val = 0;

+                }

+            } else if (is_string($val)) {

+                $val = $this->expandEntities($val);

+            }

+            if ($use == 'literal') {

+                $xml = "<$name$xmlns$atts>$val</$name>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            } else {

+                $xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            }

         }

-		// detect type and serialize

-		$xml = '';

-		switch(true) {

-			case (is_bool($val) || $type == 'boolean'):

-		   		$this->debug("serialize_val: serialize boolean");

-        		if ($type == 'boolean') {

-	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

-	        		$val = 0;

-	        	}

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";

-				}

-				break;

-			case (is_int($val) || is_long($val) || $type == 'int'):

-		   		$this->debug("serialize_val: serialize int");

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";

-				}

-				break;

-			case (is_float($val)|| is_double($val) || $type == 'float'):

-		   		$this->debug("serialize_val: serialize float");

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";

-				}

-				break;

-			case (is_string($val) || $type == 'string'):

-		   		$this->debug("serialize_val: serialize string");

-				$val = $this->expandEntities($val);

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";

-				}

-				break;

-			case is_object($val):

-		   		$this->debug("serialize_val: serialize object");

-		    	if (get_class($val) == 'soapval') {

-		    		$this->debug("serialize_val: serialize soapval object");

-		        	$pXml = $val->serialize($use);

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

-					$val->clearDebug();

-		        } else {

-					if (! $name) {

-						$name = get_class($val);

-						$this->debug("In serialize_val, used class name $name as element name");

-					} else {

-						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));

-					}

-					foreach(get_object_vars($val) as $k => $v){

-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);

-					}

-				}

-				if(isset($type) && isset($type_prefix)){

-					$type_str = " xsi:type=\"$type_prefix:$type\"";

-				} else {

-					$type_str = '';

-				}

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$pXml</$name>";

-				} else {

-					$xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";

-				}

-				break;

-			case (is_array($val) || $type):

-				// detect if struct or array

-				$valueType = $this->isArraySimpleOrStruct($val);

+        // detect type and serialize

+        $xml = '';

+        switch(true) {

+            case (is_bool($val) || $type == 'boolean'):

+                   $this->debug("serialize_val: serialize boolean");

+                if ($type == 'boolean') {

+                    $val = $val ? 'true' : 'false';

+                } elseif (! $val) {

+                    $val = 0;

+                }

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";

+                }

+                break;

+            case (is_int($val) || is_long($val) || $type == 'int'):

+                   $this->debug("serialize_val: serialize int");

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";

+                }

+                break;

+            case (is_float($val)|| is_double($val) || $type == 'float'):

+                   $this->debug("serialize_val: serialize float");

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";

+                }

+                break;

+            case (is_string($val) || $type == 'string'):

+                   $this->debug("serialize_val: serialize string");

+                $val = $this->expandEntities($val);

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";

+                }

+                break;

+            case is_object($val):

+                   $this->debug("serialize_val: serialize object");

+                if (get_class($val) == 'soapval') {

+                    $this->debug("serialize_val: serialize soapval object");

+                    $pXml = $val->serialize($use);

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

+                    $val->clearDebug();

+                } else {

+                    if (! $name) {

+                        $name = get_class($val);

+                        $this->debug("In serialize_val, used class name $name as element name");

+                    } else {

+                        $this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));

+                    }

+                    foreach(get_object_vars($val) as $k => $v){

+                        $pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);

+                    }

+                }

+                if(isset($type) && isset($type_prefix)){

+                    $type_str = " xsi:type=\"$type_prefix:$type\"";

+                } else {

+                    $type_str = '';

+                }

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$pXml</$name>";

+                } else {

+                    $xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";

+                }

+                break;

+            case (is_array($val) || $type):

+                // detect if struct or array

+                $valueType = $this->isArraySimpleOrStruct($val);

                 if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){

-			   		$this->debug("serialize_val: serialize array");

-					$i = 0;

-					if(is_array($val) && count($val)> 0){

-						foreach($val as $v){

-	                    	if(is_object($v) && get_class($v) ==  'soapval'){

-								$tt_ns = $v->type_ns;

-								$tt = $v->type;

-							} elseif (is_array($v)) {

-								$tt = $this->isArraySimpleOrStruct($v);

-							} else {

-								$tt = gettype($v);

-	                        }

-							$array_types[$tt] = 1;

-							// TODO: for literal, the name should be $name

-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);

-							++$i;

-						}

-						if(count($array_types) > 1){

-							$array_typename = 'xsd:anyType';

-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

-							if ($tt == 'integer') {

-								$tt = 'int';

-							}

-							$array_typename = 'xsd:'.$tt;

-						} elseif(isset($tt) && $tt == 'arraySimple'){

-							$array_typename = 'SOAP-ENC:Array';

-						} elseif(isset($tt) && $tt == 'arrayStruct'){

-							$array_typename = 'unnamed_struct_use_soapval';

-						} else {

-							// if type is prefixed, create type prefix

-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){

-								 $array_typename = 'xsd:' . $tt;

-							} elseif ($tt_ns) {

-								$tt_prefix = 'ns' . rand(1000, 9999);

-								$array_typename = "$tt_prefix:$tt";

-								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";

-							} else {

-								$array_typename = $tt;

-							}

-						}

-						$array_type = $i;

-						if ($use == 'literal') {

-							$type_str = '';

-						} else if (isset($type) && isset($type_prefix)) {

-							$type_str = " xsi:type=\"$type_prefix:$type\"";

-						} else {

-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";

-						}

-					// empty array

-					} else {

-						if ($use == 'literal') {

-							$type_str = '';

-						} else if (isset($type) && isset($type_prefix)) {

-							$type_str = " xsi:type=\"$type_prefix:$type\"";

-						} else {

-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";

-						}

-					}

-					// TODO: for array in literal, there is no wrapper here

-					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";

-				} else {

-					// got a struct

-			   		$this->debug("serialize_val: serialize struct");

-					if(isset($type) && isset($type_prefix)){

-						$type_str = " xsi:type=\"$type_prefix:$type\"";

-					} else {

-						$type_str = '';

-					}

-					if ($use == 'literal') {

-						$xml .= "<$name$xmlns$atts>";

-					} else {

-						$xml .= "<$name$xmlns$type_str$atts>";

-					}

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

-						// Apache Map

-						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {

-							$xml .= '<item>';

-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);

-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);

-							$xml .= '</item>';

-						} else {

-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);

-						}

-					}

-					$xml .= "</$name>";

-				}

-				break;

-			default:

-		   		$this->debug("serialize_val: serialize unknown");

-				$xml .= 'not detected, got '.gettype($val).' for '.$val;

-				break;

-		}

-		$this->debug("serialize_val returning $xml");

-		return $xml;

-	}

-

-    /**

-    * serializes a message

-    *

-    * @param string $body the XML of the SOAP body

-    * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array

-    * @param array $namespaces optional the namespaces used in generating the body and headers

-    * @param string $style optional (rpc|document)

-    * @param string $use optional (encoded|literal)

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

-    * @return string the message

-    * @access public

-    */

+                        $this->debug("serialize_val: serialize array");

+                    $i = 0;

+                    if(is_array($val) && count($val)> 0){

+                        foreach($val as $v){

+                            if(is_object($v) && get_class($v) ==  'soapval'){

+                                $tt_ns = $v->type_ns;

+                                $tt = $v->type;

+                            } elseif (is_array($v)) {

+                                $tt = $this->isArraySimpleOrStruct($v);

+                            } else {

+                                $tt = gettype($v);

+                            }

+                            $array_types[$tt] = 1;

+                            // TODO: for literal, the name should be $name

+                            $xml .= $this->serialize_val($v,'item',false,false,false,false,$use);

+                            ++$i;

+                        }

+                        if(count($array_types) > 1){

+                            $array_typename = 'xsd:anyType';

+                        } elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

+                            if ($tt == 'integer') {

+                                $tt = 'int';

+                            }

+                            $array_typename = 'xsd:'.$tt;

+                        } elseif(isset($tt) && $tt == 'arraySimple'){

+                            $array_typename = 'SOAP-ENC:Array';

+                        } elseif(isset($tt) && $tt == 'arrayStruct'){

+                            $array_typename = 'unnamed_struct_use_soapval';

+                        } else {

+                            // if type is prefixed, create type prefix

+                            if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){

+                                    $array_typename = 'xsd:' . $tt;

+                            } elseif ($tt_ns) {

+                                $tt_prefix = 'ns' . rand(1000, 9999);

+                                $array_typename = "$tt_prefix:$tt";

+                                $xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";

+                            } else {

+                                $array_typename = $tt;

+                            }

+                        }

+                        $array_type = $i;

+                        if ($use == 'literal') {

+                            $type_str = '';

+                        } else if (isset($type) && isset($type_prefix)) {

+                            $type_str = " xsi:type=\"$type_prefix:$type\"";

+                        } else {

+                            $type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";

+                        }

+                    // empty array

+                    } else {

+                        if ($use == 'literal') {

+                            $type_str = '';

+                        } else if (isset($type) && isset($type_prefix)) {

+                            $type_str = " xsi:type=\"$type_prefix:$type\"";

+                        } else {

+                            $type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";

+                        }

+                    }

+                    // TODO: for array in literal, there is no wrapper here

+                    $xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";

+                } else {

+                    // got a struct

+                        $this->debug("serialize_val: serialize struct");

+                    if(isset($type) && isset($type_prefix)){

+                        $type_str = " xsi:type=\"$type_prefix:$type\"";

+                    } else {

+                        $type_str = '';

+                    }

+                    if ($use == 'literal') {

+                        $xml .= "<$name$xmlns$atts>";

+                    } else {

+                        $xml .= "<$name$xmlns$type_str$atts>";

+                    }

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

+                        // Apache Map

+                        if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {

+                            $xml .= '<item>';

+                            $xml .= $this->serialize_val($k,'key',false,false,false,false,$use);

+                            $xml .= $this->serialize_val($v,'value',false,false,false,false,$use);

+                            $xml .= '</item>';

+                        } else {

+                            $xml .= $this->serialize_val($v,$k,false,false,false,false,$use);

+                        }

+                    }

+                    $xml .= "</$name>";

+                }

+                break;

+            default:

+                   $this->debug("serialize_val: serialize unknown");

+                $xml .= 'not detected, got '.gettype($val).' for '.$val;

+                break;

+        }

+        $this->debug("serialize_val returning $xml");

+        return $xml;

+    }

+

+    /**

+     * serializes a message

+     *

+     * @param string $body the XML of the SOAP body

+     * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array

+     * @param array $namespaces optional the namespaces used in generating the body and headers

+     * @param string $style optional (rpc|document)

+     * @param string $use optional (encoded|literal)

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

+     * @return string the message

+     * @access public

+     */

     function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){

     // TODO: add an option to automatically run utf8_encode on $body and $headers

     // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows

     // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1

 

-	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");

-	$this->debug("headers:");

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

-	$this->debug("namespaces:");

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

+    $this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");

+    $this->debug("headers:");

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

+    $this->debug("namespaces:");

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

 

-	// serialize namespaces

+    // serialize namespaces

     $ns_string = '';

-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){

-		$ns_string .= " xmlns:$k=\"$v\"";

-	}

-	if($encodingStyle) {

-		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";

-	}

-

-	// serialize headers

-	if($headers){

-		if (is_array($headers)) {

-			$xml = '';

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

-				if (is_object($v) && get_class($v) == 'soapval') {

-					$xml .= $this->serialize_val($v, false, false, false, false, false, $use);

-				} else {

-					$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);

-				}

-			}

-			$headers = $xml;

-			$this->debug("In serializeEnvelope, serialized array of headers to $headers");

-		}

-		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";

-	}

-	// serialize envelope

-	return

-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".

-	'<SOAP-ENV:Envelope'.$ns_string.">".

-	$headers.

-	"<SOAP-ENV:Body>".

-		$body.

-	"</SOAP-ENV:Body>".

-	"</SOAP-ENV:Envelope>";

-    }

-

-	/**

-	 * formats a string to be inserted into an HTML stream

-	 *

-	 * @param string $str The string to format

-	 * @return string The formatted string

-	 * @access public

-	 * @deprecated

-	 */

+    foreach(array_merge($this->namespaces,$namespaces) as $k => $v){

+        $ns_string .= " xmlns:$k=\"$v\"";

+    }

+    if($encodingStyle) {

+        $ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";

+    }

+

+    // serialize headers

+    if($headers){

+        if (is_array($headers)) {

+            $xml = '';

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

+                if (is_object($v) && get_class($v) == 'soapval') {

+                    $xml .= $this->serialize_val($v, false, false, false, false, false, $use);

+                } else {

+                    $xml .= $this->serialize_val($v, $k, false, false, false, false, $use);

+                }

+            }

+            $headers = $xml;

+            $this->debug("In serializeEnvelope, serialized array of headers to $headers");

+        }

+        $headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";

+    }

+    // serialize envelope

+    return

+    '<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".

+    '<SOAP-ENV:Envelope'.$ns_string.">".

+    $headers.

+    "<SOAP-ENV:Body>".

+        $body.

+    "</SOAP-ENV:Body>".

+    "</SOAP-ENV:Envelope>";

+    }

+

+    /**

+     * formats a string to be inserted into an HTML stream

+     *

+     * @param string $str The string to format

+     * @return string The formatted string

+     * @access public

+     * @deprecated

+     */

     function formatDump($str){

-		$str = htmlspecialchars($str);

-		return nl2br($str);

-    }

-

-	/**

-	* contracts (changes namespace to prefix) a qualified name

-	*

-	* @param    string $qname qname

-	* @return	string contracted qname

-	* @access   private

-	*/

-	function contractQname($qname){

-		// get element namespace

-		//$this->xdebug("Contract $qname");

-		if (strrpos($qname, ':')) {

-			// get unqualified name

-			$name = substr($qname, strrpos($qname, ':') + 1);

-			// get ns

-			$ns = substr($qname, 0, strrpos($qname, ':'));

-			$p = $this->getPrefixFromNamespace($ns);

-			if ($p) {

-				return $p . ':' . $name;

-			}

-			return $qname;

-		} else {

-			return $qname;

-		}

-	}

-

-	/**

-	* expands (changes prefix to namespace) a qualified name

-	*

-	* @param    string $qname qname

-	* @return	string expanded qname

-	* @access   private

-	*/

-	function expandQname($qname){

-		// get element prefix

-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){

-			// get unqualified name

-			$name = substr(strstr($qname,':'),1);

-			// get ns prefix

-			$prefix = substr($qname,0,strpos($qname,':'));

-			if(isset($this->namespaces[$prefix])){

-				return $this->namespaces[$prefix].':'.$name;

-			} else {

-				return $qname;

-			}

-		} else {

-			return $qname;

-		}

-	}

-

-    /**

-    * returns the local part of a prefixed string

-    * returns the original string, if not prefixed

-    *

-    * @param string $str The prefixed string

-    * @return string The local part

-    * @access public

-    */

-	function getLocalPart($str){

-		if($sstr = strrchr($str,':')){

-			// get unqualified name

-			return substr( $sstr, 1 );

-		} else {

-			return $str;

-		}

-	}

-

-	/**

-    * returns the prefix part of a prefixed string

-    * returns false, if not prefixed

-    *

-    * @param string $str The prefixed string

-    * @return mixed The prefix or false if there is no prefix

-    * @access public

-    */

-	function getPrefix($str){

-		if($pos = strrpos($str,':')){

-			// get prefix

-			return substr($str,0,$pos);

-		}

-		return false;

-	}

-

-	/**

-    * pass it a prefix, it returns a namespace

-    *

-    * @param string $prefix The prefix

-    * @return mixed The namespace, false if no namespace has the specified prefix

-    * @access public

-    */

-	function getNamespaceFromPrefix($prefix){

-		if (isset($this->namespaces[$prefix])) {

-			return $this->namespaces[$prefix];

-		}

-		//$this->setError("No namespace registered for prefix '$prefix'");

-		return false;

-	}

-

-	/**

-    * returns the prefix for a given namespace (or prefix)

-    * or false if no prefixes registered for the given namespace

-    *

-    * @param string $ns The namespace

-    * @return mixed The prefix, false if the namespace has no prefixes

-    * @access public

-    */

-	function getPrefixFromNamespace($ns) {

-		foreach ($this->namespaces as $p => $n) {

-			if ($ns == $n || $ns == $p) {

-			    $this->usedNamespaces[$p] = $n;

-				return $p;

-			}

-		}

-		return false;

-	}

-

-	/**

-    * returns the time in ODBC canonical form with microseconds

-    *

-    * @return string The time in ODBC canonical form with microseconds

-    * @access public

-    */

-	function getmicrotime() {

-		if (function_exists('gettimeofday')) {

-			$tod = gettimeofday();

-			$sec = $tod['sec'];

-			$usec = $tod['usec'];

-		} else {

-			$sec = time();

-			$usec = 0;

-		}

-		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);

-	}

-

-	/**

-	 * Returns a string with the output of var_dump

-	 *

-	 * @param mixed $data The variable to var_dump

-	 * @return string The output of var_dump

-	 * @access public

-	 */

+        $str = htmlspecialchars($str);

+        return nl2br($str);

+    }

+

+    /**

+     * contracts (changes namespace to prefix) a qualified name

+     *

+     * @param    string $qname qname

+     * @return	string contracted qname

+     * @access   private

+     */

+    function contractQname($qname){

+        // get element namespace

+        //$this->xdebug("Contract $qname");

+        if (strrpos($qname, ':')) {

+            // get unqualified name

+            $name = substr($qname, strrpos($qname, ':') + 1);

+            // get ns

+            $ns = substr($qname, 0, strrpos($qname, ':'));

+            $p = $this->getPrefixFromNamespace($ns);

+            if ($p) {

+                return $p . ':' . $name;

+            }

+            return $qname;

+        } else {

+            return $qname;

+        }

+    }

+

+    /**

+     * expands (changes prefix to namespace) a qualified name

+     *

+     * @param    string $qname qname

+     * @return	string expanded qname

+     * @access   private

+     */

+    function expandQname($qname){

+        // get element prefix

+        if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){

+            // get unqualified name

+            $name = substr(strstr($qname,':'),1);

+            // get ns prefix

+            $prefix = substr($qname,0,strpos($qname,':'));

+            if(isset($this->namespaces[$prefix])){

+                return $this->namespaces[$prefix].':'.$name;

+            } else {

+                return $qname;

+            }

+        } else {

+            return $qname;

+        }

+    }

+

+    /**

+     * returns the local part of a prefixed string

+     * returns the original string, if not prefixed

+     *

+     * @param string $str The prefixed string

+     * @return string The local part

+     * @access public

+     */

+    function getLocalPart($str){

+        if($sstr = strrchr($str,':')){

+            // get unqualified name

+            return substr( $sstr, 1 );

+        } else {

+            return $str;

+        }

+    }

+

+    /**

+     * returns the prefix part of a prefixed string

+     * returns false, if not prefixed

+     *

+     * @param string $str The prefixed string

+     * @return mixed The prefix or false if there is no prefix

+     * @access public

+     */

+    function getPrefix($str){

+        if($pos = strrpos($str,':')){

+            // get prefix

+            return substr($str,0,$pos);

+        }

+        return false;

+    }

+

+    /**

+     * pass it a prefix, it returns a namespace

+     *

+     * @param string $prefix The prefix

+     * @return mixed The namespace, false if no namespace has the specified prefix

+     * @access public

+     */

+    function getNamespaceFromPrefix($prefix){

+        if (isset($this->namespaces[$prefix])) {

+            return $this->namespaces[$prefix];

+        }

+        //$this->setError("No namespace registered for prefix '$prefix'");

+        return false;

+    }

+

+    /**

+     * returns the prefix for a given namespace (or prefix)

+     * or false if no prefixes registered for the given namespace

+     *

+     * @param string $ns The namespace

+     * @return mixed The prefix, false if the namespace has no prefixes

+     * @access public

+     */

+    function getPrefixFromNamespace($ns) {

+        foreach ($this->namespaces as $p => $n) {

+            if ($ns == $n || $ns == $p) {

+                $this->usedNamespaces[$p] = $n;

+                return $p;

+            }

+        }

+        return false;

+    }

+

+    /**

+     * returns the time in ODBC canonical form with microseconds

+     *

+     * @return string The time in ODBC canonical form with microseconds

+     * @access public

+     */

+    function getmicrotime() {

+        if (function_exists('gettimeofday')) {

+            $tod = gettimeofday();

+            $sec = $tod['sec'];

+            $usec = $tod['usec'];

+        } else {

+            $sec = time();

+            $usec = 0;

+        }

+        return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);

+    }

+

+    /**

+     * Returns a string with the output of var_dump

+     *

+     * @param mixed $data The variable to var_dump

+     * @return string The output of var_dump

+     * @access public

+     */

     function varDump($data) {

-		ob_start();

-		var_dump($data);

-		$ret_val = ob_get_contents();

-		ob_end_clean();

-		return $ret_val;

-	}

-

-	/**

-	* represents the object as a string

-	*

-	* @return	string

-	* @access   public

-	*/

-	function __toString() {

-		return $this->varDump($this);

-	}

+        ob_start();

+        var_dump($data);

+        $ret_val = ob_get_contents();

+        ob_end_clean();

+        return $ret_val;

+    }

+

+    /**

+     * represents the object as a string

+     *

+     * @return	string

+     * @access   public

+     */

+    function __toString() {

+        return $this->varDump($this);

+    }

 }

 

 // XML Schema Datatype Helper Functions

@@ -903,35 +903,35 @@ 
 * @access   public

 */

 function timestamp_to_iso8601($timestamp,$utc=true){

-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);

-	$pos = strrpos($datestr, "+");

-	if ($pos === FALSE) {

-		$pos = strrpos($datestr, "-");

-	}

-	if ($pos !== FALSE) {

-		if (strlen($datestr) == $pos + 5) {

-			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);

-		}

-	}

-	if($utc){

-		$pattern = '/'.

-		'([0-9]{4})-'.	// centuries & years CCYY-

-		'([0-9]{2})-'.	// months MM-

-		'([0-9]{2})'.	// days DD

-		'T'.			// separator T

-		'([0-9]{2}):'.	// hours hh:

-		'([0-9]{2}):'.	// minutes mm:

-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...

-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

-		'/';

-

-		if(preg_match($pattern,$datestr,$regs)){

-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);

-		}

-		return false;

-	} else {

-		return $datestr;

-	}

+    $datestr = date('Y-m-d\TH:i:sO',$timestamp);

+    $pos = strrpos($datestr, "+");

+    if ($pos === FALSE) {

+        $pos = strrpos($datestr, "-");

+    }

+    if ($pos !== FALSE) {

+        if (strlen($datestr) == $pos + 5) {

+            $datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);

+        }

+    }

+    if($utc){

+        $pattern = '/'.

+        '([0-9]{4})-'.	// centuries & years CCYY-

+        '([0-9]{2})-'.	// months MM-

+        '([0-9]{2})'.	// days DD

+        'T'.			// separator T

+        '([0-9]{2}):'.	// hours hh:

+        '([0-9]{2}):'.	// minutes mm:

+        '([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...

+        '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+        '/';

+

+        if(preg_match($pattern,$datestr,$regs)){

+            return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);

+        }

+        return false;

+    } else {

+        return $datestr;

+    }

 }

 

 /**

@@ -942,35 +942,35 @@ 
 * @access   public

 */

 function iso8601_to_timestamp($datestr){

-	$pattern = '/'.

-	'([0-9]{4})-'.	// centuries & years CCYY-

-	'([0-9]{2})-'.	// months MM-

-	'([0-9]{2})'.	// days DD

-	'T'.			// separator T

-	'([0-9]{2}):'.	// hours hh:

-	'([0-9]{2}):'.	// minutes mm:

-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...

-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

-	'/';

-	if(preg_match($pattern,$datestr,$regs)){

-		// not utc

-		if($regs[8] != 'Z'){

-			$op = substr($regs[8],0,1);

-			$h = substr($regs[8],1,2);

-			$m = substr($regs[8],strlen($regs[8])-2,2);

-			if($op == '-'){

-				$regs[4] = $regs[4] + $h;

-				$regs[5] = $regs[5] + $m;

-			} elseif($op == '+'){

-				$regs[4] = $regs[4] - $h;

-				$regs[5] = $regs[5] - $m;

-			}

-		}

-		return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

+    $pattern = '/'.

+    '([0-9]{4})-'.	// centuries & years CCYY-

+    '([0-9]{2})-'.	// months MM-

+    '([0-9]{2})'.	// days DD

+    'T'.			// separator T

+    '([0-9]{2}):'.	// hours hh:

+    '([0-9]{2}):'.	// minutes mm:

+    '([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...

+    '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+    '/';

+    if(preg_match($pattern,$datestr,$regs)){

+        // not utc

+        if($regs[8] != 'Z'){

+            $op = substr($regs[8],0,1);

+            $h = substr($regs[8],1,2);

+            $m = substr($regs[8],strlen($regs[8])-2,2);

+            if($op == '-'){

+                $regs[4] = $regs[4] + $h;

+                $regs[5] = $regs[5] + $m;

+            } elseif($op == '+'){

+                $regs[4] = $regs[4] - $h;

+                $regs[5] = $regs[5] - $m;

+            }

+        }

+        return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

 //		return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");

-	} else {

-		return false;

-	}

+    } else {

+        return false;

+    }

 }

 

 /**

@@ -982,13 +982,13 @@ 
 */

 function usleepWindows($usec)

 {

-	$start = gettimeofday();

-

-	do

-	{

-		$stop = gettimeofday();

-		$timePassed = 1000000 * ($stop['sec'] - $start['sec'])

-		+ $stop['usec'] - $start['usec'];

-	}

-	while ($timePassed < $usec);

+    $start = gettimeofday();

+

+    do

+    {

+        $stop = gettimeofday();

+        $timePassed = 1000000 * ($stop['sec'] - $start['sec'])

+        + $stop['usec'] - $start['usec'];

+    }

+    while ($timePassed < $usec);

 }