chamilo / chamilo-lms

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

Indentation +14 added lines, -14 removed lines

@@ -9,18 +9,18 @@
 class HTML_QuickForm_Rule_FileName extends HTML_QuickForm_Rule
 {
 
-	/**
-	 * @param $value array     Uploaded file info (from $_FILES)
-	 * @param null $options
-	 * @return bool
-	 */
-	public function validate($value, $options = null)
-	{
-		if ((isset($elementValue['error']) && $elementValue['error'] == 0) ||
-			(!empty($elementValue['tmp_name']) && $elementValue['tmp_name'] != 'none')) {
-			return is_uploaded_file($elementValue['tmp_name']);
-		} else {
-			return false;
-		}
-	}
+    /**
+     * @param $value array     Uploaded file info (from $_FILES)
+     * @param null $options
+     * @return bool
+     */
+    public function validate($value, $options = null)
+    {
+        if ((isset($elementValue['error']) && $elementValue['error'] == 0) ||
+            (!empty($elementValue['tmp_name']) && $elementValue['tmp_name'] != 'none')) {
+            return is_uploaded_file($elementValue['tmp_name']);
+        } else {
+            return false;
+        }
+    }
 }

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

Indentation +15 added lines, -15 removed lines

@@ -6,24 +6,24 @@
  */
 class HTML_QuickForm_Compare_Fields extends HTML_QuickForm_Rule_Compare 
 {
-	/**
-	 * Function to check an array of fields 	 
-	 * @param   array of field names
+    /**
+     * Function to check an array of fields 	 
+     * @param   array of field names
      * @param   string operator ==, >=, etc
      * @param   string the value to compare
-	 * @return boolean True if date is valid
-	 */
-	function validate($values, $operator_and_max_value) {
+     * @return boolean True if date is valid
+     */
+    function validate($values, $operator_and_max_value) {
         if (is_array($values) && !empty($values) && !empty($operator_and_max_value)) {
-           $final_value = 0;
-           foreach ($values as $value) {
-               $final_value += $value;
-           }
-           $params = explode('@', $operator_and_max_value);
-           $operator    = $params[0];
-           $max_value   = $params[1];                      
-           return parent::validate(array($final_value, $max_value), $operator);
+            $final_value = 0;
+            foreach ($values as $value) {
+                $final_value += $value;
+            }
+            $params = explode('@', $operator_and_max_value);
+            $operator    = $params[0];
+            $max_value   = $params[1];                      
+            return parent::validate(array($final_value, $max_value), $operator);
         }
         return false;        
-	}
+    }
 }
\ No newline at end of file

main/inc/lib/chamilo_session.class.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
         }*/
         // If the session time has expired, refresh the starttime value,
         //  so we're starting to count down from a later time
