chamilo / chamilo-lms

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

Indentation +845 added lines, -845 removed lines

@@ -83,809 +83,809 @@ 
 * @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 __construct() {

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

-	}

-

-	/**

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

-	*

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

-	* @access	public

-	*/

-	function getGlobalDebugLevel() {

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

-	}

-

-	/**

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

-	*

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

-	* @access	public

-	*/

-	function setGlobalDebugLevel($level) {

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

-	}

-

-	/**

-	* gets the debug level for this instance

-	*

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

-	* @access	public

-	*/

-	function getDebugLevel() {

-		return $this->debugLevel;

-	}

-

-	/**

-	* sets the debug level for this instance

-	*

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

-	* @access	public

-	*/

-	function setDebugLevel($level) {

-		$this->debugLevel = $level;

-	}

-

-	/**

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

-	*

-	* @param    string $string debug data

-	* @access   private

-	*/

-	function debug($string){

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

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

-		}

-	}

-

-	/**

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

-	*

-	* @param    string $string debug data

-	* @access   public

-	*/

-	function appendDebug($string){

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

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

-			// memory more efficiently

-			$this->debug_str .= $string;

-		}

-	}

-

-	/**

-	* clears the current debug data for this instance

-	*

-	* @access   public

-	*/

-	function clearDebug() {

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

-		// memory more efficiently

-		$this->debug_str = '';

-	}

-

-	/**

-	* gets the current debug data for this instance

-	*

-	* @return   debug data

-	* @access   public

-	*/

-	function &getDebug() {

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

-		// memory more efficiently

-		return $this->debug_str;

-	}

-

-	/**

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

-	* this may change the contents of the debug data

-	*

-	* @return   debug data as an XML comment

-	* @access   public

-	*/

-	function &getDebugAsXMLComment() {

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

-		// memory more efficiently

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

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

-		}

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

-    	return $ret;

-	}

-

-	/**

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

-	*

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

-	* @access	private

-	*/

-	function expandEntities($val) {

-		if ($this->charencoding) {

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

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

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

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

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

-	    }

-	    return $val;

-	}

-

-	/**

-	* returns error string if present

-	*

-	* @return   mixed error string or false

-	* @access   public

-	*/

-	function getError(){

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

-			return $this->error_str;

-		}

-		return false;

-	}

-

-	/**

-	* sets error string

-	*

-	* @return   boolean $string error string

-	* @access   private

-	*/

-	function setError($str){

-		$this->error_str = $str;

-	}

-

-	/**

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

-	*

-	* @param	mixed	$val	The PHP array

-	* @return	string	(arraySimple|arrayStruct)

-	* @access	private

-	*/

-	function isArraySimpleOrStruct($val) {

+    );

+

+    /**

+     * XML entities to convert

+     *

+     * @var      array

+     * @access   public

+     * @deprecated

+     * @see	expandEntities

+     */

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

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

+

+    /**

+     * constructor

+     *

+     * @access	public

+     */

+    function __construct() {

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

+    }

+

+    /**

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

+     *

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

+     * @access	public

+     */

+    function getGlobalDebugLevel() {

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

+    }

+

+    /**

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

+     *

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

+     * @access	public

+     */

+    function setGlobalDebugLevel($level) {

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

+    }

+

+    /**

+     * gets the debug level for this instance

+     *

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

+     * @access	public

+     */

+    function getDebugLevel() {

+        return $this->debugLevel;

+    }

+

+    /**

+     * sets the debug level for this instance

+     *

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

+     * @access	public

+     */

+    function setDebugLevel($level) {

+        $this->debugLevel = $level;

+    }

+

+    /**

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

+     *

+     * @param    string $string debug data

+     * @access   private

+     */

+    function debug($string){

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

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

+        }

+    }

+

+    /**

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

+     *

+     * @param    string $string debug data

+     * @access   public

+     */

+    function appendDebug($string){

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

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

+            // memory more efficiently

+            $this->debug_str .= $string;

+        }

+    }

+

+    /**

+     * clears the current debug data for this instance

+     *

+     * @access   public

+     */

+    function clearDebug() {

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

+        // memory more efficiently

+        $this->debug_str = '';

+    }

+

+    /**

+     * gets the current debug data for this instance

+     *

+     * @return   debug data

+     * @access   public

+     */

+    function &getDebug() {

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

+        // memory more efficiently

+        return $this->debug_str;

+    }

+

+    /**

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

+     * this may change the contents of the debug data

+     *

+     * @return   debug data as an XML comment

+     * @access   public

+     */

+    function &getDebugAsXMLComment() {

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

+        // memory more efficiently

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

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

+        }

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

+        return $ret;

+    }

+

+    /**

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

+     *

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

+     * @access	private

+     */

+    function expandEntities($val) {

+        if ($this->charencoding) {

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

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

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

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

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

+        }

+        return $val;

+    }

+

+    /**

+     * returns error string if present

+     *

+     * @return   mixed error string or false

+     * @access   public

+     */

+    function getError(){

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

+            return $this->error_str;

+        }

+        return false;

+    }

+

+    /**

+     * sets error string

+     *

+     * @return   boolean $string error string

+     * @access   private

+     */

+    function setError($str){

+        $this->error_str = $str;

+    }

+

+    /**

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

+     *

+     * @param	mixed	$val	The PHP array

+     * @return	string	(arraySimple|arrayStruct)

+     * @access	private

+     */

+    function isArraySimpleOrStruct($val) {

         $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;

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

-				// detect if struct or array

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

+        // detect type and serialize

+        $xml = '';

+        switch(true) {

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

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

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

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

+                } elseif (! $val) {

+                    $val = 0;

+                }

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

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

+                } else {

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

+                }

+                break;

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

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

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

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

+                } else {

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

+                }

+                break;

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

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

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

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

+                } else {

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

+                }

+                break;

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

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

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

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

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

+                } else {

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

+                }

+                break;

+            case is_object($val):

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

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

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

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

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

+                    $val->clearDebug();

+                } else {

+                    if (! $name) {

+                        $name = get_class($val);

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

+                    } else {

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

+                    }

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

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

+                    }

+                }

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

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

+                } else {

+                    $type_str = '';

+                }

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

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

+                } else {

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

+                }

+                break;

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

+                // detect if struct or array

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

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

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

-					$i = 0;

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

-						foreach($val as $v){

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

-								$tt_ns = $v->type_ns;

-								$tt = $v->type;

-							} elseif (is_array($v)) {

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

-							} else {

-								$tt = gettype($v);

-	                        }

-							$array_types[$tt] = 1;

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

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

-							++$i;

-						}

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

-							$array_typename = 'xsd:anyType';

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

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

-								$tt = 'int';

-							}

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

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

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

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

-							$array_typename = 'unnamed_struct_use_soapval';

-						} else {

-							// if type is prefixed, create type prefix

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

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

-							} elseif ($tt_ns) {

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

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

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

-							} else {

-								$array_typename = $tt;

-							}

-						}

-						$array_type = $i;

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

-							$type_str = '';

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

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

-						} else {

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

-						}

-					// empty array

-					} else {

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

-							$type_str = '';

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

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

-						} else {

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

-						}

-					}

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

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

-				} else {

-					// got a struct

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

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

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

-					} else {

-						$type_str = '';

-					}

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

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

-					} else {

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

-					}

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

-						// Apache Map

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

-							$xml .= '<item>';

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

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

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

-						} else {

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

-						}

-					}

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

-				}

-				break;

-			default:

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

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

-				break;

-		}

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

-		return $xml;

-	}

-

-    /**

-    * serializes a message

-    *

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

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

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

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

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

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

-    * @return string the message

-    * @access public

-    */

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

+                    $i = 0;

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

+                        foreach($val as $v){

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

+                                $tt_ns = $v->type_ns;

+                                $tt = $v->type;

+                            } elseif (is_array($v)) {

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

+                            } else {

+                                $tt = gettype($v);

+                            }

+                            $array_types[$tt] = 1;

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

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

+                            ++$i;

+                        }

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

+                            $array_typename = 'xsd:anyType';

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

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

+                                $tt = 'int';

+                            }

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

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

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

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

+                            $array_typename = 'unnamed_struct_use_soapval';

+                        } else {

+                            // if type is prefixed, create type prefix

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

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

+                            } elseif ($tt_ns) {

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

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

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

+                            } else {

+                                $array_typename = $tt;

+                            }

+                        }

+                        $array_type = $i;

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

+                            $type_str = '';

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

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

+                        } else {

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

+                        }

+                    // empty array

+                    } else {

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

+                            $type_str = '';

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

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

+                        } else {

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

+                        }

+                    }

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

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

+                } else {

+                    // got a struct

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

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

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

+                    } else {

+                        $type_str = '';

+                    }

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

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

+                    } else {

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

+                    }

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

+                        // Apache Map

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

+                            $xml .= '<item>';

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

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

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

+                        } else {

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

+                        }

+                    }

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

+                }

+                break;

+            default:

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

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

+                break;

+        }

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

+        return $xml;

+    }

+

+    /**

+     * serializes a message

+     *

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

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

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

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

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

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

+     * @return string the message

+     * @access public

+     */

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

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

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

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

 

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

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

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

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

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

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

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

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

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

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

 

-	// serialize namespaces

+    // serialize namespaces

     $ns_string = '';

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

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

-	}

-	if($encodingStyle) {

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

-	}

-

-	// serialize headers

-	if($headers){

-		if (is_array($headers)) {

-			$xml = '';

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

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

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

-				} else {

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

-				}

-			}

-			$headers = $xml;

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

-		}

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

-	}

-	// serialize envelope

-	return

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

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

-	$headers.

-	"<SOAP-ENV:Body>".

-		$body.

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

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

-    }

-

-	/**

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

-	 *

-	 * @param string $str The string to format

-	 * @return string The formatted string

-	 * @access public

-	 * @deprecated

-	 */

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

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

+    }

+    if($encodingStyle) {

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

+    }

+

+    // serialize headers

+    if($headers){

+        if (is_array($headers)) {

+            $xml = '';

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

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

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

+                } else {

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

+                }

+            }

+            $headers = $xml;

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

+        }

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

+    }

+    // serialize envelope

+    return

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

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

+    $headers.

+    "<SOAP-ENV:Body>".

+        $body.

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

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

+    }

+

+    /**

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

+     *

+     * @param string $str The string to format

+     * @return string The formatted string

+     * @access public

+     * @deprecated

+     */

     function formatDump($str){

-		$str = htmlspecialchars($str);

-		return nl2br($str);

-    }

-

-	/**

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

-	*

-	* @param    string $qname qname

-	* @return	string contracted qname

-	* @access   private

-	*/

-	function contractQname($qname){

-		// get element namespace

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

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

-			// get unqualified name

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

-			// get ns

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

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

-			if ($p) {

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

-			}

-			return $qname;

-		} else {

-			return $qname;

-		}

-	}

-

-	/**

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

-	*

-	* @param    string $qname qname

-	* @return	string expanded qname

-	* @access   private

-	*/

-	function expandQname($qname){

-		// get element prefix

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

-			// get unqualified name

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

-			// get ns prefix

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

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

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

-			} else {

-				return $qname;

-			}

-		} else {

-			return $qname;

-		}

-	}

-

-    /**

-    * returns the local part of a prefixed string

-    * returns the original string, if not prefixed

-    *

-    * @param string $str The prefixed string

-    * @return string The local part

-    * @access public

-    */

-	function getLocalPart($str){

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

-			// get unqualified name

-			return substr( $sstr, 1 );

-		} else {

-			return $str;

-		}

-	}

-

-	/**

-    * returns the prefix part of a prefixed string

-    * returns false, if not prefixed

-    *

-    * @param string $str The prefixed string

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

-    * @access public

-    */

-	function getPrefix($str){

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

-			// get prefix

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

-		}

-		return false;

-	}

-

-	/**

-    * pass it a prefix, it returns a namespace

-    *

-    * @param string $prefix The prefix

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

-    * @access public

-    */

-	function getNamespaceFromPrefix($prefix){

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

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

-		}

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

-		return false;

-	}

-

-	/**

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

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

-    *

-    * @param string $ns The namespace

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

-    * @access public

-    */

-	function getPrefixFromNamespace($ns) {

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

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

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

-				return $p;

-			}

-		}

-		return false;

-	}

-

-	/**

-    * returns the time in ODBC canonical form with microseconds

-    *

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

-    * @access public

-    */

-	function getmicrotime() {

-		if (function_exists('gettimeofday')) {

-			$tod = gettimeofday();

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

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

-		} else {

-			$sec = time();

-			$usec = 0;

-		}

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

-	}

-

-	/**

-	 * Returns a string with the output of var_dump

-	 *

-	 * @param mixed $data The variable to var_dump

-	 * @return string The output of var_dump

-	 * @access public

-	 */

+        $str = htmlspecialchars($str);

+        return nl2br($str);

+    }

+

+    /**

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

+     *

+     * @param    string $qname qname

+     * @return	string contracted qname

+     * @access   private

+     */

+    function contractQname($qname){

+        // get element namespace

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

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

+            // get unqualified name

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

+            // get ns

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

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

+            if ($p) {

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

+            }

+            return $qname;

+        } else {

+            return $qname;

+        }

+    }

+

+    /**

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

+     *

+     * @param    string $qname qname

+     * @return	string expanded qname

+     * @access   private

+     */

+    function expandQname($qname){

+        // get element prefix

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

+            // get unqualified name

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

+            // get ns prefix

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

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

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

+            } else {

+                return $qname;

+            }

+        } else {

+            return $qname;

+        }

+    }

+

+    /**

+     * returns the local part of a prefixed string

+     * returns the original string, if not prefixed

+     *

+     * @param string $str The prefixed string

+     * @return string The local part

+     * @access public

+     */

+    function getLocalPart($str){

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

+            // get unqualified name

+            return substr( $sstr, 1 );

+        } else {

+            return $str;

+        }

+    }

+

+    /**

+     * returns the prefix part of a prefixed string

+     * returns false, if not prefixed

+     *

+     * @param string $str The prefixed string

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

+     * @access public

+     */

+    function getPrefix($str){

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

+            // get prefix

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

+        }

+        return false;

+    }

+

+    /**

+     * pass it a prefix, it returns a namespace

+     *

+     * @param string $prefix The prefix

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

+     * @access public

+     */

+    function getNamespaceFromPrefix($prefix){

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

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

+        }

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

+        return false;

+    }

+

+    /**

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

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

+     *

+     * @param string $ns The namespace

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

+     * @access public

+     */

+    function getPrefixFromNamespace($ns) {

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

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

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

+                return $p;

+            }

+        }

+        return false;

+    }

+

+    /**

+     * returns the time in ODBC canonical form with microseconds

+     *

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

+     * @access public

+     */

+    function getmicrotime() {

+        if (function_exists('gettimeofday')) {

+            $tod = gettimeofday();

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

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

+        } else {

+            $sec = time();

+            $usec = 0;

+        }

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

+    }

+

+    /**

+     * Returns a string with the output of var_dump

+     *

+     * @param mixed $data The variable to var_dump

+     * @return string The output of var_dump

+     * @access public

+     */

     function varDump($data) {

-		ob_start();

-		var_dump($data);

-		$ret_val = ob_get_contents();

-		ob_end_clean();

-		return $ret_val;

-	}

-

-	/**

-	* represents the object as a string

-	*

-	* @return	string

-	* @access   public

-	*/

-	function __toString() {

-		return $this->varDump($this);

-	}

+        ob_start();

+        var_dump($data);

+        $ret_val = ob_get_contents();

+        ob_end_clean();

+        return $ret_val;

+    }

+

+    /**

+     * represents the object as a string

+     *

+     * @return	string

+     * @access   public

+     */

+    function __toString() {

+        return $this->varDump($this);

+    }

 }

 

 // XML Schema Datatype Helper Functions

@@ -901,35 +901,35 @@ 
 * @access   public

 */

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

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

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

-	if ($pos === FALSE) {

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

-	}

-	if ($pos !== FALSE) {

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

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

-		}

-	}

-	if($utc){

-		$pattern = '/'.

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

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

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

-		'T'.			// separator T

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

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

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

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

-		'/';

-

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

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

-		}

-		return false;

-	} else {

-		return $datestr;

-	}

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

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

+    if ($pos === FALSE) {

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

+    }

+    if ($pos !== FALSE) {

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

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

+        }

+    }

+    if($utc){

+        $pattern = '/'.

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

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

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

+        'T'.			// separator T

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

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

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

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

+        '/';

+

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

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

+        }

+        return false;

+    } else {

+        return $datestr;

+    }

 }

 

 /**

@@ -940,35 +940,35 @@ 
 * @access   public

 */

 function iso8601_to_timestamp($datestr){

-	$pattern = '/'.

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

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

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

-	'T'.			// separator T

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

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

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

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

-	'/';

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

-		// not utc

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

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

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

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

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

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

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

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

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

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

-			}

-		}

-		return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

+    $pattern = '/'.

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

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

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

+    'T'.			// separator T

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

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

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

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

+    '/';

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

+        // not utc

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

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

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

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

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

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

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

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

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

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

+            }

+        }

+        return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

 //		return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");

-	} else {

-		return false;

-	}

+    } else {

+        return false;

+    }

 }

 

 /**

@@ -980,13 +980,13 @@ 
 */

 function usleepWindows($usec)

 {

-	$start = gettimeofday();

-

-	do

-	{

-		$stop = gettimeofday();

-		$timePassed = 1000000 * ($stop['sec'] - $start['sec'])

-		+ $stop['usec'] - $start['usec'];

-	}

-	while ($timePassed < $usec);

+    $start = gettimeofday();

+

+    do

+    {

+        $stop = gettimeofday();

+        $timePassed = 1000000 * ($stop['sec'] - $start['sec'])

+        + $stop['usec'] - $start['usec'];

+    }

+    while ($timePassed < $usec);

 }

main/admin/user_edit.php

Indentation +99 added lines, -99 removed lines

@@ -147,7 +147,7 @@ 
 unset($user_data['password']);
 
 if ($userGeolocalization) {
-	$htmlHeadXtra[] = '<script>
+    $htmlHeadXtra[] = '<script>
     $(document).ready(function() {
 
         var address = "' . $user_data['address'] . '";
@@ -257,27 +257,27 @@ 
 $form->addElement('hidden', 'user_id', $user_id);
 
 if (api_is_western_name_order()) {
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 } else {
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 }
 
 // Official code
@@ -299,16 +299,16 @@ 
 
 // OpenID
 if (api_get_setting('openid_authentication') == 'true') {
-	$form->addElement('text', 'openid', get_lang('OpenIDURL'));
+    $form->addElement('text', 'openid', get_lang('OpenIDURL'));
 }
 
 // Phone
 $form->addElement('text', 'phone', get_lang('PhoneNumber'));
 
 if ($userGeolocalization) {
-	// Geolocation
-	$form->addElement('text', 'address', get_lang('AddressField'), ['id' => 'address']);
-	$form->addHtml('
+    // Geolocation
+    $form->addElement('text', 'address', get_lang('AddressField'), ['id' => 'address']);
+    $form->addHtml('
         <div class="form-group">
             <label for="geolocalization" class="col-sm-2 control-label"></label>
             <div class="col-sm-8">
@@ -318,7 +318,7 @@ 
         </div>
     ');
 
-	$form->addHtml('
+    $form->addHtml('
         <div class="form-group">
             <label for="map" class="col-sm-2 control-label">
                 '.get_lang('Map').'
@@ -351,18 +351,18 @@ 
 $form->addHidden('cropResult', '');
 
 $form->addRule(
-	'picture',
-	get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
-	'filetype',
-	$allowed_picture_types
+    'picture',
+    get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
+    'filetype',
+    $allowed_picture_types
 );
 if (strlen($user_data['picture_uri']) > 0) {
-	$form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
+    $form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
 }
 
 // Username
 if (api_get_setting('login_is_email') != 'true') {
-	$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
+    $form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
     $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
     $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
     $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
@@ -434,15 +434,15 @@ 
 
 // Platform admin
 if (api_is_platform_admin()) {
-	$group = array();
-	$group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1);
-	$group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0);
+    $group = array();
+    $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1);
+    $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0);
 
-	$user_data['status'] == 1 ? $display = 'block':$display = 'none';
+    $user_data['status'] == 1 ? $display = 'block':$display = 'none';
 
-	$form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">');
-	$form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false);
-	$form->addElement('html', '</div>');
+    $form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">');
+    $form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false);
+    $form->addElement('html', '</div>');
 }
 
 //Language
@@ -460,16 +460,16 @@ 
 $form->addElement('label', get_lang('RegistrationDate'), $date);
 
 if (!$user_data['platform_admin']) {
-	// Expiration Date
-	$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
-	$group = array ();
-	$group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
-	$group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
-	$form->addGroup($group, 'max_member_group', null, '', false);
-
-	// Active account or inactive account
-	$form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
-	$form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
+    // Expiration Date
+    $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
+    $group = array ();
+    $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
+    $group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
+    $form->addGroup($group, 'max_member_group', null, '', false);
+
+    // Active account or inactive account
+    $form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
+    $form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
 }
 $studentBossList = UserManager::getStudentBossList($user_data['user_id']);
 
@@ -511,18 +511,18 @@ 
 $expiration_date = $user_data['expiration_date'];
 
 if (empty($expiration_date)) {
-	$user_data['radio_expiration_date'] = 0;
-	$user_data['expiration_date'] = api_get_local_time();
+    $user_data['radio_expiration_date'] = 0;
+    $user_data['expiration_date'] = api_get_local_time();
 } else {
-	$user_data['radio_expiration_date'] = 1;
-	$user_data['expiration_date'] = api_get_local_time($expiration_date);
+    $user_data['radio_expiration_date'] = 1;
+    $user_data['expiration_date'] = api_get_local_time($expiration_date);
 }
 $form->setDefaults($user_data);
 
 $error_drh = false;
 // Validate form
 if ($form->validate()) {
-	$user = $form->getSubmitValues(1);
+    $user = $form->getSubmitValues(1);
     $reset_password = intval($user['reset_password']);
     if ($reset_password == 2 && empty($user['password'])) {
         Display::addFlash(Display::return_message(get_lang('PasswordIsTooShort')));
@@ -530,18 +530,18 @@ 
         exit();
     }
 
-	$is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']);
+    $is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']);
 
-	if ($user['status'] == DRH && $is_user_subscribed_in_course) {
-		$error_drh = true;
-	} else {
-		$picture_element = $form->getElement('picture');
-		$picture = $picture_element->getValue();
+    if ($user['status'] == DRH && $is_user_subscribed_in_course) {
+        $error_drh = true;
+    } else {
+        $picture_element = $form->getElement('picture');
+        $picture = $picture_element->getValue();
 
-		$picture_uri = $user_data['picture_uri'];
-		if (isset($user['delete_picture']) && $user['delete_picture']) {
-			$picture_uri = UserManager::delete_user_picture($user_id);
-		} elseif (!empty($picture['name'])) {
+        $picture_uri = $user_data['picture_uri'];
+        if (isset($user['delete_picture']) && $user['delete_picture']) {
+            $picture_uri = UserManager::delete_user_picture($user_id);
+        } elseif (!empty($picture['name'])) {
             $picture_uri = UserManager::update_user_picture(
                 $user_id,
                 $_FILES['picture']['name'],
@@ -549,30 +549,30 @@ 
                 $user['cropResult']
 
             );
-		}
+        }
 
-		$lastname = $user['lastname'];
-		$firstname = $user['firstname'];
+        $lastname = $user['lastname'];
+        $firstname = $user['firstname'];
         $password = $user['password'];
         $auth_source = isset($user['auth_source']) ? $user['auth_source'] : $userInfo['auth_source'];
-		$official_code = $user['official_code'];
-		$email = $user['email'];
-		$phone = $user['phone'];
-		$username = isset($user['username']) ? $user['username'] : $userInfo['username'];
-		$status = intval($user['status']);
-		$platform_admin = intval($user['platform_admin']);
-		$send_mail = intval($user['send_mail']);
-		$reset_password = intval($user['reset_password']);
-		$hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null;
-		$language = $user['language'];
-
-		if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) {
+        $official_code = $user['official_code'];
+        $email = $user['email'];
+        $phone = $user['phone'];
+        $username = isset($user['username']) ? $user['username'] : $userInfo['username'];
+        $status = intval($user['status']);
+        $platform_admin = intval($user['platform_admin']);
+        $send_mail = intval($user['send_mail']);
+        $reset_password = intval($user['reset_password']);
+        $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null;
+        $language = $user['language'];
+
+        if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) {
             $expiration_date = $user['expiration_date'];
-		} else {
-			$expiration_date = null;
-		}
+        } else {
+            $expiration_date = null;
+        }
 
-		$active = $user_data['platform_admin'] ? 1 : intval($user['active']);
+        $active = $user_data['platform_admin'] ? 1 : intval($user['active']);
 
         //If the user is set to admin the status will be overwrite by COURSEMANAGER = 1
         if ($platform_admin == 1) {
@@ -604,44 +604,44 @@ 
             null,
             $send_mail,
             $reset_password,
-			$user['address']
+            $user['address']
         );
 
         if (isset($user['student_boss'])) {
             UserManager::subscribeUserToBossList($user_id, $user['student_boss']);
         }
 
-		if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) {
-			$up = UserManager::update_openid($user_id, $user['openid']);
-		}
+        if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) {
+            $up = UserManager::update_openid($user_id, $user['openid']);
+        }
         $currentUserId = api_get_user_id();
 
         $userObj = api_get_user_entity($user_id);
 		
         UserManager::add_user_as_admin($userObj);
 
-		if ($user_id != $currentUserId) {
-			if ($platform_admin == 1) {
-				$userObj = api_get_user_entity($user_id);
+        if ($user_id != $currentUserId) {
+            if ($platform_admin == 1) {
+                $userObj = api_get_user_entity($user_id);
                 UserManager::add_user_as_admin($userObj);
-			} else {
+            } else {
                 UserManager::remove_user_admin($user_id);
-			}
-		}
+            }
+        }
 
         $extraFieldValue = new ExtraFieldValue('user');
         $extraFieldValue->saveFieldValues($user);
 
-		$tok = Security::get_token();
-		header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')).'&sec_token='.$tok);
-		exit();
-	}
+        $tok = Security::get_token();
+        header('Location: user_list.php?action=show_message&message='.urlencode(get_lang('UserUpdated')).'&sec_token='.$tok);
+        exit();
+    }
 }
 
 $message = null;
 if ($error_drh) {
-	$err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager');
-	$message = Display::return_message($err_msg, 'error');
+    $err_msg = get_lang('StatusCanNotBeChangedToHumanResourcesManager');
+    $message = Display::return_message($err_msg, 'error');
 }
 
 $content = null;

