Inspection of "Merge branch '1.10.x' of https://github.com/chamil..." - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.10.x ( ac2491...356be2 )

by Angel Fernando Quiroz

created 2016-05-13 16:31 UTC

Status

Indentation +846 added lines, -846 removed lines patch added patch discarded remove patch

@@ -83,810 +83,810 @@  discard block
 block discarded – undo
 * @access   public
 */
 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
-	*/
-	function nusoap_base() {
-		$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) {
+    );
+
+    /**
+     * XML entities to convert
+     *
+     * @var      array
+     * @access   public
+     * @deprecated
+     * @see	expandEntities
+     */
+    var $xmlEntities = array('quot' => '"','amp' => '&',
+        'lt' => '<','gt' => '>','apos' => "'");
+
+    /**
+     * constructor
+     *
+     * @access	public
+     */
+    function nusoap_base() {
+        $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';
+            }
         }
-		// 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 = '';
+        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 = '';
         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;
-			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;
+            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
@@ -902,35 +902,35 @@  discard block
 block discarded – undo
 * @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;
+    }
 }
 
 /**
@@ -941,35 +941,35 @@  discard block
 block discarded – undo
 * @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;
+    }
 }
 
 /**
@@ -981,15 +981,15 @@  discard block
 block discarded – undo
 */
 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);
 }
 
 

Please login to merge, or discard this patch.

main/inc/lib/statistics.lib.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -666,7 +666,7 @@
 block discarded – undo
         $res = Database::query($sql);
         $count1 = Database::fetch_object($res);
         $sql = "SELECT COUNT(*) AS n FROM $user_table as u $table ".
-               "WHERE LENGTH(picture_uri) > 0 $url_condition2";
+                "WHERE LENGTH(picture_uri) > 0 $url_condition2";
         $res = Database::query($sql);
         $count2 = Database::fetch_object($res);
         // #users without picture

Please login to merge, or discard this patch.

main/inc/lib/opengraph/OpenGraph.php 1 patch

Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -18,11 +18,11 @@  discard block
 block discarded – undo
 
 class OpenGraph implements Iterator
 {
-  /**
-   * There are base schema's based on type, this is just
-   * a map so that the schema can be obtained
-   *
-   */
+    /**
+     * There are base schema's based on type, this is just
+     * a map so that the schema can be obtained
+     *
+     */
     public static $TYPES = array(
         'activity' => array('activity', 'sport'),
         'business' => array('bar', 'company', 'cafe', 'hotel', 'restaurant'),
@@ -34,19 +34,19 @@  discard block
 block discarded – undo
         'website' => array('blog', 'website'),
     );
 
-  /**
-   * Holds all the Open Graph values we've parsed from a page
-   *
-   */
+    /**
+     * Holds all the Open Graph values we've parsed from a page
+     *
+     */
     private $_values = array();
 
-  /**
-   * Fetches a URI and parses it for Open Graph data, returns
-   * false on error.
-   *
-   * @param $URI    URI to page to parse for Open Graph data
-   * @return OpenGraph
-   */
+    /**
+     * Fetches a URI and parses it for Open Graph data, returns
+     * false on error.
+     *
+     * @param $URI    URI to page to parse for Open Graph data
+     * @return OpenGraph
+     */
     static public function fetch($URI) {
         $curl = curl_init($URI);
 
@@ -69,13 +69,13 @@  discard block
 block discarded – undo
         }
     }
 
-  /**
-   * Parses HTML and extracts Open Graph data, this assumes
-   * the document is at least well formed.
-   *
-   * @param $HTML    HTML to parse
-   * @return OpenGraph
-   */
+    /**
+     * Parses HTML and extracts Open Graph data, this assumes
+     * the document is at least well formed.
+     *
+     * @param $HTML    HTML to parse
+     * @return OpenGraph
+     */
     static private function _parse($HTML) {
         $old_libxml_error = libxml_use_internal_errors(true);
 
@@ -140,13 +140,13 @@  discard block
 block discarded – undo
         return $page;
     }
 
-  /**
-   * Helper method to access attributes directly
-   * Example:
-   * $graph->title
-   *
-   * @param $key    Key to fetch from the lookup
-   */
+    /**
+     * Helper method to access attributes directly
+     * Example:
+     * $graph->title
+     *
+     * @param $key    Key to fetch from the lookup
+     */
     public function __get($key) {
         if (array_key_exists($key, $this->_values)) {
             return $this->_values[$key];
@@ -161,29 +161,29 @@  discard block
 block discarded – undo
         }
     }
 
-  /**
-   * Return all the keys found on the page
-   *
-   * @return array
-   */
+    /**
+     * Return all the keys found on the page
+     *
+     * @return array
+     */
     public function keys() {
         return array_keys($this->_values);
     }
 
-  /**
-   * Helper method to check an attribute exists
-   *
-   * @param $key
-   */
+    /**
+     * Helper method to check an attribute exists
+     *
+     * @param $key
+     */
     public function __isset($key) {
         return array_key_exists($key, $this->_values);
     }
 