-        if ( $session->has('starttime') && $session->is_expired()) {
+        if ($session->has('starttime') && $session->is_expired()) {
             $session->destroy();
         } else {
             //error_log('Time not expired, extend session for a bit more');

main/inc/lib/pear/excelreader/OLERead.inc

Indentation +86 added lines, -86 removed lines

@@ -25,12 +25,12 @@ 
 

 function GetInt4d($data, $pos)

 {

-	$value = ord($data[$pos]) | (ord($data[$pos+1])	<< 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24);

-	if ($value>=4294967294)

-	{

-		$value=-2;

-	}

-	return $value;

+    $value = ord($data[$pos]) | (ord($data[$pos+1])	<< 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24);

+    if ($value>=4294967294)

+    {

+        $value=-2;

+    }

+    return $value;

 }

 

 

@@ -45,30 +45,30 @@ 
     

     function read($sFileName){

         

-    	// check if file exist and is readable (Darko Miljanovic)

-    	if(!is_readable($sFileName)) {

-    		$this->error = 1;

-    		return false;

-    	}

+        // check if file exist and is readable (Darko Miljanovic)

+        if(!is_readable($sFileName)) {

+            $this->error = 1;

+            return false;

+        }

     	

-    	$this->data = @file_get_contents($sFileName);

-    	if (!$this->data) { 

-    		$this->error = 1; 

-    		return false; 

-   		}

-   		//echo IDENTIFIER_OLE;

-   		//echo 'start';

-   		if (substr($this->data, 0, 8) != IDENTIFIER_OLE) {

-    		$this->error = 1; 

-    		return false; 

-   		}

+        $this->data = @file_get_contents($sFileName);

+        if (!$this->data) { 

+            $this->error = 1; 

+            return false; 

+            }

+            //echo IDENTIFIER_OLE;

+            //echo 'start';

+            if (substr($this->data, 0, 8) != IDENTIFIER_OLE) {

+            $this->error = 1; 

+            return false; 

+            }

         $this->numBigBlockDepotBlocks = GetInt4d($this->data, NUM_BIG_BLOCK_DEPOT_BLOCKS_POS);

         $this->sbdStartBlock = GetInt4d($this->data, SMALL_BLOCK_DEPOT_BLOCK_POS);

         $this->rootStartBlock = GetInt4d($this->data, ROOT_START_BLOCK_POS);

         $this->extensionBlock = GetInt4d($this->data, EXTENSION_BLOCK_POS);

         $this->numExtensionBlocks = GetInt4d($this->data, NUM_EXTENSION_BLOCK_POS);

         

-	/*

+    /*

         echo $this->numBigBlockDepotBlocks." ";

         echo $this->sbdStartBlock." ";

         echo $this->rootStartBlock." ";

@@ -78,16 +78,16 @@ 
         //echo "sbdStartBlock = $this->sbdStartBlock\n";

         $bigBlockDepotBlocks = array();

         $pos = BIG_BLOCK_DEPOT_BLOCKS_POS;

-       // echo "pos = $pos";

-	$bbdBlocks = $this->numBigBlockDepotBlocks;

+        // echo "pos = $pos";

+    $bbdBlocks = $this->numBigBlockDepotBlocks;

         

             if ($this->numExtensionBlocks != 0) {

                 $bbdBlocks = (BIG_BLOCK_SIZE - BIG_BLOCK_DEPOT_BLOCKS_POS)/4; 

             }

         

         for ($i = 0; $i < $bbdBlocks; $i++) {

-              $bigBlockDepotBlocks[$i] = GetInt4d($this->data, $pos);

-              $pos += 4;

+                $bigBlockDepotBlocks[$i] = GetInt4d($this->data, $pos);

+                $pos += 4;

         }

         

         

@@ -106,7 +106,7 @@ 
             }

         }

 

-       // var_dump($bigBlockDepotBlocks);

+        // var_dump($bigBlockDepotBlocks);

         

         // readBigBlockDepot

         $pos = 0;

@@ -123,26 +123,26 @@ 
             }

         }

 

-	//var_dump($this->bigBlockChain);

+    //var_dump($this->bigBlockChain);

         //echo '=====2';

         // readSmallBlockDepot();

         $pos = 0;

-	    $index = 0;

-	    $sbdBlock = $this->sbdStartBlock;

-	    $this->smallBlockChain = array();

+        $index = 0;

+        $sbdBlock = $this->sbdStartBlock;

+        $this->smallBlockChain = array();

 	

-	    while ($sbdBlock != -2) {

+        while ($sbdBlock != -2) {

 	

-	      $pos = ($sbdBlock + 1) * BIG_BLOCK_SIZE;

+            $pos = ($sbdBlock + 1) * BIG_BLOCK_SIZE;

 	

-	      for ($j = 0; $j < BIG_BLOCK_SIZE / 4; $j++) {

-	        $this->smallBlockChain[$index] = GetInt4d($this->data, $pos);

-	        $pos += 4;

-	        $index++;

-	      }

+            for ($j = 0; $j < BIG_BLOCK_SIZE / 4; $j++) {

+            $this->smallBlockChain[$index] = GetInt4d($this->data, $pos);

+            $pos += 4;

+            $index++;

+            }

 	

-	      $sbdBlock = $this->bigBlockChain[$sbdBlock];

-	    }

+            $sbdBlock = $this->bigBlockChain[$sbdBlock];

+        }

 

         

         // readData(rootStartBlock)

@@ -162,7 +162,7 @@ 
 

     }

     

-     function __readData($bl) {

+        function __readData($bl) {

         $block = $bl;

         $pos = 0;

         $data = '';

@@ -171,28 +171,28 @@ 
             $pos = ($block + 1) * BIG_BLOCK_SIZE;

             $data = $data.substr($this->data, $pos, BIG_BLOCK_SIZE);

             //echo "pos = $pos data=$data\n";	

-	    $block = $this->bigBlockChain[$block];

+        $block = $this->bigBlockChain[$block];

+        }

+        return $data;

         }

-		return $data;

-     }

         

     function __readPropertySets(){

         $offset = 0;

         //var_dump($this->entry);

         while ($offset < strlen($this->entry)) {

-              $d = substr($this->entry, $offset, PROPERTY_STORAGE_BLOCK_SIZE);

+                $d = substr($this->entry, $offset, PROPERTY_STORAGE_BLOCK_SIZE);

             

-              $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS+1]) << 8);

+                $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS+1]) << 8);

               

-              $type = ord($d[TYPE_POS]);

-              //$maxBlock = strlen($d) / BIG_BLOCK_SIZE - 1;

+                $type = ord($d[TYPE_POS]);

+                //$maxBlock = strlen($d) / BIG_BLOCK_SIZE - 1;

         

-              $startBlock = GetInt4d($d, START_BLOCK_POS);

-              $size = GetInt4d($d, SIZE_POS);

+                $startBlock = GetInt4d($d, START_BLOCK_POS);

+                $size = GetInt4d($d, SIZE_POS);

         

             $name = '';

             for ($i = 0; $i < $nameSize ; $i++) {

-              $name .= $d[$i];

+                $name .= $d[$i];

             }

             

             $name = str_replace("\x00", "", $name);

@@ -221,50 +221,50 @@ 
     

     

     function getWorkBook(){

-    	if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD){

+        if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD){

 //    	  getSmallBlockStream(PropertyStorage ps)

 

-			$rootdata = $this->__readData($this->props[$this->rootentry]['startBlock']);

+            $rootdata = $this->__readData($this->props[$this->rootentry]['startBlock']);

 	        

-			$streamData = '';

-	        $block = $this->props[$this->wrkbook]['startBlock'];

-	        //$count = 0;

-	        $pos = 0;

-		    while ($block != -2) {

-      	          $pos = $block * SMALL_BLOCK_SIZE;

-		          $streamData .= substr($rootdata, $pos, SMALL_BLOCK_SIZE);

+            $streamData = '';

+            $block = $this->props[$this->wrkbook]['startBlock'];

+            //$count = 0;

+            $pos = 0;

+            while ($block != -2) {

+                    $pos = $block * SMALL_BLOCK_SIZE;

+                    $streamData .= substr($rootdata, $pos, SMALL_BLOCK_SIZE);

 

-			      $block = $this->smallBlockChain[$block];

-		    }

+                    $block = $this->smallBlockChain[$block];

+            }

 			

-		    return $streamData;

+            return $streamData;

     		

 

-    	}else{

+        }else{

     	

-	        $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE;

-	        if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {

-	            $numBlocks++;

-	        }

+            $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE;

+            if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {

+                $numBlocks++;

+            }

 	        

-	        if ($numBlocks == 0) return '';

+            if ($numBlocks == 0) return '';

 	        

-	        //echo "numBlocks = $numBlocks\n";

-	    //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE];

-	        //print_r($this->wrkbook);

-	        $streamData = '';

-	        $block = $this->props[$this->wrkbook]['startBlock'];

-	        //$count = 0;

-	        $pos = 0;

-	        //echo "block = $block";

-	        while ($block != -2) {

-	          $pos = ($block + 1) * BIG_BLOCK_SIZE;

-	          $streamData .= substr($this->data, $pos, BIG_BLOCK_SIZE);

-	          $block = $this->bigBlockChain[$block];

-	        }   

-	        //echo 'stream'.$streamData;

-	        return $streamData;

-    	}

+            //echo "numBlocks = $numBlocks\n";

+        //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE];

+            //print_r($this->wrkbook);

+            $streamData = '';

+            $block = $this->props[$this->wrkbook]['startBlock'];

+            //$count = 0;

+            $pos = 0;

+            //echo "block = $block";

+            while ($block != -2) {

+                $pos = ($block + 1) * BIG_BLOCK_SIZE;

+                $streamData .= substr($this->data, $pos, BIG_BLOCK_SIZE);

+                $block = $this->bigBlockChain[$block];

+            }   

+            //echo 'stream'.$streamData;

+            return $streamData;

+        }

     }

     

 }

Spacing +18 added lines, -18 removed lines

@@ -14,7 +14,7 @@ 
 define('TYPE_POS', 0x42);

 define('START_BLOCK_POS', 0x74);

 define('SIZE_POS', 0x78);

-define('IDENTIFIER_OLE', pack("CCCCCCCC",0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1));

+define('IDENTIFIER_OLE', pack("CCCCCCCC", 0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1));

 

 //echo 'ROOT_START_BLOCK_POS = '.ROOT_START_BLOCK_POS."\n";

 

@@ -25,10 +25,10 @@ 
 

 function GetInt4d($data, $pos)

 {

-	$value = ord($data[$pos]) | (ord($data[$pos+1])	<< 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24);

-	if ($value>=4294967294)

+	$value = ord($data[$pos]) | (ord($data[$pos + 1]) << 8) | (ord($data[$pos + 2]) << 16) | (ord($data[$pos + 3]) << 24);

+	if ($value >= 4294967294)

 	{

-		$value=-2;

+		$value = -2;

 	}

 	return $value;

 }

@@ -38,15 +38,15 @@ 
     var $data = '';

     

     

-    function OLERead(){

+    function OLERead() {

         

         

     }

     

-    function read($sFileName){

+    function read($sFileName) {

         

     	// check if file exist and is readable (Darko Miljanovic)

-    	if(!is_readable($sFileName)) {

+    	if (!is_readable($sFileName)) {

     		$this->error = 1;

     		return false;

     	}

@@ -82,7 +82,7 @@ 
 	$bbdBlocks = $this->numBigBlockDepotBlocks;

         

             if ($this->numExtensionBlocks != 0) {

-                $bbdBlocks = (BIG_BLOCK_SIZE - BIG_BLOCK_DEPOT_BLOCKS_POS)/4; 

+                $bbdBlocks = (BIG_BLOCK_SIZE - BIG_BLOCK_DEPOT_BLOCKS_POS) / 4; 

             }

         

         for ($i = 0; $i < $bbdBlocks; $i++) {

@@ -116,9 +116,9 @@ 
         for ($i = 0; $i < $this->numBigBlockDepotBlocks; $i++) {

             $pos = ($bigBlockDepotBlocks[$i] + 1) * BIG_BLOCK_SIZE;

             //echo "pos = $pos";	

-            for ($j = 0 ; $j < BIG_BLOCK_SIZE / 4; $j++) {

+            for ($j = 0; $j < BIG_BLOCK_SIZE / 4; $j++) {

                 $this->bigBlockChain[$index] = GetInt4d($this->data, $pos);

-                $pos += 4 ;

+                $pos += 4;

                 $index++;

             }

         }

@@ -167,7 +167,7 @@ 
         $pos = 0;

         $data = '';

         

-        while ($block != -2)  {

+        while ($block != -2) {

             $pos = ($block + 1) * BIG_BLOCK_SIZE;

             $data = $data.substr($this->data, $pos, BIG_BLOCK_SIZE);

             //echo "pos = $pos data=$data\n";	

@@ -176,13 +176,13 @@ 
 		return $data;

      }

         

-    function __readPropertySets(){

+    function __readPropertySets() {

         $offset = 0;

         //var_dump($this->entry);

         while ($offset < strlen($this->entry)) {

               $d = substr($this->entry, $offset, PROPERTY_STORAGE_BLOCK_SIZE);

             

-              $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS+1]) << 8);

+              $nameSize = ord($d[SIZE_OF_NAME_POS]) | (ord($d[SIZE_OF_NAME_POS + 1]) << 8);

               

               $type = ord($d[TYPE_POS]);

               //$maxBlock = strlen($d) / BIG_BLOCK_SIZE - 1;

@@ -191,13 +191,13 @@ 
               $size = GetInt4d($d, SIZE_POS);

         

             $name = '';

-            for ($i = 0; $i < $nameSize ; $i++) {

+            for ($i = 0; $i < $nameSize; $i++) {

               $name .= $d[$i];

             }

             

             $name = str_replace("\x00", "", $name);

             

-            $this->props[] = array (

+            $this->props[] = array(

                 'name' => $name, 

                 'type' => $type,

                 'startBlock' => $startBlock,

@@ -220,8 +220,8 @@ 
     }

     

     

-    function getWorkBook(){

-    	if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD){

+    function getWorkBook() {

+    	if ($this->props[$this->wrkbook]['size'] < SMALL_BLOCK_THRESHOLD) {

 //    	  getSmallBlockStream(PropertyStorage ps)

 

 			$rootdata = $this->__readData($this->props[$this->rootentry]['startBlock']);

@@ -240,7 +240,7 @@ 
 		    return $streamData;

     		

 

-    	}else{

+    	} else {

     	

 	        $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE;

 	        if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {

Braces +4 added lines, -2 removed lines

@@ -240,14 +240,16 @@
 		    return $streamData;

     		

 

-    	}else{

+    	} else{

     	

 	        $numBlocks = $this->props[$this->wrkbook]['size'] / BIG_BLOCK_SIZE;

 	        if ($this->props[$this->wrkbook]['size'] % BIG_BLOCK_SIZE != 0) {

 	            $numBlocks++;

 	        }

 	        

-	        if ($numBlocks == 0) return '';

+	        if ($numBlocks == 0) {
+	            return '';
+	        }
 	        

 	        //echo "numBlocks = $numBlocks\n";

 	    //byte[] streamData = new byte[numBlocks * BIG_BLOCK_SIZE];

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
 //echo $data[ROOT_START_BLOCK_POS];

 //function log

 

+/**
+ * @param integer $pos
+ */
 function GetInt4d($data, $pos)

 {

 	$value = ord($data[$pos]) | (ord($data[$pos+1])	<< 8) | (ord($data[$pos+2]) << 16) | (ord($data[$pos+3]) << 24);

main/inc/lib/pear/HTML/QuickForm/hidden.php

Indentation +7 added lines, -7 removed lines

@@ -71,13 +71,13 @@
     // }}}
     // {{{ accept()
 
-   /**
-    * Accepts a renderer
-    *
-    * @param HTML_QuickForm_Renderer    renderer object
-    * @access public
-    * @return void
-    */
+    /**
+     * Accepts a renderer
+     *
+     * @param HTML_QuickForm_Renderer    renderer object
+     * @access public
+     * @return void
+     */
     //function accept(&$renderer)
     function accept(&$renderer, $required=false, $error=null)
     {

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      * Freeze the element so that only its value is returned
      *
      * @access    public
-     * @return    void
+     * @return    boolean
      */
     function freeze()
     {

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     * @access public
     * @return void
     */
-    function accept(&$renderer, $required=false, $error=null)
+    function accept(&$renderer, $required = false, $error = null)
     {
         $renderer->renderHeader($this);
     } // end func accept

main/inc/lib/pear/HTML/QuickForm/hierselect.php

Indentation +26 added lines, -26 removed lines

@@ -434,8 +434,8 @@ 
                 $jsParts[] = $this->_convertArrayToJavascript($this->_options[$i]);
             }
             $this->_js .= "\n_hs_options['" . $this->_escapeString($this->getName()) . "'] = [\n" .
-                          implode(",\n", $jsParts) .
-                          "\n];\n";
+                            implode(",\n", $jsParts) .
+                            "\n];\n";
             // default value; if we don't actually have any values yet just use
             // the first option (for single selects) or empty array (for multiple)
             $values = array();
@@ -450,7 +450,7 @@ 
                 }
             }
             $this->_js .= "_hs_defaults['" . $this->_escapeString($this->getName()) . "'] = " .
-                          $this->_convertArrayToJavascript($values, false) . ";\n";
+                            $this->_convertArrayToJavascript($values, false) . ";\n";
         }
         include_once('HTML/QuickForm/Renderer/Default.php');
         $renderer =& new HTML_QuickForm_Renderer_Default();
@@ -464,7 +464,7 @@ 
             }
         }
         return (empty($this->_js)? '': "<script type=\"text/javascript\">\n//<![CDATA[\n" . $this->_js . "//]]>\n</script>") .
-               $renderer->toHtml();
+                $renderer->toHtml();
     } // end func toHtml
 
     // }}}
@@ -506,14 +506,14 @@ 
     // }}}
     // {{{ _convertArrayToJavascript()
 
-   /**
-    * Converts PHP array to its Javascript analog
-    *
-    * @access private
-    * @param  array     PHP array to convert
-    * @param  bool      Generate Javascript object literal (default, works like PHP's associative array) or array literal
-    * @return string    Javascript representation of the value
-    */
+    /**
+     * Converts PHP array to its Javascript analog
+     *
+     * @access private
+     * @param  array     PHP array to convert
+     * @param  bool      Generate Javascript object literal (default, works like PHP's associative array) or array literal
+     * @return string    Javascript representation of the value
+     */
     function _convertArrayToJavascript($array, $assoc = true)
     {
         if (!is_array($array)) {
@@ -537,13 +537,13 @@ 
     // }}}
     // {{{ _convertScalarToJavascript()
 
-   /**
-    * Converts PHP's scalar value to its Javascript analog
-    *
-    * @access private
-    * @param  mixed     PHP value to convert
-    * @return string    Javascript representation of the value
-    */
+    /**
+     * Converts PHP's scalar value to its Javascript analog
+     *
+     * @access private
+     * @param  mixed     PHP value to convert
+     * @return string    Javascript representation of the value
+     */
     function _convertScalarToJavascript($val)
     {
         if (is_bool($val)) {
@@ -563,13 +563,13 @@ 
     // }}}
     // {{{ _escapeString()
 
-   /**
-    * Quotes the string so that it can be used in Javascript string constants
-    *
-    * @access private
-    * @param  string
-    * @return string
-    */
+    /**
+     * Quotes the string so that it can be used in Javascript string constants
+     *
+     * @access private
+     * @param  string
+     * @return string
+     */
     function _escapeString($str)
     {
         return strtr($str,array(

Spacing +28 added lines, -29 removed lines

@@ -83,7 +83,7 @@ 
      * @access    public
      * @return    void
      */
-    function HTML_QuickForm_hierselect($elementName=null, $elementLabel=null, $attributes=null, $separator=null)
+    function HTML_QuickForm_hierselect($elementName = null, $elementLabel = null, $attributes = null, $separator = null)
     {
         $this->HTML_QuickForm_element($elementName, $elementLabel, $attributes);
         $this->_persistantFreeze = true;
@@ -154,8 +154,8 @@ 
             // setDefaults has probably been called before this function
             // check if all elements have been created
             $totalNbElements = count($this->_options);
-            for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) {
-                $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
+            for ($i = $this->_nbElements; $i < $totalNbElements; $i++) {
+                $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
                 $this->_nbElements++;
             }
         }
@@ -209,8 +209,8 @@ 
             // setDefaults has probably been called before this function
             // check if all elements have been created
             $totalNbElements = 2;
-            for ($i = $this->_nbElements; $i < $totalNbElements; $i ++) {
-                $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
+            for ($i = $this->_nbElements; $i < $totalNbElements; $i++) {
+                $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
                 $this->_nbElements++;
             }
         }
@@ -233,12 +233,12 @@ 
         foreach (array_keys($this->_elements) AS $key) {
             $array = eval("return isset(\$this->_options[{$key}]{$toLoad})? \$this->_options[{$key}]{$toLoad}: null;");
             if (is_array($array)) {
-                $select =& $this->_elements[$key];
+                $select = & $this->_elements[$key];
                 $select->_options = array();
                 $select->loadArray($array);
 
-                $value  = is_array($v = $select->getValue()) ? $v[0] : key($array);
-                $toLoad .= '[\'' . str_replace(array('\\', '\''), array('\\\\', '\\\''), $value) . '\']';
+                $value = is_array($v = $select->getValue()) ? $v[0] : key($array);
+                $toLoad .= '[\''.str_replace(array('\\', '\''), array('\\\\', '\\\''), $value).'\']';
             }
         }
     } // end func _setOptions
@@ -277,7 +277,7 @@ 
     function _createElements()
     {
         for ($i = 0; $i < $this->_nbElements; $i++) {
-            $this->_elements[] =& new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
+            $this->_elements[] = & new HTML_QuickForm_select($i, null, array(), $this->getAttributes());
         }
     } // end func _createElements
 
@@ -292,10 +292,10 @@ 
             $keys     = array_keys($this->_elements);
             $onChange = array();
             for ($i = 0; $i < count($keys) - 1; $i++) {
-                $select =& $this->_elements[$keys[$i]];
+                $select = & $this->_elements[$keys[$i]];
                 $onChange[$i] = $select->getAttribute('onchange');
                 $select->updateAttributes(
-                    array('onchange' => '_hs_swapOptions(this.form, \'' . $this->_escapeString($this->getName()) . '\', ' . $keys[$i] . ');' . $onChange[$i])
+                    array('onchange' => '_hs_swapOptions(this.form, \''.$this->_escapeString($this->getName()).'\', '.$keys[$i].');'.$onChange[$i])
                 );
             }
 
@@ -433,37 +433,36 @@ 
             for ($i = 1; $i < $this->_nbElements; $i++) {
                 $jsParts[] = $this->_convertArrayToJavascript($this->_options[$i]);
             }
-            $this->_js .= "\n_hs_options['" . $this->_escapeString($this->getName()) . "'] = [\n" .
-                          implode(",\n", $jsParts) .
+            $this->_js .= "\n_hs_options['".$this->_escapeString($this->getName())."'] = [\n".
+                          implode(",\n", $jsParts).
                           "\n];\n";
             // default value; if we don't actually have any values yet just use
             // the first option (for single selects) or empty array (for multiple)
             $values = array();
             foreach (array_keys($this->_elements) as $key) {
                 if (is_array($v = $this->_elements[$key]->getValue())) {
-                    $values[] = count($v) > 1? $v: $v[0];
+                    $values[] = count($v) > 1 ? $v : $v[0];
                 } else {
                     // XXX: accessing the supposedly private _options array
-                    $values[] = $this->_elements[$key]->getMultiple() || empty($this->_elements[$key]->_options[0])?
-                                array():
-                                $this->_elements[$key]->_options[0]['attr']['value'];
+                    $values[] = $this->_elements[$key]->getMultiple() || empty($this->_elements[$key]->_options[0]) ?
+                                array() : $this->_elements[$key]->_options[0]['attr']['value'];
                 }
             }
-            $this->_js .= "_hs_defaults['" . $this->_escapeString($this->getName()) . "'] = " .
-                          $this->_convertArrayToJavascript($values, false) . ";\n";
+            $this->_js .= "_hs_defaults['".$this->_escapeString($this->getName())."'] = ".
+                          $this->_convertArrayToJavascript($values, false).";\n";
         }
         include_once('HTML/QuickForm/Renderer/Default.php');
-        $renderer =& new HTML_QuickForm_Renderer_Default();
+        $renderer = & new HTML_QuickForm_Renderer_Default();
         $renderer->setElementTemplate('{element}');
         parent::accept($renderer);
 
         if (!empty($onChange)) {
-            $keys     = array_keys($this->_elements);
+            $keys = array_keys($this->_elements);
             for ($i = 0; $i < count($keys) - 1; $i++) {
                 $this->_elements[$keys[$i]]->updateAttributes(array('onchange' => $onChange[$i]));
             }
         }
-        return (empty($this->_js)? '': "<script type=\"text/javascript\">\n//<![CDATA[\n" . $this->_js . "//]]>\n</script>") .
+        return (empty($this->_js) ? '' : "<script type=\"text/javascript\">\n//<![CDATA[\n".$this->_js."//]]>\n</script>").
                $renderer->toHtml();
     } // end func toHtml
 
@@ -491,12 +490,12 @@ 
                 $onReset = $caller->getAttribute('onreset');
                 if (strlen($onReset)) {
                     if (strpos($onReset, '_hs_setupOnReset')) {
-                        $caller->updateAttributes(array('onreset' => str_replace('_hs_setupOnReset(this, [', "_hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "', ", $onReset)));
+                        $caller->updateAttributes(array('onreset' => str_replace('_hs_setupOnReset(this, [', "_hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."', ", $onReset)));
                     } else {
-                        $caller->updateAttributes(array('onreset' => "var temp = function() { {$onReset} } ; if (!temp()) { return false; } ; if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "']); } "));
+                        $caller->updateAttributes(array('onreset' => "var temp = function() { {$onReset} } ; if (!temp()) { return false; } ; if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."']); } "));
                     }
                 } else {
-                    $caller->updateAttributes(array('onreset' => "if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['" . $this->_escapeString($this->getName()) . "']); } "));
+                    $caller->updateAttributes(array('onreset' => "if (typeof _hs_setupOnReset != 'undefined') { return _hs_setupOnReset(this, ['".$this->_escapeString($this->getName())."']); } "));
                 }
             }
             return $ret;
@@ -521,7 +520,7 @@ 
         } else {
             $items = array();
             foreach ($array as $key => $val) {
-                $item = $assoc? "'" . $this->_escapeString($key) . "': ": '';
+                $item = $assoc ? "'".$this->_escapeString($key)."': " : '';
                 if (is_array($val)) {
                     $item .= $this->_convertArrayToJavascript($val, $assoc);
                 } else {
@@ -531,7 +530,7 @@ 
             }
         }
         $js = implode(', ', $items);
-        return $assoc? '{ ' . $js . ' }': '[' . $js . ']';
+        return $assoc ? '{ '.$js.' }' : '['.$js.']';
     }
 
     // }}}
@@ -551,7 +550,7 @@ 
         } elseif (is_int($val) || is_double($val)) {
             return $val;
         } elseif (is_string($val)) {
-            return "'" . $this->_escapeString($val) . "'";
+            return "'".$this->_escapeString($val)."'";
         } elseif (is_null($val)) {
             return 'null';
         } else {
@@ -572,7 +571,7 @@ 
     */
     function _escapeString($str)
     {
-        return strtr($str,array(
+        return strtr($str, array(
             "\r"    => '\r',
             "\n"    => '\n',
             "\t"    => '\t',

main/inc/lib/pear/HTML/QuickForm/CAPTCHA.php

Spacing +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
         unset($attr['name']);
 
         $html = $this->_getTabs()
-                . '<span' . $this->_getAttrString($attr) . '>'
+                . '<span'.$this->_getAttrString($attr).'>'
                 . htmlspecialchars($captcha)
                 . '</span>';
         return $html;

main/inc/lib/pear/HTML/QuickForm/email.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      * @return    void
      * @throws
      */
-    function HTML_QuickForm_email($elementName=null, $elementLabel=null, $attributes=null)
+    function HTML_QuickForm_email($elementName = null, $elementLabel = null, $attributes = null)
     {
         parent::__construct($elementName, $elementLabel, $attributes);
         $this->setType('email');

main/inc/lib/pear/HTML/QuickForm/Action/Back.php

Spacing +3 added lines, -3 removed lines

@@ -35,8 +35,8 @@ 
     {
         // save the form values and validation status to the session
         $page->isFormBuilt() or $page->buildForm();
-        $pageName =  $page->getAttribute('id');
-        $data     =& $page->controller->container();
+        $pageName = $page->getAttribute('id');
+        $data     = & $page->controller->container();
         $data['values'][$pageName] = $page->exportValues();
         if (!$page->controller->isModal()) {
             if (PEAR::isError($valid = $page->validate())) {
@@ -53,7 +53,7 @@ 
             return $page->handle('jump');
             //
         } else {
-            $prev =& $page->controller->getPage($prevName);
+            $prev = & $page->controller->getPage($prevName);
             // Modified by Chamilo team, 16-MAR-2010.
             //$prev->handle('jump');
             return $prev->handle('jump');