src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php

Indentation +707 added lines, -707 removed lines

@@ -21,16 +21,16 @@ 
  */
 class CourseRestorer
 {
-	/**
-	 * The course-object
-	 */
+    /**
+     * The course-object
+     */
     public $course;
     public $destination_course_info;
 
-	/**
-	 * What to do with files with same name (FILE_SKIP, FILE_RENAME or
-	 * FILE_OVERWRITE)
-	 */
+    /**
+     * What to do with files with same name (FILE_SKIP, FILE_RENAME or
+     * FILE_OVERWRITE)
+     */
     public $file_option;
     public $set_tools_invisible_by_default;
     public $skip_content;
@@ -42,7 +42,7 @@ 
         'events',
         'forum_category',
         'forums',
-       // 'forum_topics',
+        // 'forum_topics',
         'glossary',
         'quizzes',
         'test_category',
@@ -110,15 +110,15 @@ 
         $this->tool_copy_settings = $array;
     }
 
-	/**
-	 * Restore a course.
+    /**
+     * Restore a course.
      *
-	 * @param string    $destination_course_code code of the Chamilo-course in
-	 * @param int	    $session_id
-	 * @param bool	    $update_course_settings Course settings are going to be restore?
+     * @param string    $destination_course_code code of the Chamilo-course in
+     * @param int	    $session_id
+     * @param bool	    $update_course_settings Course settings are going to be restore?
      * @param bool      $respect_base_content
      * @return false|null
-	 */
+     */
     public function restore(
         $destination_course_code = '',
         $session_id = 0,
@@ -261,17 +261,17 @@ 
         }
     }
 
-	/**
-	 * Restore only harmless course settings:
+    /**
+     * Restore only harmless course settings:
      * course_language, visibility, department_name,department_url,
      * subscribe, unsubscribe ,category_code
-	 *
-	 * @param string $destination_course_code
-	 */
+     *
+     * @param string $destination_course_code
+     */
     public function restore_course_settings($destination_course_code)
     {
-	    $origin_course_info = api_get_course_info($destination_course_code);
-	    $course_info = $this->course->info;
+        $origin_course_info = api_get_course_info($destination_course_code);
+        $course_info = $this->course->info;
         $params['course_language'] = $course_info['language'];
         $params['visibility'] = $course_info['visibility'];
         $params['department_name'] = $course_info['department_name'];
@@ -280,8 +280,8 @@ 
         $params['category_code'] = $course_info['categoryCode'];
         $params['subscribe'] = $course_info['subscribe_allowed'];
         $params['unsubscribe'] = $course_info['unsubscribe'];
-	    CourseManager::update_attributes($origin_course_info['real_id'], $params);
-	}
+        CourseManager::update_attributes($origin_course_info['real_id'], $params);
+    }
 
     /**
      * Restore documents
@@ -295,11 +295,11 @@ 
         $course_info = api_get_course_info($destination_course_code);
 
         if ($this->course->has_resources(RESOURCE_DOCUMENT)) {
-			$table = Database :: get_course_table(TABLE_DOCUMENT);
-			$resources = $this->course->resources;
+            $table = Database :: get_course_table(TABLE_DOCUMENT);
+            $resources = $this->course->resources;
             $path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
 
-			foreach ($resources[RESOURCE_DOCUMENT] as $id => $document) {
+            foreach ($resources[RESOURCE_DOCUMENT] as $id => $document) {
                 if (empty($document->item_properties[0]['id_session'])) {
                     $my_session_id = 0;
                 } else {
@@ -368,7 +368,7 @@ 
                             }
                         }
                     }
-		    	} elseif ($document->file_type == DOCUMENT) {
+                } elseif ($document->file_type == DOCUMENT) {
                     //Checking if folder exists in the database otherwise we created it
                     $dir_to_create = dirname($document->path);
 
@@ -424,19 +424,19 @@ 
                         }
                     }
 
-					if (file_exists($path.$document->path)) {
-						switch ($this->file_option) {
-							case FILE_OVERWRITE:
+                    if (file_exists($path.$document->path)) {
+                        switch ($this->file_option) {
+                            case FILE_OVERWRITE:
                                 $origin_path = $this->course->backup_path.'/'.$document->path;
 
-								if (file_exists($origin_path)) {
-        						    copy($origin_path, $path.$document->path);
+                                if (file_exists($origin_path)) {
+                                    copy($origin_path, $path.$document->path);
                                     $sql = "SELECT id FROM $table
                                             WHERE
                                                 c_id = ".$this->destination_course_id." AND
                                                 path = '/".self::DBUTF8escapestring(substr($document->path, 9))."'";
 
-        						    $res = Database::query($sql);
+                                    $res = Database::query($sql);
                                     $count = Database::num_rows($res);
 
                                     if ($count == 0) {
@@ -451,7 +451,7 @@ 
                                             'readonly' => 0
                                         ];
 
-    									$document_id = Database::insert($table, $params);
+                                        $document_id = Database::insert($table, $params);
 
                                         if ($document_id) {
                                             $sql = "UPDATE $table SET id = iid WHERE iid = $document_id";
@@ -559,83 +559,83 @@ 
                                             ],
                                         ]
                                     );
-								}
+                                }
 
-								break;
-							case FILE_SKIP:
-								$sql = "SELECT id FROM $table
+                                break;
+                            case FILE_SKIP:
+                                $sql = "SELECT id FROM $table
 								        WHERE
 								            c_id = ".$this->destination_course_id." AND
 								            path='/".self::DBUTF8escapestring(substr($document->path, 9))."'";
-								$res = Database::query($sql);
-								$obj = Database::fetch_object($res);
-								$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = $obj->id;
-								break;
-							case FILE_RENAME:
-								$i = 1;
-								$ext = explode('.', basename($document->path));
-								if (count($ext) > 1) {
-									$ext = array_pop($ext);
-									$file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
-									$ext = '.'.$ext;
-								} else {
-									$ext = '';
-									$file_name_no_ext = $document->path;
-								}
-								$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-								$file_exists = file_exists($path.$new_file_name);
-								while ($file_exists) {
-									$i ++;
-									$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-									$file_exists = file_exists($path.$new_file_name);
-								}
-
-								if (!empty($session_id)) {
-
-									$document_path = explode('/',$document->path,3);
-									$course_path = $path;
-									$orig_base_folder = $document_path[1];
-									$orig_base_path   = $course_path.$document_path[0].'/'.$document_path[1];
-
-									if (is_dir($orig_base_path)) {
-
-										$new_base_foldername = $orig_base_folder;
-										$new_base_path = $orig_base_path;
-
-										if ($_SESSION['orig_base_foldername'] != $new_base_foldername) {
-											unset($_SESSION['new_base_foldername']);
-											unset($_SESSION['orig_base_foldername']);
-											unset($_SESSION['new_base_path']);
-										}
-
-										$folder_exists = file_exists($new_base_path);
-										if ($folder_exists) {
-											$_SESSION['orig_base_foldername'] = $new_base_foldername; 		// e.g: carpeta1 in session
-											$x = '';
-											while ($folder_exists) {
-												$x = $x + 1;
-												$new_base_foldername = $document_path[1].'_'.$x;
-												$new_base_path = $orig_base_path.'_'.$x;
+                                $res = Database::query($sql);
+                                $obj = Database::fetch_object($res);
+                                $this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = $obj->id;
+                                break;
+                            case FILE_RENAME:
+                                $i = 1;
+                                $ext = explode('.', basename($document->path));
+                                if (count($ext) > 1) {
+                                    $ext = array_pop($ext);
+                                    $file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
+                                    $ext = '.'.$ext;
+                                } else {
+                                    $ext = '';
+                                    $file_name_no_ext = $document->path;
+                                }
+                                $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                                $file_exists = file_exists($path.$new_file_name);
+                                while ($file_exists) {
+                                    $i ++;
+                                    $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                                    $file_exists = file_exists($path.$new_file_name);
+                                }
+
+                                if (!empty($session_id)) {
+
+                                    $document_path = explode('/',$document->path,3);
+                                    $course_path = $path;
+                                    $orig_base_folder = $document_path[1];
+                                    $orig_base_path   = $course_path.$document_path[0].'/'.$document_path[1];
+
+                                    if (is_dir($orig_base_path)) {
+
+                                        $new_base_foldername = $orig_base_folder;
+                                        $new_base_path = $orig_base_path;
+
+                                        if ($_SESSION['orig_base_foldername'] != $new_base_foldername) {
+                                            unset($_SESSION['new_base_foldername']);
+                                            unset($_SESSION['orig_base_foldername']);
+                                            unset($_SESSION['new_base_path']);
+                                        }
+
+                                        $folder_exists = file_exists($new_base_path);
+                                        if ($folder_exists) {
+                                            $_SESSION['orig_base_foldername'] = $new_base_foldername; 		// e.g: carpeta1 in session
+                                            $x = '';
+                                            while ($folder_exists) {
+                                                $x = $x + 1;
+                                                $new_base_foldername = $document_path[1].'_'.$x;
+                                                $new_base_path = $orig_base_path.'_'.$x;
                                                 if ($_SESSION['new_base_foldername'] == $new_base_foldername) {
                                                     break;
                                                 }
-												$folder_exists = file_exists($new_base_path);
-											}
-											$_SESSION['new_base_foldername'] = $new_base_foldername;
-											$_SESSION['new_base_path'] = $new_base_path;
-										}
-
-										if (isset($_SESSION['new_base_foldername']) && isset($_SESSION['new_base_path'])) {
-											$new_base_foldername = $_SESSION['new_base_foldername'];
-											$new_base_path = $_SESSION['new_base_path'];
-										}
-
-										$dest_document_path = $new_base_path.'/'.$document_path[2];		// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1/collaborative.png"
-										$basedir_dest_path 	= dirname($dest_document_path);				// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1"
-										$base_path_document = $course_path.$document_path[0];			// e.g: "/var/www/wiener/courses/CURSO4/document"
-										$path_title = '/'.$new_base_foldername.'/'.$document_path[2];
-
-										copy_folder_course_session(
+                                                $folder_exists = file_exists($new_base_path);
+                                            }
+                                            $_SESSION['new_base_foldername'] = $new_base_foldername;
+                                            $_SESSION['new_base_path'] = $new_base_path;
+                                        }
+
+                                        if (isset($_SESSION['new_base_foldername']) && isset($_SESSION['new_base_path'])) {
+                                            $new_base_foldername = $_SESSION['new_base_foldername'];
+                                            $new_base_path = $_SESSION['new_base_path'];
+                                        }
+
+                                        $dest_document_path = $new_base_path.'/'.$document_path[2];		// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1/collaborative.png"
+                                        $basedir_dest_path 	= dirname($dest_document_path);				// e.g: "/var/www/wiener/courses/CURSO4/document/carpeta1_1/subcarpeta1"
+                                        $base_path_document = $course_path.$document_path[0];			// e.g: "/var/www/wiener/courses/CURSO4/document"
+                                        $path_title = '/'.$new_base_foldername.'/'.$document_path[2];
+
+                                        copy_folder_course_session(
                                             $basedir_dest_path,
                                             $base_path_document,
                                             $session_id,
@@ -677,7 +677,7 @@ 
                                             'session_id' => $my_session_id,
                                         ];
 
-										$document_id = Database::insert($table, $params);
+                                        $document_id = Database::insert($table, $params);
 
                                         if ($document_id) {
                                             $sql = "UPDATE $table SET id = iid WHERE iid = $document_id";
@@ -706,10 +706,10 @@ 
                                             null,
                                             $my_session_id
                                         );
-									} else {
-									    if (file_exists($path.$document->path)) {
+                                    } else {
+                                        if (file_exists($path.$document->path)) {
                                             copy($path.$document->path, $path.$new_file_name);
-									    }
+                                        }
                                         //Replace old course code with the new destination code see BT#1985
                                         if (file_exists($path.$new_file_name)) {
                                             $file_info = pathinfo($path.$new_file_name);
@@ -768,10 +768,10 @@ 
                                                 $my_session_id
                                             );
                                         }
-									}
-								} else {
+                                    }
+                                } else {
 
-									copy($this->course->backup_path.'/'.$document->path, $path.$new_file_name);
+                                    copy($this->course->backup_path.'/'.$document->path, $path.$new_file_name);
 
                                     //Replace old course code with the new destination code see BT#1985
                                     if (file_exists($path.$new_file_name)) {
@@ -831,20 +831,20 @@ 
                                         null,
                                         $my_session_id
                                     );
-								}
-								break;
-
-						} // end switch
-					} else {
-					    // end if file exists
-						//make sure the source file actually exists
-						if (is_file($this->course->backup_path.'/'.$document->path) &&
+                                }
+                                break;
+
+                        } // end switch
+                    } else {
+                        // end if file exists
+                        //make sure the source file actually exists
+                        if (is_file($this->course->backup_path.'/'.$document->path) &&
                             is_readable($this->course->backup_path.'/'.$document->path) &&
                             is_dir(dirname($path.$document->path)) &&
                             is_writeable(dirname($path.$document->path))
                         ) {
-						    //echo 'Copying';
-							copy($this->course->backup_path.'/'.$document->path, $path.$document->path);
+                            //echo 'Copying';
+                            copy($this->course->backup_path.'/'.$document->path, $path.$document->path);
 
                             //Replace old course code with the new destination code see BT#1985
                             if (file_exists($path.$document->path)) {
@@ -883,7 +883,7 @@ 
                                 Database::query($sql);
                             }
 
-							$this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = $document_id;
+                            $this->course->resources[RESOURCE_DOCUMENT][$id]->destination_id = $document_id;
 
                             $itemProperty = isset($document->item_properties[0]) ? $document->item_properties[0] : '';
                             $insertUserId = isset($itemProperty['insert_user_id']) ? $itemProperty['insert_user_id'] : api_get_user_id();
@@ -905,78 +905,78 @@ 
                                 null,
                                 $my_session_id
                             );
-						} else {
-							if (is_file($this->course->backup_path.'/'.$document->path) &&
+                        } else {
+                            if (is_file($this->course->backup_path.'/'.$document->path) &&
                                 is_readable($this->course->backup_path.'/'.$document->path)
                             ) {
-								error_log('Course copy generated an ignoreable error while trying to copy '.$this->course->backup_path.'/'.$document->path.': file not found');
-							}
-							if (!is_dir(dirname($path.$document->path))) {
-								error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not found');
-							}
-							if (!is_writeable(dirname($path.$document->path))) {
-								error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not writeable');
-							}
-						}
-					} // end file doesn't exist
-				}
-			} // end for each
-
-    		// Delete sessions for the copy the new folder in session
-    		unset($_SESSION['new_base_foldername']);
-    		unset($_SESSION['orig_base_foldername']);
-    		unset($_SESSION['new_base_path']);
-		}
-	}
-
-	/**
-	 * Restore scorm documents
-	 * TODO @TODO check that the restore function with renaming doesn't break the scorm structure!
+                                error_log('Course copy generated an ignoreable error while trying to copy '.$this->course->backup_path.'/'.$document->path.': file not found');
+                            }
+                            if (!is_dir(dirname($path.$document->path))) {
+                                error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not found');
+                            }
+                            if (!is_writeable(dirname($path.$document->path))) {
+                                error_log('Course copy generated an ignoreable error while trying to copy to '.dirname($path.$document->path).': directory not writeable');
+                            }
+                        }
+                    } // end file doesn't exist
+                }
+            } // end for each
+
+            // Delete sessions for the copy the new folder in session
+            unset($_SESSION['new_base_foldername']);
+            unset($_SESSION['orig_base_foldername']);
+            unset($_SESSION['new_base_path']);
+        }
+    }
+
+    /**
+     * Restore scorm documents
+     * TODO @TODO check that the restore function with renaming doesn't break the scorm structure!
      * see #7029
-	 */
-	public function restore_scorm_documents()
+     */
+    public function restore_scorm_documents()
     {
-		$perm = api_get_permissions_for_new_directories();
+        $perm = api_get_permissions_for_new_directories();
 
-		if ($this->course->has_resources(RESOURCE_SCORM)) {
-			$resources = $this->course->resources;
+        if ($this->course->has_resources(RESOURCE_SCORM)) {
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_SCORM] as $document) {
-				$path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
-				@mkdir(dirname($path.$document->path), $perm, true);
+            foreach ($resources[RESOURCE_SCORM] as $document) {
+                $path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/';
+                @mkdir(dirname($path.$document->path), $perm, true);
 
-				if (file_exists($path.$document->path)) {
-					switch ($this->file_option) {
-						case FILE_OVERWRITE:
-							rmdirr($path.$document->path);
+                if (file_exists($path.$document->path)) {
+                    switch ($this->file_option) {
+                        case FILE_OVERWRITE:
+                            rmdirr($path.$document->path);
                             copyDirTo(
                                 $this->course->backup_path . '/' . $document->path,
                                 $path . dirname($document->path),
                                 false
                             );
-							break;
-						case FILE_SKIP:
-							break;
+                            break;
+                        case FILE_SKIP:
+                            break;
                         case FILE_RENAME:
-							$i = 1;
-							$ext = explode('.', basename($document->path));
-							if (count($ext) > 1) {
-								$ext = array_pop($ext);
-								$file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
-								$ext = '.'.$ext;
-							} else {
-								$ext = '';
-								$file_name_no_ext = $document->path;
-							}
-
-							$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-							$file_exists = file_exists($path.$new_file_name);
-
-							while ($file_exists) {
-								$i ++;
-								$new_file_name = $file_name_no_ext.'_'.$i.$ext;
-								$file_exists = file_exists($path.$new_file_name);
-							}
+                            $i = 1;
+                            $ext = explode('.', basename($document->path));
+                            if (count($ext) > 1) {
+                                $ext = array_pop($ext);
+                                $file_name_no_ext = substr($document->path, 0, - (strlen($ext) + 1));
+                                $ext = '.'.$ext;
+                            } else {
+                                $ext = '';
+                                $file_name_no_ext = $document->path;
+                            }
+
+                            $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                            $file_exists = file_exists($path.$new_file_name);
+
+                            while ($file_exists) {
+                                $i ++;
+                                $new_file_name = $file_name_no_ext.'_'.$i.$ext;
+                                $file_exists = file_exists($path.$new_file_name);
+                            }
 
                             rename(
                                 $this->course->backup_path . '/' . $document->path,
@@ -992,30 +992,30 @@ 
                                 $this->course->backup_path . '/' . $document->path
                             );
 
-							break;
-					} // end switch
-				} else {
+                            break;
+                    } // end switch
+                } else {
                     // end if file exists
                     copyDirTo(
                         $this->course->backup_path . '/' . $document->path,
                         $path . dirname($document->path),
                         false
                     );
-				}
-			} // end for each
-		}
-	}
-
-	/**
-	 * Restore forums
-	 */
-	public function restore_forums($sessionId = 0)
+                }
+            } // end for each
+        }
+    }
+
+    /**
+     * Restore forums
+     */
+    public function restore_forums($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_FORUM)) {
+        if ($this->course->has_resources(RESOURCE_FORUM)) {
             $sessionId = intval($sessionId);
-			$table_forum = Database::get_course_table(TABLE_FORUM);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_FORUM] as $id => $forum) {
+            $table_forum = Database::get_course_table(TABLE_FORUM);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_FORUM] as $id => $forum) {
                 $params = (array)$forum->obj;
                 $cat_id = '';
                 if (isset($this->course->resources[RESOURCE_FORUMCATEGORY]) &&
@@ -1062,33 +1062,33 @@ 
                     Database::query($sql);
                 }
 
-				$this->course->resources[RESOURCE_FORUM][$id]->destination_id = $new_id;
-
-				$forum_topics = 0;
-				if (is_array($this->course->resources[RESOURCE_FORUMTOPIC])) {
-					foreach ($this->course->resources[RESOURCE_FORUMTOPIC] as $topic_id => $topic) {
-						if ($topic->obj->forum_id == $id) {
-							$this->restore_topic($topic_id, $new_id, $sessionId);
-							$forum_topics ++;
-						}
-					}
-				}
-				if ($forum_topics > 0) {
-					$sql = "UPDATE ".$table_forum." SET forum_threads = ".$forum_topics."
+                $this->course->resources[RESOURCE_FORUM][$id]->destination_id = $new_id;
+
+                $forum_topics = 0;
+                if (is_array($this->course->resources[RESOURCE_FORUMTOPIC])) {
+                    foreach ($this->course->resources[RESOURCE_FORUMTOPIC] as $topic_id => $topic) {
+                        if ($topic->obj->forum_id == $id) {
+                            $this->restore_topic($topic_id, $new_id, $sessionId);
+                            $forum_topics ++;
+                        }
+                    }
+                }
+                if ($forum_topics > 0) {
+                    $sql = "UPDATE ".$table_forum." SET forum_threads = ".$forum_topics."
                             WHERE c_id = {$this->destination_course_id} AND forum_id = ".(int)$new_id;
-					Database::query($sql);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Restore forum-categories
-	 */
+                    Database::query($sql);
+                }
+            }
+        }
+    }
+
+    /**
+     * Restore forum-categories
+     */
     public function restore_forum_category($my_id = null, $sessionId = 0)
     {
-		$forum_cat_table = Database :: get_course_table(TABLE_FORUM_CATEGORY);
-		$resources = $this->course->resources;
+        $forum_cat_table = Database :: get_course_table(TABLE_FORUM_CATEGORY);
+        $resources = $this->course->resources;
         if (!empty($resources[RESOURCE_FORUMCATEGORY])) {
             foreach ($resources[RESOURCE_FORUMCATEGORY] as $id => $forum_cat) {
                 if (!empty($my_id)) {
@@ -1125,16 +1125,16 @@ 
                 }
             }
         }
-	}
+    }
 
-	/**
-	 * Restore a forum-topic
-	 * @param false|string $forum_id
-	 */
+    /**
+     * Restore a forum-topic
+     * @param false|string $forum_id
+     */
     public function restore_topic($thread_id, $forum_id, $sessionId = 0)
     {
-		$table = Database :: get_course_table(TABLE_FORUM_THREAD);
-		$topic = $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id];
+        $table = Database :: get_course_table(TABLE_FORUM_THREAD);
+        $topic = $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id];
 
         $params = (array)$topic->obj;
         $params = self::DBUTF8_array($params);
@@ -1171,27 +1171,27 @@ 
             $sessionId
         );
 
-		$this->course->resources[RESOURCE_FORUMTOPIC][$thread_id]->destination_id = $new_id;
-		$topic_replies = -1;
-
-		foreach ($this->course->resources[RESOURCE_FORUMPOST] as $post_id => $post) {
-			if ($post->obj->thread_id == $thread_id) {
-				$topic_replies++;
-				$this->restore_post($post_id, $new_id, $forum_id, $sessionId);
-			}
-		}
-		return $new_id;
-	}
-
-	/**
-	 * Restore a forum-post
-	 * @TODO Restore tree-structure of posts. For example: attachments to posts.
-	 * @param false|string $topic_id
-	 */
+        $this->course->resources[RESOURCE_FORUMTOPIC][$thread_id]->destination_id = $new_id;
+        $topic_replies = -1;
+
+        foreach ($this->course->resources[RESOURCE_FORUMPOST] as $post_id => $post) {
+            if ($post->obj->thread_id == $thread_id) {
+                $topic_replies++;
+                $this->restore_post($post_id, $new_id, $forum_id, $sessionId);
+            }
+        }
+        return $new_id;
+    }
+
+    /**
+     * Restore a forum-post
+     * @TODO Restore tree-structure of posts. For example: attachments to posts.
+     * @param false|string $topic_id
+     */
     public function restore_post($id, $topic_id, $forum_id, $sessionId = 0)
     {
-		$table_post = Database :: get_course_table(TABLE_FORUM_POST);
-		$post = $this->course->resources[RESOURCE_FORUMPOST][$id];
+        $table_post = Database :: get_course_table(TABLE_FORUM_POST);
+        $post = $this->course->resources[RESOURCE_FORUMPOST][$id];
         $params = (array) $post->obj;
         $params['c_id'] = $this->destination_course_id;
         $params['forum_id'] = $forum_id;
@@ -1226,37 +1226,37 @@ 
             null,
             $sessionId
         );
-		$this->course->resources[RESOURCE_FORUMPOST][$id]->destination_id = $new_id;
+        $this->course->resources[RESOURCE_FORUMPOST][$id]->destination_id = $new_id;
 
-		return $new_id;
-	}
+        return $new_id;
+    }
 
-	/**
-	 * Restore links
-	 */
+    /**
+     * Restore links
+     */
     public function restore_links($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_LINK)) {
-			$link_table = Database :: get_course_table(TABLE_LINK);
-			$resources = $this->course->resources;
+        if ($this->course->has_resources(RESOURCE_LINK)) {
+            $link_table = Database :: get_course_table(TABLE_LINK);
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_LINK] as $id => $link) {
+            foreach ($resources[RESOURCE_LINK] as $id => $link) {
                 $cat_id = $this->restore_link_category(
                     $link->category_id,
                     $session_id
                 );
-				$sql = "SELECT MAX(display_order)
+                $sql = "SELECT MAX(display_order)
 				        FROM $link_table
 				        WHERE
 				            c_id = ".$this->destination_course_id." AND
 				            category_id='" . intval($cat_id). "'";
-				$result = Database::query($sql);
-    			list($max_order) = Database::fetch_array($result);
+                $result = Database::query($sql);
+                list($max_order) = Database::fetch_array($result);
 
                 $params = [];
-    			if (!empty($session_id)) {
+                if (!empty($session_id)) {
                     $params['session_id'] = $session_id;
-    			}
+                }
 
                 $params['c_id'] = $this->destination_course_id;
                 $params['url'] = self::DBUTF8($link->url);
@@ -1285,9 +1285,9 @@ 
                     }
                     $this->course->resources[RESOURCE_LINK][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Restore a link-category
@@ -1331,21 +1331,21 @@ 
         return $this->course->resources[RESOURCE_LINKCATEGORY][$id]->destination_id;
     }
 
-	/**
-	 * Restore tool intro
-	 */
+    /**
+     * Restore tool intro
+     */
     public function restore_tool_intro($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_TOOL_INTRO)) {
+        if ($this->course->has_resources(RESOURCE_TOOL_INTRO)) {
             $sessionId = intval($sessionId);
-			$tool_intro_table = Database :: get_course_table(TABLE_TOOL_INTRO);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_TOOL_INTRO] as $id => $tool_intro) {
-				$sql = "DELETE FROM ".$tool_intro_table."
+            $tool_intro_table = Database :: get_course_table(TABLE_TOOL_INTRO);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_TOOL_INTRO] as $id => $tool_intro) {
+                $sql = "DELETE FROM ".$tool_intro_table."
 				        WHERE
 				            c_id = ".$this->destination_course_id." AND
 				            id='".self::DBUTF8escapestring($tool_intro->id)."'";
-				Database::query($sql);
+                Database::query($sql);
 
                 $tool_intro->intro_text = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $tool_intro->intro_text,
@@ -1373,21 +1373,21 @@ 
 
                     $this->course->resources[RESOURCE_TOOL_INTRO][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore events
-	 */
+    /**
+     * Restore events
+     */
     public function restore_events($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_EVENT)) {
+        if ($this->course->has_resources(RESOURCE_EVENT)) {
             $sessionId = intval($sessionId);
-			$table = Database :: get_course_table(TABLE_AGENDA);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_EVENT] as $id => $event) {
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+            $table = Database :: get_course_table(TABLE_AGENDA);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_EVENT] as $id => $event) {
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $event->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $event->content,
                     $this->course->code,
@@ -1405,7 +1405,7 @@ 
                     'end_date' => $event->end_date,
                     'session_id' => $sessionId,
                 ];
-				$new_event_id = Database::insert($table, $params);
+                $new_event_id = Database::insert($table, $params);
 
                 if ($new_event_id) {
                     $sql = "UPDATE $table SET id = iid WHERE iid = $new_event_id";
@@ -1418,30 +1418,30 @@ 
                     $this->course->resources[RESOURCE_EVENT][$id]->destination_id = $new_event_id;
                 }
 
-				// Copy event attachment
+                // Copy event attachment
 
-				$origin_path = $this->course->backup_path.'/upload/calendar/';
-				$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/calendar/';
+                $origin_path = $this->course->backup_path.'/upload/calendar/';
+                $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/calendar/';
 
-				if (!empty($this->course->orig)) {
+                if (!empty($this->course->orig)) {
 
-					$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
-					$sql = 'SELECT path, comment, size, filename
+                    $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
+                    $sql = 'SELECT path, comment, size, filename
 					        FROM '.$table_attachment.'
 					        WHERE c_id = '.$this->destination_course_id.' AND agenda_id = '.$id;
-					$attachment_event = Database::query($sql);
-					$attachment_event = Database::fetch_object($attachment_event);
+                    $attachment_event = Database::query($sql);
+                    $attachment_event = Database::fetch_object($attachment_event);
 
-					if (file_exists($origin_path.$attachment_event->path) &&
+                    if (file_exists($origin_path.$attachment_event->path) &&
                         !is_dir($origin_path.$attachment_event->path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
-						$copy_result = copy($origin_path.$attachment_event->path, $destination_path.$new_filename);
-						//$copy_result = true;
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $copy_result = copy($origin_path.$attachment_event->path, $destination_path.$new_filename);
+                        //$copy_result = true;
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
 
-							$params = [
+                            $params = [
                                 'c_id' => $this->destination_course_id,
                                 'path' => self::DBUTF8($new_filename),
                                 'comment' => self::DBUTF8($attachment_event->comment),
@@ -1455,17 +1455,17 @@ 
                                 Database::query($sql);
                             }
                         }
-					}
-				} else {
-					// get the info of the file
-					if (!empty($event->attachment_path) &&
+                    }
+                } else {
+                    // get the info of the file
+                    if (!empty($event->attachment_path) &&
                         is_file($origin_path.$event->attachment_path) &&
                         is_readable($origin_path.$event->attachment_path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
-						$copy_result = copy($origin_path.$event->attachment_path, $destination_path.$new_filename);
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $copy_result = copy($origin_path.$event->attachment_path, $destination_path.$new_filename);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1481,29 +1481,29 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $id";
                                 Database::query($sql);
                             }
-						}
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Restore course-description
-	 */
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Restore course-description
+     */
     public function restore_course_descriptions($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_COURSEDESCRIPTION)) {
-			$table = Database :: get_course_table(TABLE_COURSE_DESCRIPTION);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_COURSEDESCRIPTION] as $id => $cd) {
+        if ($this->course->has_resources(RESOURCE_COURSEDESCRIPTION)) {
+            $table = Database :: get_course_table(TABLE_COURSE_DESCRIPTION);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_COURSEDESCRIPTION] as $id => $cd) {
                 $courseDescription = (array) $cd;
 
                 $content = isset($courseDescription['content']) ? $courseDescription['content'] : '';
                 $descriptionType = isset($courseDescription['description_type']) ? $courseDescription['description_type'] : '';
                 $title = isset($courseDescription['title']) ? $courseDescription['title'] : '';
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $description_content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $content,
                     $this->course->code,
@@ -1532,22 +1532,22 @@ 
                     }
                     $this->course->resources[RESOURCE_COURSEDESCRIPTION][$id]->destination_id = $id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore announcements
-	 */
+    /**
+     * Restore announcements
+     */
     public function restore_announcements($sessionId = 0)
     {
-		if ($this->course->has_resources(RESOURCE_ANNOUNCEMENT)) {
+        if ($this->course->has_resources(RESOURCE_ANNOUNCEMENT)) {
             $sessionId = intval($sessionId);
-			$table = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_ANNOUNCEMENT] as $id => $announcement) {
+            $table = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_ANNOUNCEMENT] as $id => $announcement) {
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $announcement->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $announcement->content,
                     $this->course->code,
@@ -1566,7 +1566,7 @@ 
                     'session_id' => $sessionId,
                 ];
 
-				$new_announcement_id = Database::insert($table, $params);
+                $new_announcement_id = Database::insert($table, $params);
 
                 if ($new_announcement_id) {
                     $sql = "UPDATE $table SET id = iid WHERE iid = $new_announcement_id";
@@ -1578,32 +1578,32 @@ 
                     $this->course->resources[RESOURCE_ANNOUNCEMENT][$id]->destination_id = $new_announcement_id;
                 }
 
-				$origin_path = $this->course->backup_path.'/upload/announcements/';
-				$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/announcements/';
+                $origin_path = $this->course->backup_path.'/upload/announcements/';
+                $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/announcements/';
 
-				// Copy announcement attachment file
-				if (!empty($this->course->orig)) {
+                // Copy announcement attachment file
+                if (!empty($this->course->orig)) {
 
-					$table_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
-					$sql = 'SELECT path, comment, size, filename
+                    $table_attachment = Database::get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+                    $sql = 'SELECT path, comment, size, filename
 					        FROM '.$table_attachment.'
 					        WHERE
 					            c_id = '.$this->destination_course_id.' AND
 					            announcement_id = '.$id;
-					$attachment_event = Database::query($sql);
-					$attachment_event = Database::fetch_object($attachment_event);
+                    $attachment_event = Database::query($sql);
+                    $attachment_event = Database::fetch_object($attachment_event);
 
-					if (file_exists($origin_path.$attachment_event->path) &&
+                    if (file_exists($origin_path.$attachment_event->path) &&
                         !is_dir($origin_path.$attachment_event->path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
                         $copy_result = copy(
                             $origin_path.$attachment_event->path,
                             $destination_path.$new_filename
                         );
 
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1620,19 +1620,19 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $attachmentId";
                                 Database::query($sql);
                             }
-						}
-					}
-				} else {
-					// get the info of the file
-					if (!empty($announcement->attachment_path) &&
+                        }
+                    }
+                } else {
+                    // get the info of the file
+                    if (!empty($announcement->attachment_path) &&
                         is_file($origin_path.$announcement->attachment_path) &&
                         is_readable($origin_path.$announcement->attachment_path)
                     ) {
-						$new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
-						$copy_result = copy($origin_path.$announcement->attachment_path, $destination_path.$new_filename);
+                        $new_filename = uniqid(''); //ass seen in the add_agenda_attachment_file() function in agenda.inc.php
+                        $copy_result = copy($origin_path.$announcement->attachment_path, $destination_path.$new_filename);
 
-						if ($copy_result) {
-							$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+                        if ($copy_result) {
+                            $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
 
                             $params = [
                                 'c_id' => $this->destination_course_id,
@@ -1649,12 +1649,12 @@ 
                                 $sql = "UPDATE $table_attachment SET id = iid WHERE iid = $attachmentId";
                                 Database::query($sql);
                             }
-						}
-					}
-				}
-			}
-		}
-	}
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Quiz
@@ -1665,13 +1665,13 @@ 
         $session_id = 0,
         $respect_base_content = false
     ) {
-		if ($this->course->has_resources(RESOURCE_QUIZ)) {
-			$table_qui = Database :: get_course_table(TABLE_QUIZ_TEST);
-			$table_rel = Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION);
-			$table_doc = Database :: get_course_table(TABLE_DOCUMENT);
-			$resources = $this->course->resources;
+        if ($this->course->has_resources(RESOURCE_QUIZ)) {
+            $table_qui = Database :: get_course_table(TABLE_QUIZ_TEST);
+            $table_rel = Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION);
+            $table_doc = Database :: get_course_table(TABLE_DOCUMENT);
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_QUIZ] as $id => $quiz) {
+            foreach ($resources[RESOURCE_QUIZ] as $id => $quiz) {
 
                 if (isset($quiz->obj)) {
                     //For new imports
@@ -1681,7 +1681,7 @@ 
                     $quiz->obj = $quiz;
                 }
 
-				$doc = '';
+                $doc = '';
                 if (!empty($quiz->sound)) {
                     if (isset($this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]) &&
                         $this->course->resources[RESOURCE_DOCUMENT][$quiz->sound]->is_restored()) {
@@ -1689,14 +1689,14 @@ 
                                 WHERE
                                     c_id = " . $this->destination_course_id . "  AND
                                     id = " . $resources[RESOURCE_DOCUMENT][$quiz->sound]->destination_id;
-						$doc = Database::query($sql);
-						$doc = Database::fetch_object($doc);
-						$doc = str_replace('/audio/', '', $doc->path);
-					}
-				}
-
-				if ($id != -1) {
-					// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                        $doc = Database::query($sql);
+                        $doc = Database::fetch_object($doc);
+                        $doc = str_replace('/audio/', '', $doc->path);
+                    }
+                }
+
+                if ($id != -1) {
+                    // check resources inside html from ckeditor tool and copy correct urls into recipient course
                     $quiz->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $quiz->description,
                         $this->course->code,
@@ -1708,13 +1708,13 @@ 
                     $quiz->start_time = $quiz->start_time == '0000-00-00 00:00:00' ? null : $quiz->start_time;
                     $quiz->end_time = $quiz->end_time == '0000-00-00 00:00:00' ? null : $quiz->end_time;
 
-					global $_custom;
-					if (isset($_custom['exercises_clean_dates_when_restoring']) &&
+                    global $_custom;
+                    if (isset($_custom['exercises_clean_dates_when_restoring']) &&
                         $_custom['exercises_clean_dates_when_restoring']
                     ) {
-						$quiz->start_time = null;
-						$quiz->end_time   = null;
-					}
+                        $quiz->start_time = null;
+                        $quiz->end_time   = null;
+                    }
 
                     $params = array(
                         'c_id' => $this->destination_course_id,
@@ -1748,10 +1748,10 @@ 
                         }
                         $params['session_id'] = $my_session_id;
                     } else {
-        				if (!empty($session_id)) {
-        					$session_id = intval($session_id);
+                        if (!empty($session_id)) {
+                            $session_id = intval($session_id);
                             $params['session_id'] = $session_id;
-    				    }
+                        }
                     }
                     $new_id = Database::insert($table_qui, $params);
 
@@ -1760,15 +1760,15 @@ 
                         Database::query($sql);
                     }
 
-				} else {
-					// $id = -1 identifies the fictionary test for collecting
-					// orphan questions. We do not store it in the database.
-					$new_id = -1;
-				}
+                } else {
+                    // $id = -1 identifies the fictionary test for collecting
+                    // orphan questions. We do not store it in the database.
+                    $new_id = -1;
+                }
 
-				$this->course->resources[RESOURCE_QUIZ][$id]->destination_id = $new_id;
+                $this->course->resources[RESOURCE_QUIZ][$id]->destination_id = $new_id;
 
-				$order = 0;
+                $order = 0;
                 if (!empty($quiz->question_ids)) {
                     foreach ($quiz->question_ids as $index => $question_id) {
                         $qid = $this->restore_quiz_question($question_id);
@@ -1781,30 +1781,30 @@ 
                         Database::query($sql);
                     }
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * Restore quiz-questions
+    /**
+     * Restore quiz-questions
      * @params int question id
-	 */
+     */
     public function restore_quiz_question($id)
     {
-		$resources = $this->course->resources;
+        $resources = $this->course->resources;
         $question = isset($resources[RESOURCE_QUIZQUESTION][$id]) ? $resources[RESOURCE_QUIZQUESTION][$id] : null;
 
-		$new_id = 0;
+        $new_id = 0;
 
-		if (is_object($question)) {
-			if ($question->is_restored()) {
-				return $question->destination_id;
-			}
-			$table_que = Database::get_course_table(TABLE_QUIZ_QUESTION);
-			$table_ans = Database::get_course_table(TABLE_QUIZ_ANSWER);
+        if (is_object($question)) {
+            if ($question->is_restored()) {
+                return $question->destination_id;
+            }
+            $table_que = Database::get_course_table(TABLE_QUIZ_QUESTION);
+            $table_ans = Database::get_course_table(TABLE_QUIZ_ANSWER);
             $table_options = Database::get_course_table(TABLE_QUIZ_QUESTION_OPTION);
 
-			// check resources inside html from ckeditor tool and copy correct urls into recipient course
+            // check resources inside html from ckeditor tool and copy correct urls into recipient course
             $question->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                 $question->description,
                 $this->course->code,
@@ -1825,7 +1825,7 @@ 
                 'extra' => self::DBUTF8($question->extra),
             ];
 
-			$new_id = Database::insert($table_que, $params);
+            $new_id = Database::insert($table_que, $params);
 
             if ($new_id) {
 
@@ -1866,7 +1866,7 @@ 
 
                 foreach ($temp as $index => $answer) {
                     //id = '".$index."',
-					$params = [
+                    $params = [
                         'c_id' => $this->destination_course_id,
                         'question_id' => $new_id,
                         'answer' => self::DBUTF8($answer['answer']),
@@ -1885,12 +1885,12 @@ 
                         $sql = "UPDATE $table_ans SET id = iid, id_auto = iid WHERE iid = $answerId";
                         Database::query($sql);
                     }
-				}
-			} else {
+                }
+            } else {
                 $correct_answers = array();
-				foreach ($question->answers as $index => $answer) {
+                foreach ($question->answers as $index => $answer) {
 
-					// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                    // check resources inside html from ckeditor tool and copy correct urls into recipient course
                     $answer['answer'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                         $answer['answer'],
                         $this->course->code,
@@ -1929,8 +1929,8 @@ 
                     }
 
                     $correct_answers[$answerId] = $answer['correct'];
-				}
-			}
+                }
+            }
 
             //Current course id
             $course_id = api_get_course_int_id();
@@ -2027,12 +2027,12 @@ 
                     }
                 }
             }
-			$this->course->resources[RESOURCE_QUIZQUESTION][$id]->destination_id = $new_id;
-		}
-		return $new_id;
-	}
+            $this->course->resources[RESOURCE_QUIZQUESTION][$id]->destination_id = $new_id;
+        }
+        return $new_id;
+    }
 
-	/**
+    /**
      * @todo : add session id when used for session
      */
     public function restore_test_category($session_id, $respect_base_content, $destination_course_code)
@@ -2112,21 +2112,21 @@ 
         $sessionId = intval($sessionId);
 
         if ($this->course->has_resources(RESOURCE_SURVEY)) {
-			$table_sur = Database :: get_course_table(TABLE_SURVEY);
-			$table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-			$table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_SURVEY] as $id => $survey) {
+            $table_sur = Database :: get_course_table(TABLE_SURVEY);
+            $table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+            $table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_SURVEY] as $id => $survey) {
 
-				$sql = 'SELECT survey_id FROM '.$table_sur.'
+                $sql = 'SELECT survey_id FROM '.$table_sur.'
                         WHERE
                             c_id = '.$this->destination_course_id.' AND
                             code = "'.self::DBUTF8escapestring($survey->code).'" AND
                             lang = "'.self::DBUTF8escapestring($survey->lang).'" ';
 
-				$result_check = Database::query($sql);
+                $result_check = Database::query($sql);
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $survey->title = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $survey->title,
                     $this->course->code,
@@ -2180,20 +2180,20 @@ 
                     'session_id' => $sessionId,
                 ];
 
-				//An existing survey exists with the same code and the same language
-				if (Database::num_rows($result_check) == 1) {
-					switch ($this->file_option) {
-						case FILE_SKIP:
-							//Do nothing
-							break;
-						case FILE_RENAME:
-							$survey_code = $survey->code.'_';
-							$i=1;
-							$temp_survey_code = $survey_code.$i;
-							while (!$this->is_survey_code_available($temp_survey_code)) {
-								$temp_survey_code = $survey_code.++$i;
-							}
-							$survey_code = $temp_survey_code;
+                //An existing survey exists with the same code and the same language
+                if (Database::num_rows($result_check) == 1) {
+                    switch ($this->file_option) {
+                        case FILE_SKIP:
+                            //Do nothing
+                            break;
+                        case FILE_RENAME:
+                            $survey_code = $survey->code.'_';
+                            $i=1;
+                            $temp_survey_code = $survey_code.$i;
+                            while (!$this->is_survey_code_available($temp_survey_code)) {
+                                $temp_survey_code = $survey_code.++$i;
+                            }
+                            $survey_code = $temp_survey_code;
 
                             $params['code'] = $survey_code;
                             $new_id = Database::insert($table_sur, $params);
@@ -2212,25 +2212,25 @@ 
                                     Database::query($sql);
                                 }
                             }
-							break;
-						case FILE_OVERWRITE:
-							// Delete the existing survey with the same code and language and import the one of the source course
-							// getting the information of the survey (used for when the survey is shared)
+                            break;
+                        case FILE_OVERWRITE:
+                            // Delete the existing survey with the same code and language and import the one of the source course
+                            // getting the information of the survey (used for when the survey is shared)
 
-							$sql = "SELECT * FROM $table_sur
+                            $sql = "SELECT * FROM $table_sur
 							        WHERE
 							            c_id = ".$this->destination_course_id." AND
 							            survey_id='".self::DBUTF8escapestring(Database::result($result_check,0,0))."'";
-							$result = Database::query($sql);
-							$survey_data = Database::fetch_array($result,'ASSOC');
+                            $result = Database::query($sql);
+                            $survey_data = Database::fetch_array($result,'ASSOC');
 
-							// if the survey is shared => also delete the shared content
-							if (isset($survey_data['survey_share']) && is_numeric($survey_data['survey_share'])) {
+                            // if the survey is shared => also delete the shared content
+                            if (isset($survey_data['survey_share']) && is_numeric($survey_data['survey_share'])) {
                                 SurveyManager::delete_survey($survey_data['survey_share'], true,$this->destination_course_id);
-							}
-							SurveyManager :: delete_survey($survey_data['survey_id'],false,$this->destination_course_id);
+                            }
+                            SurveyManager :: delete_survey($survey_data['survey_id'],false,$this->destination_course_id);
 
-							// Insert the new source survey
+                            // Insert the new source survey
                             $new_id = Database::insert($table_sur, $params);
 
                             if ($new_id) {
@@ -2251,11 +2251,11 @@ 
                                     Database::query($sql);
                                 }
                             }
-							break;
-						default:
-							break;
-					}
-				} else {
+                            break;
+                        default:
+                            break;
+                    }
+                } else {
                     // No existing survey with the same language and the same code, we just copy the survey
                     $new_id = Database::insert($table_sur, $params);
 
@@ -2277,48 +2277,48 @@ 
                             Database::query($sql);
                         }
                     }
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check availability of a survey code
-	 * @param string $survey_code
-	 */
+                }
+            }
+        }
+    }
+
+    /**
+     * Check availability of a survey code
+     * @param string $survey_code
+     */
     public function is_survey_code_available($survey_code)
     {
-		$table_sur = Database :: get_course_table(TABLE_SURVEY);
-		$sql = "SELECT * FROM $table_sur
+        $table_sur = Database :: get_course_table(TABLE_SURVEY);
+        $sql = "SELECT * FROM $table_sur
 		        WHERE
 		            c_id = ".$this->destination_course_id." AND
 		            code='".self::DBUTF8escapestring($survey_code)."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
         if (Database::num_rows($result) > 0) {
             return false;
         } else {
             return true;
         }
-	}
+    }
 
-	/**
-	 * Restore survey-questions
-	 * @param string $survey_id
-	 */
+    /**
+     * Restore survey-questions
+     * @param string $survey_id
+     */
     public function restore_survey_question($id, $survey_id)
     {
-		$resources = $this->course->resources;
-		$question = $resources[RESOURCE_SURVEYQUESTION][$id];
+        $resources = $this->course->resources;
+        $question = $resources[RESOURCE_SURVEYQUESTION][$id];
         $new_id = 0;
 
-		if (is_object($question)) {
-			if ($question->is_restored()) {
-				return $question->destination_id;
-			}
-			$table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-			$table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+        if (is_object($question)) {
+            if ($question->is_restored()) {
+                return $question->destination_id;
+            }
+            $table_que = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+            $table_ans = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 
-			// check resources inside html from ckeditor tool and copy correct urls into recipient course
+            // check resources inside html from ckeditor tool and copy correct urls into recipient course
             $question->survey_question = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                 $question->survey_question,
                 $this->course->code,
@@ -2372,10 +2372,10 @@ 
                 }
                 $this->course->resources[RESOURCE_SURVEYQUESTION][$id]->destination_id = $new_id;
             }
-		}
+        }
 
-		return $new_id;
-	}
+        return $new_id;
+    }
 
     /**
      * Restoring learning paths
@@ -2386,19 +2386,19 @@ 
     {
         $session_id = intval($session_id);
 
-		if ($this->course->has_resources(RESOURCE_LEARNPATH)) {
+        if ($this->course->has_resources(RESOURCE_LEARNPATH)) {
             $table_main = Database::get_course_table(TABLE_LP_MAIN);
             $table_item = Database::get_course_table(TABLE_LP_ITEM);
             $table_tool = Database::get_course_table(TABLE_TOOL_LIST);
 
-			$resources = $this->course->resources;
+            $resources = $this->course->resources;
 
-			$origin_path = $this->course->backup_path.'/upload/learning_path/images/';
-			$destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/learning_path/images/';
+            $origin_path = $this->course->backup_path.'/upload/learning_path/images/';
+            $destination_path = api_get_path(SYS_COURSE_PATH).$this->course->destination_path.'/upload/learning_path/images/';
 
-			foreach ($resources[RESOURCE_LEARNPATH] as $id => $lp) {
-				$condition_session = '';
-				if (!empty($session_id)) {
+            foreach ($resources[RESOURCE_LEARNPATH] as $id => $lp) {
+                $condition_session = '';
+                if (!empty($session_id)) {
                     if ($respect_base_content) {
                         $my_session_id = $lp->session_id;
                         if (!empty($lp->session_id)) {
@@ -2409,20 +2409,20 @@ 
                         $session_id = intval($session_id);
                         $condition_session = $session_id;
                     }
-				}
-
-				// Adding the author's image
-				if (!empty($lp->preview_image)) {
-					$new_filename = uniqid('').substr($lp->preview_image,strlen($lp->preview_image)-7, strlen($lp->preview_image));
-					if (file_exists($origin_path.$lp->preview_image) && !is_dir($origin_path.$lp->preview_image)) {
-						$copy_result = copy($origin_path.$lp->preview_image, $destination_path.$new_filename);
-						if ($copy_result) {
-							$lp->preview_image = $new_filename;
-						} else {
-							$lp->preview_image ='';
-						}
-					}
-				}
+                }
+
+                // Adding the author's image
+                if (!empty($lp->preview_image)) {
+                    $new_filename = uniqid('').substr($lp->preview_image,strlen($lp->preview_image)-7, strlen($lp->preview_image));
+                    if (file_exists($origin_path.$lp->preview_image) && !is_dir($origin_path.$lp->preview_image)) {
+                        $copy_result = copy($origin_path.$lp->preview_image, $destination_path.$new_filename);
+                        if ($copy_result) {
+                            $lp->preview_image = $new_filename;
+                        } else {
+                            $lp->preview_image ='';
+                        }
+                    }
+                }
 
                 if ($this->add_text_in_items) {
                     $lp->name = $lp->name.' '.get_lang('CopyLabelSuffix');
@@ -2480,7 +2480,7 @@ 
                     $params['session_id'] = $condition_session;
                 }
 
-				$new_lp_id = Database::insert($table_main, $params);
+                $new_lp_id = Database::insert($table_main, $params);
 
                 if ($new_lp_id) {
 
@@ -2541,13 +2541,13 @@ 
                 $old_refs = array();
                 $prerequisite_ids = array();
 
-				foreach ($lp->get_items() as $index => $item) {
-					// we set the ref code here and then we update in a for loop
-					$ref = $item['ref'];
+                foreach ($lp->get_items() as $index => $item) {
+                    // we set the ref code here and then we update in a for loop
+                    $ref = $item['ref'];
 
-					// Dealing with path the same way as ref as some data has
+                    // Dealing with path the same way as ref as some data has
                     // been put into path when it's a local resource
-					// Only fix the path for no scos
+                    // Only fix the path for no scos
                     if ($item['item_type'] == 'sco') {
                         $path = $item['path'];
                     } else {
@@ -2576,128 +2576,128 @@ 
                         'launch_data' => self::DBUTF8($item['launch_data']),
                     ];
 
-					$new_item_id = Database::insert($table_item, $params);
+                    $new_item_id = Database::insert($table_item, $params);
 
                     $sql = "UPDATE $table_item SET id = iid WHERE iid = $new_item_id";
                     Database::query($sql);
 
-					//save a link between old and new item IDs
-					$new_item_ids[$item['id']] = $new_item_id;
-					//save a reference of items that need a parent_item_id refresh
-					$parent_item_ids[$new_item_id] = $item['parent_item_id'];
-					//save a reference of items that need a previous_item_id refresh
-					$previous_item_ids[$new_item_id] = $item['previous_item_id'];
-					//save a reference of items that need a next_item_id refresh
-					$next_item_ids[$new_item_id] = $item['next_item_id'];
-
-					if (!empty($item['prerequisite'])) {
-						if ($lp->lp_type =='2') {
-							// if is an sco
-							$old_prerequisite[$new_item_id]= $item['prerequisite'];
-						} else {
-							$old_prerequisite[$new_item_id]= $new_item_ids[$item['prerequisite']];
-						}
-					}
-
-					if (!empty($ref)) {
-						if ($lp->lp_type =='2') {
-							// if is an sco
-							$old_refs[$new_item_id]= $ref;
-						} else {
+                    //save a link between old and new item IDs
+                    $new_item_ids[$item['id']] = $new_item_id;
+                    //save a reference of items that need a parent_item_id refresh
+                    $parent_item_ids[$new_item_id] = $item['parent_item_id'];
+                    //save a reference of items that need a previous_item_id refresh
+                    $previous_item_ids[$new_item_id] = $item['previous_item_id'];
+                    //save a reference of items that need a next_item_id refresh
+                    $next_item_ids[$new_item_id] = $item['next_item_id'];
+
+                    if (!empty($item['prerequisite'])) {
+                        if ($lp->lp_type =='2') {
+                            // if is an sco
+                            $old_prerequisite[$new_item_id]= $item['prerequisite'];
+                        } else {
+                            $old_prerequisite[$new_item_id]= $new_item_ids[$item['prerequisite']];
+                        }
+                    }
+
+                    if (!empty($ref)) {
+                        if ($lp->lp_type =='2') {
+                            // if is an sco
+                            $old_refs[$new_item_id]= $ref;
+                        } else {
                             $old_refs[$new_item_id]= $new_item_ids[$ref];
-						}
-					}
+                        }
+                    }
 
-					$prerequisite_ids[$new_item_id] = $item['prerequisite'];
-				}
+                    $prerequisite_ids[$new_item_id] = $item['prerequisite'];
+                }
 
-				// Updating prerequisites
-				foreach ($old_prerequisite  as $key=>$my_old_prerequisite) {
-					if ($my_old_prerequisite != ''){
-						$sql = "UPDATE ".$table_item." SET prerequisite = '".$my_old_prerequisite."'
+                // Updating prerequisites
+                foreach ($old_prerequisite  as $key=>$my_old_prerequisite) {
+                    if ($my_old_prerequisite != ''){
+                        $sql = "UPDATE ".$table_item." SET prerequisite = '".$my_old_prerequisite."'
 						        WHERE c_id = ".$this->destination_course_id." AND id = '".$key."'  ";
-						Database::query($sql);
-					}
-				}
-
-				// Updating refs
-				foreach ($old_refs  as $key=>$my_old_ref) {
-					if ($my_old_ref != '') {
-						$sql = "UPDATE ".$table_item." SET ref = '".$my_old_ref."'
+                        Database::query($sql);
+                    }
+                }
+
+                // Updating refs
+                foreach ($old_refs  as $key=>$my_old_ref) {
+                    if ($my_old_ref != '') {
+                        $sql = "UPDATE ".$table_item." SET ref = '".$my_old_ref."'
 						        WHERE c_id = ".$this->destination_course_id." AND id = '".$key."'  ";
-						Database::query($sql);
-					}
-				}
-
-				foreach ($parent_item_ids as $new_item_id => $parent_item_old_id) {
-					$parent_new_id = 0;
-					if($parent_item_old_id != 0){
-						$parent_new_id = $new_item_ids[$parent_item_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET parent_item_id = '".$parent_new_id."'
+                        Database::query($sql);
+                    }
+                }
+
+                foreach ($parent_item_ids as $new_item_id => $parent_item_old_id) {
+                    $parent_new_id = 0;
+                    if($parent_item_old_id != 0){
+                        $parent_new_id = $new_item_ids[$parent_item_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET parent_item_id = '".$parent_new_id."'
 					        WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-				foreach ($previous_item_ids as $new_item_id => $previous_item_old_id) {
-					$previous_new_id = 0;
-					if ($previous_item_old_id != 0){
-						$previous_new_id = $new_item_ids[$previous_item_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET previous_item_id = '".$previous_new_id."'
+                    Database::query($sql);
+                }
+                foreach ($previous_item_ids as $new_item_id => $previous_item_old_id) {
+                    $previous_new_id = 0;
+                    if ($previous_item_old_id != 0){
+                        $previous_new_id = $new_item_ids[$previous_item_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET previous_item_id = '".$previous_new_id."'
 					        WHERE  c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-
-				foreach ($next_item_ids as $new_item_id => $next_item_old_id) {
-					$next_new_id = 0;
-					if ($next_item_old_id != 0){
-						$next_new_id = $new_item_ids[$next_item_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET next_item_id = '".$next_new_id."'
+                    Database::query($sql);
+                }
+
+                foreach ($next_item_ids as $new_item_id => $next_item_old_id) {
+                    $next_new_id = 0;
+                    if ($next_item_old_id != 0){
+                        $next_new_id = $new_item_ids[$next_item_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET next_item_id = '".$next_new_id."'
 					        WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-
-				foreach ($prerequisite_ids as $new_item_id => $prerequisite_old_id) {
-					$prerequisite_new_id = 0;
-					if ($prerequisite_old_id != 0){
-						$prerequisite_new_id = $new_item_ids[$prerequisite_old_id];
-					}
-					$sql = "UPDATE ".$table_item." SET prerequisite = '".$prerequisite_new_id."'
+                    Database::query($sql);
+                }
+
+                foreach ($prerequisite_ids as $new_item_id => $prerequisite_old_id) {
+                    $prerequisite_new_id = 0;
+                    if ($prerequisite_old_id != 0){
+                        $prerequisite_new_id = $new_item_ids[$prerequisite_old_id];
+                    }
+                    $sql = "UPDATE ".$table_item." SET prerequisite = '".$prerequisite_new_id."'
 					        WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
-					Database::query($sql);
-				}
-				$this->course->resources[RESOURCE_LEARNPATH][$id]->destination_id = $new_lp_id;
-			}
-		}
-	}
-
-	/**
-	 * Restore works
+                    Database::query($sql);
+                }
+                $this->course->resources[RESOURCE_LEARNPATH][$id]->destination_id = $new_lp_id;
+            }
+        }
+    }
+
+    /**
+     * Restore works
      * @deprecated use restore_works
      *
-	 */
-	public function restore_student_publication($sessionId = 0)
+     */
+    public function restore_student_publication($sessionId = 0)
     {
         $sessionId = intval($sessionId);
         $work_assignment_table = Database:: get_course_table(TABLE_STUDENT_PUBLICATION_ASSIGNMENT);
         $work_table = Database:: get_course_table(TABLE_STUDENT_PUBLICATION);
         $item_property_table = Database:: get_course_table(TABLE_ITEM_PROPERTY);
 
-		// Query in student publication
-		$sql = 'SELECT * FROM '.$work_table.'
+        // Query in student publication
+        $sql = 'SELECT * FROM '.$work_table.'
 		        WHERE c_id = '.$this->course_origin_id.' AND filetype = "folder" AND active IN (0, 1) ';
 
-		$result = Database::query($sql);
-		$folders = Database::store_result($result, 'ASSOC');
+        $result = Database::query($sql);
+        $folders = Database::store_result($result, 'ASSOC');
 
-		foreach ($folders  as $folder) {
-		    $old_id = $folder['id'];
+        foreach ($folders  as $folder) {
+            $old_id = $folder['id'];
             unset($folder['id']);
-			$folder['c_id'] = $this->destination_course_id;
+            $folder['c_id'] = $this->destination_course_id;
             $folder['parent_id'] = 0;
             $folder['session_id'] = $sessionId;
-			$new_id = Database::insert($work_table, $folder);
+            $new_id = Database::insert($work_table, $folder);
 
             if ($new_id) {
                 // query in item property
@@ -2756,23 +2756,23 @@ 
                     }
                 }
             }
-		}
+        }
 
         $destination = '../..'.api_get_path(REL_COURSE_PATH).$this->course->destination_path.'/work/';
         $origin = '../..'.api_get_path(REL_COURSE_PATH).$this->course->info['path'].'/work/';
         self::allow_create_all_directory($origin, $destination, false);
-	}
+    }
 
     /**
-    * copy all directory and sub directory
-    * @param string The path origin
-    * @param string The path destination
-    * @param boolean Option Overwrite
-    * @param string $source
-    * @param string $dest
-    * @return void()
-    * @deprecated
-    */
+     * copy all directory and sub directory
+     * @param string The path origin
+     * @param string The path destination
+     * @param boolean Option Overwrite
+     * @param string $source
+     * @param string $dest
+     * @return void()
+     * @deprecated
+     */
     public function allow_create_all_directory($source, $dest, $overwrite = false)
     {
         if (!is_dir($dest)) {
@@ -2783,7 +2783,7 @@ 
                 if ($file != '.' && $file != '..') {
                     $path = $source . '/' . $file;
                     if (is_file($path)) {
-                       /* if (!is_file($dest . '/' . $file) || $overwrite)
+                        /* if (!is_file($dest . '/' . $file) || $overwrite)
                         if (!@copy($path, $dest . '/' . $file)) {
                             echo '<font color="red">File ('.$path.') '.get_lang('NotHavePermission').'</font>';
                         }*/
@@ -2798,12 +2798,12 @@ 
         }
     }
 
-	/**
-	 * Gets the new ID of one specific tool item from the tool name and the old ID
-	 * @param	string	Tool name
-	 * @param	integer	Old ID
-	 * @return	integer	New ID
-	 */
+    /**
+     * Gets the new ID of one specific tool item from the tool name and the old ID
+     * @param	string	Tool name
+     * @param	integer	Old ID
+     * @return	integer	New ID
+     */
     public function get_new_id($tool, $ref)
     {
         // Check if the value exist in the current array.
@@ -2825,25 +2825,25 @@ 
         }
 
         return '';
-	}
+    }
 
-	/**
-	 * Restore glossary
-	 */
+    /**
+     * Restore glossary
+     */
     public function restore_glossary($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_GLOSSARY)) {
-			$table_glossary = Database :: get_course_table(TABLE_GLOSSARY);
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_GLOSSARY] as $id => $glossary) {
+        if ($this->course->has_resources(RESOURCE_GLOSSARY)) {
+            $table_glossary = Database :: get_course_table(TABLE_GLOSSARY);
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_GLOSSARY] as $id => $glossary) {
 
                 $params = [];
-    			if (!empty($session_id)) {
-    				$session_id = intval($session_id);
+                if (!empty($session_id)) {
+                    $session_id = intval($session_id);
                     $params['session_id'] = $session_id;
-    			}
+                }
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $glossary->description = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $glossary->description,
                     $this->course->code,
@@ -2877,27 +2877,27 @@ 
 
                     $this->course->resources[RESOURCE_GLOSSARY][$id]->destination_id = $my_id;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * @param int $session_id
      */
     public function restore_wiki($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_WIKI)) {
-			// wiki table of the target course
-			$table_wiki = Database :: get_course_table(TABLE_WIKI);
-			$table_wiki_conf = Database :: get_course_table(TABLE_WIKI_CONF);
+        if ($this->course->has_resources(RESOURCE_WIKI)) {
+            // wiki table of the target course
+            $table_wiki = Database :: get_course_table(TABLE_WIKI);
+            $table_wiki_conf = Database :: get_course_table(TABLE_WIKI_CONF);
 
-			// storing all the resources that have to be copied in an array
-			$resources = $this->course->resources;
+            // storing all the resources that have to be copied in an array
+            $resources = $this->course->resources;
 
-			foreach ($resources[RESOURCE_WIKI] as $id => $wiki) {
-				// the sql statement to insert the groups from the old course to the new course
+            foreach ($resources[RESOURCE_WIKI] as $id => $wiki) {
+                // the sql statement to insert the groups from the old course to the new course
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $wiki->content = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $wiki->content,
                     $this->course->code,
@@ -2932,7 +2932,7 @@ 
                     'user_ip' => ''
                 ];
 
-				$new_id = Database::insert($table_wiki, $params);
+                $new_id = Database::insert($table_wiki, $params);
 
                 if ($new_id) {
                     $sql = "UPDATE $table_wiki SET page_id = '$new_id', id = iid
@@ -2962,9 +2962,9 @@ 
 
                     Database::insert($table_wiki_conf, $params);
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Restore Thematics
@@ -2972,15 +2972,15 @@ 
      */
     public function restore_thematic($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_THEMATIC)) {
+        if ($this->course->has_resources(RESOURCE_THEMATIC)) {
             $table_thematic = Database::get_course_table(TABLE_THEMATIC);
             $table_thematic_advance = Database::get_course_table(TABLE_THEMATIC_ADVANCE);
             $table_thematic_plan = Database::get_course_table(TABLE_THEMATIC_PLAN);
 
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_THEMATIC] as $id => $thematic) {
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_THEMATIC] as $id => $thematic) {
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $thematic->params['content'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $thematic->params['content'],
                     $this->course->code,
@@ -2988,13 +2988,13 @@ 
                     $this->course->backup_path,
                     $this->course->info['path']
                 );
-				$thematic->params['c_id']  = $this->destination_course_id;
-				unset($thematic->params['id']);
+                $thematic->params['c_id']  = $this->destination_course_id;
+                unset($thematic->params['id']);
                 unset($thematic->params['iid']);
 
-				$last_id = Database::insert($table_thematic, $thematic->params, false);
+                $last_id = Database::insert($table_thematic, $thematic->params, false);
 
-				if ($last_id) {
+                if ($last_id) {
 
                     $sql = "UPDATE $table_thematic SET id = iid WHERE iid = $last_id";
                     Database::query($sql);
@@ -3007,12 +3007,12 @@ 
                         api_get_user_id()
                     );
 
-					foreach ($thematic->thematic_advance_list as $thematic_advance) {
-						unset($thematic_advance['id']);
+                    foreach ($thematic->thematic_advance_list as $thematic_advance) {
+                        unset($thematic_advance['id']);
                         unset($thematic_advance['iid']);
-						$thematic_advance['attendance_id'] = 0;
-						$thematic_advance['thematic_id'] = $last_id;
-						$thematic_advance['c_id']  = $this->destination_course_id;
+                        $thematic_advance['attendance_id'] = 0;
+                        $thematic_advance['thematic_id'] = $last_id;
+                        $thematic_advance['c_id']  = $this->destination_course_id;
 
                         $my_id = Database::insert(
                             $table_thematic_advance,
@@ -3020,7 +3020,7 @@ 
                             false
                         );
 
-						if ($my_id) {
+                        if ($my_id) {
 
                             $sql = "UPDATE $table_thematic_advance SET id = iid WHERE iid = $my_id";
                             Database::query($sql);
@@ -3032,17 +3032,17 @@ 
                                 'ThematicAdvanceAdded',
                                 api_get_user_id()
                             );
-						}
-					}
+                        }
+                    }
 
-					foreach($thematic->thematic_plan_list as $thematic_plan) {
-						unset($thematic_plan['id']);
+                    foreach($thematic->thematic_plan_list as $thematic_plan) {
+                        unset($thematic_plan['id']);
                         unset($thematic_plan['iid']);
-						$thematic_plan['thematic_id'] = $last_id;
-						$thematic_plan['c_id'] = $this->destination_course_id;
-						$my_id = Database::insert($table_thematic_plan, $thematic_plan, false);
+                        $thematic_plan['thematic_id'] = $last_id;
+                        $thematic_plan['c_id'] = $this->destination_course_id;
+                        $my_id = Database::insert($table_thematic_plan, $thematic_plan, false);
 
-						if ($my_id) {
+                        if ($my_id) {
 
                             $sql = "UPDATE $table_thematic_plan SET id = iid WHERE iid = $my_id";
                             Database::query($sql);
@@ -3054,12 +3054,12 @@ 
                                 'ThematicPlanAdded',
                                 api_get_user_id()
                             );
-						}
-					}
-				}
-			}
-		}
-	}
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Attendance
@@ -3067,14 +3067,14 @@ 
      */
     public function restore_attendance($session_id = 0)
     {
-		if ($this->course->has_resources(RESOURCE_ATTENDANCE)) {
-			$table_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
-			$table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR);
+        if ($this->course->has_resources(RESOURCE_ATTENDANCE)) {
+            $table_attendance = Database :: get_course_table(TABLE_ATTENDANCE);
+            $table_attendance_calendar = Database :: get_course_table(TABLE_ATTENDANCE_CALENDAR);
 
-			$resources = $this->course->resources;
-			foreach ($resources[RESOURCE_ATTENDANCE] as $id => $obj) {
+            $resources = $this->course->resources;
+            foreach ($resources[RESOURCE_ATTENDANCE] as $id => $obj) {
 
-				// check resources inside html from ckeditor tool and copy correct urls into recipient course
+                // check resources inside html from ckeditor tool and copy correct urls into recipient course
                 $obj->params['description'] = DocumentManager::replace_urls_inside_content_html_from_copy_course(
                     $obj->params['description'],
                     $this->course->code,
@@ -3086,11 +3086,11 @@ 
                 unset($obj->params['id']);
                 unset($obj->params['iid']);
 
-				$obj->params['c_id'] = $this->destination_course_id;
+                $obj->params['c_id'] = $this->destination_course_id;
 
-				$last_id = Database::insert($table_attendance, $obj->params);
+                $last_id = Database::insert($table_attendance, $obj->params);
 
-				if (is_numeric($last_id)) {
+                if (is_numeric($last_id)) {
 
                     $sql = "UPDATE $table_attendance SET id = iid WHERE iid = $last_id";
                     Database::query($sql);
@@ -3104,11 +3104,11 @@ 
                     );
 
                     foreach ($obj->attendance_calendar as $attendance_calendar) {
-						unset($attendance_calendar['id']);
+                        unset($attendance_calendar['id']);
                         unset($attendance_calendar['iid']);
 
-						$attendance_calendar['attendance_id'] = $last_id;
-						$attendance_calendar['c_id'] = $this->destination_course_id;
+                        $attendance_calendar['attendance_id'] = $last_id;
+                        $attendance_calendar['c_id'] = $this->destination_course_id;
                         $attendanceCalendarId = Database::insert(
                             $table_attendance_calendar,
                             $attendance_calendar
@@ -3116,11 +3116,11 @@ 
 
                         $sql = "UPDATE $table_attendance_calendar SET id = iid WHERE iid = $attendanceCalendarId";
                         Database::query($sql);
-					}
-				}
-			}
-		}
-	}
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * Restore Works
@@ -3261,11 +3261,11 @@ 
      */
     public function DBUTF8($str)
     {
-		if (UTF8_CONVERT) {
+        if (UTF8_CONVERT) {
             $str = utf8_encode($str);
         }
-		return $str;
-	}
+        return $str;
+    }
 
     /**
      * @param string $str
@@ -3276,8 +3276,8 @@ 
         if (UTF8_CONVERT) {
             $str = utf8_encode($str);
         }
-		return Database::escape_string($str);
-	}
+        return Database::escape_string($str);
+    }
 
     /**
      * @param array $array

src/Chamilo/CourseBundle/Component/CourseCopy/CourseSelectForm.php

Indentation +243 added lines, -243 removed lines

@@ -17,13 +17,13 @@ 
  */
 class CourseSelectForm
 {
-	/**
-	 * Display the form
+    /**
+     * Display the form
      * @param array $course
-	 * @param array $hidden_fields Hidden fields to add to the form.
-	 * @param boolean $avoid_serialize the document array will be serialize. This is used in the course_copy.php file
-	 */
-	public static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
+     * @param array $hidden_fields Hidden fields to add to the form.
+     * @param boolean $avoid_serialize the document array will be serialize. This is used in the course_copy.php file
+     */
+    public static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
     {
         global $charset;
         $resource_titles[RESOURCE_GRADEBOOK] = get_lang('Gradebook');
@@ -138,47 +138,47 @@ 
             }
 		</script>
 		<?php
-		// get destination course title
-		if (!empty($hidden_fields['destination_course'])) {
+        // get destination course title
+        if (!empty($hidden_fields['destination_course'])) {
             $sessionTitle = !empty($hidden_fields['destination_session']) ? ' (' . api_get_session_name($hidden_fields['destination_session']) . ')' : null;
             $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
-			echo '<h3>';
-			echo get_lang('DestinationCourse').' : '.$course_infos['title'] . ' ('.$course_infos['code'].') '.$sessionTitle;
-			echo '</h3>';
-		}
+            echo '<h3>';
+            echo get_lang('DestinationCourse').' : '.$course_infos['title'] . ' ('.$course_infos['code'].') '.$sessionTitle;
+            echo '</h3>';
+        }
         echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
-		echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
+        echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
         $icon = Display::returnIconPath('myprogress_bar.gif');
-		echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.$icon.',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
-		echo '<input type="hidden" name="action" value="course_select_form"/>';
+        echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.$icon.',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
+        echo '<input type="hidden" name="action" value="course_select_form"/>';
 
-		if (!empty($hidden_fields['destination_course']) &&
+        if (!empty($hidden_fields['destination_course']) &&
             !empty($hidden_fields['origin_course']) &&
             !empty($hidden_fields['destination_session']) &&
             !empty($hidden_fields['origin_session'])
         ) {
-			echo '<input type="hidden" name="destination_course" 	value="'.$hidden_fields['destination_course'].'"/>';
-			echo '<input type="hidden" name="origin_course" 		value="'.$hidden_fields['origin_course'].'"/>';
-			echo '<input type="hidden" name="destination_session" 	value="'.$hidden_fields['destination_session'].'"/>';
-			echo '<input type="hidden" name="origin_session" 		value="'.$hidden_fields['origin_session'].'"/>';
-		}
+            echo '<input type="hidden" name="destination_course" 	value="'.$hidden_fields['destination_course'].'"/>';
+            echo '<input type="hidden" name="origin_course" 		value="'.$hidden_fields['origin_course'].'"/>';
+            echo '<input type="hidden" name="destination_session" 	value="'.$hidden_fields['destination_session'].'"/>';
+            echo '<input type="hidden" name="origin_session" 		value="'.$hidden_fields['origin_session'].'"/>';
+        }
 
-		$element_count = 0;
+        $element_count = 0;
         $forum_categories = array();
         $forums = array();
         $forum_topics = array();
 
         echo '<p>';
-		echo get_lang('SelectResources');
-		echo '</p>';
+        echo get_lang('SelectResources');
+        echo '</p>';
 
         Display::display_normal_message(get_lang('DontForgetToSelectTheMediaFilesIfYourResourceNeedIt'));
 
         foreach ($course->resources as $type => $resources) {
             if (count($resources) > 0) {
-				switch ($type) {
-					//Resources to avoid
-					case RESOURCE_FORUMCATEGORY:
+                switch ($type) {
+                    //Resources to avoid
+                    case RESOURCE_FORUMCATEGORY:
                         foreach ($resources as $id => $resource) {
                             $forum_categories[$id] = $resource;
                         }
@@ -204,30 +204,30 @@ 
                     case RESOURCE_SCORM:
                         break;
                     default:
-						echo '<span id="img_'.$type.'" class="fa fa-minus-square-o fa-lg" onclick="javascript:exp('."'$type'".');" >&nbsp;</span>&nbsp;';
-						echo '<b onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
-						echo '<div id="div_'.$type.'">';
-						if ($type == RESOURCE_LEARNPATH) {
-    						Display::display_warning_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
-    						Display::display_warning_message(get_lang('IfYourLPsHaveAudioFilesIncludedYouShouldSelectThemFromTheDocuments'));
-						}
-						if ($type == RESOURCE_DOCUMENT) {
+                        echo '<span id="img_'.$type.'" class="fa fa-minus-square-o fa-lg" onclick="javascript:exp('."'$type'".');" >&nbsp;</span>&nbsp;';
+                        echo '<b onclick="javascript:exp('."'$type'".');" >'.$resource_titles[$type].'</b><br />';
+                        echo '<div id="div_'.$type.'">';
+                        if ($type == RESOURCE_LEARNPATH) {
+                            Display::display_warning_message(get_lang('ToExportLearnpathWithQuizYouHaveToSelectQuiz'));
+                            Display::display_warning_message(get_lang('IfYourLPsHaveAudioFilesIncludedYouShouldSelectThemFromTheDocuments'));
+                        }
+                        if ($type == RESOURCE_DOCUMENT) {
                             if (api_get_setting('show_glossary_in_documents') != 'none') {
                                 Display::display_warning_message(get_lang('ToExportDocumentsWithGlossaryYouHaveToSelectGlossary'));
                             }
-						}
+                        }
 
-						echo '<div class="well">';
+                        echo '<div class="well">';
 
                         echo '<div class="btn-group">';
-						echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a>";
+                        echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript: setCheckbox('$type',true);\" >".get_lang('All')."</a>";
                         echo "<a class=\"btn btn-default\" href=\"javascript: void(0);\" onclick=\"javascript:setCheckbox('$type',false);\" >".get_lang('None')."</a>";
-						echo '</div><br />';
+                        echo '</div><br />';
                         echo '<ul class="list-unstyled">';
-						foreach ($resources as $id => $resource) {
+                        foreach ($resources as $id => $resource) {
                             if ($resource) {
                                 echo '<li>';
-								// Event obj in 1.9.x in 1.10.x the class is CalendarEvent
+                                // Event obj in 1.9.x in 1.10.x the class is CalendarEvent
                                 Resource::setClassType($resource);
                                 echo '<label class="checkbox">';
                                 echo '<input type="checkbox" name="resource['.$type.']['.$id.']"  id="resource['.$type.']['.$id.']" />';
@@ -235,15 +235,15 @@ 
                                 echo '</label>';
                                 echo '</li>';
                             }
-						}
+                        }
                         echo '</ul>';
-						echo '</div>';
-						echo '</div>';
-						echo '<script language="javascript">exp('."'$type'".')</script>';
-						$element_count++;
+                        echo '</div>';
+                        echo '</div>';
+                        echo '<script language="javascript">exp('."'$type'".')</script>';
+                        $element_count++;
                 }
-			}
-		}
+            }
+        }
 
         //Fixes forum order
         if (!empty($forum_categories)) {
@@ -298,65 +298,65 @@ 
             echo '<script language="javascript">exp('."'$type'".')</script>';
         }
 
-		if ($avoid_serialize) {
-			/*Documents are avoided due the huge amount of memory that the serialize php function "eats"
+        if ($avoid_serialize) {
+            /*Documents are avoided due the huge amount of memory that the serialize php function "eats"
 			(when there are directories with hundred/thousand of files) */
-			// this is a known issue of serialize
-			$course->resources['document']= null;
-		}
+            // this is a known issue of serialize
+            $course->resources['document']= null;
+        }
 
-		echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
+        echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
 
-		if (is_array($hidden_fields)) {
-			foreach ($hidden_fields as $key => $value) {
-				echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
-			}
-		}
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $key => $value) {
+                echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
+            }
+        }
 
         $recycleOption = isset($_POST['recycle_option']) ? true : false;
 
-		if (empty($element_count)) {
-		    Display::display_warning_message(get_lang('NoDataAvailable'));
-		} else {
-    		if (!empty($hidden_fields['destination_session'])) {
-    			echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES, $charset))."'".')) return false;" >'.
+        if (empty($element_count)) {
+            Display::display_warning_message(get_lang('NoDataAvailable'));
+        } else {
+            if (!empty($hidden_fields['destination_session'])) {
+                echo '<br /><button class="save" type="submit" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES, $charset))."'".')) return false;" >'.
                     get_lang('Ok').'</button>';
-    		} else {
+            } else {
                 if ($recycleOption) {
                     echo '<br /><button class="save" type="submit">'.
                         get_lang('Ok').'</button>';
                 } else {
-    			    echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.
+                    echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.
                     get_lang('Ok').'</button>';
                 }
-    		}
-		}
+            }
+        }
 
-		CourseSelectForm::display_hidden_quiz_questions($course);
-		CourseSelectForm::display_hidden_scorm_directories($course);
-		echo '</form>';
-		echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
-	}
+        CourseSelectForm::display_hidden_quiz_questions($course);
+        CourseSelectForm::display_hidden_scorm_directories($course);
+        echo '</form>';
+        echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
+    }
 
     /**
      * @param $course
      */
     public static function display_hidden_quiz_questions($course)
     {
-		if(is_array($course->resources)){
-			foreach ($course->resources as $type => $resources) {
-				if (count($resources) > 0) {
-					switch ($type) {
-						case RESOURCE_QUIZQUESTION:
-							foreach ($resources as $id => $resource) {
-								echo '<input type="hidden" name="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" id="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" value="On" />';
-							}
-							break;
-					}
-				}
-			}
-		}
-	}
+        if(is_array($course->resources)){
+            foreach ($course->resources as $type => $resources) {
+                if (count($resources) > 0) {
+                    switch ($type) {
+                        case RESOURCE_QUIZQUESTION:
+                            foreach ($resources as $id => $resource) {
+                                echo '<input type="hidden" name="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" id="resource['.RESOURCE_QUIZQUESTION.']['.$id.']" value="On" />';
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * @param $course
@@ -364,30 +364,30 @@ 
     public static function display_hidden_scorm_directories($course)
     {
         if (is_array($course->resources)){
-			foreach ($course->resources as $type => $resources) {
-				if (count($resources) > 0) {
-					switch($type) {
-						case RESOURCE_SCORM:
-							foreach ($resources as $id => $resource) {
-								echo '<input type="hidden" name="resource['.RESOURCE_SCORM.']['.$id.']" id="resource['.RESOURCE_SCORM.']['.$id.']" value="On" />';
-							}
-							break;
-					}
-				}
-			}
-		}
-	}
+            foreach ($course->resources as $type => $resources) {
+                if (count($resources) > 0) {
+                    switch($type) {
+                        case RESOURCE_SCORM:
+                            foreach ($resources as $id => $resource) {
+                                echo '<input type="hidden" name="resource['.RESOURCE_SCORM.']['.$id.']" id="resource['.RESOURCE_SCORM.']['.$id.']" value="On" />';
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Get the posted course
-	 * @param string $from who calls the function?
+    /**
+     * Get the posted course
+     * @param string $from who calls the function?
      * It can be copy_course, create_backup, import_backup or recycle_course
      * @param int $session_id
      * @param string $course_code
-	 * @return course The course-object with all resources selected by the user
-	 * in the form given by display_form(...)
-	 */
-	public static function get_posted_course($from = '', $session_id = 0, $course_code = '')
+     * @return course The course-object with all resources selected by the user
+     * in the form given by display_form(...)
+     */
+    public static function get_posted_course($from = '', $session_id = 0, $course_code = '')
     {
         $course = null;
 
@@ -397,30 +397,30 @@ 
             return false;
         }
 
-		// Create the resource DOCUMENT objects
-		// Loading the results from the checkboxes of ethe javascript
-		$resource = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
+        // Create the resource DOCUMENT objects
+        // Loading the results from the checkboxes of ethe javascript
+        $resource = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
 
-		$course_info = api_get_course_info($course_code);
-		$table_doc = Database::get_course_table(TABLE_DOCUMENT);
-		$table_prop = Database::get_course_table(TABLE_ITEM_PROPERTY);
-		$course_id = $course_info['real_id'];
+        $course_info = api_get_course_info($course_code);
+        $table_doc = Database::get_course_table(TABLE_DOCUMENT);
+        $table_prop = Database::get_course_table(TABLE_ITEM_PROPERTY);
+        $course_id = $course_info['real_id'];
 
-		/* Searching the documents resource that have been set to null because
+        /* Searching the documents resource that have been set to null because
         $avoid_serialize is true in the display_form() function*/
-		if ($from === 'copy_course') {
-			if (is_array($resource)) {
-				$resource = array_keys($resource);
+        if ($from === 'copy_course') {
+            if (is_array($resource)) {
+                $resource = array_keys($resource);
 
-				foreach	($resource as $resource_item) {
+                foreach	($resource as $resource_item) {
 
-					$condition_session = '';
-					if (!empty($session_id)) {
-						$session_id = intval($session_id);
-						$condition_session = ' AND d.session_id ='.$session_id;
-					}
+                    $condition_session = '';
+                    if (!empty($session_id)) {
+                        $session_id = intval($session_id);
+                        $condition_session = ' AND d.session_id ='.$session_id;
+                    }
 
-					$sql = 'SELECT d.id, d.path, d.comment, d.title, d.filetype, d.size
+                    $sql = 'SELECT d.id, d.path, d.comment, d.title, d.filetype, d.size
 							FROM '.$table_doc.' d, '.$table_prop.' p
 							WHERE
 							    d.c_id = '.$course_id.' AND
@@ -429,8 +429,8 @@ 
                                 p.ref = d.id AND p.visibility != 2 AND
                                 d.id = '.$resource_item.$condition_session.'
 							ORDER BY path';
-					$db_result = Database::query($sql);
-					while ($obj = Database::fetch_object($db_result)) {
+                    $db_result = Database::query($sql);
+                    while ($obj = Database::fetch_object($db_result)) {
                         $doc = new Document(
                             $obj->id,
                             $obj->path,
@@ -454,25 +454,25 @@ 
                             }
                             $course->resources[RESOURCE_DOCUMENT][$resource_item]->item_properties = $all_properties;
                         }
-					}
-				}
-			}
-		}
+                    }
+                }
+            }
+        }
 
-		if (is_array($course->resources)) {
-			foreach ($course->resources as $type => $resources) {
+        if (is_array($course->resources)) {
+            foreach ($course->resources as $type => $resources) {
 
-				switch ($type) {
-					case RESOURCE_SURVEYQUESTION:
-						foreach($resources as $id => $obj) {
-						    if (isset($_POST['resource'][RESOURCE_SURVEY]) &&
+                switch ($type) {
+                    case RESOURCE_SURVEYQUESTION:
+                        foreach($resources as $id => $obj) {
+                            if (isset($_POST['resource'][RESOURCE_SURVEY]) &&
                                 is_array($_POST['resource'][RESOURCE_SURVEY]) &&
                                 !in_array($obj->survey_id, array_keys($_POST['resource'][RESOURCE_SURVEY]))
                             ) {
-								unset($course->resources[$type][$id]);
-							}
-						}
-						break;
+                                unset($course->resources[$type][$id]);
+                            }
+                        }
+                        break;
                     case RESOURCE_FORUMTOPIC:
                     case RESOURCE_FORUMPOST:
                        //Add post from topic
@@ -524,63 +524,63 @@ 
                                 }
                             }
                         }
-					case RESOURCE_LINKCATEGORY:
-					case RESOURCE_FORUMCATEGORY:
-					case RESOURCE_QUIZQUESTION:
-					case RESOURCE_DOCUMENT:
-						// Mark folders to import which are not selected by the user to import,
-						// but in which a document was selected.
-						$documents = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
-						if (!empty($resources) && is_array($resources))
-							foreach ($resources as $id => $obj) {
-								if (isset($obj->file_type) && $obj->file_type == 'folder' &&
+                    case RESOURCE_LINKCATEGORY:
+                    case RESOURCE_FORUMCATEGORY:
+                    case RESOURCE_QUIZQUESTION:
+                    case RESOURCE_DOCUMENT:
+                        // Mark folders to import which are not selected by the user to import,
+                        // but in which a document was selected.
+                        $documents = isset($_POST['resource'][RESOURCE_DOCUMENT]) ? $_POST['resource'][RESOURCE_DOCUMENT] : null;
+                        if (!empty($resources) && is_array($resources))
+                            foreach ($resources as $id => $obj) {
+                                if (isset($obj->file_type) && $obj->file_type == 'folder' &&
                                     !isset($_POST['resource'][RESOURCE_DOCUMENT][$id]) &&
                                     is_array($documents)
                                 ) {
-									foreach ($documents as $id_to_check => $post_value) {
-										$obj_to_check = $resources[$id_to_check];
-										$shared_path_part = substr($obj_to_check->path,0,strlen($obj->path));
-										if ($id_to_check != $id && $obj->path == $shared_path_part) {
-											$_POST['resource'][RESOURCE_DOCUMENT][$id] = 1;
-											break;
-										}
-									}
-								}
-							}
-					default :
-						if (!empty($resources) && is_array($resources)) {
-							foreach ($resources as $id => $obj) {
-								$resource_is_used_elsewhere = $course->is_linked_resource($obj);
-								// check if document is in a quiz (audio/video)
-								if ($type == RESOURCE_DOCUMENT && $course->has_resources(RESOURCE_QUIZ)) {
-									foreach($course->resources[RESOURCE_QUIZ] as $quiz) {
+                                    foreach ($documents as $id_to_check => $post_value) {
+                                        $obj_to_check = $resources[$id_to_check];
+                                        $shared_path_part = substr($obj_to_check->path,0,strlen($obj->path));
+                                        if ($id_to_check != $id && $obj->path == $shared_path_part) {
+                                            $_POST['resource'][RESOURCE_DOCUMENT][$id] = 1;
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                    default :
+                        if (!empty($resources) && is_array($resources)) {
+                            foreach ($resources as $id => $obj) {
+                                $resource_is_used_elsewhere = $course->is_linked_resource($obj);
+                                // check if document is in a quiz (audio/video)
+                                if ($type == RESOURCE_DOCUMENT && $course->has_resources(RESOURCE_QUIZ)) {
+                                    foreach($course->resources[RESOURCE_QUIZ] as $quiz) {
                                         $quiz = $quiz->obj;
-										if (isset($quiz->media) && $quiz->media == $id) {
-											$resource_is_used_elsewhere = true;
-										}
-									}
-								}
-								if (!isset($_POST['resource'][$type][$id]) && !$resource_is_used_elsewhere) {
-									unset($course->resources[$type][$id]);
-								}
-							}
-						}
-				}
-			}
-		}
+                                        if (isset($quiz->media) && $quiz->media == $id) {
+                                            $resource_is_used_elsewhere = true;
+                                        }
+                                    }
+                                }
+                                if (!isset($_POST['resource'][$type][$id]) && !$resource_is_used_elsewhere) {
+                                    unset($course->resources[$type][$id]);
+                                }
+                            }
+                        }
+                }
+            }
+        }
 
-		return $course;
-	}
+        return $course;
+    }
 
-	/**
-	 * Display the form session export
+    /**
+     * Display the form session export
      * @param array $list_course
-	 * @param array $hidden_fields Hidden fields to add to the form.
+     * @param array $hidden_fields Hidden fields to add to the form.
      * @param boolean $avoid_serialize the document array will be serialize. This is used in the course_copy.php file
-	 */
-	 public static function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)
-     {
-         ?>
+     */
+        public static function display_form_session_export($list_course, $hidden_fields = null, $avoid_serialize = false)
+        {
+            ?>
 		<script>
 			function exp(item) {
 				el = document.getElementById('div_'+item);
@@ -622,65 +622,65 @@ 
 		</script>
 		<?php
 
-		//get destination course title
-		if(!empty($hidden_fields['destination_course'])) {
-             if (!empty($hidden_fields['destination_session'])) {
-                 $sessionTitle = ' (' . api_get_session_name($hidden_fields['destination_session']) . ')';
-             } else {
-                 $sessionTitle = null;
-             }
+        //get destination course title
+        if(!empty($hidden_fields['destination_course'])) {
+                if (!empty($hidden_fields['destination_session'])) {
+                    $sessionTitle = ' (' . api_get_session_name($hidden_fields['destination_session']) . ')';
+                } else {
+                    $sessionTitle = null;
+                }
             $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']);
-			echo '<h3>';
-				echo get_lang('DestinationCourse') . ' : ' . $course_infos['title'] . $sessionTitle;
-			echo '</h3>';
-		}
+            echo '<h3>';
+                echo get_lang('DestinationCourse') . ' : ' . $course_infos['title'] . $sessionTitle;
+            echo '</h3>';
+        }
 
-		echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
-		echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
+        echo '<script src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
+        echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
         $icon = Display::returnIconPath('progress_bar.gif');
-		echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="myUpload.start(\'dynamic_div\',\''.$icon.'\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
-		echo '<input type="hidden" name="action" value="course_select_form"/>';
-		foreach ($list_course as $course) {
-			foreach ($course->resources as $type => $resources) {
-				if (count($resources) > 0) {
-					echo '<span id="img_'.$course->code.'" class="fa fa-minus-square-o fa-lg" onclick="javascript:exp('."'$course->code'".');" >&nbsp;</span>';
-					echo '<b  onclick="javascript:exp('."'$course->code'".');" > '.$course->code.'</b><br />';
-					echo '<div id="div_'.$course->code.'">';
-					echo '<blockquote>';
+        echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="myUpload.start(\'dynamic_div\',\''.$icon.'\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
+        echo '<input type="hidden" name="action" value="course_select_form"/>';
+        foreach ($list_course as $course) {
+            foreach ($course->resources as $type => $resources) {
+                if (count($resources) > 0) {
+                    echo '<span id="img_'.$course->code.'" class="fa fa-minus-square-o fa-lg" onclick="javascript:exp('."'$course->code'".');" >&nbsp;</span>';
+                    echo '<b  onclick="javascript:exp('."'$course->code'".');" > '.$course->code.'</b><br />';
+                    echo '<div id="div_'.$course->code.'">';
+                    echo '<blockquote>';
 
                     echo '<div class="btn-group">';
-					echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',true);\" >".get_lang('All')."</a>";
+                    echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',true);\" >".get_lang('All')."</a>";
                     echo "<a class=\"btn\" href=\"#\" onclick=\"javascript:setCheckbox('".$course->code."',false);\" >".get_lang('None')."</a>";
-					echo '</div><br />';
+                    echo '</div><br />';
 
-					foreach ($resources as $id => $resource) {
-						echo '<label class="checkbox" for="resource['.$course->code.']['.$id.']">';
+                    foreach ($resources as $id => $resource) {
+                        echo '<label class="checkbox" for="resource['.$course->code.']['.$id.']">';
                         echo '<input type="checkbox" name="resource['.$course->code.']['.$id.']" id="resource['.$course->code.']['.$id.']"/>';
-						$resource->show();
-						echo '</label>';
-					}
-					echo '</blockquote>';
-					echo '</div>';
-					echo '<script type="text/javascript">exp('."'$course->code'".')</script>';
-				}
-			}
-		}
-		if ($avoid_serialize) {
-			//Documents are avoided due the huge amount of memory that the serialize php function "eats" (when there are directories with hundred/thousand of files)
-			// this is a known issue of serialize
-			$course->resources['document']= null;
-		}
-		echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
-		if (is_array($hidden_fields)) {
-			foreach ($hidden_fields as $key => $value) {
-				echo "\n";
-				echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
-			}
-		}
-		echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.get_lang('Ok').'</button>';
-		CourseSelectForm :: display_hidden_quiz_questions($course);
-		CourseSelectForm :: display_hidden_scorm_directories($course);
-		echo '</form>';
-		echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
-	}
+                        $resource->show();
+                        echo '</label>';
+                    }
+                    echo '</blockquote>';
+                    echo '</div>';
+                    echo '<script type="text/javascript">exp('."'$course->code'".')</script>';
+                }
+            }
+        }
+        if ($avoid_serialize) {
+            //Documents are avoided due the huge amount of memory that the serialize php function "eats" (when there are directories with hundred/thousand of files)
+            // this is a known issue of serialize
+            $course->resources['document']= null;
+        }
+        echo '<input type="hidden" name="course" value="'.base64_encode(Course::serialize($course)).'"/>';
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $key => $value) {
+                echo "\n";
+                echo '<input type="hidden" name="'.$key.'" value="'.$value.'"/>';
+            }
+        }
+        echo '<br /><button class="save" type="submit" onclick="checkLearnPath(\''.addslashes(get_lang('DocumentsWillBeAddedToo')).'\')">'.get_lang('Ok').'</button>';
+        CourseSelectForm :: display_hidden_quiz_questions($course);
+        CourseSelectForm :: display_hidden_scorm_directories($course);
+        echo '</form>';
+        echo '<div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;"></div>';
+    }
 }

main/exercise/fill_blanks.class.php

Indentation +69 added lines, -69 removed lines

@@ -726,29 +726,29 @@ 
     }
 
     /**
-    * Return an array of student state answers for fill the blank questions
-    * for each students that answered the question
-    * -2  : didn't answer
-    * -1  : student answer is wrong
-    *  0  : student answer is correct
-    * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
-    *
-    * @param integer $testId
-    * @param integer $questionId
-    * @param $studentsIdList
-    * @param string $startDate
-    * @param string $endDate
-    * @param bool $useLastAnswerredAttempt
-    * @return array
-    * (
-    *     [student_id] => Array
-    *         (
-    *             [first fill the blank for question] => -1
-    *             [second fill the blank for question] => 2
-    *             [third fill the blank for question] => -1
-    *         )
-    * )
-    */
+     * Return an array of student state answers for fill the blank questions
+     * for each students that answered the question
+     * -2  : didn't answer
+     * -1  : student answer is wrong
+     *  0  : student answer is correct
+     * >0  : for fill the blank question with choice menu, is the index of the student answer (right answer indice is 0)
+     *
+     * @param integer $testId
+     * @param integer $questionId
+     * @param $studentsIdList
+     * @param string $startDate
+     * @param string $endDate
+     * @param bool $useLastAnswerredAttempt
+     * @return array
+     * (
+     *     [student_id] => Array
+     *         (
+     *             [first fill the blank for question] => -1
+     *             [second fill the blank for question] => 2
+     *             [third fill the blank for question] => -1
+     *         )
+     * )
+     */
     public static function getFillTheBlankTabResult(
         $testId,
         $questionId,
@@ -757,17 +757,17 @@ 
         $endDate,
         $useLastAnswerredAttempt = true
     ) {
-       $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-       $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
-       $courseId = api_get_course_int_id();
+        $tblTrackEAttempt = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+        $tblTrackEExercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
+        $courseId = api_get_course_int_id();
 
 
-       // request to have all the answers of student for this question
-       // student may have doing it several time
-       // student may have not answered the bracket id, in this case, is result of the answer is empty
+        // request to have all the answers of student for this question
+        // student may have doing it several time
+        // student may have not answered the bracket id, in this case, is result of the answer is empty
 
-       // we got the less recent attempt first
-       $sql = '
+        // we got the less recent attempt first
+        $sql = '
            SELECT * FROM '.$tblTrackEAttempt.' tea
            LEFT JOIN '.$tblTrackEExercise.' tee
            ON tee.exe_id = tea.exe_id
@@ -782,51 +782,51 @@ 
            ORDER BY user_id, tea.exe_id;
        ';
 
-       $res = Database::query($sql);
-       $tabUserResult = array();
-       $bracketNumber = 0;
-       // foreach attempts for all students starting with his older attempt
-       while ($data = Database::fetch_array($res)) {
-           $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
+        $res = Database::query($sql);
+        $tabUserResult = array();
+        $bracketNumber = 0;
+        // foreach attempts for all students starting with his older attempt
+        while ($data = Database::fetch_array($res)) {
+            $tabAnswer = FillBlanks::getAnswerInfo($data['answer'], true);
 
-           // for each bracket to find in this question
-           foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
+            // for each bracket to find in this question
+            foreach ($tabAnswer['studentanswer'] as $bracketNumber => $studentAnswer) {
 
-               if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
-                   // student has answered this bracket, cool
-                   switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
-                       case self::FILL_THE_BLANK_MENU :
+                if ($tabAnswer['studentanswer'][$bracketNumber] != '') {
+                    // student has answered this bracket, cool
+                    switch (FillBlanks::getFillTheBlankAnswerType($tabAnswer['tabwords'][$bracketNumber])) {
+                        case self::FILL_THE_BLANK_MENU :
                            // get the indice of the choosen answer in the menu
                            // we know that the right answer is the first entry of the menu, ie 0
                            // (remember, menu entries are shuffled when taking the test)
                            $tabUserResult[$data['user_id']][$bracketNumber] = FillBlanks::getFillTheBlankMenuAnswerNum(
-                               $tabAnswer['tabwords'][$bracketNumber],
-                               $tabAnswer['studentanswer'][$bracketNumber]
-                           );
-                           break;
-                       default :
+                                $tabAnswer['tabwords'][$bracketNumber],
+                                $tabAnswer['studentanswer'][$bracketNumber]
+                            );
+                            break;
+                        default :
                            if (FillBlanks::isGoodStudentAnswer($tabAnswer['studentanswer'][$bracketNumber], $tabAnswer['tabwords'][$bracketNumber])) {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
-                           } else {
-                               $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
-                           }
-                   }
-               } else {
-                   // student didn't answer this bracket
-                   if ($useLastAnswerredAttempt) {
-                       // if we take into account the last answered attempt
-                       if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
-                           $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
-                       }
-                   } else {
-                       // we take the last attempt, even if the student answer the question before
-                       $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
-                   }
-               }
-           }
-       }
-
-       return $tabUserResult;
+                                $tabUserResult[$data['user_id']][$bracketNumber] = 0;   //  right answer
+                            } else {
+                                $tabUserResult[$data['user_id']][$bracketNumber] = -1;  // wrong answer
+                            }
+                    }
+                } else {
+                    // student didn't answer this bracket
+                    if ($useLastAnswerredAttempt) {
+                        // if we take into account the last answered attempt
+                        if (!isset($tabUserResult[$data['user_id']][$bracketNumber])) {
+                            $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                        }
+                    } else {
+                        // we take the last attempt, even if the student answer the question before
+                        $tabUserResult[$data['user_id']][$bracketNumber] = -2;      // not answered
+                    }
+                }
+            }
+        }
+
+        return $tabUserResult;
     }
 
     /**

main/resourcelinker/resourcelinker.php

Indentation +462 added lines, -462 removed lines

@@ -79,81 +79,81 @@ 
 */
 if ($from_learnpath == 'yes')
 {
-	//start from clear every time in LearnPath Builder
-	$_SESSION['addedresource'] = null;
-	$_SESSION['addedresourceid'] = null;
-	$_SESSION['addedresourceassigned'] = null;
-	unset ($_SESSION['addedresource']);
-	unset ($_SESSION['addedresourceid']);
-	unset ($_SESSION['addedresourceassigned']);
+    //start from clear every time in LearnPath Builder
+    $_SESSION['addedresource'] = null;
+    $_SESSION['addedresourceid'] = null;
+    $_SESSION['addedresourceassigned'] = null;
+    unset ($_SESSION['addedresource']);
+    unset ($_SESSION['addedresourceid']);
+    unset ($_SESSION['addedresourceassigned']);
 }
 
 // Process a new chapter?
 if (!empty ($_POST['add_dir']) && !empty ($_POST['title']))
 {
-	$title = $_POST['title'];
-	$description = '';
-	if (!empty ($_POST['description']))
-	{
-		$description = $_POST['description'];
-	}
-
-	// get max display_order so far in this parent chapter
-	$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE learnpath_id = $learnpath_id "." AND parent_chapter_id = $chapter_id";
-	$res = Database::query($sql);
-	$row = Database::fetch_array($res);
-	$max_temp = $row[0];
-
-	$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE "." chapter_id = $chapter_id";
-	$res = Database::query($sql);
-	$row = Database::fetch_array($res);
-	$max_temp2 = $row[0];
-	if ($max_temp2 > $max_temp)
-	{
-		$order = $max_temp2 +1;
-	}
-	else
-	{
-		$order = $max_temp +1;
-	}
-
-	$sql = "INSERT INTO $tbl_learnpath_chapter "."(learnpath_id,chapter_name,chapter_description,parent_chapter_id,display_order) "." VALUES "."($learnpath_id, '$title', '$description', $chapter_id, $order )";
-	$res = Database::query($sql);
-	if ($res !== false)
-	{
-		$title = '';
-		$description = '';
-	}
+    $title = $_POST['title'];
+    $description = '';
+    if (!empty ($_POST['description']))
+    {
+        $description = $_POST['description'];
+    }
+
+    // get max display_order so far in this parent chapter
+    $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE learnpath_id = $learnpath_id "." AND parent_chapter_id = $chapter_id";
+    $res = Database::query($sql);
+    $row = Database::fetch_array($res);
+    $max_temp = $row[0];
+
+    $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE "." chapter_id = $chapter_id";
+    $res = Database::query($sql);
+    $row = Database::fetch_array($res);
+    $max_temp2 = $row[0];
+    if ($max_temp2 > $max_temp)
+    {
+        $order = $max_temp2 +1;
+    }
+    else
+    {
+        $order = $max_temp +1;
+    }
+
+    $sql = "INSERT INTO $tbl_learnpath_chapter "."(learnpath_id,chapter_name,chapter_description,parent_chapter_id,display_order) "." VALUES "."($learnpath_id, '$title', '$description', $chapter_id, $order )";
+    $res = Database::query($sql);
+    if ($res !== false)
+    {
+        $title = '';
+        $description = '';
+    }
 }
 
 // This if when a external link is submitted
 if (!empty ($_POST['external_link_submit']))
 {
-	$add = true;
-	if ($add_2_links != "niet toevoegen")
-	{
-		// add external link to the links table.
-		$pos = strpos($external_link, 'ttp:');
-		if ($pos == '')
-		{
-			$external_link = 'http://'.$external_link;
-		}
-
-		$sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
-		$result = Database::query($sql);
-		$addedresource[] = "Link";
-		$addedresourceid[] = Database::insert_id();
-		$_SESSION['addedresource'] = $addedresource;
-		$_SESSION['addedresourceid'] = $addedresourceid;
-	}
-	else
-	{
-		// do not add external link to the links table
-		$addedresource[] = "Externallink";
-		$addedresourceid[] = $external_link;
-		$_SESSION['addedresource'] = $addedresource;
-		$_SESSION['addedresourceid'] = $addedresourceid;
-	}
+    $add = true;
+    if ($add_2_links != "niet toevoegen")
+    {
+        // add external link to the links table.
+        $pos = strpos($external_link, 'ttp:');
+        if ($pos == '')
+        {
+            $external_link = 'http://'.$external_link;
+        }
+
+        $sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
+        $result = Database::query($sql);
+        $addedresource[] = "Link";
+        $addedresourceid[] = Database::insert_id();
+        $_SESSION['addedresource'] = $addedresource;
+        $_SESSION['addedresourceid'] = $addedresourceid;
+    }
+    else
+    {
+        // do not add external link to the links table
+        $addedresource[] = "Externallink";
+        $addedresourceid[] = $external_link;
+        $_SESSION['addedresource'] = $addedresource;
+        $_SESSION['addedresourceid'] = $addedresourceid;
+    }
 }
 
 // loading the session variables into local array
@@ -163,107 +163,107 @@ 
 // This is when a resource was added to the session
 if ($add)
 {
-	// adding the new variable to the local array
-	if (empty ($_POST['external_link_submit']))
-	{
-		//that case is already arranged, see upwards
-		$addedresource[] = $content;
-		$addedresourceid[] = $add;
-	}
-	$addedresourceassigned[] = 0;
-
-	// loading the local array into the session variable
-	$_SESSION['addedresource'] = $addedresource;
-	$_SESSION['addedresourceid'] = $addedresourceid;
+    // adding the new variable to the local array
+    if (empty ($_POST['external_link_submit']))
+    {
+        //that case is already arranged, see upwards
+        $addedresource[] = $content;
+        $addedresourceid[] = $add;
+    }
+    $addedresourceassigned[] = 0;
+
+    // loading the local array into the session variable
+    $_SESSION['addedresource'] = $addedresource;
+    $_SESSION['addedresourceid'] = $addedresourceid;
+
+    //---------------------------------------
+    //we assign to chapters immediately !
+    //---------------------------------------
+    $resource_added = false;
+    if ($from_learnpath == 'yes')
+    {
+        $i = 0;
+        //calculating the last order of the items of this chapter
+        $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE chapter_id=$chapter_id";
+        $result = Database::query($sql);
+        if(Database::num_rows($result)==0){
+            $lastorder_item = 0;
+        }else{
+            $row = Database::fetch_array($result);
+            $lastorder_item = ($row[0]);
+        }
+        $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
+        $result = Database::query($sql);
+        if(Database::num_rows($result)==0){
+            $lastorder_chapter = 0;
+        }else{
+            $row = Database::fetch_array($result);
+            $lastorder_chapter = ($row[0]);
+        }
+        $lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
 
-	//---------------------------------------
-	//we assign to chapters immediately !
-	//---------------------------------------
-	$resource_added = false;
-	if ($from_learnpath == 'yes')
-	{
-		$i = 0;
-		//calculating the last order of the items of this chapter
-		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE chapter_id=$chapter_id";
-		$result = Database::query($sql);
-		if(Database::num_rows($result)==0){
-			$lastorder_item = 0;
-		}else{
-			$row = Database::fetch_array($result);
-			$lastorder_item = ($row[0]);
-		}
-		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
-		$result = Database::query($sql);
-		if(Database::num_rows($result)==0){
-			$lastorder_chapter = 0;
-		}else{
-			$row = Database::fetch_array($result);
-			$lastorder_chapter = ($row[0]);
-		}
-		$lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
-
-		foreach ($addedresource as $addedresource_item)
-		{
-			// in the case we added a chapter, add this into the chapters list with the correct parent_id
-			if ($addedresource_item == "Chap")
-			{
-				$sql = "INSERT INTO $tbl_learnpath_chapter ("."'learnpath_id','chapter_name','chapter_description','parent_chapter_id','display_order'".") VALUES (".$learnpath_id.",'".$learnpath_chapter_name."','".$learnpath_chapter_description."',".$chapter_id.",".$lastorder.")";
-				Database::query($sql);
-			}
-
-			if (!$addedresourceassigned[$i])
-			{
-				//not to assign it twice
-				if ($addedresource_item == "Ass")
-				{
-					$addedresource_item = "Assignments";
-				}
-				if ($addedresource_item == "Drop")
-				{
-					$addedresource_item = "Dropbox";
-				}
-				if ($addedresource_item == "Intro")
-				{
-					$addedresource_item = "Introduction_text";
-				}
-				if ($addedresource_item == "Course_desc")
-				{
-					$addedresource_item = "Course_description";
-				}
-				if ($addedresource_item == "Group")
-				{
-					$addedresource_item = "Groups";
-				}
-				if ($addedresource_item == "User")
-				{
-					$addedresource_item = "Users";
-				}
-				if ($target == '')
-				{
-					$target = '_self';
-				}
-				if ($addedresource_item == 'Link')
-				{
-					$addedresource_item .= ' '.$target;
-				}
-				$sql = "INSERT INTO $tbl_learnpath_item (id, chapter_id, item_type, item_id, display_order) VALUES ( '$autoid', '$chapter_id', '$addedresource_item','$addedresourceid[$i]','".$lastorder."')";
-				$result = Database::query($sql);
-				$addedresourceassigned[$i] = 1;
-				$resource_added = true;
-			}
-			$i ++;
-			$lastorder ++;
-		}
-		//$_SESSION['addedresource']=null;
-		//$_SESSION['addedresourceid']=null;
-		// cleaning up the session once again
-		$_SESSION['addedresource'] = null;
-   		$_SESSION['addedresourceid'] = null;
-   		$_SESSION['addedresourceassigned'] = null;
-   		unset ($_SESSION['addedresource']);
-   		unset ($_SESSION['addedresourceid']);
-   		unset ($_SESSION['addedresourceassigned']);
-	}
+        foreach ($addedresource as $addedresource_item)
+        {
+            // in the case we added a chapter, add this into the chapters list with the correct parent_id
+            if ($addedresource_item == "Chap")
+            {
+                $sql = "INSERT INTO $tbl_learnpath_chapter ("."'learnpath_id','chapter_name','chapter_description','parent_chapter_id','display_order'".") VALUES (".$learnpath_id.",'".$learnpath_chapter_name."','".$learnpath_chapter_description."',".$chapter_id.",".$lastorder.")";
+                Database::query($sql);
+            }
+
+            if (!$addedresourceassigned[$i])
+            {
+                //not to assign it twice
+                if ($addedresource_item == "Ass")
+                {
+                    $addedresource_item = "Assignments";
+                }
+                if ($addedresource_item == "Drop")
+                {
+                    $addedresource_item = "Dropbox";
+                }
+                if ($addedresource_item == "Intro")
+                {
+                    $addedresource_item = "Introduction_text";
+                }
+                if ($addedresource_item == "Course_desc")
+                {
+                    $addedresource_item = "Course_description";
+                }
+                if ($addedresource_item == "Group")
+                {
+                    $addedresource_item = "Groups";
+                }
+                if ($addedresource_item == "User")
+                {
+                    $addedresource_item = "Users";
+                }
+                if ($target == '')
+                {
+                    $target = '_self';
+                }
+                if ($addedresource_item == 'Link')
+                {
+                    $addedresource_item .= ' '.$target;
+                }
+                $sql = "INSERT INTO $tbl_learnpath_item (id, chapter_id, item_type, item_id, display_order) VALUES ( '$autoid', '$chapter_id', '$addedresource_item','$addedresourceid[$i]','".$lastorder."')";
+                $result = Database::query($sql);
+                $addedresourceassigned[$i] = 1;
+                $resource_added = true;
+            }
+            $i ++;
+            $lastorder ++;
+        }
+        //$_SESSION['addedresource']=null;
+        //$_SESSION['addedresourceid']=null;
+        // cleaning up the session once again
+        $_SESSION['addedresource'] = null;
+            $_SESSION['addedresourceid'] = null;
+            $_SESSION['addedresourceassigned'] = null;
+            unset ($_SESSION['addedresource']);
+            unset ($_SESSION['addedresourceid']);
+            unset ($_SESSION['addedresourceassigned']);
+    }
 }
 
 /*
@@ -278,64 +278,64 @@ 
 */
 if ($_GET["source_id"])
 {
-	switch ($_GET["source_id"])
-	{
-		case "1" : // coming from Agenda
-			if ($action == "edit")
-			{
-				$url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
-			}
-			elseif ($action == "add")
-		{
-				$url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
-			}
-			else
-			{
-				$url = "../calendar/agenda.php?action=add";
-			}
-			$originaltoolname = get_lang("Agenda");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			unset($_SESSION['from_learnpath']);
-			unset ($from_learnpath);
-			break;
-		case "2" : // coming from forum: new topic
-			$url = "../phpbb/newtopic.php?forum=$source_forum&md5=$md5";
-			$originaltoolname = get_lang("ForumAddNewTopic");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			unset($_SESSION['from_learnpath']);
-			unset ($from_learnpath);
-			break;
-		case "3" : // coming from forum: edit topic
-			$url = "../phpbb/editpost.php?post_id=$post_id&topic=$topic&forum=$forum&md5=$md5&originalresource=no";
-			$originaltoolname = get_lang("ForumEditTopic");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			unset($_SESSION['from_learnpath']);
-			unset ($from_learnpath);
-			break;
-		case "4" : // coming from exercises: edit topic
-			$url = "../exercise/admin.php?modifyAnswers=$modifyAnswers";
-			$originaltoolname = get_lang("ExerciseAnswers");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			unset($_SESSION['from_learnpath']);
-			unset ($from_learnpath);
-			break;
-		case "5" : // coming from learning path
-			$from_learnpath = 'yes';
-			Session::write('from_learnpath',$from_learnpath);
-			break;
-			/*************************************** end add Frederik.Vermeire@pandora.be *********************************/
-
-	}
-	// We do not come from the learning path. We store the name of the tool & url in a session.
-	if ($from_learnpath != 'yes')
-	{
-		if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"]<>$interbreadcrumb["url"])
-		{
-			$_SESSION["origintoolurl"] = $breadcrumbelement["url"];
-			$_SESSION["origintoolname"] = $breadcrumbelement["name"];
-			$interbreadcrumb = "";
-		}
-	}
+    switch ($_GET["source_id"])
+    {
+        case "1" : // coming from Agenda
+            if ($action == "edit")
+            {
+                $url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
+            }
+            elseif ($action == "add")
+        {
+                $url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
+            }
+            else
+            {
+                $url = "../calendar/agenda.php?action=add";
+            }
+            $originaltoolname = get_lang("Agenda");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            unset($_SESSION['from_learnpath']);
+            unset ($from_learnpath);
+            break;
+        case "2" : // coming from forum: new topic
+            $url = "../phpbb/newtopic.php?forum=$source_forum&md5=$md5";
+            $originaltoolname = get_lang("ForumAddNewTopic");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            unset($_SESSION['from_learnpath']);
+            unset ($from_learnpath);
+            break;
+        case "3" : // coming from forum: edit topic
+            $url = "../phpbb/editpost.php?post_id=$post_id&topic=$topic&forum=$forum&md5=$md5&originalresource=no";
+            $originaltoolname = get_lang("ForumEditTopic");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            unset($_SESSION['from_learnpath']);
+            unset ($from_learnpath);
+            break;
+        case "4" : // coming from exercises: edit topic
+            $url = "../exercise/admin.php?modifyAnswers=$modifyAnswers";
+            $originaltoolname = get_lang("ExerciseAnswers");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            unset($_SESSION['from_learnpath']);
+            unset ($from_learnpath);
+            break;
+        case "5" : // coming from learning path
+            $from_learnpath = 'yes';
+            Session::write('from_learnpath',$from_learnpath);
+            break;
+            /*************************************** end add Frederik.Vermeire@pandora.be *********************************/
+
+    }
+    // We do not come from the learning path. We store the name of the tool & url in a session.
+    if ($from_learnpath != 'yes')
+    {
+        if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"]<>$interbreadcrumb["url"])
+        {
+            $_SESSION["origintoolurl"] = $breadcrumbelement["url"];
+            $_SESSION["origintoolname"] = $breadcrumbelement["name"];
+            $interbreadcrumb = "";
+        }
+    }
 
 }
 