-  /**
-   * Will return true if the page has location data embedded
-   *
-   * @return boolean Check if the page has location data
-   */
+    /**
+     * Will return true if the page has location data embedded
+     *
+     * @return boolean Check if the page has location data
+     */
     public function hasLocation() {
         if (array_key_exists('latitude', $this->_values) && array_key_exists('longitude', $this->_values)) {
             return true;
@@ -197,9 +197,9 @@  discard block
 block discarded – undo
         return $valid_address;
     }
 
-  /**
-   * Iterator code
-   */
+    /**
+     * Iterator code
+     */
     private $_position = 0;
     public function rewind() { reset($this->_values); $this->_position = 0; }
     public function current() { return current($this->_values); }

Please login to merge, or discard this patch.

main/inc/lib/auth.lib.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -379,7 +379,7 @@
 block discarded – undo
         $sql_delete = "DELETE FROM $tucc
                       WHERE id='" . $category_id . "' and user_id='" . $current_user_id . "'";
         $resultQuery = Database::query($sql_delete);
-       if (Database::affected_rows($resultQuery)) {
+        if (Database::affected_rows($resultQuery)) {
             $result = true;
         }
         $sql = "UPDATE $TABLECOURSUSER

Please login to merge, or discard this patch.

main/inc/lib/internationalization.lib.php 1 patch

Indentation +21 added lines, -22 removed lines patch added patch discarded remove patch

@@ -103,13 +103,13 @@  discard block
 block discarded – undo
     if (isset($_configuration['language_measure_frequency']) &&
         $_configuration['language_measure_frequency'] == 1
     ) {
-      require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
-      global $langstats;
-      $langstats->add_use($variable,'');
+        require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
+        global $langstats;
+        $langstats->add_use($variable,'');
     }
 
     if (!isset($used_lang_vars)) {
-    	$used_lang_vars = array();
+        $used_lang_vars = array();
     }
 
     // Caching results from some API functions, for speed.
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
     static $text_direction = array();
 
     if (empty($language)) {
-    	$language = api_get_interface_language();
+        $language = api_get_interface_language();
     }
     if (!isset($text_direction[$language])) {
         $text_direction[$language] = in_array(api_purify_language_id($language),
@@ -536,24 +536,24 @@  discard block
 block discarded – undo
             case DATE_FORMAT_ONLY_DAYNAME:
                 $date_format = get_lang('dateFormatOnlyDayName', '', $language);
                 if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
                 break;
             case DATE_FORMAT_NUMBER_NO_YEAR:
                 $date_format = get_lang('dateFormatShortNumberNoYear', '', $language);
-        		if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
+                if (INTL_INSTALLED) {
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
+                break;
+            case DATE_FORMAT_NUMBER:
+                $date_format = get_lang('dateFormatShortNumber', '', $language);
+                if (INTL_INSTALLED) {
+                    $datetype = IntlDateFormatter::SHORT;
+                    $timetype = IntlDateFormatter::NONE;
+                }
                 break;
-        	case DATE_FORMAT_NUMBER:
-        		$date_format = get_lang('dateFormatShortNumber', '', $language);
-        		if (INTL_INSTALLED) {
-        			$datetype = IntlDateFormatter::SHORT;
-        			$timetype = IntlDateFormatter::NONE;
-        		}
-        		break;
             case TIME_NO_SEC_FORMAT:
                 $date_format = get_lang('timeNoSecFormat', '', $language);
                 if (INTL_INSTALLED) {
@@ -589,14 +589,14 @@  discard block
 block discarded – undo
                     $timetype = IntlDateFormatter::SHORT;
                 }
                 break;
-			case DATE_TIME_FORMAT_SHORT:
+            case DATE_TIME_FORMAT_SHORT:
                 $date_format = get_lang('dateTimeFormatShort', '', $language);
                 if (INTL_INSTALLED) {
                     $datetype = IntlDateFormatter::FULL;
                     $timetype = IntlDateFormatter::SHORT;
                 }
                 break;
-			case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
+            case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
                 $date_format = get_lang('dateTimeFormatShortTimeFirst', '', $language);
                 if (INTL_INSTALLED) {
                     $datetype = IntlDateFormatter::FULL;
@@ -1817,7 +1817,6 @@  discard block
 block discarded – undo
 
 /**
  * Return true a date is valid
-
  * @param string $date example: 2014-06-30 13:05:05
  * @param string $format example: "Y-m-d H:i:s"
  *

Please login to merge, or discard this patch.

main/inc/lib/nanogong.lib.php 1 patch

Indentation +240 added lines, -240 removed lines patch added patch discarded remove patch

@@ -71,7 +71,7 @@  discard block
 block discarded – undo
         ) {
             mkdir($this->store_path.$this->session_id.'/'.$this->exercise_id.'/'.$this->question_id.'/'.$this->user_id, $directoryPermissions);
         }
-	}
+    }
 
     /**
      * Setting parameters: course id, session id, etc
@@ -119,24 +119,24 @@  discard block
 block discarded – undo
             $this->question_id = 0;
         }
 
-		$this->can_edit = false;
+        $this->can_edit = false;
 
-		if (api_is_allowed_to_edit()) {
-			$this->can_edit = true;
-		} else {
-			if ($this->user_id ==  api_get_user_id()) {
-				$this->can_edit = true;
-			}
-		}
+        if (api_is_allowed_to_edit()) {
+            $this->can_edit = true;
+        } else {
+            if ($this->user_id ==  api_get_user_id()) {
+                $this->can_edit = true;
+            }
+        }
 
-		// Settings the params array
-		$this->params = $params;
-		$this->store_path = api_get_path(SYS_COURSE_PATH).$this->course_info['path'].'/exercises/';
-		$this->create_user_folder();
-		$this->store_path = $this->store_path.implode('/', array($this->session_id, $this->exercise_id, $this->question_id, $this->user_id)).'/';
-		$this->filename = $this->generate_filename();
-		$this->store_filename = $this->store_path.$this->filename;
-	}
+        // Settings the params array
+        $this->params = $params;
+        $this->store_path = api_get_path(SYS_COURSE_PATH).$this->course_info['path'].'/exercises/';
+        $this->create_user_folder();
+        $this->store_path = $this->store_path.implode('/', array($this->session_id, $this->exercise_id, $this->question_id, $this->user_id)).'/';
+        $this->filename = $this->generate_filename();
+        $this->store_filename = $this->store_path.$this->filename;
+    }
 
     /**
      * Generates the filename with the next format:
@@ -187,30 +187,30 @@  discard block
 block discarded – undo
         return $delete_found;
     }
 
-	/**
-	 *
-	 * Tricky stuff to deal with the feedback = 0 in exercises (all question per page)
+    /**
+     *
+     * Tricky stuff to deal with the feedback = 0 in exercises (all question per page)
      * @param int $exe_id
-	 */
+     */
     public function replace_with_real_exe($exe_id)
     {
-		$filename = null;
-		//@ugly fix
-		foreach($this->available_extensions as $extension) {
-			$items = explode('-', $this->filename);
-			$items[5] = 'temp_exe';
-			$filename = implode('-', $items);
-			if (is_file($this->store_path.$filename.'.'.$extension)) {
-				$old_name = $this->store_path.$filename.'.'.$extension;
-				$items = explode('-', $this->filename);
-				$items[5] = $exe_id;
-				$filename = $filename = implode('-', $items);
-				$new_name = $this->store_path.$filename.'.'.$extension;
-				rename($old_name, $new_name);
-				break;
-			}
-		}
-	}
+        $filename = null;
+        //@ugly fix
+        foreach($this->available_extensions as $extension) {
+            $items = explode('-', $this->filename);
+            $items[5] = 'temp_exe';
+            $filename = implode('-', $items);
+            if (is_file($this->store_path.$filename.'.'.$extension)) {
+                $old_name = $this->store_path.$filename.'.'.$extension;
+                $items = explode('-', $this->filename);
+                $items[5] = $exe_id;
+                $filename = $filename = implode('-', $items);
+                $new_name = $this->store_path.$filename.'.'.$extension;
+                rename($old_name, $new_name);
+                break;
+            }
+        }
+    }
 
     /**
      * @param bool $load_from_database
@@ -218,24 +218,24 @@  discard block
 block discarded – undo
      */
     public function load_filename_if_exists($load_from_database = false)
     {
-		$filename = null;
-		//@ugly fix
-		foreach($this->available_extensions as $extension) {
-			if (is_file($this->store_path.$this->filename.'.'.$extension)) {
-				$filename = $this->filename.'.'.$extension;
-				break;
-			}
-		}
+        $filename = null;
+        //@ugly fix
+        foreach($this->available_extensions as $extension) {
+            if (is_file($this->store_path.$this->filename.'.'.$extension)) {
+                $filename = $this->filename.'.'.$extension;
+                break;
+            }
+        }
 
-		// temp_exe
-		if ($load_from_database) {
+        // temp_exe
+        if ($load_from_database) {
 
-			//Load the real filename just if exists
-			if (isset($this->params['exe_id']) && isset($this->params['user_id']) &&
+            //Load the real filename just if exists
+            if (isset($this->params['exe_id']) && isset($this->params['user_id']) &&
                 isset($this->params['question_id']) && isset($this->params['session_id']) && isset($this->params['course_id'])
             ) {
-				$attempt_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-				$sql = "SELECT filename FROM $attempt_table
+                $attempt_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+                $sql = "SELECT filename FROM $attempt_table
                         WHERE
                             exe_id = ".$this->params['exe_id']." AND
                             user_id = ".$this->params['user_id']." AND
@@ -243,107 +243,107 @@  discard block
 block discarded – undo
                             session_id 	= ".$this->params['session_id']." AND
                             course_code = '".$this->course_info['code']."'
                         LIMIT 1";
-				$result = Database::query($sql);
-				$result = Database::fetch_row($result,'ASSOC');
+                $result = Database::query($sql);
+                $result = Database::fetch_row($result,'ASSOC');
 
-				if (isset($result) && isset($result[0]) && !empty($result[0])) {
-					$filename = $result[0];
-				}
-			}
-		}
+                if (isset($result) && isset($result[0]) && !empty($result[0])) {
+                    $filename = $result[0];
+                }
+            }
+        }
 
-		if (is_file($this->store_path.$filename)) {
-			return $this->store_path.$filename;
-		}
+        if (is_file($this->store_path.$filename)) {
+            return $this->store_path.$filename;
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 *
-	 * Get the URL of the file
-	 * path courses/XXX/exercises/(session_id)/(exercise_id)/(question_id)/(user_id)/
+    /**
+     *
+     * Get the URL of the file
+     * path courses/XXX/exercises/(session_id)/(exercise_id)/(question_id)/(user_id)/
      * @param int $force_download
-	 *
-	 * @return string
-	 */
+     *
+     * @return string
+     */
     public function get_public_url($force_download = 0)
     {
-		$params = $this->get_params();
-		$filename = basename($this->load_filename_if_exists());
+        $params = $this->get_params();
+        $filename = basename($this->load_filename_if_exists());
         $url = api_get_path(WEB_COURSE_PATH).$this->course_info['path'].'/exercises/'.$params['session_id'].'/'.$params['exercise_id'].'/'.$params['question_id'].'/'.$params['user_id'].'/'.$filename;
-		return $url;
-	}
+        return $url;
+    }
 
-	/**
-	 * Uploads the nanogong wav file
+    /**
+     * Uploads the nanogong wav file
      * @param bool
-	 */
-	public function upload_file($is_nano = false)
-	{
-		if (!empty($_FILES)) {
-			$upload_ok = process_uploaded_file($_FILES['file'], false);
-
-			if (!is_uploaded_file($_FILES['file']['tmp_name'])) {
-				return 0;
-			}
+     */
+    public function upload_file($is_nano = false)
+    {
+        if (!empty($_FILES)) {
+            $upload_ok = process_uploaded_file($_FILES['file'], false);
 
-			if ($upload_ok) {
-				// Check if there is enough space to save the file
-				if (!DocumentManager::enough_space($_FILES['file']['size'], DocumentManager::get_course_quota())) {
-					return 0;
-				}
+            if (!is_uploaded_file($_FILES['file']['tmp_name'])) {
+                return 0;
+            }
 
-				//first we delete everything before uploading the file
-				$this->delete_files();
+            if ($upload_ok) {
+                // Check if there is enough space to save the file
+                if (!DocumentManager::enough_space($_FILES['file']['size'], DocumentManager::get_course_quota())) {
+                    return 0;
+                }
 
-				//Reload the filename variable
-				$file_name = add_ext_on_mime($_FILES['file']['name'], $_FILES['file']['type']);
-				$file_name = strtolower($file_name);
-				$file_info = pathinfo($file_name);
+                //first we delete everything before uploading the file
+                $this->delete_files();
 
-				if ($is_nano == true) {
-					$file_info['extension'] = 'wav';
-				}
+                //Reload the filename variable
+                $file_name = add_ext_on_mime($_FILES['file']['name'], $_FILES['file']['type']);
+                $file_name = strtolower($file_name);
+                $file_info = pathinfo($file_name);
 
-				$file_name = $this->filename.'.'.$file_info['extension'];
+                if ($is_nano == true) {
+                    $file_info['extension'] = 'wav';
+                }
 
-				if (in_array($file_info['extension'], $this->available_extensions)) {
-					if (move_uploaded_file($_FILES['file']['tmp_name'], $this->store_path.$file_name)) {
-						$this->store_filename = $this->store_path.$file_name;
-						return 1;
-					}
-				}
-			}
-		}
+                $file_name = $this->filename.'.'.$file_info['extension'];
+
+                if (in_array($file_info['extension'], $this->available_extensions)) {
+                    if (move_uploaded_file($_FILES['file']['tmp_name'], $this->store_path.$file_name)) {
+                        $this->store_filename = $this->store_path.$file_name;
+                        return 1;
+                    }
+                }
+            }
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Show the audio file + a button to download
+    /**
+     * Show the audio file + a button to download
      * @param bool
-	 */
-	public function show_audio_file($show_delete_button = false)
-	{
-		$html = '';
-		$file_path = $this->load_filename_if_exists();
-
-		if (!empty($file_path)) {
-			$url = $this->get_public_url(true);
-			$actions = Display::url(Display::return_icon('save.png', get_lang('Download'), array(), ICON_SIZE_SMALL), $url, array('target'=>'_blank'));
-			$download_button = Display::url(get_lang('Download'), $url, array('class' =>'btn btn-default'));
-
-			if ($show_delete_button) {
-				$actions .= ' '.Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), "#", array('onclick'=>'delete_file();'));
-			}
+     */
+    public function show_audio_file($show_delete_button = false)
+    {
+        $html = '';
+        $file_path = $this->load_filename_if_exists();
+
+        if (!empty($file_path)) {
+            $url = $this->get_public_url(true);
+            $actions = Display::url(Display::return_icon('save.png', get_lang('Download'), array(), ICON_SIZE_SMALL), $url, array('target'=>'_blank'));
+            $download_button = Display::url(get_lang('Download'), $url, array('class' =>'btn btn-default'));
 
-			$basename = basename($file_path);
-			$path_info = pathinfo($basename);
+            if ($show_delete_button) {
+                $actions .= ' '.Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), "#", array('onclick'=>'delete_file();'));
+            }
 
-			if ($path_info['extension'] == 'wav') {
+            $basename = basename($file_path);
+            $path_info = pathinfo($basename);
 
-				$html .= '<script>
+            if ($path_info['extension'] == 'wav') {
+
+                $html .= '<script>
 				$(document).ready( function() {
 					var java_enabled = navigator.javaEnabled();
 
@@ -357,56 +357,56 @@  discard block
 block discarded – undo
 				});
 				</script>';
 
-				$html .= '<div id="nanogong_player_id" class="nanogong_player_container">';
-					$html .= '<div class="action_player">'.$actions.'</div>';
-					$html .= '<div class="nanogong_player">';
-						$html .= '<applet id="nanogong_player" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" ALIGN="middle">';
-						$html .= '<param name="ShowRecordButton" value="false" />'; // default true
-						$html .= '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
-						//echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
-						$html .= '<param name="ShowTime" value="true" />'; // default false
-						$html .= '<param name="Color" value="#FFFFFF" />';
+                $html .= '<div id="nanogong_player_id" class="nanogong_player_container">';
+                    $html .= '<div class="action_player">'.$actions.'</div>';
+                    $html .= '<div class="nanogong_player">';
+                        $html .= '<applet id="nanogong_player" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" ALIGN="middle">';
+                        $html .= '<param name="ShowRecordButton" value="false" />'; // default true
+                        $html .= '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
+                        //echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
+                        $html .= '<param name="ShowTime" value="true" />'; // default false
+                        $html .= '<param name="Color" value="#FFFFFF" />';
                         $html .= '<param name="ShowSpeedButton" value="false" />';
-						//echo '<param name="StartTime" value="10.5" />';
-						//echo '<param name="EndTime" value="65" />';
-						$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
-						//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
-						//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
-						//echo '<param name="SamplingRate" value="32000" />';
-						//echo '<param name="MaxDuration" value="60" />';
-						$html .=  '<param name="SoundFileURL" value="'.$url.'" />';//load a file |(default "")
-						$html .= '</applet>';
-					$html .= '</div>';
-				$html .= '</div>';
+                        //echo '<param name="StartTime" value="10.5" />';
+                        //echo '<param name="EndTime" value="65" />';
+                        $html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+                        //$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+                        //Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
+                        //echo '<param name="SamplingRate" value="32000" />';
+                        //echo '<param name="MaxDuration" value="60" />';
+                        $html .=  '<param name="SoundFileURL" value="'.$url.'" />';//load a file |(default "")
+                        $html .= '</applet>';
+                    $html .= '</div>';
+                $html .= '</div>';
                 $html .= '<div id="nanogong_warning">'.Display::return_message(get_lang('BrowserDoesNotSupportNanogongPlayer'), 'warning').$download_button.'</div>';
 
-			} elseif(in_array($path_info['extension'],array('mp3', 'ogg','wav'))) {
-				$js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
-				$html .= '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skin/blue.monday/css/jplayer.blue.monday.css" type="text/css">';
-				$html .= '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jplayer/jquery.jplayer.min.js"></script>';
+            } elseif(in_array($path_info['extension'],array('mp3', 'ogg','wav'))) {
+                $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
+                $html .= '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skin/blue.monday/css/jplayer.blue.monday.css" type="text/css">';
+                $html .= '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jplayer/jquery.jplayer.min.js"></script>';
 
-				$html .= '<div class="nanogong_player"></div>';
-				$html .= '<br /><div class="action_player">'.$actions.'</div><br /><br /><br />';
+                $html .= '<div class="nanogong_player"></div>';
+                $html .= '<br /><div class="action_player">'.$actions.'</div><br /><br /><br />';
 
                 $params = array(
                     'url' => $url,
                     'extension' =>$path_info['extension'],
                     'count'=> 1
-                 );
+                    );
                 $jquery = DocumentManager::generate_jplayer_jquery($params);
-				$html .= '<script>
+                $html .= '<script>
 				$(document).ready( function() {
 				    //Experimental changes to preview mp3, ogg files
 				     '.$jquery.'
 				});
 				</script>';
-				$html .= DocumentManager::generate_media_preview(1, 'advanced');
-			}
-		}
+                $html .= DocumentManager::generate_media_preview(1, 'advanced');
+            }
+        }
         return $html;
-	}
+    }
 
-	/*
+    /*
 	var filename = document.getElementById("audio_title").value+".wav";
 	var filename = filename.replace(/\s/g, "_");//replace spaces by _
 	var filename = encodeURIComponent(filename);
@@ -416,19 +416,19 @@  discard block
 block discarded – undo
 	var urlnanogong="'.$url.'?filename="+filename+"&filepath="+filepath+"&dir="+dir+"&course_code="+course_code;
 	*/
 
-	/**
-	 * Returns the nanogong javascript code
-	 * @return string
-	 */
+    /**
+     * Returns the nanogong javascript code
+     * @return string
+     */
     public function return_js()
     {
-		$params = $this->get_params(true);
-		$url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params.'&is_nano=1';
-		$url_load_file = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=show_audio&'.$params;
+        $params = $this->get_params(true);
+        $url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params.'&is_nano=1';
+        $url_load_file = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=show_audio&'.$params;
 
-		$url_delete = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=delete&'.$params;
+        $url_delete = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=delete&'.$params;
 
-		$js =  '<script language="javascript">
+        $js =  '<script language="javascript">
 
 			//lang vars
 
@@ -544,77 +544,77 @@  discard block
 block discarded – undo
 				return false;
 			}
 			</script>';
-		return $js;
-	}
+        return $js;
+    }
 
-	/**
-	 * Returns the HTML form to upload a nano file or upload a file
+    /**
+     * Returns the HTML form to upload a nano file or upload a file
      * @param string
-	 */
-	public function return_form($message = null)
+     */
+    public function return_form($message = null)
     {
 
-		$params = $this->get_params(true);
-		$url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params;
+        $params = $this->get_params(true);
+        $url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params;
 
-		//check browser support and load form
-		$array_browser = api_browser_support('check_browser');
+        //check browser support and load form
+        $array_browser = api_browser_support('check_browser');
 
-		$preview_file = $this->show_audio_file(true, true);
+        $preview_file = $this->show_audio_file(true, true);
 
         $preview_file = Display::div(
             $preview_file,
             array('id' => 'preview', 'style' => 'text-align:center; padding-left: 25px;')
         );
 
-		$html = '<center>';
+        $html = '<center>';
 
-		//Use normal upload file
-		$html .= Display::return_icon('microphone.png', get_lang('PressRecordButton'),'', ICON_SIZE_BIG);
-		$html .='<br />';
+        //Use normal upload file
+        $html .= Display::return_icon('microphone.png', get_lang('PressRecordButton'),'', ICON_SIZE_BIG);
+        $html .='<br />';
 
-		$html .= '<div id="nanogong_div">';
+        $html .= '<div id="nanogong_div">';
 
-		$html .= '<applet id="nanogong" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" align="middle">';
-		//echo '<param name="ShowRecordButton" value="false" />'; // default true
-		// echo '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
+        $html .= '<applet id="nanogong" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" align="middle">';
+        //echo '<param name="ShowRecordButton" value="false" />'; // default true
+        // echo '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
         $html .= '<param name="ShowSpeedButton" value="false" />'; // default true
-		//echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
-		$html .= '<param name="ShowTime" value="true" />'; // default false
-		$html .= '<param name="Color" value="#FFFFFF" />'; // default #FFFFFF
-		//echo '<param name="StartTime" value="10.5" />';
-		//echo '<param name="EndTime" value="65" />';
-		$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
-		//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+        //echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
+        $html .= '<param name="ShowTime" value="true" />'; // default false
+        $html .= '<param name="Color" value="#FFFFFF" />'; // default #FFFFFF
+        //echo '<param name="StartTime" value="10.5" />';
+        //echo '<param name="EndTime" value="65" />';
+        $html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+        //$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
 
-		//echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
-		//echo '<param name="MaxDuration" value="60" />';
-		//echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
-		$html .= '</applet>';
+        //echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
+        //echo '<param name="MaxDuration" value="60" />';
+        //echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
+        $html .= '</applet>';
 
-		$html .= '<br /><br /><br />';
+        $html .= '<br /><br /><br />';
 
         $html .= '<form name="form_nanogong_advanced">';
-		$html .= '<input type="hidden" name="is_nano" value="1">';
-		$html .= '<a href="#" class="btn btn-default"  onclick="send_voice()" />'.get_lang('SendRecord').'</a>';
-		$html .= '</form></div>';
+        $html .= '<input type="hidden" name="is_nano" value="1">';
+        $html .= '<a href="#" class="btn btn-default"  onclick="send_voice()" />'.get_lang('SendRecord').'</a>';
+        $html .= '</form></div>';
 
         $html .= Display::url(get_lang('ProblemsRecordingUploadYourOwnAudioFile'), 'javascript:void(0)', array('onclick' => 'show_simple_upload_form();'));
 
-		$html .= '<br /><br /><div id="no_nanogong_div">';
-		//$html .= Display::return_message(get_lang('BrowserNotSupportNanogongSend'), 'warning');
-		$html .= '<form id="form_nanogong_simple" class="form-search" action="'.$url.'" name="form_nanogong" method="POST" enctype="multipart/form-data">';
-		$html .= '<input type="file" name="file">';
-		$html .= '<a href="#" class="btn btn-default"  onclick="upload_file()" /><em class="fa fa-upload"></em> '.get_lang('UploadFile').'</a>';
-		$html .= '</form>';
+        $html .= '<br /><br /><div id="no_nanogong_div">';
+        //$html .= Display::return_message(get_lang('BrowserNotSupportNanogongSend'), 'warning');
+        $html .= '<form id="form_nanogong_simple" class="form-search" action="'.$url.'" name="form_nanogong" method="POST" enctype="multipart/form-data">';
+        $html .= '<input type="file" name="file">';
+        $html .= '<a href="#" class="btn btn-default"  onclick="upload_file()" /><em class="fa fa-upload"></em> '.get_lang('UploadFile').'</a>';
+        $html .= '</form>';
         $html .= '</div>';
-		$html .= '</center>';
-		$html .= '<div style="display:none" id="status_ok" class="confirmation-message"></div><div style="display:none" id="status_warning" class="warning-message"></div>';
-		$html .= '<div id="messages">'.$message.'</div>';
-		$html .= $preview_file;
+        $html .= '</center>';
+        $html .= '<div style="display:none" id="status_ok" class="confirmation-message"></div><div style="display:none" id="status_warning" class="warning-message"></div>';
+        $html .= '<div id="messages">'.$message.'</div>';
+        $html .= $preview_file;
 
-		return $html;
-	}
+        return $html;
+    }
 
     /**
      * @param bool $return_as_query
@@ -622,15 +622,15 @@  discard block
 block discarded – undo
      */
     public function get_params($return_as_query = false)
     {
-		if (empty($this->params)) {
-			return false;
-		}
-		if ($return_as_query) {
-			return http_build_query($this->params);
-		}
+        if (empty($this->params)) {
+            return false;
+        }
+        if ($return_as_query) {
+            return http_build_query($this->params);
+        }
 
-		return $this->params;
-	}
+        return $this->params;
+    }
 
     /**
      * @param $attribute
@@ -638,18 +638,18 @@  discard block
 block discarded – undo
      */
     public function get_param_value($attribute)
     {
-		if (isset($this->params[$attribute])) {
-			return $this->params[$attribute];
-		}
-	}
-
-	/**
-	 * Show a button to load the form
-	 * @return string
-	 */
+        if (isset($this->params[$attribute])) {
+            return $this->params[$attribute];
+        }
+    }
+
+    /**
+     * Show a button to load the form
+     * @return string
+     */
     public function show_button()
     {
-		$params_string = $this->get_params(true);
+        $params_string = $this->get_params(true);
 
         $url = api_get_path(WEB_AJAX_PATH)
             . 'nanogong.ajax.php?a=show_form&'
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
                 'data-title' => get_lang('RecordAnswer')
             ]
         );