@@ -343,26 +343,26 @@ 
 // the information from the session. Else we use the information of the learningpath itself.
 if ($from_learnpath != 'yes')
 {
-	$nameTools = get_lang('AddResource');
-	$interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
+    $nameTools = get_lang('AddResource');
+    $interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
 }
 else
 {
-	$learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
+    $learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
 		  								WHERE learnpath_id=$learnpath_id";
-	$sql_result = Database::query($learnpath_select_query);
-	$therow = Database::fetch_array($sql_result);
+    $sql_result = Database::query($learnpath_select_query);
+    $therow = Database::fetch_array($sql_result);
 
-	$learnpath_chapter_query = "	SELECT * FROM $tbl_learnpath_chapter
+    $learnpath_chapter_query = "	SELECT * FROM $tbl_learnpath_chapter
 		  								WHERE (learnpath_id = '$learnpath_id' and id = '$chapter_id')";
-	$sql_result = Database::query($learnpath_chapter_query);
-	$therow2 = Database::fetch_array($sql_result);
+    $sql_result = Database::query($learnpath_chapter_query);
+    $therow2 = Database::fetch_array($sql_result);
 
-	$from_learnpath = 'yes';
-	$_SESSION['from_learnpath'] = $from_learnpath;
-	$interbreadcrumb[] = array ("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
-	$interbreadcrumb[] = array ("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
-	$interbreadcrumb[] = array ("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
+    $from_learnpath = 'yes';
+    $_SESSION['from_learnpath'] = $from_learnpath;
+    $interbreadcrumb[] = array ("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
+    $interbreadcrumb[] = array ("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
+    $interbreadcrumb[] = array ("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
 
 }
 
@@ -380,7 +380,7 @@ 
 echo "<h3>".$nameTools;
 if ($from_learnpath == 'yes')
 {
-	echo get_lang("AddResource")." - {$therow2['chapter_name']}";
+    echo get_lang("AddResource")." - {$therow2['chapter_name']}";
 }
 echo "</h3>";
 
@@ -393,7 +393,7 @@ 
 $result_select_active=Database::query($sql_select_active);
 while ($row=Database::fetch_array($result_select_active))
 {
-	$active_modules[]=$row['name'];
+    $active_modules[]=$row['name'];
 }
 
 
@@ -536,12 +536,12 @@ 
 
 if ($from_learnpath != 'yes')
 {
-	echo "<tr><td>&nbsp;</td></tr>";
-	echo "<tr><td><b>".get_lang('ResourcesAdded')." (";
-	echo count($addedresource);
-	echo ")</b></td></tr>";
-	echo "<tr><td nowrap><a href=\"".api_get_self()."?showresources=true&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('ShowDelete')."</a>";
-	echo "</td></tr>";
+    echo "<tr><td>&nbsp;</td></tr>";
+    echo "<tr><td><b>".get_lang('ResourcesAdded')." (";
+    echo count($addedresource);
+    echo ")</b></td></tr>";
+    echo "<tr><td nowrap><a href=\"".api_get_self()."?showresources=true&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('ShowDelete')."</a>";
+    echo "</td></tr>";
 }
 ?>
         <tr>
@@ -557,11 +557,11 @@ 
 
 if ($from_learnpath != 'yes')
 {
-	echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
+    echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
 }
 else
 {
-	echo "<form method=\"get\" action=\"../learnpath/learnpath_handler.php\" style=\"margin: 0px;\"><input type=\"hidden\" name=\"learnpath_id\" value=\"".htmlentities($learnpath_id)."\"><input type=\"submit\" value=\"".'  '.get_lang('Ok').'  '."\"></form>";
+    echo "<form method=\"get\" action=\"../learnpath/learnpath_handler.php\" style=\"margin: 0px;\"><input type=\"hidden\" name=\"learnpath_id\" value=\"".htmlentities($learnpath_id)."\"><input type=\"submit\" value=\"".'  '.get_lang('Ok').'  '."\"></form>";
 }
 ?>
 
@@ -577,40 +577,40 @@ 
 
 if ($resource_added)
 {
-	Display :: display_normal_message(get_lang("ResourceAdded"));
+    Display :: display_normal_message(get_lang("ResourceAdded"));
 }
 
 if ($from_learnpath != 'yes')
 {
-	echo count($addedresource)." ".api_strtolower(get_lang('ResourcesAdded'))."<br/>";
+    echo count($addedresource)." ".api_strtolower(get_lang('ResourcesAdded'))."<br/>";
 }
 //echo "<hr>";
 
 // Agenda items -->
 if ($content == "Agenda")
 {
-	$TABLEAGENDA 			= Database::get_course_table(TABLE_AGENDA);
-	$TABLE_ITEM_PROPERTY 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
+    $TABLEAGENDA 			= Database::get_course_table(TABLE_AGENDA);
+    $TABLE_ITEM_PROPERTY 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 
-	$sql="SELECT agenda.*, toolitemproperties.*
+    $sql="SELECT agenda.*, toolitemproperties.*
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." toolitemproperties
 					WHERE agenda.id = toolitemproperties.ref
 					AND toolitemproperties.tool='".TOOL_CALENDAR_EVENT."'
 					AND (toolitemproperties.to_group_id='0' OR toolitemproperties.to_group_id IS NULL)
 					AND toolitemproperties.visibility='1'";
 
-	$result = Database::query($sql);
-
-	while ($myrow = Database::fetch_array($result))
-	{
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\">";
-		echo "<img src='../img/agenda.gif' alt='agenda'>";
-		echo api_convert_and_format_date($myrow["start_date"], null, date_default_timezone_get())."<br />";
-		echo "<b>".$myrow["title"]."</b></td></tr><tr><td>";
-		echo $myrow["content"]."<br />";
-		showorhide_addresourcelink($content, $myrow["id"]);
-		echo "</td></tr></table><br />";
-	}
+    $result = Database::query($sql);
+
+    while ($myrow = Database::fetch_array($result))
+    {
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\">";
+        echo "<img src='../img/agenda.gif' alt='agenda'>";
+        echo api_convert_and_format_date($myrow["start_date"], null, date_default_timezone_get())."<br />";
+        echo "<b>".$myrow["title"]."</b></td></tr><tr><td>";
+        echo $myrow["content"]."<br />";
+        showorhide_addresourcelink($content, $myrow["id"]);
+        echo "</td></tr></table><br />";
+    }
 } // end if ($_GET["resource"]=="Agenda")
 
 /*
@@ -620,12 +620,12 @@ 
 */
 if ($content == "chapter")
 {
-	echo '<table><form name="add_dir" action="'.'" method="POST">'."\n";
-	echo '  <tr><td>'.get_lang('Title').'</td><td><input type="text" name="title" value="'.$title.'"></input></td></tr>'."\n";
-	echo '  <tr><td>'.get_lang('Description').'</td><td><input type="text" name="description" value="'.$description.'"></input></td></tr>'."\n";
-	echo '  <tr><td></td><td><input type="submit" name="add_dir" value="'.get_lang('AddIt').'"/></td></tr>'."\n";
-	echo '</form></table>'."\n";
-	//echo "<hr>";
+    echo '<table><form name="add_dir" action="'.'" method="POST">'."\n";
+    echo '  <tr><td>'.get_lang('Title').'</td><td><input type="text" name="title" value="'.$title.'"></input></td></tr>'."\n";
+    echo '  <tr><td>'.get_lang('Description').'</td><td><input type="text" name="description" value="'.$description.'"></input></td></tr>'."\n";
+    echo '  <tr><td></td><td><input type="submit" name="add_dir" value="'.get_lang('AddIt').'"/></td></tr>'."\n";
+    echo '</form></table>'."\n";
+    //echo "<hr>";
 }
 
 /*
@@ -640,23 +640,23 @@ 
 //				b. one is a student AND the documents tool is active. Student cannot add documents if the documents tool is inactive (teacher can do this)
 if ($content == "Document" OR (empty($content) AND (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT,$active_modules))) AND !$_GET['showresources'])
 {
-	// setting variables for file locations
-	$baseServDir = $_configuration['root_sys'];
-	$courseDir = $_course['path']."/document";
-	$baseWorkDir = $baseServDir.$courseDir;
-	// showing the link to move one folder up (when not in the root folder)
-	show_folder_up($chapter_id);
-	// showing the blue bar with the path in it when we are not in the root
-	if (get_levels($folder))
-	{
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#4171B5\">";
-		echo "<img src=\"../img/opendir.gif\" alt='directory'><font color=\"#ffffff\"><b>";
-		echo $folder."</b></font></td></tr></table>";
-	}
-
-	// showing the documents and subfolders of the folder we are in.
-	show_documents($folder, $chapter_id);
-	//echo "<hr>";
+    // setting variables for file locations
+    $baseServDir = $_configuration['root_sys'];
+    $courseDir = $_course['path']."/document";
+    $baseWorkDir = $baseServDir.$courseDir;
+    // showing the link to move one folder up (when not in the root folder)
+    show_folder_up($chapter_id);
+    // showing the blue bar with the path in it when we are not in the root
+    if (get_levels($folder))
+    {
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#4171B5\">";
+        echo "<img src=\"../img/opendir.gif\" alt='directory'><font color=\"#ffffff\"><b>";
+        echo $folder."</b></font></td></tr></table>";
+    }
+
+    // showing the documents and subfolders of the folder we are in.
+    show_documents($folder, $chapter_id);
+    //echo "<hr>";
 }
 
 /*
@@ -666,8 +666,8 @@ 
 */
 if ($content == "Ad_Valvas")
 {
-	$tbl_announcement = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-	$sql = "SELECT * FROM ".$tbl_announcement." a, ".$item_property_table." i
+    $tbl_announcement = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+    $sql = "SELECT * FROM ".$tbl_announcement." a, ".$item_property_table." i
 			WHERE
 				i.tool = '".TOOL_ANNOUNCEMENT."' AND
 				a.id=i.ref AND
@@ -676,17 +676,17 @@ 
 				i.to_user_id IS NULL
 			ORDER BY a.display_order ASC";
 
-	$result = Database::query($sql);
-	while ($myrow = Database::fetch_array($result))
-	{
-		echo "<table width=\"100%\"><tr><td>";
-		echo "<img src='../img/valves.gif' alt='advalvas'>";
-		echo api_convert_and_format_date($myrow["end_date"], DATE_FORMAT_LONG, date_default_timezone_get());
-		echo "</td></tr><tr><td>";
-		echo $myrow["title"]."<br />";
-		showorhide_addresourcelink($content, $myrow["id"]);
-		echo "</td></tr></table>";
-	}
+    $result = Database::query($sql);
+    while ($myrow = Database::fetch_array($result))
+    {
+        echo "<table width=\"100%\"><tr><td>";
+        echo "<img src='../img/valves.gif' alt='advalvas'>";
+        echo api_convert_and_format_date($myrow["end_date"], DATE_FORMAT_LONG, date_default_timezone_get());
+        echo "</td></tr><tr><td>";
+        echo $myrow["title"]."<br />";
+        showorhide_addresourcelink($content, $myrow["id"]);
+        echo "</td></tr></table>";
+    }
 }
 
 /*
@@ -696,75 +696,75 @@ 
 */
 if ($content == "Forum")
 {
-	$TBL_FORUMS 		= Database::get_course_table(TABLE_FORUM);
-	$TBL_CATAGORIES 	= Database::get_course_table(TABLE_FORUM_CATEGORY);
-	$TBL_FORUMTOPICS 	= Database::get_course_table(TABLE_FORUM_POST);
-	$tbl_posts 			= Database::get_course_table(TABLE_FORUM_POST);
-	$tbl_posts_text 	= Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
-
-	echo "<table width='100%'>";
+    $TBL_FORUMS 		= Database::get_course_table(TABLE_FORUM);
+    $TBL_CATAGORIES 	= Database::get_course_table(TABLE_FORUM_CATEGORY);
+    $TBL_FORUMTOPICS 	= Database::get_course_table(TABLE_FORUM_POST);
+    $tbl_posts 			= Database::get_course_table(TABLE_FORUM_POST);
+    $tbl_posts_text 	= Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
+
+    echo "<table width='100%'>";
+
+    // displaying the categories and the forums
+    if (!$forum and !$thread)
+    {
+        $sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_CATAGORIES." categories WHERE forums.cat_id=categories.cat_id ORDER BY forums.cat_id DESC";
+        $result = Database::query($sql);
+        while ($myrow = Database::fetch_array($result))
+        {
+            if ($myrow["cat_title"] !== $old_cat_title)
+            {
+                echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
+            }
+            $old_cat_title = $myrow["cat_title"];
+            echo "<tr><td><img src='../img/forum.gif'><a href='".api_get_self()."?content=Forum&category=".$myrow["cat_id"]."&forum=".$myrow["forum_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["forum_name"]."</td><td>";
+            showorhide_addresourcelink("Forum", $myrow["forum_id"]);
+            echo "</td></tr>";
+        }
+    }
+    //displaying all the threads of one forum
+    if ($forum)
+    {
+        // displaying the category title
+        $sql = "SELECT * FROM ".$TBL_CATAGORIES." WHERE cat_id=$category";
+        $result = Database::query($sql);
+        $myrow = Database::fetch_array($result);
+        echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
+
+        // displaying the forum title
+        $sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_FORUMTOPICS." topics WHERE forums.forum_id=topics.forum_id";
+        $result = Database::query($sql);
+        $myrow = Database::fetch_array($result);
+        echo "<tr><td bgcolor='#cccccc' colspan='2'><b>".$myrow["forum_name"]."</b></td></tr>";
+
+        if (!$thread)
+        {
+            // displaying all the threads of this forum
+            $sql = "SELECT * FROM ".$TBL_FORUMTOPICS." WHERE forum_id=$forum";
+            $result = Database::query($sql);
+            while ($myrow = Database::fetch_array($result))
+            {
+                echo "<tr><td><a href='".api_get_self()."?content=Forum&category=$category&forum=1&thread=".$myrow["topic_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["topic_title"]."</a>  (".$myrow["prenom"]." ".$myrow["nom"].")</td><td>";
+                showorhide_addresourcelink("Thread", $myrow["topic_id"]);
+                echo "</td></tr>";
+            }
+        }
+        else
+        {
+            // displaying all the replies
+            $sql = "SELECT * FROM ".$tbl_posts." post, ".$tbl_posts_text." post_text WHERE post_text.post_id=post.post_id and post.topic_id=$thread ORDER BY post_text.post_id ASC";
+            $result = Database::query($sql);
+            while ($myrow = Database::fetch_array($result))
+            {
+                echo "<tr><td><b>".$myrow["post_title"]."</b><br>";
+                echo $myrow["post_text"]."</td>";
+                echo "<td>";
+                showorhide_addresourcelink("Post", $myrow["post_id"]);
+                echo "</td></tr><tr><td colspan='2'><hr noshade></td></tr>";
+            }
 
-	// displaying the categories and the forums
-	if (!$forum and !$thread)
-	{
-		$sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_CATAGORIES." categories WHERE forums.cat_id=categories.cat_id ORDER BY forums.cat_id DESC";
-		$result = Database::query($sql);
-		while ($myrow = Database::fetch_array($result))
-		{
-			if ($myrow["cat_title"] !== $old_cat_title)
-			{
-				echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
-			}
-			$old_cat_title = $myrow["cat_title"];
-			echo "<tr><td><img src='../img/forum.gif'><a href='".api_get_self()."?content=Forum&category=".$myrow["cat_id"]."&forum=".$myrow["forum_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["forum_name"]."</td><td>";
-			showorhide_addresourcelink("Forum", $myrow["forum_id"]);
-			echo "</td></tr>";
-		}
-	}
-	//displaying all the threads of one forum
-	if ($forum)
-	{
-		// displaying the category title
-		$sql = "SELECT * FROM ".$TBL_CATAGORIES." WHERE cat_id=$category";
-		$result = Database::query($sql);
-		$myrow = Database::fetch_array($result);
-		echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
-
-		// displaying the forum title
-		$sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_FORUMTOPICS." topics WHERE forums.forum_id=topics.forum_id";
-		$result = Database::query($sql);
-		$myrow = Database::fetch_array($result);
-		echo "<tr><td bgcolor='#cccccc' colspan='2'><b>".$myrow["forum_name"]."</b></td></tr>";
-
-		if (!$thread)
-		{
-			// displaying all the threads of this forum
-			$sql = "SELECT * FROM ".$TBL_FORUMTOPICS." WHERE forum_id=$forum";
-			$result = Database::query($sql);
-			while ($myrow = Database::fetch_array($result))
-			{
-				echo "<tr><td><a href='".api_get_self()."?content=Forum&category=$category&forum=1&thread=".$myrow["topic_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["topic_title"]."</a>  (".$myrow["prenom"]." ".$myrow["nom"].")</td><td>";
-				showorhide_addresourcelink("Thread", $myrow["topic_id"]);
-				echo "</td></tr>";
-			}
-		}
-		else
-		{
-			// displaying all the replies
-			$sql = "SELECT * FROM ".$tbl_posts." post, ".$tbl_posts_text." post_text WHERE post_text.post_id=post.post_id and post.topic_id=$thread ORDER BY post_text.post_id ASC";
-			$result = Database::query($sql);
-			while ($myrow = Database::fetch_array($result))
-			{
-				echo "<tr><td><b>".$myrow["post_title"]."</b><br>";
-				echo $myrow["post_text"]."</td>";
-				echo "<td>";
-				showorhide_addresourcelink("Post", $myrow["post_id"]);
-				echo "</td></tr><tr><td colspan='2'><hr noshade></td></tr>";
-			}
-
-		}
-	}
-	echo "</table>";
+        }
+    }
+    echo "</table>";
 }
 
 /*
@@ -774,57 +774,57 @@ 
 */
 if ($content == "Link")
 {
-	// including the links language file
-	include ("../lang/$language/link.inc.php");
-
-	$tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
-	if (($learnpath_id != '') and ($content == 'Link'))
-	{
-		echo "<form name='learnpath_link'><table>";
-		echo "<tr></td><td align='left'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target' onchange='targetfunc()'><option value='_self' ";
-		if ($target == '_self')
-		{
-			echo "selected";
-		}
-		echo ">".get_lang('SameWindow')."</option><option value='_blank'";
-		if ($target == '_blank')
-		{
-			echo "selected";
-		}
-		echo ">".get_lang('NewWindow')."</option></select></td></tr></table></form>";
-	}
-
-	// showing the links that are in the root (having no category)
-	$sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
-	$result = Database::query($sql);
-	if (Database::num_rows($result) > 0)
-	{
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".get_lang('NoCategory')."</i></td></tr></table>";
-		while ($myrow = Database::fetch_array($result))
-		{
-			echo "<img src='../img/links.gif'>".$myrow["title"];
-			echo "<br>";
-			showorhide_addresourcelink($content, $myrow["id"]);
-			echo "<br><br>";
-		}
-	}
-
-	// showing the categories and the links in it.
-	$sqlcategories = "SELECT * FROM ".$tbl_categories." ORDER by display_order DESC";
-	$resultcategories = Database::query($sqlcategories) or die;
-	while ($myrow = @ Database::fetch_array($resultcategories))
-	{
-		$sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
-		$result_links = Database::query($sql_links);
-		while ($myrow = Database::fetch_array($result_links))
-		{
-			echo "<img src='../img/links.gif' />".$myrow["title"];
-			echo "<br>";
-			showorhide_addresourcelink($content, $myrow["id"]);
-			echo "<br><br>";
-		}
-	}
+    // including the links language file
+    include ("../lang/$language/link.inc.php");
+
+    $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
+    if (($learnpath_id != '') and ($content == 'Link'))
+    {
+        echo "<form name='learnpath_link'><table>";
+        echo "<tr></td><td align='left'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target' onchange='targetfunc()'><option value='_self' ";
+        if ($target == '_self')
+        {
+            echo "selected";
+        }
+        echo ">".get_lang('SameWindow')."</option><option value='_blank'";
+        if ($target == '_blank')
+        {
+            echo "selected";
+        }
+        echo ">".get_lang('NewWindow')."</option></select></td></tr></table></form>";
+    }
+
+    // showing the links that are in the root (having no category)
+    $sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
+    $result = Database::query($sql);
+    if (Database::num_rows($result) > 0)
+    {
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".get_lang('NoCategory')."</i></td></tr></table>";
+        while ($myrow = Database::fetch_array($result))
+        {
+            echo "<img src='../img/links.gif'>".$myrow["title"];
+            echo "<br>";
+            showorhide_addresourcelink($content, $myrow["id"]);
+            echo "<br><br>";
+        }
+    }
+
+    // showing the categories and the links in it.
+    $sqlcategories = "SELECT * FROM ".$tbl_categories." ORDER by display_order DESC";
+    $resultcategories = Database::query($sqlcategories) or die;
+    while ($myrow = @ Database::fetch_array($resultcategories))
+    {
+        $sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
+        $result_links = Database::query($sql_links);
+        while ($myrow = Database::fetch_array($result_links))
+        {
+            echo "<img src='../img/links.gif' />".$myrow["title"];
+            echo "<br>";
+            showorhide_addresourcelink($content, $myrow["id"]);
+            echo "<br><br>";
+        }
+    }
 }
 
 /*
@@ -834,31 +834,31 @@ 
 */
 if (($content == "Exercise") or ($content == "HotPotatoes"))
 {
-	$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
-	$result = Database::query("SELECT * FROM ".$TBL_EXERCICES." WHERE active='1' ORDER BY id ASC");
-	while ($myrow = Database::fetch_array($result))
-	{
-		echo "<img src='../img/quiz.gif'>".$myrow["title"]."<br>";
-		showorhide_addresourcelink($content, $myrow["id"]);
-		echo "<br><br>";
-	}
+    $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
+    $result = Database::query("SELECT * FROM ".$TBL_EXERCICES." WHERE active='1' ORDER BY id ASC");
+    while ($myrow = Database::fetch_array($result))
+    {
+        echo "<img src='../img/quiz.gif'>".$myrow["title"]."<br>";
+        showorhide_addresourcelink($content, $myrow["id"]);
+        echo "<br><br>";
+    }
+
+    if ($from_learnpath == 'yes')
+    {
+        $uploadPath = "/HotPotatoes_files";
+        $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
+        $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+        $sql = "SELECT * FROM ".$TBL_DOCUMENT." WHERE (path LIKE '%htm%' OR path LIKE '%html%') AND path LIKE '".$uploadPath."/%/%' ORDER BY id ASC";
+        $result = Database::query($sql);
+        while ($myrow = Database::fetch_array($result))
+        {
+            $path = $myrow["path"];
+            echo "<img src='../img/jqz.gif'>".GetQuizName($path, $documentPath)."<br>";
+            showorhide_addresourcelink("HotPotatoes", $myrow["id"]);
+            echo "<br><br>";
 
-	if ($from_learnpath == 'yes')
-	{
-		$uploadPath = "/HotPotatoes_files";
-		$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
-		$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-		$sql = "SELECT * FROM ".$TBL_DOCUMENT." WHERE (path LIKE '%htm%' OR path LIKE '%html%') AND path LIKE '".$uploadPath."/%/%' ORDER BY id ASC";
-		$result = Database::query($sql);
-		while ($myrow = Database::fetch_array($result))
-		{
-			$path = $myrow["path"];
-			echo "<img src='../img/jqz.gif'>".GetQuizName($path, $documentPath)."<br>";
-			showorhide_addresourcelink("HotPotatoes", $myrow["id"]);
-			echo "<br><br>";
-
-		}
-	}
+        }
+    }
 }
 
 /*
@@ -876,10 +876,10 @@ 
       <td align="left"><input name="external_link" type="text" id="external_link" value="http://"></td>
 	  <?php
 
-	if ($learnpath_id != '')
-	{
-		echo "</tr><tr><td align='right'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target'><option value='_self'>".get_lang('SameWindow')."</option><option value='_blank'>".get_lang('NewWindow')."</option></select></td>";
-	}
+    if ($learnpath_id != '')
+    {
+        echo "</tr><tr><td align='right'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target'><option value='_self'>".get_lang('SameWindow')."</option><option value='_blank'>".get_lang('NewWindow')."</option></select></td>";
+    }
 ?>
 	</tr>
     <tr>
@@ -891,14 +891,14 @@ 
 	  <option value="0"><?php echo get_lang('MainCategory'); ?></option>
 		<?php
 
-	$tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
-	$sql = "SELECT * FROM $tbl_categories ORDER BY display_order ASC";
-	echo $sql;
-	$result = Database::query($sql);
-	while ($row = Database::fetch_array($result))
-	{
-		echo "<option value='".$row["id"]."'>".$row["category_title"]."</option>";
-	}
+    $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
+    $sql = "SELECT * FROM $tbl_categories ORDER BY display_order ASC";
+    echo $sql;
+    $result = Database::query($sql);
+    while ($row = Database::fetch_array($result))
+    {
+        echo "<option value='".$row["id"]."'>".$row["category_title"]."</option>";
+    }
 ?>
 
       </select><?php } ?></td>
@@ -927,7 +927,7 @@ 
 */
 if ($content == "Assignment")
 {
-	echo "<a href=".api_get_self()."?content=Ass&add=Ass&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".get_lang('AddAssignmentPage')."</a>";
+    echo "<a href=".api_get_self()."?content=Ass&add=Ass&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".get_lang('AddAssignmentPage')."</a>";
 }
 
 /*
@@ -937,7 +937,7 @@ 
 */
 if ($content == "Dropbox")
 {
-	echo "<a href='".api_get_self()."?content=Drop&add=Drop&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('DropboxAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Drop&add=Drop&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('DropboxAdd')."</a>";
 }
 
 /*
@@ -947,7 +947,7 @@ 
 */
 if ($content == "Introduction_text")
 {
-	echo "<a href='".api_get_self()."?content=Intro&add=Intro&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('IntroductionTextAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Intro&add=Intro&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('IntroductionTextAdd')."</a>";
 }
 
 /*
@@ -957,7 +957,7 @@ 
 */
 if ($content == "Course_description")
 {
-	echo "<a href='".api_get_self()."?content=Course_desc&add=Course_desc&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('CourseDescriptionAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Course_desc&add=Course_desc&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('CourseDescriptionAdd')."</a>";
 }
 
 /*
@@ -967,7 +967,7 @@ 
 */
 if ($content == "Groups")
 {
-	echo "<a href='".api_get_self()."?content=Group&add=Group&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('$GroupsAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Group&add=Group&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('$GroupsAdd')."</a>";
 }
 
 /*
@@ -977,13 +977,13 @@ 
 */
 if ($content == "Users")
 {
-	echo "<a href='".api_get_self()."?content=User&add=User&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('UsersAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=User&add=User&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('UsersAdd')."</a>";
 }
 
 if ($showresources)
 {
-	//echo "<h4>".get_lang('ResourceAdded')."</h4>";
-	display_resources(1);
+    //echo "<h4>".get_lang('ResourceAdded')."</h4>";
+    display_resources(1);
 }
 
 echo "</td></tr></table>";

main/webservices/cm_webservice_course.php

Indentation +511 added lines, -511 removed lines

@@ -10,521 +10,521 @@
  */
 class WSCMCourse extends WSCM
 {
-	/**
-	 * Deletes a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed True if the course was successfully deleted, WSError otherwise
-	 */
-	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSCMError) {
-			return $course_id;
-		} else {
-			$course_code = CourseManager::get_course_code_from_course_id($course_id);
-			CourseManager::delete_course($course_code);
-			return true;
-		}
-	}
-
-	/**
-	 * Deletes a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 */
-	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
-
-	/**
-	 * Deletes multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
-	 * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteCourses($secret_key, $courses) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
-				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
-				$result_tmp['course_id_value'] = $course['course_id_value'];
-				if($result_op instanceof WSCMError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
-
-	/**
-	 * Creates a course (helper method)
-	 *
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return mixed Generated id if creation was successful, WSError otherwise
-	 */
-	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// Add the original course id field name and value to the extra fields if needed
-		$extras_associative = array();
-		if($course_id_field_name != "chamilo_course_id") {
-			$extras_associative[$course_id_field_name] = $course_id_value;
-		}
-		foreach($extras as $extra) {
-			$extras_associative[$extra['field_name']] = $extra['field_value'];
-		}
-		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
-		if($course_admin_id instanceof WSError) {
-			return $course_admin_id;
-		}
-		if($wanted_code == '') {
-			$wanted_code = CourseManager::generate_course_code($title);
-		}
-		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
-		if (!$result) {
-			return new WSError(202, 'There was an error creating the course');
-		} else {
-			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
-			}
-			// Get course id
-			$course_info = CourseManager::get_course_information($result);
-			return $course_info['real_id'];
-		}
-	}
-
-	/**
-	 * Creates a course
-	 *
-	 * @param string API secret key
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return int Course id generated
-	 */
-	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
-
-	/**
-	 * Create multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Courses to be created, with elements following the structure presented in CreateCourse
-	 * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateCourses($secret_key, $courses) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSCMError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
-				//reinitialize variables just in case
-				$title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = null;
-				extract($course);
-				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-				if($result instanceof WSCMError) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
-
-	/**
-	 * Edits a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSCMError) {
-			return $course_id;
-		} else {
-			$attributes = array();
-			if(!empty($title)) {
-				$attributes['title'] = $title;
-			}
-			if(!empty($category_code)) {
-				$attributes['category_code'] = $category_code;
-			}
-			if(!empty($department_name)) {
-				$attributes['department_name'] = $department_name;
-			}
-			if(!empty($department_url)) {
-				$attributes['department_url'] = $department_url;
-			}
-			if(!empty($language)) {
-				$attributes['course_language'] = $language;
-			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
-			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
-			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
-			}
-			if(!empty($visual_code)) {
-				$attributes['visual_code'] = $visual_code;
-			}
-			if(!empty($attributes)) {
-				CourseManager::update_attributes($course_id, $attributes);
-			}
-			if(!empty($extras)) {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				$extras_associative = array();
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-				foreach($extras_associative as $fname => $fvalue) {
-					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
-				}
-			}
-			return true;
-		}
-	}
-
-	/**
-	 * Edits a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 */
-	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSCMError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
-			if($result instanceof WSCMError) {
-				$this->handleError($result);
-			}
-		}
-	}
-
-	/**
-	 * List courses
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
-	 * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
-	 */
-	public function ListCourses($secret_key, $course_id_field_name) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$courses_result = array();
-			$category_names = array();
-
-			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
-				$course_tmp = array();
-				$course_tmp['id'] = $course['id'];
-				$course_tmp['code'] = $course['code'];
-				$course_tmp['title'] = $course['title'];
-				$course_tmp['language'] = $course['course_language'];
-				$course_tmp['visibility'] = $course['visibility'];
-
-				// Determining category name
-				if($category_names[$course['category_code']]) {
-					$course_tmp['category_name'] = $category_names[$course['category_code']];
-				} else {
-					$category = CourseManager::get_course_category($course['category_code']);
-					$category_names[$course['category_code']] = $category['name'];
-					$course_tmp['category_name'] = $category['name'];
-				}
-
-				// Determining number of students registered in course
-				$user_list = CourseManager::get_user_list_from_course_code($course['code']);
-				$course_tmp['number_students'] = count($user_list);
-
-				// Determining external course id
-				$course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_id_field_name, $course['code']);
-
-
-				$courses_result[] = $course_tmp;
-			}
-
-			return $courses_result;
-		}
-	}
-
-	/**
-	 * Subscribe or unsubscribe user to a course (helper method)
-	 *
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Set to 1 to subscribe, 0 to unsubscribe
-	 * @param int Status (STUDENT or TEACHER) Used for subscription only
-	 * @return mixed True if subscription or unsubscription was successful, false otherwise
-	 */
-	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				if($state == 0) {
-					// Unsubscribe user
-					CourseManager::unsubscribe_user($user_id, $course_code);
-					return true;
-				} else {
-					// Subscribe user
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
-						return true;
-					} else {
-						return new WSError(203, 'An error occured subscribing to this course');
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Subscribe user to a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Status (1 = Teacher, 5 = Student)
-	 */
-	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
-
-	/**
-	 * Unsusbscribe user from course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 */
-	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
-
-	/**
-	 * Returns the descriptions of a course, along with their id
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
-	 */
-	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Course exists, get its descriptions
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$results = array();
-				foreach($descriptions as $description) {
-					$results[] = array('course_desc_id' => $description->get_description_type(),
-						'course_desc_title' => $description->get_title(),
-						'course_desc_content' => $description->get_content());
-				}
-				return $results;
-			}
-		}
-	}
-
-
-	/**
-	 * Edit course description
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param int Category id from course description
-	 * @param string Description title
-	 * @param string Course description content
-	 */
-	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Create the new course description
-				$cd = new CourseDescription();
-				$cd->set_description_type($course_desc_id);
-				$cd->set_title($course_desc_title);
-				$cd->set_content($course_desc_content);
-				$cd->set_session_id(0);
-
-				// Get course info
+    /**
+     * Deletes a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed True if the course was successfully deleted, WSError otherwise
+     */
+    protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSCMError) {
+            return $course_id;
+        } else {
+            $course_code = CourseManager::get_course_code_from_course_id($course_id);
+            CourseManager::delete_course($course_code);
+            return true;
+        }
+    }
+
+    /**
+     * Deletes a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     */
+    public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
+
+    /**
+     * Deletes multiple courses
+     *
+     * @param string API secret key
+     * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
+     * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteCourses($secret_key, $courses) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
+                $result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
+                $result_tmp['course_id_value'] = $course['course_id_value'];
+                if($result_op instanceof WSCMError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
+
+    /**
+     * Creates a course (helper method)
+     *
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return mixed Generated id if creation was successful, WSError otherwise
+     */
+    protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // Add the original course id field name and value to the extra fields if needed
+        $extras_associative = array();
+        if($course_id_field_name != "chamilo_course_id") {
+            $extras_associative[$course_id_field_name] = $course_id_value;
+        }
+        foreach($extras as $extra) {
+            $extras_associative[$extra['field_name']] = $extra['field_value'];
+        }
+        $course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
+        if($course_admin_id instanceof WSError) {
+            return $course_admin_id;
+        }
+        if($wanted_code == '') {
+            $wanted_code = CourseManager::generate_course_code($title);
+        }
+        $result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
+        if (!$result) {
+            return new WSError(202, 'There was an error creating the course');
+        } else {
+            // Update extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
+            }
+            // Get course id
+            $course_info = CourseManager::get_course_information($result);
+            return $course_info['real_id'];
+        }
+    }
+
+    /**
+     * Creates a course
+     *
+     * @param string API secret key
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return int Course id generated
+     */
+    public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
+
+    /**
+     * Create multiple courses
+     *
+     * @param string API secret key
+     * @param array Courses to be created, with elements following the structure presented in CreateCourse
+     * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateCourses($secret_key, $courses) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSCMError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
+                //reinitialize variables just in case
+                $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = null;
+                extract($course);
+                $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+                if($result instanceof WSCMError) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
+
+    /**
+     * Edits a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     * @return mixed True in case of success, WSError otherwise
+     */
+    protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSCMError) {
+            return $course_id;
+        } else {
+            $attributes = array();
+            if(!empty($title)) {
+                $attributes['title'] = $title;
+            }
+            if(!empty($category_code)) {
+                $attributes['category_code'] = $category_code;
+            }
+            if(!empty($department_name)) {
+                $attributes['department_name'] = $department_name;
+            }
+            if(!empty($department_url)) {
+                $attributes['department_url'] = $department_url;
+            }
+            if(!empty($language)) {
+                $attributes['course_language'] = $language;
+            }
+            if($visibility != '') {
+                $attributes['visibility'] = (int)$visibility;
+            }
+            if($subscribe != '') {
+                $attributes['subscribe'] = (int)$subscribe;
+            }
+            if($unsubscribe != '') {
+                $attributes['unsubscribe'] = (int)$unsubscribe;
+            }
+            if(!empty($visual_code)) {
+                $attributes['visual_code'] = $visual_code;
+            }
+            if(!empty($attributes)) {
+                CourseManager::update_attributes($course_id, $attributes);
+            }
+            if(!empty($extras)) {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                $extras_associative = array();
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+                foreach($extras_associative as $fname => $fvalue) {
+                    CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
+                }
+            }
+            return true;
+        }
+    }
+
+    /**
+     * Edits a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     */
+    public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSCMError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
+            if($result instanceof WSCMError) {
+                $this->handleError($result);
+            }
+        }
+    }
+
+    /**
+     * List courses
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
+     * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
+     */
+    public function ListCourses($secret_key, $course_id_field_name) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $courses_result = array();
+            $category_names = array();
+
+            $courses = CourseManager::get_courses_list();
+            foreach($courses as $course) {
+                $course_tmp = array();
+                $course_tmp['id'] = $course['id'];
+                $course_tmp['code'] = $course['code'];
+                $course_tmp['title'] = $course['title'];
+                $course_tmp['language'] = $course['course_language'];
+                $course_tmp['visibility'] = $course['visibility'];
+
+                // Determining category name
+                if($category_names[$course['category_code']]) {
+                    $course_tmp['category_name'] = $category_names[$course['category_code']];
+                } else {
+                    $category = CourseManager::get_course_category($course['category_code']);
+                    $category_names[$course['category_code']] = $category['name'];
+                    $course_tmp['category_name'] = $category['name'];
+                }
+
+                // Determining number of students registered in course
+                $user_list = CourseManager::get_user_list_from_course_code($course['code']);
+                $course_tmp['number_students'] = count($user_list);
+
+                // Determining external course id
+                $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_id_field_name, $course['code']);
+
+
+                $courses_result[] = $course_tmp;
+            }
+
+            return $courses_result;
+        }
+    }
+
+    /**
+     * Subscribe or unsubscribe user to a course (helper method)
+     *
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Set to 1 to subscribe, 0 to unsubscribe
+     * @param int Status (STUDENT or TEACHER) Used for subscription only
+     * @return mixed True if subscription or unsubscription was successful, false otherwise
+     */
+    protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                if($state == 0) {
+                    // Unsubscribe user
+                    CourseManager::unsubscribe_user($user_id, $course_code);
+                    return true;
+                } else {
+                    // Subscribe user
+                    if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
+                        return true;
+                    } else {
+                        return new WSError(203, 'An error occured subscribing to this course');
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Subscribe user to a course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Status (1 = Teacher, 5 = Student)
+     */
+    public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
+
+    /**
+     * Unsusbscribe user from course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     */
+    public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
+
+    /**
+     * Returns the descriptions of a course, along with their id
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
+     */
+    public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Course exists, get its descriptions
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $results = array();
+                foreach($descriptions as $description) {
+                    $results[] = array('course_desc_id' => $description->get_description_type(),
+                        'course_desc_title' => $description->get_title(),
+                        'course_desc_content' => $description->get_content());
+                }
+                return $results;
+            }
+        }
+    }
+
+
+    /**
+     * Edit course description
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param int Category id from course description
+     * @param string Description title
+     * @param string Course description content
+     */
+    public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Create the new course description
+                $cd = new CourseDescription();
+                $cd->set_description_type($course_desc_id);
+                $cd->set_title($course_desc_title);
+                $cd->set_content($course_desc_content);
+                $cd->set_session_id(0);
+
+                // Get course info
                 $course_info = CourseManager::get_course_information(
                     CourseManager::get_course_code_from_course_id($course_id)
                 );
-				// Check if this course description exists
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$exists = false;
-				foreach($descriptions as $description) {
-					if($description->get_description_type() == $course_desc_id) {
-						$exists = true;
-					}
-				}
+                // Check if this course description exists
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $exists = false;
+                foreach($descriptions as $description) {
+                    if($description->get_description_type() == $course_desc_id) {
+                        $exists = true;
+                    }
+                }
                 $cd->set_course_id($course_info['real_id']);
-				if (!$exists) {
-					$cd->set_progress(0);
-					$cd->insert();
-				} else {
-					$cd->update();
-				}
-			}
-		}
-	}
-	public function unreadMessage($username, $password)
-	{
-		if($this->verifyUserPass($username, $password) == "valid")
-		{
-			$table_message = Database::get_main_table(TABLE_MESSAGE);
-			$user_id = UserManager::get_user_id_from_username($username);
-			$condition_msg_status = ' msg_status = 1 '; // define('MESSAGE_STATUS_UNREAD', '1');
-
-			$sql_query = "SELECT COUNT(*) as number_messages FROM $table_message WHERE $condition_msg_status AND user_receiver_id=".$user_id;
-
-			$sql_result = Database::query($sql_query);
-			$result = Database::fetch_array($sql_result);
-			return $result['number_messages'];
-		}
-		return "0";
-	}
-
-	public function get_message_data($username, $password)
-	{
-		if($this->verifyUserPass($username, $password) == "valid")
-		{
-			$user_id = get_user_id_from_username($username);
-
-		}
-
-	}
-
-	public function nada($username, $password)
-	{
-		if($this->verifyUserPass($username, $password) == "valid")
-			return $username.$password;
-		return $username;
-	}
+                if (!$exists) {
+                    $cd->set_progress(0);
+                    $cd->insert();
+                } else {
+                    $cd->update();
+                }
+            }
+        }
+    }
+    public function unreadMessage($username, $password)
+    {
+        if($this->verifyUserPass($username, $password) == "valid")
+        {
+            $table_message = Database::get_main_table(TABLE_MESSAGE);
+            $user_id = UserManager::get_user_id_from_username($username);
+            $condition_msg_status = ' msg_status = 1 '; // define('MESSAGE_STATUS_UNREAD', '1');
+
+            $sql_query = "SELECT COUNT(*) as number_messages FROM $table_message WHERE $condition_msg_status AND user_receiver_id=".$user_id;
+
+            $sql_result = Database::query($sql_query);
+            $result = Database::fetch_array($sql_result);
+            return $result['number_messages'];
+        }
+        return "0";
+    }
+
+    public function get_message_data($username, $password)
+    {
+        if($this->verifyUserPass($username, $password) == "valid")
+        {
+            $user_id = get_user_id_from_username($username);
+
+        }
+
+    }
+
+    public function nada($username, $password)
+    {
+        if($this->verifyUserPass($username, $password) == "valid")
+            return $username.$password;
+        return $username;
+    }
 
 
 

main/webservices/webservice_course.php

Indentation +455 added lines, -455 removed lines

@@ -12,490 +12,490 @@
  */
 class WSCourse extends WS
 {
-	/**
-	 * Deletes a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed True if the course was successfully deleted, WSError otherwise
-	 */
-	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$course_code = CourseManager::get_course_code_from_course_id($course_id);
-			CourseManager::delete_course($course_code);
-			return true;
-		}
-	}
+    /**
+     * Deletes a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed True if the course was successfully deleted, WSError otherwise
+     */
+    protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $course_code = CourseManager::get_course_code_from_course_id($course_id);
+            CourseManager::delete_course($course_code);
+            return true;
+        }
+    }
 
-	/**
-	 * Deletes a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 */
-	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     */
+    public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Deletes multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
-	 * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteCourses($secret_key, $courses) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
-				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
-				$result_tmp['course_id_value'] = $course['course_id_value'];
-				if($result_op instanceof WSError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+    /**
+     * Deletes multiple courses
+     *
+     * @param string API secret key
+     * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
+     * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteCourses($secret_key, $courses) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
+                $result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
+                $result_tmp['course_id_value'] = $course['course_id_value'];
+                if($result_op instanceof WSError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Creates a course (helper method)
-	 *
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return mixed Generated id if creation was successful, WSError otherwise
-	 */
-	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// Add the original course id field name and value to the extra fields if needed
-		$extras_associative = array();
-		if($course_id_field_name != "chamilo_course_id") {
-			$extras_associative[$course_id_field_name] = $course_id_value;
-		}
-		foreach($extras as $extra) {
-			$extras_associative[$extra['field_name']] = $extra['field_value'];
-		}
-		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
-		if($course_admin_id instanceof WSError) {
-			return $course_admin_id;
-		}
-		if($wanted_code == '') {
-			$wanted_code = CourseManager::generate_course_code($title);
-		}
-		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
-		if (!$result) {
-			return new WSError(202, 'There was an error creating the course');
-		} else {
-			// Update extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
-			}
-			// Get course id
-			$course_info = CourseManager::get_course_information($result);
-			return $course_info['real_id'];
-		}
-	}
+    /**
+     * Creates a course (helper method)
+     *
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return mixed Generated id if creation was successful, WSError otherwise
+     */
+    protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // Add the original course id field name and value to the extra fields if needed
+        $extras_associative = array();
+        if($course_id_field_name != "chamilo_course_id") {
+            $extras_associative[$course_id_field_name] = $course_id_value;
+        }
+        foreach($extras as $extra) {
+            $extras_associative[$extra['field_name']] = $extra['field_value'];
+        }
+        $course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
+        if($course_admin_id instanceof WSError) {
+            return $course_admin_id;
+        }
+        if($wanted_code == '') {
+            $wanted_code = CourseManager::generate_course_code($title);
+        }
+        $result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
+        if (!$result) {
+            return new WSError(202, 'There was an error creating the course');
+        } else {
+            // Update extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
+            }
+            // Get course id
+            $course_info = CourseManager::get_course_information($result);
+            return $course_info['real_id'];
+        }
+    }
 
-	/**
-	 * Creates a course
-	 *
-	 * @param string API secret key
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
-	 * @param string Tutor name
-	 * @param string Course admin user id field name
-	 * @param string Course admin user id value
-	 * @param string Course language
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param array Course extra fields
-	 * @return int Course id generated
-	 */
-	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
+    /**
+     * Creates a course
+     *
+     * @param string API secret key
+     * @param string Title
+     * @param string Category code
+     * @param string Wanted code. If it's not defined, it will be generated automatically
+     * @param string Tutor name
+     * @param string Course admin user id field name
+     * @param string Course admin user id value
+     * @param string Course language
+     * @param string Course id field name
+     * @param string Course id value
+     * @param array Course extra fields
+     * @return int Course id generated
+     */
+    public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Create multiple courses
-	 *
-	 * @param string API secret key
-	 * @param array Courses to be created, with elements following the structure presented in CreateCourse
-	 * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateCourses($secret_key, $courses) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($courses as $course) {
-				$result_tmp = array();
+    /**
+     * Create multiple courses
+     *
+     * @param string API secret key
+     * @param array Courses to be created, with elements following the structure presented in CreateCourse
+     * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateCourses($secret_key, $courses) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($courses as $course) {
+                $result_tmp = array();
                 // re-initialize variables just in case
                 $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = 0;
-				extract($course);
-				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
-				if($result instanceof WSError) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['course_id_value'] = $course_id_value;
-					$result_tmp['course_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                extract($course);
+                $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
+                if($result instanceof WSError) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['course_id_value'] = $course_id_value;
+                    $result_tmp['course_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Edits a course (helper method)
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$attributes = array();
-			if(!empty($title)) {
-				$attributes['title'] = $title;
-			}
-			if(!empty($category_code)) {
-				$attributes['category_code'] = $category_code;
-			}
-			if(!empty($department_name)) {
-				$attributes['department_name'] = $department_name;
-			}
-			if(!empty($department_url)) {
-				$attributes['department_url'] = $department_url;
-			}
-			if(!empty($language)) {
-				$attributes['course_language'] = $language;
-			}
-			if($visibility != '') {
-				$attributes['visibility'] = (int)$visibility;
-			}
-			if($subscribe != '') {
-				$attributes['subscribe'] = (int)$subscribe;
-			}
-			if($unsubscribe != '') {
-				$attributes['unsubscribe'] = (int)$unsubscribe;
-			}
-			if(!empty($visual_code)) {
-				$attributes['visual_code'] = $visual_code;
-			}
-			if(!empty($attributes)) {
-				CourseManager::update_attributes($course_id, $attributes);
-			}
-			if(!empty($extras)) {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				$extras_associative = array();
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-				foreach($extras_associative as $fname => $fvalue) {
-					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
-				}
-			}
-			return true;
-		}
-	}
+    /**
+     * Edits a course (helper method)
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     * @return mixed True in case of success, WSError otherwise
+     */
+    protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $attributes = array();
+            if(!empty($title)) {
+                $attributes['title'] = $title;
+            }
+            if(!empty($category_code)) {
+                $attributes['category_code'] = $category_code;
+            }
+            if(!empty($department_name)) {
+                $attributes['department_name'] = $department_name;
+            }
+            if(!empty($department_url)) {
+                $attributes['department_url'] = $department_url;
+            }
+            if(!empty($language)) {
+                $attributes['course_language'] = $language;
+            }
+            if($visibility != '') {
+                $attributes['visibility'] = (int)$visibility;
+            }
+            if($subscribe != '') {
+                $attributes['subscribe'] = (int)$subscribe;
+            }
+            if($unsubscribe != '') {
+                $attributes['unsubscribe'] = (int)$unsubscribe;
+            }
+            if(!empty($visual_code)) {
+                $attributes['visual_code'] = $visual_code;
+            }
+            if(!empty($attributes)) {
+                CourseManager::update_attributes($course_id, $attributes);
+            }
+            if(!empty($extras)) {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                $extras_associative = array();
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+                foreach($extras_associative as $fname => $fvalue) {
+                    CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
+                }
+            }
+            return true;
+        }
+    }
 
-	/**
-	 * Edits a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Title
-	 * @param string Category code
-	 * @param string Department name
-	 * @param string Department url
-	 * @param string Course language
-	 * @param int Visibility
-	 * @param int Subscribe (0 = denied, 1 = allowed)
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
-	 * @param string Visual code
-	 * @param array Course extra fields
-	 */
-	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Edits a course
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Title
+     * @param string Category code
+     * @param string Department name
+     * @param string Department url
+     * @param string Course language
+     * @param int Visibility
+     * @param int Subscribe (0 = denied, 1 = allowed)
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
+     * @param string Visual code
+     * @param array Course extra fields
+     */
+    public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * List courses
-	 *
-	 * @param string API secret key
-	 * @param string A list of visibility filter we want to apply
-	 * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
-	 * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
-	 */
-	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
+    /**
+     * List courses
+     *
+     * @param string API secret key
+     * @param string A list of visibility filter we want to apply
+     * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
+     * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
+     */
+    public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
             $visibilities = split(',',$visibility);
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
             foreach ($visibilities as $p => $visibility) {
                 $visibilities[$p] = $vis[$visibility];
             }
-			$courses_result = array();
-			$category_names = array();
+            $courses_result = array();
+            $category_names = array();
 
-			$courses = CourseManager::get_courses_list();
-			foreach($courses as $course) {
+            $courses = CourseManager::get_courses_list();
+            foreach($courses as $course) {
                 //skip elements that do not match required visibility
                 if (!in_array($course['visibility'],$visibilities)) { continue; }
-				$course_tmp = array();
-				$course_tmp['id'] = $course['id'];
-				$course_tmp['code'] = $course['code'];
-				$course_tmp['title'] = $course['title'];
-				$course_tmp['language'] = $course['course_language'];
-				$course_tmp['visibility'] = $course['visibility'];
+                $course_tmp = array();
+                $course_tmp['id'] = $course['id'];
+                $course_tmp['code'] = $course['code'];
+                $course_tmp['title'] = $course['title'];
+                $course_tmp['language'] = $course['course_language'];
+                $course_tmp['visibility'] = $course['visibility'];
 
-				// Determining category name
-				if($category_names[$course['category_code']]) {
-					$course_tmp['category_name'] = $category_names[$course['category_code']];
-				} else {
-					$category = CourseManager::get_course_category($course['category_code']);
-					$category_names[$course['category_code']] = $category['name'];
-					$course_tmp['category_name'] = $category['name'];
-				}
+                // Determining category name
+                if($category_names[$course['category_code']]) {
+                    $course_tmp['category_name'] = $category_names[$course['category_code']];
+                } else {
+                    $category = CourseManager::get_course_category($course['category_code']);
+                    $category_names[$course['category_code']] = $category['name'];
+                    $course_tmp['category_name'] = $category['name'];
+                }
 
-				// Determining number of students registered in course
-				$user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
-				$course_tmp['number_students'] = count($user_list);
+                // Determining number of students registered in course
+                $user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
+                $course_tmp['number_students'] = count($user_list);
 
-				// Determining external course id - this code misses the external course id field name
-				// $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
+                // Determining external course id - this code misses the external course id field name
+                // $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
 
 
-				$courses_result[] = $course_tmp;
-			}
+                $courses_result[] = $course_tmp;
+            }
 
-			return $courses_result;
-		}
-	}
+            return $courses_result;
+        }
+    }
 
-	/**
-	 * Subscribe or unsubscribe user to a course (helper method)
-	 *
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Set to 1 to subscribe, 0 to unsubscribe
-	 * @param int Status (STUDENT or TEACHER) Used for subscription only
-	 * @return mixed True if subscription or unsubscription was successful, false otherwise
-	 */
-	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-		if($course_id instanceof WSError) {
-			return $course_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
-				if($state == 0) {
-					// Unsubscribe user
-					CourseManager::unsubscribe_user($user_id, $course_code);
-					return true;
-				} else {
-					// Subscribe user
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
-						return true;
-					} else {
-						return new WSError(203, 'An error occured subscribing to this course');
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Subscribe or unsubscribe user to a course (helper method)
+     *
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Set to 1 to subscribe, 0 to unsubscribe
+     * @param int Status (STUDENT or TEACHER) Used for subscription only
+     * @return mixed True if subscription or unsubscription was successful, false otherwise
+     */
+    protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+        if($course_id instanceof WSError) {
+            return $course_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
+                if($state == 0) {
+                    // Unsubscribe user
+                    CourseManager::unsubscribe_user($user_id, $course_code);
+                    return true;
+                } else {
+                    // Subscribe user
+                    if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
+                        return true;
+                    } else {
+                        return new WSError(203, 'An error occured subscribing to this course');
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 * @param int Status (1 = Teacher, 5 = Student)
-	 */
-	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     * @param int Status (1 = Teacher, 5 = Student)
+     */
+    public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Unsusbscribe user from course
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
-	 * @param string Course id value.
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
-	 * @param string User id value
-	 */
-	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Unsusbscribe user from course
+     *
+     * @param string API secret key
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
+     * @param string Course id value.
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
+     * @param string User id value
+     */
+    public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Returns the descriptions of a course, along with their id
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
-	 */
-	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Course exists, get its descriptions
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$results = array();
-				foreach($descriptions as $description) {
-					$results[] = array('course_desc_id' => $description->get_description_type(),
-										'course_desc_title' => $description->get_title(),
-										'course_desc_content' => $description->get_content());
-				}
-				return $results;
-			}
-		}
-	}
+    /**
+     * Returns the descriptions of a course, along with their id
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
+     */
+    public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Course exists, get its descriptions
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $results = array();
+                foreach($descriptions as $description) {
+                    $results[] = array('course_desc_id' => $description->get_description_type(),
+                                        'course_desc_title' => $description->get_title(),
+                                        'course_desc_content' => $description->get_content());
+                }
+                return $results;
+            }
+        }
+    }
 
 
-	/**
-	 * Edit course description
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param int Category id from course description
-	 * @param string Description title
-	 * @param string Course description content
-	 */
-	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				// Create the new course description
-				$cd = new CourseDescription();
-				$cd->set_description_type($course_desc_id);
-				$cd->set_title($course_desc_title);
-				$cd->set_content($course_desc_content);
-				$cd->set_session_id(0);
-				// Get course info
-				$course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
+    /**
+     * Edit course description
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param int Category id from course description
+     * @param string Description title
+     * @param string Course description content
+     */
+    public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                // Create the new course description
+                $cd = new CourseDescription();
+                $cd->set_description_type($course_desc_id);
+                $cd->set_title($course_desc_title);
+                $cd->set_content($course_desc_content);
+                $cd->set_session_id(0);
+                // Get course info
+                $course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
                 $cd->set_course_id($course_info['real_id']);
-				// Check if this course description exists
-				$descriptions = CourseDescription::get_descriptions($course_id);
-				$exists = false;
-				foreach($descriptions as $description) {
-					if($description->get_description_type() == $course_desc_id) {
-						$exists = true;
-					}
-				}
-				if (!$exists) {
-					$cd->set_progress(0);
-					$cd->insert();
-				} else {
-					$cd->update();
-				}
-			}
-		}
-	}
+                // Check if this course description exists
+                $descriptions = CourseDescription::get_descriptions($course_id);
+                $exists = false;
+                foreach($descriptions as $description) {
+                    if($description->get_description_type() == $course_desc_id) {
+                        $exists = true;
+                    }
+                }
+                if (!$exists) {
+                    $cd->set_progress(0);
+                    $cd->insert();
+                } else {
+                    $cd->update();
+                }
+            }
+        }
+    }
 }