-		$html .= '<br /><br />'.Display::return_message(get_lang('UseTheMessageBelowToAddSomeComments'));
-		return $html;
-	}
+        $html .= '<br /><br />'.Display::return_message(get_lang('UseTheMessageBelowToAddSomeComments'));
+        return $html;
+    }
 }

Please login to merge, or discard this patch.

main/inc/lib/statsUtils.lib.inc.php 1 patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -107,14 +107,14 @@
 block discarded – undo
         return $resu;
     }
 
-	/**
-	 * @author Sebastien Piraux <[email protected]>
-	 * @param sql : a sql query (as a string)
-	 * @return hours_array
-	 * @desc        Return an assoc array.  Keys are the hours, values are
-	 * the number of time this hours was found.
-	 * key 'total' return the sum of all number of time hours
-	 * appear
+    /**
+     * @author Sebastien Piraux <[email protected]>
+     * @param sql : a sql query (as a string)
+     * @return hours_array
+     * @desc        Return an assoc array.  Keys are the hours, values are
+     * the number of time this hours was found.
+     * key 'total' return the sum of all number of time hours
+     * appear
      */
     public static function hoursTab($sql)
     {

Please login to merge, or discard this patch.

main/inc/lib/rights.lib.php 1 patch

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -5,42 +5,42 @@
 block discarded – undo
  * @deprecated Don't use this class
  */
 class Rights {
-	private static $rights_cache = array();
-	private static $rights = array (
-		'show_tabs:reports' =>
-			array (
-				'type' => 'const',
-				'const' => 'true' )
-		);
+    private static $rights_cache = array();
+    private static $rights = array (
+        'show_tabs:reports' =>
+            array (
+                'type' => 'const',
+                'const' => 'true' )
+        );
 
-	// warning the goal of this function is to enforce rights managment in Chamilo
-	// thus default return value is always true
-	public static function hasRight($handler) {
-		if (array_key_exists($handler, self::$rights_cache))
-			return self::$rights_cache[$handler];
+    // warning the goal of this function is to enforce rights managment in Chamilo
+    // thus default return value is always true
+    public static function hasRight($handler) {
+        if (array_key_exists($handler, self::$rights_cache))
+            return self::$rights_cache[$handler];
 
-		if (!array_key_exists($handler, self::$rights))
-			return true; // handler does not exists
+        if (!array_key_exists($handler, self::$rights))
+            return true; // handler does not exists
 
-		if (self::$rights[$handler]['type'] == 'sql') {
-			$result = Database::query(self::$rights[$handler]['sql']);
-			if (Database::num_rows($result) > 0)
-				$result = true;
-			else
-				$result = false;
-		} else if (self::$rights[$handler]['type'] == 'const')
-			$result = self::$rights[$handler]['const'];
-		else if (self::$rights[$handler]['type'] == 'func')
-			$result = self::$rights[$handler]['func']();
-		else // handler type not implemented
-			return true;
-		self::$rights_cache[$handler] = $result;
-		return $result;
-	}
+        if (self::$rights[$handler]['type'] == 'sql') {
+            $result = Database::query(self::$rights[$handler]['sql']);
+            if (Database::num_rows($result) > 0)
+                $result = true;
+            else
+                $result = false;
+        } else if (self::$rights[$handler]['type'] == 'const')
+            $result = self::$rights[$handler]['const'];
+        else if (self::$rights[$handler]['type'] == 'func')
+            $result = self::$rights[$handler]['func']();
+        else // handler type not implemented
+            return true;
+        self::$rights_cache[$handler] = $result;
+        return $result;
+    }
 
-	public static function hasRightClosePageWithError($handler) {
-		if (hasRight($handler) == false)
-			die("You are not allowed here"); //FIXME
-	}
+    public static function hasRightClosePageWithError($handler) {
+        if (hasRight($handler) == false)
+            die("You are not allowed here"); //FIXME
+    }
 
 }

Please login to merge, or discard this patch.

main/inc/lib/plugin.lib.php 1 patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -173,9 +173,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @param string $pluginName
-    * @param int    $urlId
-    */
+     * @param string $pluginName
+     * @param int    $urlId
+     */
     public function uninstall($pluginName, $urlId = null)
     {
         if (empty($urlId)) {
@@ -252,12 +252,12 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @param string $region
-    * @param string $template
-    * @param bool   $forced
-    *
-    * @return null|string
-    */
+     * @param string $region
+     * @param string $template
+     * @param bool   $forced
+     *
+     * @return null|string
+     */
     public function load_region($region, $template, $forced = false)
     {
         if ($region == 'course_tool_plugin') {

Please login to merge, or discard this patch.

		@@ -379,7 +379,7 @@
		block discarded – undo
379	379	$sql_delete = "DELETE FROM $tucc
380	380	WHERE id='" . $category_id . "' and user_id='" . $current_user_id . "'";
381	381	$resultQuery = Database::query($sql_delete);
382		- if (Database::affected_rows($resultQuery)) {
	382	+ if (Database::affected_rows($resultQuery)) {
383	383	$result = true;
384	384	}
385	385	$sql = "UPDATE $TABLECOURSUSER

		@@ -103,13 +103,13 @@ discard block
		block discarded – undo
103	103	if (isset($_configuration['language_measure_frequency']) &&
104	104	$_configuration['language_measure_frequency'] == 1
105	105	) {
106		- require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
107		- global $langstats;
108		- $langstats->add_use($variable,'');
	106	+ require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
	107	+ global $langstats;
	108	+ $langstats->add_use($variable,'');
109	109	}
110	110
111	111	if (!isset($used_lang_vars)) {
112		- $used_lang_vars = array();
	112	+ $used_lang_vars = array();
113	113	}
114	114
115	115	// Caching results from some API functions, for speed.
		@@ -305,7 +305,7 @@ discard block
		block discarded – undo
305	305	static $text_direction = array();
306	306
307	307	if (empty($language)) {
308		- $language = api_get_interface_language();
	308	+ $language = api_get_interface_language();
309	309	}
310	310	if (!isset($text_direction[$language])) {
311	311	$text_direction[$language] = in_array(api_purify_language_id($language),
		@@ -536,24 +536,24 @@ discard block
		block discarded – undo
536	536	case DATE_FORMAT_ONLY_DAYNAME:
537	537	$date_format = get_lang('dateFormatOnlyDayName', '', $language);
538	538	if (INTL_INSTALLED) {
539		- $datetype = IntlDateFormatter::SHORT;
540		- $timetype = IntlDateFormatter::NONE;
541		- }
	539	+ $datetype = IntlDateFormatter::SHORT;
	540	+ $timetype = IntlDateFormatter::NONE;
	541	+ }
542	542	break;
543	543	case DATE_FORMAT_NUMBER_NO_YEAR:
544	544	$date_format = get_lang('dateFormatShortNumberNoYear', '', $language);
545		- if (INTL_INSTALLED) {
546		- $datetype = IntlDateFormatter::SHORT;
547		- $timetype = IntlDateFormatter::NONE;
548		- }
	545	+ if (INTL_INSTALLED) {
	546	+ $datetype = IntlDateFormatter::SHORT;
	547	+ $timetype = IntlDateFormatter::NONE;
	548	+ }
	549	+ break;
	550	+ case DATE_FORMAT_NUMBER:
	551	+ $date_format = get_lang('dateFormatShortNumber', '', $language);
	552	+ if (INTL_INSTALLED) {
	553	+ $datetype = IntlDateFormatter::SHORT;
	554	+ $timetype = IntlDateFormatter::NONE;
	555	+ }
549	556	break;
550		- case DATE_FORMAT_NUMBER:
551		- $date_format = get_lang('dateFormatShortNumber', '', $language);
552		- if (INTL_INSTALLED) {
553		- $datetype = IntlDateFormatter::SHORT;
554		- $timetype = IntlDateFormatter::NONE;
555		- }
556		- break;
557	557	case TIME_NO_SEC_FORMAT:
558	558	$date_format = get_lang('timeNoSecFormat', '', $language);
559	559	if (INTL_INSTALLED) {
		@@ -589,14 +589,14 @@ discard block
		block discarded – undo
589	589	$timetype = IntlDateFormatter::SHORT;
590	590	}
591	591	break;
592		- case DATE_TIME_FORMAT_SHORT:
	592	+ case DATE_TIME_FORMAT_SHORT:
593	593	$date_format = get_lang('dateTimeFormatShort', '', $language);
594	594	if (INTL_INSTALLED) {
595	595	$datetype = IntlDateFormatter::FULL;
596	596	$timetype = IntlDateFormatter::SHORT;
597	597	}
598	598	break;
599		- case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
	599	+ case DATE_TIME_FORMAT_SHORT_TIME_FIRST:
600	600	$date_format = get_lang('dateTimeFormatShortTimeFirst', '', $language);
601	601	if (INTL_INSTALLED) {
602	602	$datetype = IntlDateFormatter::FULL;
		@@ -1817,7 +1817,6 @@ discard block
		block discarded – undo
1817	1817
1818	1818	/**
1819	1819	* Return true a date is valid
1820		-
1821	1820	* @param string $date example: 2014-06-30 13:05:05
1822	1821	* @param string $format example: "Y-m-d H:i:s"
1823	1822	*

		@@ -173,9 +173,9 @@ discard block
		block discarded – undo
173	173	}
174	174
175	175	/**
176		- * @param string $pluginName
177		- * @param int $urlId
178		- */
	176	+ * @param string $pluginName
	177	+ * @param int $urlId
	178	+ */
179	179	public function uninstall($pluginName, $urlId = null)
180	180	{
181	181	if (empty($urlId)) {
		@@ -252,12 +252,12 @@ discard block
		block discarded – undo
252	252	}
253	253
254	254	/**
255		- * @param string $region
256		- * @param string $template
257		- * @param bool $forced
258		- *
259		- * @return null\|string
260		- */
	255	+ * @param string $region
	256	+ * @param string $template
	257	+ * @param bool $forced
	258	+ *
	259	+ * @return null\|string
	260	+ */
261	261	public function load_region($region, $template, $forced = false)
262	262	{
263	263	if ($region == 'course_tool_plugin') {

		@@ -666,7 +666,7 @@
		block discarded – undo
666	666	$res = Database::query($sql);
667	667	$count1 = Database::fetch_object($res);
668	668	$sql = "SELECT COUNT(*) AS n FROM $user_table as u $table ".
669		- "WHERE LENGTH(picture_uri) > 0 $url_condition2";
	669	+ "WHERE LENGTH(picture_uri) > 0 $url_condition2";
670	670	$res = Database::query($sql);
671	671	$count2 = Database::fetch_object($res);
672	672	// #users without picture

		@@ -18,11 +18,11 @@ discard block
		block discarded – undo
18	18
19	19	class OpenGraph implements Iterator
20	20	{
21		- /**
22		- * There are base schema's based on type, this is just
23		- * a map so that the schema can be obtained
24		- *
25		- */
	21	+ /**
	22	+ * There are base schema's based on type, this is just
	23	+ * a map so that the schema can be obtained
	24	+ *
	25	+ */
26	26	public static $TYPES = array(
27	27	'activity' => array('activity', 'sport'),
28	28	'business' => array('bar', 'company', 'cafe', 'hotel', 'restaurant'),
		@@ -34,19 +34,19 @@ discard block
		block discarded – undo
34	34	'website' => array('blog', 'website'),
35	35	);
36	36
37		- /**
38		- * Holds all the Open Graph values we've parsed from a page
39		- *
40		- */
	37	+ /**
	38	+ * Holds all the Open Graph values we've parsed from a page
	39	+ *
	40	+ */
41	41	private $_values = array();
42	42
43		- /**
44		- * Fetches a URI and parses it for Open Graph data, returns
45		- * false on error.
46		- *
47		- * @param $URI URI to page to parse for Open Graph data
48		- * @return OpenGraph
49		- */
	43	+ /**
	44	+ * Fetches a URI and parses it for Open Graph data, returns
	45	+ * false on error.
	46	+ *
	47	+ * @param $URI URI to page to parse for Open Graph data
	48	+ * @return OpenGraph
	49	+ */
50	50	static public function fetch($URI) {
51	51	$curl = curl_init($URI);
52	52
		@@ -69,13 +69,13 @@ discard block
		block discarded – undo
69	69	}
70	70	}
71	71
72		- /**
73		- * Parses HTML and extracts Open Graph data, this assumes
74		- * the document is at least well formed.
75		- *
76		- * @param $HTML HTML to parse
77		- * @return OpenGraph
78		- */
	72	+ /**
	73	+ * Parses HTML and extracts Open Graph data, this assumes
	74	+ * the document is at least well formed.
	75	+ *
	76	+ * @param $HTML HTML to parse
	77	+ * @return OpenGraph
	78	+ */
79	79	static private function _parse($HTML) {
80	80	$old_libxml_error = libxml_use_internal_errors(true);
81	81
		@@ -140,13 +140,13 @@ discard block
		block discarded – undo
140	140	return $page;
141	141	}
142	142
143		- /**
144		- * Helper method to access attributes directly
145		- * Example:
146		- * $graph->title
147		- *
148		- * @param $key Key to fetch from the lookup
149		- */
	143	+ /**
	144	+ * Helper method to access attributes directly
	145	+ * Example:
	146	+ * $graph->title
	147	+ *
	148	+ * @param $key Key to fetch from the lookup
	149	+ */
150	150	public function __get($key) {
151	151	if (array_key_exists($key, $this->_values)) {
152	152	return $this->_values[$key];
		@@ -161,29 +161,29 @@ discard block
		block discarded – undo
161	161	}
162	162	}
163	163
164		- /**
165		- * Return all the keys found on the page
166		- *
167		- * @return array
168		- */
	164	+ /**
	165	+ * Return all the keys found on the page
	166	+ *
	167	+ * @return array
	168	+ */
169	169	public function keys() {
170	170	return array_keys($this->_values);
171	171	}
172	172
173		- /**
174		- * Helper method to check an attribute exists
175		- *
176		- * @param $key
177		- */
	173	+ /**
	174	+ * Helper method to check an attribute exists
	175	+ *
	176	+ * @param $key
	177	+ */
178	178	public function __isset($key) {
179	179	return array_key_exists($key, $this->_values);
180	180	}
181	181
182		- /**
183		- * Will return true if the page has location data embedded
184		- *
185		- * @return boolean Check if the page has location data
186		- */
	182	+ /**
	183	+ * Will return true if the page has location data embedded
	184	+ *
	185	+ * @return boolean Check if the page has location data
	186	+ */
187	187	public function hasLocation() {
188	188	if (array_key_exists('latitude', $this->_values) && array_key_exists('longitude', $this->_values)) {
189	189	return true;
		@@ -197,9 +197,9 @@ discard block
		block discarded – undo
197	197	return $valid_address;
198	198	}
199	199
200		- /**
201		- * Iterator code
202		- */
	200	+ /**
	201	+ * Iterator code
	202	+ */
203	203	private $_position = 0;
204	204	public function rewind() { reset($this->_values); $this->_position = 0; }
205	205	public function current() { return current($this->_values); }

		@@ -107,14 +107,14 @@
		block discarded – undo
107	107	return $resu;
108	108	}
109	109
110		- /**
111		- * @author Sebastien Piraux <[email protected]>
112		- * @param sql : a sql query (as a string)
113		- * @return hours_array
114		- * @desc Return an assoc array. Keys are the hours, values are
115		- * the number of time this hours was found.
116		- * key 'total' return the sum of all number of time hours
117		- * appear
	110	+ /**
	111	+ * @author Sebastien Piraux <[email protected]>
	112	+ * @param sql : a sql query (as a string)
	113	+ * @return hours_array
	114	+ * @desc Return an assoc array. Keys are the hours, values are
	115	+ * the number of time this hours was found.
	116	+ * key 'total' return the sum of all number of time hours
	117	+ * appear
118	118	*/
119	119	public static function hoursTab($sql)
120	120	{

		@@ -5,42 +5,42 @@
		block discarded – undo
5	5	* @deprecated Don't use this class
6	6	*/
7	7	class Rights {
8		- private static $rights_cache = array();
9		- private static $rights = array (
10		- 'show_tabs:reports' =>
11		- array (
12		- 'type' => 'const',
13		- 'const' => 'true' )
14		- );
	8	+ private static $rights_cache = array();
	9	+ private static $rights = array (
	10	+ 'show_tabs:reports' =>
	11	+ array (
	12	+ 'type' => 'const',
	13	+ 'const' => 'true' )
	14	+ );
15	15
16		- // warning the goal of this function is to enforce rights managment in Chamilo
17		- // thus default return value is always true
18		- public static function hasRight($handler) {
19		- if (array_key_exists($handler, self::$rights_cache))
20		- return self::$rights_cache[$handler];
	16	+ // warning the goal of this function is to enforce rights managment in Chamilo
	17	+ // thus default return value is always true
	18	+ public static function hasRight($handler) {
	19	+ if (array_key_exists($handler, self::$rights_cache))
	20	+ return self::$rights_cache[$handler];
21	21
22		- if (!array_key_exists($handler, self::$rights))
23		- return true; // handler does not exists
	22	+ if (!array_key_exists($handler, self::$rights))
	23	+ return true; // handler does not exists
24	24
25		- if (self::$rights[$handler]['type'] == 'sql') {
26		- $result = Database::query(self::$rights[$handler]['sql']);
27		- if (Database::num_rows($result) > 0)
28		- $result = true;
29		- else
30		- $result = false;
31		- } else if (self::$rights[$handler]['type'] == 'const')
32		- $result = self::$rights[$handler]['const'];
33		- else if (self::$rights[$handler]['type'] == 'func')
34		- $result = self::$rights[$handler]['func']();
35		- else // handler type not implemented
36		- return true;
37		- self::$rights_cache[$handler] = $result;
38		- return $result;
39		- }
	25	+ if (self::$rights[$handler]['type'] == 'sql') {
	26	+ $result = Database::query(self::$rights[$handler]['sql']);
	27	+ if (Database::num_rows($result) > 0)
	28	+ $result = true;
	29	+ else
	30	+ $result = false;
	31	+ } else if (self::$rights[$handler]['type'] == 'const')
	32	+ $result = self::$rights[$handler]['const'];
	33	+ else if (self::$rights[$handler]['type'] == 'func')
	34	+ $result = self::$rights[$handler]['func']();
	35	+ else // handler type not implemented
	36	+ return true;
	37	+ self::$rights_cache[$handler] = $result;
	38	+ return $result;
	39	+ }
40	40
41		- public static function hasRightClosePageWithError($handler) {
42		- if (hasRight($handler) == false)
43		- die("You are not allowed here"); //FIXME
44		- }
	41	+ public static function hasRightClosePageWithError($handler) {
	42	+ if (hasRight($handler) == false)
	43	+ die("You are not allowed here"); //FIXME
	44	+ }
45	45
46	46	}

chamilo / chamilo-lms

Push — 1.10.x ( ac2491...356be2 )

Status

Category

Indentation +846 added lines, -846 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +21 added lines, -22 removed lines patch added patch discarded remove patch

Indentation +240 added lines, -240 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch