chamilo / chamilo-lms

main/inc/lib/xajax/xajaxResponse.inc.php

Doc Comments +4 added lines, -2 removed lines

@@ -97,6 +97,7 @@ 
 	 * @param string  contains the character encoding string to use
 	 * @param boolean lets you set if you want special characters in the output
 	 *                converted to HTML entities
+	 * @param string $sEncoding
 	 *
 	 */
 	function xajaxResponse($sEncoding=XAJAX_DEFAULT_CHAR_ENCODING, $bOutputEntities=false)
@@ -223,6 +224,8 @@ 
 	 * @param string contains the id of an HTML element
 	 * @param string the part of the element you wish to clear ("innerHTML",
 	 *               "value", etc.)
+	 * @param string $sTarget
+	 * @param string $sAttribute
 	 */
 	function addClear($sTarget,$sAttribute)
 	{
@@ -279,6 +282,7 @@ 
 	 * <i>Usage:</i> <kbd>$objResponse->addScript("var x = prompt('get some text');");</kbd>
 	 *
 	 * @param string contains Javascript code to be executed
+	 * @param string $sJS
 	 */
 	function addScript($sJS)
 	{
@@ -290,8 +294,6 @@ 
 	 *
 	 * <i>Usage:</i> <kbd>$objResponse->addScriptCall("myJSFunction", "arg 1", "arg 2", 12345);</kbd>
 	 *
-	 * @param string $sFunc the name of a Javascript function
-	 * @param mixed $args,... optional arguments to pass to the Javascript function
 	 */
 	function addScriptCall() {
 		$arguments = func_get_args();

Spacing +37 added lines, -37 removed lines

@@ -99,7 +99,7 @@ 
 	 *                converted to HTML entities
 	 *
 	 */
-	function xajaxResponse($sEncoding=XAJAX_DEFAULT_CHAR_ENCODING, $bOutputEntities=false)
+	function xajaxResponse($sEncoding = XAJAX_DEFAULT_CHAR_ENCODING, $bOutputEntities = false)
 	{
 		$this->setCharEncoding($sEncoding);
 		$this->bOutputEntities = $bOutputEntities;
@@ -148,7 +148,7 @@ 
 	 */
 	function addConfirmCommands($iCmdNumber, $sMessage)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"cc","t"=>$iCmdNumber),$sMessage);
+		$this->xml .= $this->_cmdXML(array("n"=>"cc", "t"=>$iCmdNumber), $sMessage);
 	}
 
 	/**
@@ -161,9 +161,9 @@ 
 	 *               "value", etc.)
 	 * @param string the data you want to set the attribute to
 	 */
-	function addAssign($sTarget,$sAttribute,$sData)
+	function addAssign($sTarget, $sAttribute, $sData)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"as","t"=>$sTarget,"p"=>$sAttribute),$sData);
+		$this->xml .= $this->_cmdXML(array("n"=>"as", "t"=>$sTarget, "p"=>$sAttribute), $sData);
 	}
 
 	/**
@@ -176,9 +176,9 @@ 
 	 *               "value", etc.)
 	 * @param string the data you want to append to the end of the attribute
 	 */
-	function addAppend($sTarget,$sAttribute,$sData)
+	function addAppend($sTarget, $sAttribute, $sData)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ap","t"=>$sTarget,"p"=>$sAttribute),$sData);
+		$this->xml .= $this->_cmdXML(array("n"=>"ap", "t"=>$sTarget, "p"=>$sAttribute), $sData);
 	}
 
 	/**
@@ -192,9 +192,9 @@ 
 	 * @param string the data you want to prepend to the beginning of the
 	 *               attribute
 	 */
-	function addPrepend($sTarget,$sAttribute,$sData)
+	function addPrepend($sTarget, $sAttribute, $sData)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"pp","t"=>$sTarget,"p"=>$sAttribute),$sData);
+		$this->xml .= $this->_cmdXML(array("n"=>"pp", "t"=>$sTarget, "p"=>$sAttribute), $sData);
 	}
 
 	/**
@@ -209,10 +209,10 @@ 
 	 * @param string the string to replace the search string when found in the
 	 *               attribute
 	 */
-	function addReplace($sTarget,$sAttribute,$sSearch,$sData)
+	function addReplace($sTarget, $sAttribute, $sSearch, $sData)
 	{
 		$sDta = "<s><![CDATA[$sSearch]]></s><r><![CDATA[$sData]]></r>";
-		$this->xml .= $this->_cmdXML(array("n"=>"rp","t"=>$sTarget,"p"=>$sAttribute),$sDta);
+		$this->xml .= $this->_cmdXML(array("n"=>"rp", "t"=>$sTarget, "p"=>$sAttribute), $sDta);
 	}
 
 	/**
@@ -224,9 +224,9 @@ 
 	 * @param string the part of the element you wish to clear ("innerHTML",
 	 *               "value", etc.)
 	 */
-	function addClear($sTarget,$sAttribute)
+	function addClear($sTarget, $sAttribute)
 	{
-		$this->addAssign($sTarget,$sAttribute,'');
+		$this->addAssign($sTarget, $sAttribute, '');
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 */
 	function addAlert($sMsg)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"al"),$sMsg);
+		$this->xml .= $this->_cmdXML(array("n"=>"al"), $sMsg);
 	}
 
 	/**
@@ -260,11 +260,11 @@ 
 			$queryEnd = strpos($sURL, '#', $queryStart);
 			if ($queryEnd === FALSE)
 				$queryEnd = strlen($sURL);
-			$queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
+			$queryPart = substr($sURL, $queryStart, $queryEnd - $queryStart);
             $queryParts = array();
 			parse_str($queryPart, $queryParts);
 			$newQueryPart = "";
-			foreach($queryParts as $key => $value)
+			foreach ($queryParts as $key => $value)
 			{
 				$newQueryPart .= rawurlencode($key).'='.rawurlencode($value).ini_get('arg_separator.output');
 			}
@@ -282,7 +282,7 @@ 
 	 */
 	function addScript($sJS)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"js"),$sJS);
+		$this->xml .= $this->_cmdXML(array("n"=>"js"), $sJS);
 	}
 
 	/**
@@ -297,7 +297,7 @@ 
 		$arguments = func_get_args();
 		$sFunc = array_shift($arguments);
 		$sData = $this->_buildObjXml($arguments);
-		$this->xml .= $this->_cmdXML(array("n"=>"jc","t"=>$sFunc),$sData);
+		$this->xml .= $this->_cmdXML(array("n"=>"jc", "t"=>$sFunc), $sData);
 	}
 
 	/**
@@ -309,7 +309,7 @@ 
 	 */
 	function addRemove($sTarget)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"rm","t"=>$sTarget),'');
+		$this->xml .= $this->_cmdXML(array("n"=>"rm", "t"=>$sTarget), '');
 	}
 
 	/**
@@ -323,14 +323,14 @@ 
 	 * @param string the id to be assigned to the new element
 	 * @param string deprecated, use the addCreateInput() method instead
 	 */
-	function addCreate($sParent, $sTag, $sId, $sType="")
+	function addCreate($sParent, $sTag, $sId, $sType = "")
 	{
 		if ($sType)
 		{
 			trigger_error("The \$sType parameter of addCreate has been deprecated.  Use the addCreateInput() method instead.", E_USER_WARNING);
 			return;
 		}
-		$this->xml .= $this->_cmdXML(array("n"=>"ce","t"=>$sParent,"p"=>$sId),$sTag);
+		$this->xml .= $this->_cmdXML(array("n"=>"ce", "t"=>$sParent, "p"=>$sId), $sTag);
 	}
 
 	/**
@@ -345,7 +345,7 @@ 
 	 */
 	function addInsert($sBefore, $sTag, $sId)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ie","t"=>$sBefore,"p"=>$sId),$sTag);
+		$this->xml .= $this->_cmdXML(array("n"=>"ie", "t"=>$sBefore, "p"=>$sId), $sTag);
 	}
 
 	/**
@@ -360,7 +360,7 @@ 
 	 */
 	function addInsertAfter($sAfter, $sTag, $sId)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ia","t"=>$sAfter,"p"=>$sId),$sTag);
+		$this->xml .= $this->_cmdXML(array("n"=>"ia", "t"=>$sAfter, "p"=>$sId), $sTag);
 	}
 
 	/**
@@ -378,7 +378,7 @@ 
 	 */
 	function addCreateInput($sParent, $sType, $sName, $sId)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ci","t"=>$sParent,"p"=>$sId,"c"=>$sType),$sName);
+		$this->xml .= $this->_cmdXML(array("n"=>"ci", "t"=>$sParent, "p"=>$sId, "c"=>$sType), $sName);
 	}
 
 	/**
@@ -396,7 +396,7 @@ 
 	 */
 	function addInsertInput($sBefore, $sType, $sName, $sId)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ii","t"=>$sBefore,"p"=>$sId,"c"=>$sType),$sName);
+		$this->xml .= $this->_cmdXML(array("n"=>"ii", "t"=>$sBefore, "p"=>$sId, "c"=>$sType), $sName);
 	}
 
 	/**
@@ -414,7 +414,7 @@ 
 	 */
 	function addInsertInputAfter($sAfter, $sType, $sName, $sId)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"iia","t"=>$sAfter,"p"=>$sId,"c"=>$sType),$sName);
+		$this->xml .= $this->_cmdXML(array("n"=>"iia", "t"=>$sAfter, "p"=>$sId, "c"=>$sType), $sName);
 	}
 
 	/**
@@ -426,9 +426,9 @@ 
 	 * @param string the event you wish to set ("onclick", "onmouseover", etc.)
 	 * @param string the Javascript string you want the event to invoke
 	 */
-	function addEvent($sTarget,$sEvent,$sScript)
+	function addEvent($sTarget, $sEvent, $sScript)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ev","t"=>$sTarget,"p"=>$sEvent),$sScript);
+		$this->xml .= $this->_cmdXML(array("n"=>"ev", "t"=>$sTarget, "p"=>$sEvent), $sScript);
 	}
 
 	/**
@@ -441,9 +441,9 @@ 
 	 * @param string the name of a Javascript function that will handle the
 	 *               event. Multiple handlers can be added for the same event
 	 */
-	function addHandler($sTarget,$sEvent,$sHandler)
+	function addHandler($sTarget, $sEvent, $sHandler)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ah","t"=>$sTarget,"p"=>$sEvent),$sHandler);
+		$this->xml .= $this->_cmdXML(array("n"=>"ah", "t"=>$sTarget, "p"=>$sEvent), $sHandler);
 	}
 
 	/**
@@ -457,9 +457,9 @@ 
 	 * @param string the name of a Javascript handler function that you want to
 	 *               remove
 	 */
-	function addRemoveHandler($sTarget,$sEvent,$sHandler)
+	function addRemoveHandler($sTarget, $sEvent, $sHandler)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"rh","t"=>$sTarget,"p"=>$sEvent),$sHandler);
+		$this->xml .= $this->_cmdXML(array("n"=>"rh", "t"=>$sTarget, "p"=>$sEvent), $sHandler);
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 	 */
 	function addIncludeScript($sFileName)
 	{
-		$this->xml .= $this->_cmdXML(array("n"=>"in"),$sFileName);
+		$this->xml .= $this->_cmdXML(array("n"=>"in"), $sFileName);
 	}
 
 	/**
@@ -489,7 +489,7 @@ 
 		$sXML = "<?xml version=\"1.0\"";
 		if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0)
 			$sXML .= " encoding=\"".$this->sEncoding."\"";
-		$sXML .= " ?"."><xjx>" . $this->xml . "</xjx>";
+		$sXML .= " ?"."><xjx>".$this->xml."</xjx>";
 
 		return $sXML;
 	}
@@ -544,9 +544,9 @@ 
 			}
 		}
 		$xml = "<cmd";
-		foreach($aAttributes as $sAttribute => $sValue)
+		foreach ($aAttributes as $sAttribute => $sValue)
 			$xml .= " $sAttribute=\"$sValue\"";
-		if ($sData !== null && !stristr($sData,'<![CDATA['))
+		if ($sData !== null && !stristr($sData, '<![CDATA['))
 			$xml .= "><![CDATA[$sData]]></cmd>";
 		else if ($sData !== null)
 			$xml .= ">$sData</cmd>";
@@ -574,8 +574,8 @@ 
 			$data = "<xjxobj>";
 			foreach ($var as $key => $value) {
 				$data .= "<e>";
-				$data .= "<k>" . htmlspecialchars($key) . "</k>";
-				$data .= "<v>" . $this->_buildObjXml($value) . "</v>";
+				$data .= "<k>".htmlspecialchars($key)."</k>";
+				$data .= "<v>".$this->_buildObjXml($value)."</v>";
 				$data .= "</e>";
 			}
 			$data .= "</xjxobj>";

Braces +21 added lines, -17 removed lines

@@ -258,8 +258,9 @@ 
 		{
 			$queryStart++;
 			$queryEnd = strpos($sURL, '#', $queryStart);
-			if ($queryEnd === FALSE)
-				$queryEnd = strlen($sURL);
+			if ($queryEnd === FALSE) {
+							$queryEnd = strlen($sURL);
+			}
 			$queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
             $queryParts = array();
 			parse_str($queryPart, $queryParts);
@@ -487,8 +488,9 @@ 
 	function getXML()
 	{
 		$sXML = "<?xml version=\"1.0\"";
-		if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0)
-			$sXML .= " encoding=\"".$this->sEncoding."\"";
+		if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0) {
+					$sXML .= " encoding=\"".$this->sEncoding."\"";
+		}
 		$sXML .= " ?"."><xjx>" . $this->xml . "</xjx>";
 
 		return $sXML;
@@ -538,20 +540,21 @@ 
 			elseif (function_exists('mb_convert_encoding')) {
 			//
 				$sData = call_user_func_array('mb_convert_encoding', array(&$sData, 'HTML-ENTITIES', $this->sEncoding));
-			}
-			else {
+			} else {
 				trigger_error("The xajax XML response output could not be converted to HTML entities because the mb_convert_encoding function is not available", E_USER_NOTICE);
 			}
 		}
 		$xml = "<cmd";
-		foreach($aAttributes as $sAttribute => $sValue)
-			$xml .= " $sAttribute=\"$sValue\"";
-		if ($sData !== null && !stristr($sData,'<![CDATA['))
-			$xml .= "><![CDATA[$sData]]></cmd>";
-		else if ($sData !== null)
-			$xml .= ">$sData</cmd>";
-		else
-			$xml .= "></cmd>";
+		foreach($aAttributes as $sAttribute => $sValue) {
+					$xml .= " $sAttribute=\"$sValue\"";
+		}
+		if ($sData !== null && !stristr($sData,'<![CDATA[')) {
+					$xml .= "><![CDATA[$sData]]></cmd>";
+		} else if ($sData !== null) {
+					$xml .= ">$sData</cmd>";
+		} else {
+					$xml .= "></cmd>";
+		}
 
 		return $xml;
 	}
@@ -566,11 +569,12 @@ 
 	 * @return string serialized XML
 	 */
 	function _buildObjXml($var) {
-		if (gettype($var) == "object") $var = get_object_vars($var);
+		if (gettype($var) == "object") {
+		    $var = get_object_vars($var);
+		}
 		if (!is_array($var)) {
 			return "<![CDATA[$var]]>";
-		}
-		else {
+		} else {
 			$data = "<xjxobj>";
 			foreach ($var as $key => $value) {
 				$data .= "<e>";

Indentation +545 added lines, -545 removed lines

@@ -1,38 +1,38 @@ 
 <?php
 /**
- * xajaxResponse.inc.php :: xajax XML response class
- *
- * xajax version 0.2.4
- * copyright (c) 2005 by Jared White & J. Max Wilson
- * http://www.xajaxproject.org
- *
- * xajax is an open source PHP class library for easily creating powerful
- * PHP-driven, web-based Ajax Applications. Using xajax, you can asynchronously
- * call PHP functions and update the content of your your webpage without
- * reloading the page.
- *
- * xajax is released under the terms of the LGPL license
- * http://www.gnu.org/copyleft/lesser.html#SEC3
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @package chamilo.include.xajax
- * @version $Id: xajaxResponse.inc.php,v 1.1 2006/07/21 15:29:46 elixir_inter Exp $
- * @copyright Copyright (c) 2005-2006  by Jared White & J. Max Wilson
- * @license http://www.gnu.org/copyleft/lesser.html#SEC3 LGPL License
- */
+     * xajaxResponse.inc.php :: xajax XML response class
+     *
+     * xajax version 0.2.4
+     * copyright (c) 2005 by Jared White & J. Max Wilson
+     * http://www.xajaxproject.org
+     *
+     * xajax is an open source PHP class library for easily creating powerful
+     * PHP-driven, web-based Ajax Applications. Using xajax, you can asynchronously
+     * call PHP functions and update the content of your your webpage without
+     * reloading the page.
+     *
+     * xajax is released under the terms of the LGPL license
+     * http://www.gnu.org/copyleft/lesser.html#SEC3
+     *
+     * This library is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU Lesser General Public
+     * License as published by the Free Software Foundation; either
+     * version 2.1 of the License, or (at your option) any later version.
+     *
+     * This library is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     * Lesser General Public License for more details.
+     *
+     * You should have received a copy of the GNU Lesser General Public
+     * License along with this library; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     *
+     * @package chamilo.include.xajax
+     * @version $Id: xajaxResponse.inc.php,v 1.1 2006/07/21 15:29:46 elixir_inter Exp $
+     * @copyright Copyright (c) 2005-2006  by Jared White & J. Max Wilson
+     * @license http://www.gnu.org/copyleft/lesser.html#SEC3 LGPL License
+     */
 
 /*
    ----------------------------------------------------------------------------
@@ -67,521 +67,521 @@ 
  */
 class xajaxResponse
 {
-	/**#@+
+    /**#@+
 	 * @access protected
 	 */
-	/**
-	 * @var string internal XML storage
-	 */
-	var $xml;
-	/**
-	 * @var string the encoding type to use
-	 */
-	var $sEncoding;
-	/**
-	 * @var boolean if special characters in the XML should be converted to
-	 *              entities
-	 */
-	var $bOutputEntities;
-
-	/**#@-*/
-
-	/**
-	 * The constructor's main job is to set the character encoding for the
-	 * response.
-	 *
-	 * <i>Note:</i> to change the character encoding for all of the
-	 * responses, set the XAJAX_DEFAULT_ENCODING constant before you
-	 * instantiate xajax.
-	 *
-	 * @param string  contains the character encoding string to use
-	 * @param boolean lets you set if you want special characters in the output
-	 *                converted to HTML entities
-	 *
-	 */
-	function xajaxResponse($sEncoding=XAJAX_DEFAULT_CHAR_ENCODING, $bOutputEntities=false)
-	{
-		$this->setCharEncoding($sEncoding);
-		$this->bOutputEntities = $bOutputEntities;
-	}
-
-	/**
-	 * Sets the character encoding for the response based on $sEncoding, which
-	 * is a string containing the character encoding to use. You don't need to
-	 * use this method normally, since the character encoding for the response
-	 * gets set automatically based on the XAJAX_DEFAULT_CHAR_ENCODING
-	 * constant.
-	 *
-	 * @param string
-	 */
-	function setCharEncoding($sEncoding)
-	{
-		$this->sEncoding = $sEncoding;
-	}
-
-	/**
-	 * Tells the response object to convert special characters to HTML entities
-	 * automatically (only works if the mb_string extension is available).
-	 */
-	function outputEntitiesOn()
-	{
-		$this->bOutputEntities = true;
-	}
-
-	/**
-	 * Tells the response object to output special characters intact. (default
-	 * behavior)
-	 */
-	function outputEntitiesOff()
-	{
-		$this->bOutputEntities = false;
-	}
-
-	/**
-	 * Adds a confirm commands command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addConfirmCommands(1, "Do you want to preview the new data?");</kbd>
-	 *
-	 * @param integer the number of commands to skip if the user presses
-	 *                Cancel in the browsers's confirm dialog
-	 * @param string  the message to show in the browser's confirm dialog
-	 */
-	function addConfirmCommands($iCmdNumber, $sMessage)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"cc","t"=>$iCmdNumber),$sMessage);
-	}
-
-	/**
-	 * Adds an assign command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addAssign("contentDiv", "innerHTML", "Some Text");</kbd>
-	 *
-	 * @param string contains the id of an HTML element
-	 * @param string the part of the element you wish to modify ("innerHTML",
-	 *               "value", etc.)
-	 * @param string the data you want to set the attribute to
-	 */
-	function addAssign($sTarget,$sAttribute,$sData)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"as","t"=>$sTarget,"p"=>$sAttribute),$sData);
-	}
-
-	/**
-	 * Adds an append command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addAppend("contentDiv", "innerHTML", "Some New Text");</kbd>
-	 *
-	 * @param string contains the id of an HTML element
-	 * @param string the part of the element you wish to modify ("innerHTML",
-	 *               "value", etc.)
-	 * @param string the data you want to append to the end of the attribute
-	 */
-	function addAppend($sTarget,$sAttribute,$sData)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ap","t"=>$sTarget,"p"=>$sAttribute),$sData);
-	}
-
-	/**
-	 * Adds an prepend command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addPrepend("contentDiv", "innerHTML", "Some Starting Text");</kbd>
-	 *
-	 * @param string contains the id of an HTML element
-	 * @param string the part of the element you wish to modify ("innerHTML",
-	 *               "value", etc.)
-	 * @param string the data you want to prepend to the beginning of the
-	 *               attribute
-	 */
-	function addPrepend($sTarget,$sAttribute,$sData)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"pp","t"=>$sTarget,"p"=>$sAttribute),$sData);
-	}
-
-	/**
-	 * Adds a replace command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addReplace("contentDiv", "innerHTML", "text", "<b>text</b>");</kbd>
-	 *
-	 * @param string contains the id of an HTML element
-	 * @param string the part of the element you wish to modify ("innerHTML",
-	 *               "value", etc.)
-	 * @param string the string to search for
-	 * @param string the string to replace the search string when found in the
-	 *               attribute
-	 */
-	function addReplace($sTarget,$sAttribute,$sSearch,$sData)
-	{
-		$sDta = "<s><![CDATA[$sSearch]]></s><r><![CDATA[$sData]]></r>";
-		$this->xml .= $this->_cmdXML(array("n"=>"rp","t"=>$sTarget,"p"=>$sAttribute),$sDta);
-	}
-
-	/**
-	 * Adds a clear command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addClear("contentDiv", "innerHTML");</kbd>
-	 *
-	 * @param string contains the id of an HTML element
-	 * @param string the part of the element you wish to clear ("innerHTML",
-	 *               "value", etc.)
-	 */
-	function addClear($sTarget,$sAttribute)
-	{
-		$this->addAssign($sTarget,$sAttribute,'');
-	}
-
-	/**
-	 * Adds an alert command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addAlert("This is important information");</kbd>
-	 *
-	 * @param string the text to be displayed in the Javascript alert box
-	 */
-	function addAlert($sMsg)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"al"),$sMsg);
-	}
-
-	/**
-	 * Uses the addScript() method to add a Javascript redirect to another URL.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addRedirect("http://www.xajaxproject.org");</kbd>
-	 *
-	 * @param string the URL to redirect the client browser to
-	 */
-	function addRedirect($sURL)
-	{
-		//we need to parse the query part so that the values are rawurlencode()'ed
-		//can't just use parse_url() cos we could be dealing with a relative URL which
-		//  parse_url() can't deal with.
-		$queryStart = strpos($sURL, '?', strrpos($sURL, '/'));
-		if ($queryStart !== FALSE)
-		{
-			$queryStart++;
-			$queryEnd = strpos($sURL, '#', $queryStart);
-			if ($queryEnd === FALSE)
-				$queryEnd = strlen($sURL);
-			$queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
+    /**
+     * @var string internal XML storage
+     */
+    var $xml;
+    /**
+     * @var string the encoding type to use
+     */
+    var $sEncoding;
+    /**
+     * @var boolean if special characters in the XML should be converted to
+     *              entities
+     */
+    var $bOutputEntities;
+
+    /**#@-*/
+
+    /**
+     * The constructor's main job is to set the character encoding for the
+     * response.
+     *
+     * <i>Note:</i> to change the character encoding for all of the
+     * responses, set the XAJAX_DEFAULT_ENCODING constant before you
+     * instantiate xajax.
+     *
+     * @param string  contains the character encoding string to use
+     * @param boolean lets you set if you want special characters in the output
+     *                converted to HTML entities
+     *
+     */
+    function xajaxResponse($sEncoding=XAJAX_DEFAULT_CHAR_ENCODING, $bOutputEntities=false)
+    {
+        $this->setCharEncoding($sEncoding);
+        $this->bOutputEntities = $bOutputEntities;
+    }
+
+    /**
+     * Sets the character encoding for the response based on $sEncoding, which
+     * is a string containing the character encoding to use. You don't need to
+     * use this method normally, since the character encoding for the response
+     * gets set automatically based on the XAJAX_DEFAULT_CHAR_ENCODING
+     * constant.
+     *
+     * @param string
+     */
+    function setCharEncoding($sEncoding)
+    {
+        $this->sEncoding = $sEncoding;
+    }
+
+    /**
+     * Tells the response object to convert special characters to HTML entities
+     * automatically (only works if the mb_string extension is available).
+     */
+    function outputEntitiesOn()
+    {
+        $this->bOutputEntities = true;
+    }
+
+    /**
+     * Tells the response object to output special characters intact. (default
+     * behavior)
+     */
+    function outputEntitiesOff()
+    {
+        $this->bOutputEntities = false;
+    }
+
+    /**
+     * Adds a confirm commands command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addConfirmCommands(1, "Do you want to preview the new data?");</kbd>
+     *
+     * @param integer the number of commands to skip if the user presses
+     *                Cancel in the browsers's confirm dialog
+     * @param string  the message to show in the browser's confirm dialog
+     */
+    function addConfirmCommands($iCmdNumber, $sMessage)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"cc","t"=>$iCmdNumber),$sMessage);
+    }
+
+    /**
+     * Adds an assign command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addAssign("contentDiv", "innerHTML", "Some Text");</kbd>
+     *
+     * @param string contains the id of an HTML element
+     * @param string the part of the element you wish to modify ("innerHTML",
+     *               "value", etc.)
+     * @param string the data you want to set the attribute to
+     */
+    function addAssign($sTarget,$sAttribute,$sData)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"as","t"=>$sTarget,"p"=>$sAttribute),$sData);
+    }
+
+    /**
+     * Adds an append command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addAppend("contentDiv", "innerHTML", "Some New Text");</kbd>
+     *
+     * @param string contains the id of an HTML element
+     * @param string the part of the element you wish to modify ("innerHTML",
+     *               "value", etc.)
+     * @param string the data you want to append to the end of the attribute
+     */
+    function addAppend($sTarget,$sAttribute,$sData)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"ap","t"=>$sTarget,"p"=>$sAttribute),$sData);
+    }
+
+    /**
+     * Adds an prepend command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addPrepend("contentDiv", "innerHTML", "Some Starting Text");</kbd>
+     *
+     * @param string contains the id of an HTML element
+     * @param string the part of the element you wish to modify ("innerHTML",
+     *               "value", etc.)
+     * @param string the data you want to prepend to the beginning of the
+     *               attribute
+     */
+    function addPrepend($sTarget,$sAttribute,$sData)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"pp","t"=>$sTarget,"p"=>$sAttribute),$sData);
+    }
+
+    /**
+     * Adds a replace command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addReplace("contentDiv", "innerHTML", "text", "<b>text</b>");</kbd>
+     *
+     * @param string contains the id of an HTML element
+     * @param string the part of the element you wish to modify ("innerHTML",
+     *               "value", etc.)
+     * @param string the string to search for
+     * @param string the string to replace the search string when found in the
+     *               attribute
+     */
+    function addReplace($sTarget,$sAttribute,$sSearch,$sData)
+    {
+        $sDta = "<s><![CDATA[$sSearch]]></s><r><![CDATA[$sData]]></r>";
+        $this->xml .= $this->_cmdXML(array("n"=>"rp","t"=>$sTarget,"p"=>$sAttribute),$sDta);
+    }
+
+    /**
+     * Adds a clear command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addClear("contentDiv", "innerHTML");</kbd>
+     *
+     * @param string contains the id of an HTML element
+     * @param string the part of the element you wish to clear ("innerHTML",
+     *               "value", etc.)
+     */
+    function addClear($sTarget,$sAttribute)
+    {
+        $this->addAssign($sTarget,$sAttribute,'');
+    }
+
+    /**
+     * Adds an alert command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addAlert("This is important information");</kbd>
+     *
+     * @param string the text to be displayed in the Javascript alert box
+     */
+    function addAlert($sMsg)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"al"),$sMsg);
+    }
+
+    /**
+     * Uses the addScript() method to add a Javascript redirect to another URL.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addRedirect("http://www.xajaxproject.org");</kbd>
+     *
+     * @param string the URL to redirect the client browser to
+     */
+    function addRedirect($sURL)
+    {
+        //we need to parse the query part so that the values are rawurlencode()'ed
+        //can't just use parse_url() cos we could be dealing with a relative URL which
+        //  parse_url() can't deal with.
+        $queryStart = strpos($sURL, '?', strrpos($sURL, '/'));
+        if ($queryStart !== FALSE)
+        {
+            $queryStart++;
+            $queryEnd = strpos($sURL, '#', $queryStart);
+            if ($queryEnd === FALSE)
+                $queryEnd = strlen($sURL);
+            $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
             $queryParts = array();
-			parse_str($queryPart, $queryParts);
-			$newQueryPart = "";
-			foreach($queryParts as $key => $value)
-			{
-				$newQueryPart .= rawurlencode($key).'='.rawurlencode($value).ini_get('arg_separator.output');
-			}
-			$sURL = str_replace($queryPart, $newQueryPart, $sURL);
-		}
-		$this->addScript('window.location = "'.$sURL.'";');
-	}
-
-	/**
-	 * Adds a Javascript command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addScript("var x = prompt('get some text');");</kbd>
-	 *
-	 * @param string contains Javascript code to be executed
-	 */
-	function addScript($sJS)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"js"),$sJS);
-	}
-
-	/**
-	 * Adds a Javascript function call command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addScriptCall("myJSFunction", "arg 1", "arg 2", 12345);</kbd>
-	 *
-	 * @param string $sFunc the name of a Javascript function
-	 * @param mixed $args,... optional arguments to pass to the Javascript function
-	 */
-	function addScriptCall() {
-		$arguments = func_get_args();
-		$sFunc = array_shift($arguments);
-		$sData = $this->_buildObjXml($arguments);
-		$this->xml .= $this->_cmdXML(array("n"=>"jc","t"=>$sFunc),$sData);
-	}
-
-	/**
-	 * Adds a remove element command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addRemove("Div2");</kbd>
-	 *
-	 * @param string contains the id of an HTML element to be removed
-	 */
-	function addRemove($sTarget)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"rm","t"=>$sTarget),'');
-	}
-
-	/**
-	 * Adds a create element command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addCreate("parentDiv", "h3", "myid");</kbd>
-	 *
-	 * @param string contains the id of an HTML element to to which the new
-	 *               element will be appended.
-	 * @param string the tag to be added
-	 * @param string the id to be assigned to the new element
-	 * @param string deprecated, use the addCreateInput() method instead
-	 */
-	function addCreate($sParent, $sTag, $sId, $sType="")
-	{
-		if ($sType)
-		{
-			trigger_error("The \$sType parameter of addCreate has been deprecated.  Use the addCreateInput() method instead.", E_USER_WARNING);
-			return;
-		}
-		$this->xml .= $this->_cmdXML(array("n"=>"ce","t"=>$sParent,"p"=>$sId),$sTag);
-	}
-
-	/**
-	 * Adds a insert element command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addInsert("childDiv", "h3", "myid");</kbd>
-	 *
-	 * @param string contains the id of the child before which the new element
-	 *               will be inserted
-	 * @param string the tag to be added
-	 * @param string the id to be assigned to the new element
-	 */
-	function addInsert($sBefore, $sTag, $sId)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ie","t"=>$sBefore,"p"=>$sId),$sTag);
-	}
-
-	/**
-	 * Adds a insert element command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addInsertAfter("childDiv", "h3", "myid");</kbd>
-	 *
-	 * @param string contains the id of the child after which the new element
-	 *               will be inserted
-	 * @param string the tag to be added
-	 * @param string the id to be assigned to the new element
-	 */
-	function addInsertAfter($sAfter, $sTag, $sId)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ia","t"=>$sAfter,"p"=>$sId),$sTag);
-	}
-
-	/**
-	 * Adds a create input command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addCreateInput("form1", "text", "username", "input1");</kbd>
-	 *
-	 * @param string contains the id of an HTML element to which the new input
-	 *               will be appended
-	 * @param string the type of input to be created (text, radio, checkbox,
-	 *               etc.)
-	 * @param string the name to be assigned to the new input and the variable
-	 *               name when it is submitted
-	 * @param string the id to be assigned to the new input
-	 */
-	function addCreateInput($sParent, $sType, $sName, $sId)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ci","t"=>$sParent,"p"=>$sId,"c"=>$sType),$sName);
-	}
-
-	/**
-	 * Adds an insert input command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addInsertInput("input5", "text", "username", "input1");</kbd>
-	 *
-	 * @param string contains the id of the child before which the new element
-	 *               will be inserted
-	 * @param string the type of input to be created (text, radio, checkbox,
-	 *               etc.)
-	 * @param string the name to be assigned to the new input and the variable
-	 *               name when it is submitted
-	 * @param string the id to be assigned to the new input
-	 */
-	function addInsertInput($sBefore, $sType, $sName, $sId)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ii","t"=>$sBefore,"p"=>$sId,"c"=>$sType),$sName);
-	}
-
-	/**
-	 * Adds an insert input command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addInsertInputAfter("input7", "text", "email", "input2");</kbd>
-	 *
-	 * @param string contains the id of the child after which the new element
-	 *               will be inserted
-	 * @param string the type of input to be created (text, radio, checkbox,
-	 *               etc.)
-	 * @param string the name to be assigned to the new input and the variable
-	 *               name when it is submitted
-	 * @param string the id to be assigned to the new input
-	 */
-	function addInsertInputAfter($sAfter, $sType, $sName, $sId)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"iia","t"=>$sAfter,"p"=>$sId,"c"=>$sType),$sName);
-	}
-
-	/**
-	 * Adds an event command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addEvent("contentDiv", "onclick", "alert(\'Hello World\');");</kbd>
-	 *
-	 * @param string contains the id of an HTML element
-	 * @param string the event you wish to set ("onclick", "onmouseover", etc.)
-	 * @param string the Javascript string you want the event to invoke
-	 */
-	function addEvent($sTarget,$sEvent,$sScript)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ev","t"=>$sTarget,"p"=>$sEvent),$sScript);
-	}
-
-	/**
-	 * Adds a handler command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addHandler("contentDiv", "onclick", "content_click");</kbd>
-	 *
-	 * @param string contains the id of an HTML element
-	 * @param string the event you wish to set ("onclick", "onmouseover", etc.)
-	 * @param string the name of a Javascript function that will handle the
-	 *               event. Multiple handlers can be added for the same event
-	 */
-	function addHandler($sTarget,$sEvent,$sHandler)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"ah","t"=>$sTarget,"p"=>$sEvent),$sHandler);
-	}
-
-	/**
-	 * Adds a remove handler command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addRemoveHandler("contentDiv", "onclick", "content_click");</kbd>
-	 *
-	 * @param string contains the id of an HTML element
-	 * @param string the event you wish to remove ("onclick", "onmouseover",
-	 *               etc.)
-	 * @param string the name of a Javascript handler function that you want to
-	 *               remove
-	 */
-	function addRemoveHandler($sTarget,$sEvent,$sHandler)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"rh","t"=>$sTarget,"p"=>$sEvent),$sHandler);
-	}
-
-	/**
-	 * Adds an include script command message to the XML response.
-	 *
-	 * <i>Usage:</i> <kbd>$objResponse->addIncludeScript("functions.js");</kbd>
-	 *
-	 * @param string URL of the Javascript file to include
-	 */
-	function addIncludeScript($sFileName)
-	{
-		$this->xml .= $this->_cmdXML(array("n"=>"in"),$sFileName);
-	}
-
-	/**
-	 * Returns the XML to be returned from your function to the xajax processor
-	 * on your page. Since xajax 0.2, you can also return an xajaxResponse
-	 * object from your function directly, and xajax will automatically request
-	 * the XML using this method call.
-	 *
-	 * <i>Usage:</i> <kbd>return $objResponse->getXML();</kbd>
-	 *
-	 * @return string response XML data
-	 */
-	function getXML()
-	{
-		$sXML = "<?xml version=\"1.0\"";
-		if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0)
-			$sXML .= " encoding=\"".$this->sEncoding."\"";
-		$sXML .= " ?"."><xjx>" . $this->xml . "</xjx>";
-
-		return $sXML;
-	}
-
-	/**
-	 * Adds the commands of the provided response XML output to this response
-	 * object
-	 *
-	 * <i>Usage:</i>
-	 * <code>$r1 = $objResponse1->getXML();
-	 * $objResponse2->loadXML($r1);
-	 * return $objResponse2->getXML();</code>
-	 *
-	 * @param string the response XML (returned from a getXML() method) to add
-	 *               to the end of this response object
-	 */
-	function loadXML($mXML)
-	{
-		if (is_a($mXML, "xajaxResponse")) {
-			$mXML = $mXML->getXML();
-		}
-		$sNewXML = "";
-		$iStartPos = strpos($mXML, "<xjx>") + 5;
-		$sNewXML = substr($mXML, $iStartPos);
-		$iEndPos = strpos($sNewXML, "</xjx>");
-		$sNewXML = substr($sNewXML, 0, $iEndPos);
-		$this->xml .= $sNewXML;
-	}
-
-	/**
-	 * Generates XML from command data
-	 *
-	 * @access private
-	 * @param array associative array of attributes
-	 * @param string data
-	 * @return string XML command
-	 */
-	function _cmdXML($aAttributes, $sData)
-	{
-		if ($this->bOutputEntities) {
-			// An adaptation for the Dokeos LMS, 22-AUG-2009.
-			if (function_exists('api_convert_encoding')) {
-				$sData = call_user_func_array('api_convert_encoding', array(&$sData, 'HTML-ENTITIES', $this->sEncoding));
-			}
-			//if (function_exists('mb_convert_encoding')) {
-			elseif (function_exists('mb_convert_encoding')) {
-			//
-				$sData = call_user_func_array('mb_convert_encoding', array(&$sData, 'HTML-ENTITIES', $this->sEncoding));
-			}
-			else {
-				trigger_error("The xajax XML response output could not be converted to HTML entities because the mb_convert_encoding function is not available", E_USER_NOTICE);
-			}
-		}
-		$xml = "<cmd";
-		foreach($aAttributes as $sAttribute => $sValue)
-			$xml .= " $sAttribute=\"$sValue\"";
-		if ($sData !== null && !stristr($sData,'<![CDATA['))
-			$xml .= "><![CDATA[$sData]]></cmd>";
-		else if ($sData !== null)
-			$xml .= ">$sData</cmd>";
-		else
-			$xml .= "></cmd>";
-
-		return $xml;
-	}
-
-	/**
-	 * Recursively serializes a data structure in XML so it can be sent to
-	 * the client. It could be thought of as the opposite of
-	 * {@link xajax::_parseObjXml()}.
-	 *
-	 * @access private
-	 * @param mixed data structure to serialize to XML
-	 * @return string serialized XML
-	 */
-	function _buildObjXml($var) {
-		if (gettype($var) == "object") $var = get_object_vars($var);
-		if (!is_array($var)) {
-			return "<![CDATA[$var]]>";
-		}
-		else {
-			$data = "<xjxobj>";
-			foreach ($var as $key => $value) {
-				$data .= "<e>";
-				$data .= "<k>" . htmlspecialchars($key) . "</k>";
-				$data .= "<v>" . $this->_buildObjXml($value) . "</v>";
-				$data .= "</e>";
-			}
-			$data .= "</xjxobj>";
-			return $data;
-		}
-	}
+            parse_str($queryPart, $queryParts);
+            $newQueryPart = "";
+            foreach($queryParts as $key => $value)
+            {
+                $newQueryPart .= rawurlencode($key).'='.rawurlencode($value).ini_get('arg_separator.output');
+            }
+            $sURL = str_replace($queryPart, $newQueryPart, $sURL);
+        }
+        $this->addScript('window.location = "'.$sURL.'";');
+    }
+
+    /**
+     * Adds a Javascript command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addScript("var x = prompt('get some text');");</kbd>
+     *
+     * @param string contains Javascript code to be executed
+     */
+    function addScript($sJS)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"js"),$sJS);
+    }
+
+    /**
+     * Adds a Javascript function call command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addScriptCall("myJSFunction", "arg 1", "arg 2", 12345);</kbd>
+     *
+     * @param string $sFunc the name of a Javascript function
+     * @param mixed $args,... optional arguments to pass to the Javascript function
+     */
+    function addScriptCall() {
+        $arguments = func_get_args();
+        $sFunc = array_shift($arguments);
+        $sData = $this->_buildObjXml($arguments);
+        $this->xml .= $this->_cmdXML(array("n"=>"jc","t"=>$sFunc),$sData);
+    }
+
+    /**
+     * Adds a remove element command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addRemove("Div2");</kbd>
+     *
+     * @param string contains the id of an HTML element to be removed
+     */
+    function addRemove($sTarget)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"rm","t"=>$sTarget),'');
+    }
+
+    /**
+     * Adds a create element command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addCreate("parentDiv", "h3", "myid");</kbd>
+     *
+     * @param string contains the id of an HTML element to to which the new
+     *               element will be appended.
+     * @param string the tag to be added
+     * @param string the id to be assigned to the new element
+     * @param string deprecated, use the addCreateInput() method instead
+     */
+    function addCreate($sParent, $sTag, $sId, $sType="")
+    {
+        if ($sType)
+        {
+            trigger_error("The \$sType parameter of addCreate has been deprecated.  Use the addCreateInput() method instead.", E_USER_WARNING);
+            return;
+        }
+        $this->xml .= $this->_cmdXML(array("n"=>"ce","t"=>$sParent,"p"=>$sId),$sTag);
+    }
+
+    /**
+     * Adds a insert element command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addInsert("childDiv", "h3", "myid");</kbd>
+     *
+     * @param string contains the id of the child before which the new element
+     *               will be inserted
+     * @param string the tag to be added
+     * @param string the id to be assigned to the new element
+     */
+    function addInsert($sBefore, $sTag, $sId)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"ie","t"=>$sBefore,"p"=>$sId),$sTag);
+    }
+
+    /**
+     * Adds a insert element command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addInsertAfter("childDiv", "h3", "myid");</kbd>
+     *
+     * @param string contains the id of the child after which the new element
+     *               will be inserted
+     * @param string the tag to be added
+     * @param string the id to be assigned to the new element
+     */
+    function addInsertAfter($sAfter, $sTag, $sId)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"ia","t"=>$sAfter,"p"=>$sId),$sTag);
+    }
+
+    /**
+     * Adds a create input command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addCreateInput("form1", "text", "username", "input1");</kbd>
+     *
+     * @param string contains the id of an HTML element to which the new input
+     *               will be appended
+     * @param string the type of input to be created (text, radio, checkbox,
+     *               etc.)
+     * @param string the name to be assigned to the new input and the variable
+     *               name when it is submitted
+     * @param string the id to be assigned to the new input
+     */
+    function addCreateInput($sParent, $sType, $sName, $sId)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"ci","t"=>$sParent,"p"=>$sId,"c"=>$sType),$sName);
+    }
+
+    /**
+     * Adds an insert input command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addInsertInput("input5", "text", "username", "input1");</kbd>
+     *
+     * @param string contains the id of the child before which the new element
+     *               will be inserted
+     * @param string the type of input to be created (text, radio, checkbox,
+     *               etc.)
+     * @param string the name to be assigned to the new input and the variable
+     *               name when it is submitted
+     * @param string the id to be assigned to the new input
+     */
+    function addInsertInput($sBefore, $sType, $sName, $sId)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"ii","t"=>$sBefore,"p"=>$sId,"c"=>$sType),$sName);
+    }
+
+    /**
+     * Adds an insert input command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addInsertInputAfter("input7", "text", "email", "input2");</kbd>
+     *
+     * @param string contains the id of the child after which the new element
+     *               will be inserted
+     * @param string the type of input to be created (text, radio, checkbox,
+     *               etc.)
+     * @param string the name to be assigned to the new input and the variable
+     *               name when it is submitted
+     * @param string the id to be assigned to the new input
+     */
+    function addInsertInputAfter($sAfter, $sType, $sName, $sId)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"iia","t"=>$sAfter,"p"=>$sId,"c"=>$sType),$sName);
+    }
+
+    /**
+     * Adds an event command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addEvent("contentDiv", "onclick", "alert(\'Hello World\');");</kbd>
+     *
+     * @param string contains the id of an HTML element
+     * @param string the event you wish to set ("onclick", "onmouseover", etc.)
+     * @param string the Javascript string you want the event to invoke
+     */
+    function addEvent($sTarget,$sEvent,$sScript)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"ev","t"=>$sTarget,"p"=>$sEvent),$sScript);
+    }
+
+    /**
+     * Adds a handler command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addHandler("contentDiv", "onclick", "content_click");</kbd>
+     *
+     * @param string contains the id of an HTML element
+     * @param string the event you wish to set ("onclick", "onmouseover", etc.)
+     * @param string the name of a Javascript function that will handle the
+     *               event. Multiple handlers can be added for the same event
+     */
+    function addHandler($sTarget,$sEvent,$sHandler)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"ah","t"=>$sTarget,"p"=>$sEvent),$sHandler);
+    }
+
+    /**
+     * Adds a remove handler command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addRemoveHandler("contentDiv", "onclick", "content_click");</kbd>
+     *
+     * @param string contains the id of an HTML element
+     * @param string the event you wish to remove ("onclick", "onmouseover",
+     *               etc.)
+     * @param string the name of a Javascript handler function that you want to
+     *               remove
+     */
+    function addRemoveHandler($sTarget,$sEvent,$sHandler)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"rh","t"=>$sTarget,"p"=>$sEvent),$sHandler);
+    }
+
+    /**
+     * Adds an include script command message to the XML response.
+     *
+     * <i>Usage:</i> <kbd>$objResponse->addIncludeScript("functions.js");</kbd>
+     *
+     * @param string URL of the Javascript file to include
+     */
+    function addIncludeScript($sFileName)
+    {
+        $this->xml .= $this->_cmdXML(array("n"=>"in"),$sFileName);
+    }
+
+    /**
+     * Returns the XML to be returned from your function to the xajax processor
+     * on your page. Since xajax 0.2, you can also return an xajaxResponse
+     * object from your function directly, and xajax will automatically request
+     * the XML using this method call.
+     *
+     * <i>Usage:</i> <kbd>return $objResponse->getXML();</kbd>
+     *
+     * @return string response XML data
+     */
+    function getXML()
+    {
+        $sXML = "<?xml version=\"1.0\"";
+        if ($this->sEncoding && strlen(trim($this->sEncoding)) > 0)
+            $sXML .= " encoding=\"".$this->sEncoding."\"";
+        $sXML .= " ?"."><xjx>" . $this->xml . "</xjx>";
+
+        return $sXML;
+    }
+
+    /**
+     * Adds the commands of the provided response XML output to this response
+     * object
+     *
+     * <i>Usage:</i>
+     * <code>$r1 = $objResponse1->getXML();
+     * $objResponse2->loadXML($r1);
+     * return $objResponse2->getXML();</code>
+     *
+     * @param string the response XML (returned from a getXML() method) to add
+     *               to the end of this response object
+     */
+    function loadXML($mXML)
+    {
+        if (is_a($mXML, "xajaxResponse")) {
+            $mXML = $mXML->getXML();
+        }
+        $sNewXML = "";
+        $iStartPos = strpos($mXML, "<xjx>") + 5;
+        $sNewXML = substr($mXML, $iStartPos);
+        $iEndPos = strpos($sNewXML, "</xjx>");
+        $sNewXML = substr($sNewXML, 0, $iEndPos);
+        $this->xml .= $sNewXML;
+    }
+
+    /**
+     * Generates XML from command data
+     *
+     * @access private
+     * @param array associative array of attributes
+     * @param string data
+     * @return string XML command
+     */
+    function _cmdXML($aAttributes, $sData)
+    {
+        if ($this->bOutputEntities) {
+            // An adaptation for the Dokeos LMS, 22-AUG-2009.
+            if (function_exists('api_convert_encoding')) {
+                $sData = call_user_func_array('api_convert_encoding', array(&$sData, 'HTML-ENTITIES', $this->sEncoding));
+            }
+            //if (function_exists('mb_convert_encoding')) {
+            elseif (function_exists('mb_convert_encoding')) {
+            //
+                $sData = call_user_func_array('mb_convert_encoding', array(&$sData, 'HTML-ENTITIES', $this->sEncoding));
+            }
+            else {
+                trigger_error("The xajax XML response output could not be converted to HTML entities because the mb_convert_encoding function is not available", E_USER_NOTICE);
+            }
+        }
+        $xml = "<cmd";
+        foreach($aAttributes as $sAttribute => $sValue)
+            $xml .= " $sAttribute=\"$sValue\"";
+        if ($sData !== null && !stristr($sData,'<![CDATA['))
+            $xml .= "><![CDATA[$sData]]></cmd>";
+        else if ($sData !== null)
+            $xml .= ">$sData</cmd>";
+        else
+            $xml .= "></cmd>";
+
+        return $xml;
+    }
+
+    /**
+     * Recursively serializes a data structure in XML so it can be sent to
+     * the client. It could be thought of as the opposite of
+     * {@link xajax::_parseObjXml()}.
+     *
+     * @access private
+     * @param mixed data structure to serialize to XML
+     * @return string serialized XML
+     */
+    function _buildObjXml($var) {
+        if (gettype($var) == "object") $var = get_object_vars($var);
+        if (!is_array($var)) {
+            return "<![CDATA[$var]]>";
+        }
+        else {
+            $data = "<xjxobj>";
+            foreach ($var as $key => $value) {
+                $data .= "<e>";
+                $data .= "<k>" . htmlspecialchars($key) . "</k>";
+                $data .= "<v>" . $this->_buildObjXml($value) . "</v>";
+                $data .= "</e>";
+            }
+            $data .= "</xjxobj>";
+            return $data;
+        }
+    }
 
 }// end class xajaxResponse
 ?>

main/inc/lib/zombie/zombie_report.class.php

Doc Comments +3 added lines

@@ -121,6 +121,9 @@
         return $form->isSubmitted() == false || $form->validate();
     }
 
+    /**
+     * @param string $format
+     */
     function get_ceiling($format = null)
     {
         $result = Request::get('ceiling');

Spacing +2 added lines, -2 removed lines

@@ -167,7 +167,7 @@ 
         }
 
         $action = $this->get_action();
-        $f = array($this, 'action_' . $action);
+        $f = array($this, 'action_'.$action);
         if (is_callable($f)) {
             return call_user_func($f, $ids);
         }
@@ -292,7 +292,7 @@ 
             $text = get_lang('No');
         }
 
-        $result = Display::return_icon($image . '.png', $text);
+        $result = Display::return_icon($image.'.png', $text);
         return $result;
     }
 

main/install/install.lib.php

Doc Comments +14 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
  * This function return the value of a php.ini setting if not "" or if exists,
  * otherwise return false
  * @param   string  $phpSetting The name of a PHP setting
- * @return  mixed   The value of the setting, or false if not found
+ * @return  string|false   The value of the setting, or false if not found
  */
 function checkPhpSettingExists($phpSetting)
 {
@@ -1268,6 +1268,10 @@ 
  * @param   string  Extra notice (to show on the right side)
  * @param   boolean Whether to display in update mode
  * @param   string  Additional attribute for the <tr> element
+ * @param string $installType
+ * @param string $parameterName
+ * @param string $formFieldName
+ * @param string $extra_notice
  * @return  void    Direct output
  */
 function displayDatabaseParameter(
@@ -1481,6 +1485,11 @@ 
 
     <?php
 }
+/**
+ * @param string $content
+ * @param string $title
+ * @param string $id
+ */
 function panel($content = null, $title = null, $id = null, $style = null) {
     $html = '';
     if (empty($style)) {
@@ -1837,8 +1846,8 @@ 
 }
 
 /**
- * @param $current_value
- * @param $wanted_value
+ * @param string $current_value
+ * @param string $wanted_value
  * @return string
  */
 function compare_setting_values($current_value, $wanted_value)
@@ -1855,8 +1864,8 @@ 
 }
 
 /**
- * @param $course_dir
- * @param $course_attempt_name
+ * @param string $course_dir
+ * @param string $course_attempt_name
  * @param string $file
  * @return bool
  */

Indentation +10 added lines, -10 removed lines

@@ -1498,14 +1498,14 @@ 
     return $html;
 }
 /**
- * Displays a parameter in a table row.
- * Used by the display_configuration_settings_form function.
- * @param string $installType
- * @param string $parameterName
- * @param string $formFieldName
- * @param string $parameterValue
- * @param string $displayWhenUpdate
- */
+     * Displays a parameter in a table row.
+     * Used by the display_configuration_settings_form function.
+     * @param string $installType
+     * @param string $parameterName
+     * @param string $formFieldName
+     * @param string $parameterValue
+     * @param string $displayWhenUpdate
+     */
 function display_configuration_parameter(
     $installType,
     $parameterName,
@@ -1682,7 +1682,7 @@ 
         $html .= '<label class="checkbox-inline">
                         <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
                     </label>';
-         $html .= '<label class="checkbox-inline">
+            $html .= '<label class="checkbox-inline">
                     <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
                 </label>';
         $html .= '</div>';
@@ -1716,7 +1716,7 @@ 
     </div>';
 
     echo panel($html, get_lang('Platform'), 'platform');
- ?>
+    ?>
     <div class='form-group'>
         <div class="col-sm-6">
             <button type="submit" class="btn btn-default pull-right" name="step3" value="&lt; <?php echo get_lang('Previous'); ?>" ><em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?></button>

Spacing +56 added lines, -56 removed lines

@@ -396,7 +396,7 @@ 
     if (!is_array($result)) {
         $result = array();
         $exceptions = array('.', '..', 'CVS', '.svn');
-        $search       = array('_latin',   '_unicode',   '_corporate',   '_org'  , '_KM',   '_');
+        $search       = array('_latin', '_unicode', '_corporate', '_org', '_KM', '_');
         $replace_with = array(' (Latin)', ' (unicode)', ' (corporate)', ' (org)', ' (KM)', ' ');
         $dirname = api_get_path(SYS_LANG_PATH);
         $handle = opendir($dirname);
@@ -430,9 +430,9 @@ 
     if ($handle = opendir($directory)) {
         while (false !== ($file = readdir($handle))) {
             if ($file != "." && $file != "..") {
-                if (is_dir($directory. "/" . $file)) {
-                    $array_items = array_merge($array_items, my_directory_to_array($directory. '/' . $file));
-                    $file = $directory . "/" . $file;
+                if (is_dir($directory."/".$file)) {
+                    $array_items = array_merge($array_items, my_directory_to_array($directory.'/'.$file));
+                    $file = $directory."/".$file;
                     $array_items[] = preg_replace("/\/\//si", '/', $file);
                 }
             }
@@ -636,7 +636,7 @@ 
     <h2><?php get_lang('WelcomeToTheChamiloInstaller'); ?></h2>
     <div class="RequirementHeading">
         <h2><?php echo display_step_sequence(); ?>
-            <?php echo get_lang('InstallationLanguage');?>
+            <?php echo get_lang('InstallationLanguage'); ?>
         </h2>
         <p><?php echo get_lang('PleaseSelectInstallationProcessLanguage'); ?>:</p>
         <form id="lang_form" method="post" action="<?php echo api_get_self(); ?>">
@@ -709,7 +709,7 @@ 
     if (phpversion() < REQUIRED_PHP_VERSION) {
         echo '<strong><font color="red">'.get_lang('PHPVersionError').'</font></strong>';
     } else {
-        echo '<strong><font color="green">'.get_lang('PHPVersionOK'). ' '.phpversion().'</font></strong>';
+        echo '<strong><font color="green">'.get_lang('PHPVersionOK').' '.phpversion().'</font></strong>';
     }
     echo '</td>
             </tr>
@@ -881,7 +881,7 @@ 
             if ($file_course_test_was_created == true) {
                 break;
             }
-            $r = @touch($course_dir.'/test.php',$perm);
+            $r = @touch($course_dir.'/test.php', $perm);
             if ($r === true) {
                 $fil_perm_verified = $perm;
                 if (check_course_script_interpretation($course_dir, $course_attempt_name, 'test.php')) {
@@ -1137,7 +1137,7 @@ 
 function get_contact_registration_form()
 {
 
-    $html ='
+    $html = '
    <form class="form-horizontal">
     <div class="panel panel-default">
     <div class="panel-body">
@@ -1234,7 +1234,7 @@ 
             <div class="col-sm-9">
                 <div class="radio">
                     <label>
-                        <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes') . '
+                        <input type="radio" name="financial_decision" id="financial_decision1" value="1" checked /> ' . get_lang('Yes').'
                     </label>
                 </div>
                 <div class="radio">
@@ -1293,8 +1293,8 @@ 
             echo '<input type="hidden" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />';
             echo api_htmlentities($parameterValue);
         } else {
-            echo '<div class="col-sm-5"><input type="' . $inputType . '" class="form-control" size="' . DATABASE_FORM_FIELD_DISPLAY_LENGTH . '" maxlength="' . $maxLength . '" name="' . $formFieldName . '" id="' . $formFieldName . '" value="' . api_htmlentities($parameterValue) . '" />' . "</div>";
-            echo '<div class="col-sm-3">' . $extra_notice . '</div>';
+            echo '<div class="col-sm-5"><input type="'.$inputType.'" class="form-control" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxLength.'" name="'.$formFieldName.'" id="'.$formFieldName.'" value="'.api_htmlentities($parameterValue).'" />'."</div>";
+            echo '<div class="col-sm-3">'.$extra_notice.'</div>';
         }
 
     }
@@ -1330,12 +1330,12 @@ 
         $dbNameForm = $_configuration['main_database'];
         $dbPortForm = isset($_configuration['db_port']) ? $_configuration['db_port'] : '';
 
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
         echo '<div class="RequirementContent">';
         echo get_lang('DBSettingUpgradeIntro');
         echo '</div>';
     } else {
-        echo '<div class="RequirementHeading"><h2>' . display_step_sequence() .get_lang('DBSetting') . '</h2></div>';
+        echo '<div class="RequirementHeading"><h2>'.display_step_sequence().get_lang('DBSetting').'</h2></div>';
         echo '<div class="RequirementContent">';
         echo get_lang('DBSettingIntro');
         echo '</div>';
@@ -1345,12 +1345,12 @@ 
         <div class="panel-body">
         <div class="form-group">
             <label class="col-sm-4"><?php echo get_lang('DBHost'); ?> </label>
-            <?php if ($installType == 'update'){ ?>
+            <?php if ($installType == 'update') { ?>
             <div class="col-sm-5">
                 <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else { ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
             </div>
@@ -1359,12 +1359,12 @@ 
         </div>
         <div class="form-group">
             <label class="col-sm-4"><?php echo get_lang('DBPort'); ?> </label>
-            <?php if ($installType == 'update'){ ?>
+            <?php if ($installType == 'update') { ?>
             <div class="col-sm-5">
                 <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else { ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" />
             </div>
@@ -1390,7 +1390,7 @@ 
             <?php
             //Database Name fix replace weird chars
             if ($installType != INSTALL_TYPE_UPDATE) {
-                $dbNameForm = str_replace(array('-','*', '$', ' ', '.'), '', $dbNameForm);
+                $dbNameForm = str_replace(array('-', '*', '$', ' ', '.'), '', $dbNameForm);
             }
 
             displayDatabaseParameter(
@@ -1489,7 +1489,7 @@ 
     if (!empty($title)) {
         $panelTitle = Display::div($title, array('class' => 'panel-heading'));
         $panelBody = Display::div($content, array('class' => 'panel-body'));
-        $panelParent = Display::div($panelTitle . $panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
+        $panelParent = Display::div($panelTitle.$panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
     } else {
         $panelBody = Display::div($html, array('class' => 'panel-body'));
         $panelParent = Display::div($panelBody, array('id' => $id, 'class' => 'panel panel-'.$style));
@@ -1514,9 +1514,9 @@ 
     $displayWhenUpdate = 'true'
 ) {
     $html = '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">' . $parameterName . '</label>';
+    $html .= '<label class="col-sm-6 control-label">'.$parameterName.'</label>';
     if ($installType == INSTALL_TYPE_UPDATE && $displayWhenUpdate) {
-        $html .= '<input type="hidden" name="' . $formFieldName . '" value="'. api_htmlentities($parameterValue, ENT_QUOTES). '" />' . $parameterValue;
+        $html .= '<input type="hidden" name="'.$formFieldName.'" value="'.api_htmlentities($parameterValue, ENT_QUOTES).'" />'.$parameterValue;
     } else {
         $html .= '<div class="col-sm-6"><input class="form-control" type="text" size="'.FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.MAX_FORM_FIELD_LENGTH.'" name="'.$formFieldName.'" value="'.api_htmlentities($parameterValue, ENT_QUOTES).'" />'."</div>";
     }
@@ -1563,7 +1563,7 @@ 
         $languageForm = $_SESSION['install_language'];
     }
     echo '<div class="RequirementHeading">';
-    echo "<h2>" . display_step_sequence() . get_lang("CfgSetting") . "</h2>";
+    echo "<h2>".display_step_sequence().get_lang("CfgSetting")."</h2>";
     echo '</div>';
 
     echo '<p>'.get_lang('ConfigSettingsInfo').' <strong>app/config/configuration.php</strong></p>';
@@ -1581,14 +1581,14 @@ 
 
     // Parameters 3 and 4: administrator's names
 
-    $html .=  display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
-    $html .=  display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
+    $html .= display_configuration_parameter($installType, get_lang('AdminFirstName'), 'adminFirstName', $adminFirstName);
+    $html .= display_configuration_parameter($installType, get_lang('AdminLastName'), 'adminLastName', $adminLastName);
 
     //Parameter 3: administrator's email
-    $html .=  display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
+    $html .= display_configuration_parameter($installType, get_lang('AdminEmail'), 'emailForm', $emailForm);
 
     //Parameter 6: administrator's telephone
-    $html .=  display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
+    $html .= display_configuration_parameter($installType, get_lang('AdminPhone'), 'adminPhoneForm', $adminPhoneForm);
 
 
     echo panel($html, get_lang('Administrator'), 'administrator');
@@ -1607,12 +1607,12 @@ 
         $html .= display_language_selection_box('languageForm', $languageForm);
         $html .= '</div>';
     }
-    $html.= "</div>";
+    $html .= "</div>";
 
 
     //Second parameter: Chamilo URL
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL') .get_lang('ThisFieldIsRequired').'</label>';
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('ChamiloURL').get_lang('ThisFieldIsRequired').'</label>';
 
 
 
@@ -1636,34 +1636,34 @@ 
 
 
     $html .= '<div class="form-group">
-            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass") . '</label>
+            <label class="col-sm-6 control-label">' . get_lang("EncryptMethodUserPass").'</label>
         <div class="col-sm-6">';
     if ($installType == 'update') {
-        $html .= '<input type="hidden" name="encryptPassForm" value="'. $encryptPassForm .'" />'. $encryptPassForm;
+        $html .= '<input type="hidden" name="encryptPassForm" value="'.$encryptPassForm.'" />'.$encryptPassForm;
     } else {
 
         $html .= '<div class="checkbox">
                     <label>
-                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ':'') .'/> bcrypt
+                        <input  type="radio" name="encryptPassForm" value="bcrypt" id="encryptPass1" '. ($encryptPassForm == 'bcrypt' ? 'checked="checked" ' : '').'/> bcrypt
                     </label>';
 
         $html .= '<label>
-                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ':'') .'/> sha1
+                        <input  type="radio" name="encryptPassForm" value="sha1" id="encryptPass1" '. ($encryptPassForm == 'sha1' ? 'checked="checked" ' : '').'/> sha1
                     </label>';
 
         $html .= '<label>
-                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ':'') .'/> md5
+                        <input type="radio" name="encryptPassForm" value="md5" id="encryptPass0" '. ($encryptPassForm == 'md5' ? 'checked="checked" ' : '').'/> md5
                     </label>';
 
         $html .= '<label>
-                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ':'') .'/>'. get_lang('None').'
+                        <input type="radio" name="encryptPassForm" value="none" id="encryptPass2" '. ($encryptPassForm == 'none' ? 'checked="checked" ' : '').'/>'.get_lang('None').'
                     </label>';
         $html .= '</div>';
     }
     $html .= '</div></div>';
 
     $html .= '<div class="form-group">
-            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg') . '</label>
+            <label class="col-sm-6 control-label">' . get_lang('AllowSelfReg').'</label>
             <div class="col-sm-6">';
     if ($installType == 'update') {
         if ($allowSelfReg == 'true') {
@@ -1673,17 +1673,17 @@ 
         } else {
             $label = get_lang('AfterApproval');
         }
-        $html .= '<input type="hidden" name="allowSelfReg" value="'. $allowSelfReg .'" />'. $label;
+        $html .= '<input type="hidden" name="allowSelfReg" value="'.$allowSelfReg.'" />'.$label;
     } else {
         $html .= '<div class="control-group">';
         $html .= '<label class="checkbox-inline">
-                        <input type="radio" name="allowSelfReg" value="1" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '') . ' /> '. get_lang('Yes') .'
+                        <input type="radio" name="allowSelfReg" value="1" id="allowSelfReg1" '. ($allowSelfReg == 'true' ? 'checked="checked" ' : '').' /> '.get_lang('Yes').'
                     </label>';
         $html .= '<label class="checkbox-inline">
-                        <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ') .' /> '. get_lang('No') .'
+                        <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'false' ? '' : 'checked="checked" ').' /> '.get_lang('No').'
                     </label>';
          $html .= '<label class="checkbox-inline">
-                    <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ') .' /> '. get_lang('AfterApproval') .'
+                    <input type="radio" name="allowSelfReg" value="0" id="allowSelfReg0" '. ($allowSelfReg == 'approval' ? '' : 'checked="checked" ').' /> '.get_lang('AfterApproval').'
                 </label>';
         $html .= '</div>';
     }
@@ -1691,7 +1691,7 @@ 
     $html .= '</div>';
 
     $html .= '<div class="form-group">';
-    $html .= '<label class="col-sm-6 control-label">'. get_lang('AllowSelfRegProf') .'</label>
+    $html .= '<label class="col-sm-6 control-label">'.get_lang('AllowSelfRegProf').'</label>
         <div class="col-sm-6">';
     if ($installType == 'update') {
         if ($allowSelfRegProf == 'true') {
@@ -1699,16 +1699,16 @@ 
         } else {
             $label = get_lang('No');
         }
-        $html .= '<input type="hidden" name="allowSelfRegProf" value="'. $allowSelfRegProf.'" />'. $label;
+        $html .= '<input type="hidden" name="allowSelfRegProf" value="'.$allowSelfRegProf.'" />'.$label;
     } else {
         $html .= '<div class="control-group">
                 <label class="checkbox-inline">
-                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '') .'/>
-                ' . get_lang('Yes') .'
+                    <input type="radio" name="allowSelfRegProf" value="1" id="allowSelfRegProf1" '. ($allowSelfRegProf ? 'checked="checked" ' : '').'/>
+                ' . get_lang('Yes').'
                 </label>';
         $html .= '<label class="checkbox-inline">
-                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ') .' />
-                   '. get_lang('No') .'
+                    <input type="radio" name="allowSelfRegProf" value="0" id="allowSelfRegProf0" '. ($allowSelfRegProf ? '' : 'checked="checked" ').' />
+                   '. get_lang('No').'
                 </label>';
         $html .= '</div>';
     }
@@ -1773,7 +1773,7 @@ 
         "Macedonia", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", "Mexico", "Micronesia", "Moldova", "Monaco", "Mongolia", "Morocco", "Mozambique", "Myanmar",
         "Namibia", "Nauru", "Nepa", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Norway",
         "Oman",
-        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland","Portugal",
+        "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland", "Portugal",
         "Qatar",
         "Romania", "Russia", "Rwanda",
         "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia and Montenegro", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "Spain", "Sri Lanka", "Sudan", "Suriname", "Swaziland", "Sweden", "Switzerland", "Syria",
@@ -1820,11 +1820,11 @@ 
     $permissions_for_new_directories = isset($_SESSION['permissions_for_new_directories']) ? $_SESSION['permissions_for_new_directories'] : 0770;
     $permissions_for_new_files = isset($_SESSION['permissions_for_new_files']) ? $_SESSION['permissions_for_new_files'] : 0660;
     // use decoct() to store as string
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_directories) . "'
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_directories)."'
               WHERE variable  = 'permissions_for_new_directories'";
     Database::query($sql);
 
-    $sql = "UPDATE $table SET selected_value = '0" . decoct($permissions_for_new_files) . "' WHERE variable  = 'permissions_for_new_files'";
+    $sql = "UPDATE $table SET selected_value = '0".decoct($permissions_for_new_files)."' WHERE variable  = 'permissions_for_new_files'";
     Database::query($sql);
 
     if (isset($_SESSION['permissions_for_new_directories'])) {
@@ -1844,8 +1844,8 @@ 
 function compare_setting_values($current_value, $wanted_value)
 {
     $current_value_string = $current_value;
-    $current_value = (float)$current_value;
-    $wanted_value = (float)$wanted_value;
+    $current_value = (float) $current_value;
+    $wanted_value = (float) $wanted_value;
 
     if ($current_value >= $wanted_value) {
         return Display::label($current_value_string, 'success');
@@ -1896,7 +1896,7 @@ 
 
                     fwrite($fp, $out);
                     while (!feof($fp)) {
-                        $result = str_replace("\r\n", '',fgets($fp, 128));
+                        $result = str_replace("\r\n", '', fgets($fp, 128));
                         if (!empty($result) && $result == '123') {
                             $output = true;
                         }
@@ -1919,7 +1919,7 @@ 
                     curl_setopt($ch, CURLOPT_URL, $url);
                     //curl_setopt($ch, CURLOPT_TIMEOUT, 30);
                     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-                    $result = curl_exec ($ch);
+                    $result = curl_exec($ch);
                     if (!empty($result) && $result == '123') {
                         $output = true;
                     }
@@ -2679,12 +2679,12 @@ 
         $adminPhoneForm,
         '', //$picture_uri = '',
         PLATFORM_AUTH_SOURCE,
-        '',//$expirationDate,
+        '', //$expirationDate,
         1,
         0,
         null,
         '',
-        false,  //$send_mail = false,
+        false, //$send_mail = false,
         true //$isAdmin = false
     );
 
@@ -2706,7 +2706,7 @@ 
         0,
         null,
         '',
-        false,  //$send_mail = false,
+        false, //$send_mail = false,
         false //$isAdmin = false
     );
 
@@ -2772,7 +2772,7 @@ 
                 SET selected_value = '".$param->selected_value."'
                 WHERE variable = '".$param->variable."'";
         if (!empty($param->subkey)) {
-            $sql .= " AND subkey='" . $param->subkey . "'";
+            $sql .= " AND subkey='".$param->subkey."'";
         }
         Database::query($sql);
     }

Braces +15 added lines, -8 removed lines

@@ -973,8 +973,7 @@ 
                 <?php echo get_lang('Error'); ?>!<br />
                 Chamilo <?php echo implode('|', $update_from_version_8).' '.get_lang('HasNotBeenFoundInThatDir'); ?>.
             </div>
-        <?php }
-        else {
+        <?php } else {
             echo '<br />';
         }
         ?>
@@ -1060,14 +1059,19 @@ 
         <button type="submit" name="step1" class="btn btn-default" onclick="javascript: window.location='index.php'; return false;" value="<?php echo get_lang('Previous'); ?>" >
             <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?>
         </button>
-        <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) echo 'disabled="disabled"'; ?> >
+        <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) {
+    echo 'disabled="disabled"';
+}
+?> >
             <em class="fa fa-forward"> </em> <?php echo get_lang('NewInstallation'); ?>
         </button>
         <input type="hidden" name="is_executable" id="is_executable" value="-" />
         <?php
         // Real code
         echo '<button type="submit" class="btn btn-default" name="step2_update_8" value="Upgrade from Chamilo 1.9.x"';
-        if ($error) echo ' disabled="disabled"';
+        if ($error) {
+            echo ' disabled="disabled"';
+        }
         echo ' ><em class="fa fa-forward"> </em> '.get_lang('UpgradeFromLMS19x').'</button>';
 
         echo '</p>';
@@ -1350,7 +1354,7 @@ 
                 <input type="hidden" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" /><?php echo $dbHostForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else{ ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbHostForm" value="<?php echo htmlentities($dbHostForm); ?>" />
             </div>
@@ -1364,7 +1368,7 @@ 
                 <input type="hidden" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" /><?php echo $dbPortForm; ?>
             </div>
             <div class="col-sm-3"></div>
-            <?php }else{ ?>
+            <?php } else{ ?>
             <div class="col-sm-5">
                 <input type="text" class="form-control" size="25" maxlength="50" name="dbPortForm" value="<?php echo htmlentities($dbPortForm); ?>" />
             </div>
@@ -1449,12 +1453,15 @@ 
 
             </div>
 
-        <?php else: ?>
+        <?php else {
+    : ?>
 
             <?php echo $database_exists_text ?>
             <div id="db_status" style="float:left;" class="alert alert-danger">
                 <div style="float:left;">
-                    <?php echo get_lang('FailedConectionDatabase'); ?></strong>
+                    <?php echo get_lang('FailedConectionDatabase');
+}
+?></strong>
                 </div>
             </div>
 

main/newscorm/aicc.class.php

Doc Comments +5 added lines, -3 removed lines

@@ -216,7 +216,7 @@ 
     /**
      * Import the aicc object (as a result from the parse_config_files function) into the database structure
      * @param	string	$course_code
-     * @return	bool	Returns -1 on error
+     * @return	false|null	Returns -1 on error
      */
     public function import_aicc($course_code)
     {
@@ -780,7 +780,8 @@ 
      * Static function to parse AICC ini files.
      * Based on work by sinedeo at gmail dot com published on php.net (parse_ini_file()).
      * @param	string	File path
-     * @return	array	Structured array
+     * @param string $f
+     * @return	string	Structured array
      */
     function parse_ini_file_quotes_safe($f) {
         $null = '';
@@ -831,7 +832,7 @@ 
      * Based on work by sinedeo at gmail dot com published on php.net (parse_ini_file()).
      * @param		string	INI File string
      * @param		array	List of names of sections that should be considered as containing only hard string data (no variables), provided in lower case
-     * @return	array	Structured array
+     * @return	string	Structured array
      */
     function parse_ini_string_quotes_safe($s, $pure_strings = array()) {
         $null = '';
@@ -894,6 +895,7 @@ 
      * @param	string	CSV delimiter
      * @param	string	CSV enclosure
      * @param	boolean	Might one field name happen more than once on the same line? (then split by comma in the values)
+     * @param string $f
      * @return array	Simple structured array
      */
     function parse_csv_file($f, $delim = ',', $enclosure = '"', $multiples = false) {

Indentation +7 added lines, -7 removed lines

@@ -320,12 +320,12 @@ 
         }
     }
 
-     /**
-     * Intermediate to import_package only to allow import from local zip files
-     * @param	string	Path to the zip file, from the dokeos sys root
-     * @param	string	Current path (optional)
-     * @return string	Absolute path to the AICC description files or empty string on error
-     */
+        /**
+         * Intermediate to import_package only to allow import from local zip files
+         * @param	string	Path to the zip file, from the dokeos sys root
+         * @param	string	Current path (optional)
+         * @return string	Absolute path to the AICC description files or empty string on error
+         */
     function import_local_package($file_path, $current_dir = '')
     {
         // TODO: Prepare info as given by the $_FILES[''] vector.
@@ -355,7 +355,7 @@ 
         $current_dir = api_replace_dangerous_char(trim($current_dir)); // Current dir we are in, inside scorm/
         if ($this->debug > 0) { error_log('New LP - aicc::import_package() - Current_dir = '.$current_dir, 0); }
 
-         //$uploaded_filename = $_FILES['userFile']['name'];
+            //$uploaded_filename = $_FILES['userFile']['name'];
         // Get the name of the zip file without the extension.
         if ($this->debug > 0) { error_log('New LP - aicc::import_package() - Received zip file name: '.$zip_file_path, 0); }
         $file_info = pathinfo($zip_file_name);

Spacing +27 added lines, -27 removed lines

@@ -12,7 +12,7 @@ 
 class aicc extends learnpath
 {
     public $config = array();
-    public $config_basename = '';	// The configuration files might be multiple and might have
+    public $config_basename = ''; // The configuration files might be multiple and might have
                                     // funny names. We need to keep the name of that file while we
                                     // install the content.
     public $config_files = array();
@@ -32,9 +32,9 @@ 
     public $cstlist = array();
     public $orelist = array();
 
-    public $subdir = '';	// Path between the scorm/ directory and the config files e.g. maritime_nav/maritime_nav. This is the path that will be used in the lp_path when importing a package.
-    public $zipname = '';	// Keeps the zipfile safe for the object's life so that we can use it if there is no title available.
-    public $lastzipnameindex = 0;	// Keeps an index of the number of uses of the zipname so far.
+    public $subdir = ''; // Path between the scorm/ directory and the config files e.g. maritime_nav/maritime_nav. This is the path that will be used in the lp_path when importing a package.
+    public $zipname = ''; // Keeps the zipfile safe for the object's life so that we can use it if there is no title available.
+    public $lastzipnameindex = 0; // Keeps an index of the number of uses of the zipname so far.
     public $config_encoding = 'ISO-8859-1';
     public $debug = 0;
 
@@ -132,7 +132,7 @@ 
             //echo '<pre>des:'.print_r($des_params, true).'</pre>';
             if ($this->debug > 1) { error_log('New LP - In aicc::parse_config_files() - '.$des_file.' has been parsed', 0); }
             // Distribute des params into the aicc object.
-            foreach ($des_params as $des){
+            foreach ($des_params as $des) {
                 // One AU in AICC is equivalent to one SCO in SCORM (scormItem class).
                 $oDes = new aiccResource('config', $des);
                 $this->deslist[$oDes->identifier] = $oDes;
@@ -242,12 +242,12 @@ 
 
         $this->config_encoding = "ISO-8859-1"; // TODO: We may apply detection for this value, see the function api_detect_encoding().
 
-        $sql = "INSERT INTO $new_lp (c_id, lp_type, name, ref, description, path, force_commit, default_view_mod, default_encoding, js_lib, content_maker,display_order)" .
-                "VALUES " .
-                "($course_id, 3, '".$this->course_title."', '".$this->course_id."','".$this->course_description."'," .
-                "'".$this->subdir."', 0, 'embedded', '".$this->config_encoding."'," .
+        $sql = "INSERT INTO $new_lp (c_id, lp_type, name, ref, description, path, force_commit, default_view_mod, default_encoding, js_lib, content_maker,display_order)".
+                "VALUES ".
+                "($course_id, 3, '".$this->course_title."', '".$this->course_id."','".$this->course_description."',".
+                "'".$this->subdir."', 0, 'embedded', '".$this->config_encoding."',".
                 "'aicc_api.php','".$this->course_creator."',$dsp)";
-        if ($this->debug > 2) { error_log('New LP - In import_aicc(), inserting path: '. $sql, 0); }
+        if ($this->debug > 2) { error_log('New LP - In import_aicc(), inserting path: '.$sql, 0); }
         Database::query($sql);
         $lp_id = Database::insert_id();
 
@@ -276,7 +276,7 @@ 
 
         $previous = 0;
         foreach ($this->aulist as $identifier => $dummy) {
-            $oAu =& $this->aulist[$identifier];
+            $oAu = & $this->aulist[$identifier];
             //echo "Item ".$oAu->identifier;
             $field_add = '';
             $value_add = '';
@@ -294,12 +294,12 @@ 
             $parent = 0; // TODO: Deal with the parent.
             $previous = 0;
             $prereq = $oAu->prereq_string;
-            $sql_item = "INSERT INTO $new_lp_item (c_id, lp_id,item_type,ref,title, path,min_score,max_score, $field_add parent_item_id,previous_item_id,next_item_id, prerequisite,display_order,parameters) " .
-                    "VALUES " .
-                    "($course_id, $lp_id, 'au','".$oAu->identifier."','".$title."'," .
-                    "'$path',0,100, $value_add" .
-                    "$parent, $previous, 0, " .
-                    "'$prereq', 0,'".(!empty($oAu->parameters)?Database::escape_string($oAu->parameters):'')."'" .
+            $sql_item = "INSERT INTO $new_lp_item (c_id, lp_id,item_type,ref,title, path,min_score,max_score, $field_add parent_item_id,previous_item_id,next_item_id, prerequisite,display_order,parameters) ".
+                    "VALUES ".
+                    "($course_id, $lp_id, 'au','".$oAu->identifier."','".$title."',".
+                    "'$path',0,100, $value_add".
+                    "$parent, $previous, 0, ".
+                    "'$prereq', 0,'".(!empty($oAu->parameters) ? Database::escape_string($oAu->parameters) : '')."'".
                     ")";
             Database::query($sql_item);
             if ($this->debug > 1) { error_log('New LP - In aicc::import_aicc() - inserting item : '.$sql_item.' : ', 0); }
@@ -350,7 +350,7 @@ 
         $zip_file_name = $zip_file_info['name'];
 
         if ($this->debug > 0) { error_log('New LP - aicc::import_package() - Zip file path = '.$zip_file_path.', zip file name = '.$zip_file_name, 0); }
-        $course_rel_dir  = api_get_course_path().'/scorm'; // Scorm dir web path starting from /courses
+        $course_rel_dir = api_get_course_path().'/scorm'; // Scorm dir web path starting from /courses
         $course_sys_dir = api_get_path(SYS_COURSE_PATH).$course_rel_dir; // The absolute system path of this course.
         $current_dir = api_replace_dangerous_char(trim($current_dir)); // Current dir we are in, inside scorm/
         if ($this->debug > 0) { error_log('New LP - aicc::import_package() - Current_dir = '.$current_dir, 0); }
@@ -367,7 +367,7 @@ 
         if ($this->debug > 0) { error_log('New LP - aicc::import_package() - Base file name is : '.$file_base_name, 0); }
         $new_dir = api_replace_dangerous_char(trim($file_base_name));
         $this->subdir = $new_dir;
-        if($this->debug > 0) { error_log('New LP - aicc::import_package() - Subdir is first set to : '.$this->subdir, 0); }
+        if ($this->debug > 0) { error_log('New LP - aicc::import_package() - Subdir is first set to : '.$this->subdir, 0); }
 
         /*
         if (check_name_exist($course_sys_dir.$current_dir.'/'.$new_dir)) {
@@ -413,7 +413,7 @@ 
                         $subdir_isset = true;
                     } else {
                         if (!$subdir_isset) {
-                            if (preg_match('?^.*/aicc$?i',dirname($thisContent['filename']))) {
+                            if (preg_match('?^.*/aicc$?i', dirname($thisContent['filename']))) {
                                 //echo "Cutting subdir<br/>";
                                 $this->subdir .= '/'.substr(dirname($thisContent['filename']), 0, -5);
                             } else {
@@ -516,7 +516,7 @@ 
                         // TODO: RENAMING FILES CAN BE VERY DANGEROUS AICC-WISE, avoid that as much as possible!
                         //$safe_file = api_replace_dangerous_char($file, 'strict');
                         $find_str = array('\\', '.php', '.phtml');
-                        $repl_str = array('/',  '.txt', '.txt');
+                        $repl_str = array('/', '.txt', '.txt');
                         $safe_file = str_replace($find_str, $repl_str, $file);
 
                         if ($safe_file != $file) {
@@ -717,7 +717,7 @@ 
         if ($this->debug > 0) { error_log('In aicc::get_res_path('.$id.') method', 0); }
         $path = '';
         if (isset($this->resources[$id])) {
-            $oRes =& $this->resources[$id];
+            $oRes = & $this->resources[$id];
             $path = @$oRes->get_path();
         }
         return $path;
@@ -733,7 +733,7 @@ 
         if ($this->debug > 0) { error_log('In aicc::get_res_type('.$id.') method', 0); }
         $type = '';
         if (isset($this->resources[$id])) {
-            $oRes =& $this->resources[$id];
+            $oRes = & $this->resources[$id];
             $temptype = $oRes->get_scorm_type();
             if (!empty($temptype)) {
                 $type = $temptype;
@@ -746,7 +746,7 @@ 
      * Gets the default organisation's title
      * @return	string	The organization's title
      */
-    function get_title(){
+    function get_title() {
         if ($this->debug > 0) { error_log('In aicc::get_title() method', 0); }
         $title = '';
         if (isset($this->config['organizations']['default'])) {
@@ -907,7 +907,7 @@ 
             $chr = $data{$i};
             switch ($chr) {
                 case $enclosure:
-                    if ($enclosed && $data{$i+1} == $enclosure) {
+                    if ($enclosed && $data{$i + 1} == $enclosure) {
                         $fldval .= $chr;
                         ++$i; // Skip the next character.
                     } else
@@ -921,7 +921,7 @@ 
                         $fldval .= $chr;
                     break;
                 case "\r":
-                    if (!$enclosed&&$data{$i+1} == "\n")
+                    if (!$enclosed && $data{$i + 1} == "\n")
                         continue;
                 case "\n":
                     if (!$enclosed) {
@@ -932,7 +932,7 @@ 
                         $fldval .= $chr;
                     break;
                 case "\\r":
-                    if (!$enclosed&&$data{$i+1} == "\\n")
+                    if (!$enclosed && $data{$i + 1} == "\\n")
                         continue;
                 case "\\n":
                     if (!$enclosed) {

Braces +24 added lines, -15 removed lines

@@ -459,11 +459,12 @@ 
             }
         }
 
-        if ($package_type == '' || !$mandatory)
-        // && defined('CHECK_FOR_AICC') && CHECK_FOR_AICC)
+        if ($package_type == '' || !$mandatory) {
+                // && defined('CHECK_FOR_AICC') && CHECK_FOR_AICC)
         {
             return api_failure::set_failure('not_aicc_content');
         }
+        }
 
         if (!enough_size($realFileSize, $course_sys_dir, $maxFilledSpace)) {
             return api_failure::set_failure('not_enough_space');
@@ -511,7 +512,9 @@ 
                     if ($file != '.' && $file != '..') {
                         $filetype = 'file';
 
-                        if (is_dir($course_sys_dir.$new_dir.$file)) $filetype = 'folder';
+                        if (is_dir($course_sys_dir.$new_dir.$file)) {
+                            $filetype = 'folder';
+                        }
 
                         // TODO: RENAMING FILES CAN BE VERY DANGEROUS AICC-WISE, avoid that as much as possible!
                         //$safe_file = api_replace_dangerous_char($file, 'strict');
@@ -910,37 +913,43 @@ 
                     if ($enclosed && $data{$i+1} == $enclosure) {
                         $fldval .= $chr;
                         ++$i; // Skip the next character.
-                    } else
-                        $enclosed = !$enclosed;
+                    } else {
+                                            $enclosed = !$enclosed;
+                    }
                     break;
                 case $delim:
                     if (!$enclosed) {
                         $ret_array[$linecount][$fldcount++] = $fldval;
                         $fldval = '';
-                    } else
-                        $fldval .= $chr;
+                    } else {
+                                            $fldval .= $chr;
+                    }
                     break;
                 case "\r":
-                    if (!$enclosed&&$data{$i+1} == "\n")
-                        continue;
+                    if (!$enclosed&&$data{$i+1} == "\n") {
+                                            continue;
+                    }
                 case "\n":
                     if (!$enclosed) {
                         $ret_array[$linecount++][$fldcount] = $fldval;
                         $fldcount = 0;
                         $fldval = '';
-                    } else
-                        $fldval .= $chr;
+                    } else {
+                                            $fldval .= $chr;
+                    }
                     break;
                 case "\\r":
-                    if (!$enclosed&&$data{$i+1} == "\\n")
-                        continue;
+                    if (!$enclosed&&$data{$i+1} == "\\n") {
+                                            continue;
+                    }
                 case "\\n":
                     if (!$enclosed) {
                         $ret_array[$linecount++][$fldcount] = $fldval;
                         $fldcount = 0;
                         $fldval = '';
-                    } else
-                        $fldval .= $chr;
+                    } else {
+                                            $fldval .= $chr;
+                    }
                     break;
                 default:
                     $fldval .= $chr;

main/newscorm/learnpath.class.php

Doc Comments +29 added lines, -24 removed lines

@@ -84,7 +84,7 @@ 
      * @param	string	$course Course code
      * @param	integer	$lp_id
      * @param	integer	$user_id
-     * @return mixed True on success, false on error
+     * @return boolean True on success, false on error
      */
     public function __construct($course, $lp_id, $user_id)
     {
@@ -482,7 +482,8 @@ 
      * @param string $description
      * @param int $prerequisites
      * @param int $max_time_allowed
-     * @return int
+     * @param string $id
+     * @return false|string
      */
     public function add_item(
         $parent,
@@ -1021,7 +1022,7 @@ 
      * @param	array $courseInfo
      * @param	integer	Learnpath ID
      * @param	string	Whether to delete data or keep it (default: 'keep', others: 'remove')
-     * @return	boolean	True on success, false on failure (might change that to return number of elements deleted)
+     * @return	false|null	True on success, false on failure (might change that to return number of elements deleted)
      */
     public function delete($courseInfo = null, $id = null, $delete = 'keep')
     {
@@ -1155,7 +1156,7 @@ 
      * @param	integer	$id Elem ID (0 if first)
      * @param	integer	$remove Whether to remove the resource/data from the
      * system or leave it (default: 'keep', others 'remove')
-     * @return	integer	Number of elements moved
+     * @return	false|null	Number of elements moved
      * @todo implement resource removal
      */
     public function delete_item($id, $remove = 'keep')
@@ -1237,7 +1238,7 @@ 
      * @param   array   $audio The array resulting of the $_FILES[mp3] element
      * @param   int     $max_time_allowed
      * @param   string  $url
-     * @return  boolean True on success, false on error
+     * @return  false|null True on success, false on error
      */
     public function edit_item(
         $id,
@@ -1760,7 +1761,7 @@ 
 
     /**
      * Gets the first element URL.
-     * @return	string	URL to load into the viewer
+     * @return	false|null	URL to load into the viewer
      */
     public function first()
     {
@@ -2276,6 +2277,7 @@ 
      * @param int $student_id
      * @param string Course code (optional)
      * @param int $sessionId
+     * @param string $courseCode
      * @return	bool
      */
     public static function is_lp_visible_for_student(
@@ -2575,7 +2577,7 @@ 
 
     /**
      * Gets the learnpath session id
-     * @return	string	Learnpath theme
+     * @return	integer	Learnpath theme
      */
     public function get_lp_session_id()
     {
@@ -2608,7 +2610,7 @@ 
     /**
      * @param string $size
      * @param string $path_type
-     * @return bool|string
+     * @return string|false
      */
     public function get_preview_image_path($size = null, $path_type = 'web')
     {
@@ -2754,6 +2756,8 @@ 
      * Returns the XML DOM document's node
      * @param	resource	Reference to a list of objects to search for the given ITEM_*
      * @param	string		The identifier to look for
+     * @param DOMNodeList $children
+     * @param string $id
      * @return	mixed		The reference to the element found with that identifier. False if not found
      */
     public function get_scorm_xml_node(& $children, $id)
@@ -3001,7 +3005,7 @@ 
     /**
      * Generate and return the table of contents for this learnpath. The (flat) table returned can be
      * used by get_html_toc() to be ready to display
-     * @return	array	TOC as a table with 4 elements per row: title, link, status and level
+     * @return	boolean	TOC as a table with 4 elements per row: title, link, status and level
      */
     public function get_toc()
     {
@@ -3137,7 +3141,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getChapterTypes()
     {
@@ -4050,7 +4054,7 @@ 
      * Open a resource = initialise all local variables relative to this resource. Depending on the child
      * class, this might be redefined to allow several behaviours depending on the document type.
      * @param integer Resource ID
-     * @return boolean True on success, false otherwise
+     * @return boolean|null True on success, false otherwise
      */
     public function open($id)
     {
@@ -4179,7 +4183,7 @@ 
      * Can be used as abstract
      * @param	integer	$lp_id Learnpath id
      * @param	string	$set_visibility New visibility (v/i - visible/invisible)
-     * @return bool
+     * @return false|null
      */
     public static function toggle_publish($lp_id, $set_visibility = 'v')
     {
@@ -4264,7 +4268,7 @@ 
      * Make sure the results are saved with anoter method. This method should probably be
      * redefined in children classes.
      * To use a similar method  statically, use the create_new_attempt() method
-     * @return string URL to load in the viewer
+     * @return boolean URL to load in the viewer
      */
     public function restart()
     {
@@ -4342,6 +4346,7 @@ 
      * Saves the given item
      * @param	integer	$item_id. Optional (will take from $_REQUEST if null)
      * @param	boolean	$from_outside Save from url params (true) or from current attributes (false). Optional. Defaults to true
+     * @param integer $item_id
      * @return	boolean
      */
     public function save_item($item_id = null, $from_outside = true)
@@ -4839,7 +4844,7 @@ 
 
     /**
      * Sets use_max_score
-     * @param   string  $use_max_score Optional string giving the new location of this learnpath
+     * @param   integer  $use_max_score Optional string giving the new location of this learnpath
      * @return  boolean True on success / False on error
      */
     public function set_use_max_score($use_max_score = 1)
@@ -5240,6 +5245,7 @@ 
      * Register the attempt mode into db thanks to flags prevent_reinit and seriousgame_mode flags
      *
      * @param string 'seriousgame', 'single' or 'multiple'
+     * @param string $mode
      * @return boolean
      * @author ndiechburg <noel@cblue.be>
      **/
@@ -5282,7 +5288,7 @@ 
     /**
      * Switch between multiple attempt, single attempt or serious_game mode (only for scorm)
      *
-     * @return boolean
+     * @return boolean|null
      * @author ndiechburg <noel@cblue.be>
      **/
     public function switch_attempt_mode()
@@ -5473,7 +5479,6 @@ 
     /**
      * Function that creates a html list of learning path items so that we can add audio files to them
      * @author Kevin Van Den Haute
-     * @param int $lp_id
      * @return string
      */
     public function overview()
@@ -5844,7 +5849,7 @@ 
     /**
      * This function builds the action menu
      * @param bool $returnContent
-     * @return void
+     * @return string|null
      */
     public function build_action_menu($returnContent = false)
     {
@@ -6335,7 +6340,7 @@ 
     /**
      * Function that displays a list with al the resources that
      * could be added to the learning path
-     * @return string
+     * @return boolean
      */
     public function display_resources()
     {
@@ -8770,7 +8775,7 @@ 
 
     /**
      * Creates a list with all the student publications in it
-     * @return unknown
+     * @return string
      */
     public function get_student_publications()
     {
@@ -9715,7 +9720,7 @@ 
 
     /**
      * @param int $lp_id
-     * @return bool
+     * @return false|null
      */
     public function scorm_export_to_pdf($lp_id)
     {
@@ -10232,6 +10237,7 @@ 
     }
 
     /**
+     * @param string $courseCode
      * @return \learnpath
      */
     public static function getLpFromSession($courseCode, $lp_id, $user_id)
@@ -10251,7 +10257,7 @@ 
 
     /**
      * @param int $itemId
-     * @return learnpathItem|false
+     * @return string
      */
     public function getItem($itemId)
     {
@@ -10301,7 +10307,6 @@ 
     /**
      * Set whether this is a learning path with the possibility to subscribe
      * users or not
-     * @param int $subscribeUsers (0 = false, 1 = true)
      */
     public function setSubscribeUsers($value)
     {
@@ -10426,7 +10431,7 @@ 
 
     /**
      * Get the item of exercise type (evaluation type)
-     * @return array The final evaluation. Otherwise return false
+     * @return integer The final evaluation. Otherwise return false
      */
     public function getFinalEvaluationItem()
     {
@@ -10650,7 +10655,7 @@ 
     /**
      * Create a forum for this learning path
      * @param type $forumCategoryId
-     * @return int The forum ID if was created. Otherwise return false
+     * @return false|string The forum ID if was created. Otherwise return false
      */
     public function createForum($forumCategoryId)
     {

Spacing +692 added lines, -692 removed lines

@@ -53,7 +53,7 @@ 
     // Percentage progress as saved in the db.
     public $progress_db = '0';
     public $proximity; // Wether the content is distant or local or unknown.
-    public $refs_list = array (); //list of items by ref => db_id. Used only for prerequisites match.
+    public $refs_list = array(); //list of items by ref => db_id. Used only for prerequisites match.
     // !!!This array (refs_list) is built differently depending on the nature of the LP.
     // If SCORM, uses ref, if Chamilo, uses id to keep a unique value.
     public $type; //type of learnpath. Could be 'dokeos', 'scorm', 'scorm2004', 'aicc', ...
@@ -154,7 +154,7 @@ 
                 }
 
                 if ($row['expired_on'] != '0000-00-00 00:00:00') {
-                    $this->expired_on  = $row['expired_on'];
+                    $this->expired_on = $row['expired_on'];
                 }
                 if ($this->type == 2) {
                     if ($row['force_commit'] == 1) {
@@ -198,12 +198,12 @@ 
                 ORDER BY view_count DESC";
         $res = Database::query($sql);
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - querying lp_view: ' . $sql, 0);
+            error_log('New LP - learnpath::__construct() '.__LINE__.' - querying lp_view: '.$sql, 0);
         }
 
         if (Database :: num_rows($res) > 0) {
             if ($this->debug > 2) {
-                error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - Found previous view', 0);
+                error_log('New LP - learnpath::__construct() '.__LINE__.' - Found previous view', 0);
             }
             $row = Database :: fetch_array($res);
             $this->attempt = $row['view_count'];
@@ -213,7 +213,7 @@ 
             $this->lp_view_session_id = $row['session_id'];
         } else if (!api_is_invitee()) {
             if ($this->debug > 2) {
-                error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - NOT Found previous view', 0);
+                error_log('New LP - learnpath::__construct() '.__LINE__.' - NOT Found previous view', 0);
             }
             $this->attempt = 1;
             $params = [
@@ -228,7 +228,7 @@ 
             $this->lp_view_id = Database::insert_id();
 
             if ($this->debug > 2) {
-                error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - inserting new lp_view: ' . $sql, 0);
+                error_log('New LP - learnpath::__construct() '.__LINE__.' - inserting new lp_view: '.$sql, 0);
             }
 
             $sql = "UPDATE $lp_table SET id = iid WHERE iid = ".$this->lp_view_id;
@@ -244,7 +244,7 @@ 
         $res = Database::query($sql);
 
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - query lp items: ' . $sql, 0);
+            error_log('New LP - learnpath::__construct() '.__LINE__.' - query lp items: '.$sql, 0);
             error_log('-- Start while--', 0);
         }
 
@@ -264,8 +264,8 @@ 
                         $this->refs_list[$oItem->ref] = $my_item_id;
                         if ($this->debug > 2) {
                             error_log(
-                                'New LP - learnpath::__construct() - ' .
-                                'aicc object with id ' . $my_item_id .
+                                'New LP - learnpath::__construct() - '.
+                                'aicc object with id '.$my_item_id.
                                 ' set in items[]', 0);
                         }
                     }
@@ -282,19 +282,19 @@ 
 
                         $this->refs_list[$oItem->ref] = $my_item_id;
                         if ($this->debug > 2) {
-                            error_log('New LP - object with id ' . $my_item_id . ' set in items[]', 0);
+                            error_log('New LP - object with id '.$my_item_id.' set in items[]', 0);
                         }
                     }
                     break;
                 case 1:
                 default:
                     if ($this->debug > 2) {
-                        error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - calling learnpathItem', 0);
+                        error_log('New LP - learnpath::__construct() '.__LINE__.' - calling learnpathItem', 0);
                     }
                     $oItem = new learnpathItem($row['id'], $user_id, $course_id, $row);
 
                     if ($this->debug > 2) {
-                        error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - end calling learnpathItem', 0);
+                        error_log('New LP - learnpath::__construct() '.__LINE__.' - end calling learnpathItem', 0);
                     }
                     if (is_object($oItem)) {
                         $my_item_id = $oItem->get_id();
@@ -305,8 +305,8 @@ 
                         $this->refs_list[$my_item_id] = $my_item_id;
                         if ($this->debug > 2) {
                             error_log(
-                                'New LP - learnpath::__construct() ' . __LINE__ .
-                                ' - object with id ' . $my_item_id . ' set in items[]',
+                                'New LP - learnpath::__construct() '.__LINE__.
+                                ' - object with id '.$my_item_id.' set in items[]',
                                 0);
                         }
                     }
@@ -324,13 +324,13 @@ 
                 $this->items[$row['id']]->set_lp_view($this->lp_view_id, $course_id);
                 if ($this->items[$row['id']]->get_type() == TOOL_HOTPOTATOES) {
                     $this->items[$row['id']]->current_start_time = 0;
-                    $this->items[$row['id']]->current_stop_time	= 0;
+                    $this->items[$row['id']]->current_stop_time = 0;
                 }
             }
         }
 
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::__construct() ' . __LINE__ . ' ----- end while ----', 0);
+            error_log('New LP - learnpath::__construct() '.__LINE__.' ----- end while ----', 0);
         }
 
         if (!empty($lp_item_id_list)) {
@@ -422,7 +422,7 @@ 
         // TODO: Define the current item better.
         $this->first();
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::__construct() ' . __LINE__ . ' - End of learnpath constructor for learnpath ' . $this->get_id(), 0);
+            error_log('New LP - learnpath::__construct() '.__LINE__.' - End of learnpath constructor for learnpath '.$this->get_id(), 0);
         }
         return true;
     }
@@ -496,7 +496,7 @@ 
     ) {
         $course_id = $this->course_info['real_id'];
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::add_item(' . $parent . ',' . $previous . ',' . $type . ',' . $id . ',' . $title . ')', 0);
+            error_log('New LP - In learnpath::add_item('.$parent.','.$previous.','.$type.','.$id.','.$title.')', 0);
         }
         if (empty($course_id)) {
             // Sometimes Oogie doesn't catch the course info but sets $this->cc
@@ -516,7 +516,7 @@ 
                 FROM $tbl_lp_item
                 WHERE
                     c_id = $course_id AND
-                    lp_id = " . $this->get_id() . " AND
+                    lp_id = ".$this->get_id()." AND
                     parent_item_id = " . $parent;
 
         $res_count = Database::query($sql);
@@ -526,11 +526,11 @@ 
         if ($num > 0) {
             if ($previous == 0) {
                 $sql = "SELECT id, next_item_id, display_order
-                        FROM " . $tbl_lp_item . "
+                        FROM " . $tbl_lp_item."
                         WHERE
                             c_id = $course_id AND
-                            lp_id = " . $this->get_id() . " AND
-                            parent_item_id = " . $parent . " AND
+                            lp_id = ".$this->get_id()." AND
+                            parent_item_id = " . $parent." AND
                             previous_item_id = 0 OR
                             previous_item_id=" . $parent;
                 $result = Database::query($sql);
@@ -545,7 +545,7 @@ 
 						FROM $tbl_lp_item
                         WHERE
                             c_id = $course_id AND
-                            lp_id = " . $this->get_id() . " AND
+                            lp_id = ".$this->get_id()." AND
                             id = " . $previous;
 
                 $result = Database::query($sql);
@@ -565,8 +565,8 @@ 
         $typeCleaned = Database::escape_string($type);
         if ($type == 'quiz') {
             $sql = 'SELECT SUM(ponderation)
-                    FROM ' . Database :: get_course_table(TABLE_QUIZ_QUESTION) . ' as quiz_question
-                    INNER JOIN  ' . Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION) . ' as quiz_rel_question
+                    FROM ' . Database :: get_course_table(TABLE_QUIZ_QUESTION).' as quiz_question
+                    INNER JOIN  ' . Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION).' as quiz_rel_question
                     ON
                         quiz_question.id = quiz_rel_question.question_id AND
                         quiz_question.c_id = quiz_rel_question.c_id
@@ -612,7 +612,7 @@ 
         $new_item_id = Database::insert($tbl_lp_item, $params);
 
         if ($this->debug > 2) {
-            error_log('New LP - Inserting chapter: ' . $new_item_id, 0);
+            error_log('New LP - Inserting chapter: '.$new_item_id, 0);
         }
 
         if ($new_item_id) {
@@ -629,28 +629,28 @@ 
             Database::query($sql);
 
             // Update all the items after the new item.
-            $sql = "UPDATE " . $tbl_lp_item . "
+            $sql = "UPDATE ".$tbl_lp_item."
                         SET display_order = display_order + 1
                     WHERE
                         c_id = $course_id AND
-                        lp_id = " . $this->get_id() . " AND
-                        id <> " . $new_item_id . " AND
-                        parent_item_id = " . $parent . " AND
+                        lp_id = ".$this->get_id()." AND
+                        id <> " . $new_item_id." AND
+                        parent_item_id = " . $parent." AND
                         display_order > " . $display_order;
             Database::query($sql);
 
             // Update the item that should come after the new item.
-            $sql = "UPDATE " . $tbl_lp_item . "
-                    SET ref = " . $new_item_id . "
-                    WHERE c_id = $course_id AND id = " . $new_item_id;
+            $sql = "UPDATE ".$tbl_lp_item."
+                    SET ref = " . $new_item_id."
+                    WHERE c_id = $course_id AND id = ".$new_item_id;
             Database::query($sql);
 
             // Upload audio.
             if (!empty($_FILES['mp3']['name'])) {
                 // Create the audio folder if it does not exist yet.
-                $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document/';
-                if (!is_dir($filepath . 'audio')) {
-                    mkdir($filepath . 'audio', api_get_permissions_for_new_directories());
+                $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+                if (!is_dir($filepath.'audio')) {
+                    mkdir($filepath.'audio', api_get_permissions_for_new_directories());
                     $audio_id = add_document(
                         $_course,
                         '/audio',
@@ -687,7 +687,7 @@ 
                 $file_path = handle_uploaded_document(
                     $_course,
                     $_FILES['mp3'],
-                    api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document',
+                    api_get_path(SYS_COURSE_PATH).$_course['path'].'/document',
                     '/audio',
                     api_get_user_id(),
                     '',
@@ -703,8 +703,8 @@ 
 
                 // Store the mp3 file in the lp_item table.
                 $sql = "UPDATE $tbl_lp_item SET
-                            audio = '" . Database::escape_string($file) . "'
-                        WHERE id = '" . intval($new_item_id) . "'";
+                            audio = '".Database::escape_string($file)."'
+                        WHERE id = '" . intval($new_item_id)."'";
                 Database::query($sql);
             }
         }
@@ -780,7 +780,7 @@ 
         while (Database :: num_rows($res_name)) {
             // There is already one such name, update the current one a bit.
             $i++;
-            $name = $name . ' - ' . $i;
+            $name = $name.' - '.$i;
             $check_name = "SELECT * FROM $tbl_lp WHERE c_id = $course_id AND name = '$name'";
             $res_name = Database::query($check_name);
         }
@@ -892,7 +892,7 @@ 
                 // if $item points to an object and there is a parent.
                 if ($debug) {
                     error_log(
-                        'Autocompleting parent of item ' . $item . ' "'.$currentItem->get_title().'" (item ' . $parent_id . ' "'.$parent->get_title().'") ',
+                        'Autocompleting parent of item '.$item.' "'.$currentItem->get_title().'" (item '.$parent_id.' "'.$parent->get_title().'") ',
                         0
                     );
                 }
@@ -920,7 +920,7 @@ 
                         if ($childItemId != $item) {
                             if ($debug) {
                                 error_log(
-                                    'Looking at brother #'.$childItemId . ' "' . $childItem->get_title() . '", status is ' . $childItem->get_status(),
+                                    'Looking at brother #'.$childItemId.' "'.$childItem->get_title().'", status is '.$childItem->get_status(),
                                     0
                                 );
                             }
@@ -940,7 +940,7 @@ 
                             } else {
                                 if ($debug > 2) {
                                     error_log(
-                                        'Found one incomplete child of parent #' . $parent_id . ': child #'.$childItemId . ' "' . $childItem->get_title() . '", is ' . $childItem->get_status().' db_item_view_id:#'.$childItem->db_item_view_id,
+                                        'Found one incomplete child of parent #'.$parent_id.': child #'.$childItemId.' "'.$childItem->get_title().'", is '.$childItem->get_status().' db_item_view_id:#'.$childItem->db_item_view_id,
                                         0
                                     );
                                 }
@@ -1045,15 +1045,15 @@ 
         // Delete lp item id.
         foreach ($this->items as $id => $dummy) {
             $sql = "DELETE FROM $lp_item_view
-                    WHERE c_id = $course_id AND lp_item_id = '" . $id . "'";
+                    WHERE c_id = $course_id AND lp_item_id = '".$id."'";
             Database::query($sql);
         }
 
         // Proposed by Christophe (nickname: clefevre)
-        $sql = "DELETE FROM $lp_item WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "DELETE FROM $lp_item WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         Database::query($sql);
 
-        $sql = "DELETE FROM $lp_view WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "DELETE FROM $lp_view WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         Database::query($sql);
 
         self::toggle_publish($this->lp_id, 'i');
@@ -1061,32 +1061,32 @@ 
         if ($this->type == 2 || $this->type == 3) {
             // This is a scorm learning path, delete the files as well.
             $sql = "SELECT path FROM $lp
-                    WHERE c_id = ".$course_id." AND id = " . $this->lp_id;
+                    WHERE c_id = ".$course_id." AND id = ".$this->lp_id;
             $res = Database::query($sql);
             if (Database :: num_rows($res) > 0) {
                 $row = Database :: fetch_array($res);
                 $path = $row['path'];
                 $sql = "SELECT id FROM $lp
-                        WHERE c_id = ".$course_id." AND path = '$path' AND id != " . $this->lp_id;
+                        WHERE c_id = ".$course_id." AND path = '$path' AND id != ".$this->lp_id;
                 $res = Database::query($sql);
                 if (Database :: num_rows($res) > 0) { // Another learning path uses this directory, so don't delete it.
                     if ($this->debug > 2) {
-                        error_log('New LP - In learnpath::delete(), found other LP using path ' . $path . ', keeping directory', 0);
+                        error_log('New LP - In learnpath::delete(), found other LP using path '.$path.', keeping directory', 0);
                     }
                 } else {
                     // No other LP uses that directory, delete it.
-                    $course_rel_dir = api_get_course_path() . '/scorm/'; // scorm dir web path starting from /courses
-                    $course_scorm_dir = api_get_path(SYS_COURSE_PATH) . $course_rel_dir; // The absolute system path for this course.
-                    if ($delete == 'remove' && is_dir($course_scorm_dir . $path) and !empty ($course_scorm_dir)) {
+                    $course_rel_dir = api_get_course_path().'/scorm/'; // scorm dir web path starting from /courses
+                    $course_scorm_dir = api_get_path(SYS_COURSE_PATH).$course_rel_dir; // The absolute system path for this course.
+                    if ($delete == 'remove' && is_dir($course_scorm_dir.$path) and !empty ($course_scorm_dir)) {
                         if ($this->debug > 2) {
-                            error_log('New LP - In learnpath::delete(), found SCORM, deleting directory: ' . $course_scorm_dir . $path, 0);
+                            error_log('New LP - In learnpath::delete(), found SCORM, deleting directory: '.$course_scorm_dir.$path, 0);
                         }
                         // Proposed by Christophe (clefevre).
                         if (strcmp(substr($path, -2), "/.") == 0) {
                             $path = substr($path, 0, -1); // Remove "." at the end.
                         }
                         //exec('rm -rf ' . $course_scorm_dir . $path); // See Bug #5208, this is not OS-portable way.
-                        rmdirr($course_scorm_dir . $path);
+                        rmdirr($course_scorm_dir.$path);
                     }
                 }
             }
@@ -1099,7 +1099,7 @@ 
                 WHERE c_id = ".$course_id." AND (link LIKE '$link%' AND image='scormbuilder.gif')";
         Database::query($sql);
 
-        $sql = "DELETE FROM $lp WHERE c_id = ".$course_id." AND id = " . $this->lp_id;
+        $sql = "DELETE FROM $lp WHERE c_id = ".$course_id." AND id = ".$this->lp_id;
         Database::query($sql);
         // Updates the display order of all lps.
         $this->update_display_order();
@@ -1112,7 +1112,7 @@ 
             api_get_user_id()
         );
 
-        $link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 4 , $id, api_get_session_id());
+        $link_info = GradebookUtils::is_resource_in_course_gradebook(api_get_course_id(), 4, $id, api_get_session_id());
         if ($link_info !== false) {
             GradebookUtils::remove_resource_from_course_gradebook($link_info['id']);
         }
@@ -1132,7 +1132,7 @@ 
     {
         $course_id = $this->course_info['real_id'];
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::delete_children_items(' . $id . ')', 0);
+            error_log('New LP - In learnpath::delete_children_items('.$id.')', 0);
         }
         $num = 0;
         if (empty ($id) || $id != strval(intval($id))) {
@@ -1143,7 +1143,7 @@ 
         $res = Database::query($sql);
         while ($row = Database :: fetch_array($res)) {
             $num += $this->delete_children_items($row['id']);
-            $sql_del = "DELETE FROM $lp_item WHERE c_id = ".$course_id." AND id = " . $row['id'];
+            $sql_del = "DELETE FROM $lp_item WHERE c_id = ".$course_id." AND id = ".$row['id'];
             Database::query($sql_del);
             $num++;
         }
@@ -1184,12 +1184,12 @@ 
         // Delete children items.
         $num = $this->delete_children_items($id);
         if ($this->debug > 2) {
-            error_log('New LP - learnpath::delete_item() - deleted ' . $num . ' children of element ' . $id, 0);
+            error_log('New LP - learnpath::delete_item() - deleted '.$num.' children of element '.$id, 0);
         }
         // Now delete the item.
         $sql_del = "DELETE FROM $lp_item WHERE c_id = $course_id AND id = $id";
         if ($this->debug > 2) {
-            error_log('New LP - Deleting item: ' . $sql_del, 0);
+            error_log('New LP - Deleting item: '.$sql_del, 0);
         }
         Database::query($sql_del);
         // Now update surrounding items.
@@ -1264,15 +1264,15 @@ 
         }
 
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
-        $sql_select = "SELECT * FROM " . $tbl_lp_item . " WHERE c_id = ".$course_id." AND id = " . $id;
+        $sql_select = "SELECT * FROM ".$tbl_lp_item." WHERE c_id = ".$course_id." AND id = ".$id;
         $res_select = Database::query($sql_select);
         $row_select = Database :: fetch_array($res_select);
         $audio_update_sql = '';
         if (is_array($audio) && !empty ($audio['tmp_name']) && $audio['error'] === 0) {
             // Create the audio folder if it does not exist yet.
-            $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document/';
-            if (!is_dir($filepath . 'audio')) {
-                mkdir($filepath . 'audio', api_get_permissions_for_new_directories());
+            $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+            if (!is_dir($filepath.'audio')) {
+                mkdir($filepath.'audio', api_get_permissions_for_new_directories());
                 $audio_id = add_document(
                     $_course,
                     '/audio',
@@ -1310,11 +1310,11 @@ 
             $pi = pathinfo($audio['name']);
             if ($pi['extension'] == 'mp3') {
                 $c_det = api_get_course_info($this->cc);
-                $bp = api_get_path(SYS_COURSE_PATH) . $c_det['path'] . '/document';
+                $bp = api_get_path(SYS_COURSE_PATH).$c_det['path'].'/document';
                 $path = handle_uploaded_document($c_det, $audio, $bp, '/audio', api_get_user_id(), 0, null, 0, 'rename', false, 0);
                 $path = substr($path, 7);
                 // Update reference in lp_item - audio path is the path from inside de document/audio/ dir.
-                $audio_update_sql = ", audio = '" . Database::escape_string($path) . "' ";
+                $audio_update_sql = ", audio = '".Database::escape_string($path)."' ";
             }
         }
 
@@ -1324,13 +1324,13 @@ 
         // TODO: htmlspecialchars to be checked for encoding related problems.
         if ($same_parent && $same_previous) {
             // Only update title and description.
-            $sql = "UPDATE " . $tbl_lp_item . "
-                    SET title = '" . Database::escape_string($title) . "',
-                        prerequisite = '" . $prerequisites . "',
-                        description = '" . Database::escape_string($description) . "'
-                        " . $audio_update_sql . ",
-                        max_time_allowed = '" . Database::escape_string($max_time_allowed) . "'
-                    WHERE c_id = ".$course_id." AND id = " . $id;
+            $sql = "UPDATE ".$tbl_lp_item."
+                    SET title = '" . Database::escape_string($title)."',
+                        prerequisite = '" . $prerequisites."',
+                        description = '" . Database::escape_string($description)."'
+                        " . $audio_update_sql.",
+                        max_time_allowed = '" . Database::escape_string($max_time_allowed)."'
+                    WHERE c_id = ".$course_id." AND id = ".$id;
             Database::query($sql);
         } else {
             $old_parent = $row_select['parent_item_id'];
@@ -1345,27 +1345,27 @@ 
 
             if ($old_previous != 0) {
                 // Next
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET next_item_id = " . $old_next . "
-                        WHERE c_id = ".$course_id." AND id = " . $old_previous;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET next_item_id = " . $old_next."
+                        WHERE c_id = ".$course_id." AND id = ".$old_previous;
                 Database::query($sql);
             }
 
             if ($old_next != 0) {
                 // Previous
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET previous_item_id = " . $old_previous . "
-                        WHERE c_id = ".$course_id." AND id = " . $old_next;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET previous_item_id = " . $old_previous."
+                        WHERE c_id = ".$course_id." AND id = ".$old_next;
                 Database::query($sql);
             }
 
             // display_order - 1 for every item with a display_order bigger then the display_order of the current item.
-            $sql = "UPDATE " . $tbl_lp_item . "
+            $sql = "UPDATE ".$tbl_lp_item."
                     SET display_order = display_order - 1
                     WHERE
                         c_id = ".$course_id." AND
-                        display_order > " . $old_order . " AND
-                        lp_id = " . $this->lp_id . " AND
+                        display_order > " . $old_order." AND
+                        lp_id = " . $this->lp_id." AND
                         parent_item_id = " . $old_parent;
             Database::query($sql);
             /* END -- virtually remove the current item id */
@@ -1375,11 +1375,11 @@ 
             if ($previous == 0) {
                 // Select the data of the item that should come after the current item.
                 $sql = "SELECT id, display_order
-                        FROM " . $tbl_lp_item . "
+                        FROM " . $tbl_lp_item."
                         WHERE
                             c_id = ".$course_id." AND
-                            lp_id = " . $this->lp_id . " AND
-                            parent_item_id = " . $parent . " AND
+                            lp_id = " . $this->lp_id." AND
+                            parent_item_id = " . $parent." AND
                             previous_item_id = " . $previous;
                 $res_select_old = Database::query($sql);
                 $row_select_old = Database::fetch_array($res_select_old);
@@ -1395,8 +1395,8 @@ 
             } else {
                 // Select the data of the item that should come before the current item.
                 $sql = "SELECT next_item_id, display_order
-                        FROM " . $tbl_lp_item . "
-                        WHERE c_id = ".$course_id." AND id = " . $previous;
+                        FROM " . $tbl_lp_item."
+                        WHERE c_id = ".$course_id." AND id = ".$previous;
                 $res_select_old = Database::query($sql);
                 $row_select_old = Database :: fetch_array($res_select_old);
                 $new_next = $row_select_old['next_item_id'];
@@ -1405,57 +1405,57 @@ 
 
             // TODO: htmlspecialchars to be checked for encoding related problems.
             // Update the current item with the new data.
-            $sql = "UPDATE " . $tbl_lp_item . "
+            $sql = "UPDATE ".$tbl_lp_item."
                     SET
-                        title = '" . Database::escape_string($title) . "',
-                        description = '" . Database::escape_string($description) . "',
-                        parent_item_id = " . $parent . ",
-                        previous_item_id = " . $previous . ",
-                        next_item_id = " . $new_next . ",
-                        display_order = " . $new_order . "
-                        " . $audio_update_sql . "
-                    WHERE c_id = ".$course_id." AND id = " . $id;
+                        title = '" . Database::escape_string($title)."',
+                        description = '" . Database::escape_string($description)."',
+                        parent_item_id = " . $parent.",
+                        previous_item_id = " . $previous.",
+                        next_item_id = " . $new_next.",
+                        display_order = " . $new_order."
+                        " . $audio_update_sql."
+                    WHERE c_id = ".$course_id." AND id = ".$id;
             Database::query($sql);
 
             if ($previous != 0) {
                 // Update the previous item's next_item_id.
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET next_item_id = " . $id . "
-                        WHERE c_id = ".$course_id." AND id = " . $previous;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET next_item_id = " . $id."
+                        WHERE c_id = ".$course_id." AND id = ".$previous;
                 Database::query($sql);
             }
 
             if ($new_next != 0) {
                 // Update the next item's previous_item_id.
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET previous_item_id = " . $id . "
-                        WHERE c_id = ".$course_id." AND id = " . $new_next;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET previous_item_id = " . $id."
+                        WHERE c_id = ".$course_id." AND id = ".$new_next;
                 Database::query($sql);
             }
 
             if ($old_prerequisite != $prerequisites) {
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET prerequisite = '" . $prerequisites . "'
-                        WHERE c_id = ".$course_id." AND id = " . $id;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET prerequisite = '" . $prerequisites."'
+                        WHERE c_id = ".$course_id." AND id = ".$id;
                 Database::query($sql);
             }
 
             if ($old_max_time_allowed != $max_time_allowed) {
                 // update max time allowed
-                $sql = "UPDATE " . $tbl_lp_item . "
-                        SET max_time_allowed = " . $max_time_allowed . "
-                        WHERE c_id = ".$course_id." AND id = " . $id;
+                $sql = "UPDATE ".$tbl_lp_item."
+                        SET max_time_allowed = " . $max_time_allowed."
+                        WHERE c_id = ".$course_id." AND id = ".$id;
                 Database::query($sql);
             }
 
             // Update all the items with the same or a bigger display_order than the current item.
-            $sql = "UPDATE " . $tbl_lp_item . "
+            $sql = "UPDATE ".$tbl_lp_item."
                     SET display_order = display_order + 1
                     WHERE
                        c_id = ".$course_id." AND
-                       lp_id = " . $this->get_id() . " AND
-                       id <> " . $id . " AND
-                       parent_item_id = " . $parent . " AND
+                       lp_id = " . $this->get_id()." AND
+                       id <> " . $id." AND
+                       parent_item_id = " . $parent." AND
                        display_order >= " . $new_order;
 
             Database::query($sql);
@@ -1481,7 +1481,7 @@ 
     {
         $course_id = api_get_course_int_id();
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::edit_item_prereq(' . $id . ',' . $prerequisite_id . ',' . $mastery_score . ',' . $max_score . ')', 0);
+            error_log('New LP - In learnpath::edit_item_prereq('.$id.','.$prerequisite_id.','.$mastery_score.','.$max_score.')', 0);
         }
 
         if (empty($id) || ($id != strval(intval($id))) || empty ($prerequisite_id)) {
@@ -1579,8 +1579,8 @@ 
             error_log('New LP - In learnpath::get_brother_chapters()', 0);
         }
 
-        if (empty($id)|| $id != strval(intval($id))) {
-            return array ();
+        if (empty($id) || $id != strval(intval($id))) {
+            return array();
         }
 
         $lp_item = Database :: get_course_table(TABLE_LP_ITEM);
@@ -1598,13 +1598,13 @@ 
                             item_type='dokeos_chapter'
                         ORDER BY display_order";
             $res_bros = Database::query($sql_bros);
-            $list = array ();
+            $list = array();
             while ($row_bro = Database :: fetch_array($res_bros)) {
                 $list[] = $row_bro;
             }
             return $list;
         }
-        return array ();
+        return array();
     }
 
     /**
@@ -1617,11 +1617,11 @@ 
     {
         $course_id = api_get_course_int_id();
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::get_brother_items(' . $id . ')', 0);
+            error_log('New LP - In learnpath::get_brother_items('.$id.')', 0);
         }
 
         if (empty ($id) || $id != strval(intval($id))) {
-            return array ();
+            return array();
         }
 
         $lp_item = Database :: get_course_table(TABLE_LP_ITEM);
@@ -1633,13 +1633,13 @@ 
             $sql_bros = "SELECT * FROM $lp_item WHERE c_id = ".$course_id." AND parent_item_id = $parent
                          ORDER BY display_order";
             $res_bros = Database::query($sql_bros);
-            $list = array ();
+            $list = array();
             while ($row_bro = Database :: fetch_array($res_bros)) {
                 $list[] = $row_bro;
             }
             return $list;
         }
-        return array ();
+        return array();
     }
 
     /**
@@ -1709,7 +1709,7 @@ 
             $current = $this->current;
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_current_item_id() - Returning ' . $current, 0);
+            error_log('New LP - In learnpath::get_current_item_id() - Returning '.$current, 0);
         }
         return $current;
     }
@@ -1790,7 +1790,7 @@ 
         ) {
 
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::first() - Last item seen is ' . $this->last_item_seen.' of type '.$this->items[$this->last_item_seen]->get_type(), 0);
+                error_log('New LP - In learnpath::first() - Last item seen is '.$this->last_item_seen.' of type '.$this->items[$this->last_item_seen]->get_type(), 0);
             }
             $index = -1;
             foreach ($this->ordered_items as $myindex => $item_id) {
@@ -1802,7 +1802,7 @@ 
             if ($index == -1) {
                 // Index hasn't changed, so item not found - panic (this shouldn't happen).
                 if ($this->debug > 2) {
-                    error_log('New LP - Last item (' . $this->last_item_seen . ') was found in items but not in ordered_items, panic!', 0);
+                    error_log('New LP - Last item ('.$this->last_item_seen.') was found in items but not in ordered_items, panic!', 0);
                 }
                 return false;
             } else {
@@ -1817,7 +1817,7 @@ 
             $index = 0;
             // Loop through all ordered items and stop at the first item that is
             // not a directory *and* that has not been completed yet.
-            while ( !empty($this->ordered_items[$index]) AND
+            while (!empty($this->ordered_items[$index]) AND
                 is_a($this->items[$this->ordered_items[$index]], 'learnpathItem') AND
                 (
                     $this->items[$this->ordered_items[$index]]->get_type() == 'dir' OR
@@ -1831,14 +1831,14 @@ 
             $this->current  = isset($this->ordered_items[$index]) ? $this->ordered_items[$index] : null;
             $this->index    = $index;
             if ($this->debug > 2) {
-                error_log('$index ' . $index);
+                error_log('$index '.$index);
             }
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::first() - No last item seen. New last = ' . $this->last . '(' . $this->ordered_items[$index] . ')', 0);
+                error_log('New LP - In learnpath::first() - No last item seen. New last = '.$this->last.'('.$this->ordered_items[$index].')', 0);
             }
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::first() - First item is ' . $this->get_current_item_id());
+            error_log('New LP - In learnpath::first() - First item is '.$this->get_current_item_id());
         }
     }
 
@@ -1851,7 +1851,7 @@ 
     public function get_js_info($item_id = '')
     {
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::get_js_info(' . $item_id . ')', 0);
+            error_log('New LP - In learnpath::get_js_info('.$item_id.')', 0);
         }
 
         $info = '';
@@ -1861,17 +1861,17 @@ 
             //if item is defined, return values from DB
             $oItem = $this->items[$item_id];
             $info .= '<script language="javascript">';
-            $info .= "top.set_score(" . $oItem->get_score() . ");\n";
-            $info .= "top.set_max(" . $oItem->get_max() . ");\n";
-            $info .= "top.set_min(" . $oItem->get_min() . ");\n";
-            $info .= "top.set_lesson_status('" . $oItem->get_status() . "');";
-            $info .= "top.set_session_time('" . $oItem->get_scorm_time('js') . "');";
-            $info .= "top.set_suspend_data('" . $oItem->get_suspend_data() . "');";
-            $info .= "top.set_saved_lesson_status('" . $oItem->get_status() . "');";
+            $info .= "top.set_score(".$oItem->get_score().");\n";
+            $info .= "top.set_max(".$oItem->get_max().");\n";
+            $info .= "top.set_min(".$oItem->get_min().");\n";
+            $info .= "top.set_lesson_status('".$oItem->get_status()."');";
+            $info .= "top.set_session_time('".$oItem->get_scorm_time('js')."');";
+            $info .= "top.set_suspend_data('".$oItem->get_suspend_data()."');";
+            $info .= "top.set_saved_lesson_status('".$oItem->get_status()."');";
             $info .= "top.set_flag_synchronized();";
             $info .= '</script>';
             if ($this->debug > 2) {
-                error_log('New LP - in learnpath::get_js_info(' . $item_id . ') - returning: ' . $info, 0);
+                error_log('New LP - in learnpath::get_js_info('.$item_id.') - returning: '.$info, 0);
             }
             return $info;
 
@@ -1879,17 +1879,17 @@ 
 
             // If item_id is empty, just update to default SCORM data.
             $info .= '<script language="javascript">';
-            $info .= "top.set_score(" . learnpathItem :: get_score() . ");\n";
-            $info .= "top.set_max(" . learnpathItem :: get_max() . ");\n";
-            $info .= "top.set_min(" . learnpathItem :: get_min() . ");\n";
-            $info .= "top.set_lesson_status('" . learnpathItem :: get_status() . "');";
-            $info .= "top.set_session_time('" . learnpathItem :: getScormTimeFromParameter('js') . "');";
-            $info .= "top.set_suspend_data('" . learnpathItem :: get_suspend_data() . "');";
-            $info .= "top.set_saved_lesson_status('" . learnpathItem :: get_status() . "');";
+            $info .= "top.set_score(".learnpathItem :: get_score().");\n";
+            $info .= "top.set_max(".learnpathItem :: get_max().");\n";
+            $info .= "top.set_min(".learnpathItem :: get_min().");\n";
+            $info .= "top.set_lesson_status('".learnpathItem :: get_status()."');";
+            $info .= "top.set_session_time('".learnpathItem :: getScormTimeFromParameter('js')."');";
+            $info .= "top.set_suspend_data('".learnpathItem :: get_suspend_data()."');";
+            $info .= "top.set_saved_lesson_status('".learnpathItem :: get_status()."');";
             $info .= "top.set_flag_synchronized();";
             $info .= '</script>';
             if ($this->debug > 2) {
-                error_log('New LP - in learnpath::get_js_info(' . $item_id . ') - returning: ' . $info, 0);
+                error_log('New LP - in learnpath::get_js_info('.$item_id.') - returning: '.$info, 0);
             }
             return $info;
         }
@@ -1943,12 +1943,12 @@ 
      * Gets the navigation bar for the learnpath display screen
      * @return	string	The HTML string to use as a navigation bar
      */
-    public function get_navigation_bar($idBar = null, $display=null) {
+    public function get_navigation_bar($idBar = null, $display = null) {
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::get_navigation_bar()', 0);
         }
-        if(empty($idBar)){
-            $idBar='control-top';
+        if (empty($idBar)) {
+            $idBar = 'control-top';
         }
         /* if(empty($display)){
             $display='display:block';
@@ -1961,16 +1961,16 @@ 
             $navbar = '
                   <span id="'.$idBar.'" class="buttons">
                     <a class="icon-toolbar" href="lp_controller.php?action=stats&'.api_get_cidreq(true).'&lp_id='.$lp_id.'" onclick="window.parent.API.save_asset();return true;" target="content_name" title="stats" id="stats_link">
-                        <span class="fa fa-info"></span><span class="sr-only">' . get_lang('Reporting') . '</span>
+                        <span class="fa fa-info"></span><span class="sr-only">' . get_lang('Reporting').'</span>
                     </a>
-                    <a class="icon-toolbar" id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous">
-                        <span class="fa fa-chevron-left"></span><span class="sr-only">' . get_lang('ScormPrevious') . '</span>
+                    <a class="icon-toolbar" id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid.',\'previous\');return false;" title="previous">
+                        <span class="fa fa-chevron-left"></span><span class="sr-only">' . get_lang('ScormPrevious').'</span>
                     </a>
-                    <a class="icon-toolbar" id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next">
-                        <span class="fa fa-chevron-right"></span><span class="sr-only">' . get_lang('ScormNext') . '</span>
+                    <a class="icon-toolbar" id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid.',\'next\');return false;" title="next">
+                        <span class="fa fa-chevron-right"></span><span class="sr-only">' . get_lang('ScormNext').'</span>
                     </a>
                     <a class="icon-toolbar" id="view-embedded" href="lp_controller.php?action=mode&mode=embedded" target="_top" title="embedded mode">
-                        <span class="fa fa-columns"></span><span class="sr-only">' . get_lang('ScormExitFullScreen') . '</span>
+                        <span class="fa fa-columns"></span><span class="sr-only">' . get_lang('ScormExitFullScreen').'</span>
                     </a> 
                   </span>';
 
@@ -1978,13 +1978,13 @@ 
             $navbar = '
                 <span id="'.$idBar.'" class="buttons text-right">
                     <a class="icon-toolbar" href="lp_controller.php?action=stats&'.api_get_cidreq(true).'&lp_id='.$lp_id.'" onclick="window.parent.API.save_asset();return true;" target="content_name" title="stats" id="stats_link">
-                        <span class="fa fa-info"></span><span class="sr-only">' . get_lang('Reporting') . '</span>
+                        <span class="fa fa-info"></span><span class="sr-only">' . get_lang('Reporting').'</span>
                     </a>
-                    <a class="icon-toolbar" id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'previous\');return false;" title="previous">
-                        <span class="fa fa-chevron-left"></span><span class="sr-only">' . get_lang('ScormPrevious') . '</span>
+                    <a class="icon-toolbar" id="scorm-previous" href="#" onclick="switch_item(' . $mycurrentitemid.',\'previous\');return false;" title="previous">
+                        <span class="fa fa-chevron-left"></span><span class="sr-only">' . get_lang('ScormPrevious').'</span>
                     </a>
-                    <a class="icon-toolbar" id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid . ',\'next\');return false;" title="next">
-                        <span class="fa fa-chevron-right"></span><span class="sr-only">' . get_lang('ScormNext') . '</span>
+                    <a class="icon-toolbar" id="scorm-next" href="#" onclick="switch_item(' . $mycurrentitemid.',\'next\');return false;" title="next">
+                        <span class="fa fa-chevron-right"></span><span class="sr-only">' . get_lang('ScormNext').'</span>
                     </a>
                 </span>';
         }
@@ -2005,11 +2005,11 @@ 
         $index = $this->index;
         $index++;
         if ($this->debug > 2) {
-            error_log('New LP - Now looking at ordered_items[' . ($index) . '] - type is ' . $this->items[$this->ordered_items[$index]]->type, 0);
+            error_log('New LP - Now looking at ordered_items['.($index).'] - type is '.$this->items[$this->ordered_items[$index]]->type, 0);
         }
         while (!empty ($this->ordered_items[$index]) AND ($this->items[$this->ordered_items[$index]]->get_type() == 'dir' || $this->items[$this->ordered_items[$index]]->get_type() == 'dokeos_chapter') AND $index < $this->max_ordered_items) {
             $index++;
-            if ($index == $this->max_ordered_items){
+            if ($index == $this->max_ordered_items) {
                 if ($this->items[$this->ordered_items[$index]]->get_type() == 'dir' || $this->items[$this->ordered_items[$index]]->get_type() == 'dokeos_chapter') {
                     return $this->index;
                 } else {
@@ -2021,7 +2021,7 @@ 
             return $this->index;
         }
         if ($this->debug > 2) {
-            error_log('New LP - index is now ' . $index, 0);
+            error_log('New LP - index is now '.$index, 0);
         }
         return $index;
     }
@@ -2039,7 +2039,7 @@ 
         if (!empty ($new_index)) {
             if (isset ($this->ordered_items[$new_index])) {
                 if ($this->debug > 2) {
-                    error_log('New LP - In learnpath::get_next_index() - Returning ' . $this->ordered_items[$new_index], 0);
+                    error_log('New LP - In learnpath::get_next_index() - Returning '.$this->ordered_items[$new_index], 0);
                 }
                 return $this->ordered_items[$new_index];
             }
@@ -2081,7 +2081,7 @@ 
         }
 
         // Filename without its extension.
-        $file_base_name = str_replace('.' . $extension, '', $filename);
+        $file_base_name = str_replace('.'.$extension, '', $filename);
 
         $zipFile = new PclZip($file_path);
         // Check the zip content (real size and file extension).
@@ -2105,7 +2105,7 @@ 
                     break; // Exit the foreach loop.
                 } elseif (
                     preg_match('/aicc\//i', $thisContent['filename']) ||
-                    in_array(strtolower(pathinfo($thisContent['filename'], PATHINFO_EXTENSION)), array( 'crs','au','des','cst'))
+                    in_array(strtolower(pathinfo($thisContent['filename'], PATHINFO_EXTENSION)), array('crs', 'au', 'des', 'cst'))
                 ) {
                     $ext = strtolower(pathinfo($thisContent['filename'], PATHINFO_EXTENSION));
                     switch ($ext) {
@@ -2147,7 +2147,7 @@ 
             error_log('New LP - In learnpath::get_previous_index()', 0);
         }
         $index = $this->index;
-        if (isset ($this->ordered_items[$index -1])) {
+        if (isset ($this->ordered_items[$index - 1])) {
             $index--;
             while (isset($this->ordered_items[$index]) && ($this->items[$this->ordered_items[$index]]->get_type() == 'dir' || $this->items[$this->ordered_items[$index]]->get_type() == 'dokeos_chapter')) {
                 $index--;
@@ -2157,7 +2157,7 @@ 
             }
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - get_previous_index() - there was no previous index available, reusing ' . $index, 0);
+                error_log('New LP - get_previous_index() - there was no previous index available, reusing '.$index, 0);
             }
             // There is no previous item.
         }
@@ -2200,8 +2200,8 @@ 
     {
         $course_id = api_get_course_int_id();
         $_course = api_get_course_info();
-        $tbl_lp_item 		= Database :: get_course_table(TABLE_LP_ITEM);
-        $tbl_lp_item_view 	= Database :: get_course_table(TABLE_LP_ITEM_VIEW);
+        $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
+        $tbl_lp_item_view = Database :: get_course_table(TABLE_LP_ITEM_VIEW);
 
         // Getting all the information about the item.
         $sql = "SELECT * FROM ".$tbl_lp_item." as lp
@@ -2212,7 +2212,7 @@ 
                     lp.c_id = $course_id AND
                     lp_view.c_id = $course_id";
         $result = Database::query($sql);
-        $row 	= Database::fetch_assoc($result);
+        $row = Database::fetch_assoc($result);
         $output = '';
 
         if (!empty ($row['audio'])) {
@@ -2220,8 +2220,8 @@ 
             $list = $_SESSION['oLP']->get_toc();
             $type_quiz = false;
 
-            foreach($list as $toc) {
-                if ($toc['id'] == $_SESSION['oLP']->current && ($toc['type']=='quiz') ) {
+            foreach ($list as $toc) {
+                if ($toc['id'] == $_SESSION['oLP']->current && ($toc['type'] == 'quiz')) {
                     $type_quiz = true;
                 }
             }
@@ -2284,7 +2284,7 @@ 
         $courseCode = null,
         $sessionId = null
     ) {
-        $lp_id = (int)$lp_id;
+        $lp_id = (int) $lp_id;
         $courseInfo = api_get_course_info($courseCode);
         $sessionId = intval($sessionId);
 
@@ -2450,10 +2450,10 @@ 
      */
     public static function get_progress_bar($percentage = -1, $text_add = '')
     {
-        $text = $percentage . $text_add;
+        $text = $percentage.$text_add;
         $output = '<div class="progress">
-                        <div id="progress_bar_value" class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="' .$percentage. '" aria-valuemin="0" aria-valuemax="100" style="width: '.$text.';">
-                        '. $text .'
+                        <div id="progress_bar_value" class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="' .$percentage.'" aria-valuemin="0" aria-valuemax="100" style="width: '.$text.';">
+                        '. $text.'
                         </div>
                     </div>';
 
@@ -2489,16 +2489,16 @@ 
         }
         $total_items = $this->get_total_items_count_without_chapters();
         if ($this->debug > 2) {
-            error_log('New LP - Total items available in this learnpath: ' . $total_items, 0);
+            error_log('New LP - Total items available in this learnpath: '.$total_items, 0);
         }
         $completeItems = $this->get_complete_items_count();
         if ($this->debug > 2) {
-            error_log('New LP - Items completed so far: ' . $completeItems, 0);
+            error_log('New LP - Items completed so far: '.$completeItems, 0);
         }
         if ($add != 0) {
             $completeItems += $add;
             if ($this->debug > 2) {
-                error_log('New LP - Items completed so far (+modifier): ' . $completeItems, 0);
+                error_log('New LP - Items completed so far (+modifier): '.$completeItems, 0);
             }
         }
         $text = '';
@@ -2516,7 +2516,7 @@ 
             $text = '%';
         } elseif ($mode == 'abs') {
             $percentage = $completeItems;
-            $text = '/' . $total_items;
+            $text = '/'.$total_items;
         }
 
         return array(
@@ -2712,7 +2712,7 @@ 
                 // and replace them, one by one, by the internal IDs (chamilo db)
                 // TODO: Modify the '*' replacement to replace the multiplier in front of it
                 // by a space as well.
-                $find = array (
+                $find = array(
                     '&',
                     '|',
                     '~',
@@ -2724,7 +2724,7 @@ 
                     '(',
                     ')'
                 );
-                $replace = array (
+                $replace = array(
                     ' ',
                     ' ',
                     ' ',
@@ -2741,7 +2741,7 @@ 
                 foreach ($ids as $id) {
                     $id = trim($id);
                     if (isset ($this->refs_list[$id])) {
-                        $prereq = preg_replace('/[^a-zA-Z_0-9](' . $id . ')[^a-zA-Z_0-9]/', 'ITEM_' . $this->refs_list[$id], $prereq);
+                        $prereq = preg_replace('/[^a-zA-Z_0-9]('.$id.')[^a-zA-Z_0-9]/', 'ITEM_'.$this->refs_list[$id], $prereq);
                     }
                 }
 
@@ -2849,9 +2849,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::get_items_status_list()', 0);
         }
-        $list = array ();
+        $list = array();
         foreach ($this->ordered_items as $item_id) {
-            $list[] = array (
+            $list[] = array(
                 $item_id => $this->items[$item_id]->get_status()
             );
         }
@@ -2905,7 +2905,7 @@ 
         $res = Database::query($sql);
         $num = Database :: num_rows($res);
         if ($num > 0) {
-            $list[] = array (
+            $list[] = array(
                 'order_id' => api_htmlentities(get_lang('Order'), ENT_QUOTES),
                 'id' => api_htmlentities(get_lang('InteractionID'), ENT_QUOTES),
                 'type' => api_htmlentities(get_lang('Type'), ENT_QUOTES),
@@ -2916,7 +2916,7 @@ 
                 'latency' => api_htmlentities(get_lang('LatencyTimeSpent'), ENT_QUOTES)
             );
             while ($row = Database :: fetch_array($res)) {
-                $list[] = array (
+                $list[] = array(
                     'order_id' => ($row['order_id'] + 1),
                     'id' => urldecode($row['interaction_id']), //urldecode because they often have %2F or stuff like that
                     'type' => $row['interaction_type'],
@@ -2984,7 +2984,7 @@ 
                 'status' => api_htmlentities(get_lang('ObjectiveStatus'), ENT_QUOTES)
             );
             while ($row = Database :: fetch_array($res)) {
-                $list[] = array (
+                $list[] = array(
                     'order_id' => ($row['order_id'] + 1),
                     'objective_id' => urldecode($row['objective_id']), // urldecode() because they often have %2F or stuff like that.
                     'score_raw' => $row['score_raw'],
@@ -3011,10 +3011,10 @@ 
         $toc = array();
         foreach ($this->ordered_items as $item_id) {
             if ($this->debug > 2) {
-                error_log('learnpath::get_toc(): getting info for item ' . $item_id, 0);
+                error_log('learnpath::get_toc(): getting info for item '.$item_id, 0);
             }
             // TODO: Change this link generation and use new function instead.
-            $toc[] = array (
+            $toc[] = array(
                 'id'            => $item_id,
                 'title'         => $this->items[$item_id]->get_title(),
                 'status'        => $this->items[$item_id]->get_status(),
@@ -3025,7 +3025,7 @@ 
             );
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_toc() - TOC array: ' . print_r($toc, true), 0);
+            error_log('New LP - In learnpath::get_toc() - TOC array: '.print_r($toc, true), 0);
         }
         return $toc;
     }
@@ -3042,10 +3042,10 @@ 
         }
         $toc = $varname.' = new Array();';
         foreach ($this->ordered_items as $item_id) {
-            $toc.= $varname."['i$item_id'] = '".$this->items[$item_id]->get_type()."';";
+            $toc .= $varname."['i$item_id'] = '".$this->items[$item_id]->get_type()."';";
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_items_details_as_js() - TOC array: ' . print_r($toc, true), 0);
+            error_log('New LP - In learnpath::get_items_details_as_js() - TOC array: '.print_r($toc, true), 0);
         }
         return $toc;
     }
@@ -3069,7 +3069,7 @@ 
             }
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_type() - Returning ' . ($res ? $res : 'false'), 0);
+            error_log('New LP - In learnpath::get_type() - Returning '.($res ? $res : 'false'), 0);
         }
         return $res;
     }
@@ -3085,7 +3085,7 @@ 
         $tbl_lp = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = intval($lp_id);
         $sql = "SELECT lp_type FROM $tbl_lp
-                WHERE c_id = $course_id AND id = '" . $lp_id . "'";
+                WHERE c_id = $course_id AND id = '".$lp_id."'";
         $res = Database::query($sql);
         if ($res === false) {
             return null;
@@ -3177,7 +3177,7 @@ 
 
         foreach ($toc_list as $item) {
             // TODO: Complete this
-            $icon_name = array (
+            $icon_name = array(
                 'not attempted' => '../img/notattempted.gif',
                 'incomplete'    => '../img/incomplete.png',
                 'failed'        => '../img/delete.png',
@@ -3189,7 +3189,7 @@ 
 
             // Style Status
 
-            $class_name = array (
+            $class_name = array(
                 'not attempted' => 'scorm_not_attempted',
                 'incomplete'    => 'scorm_not_attempted',
                 'failed'        => 'scorm_failed',
@@ -3209,7 +3209,7 @@ 
             $dirTypes = self::getChapterTypes();
 
             if (in_array($item['type'], $dirTypes)) {
-                $scorm_color_background ='scorm_item_section ';
+                $scorm_color_background = 'scorm_item_section ';
                 $style_item = '';
             }
             if ($item['id'] == $this->current) {
@@ -3218,7 +3218,7 @@ 
                 $scorm_color_background = 'scorm_item_normal '.$scorm_color_background.' ';
             }
 
-            $html .= '<div id="toc_' . $item['id'] . '" class="' . $scorm_color_background . ' '.$class_name[$item['status']].' ">';
+            $html .= '<div id="toc_'.$item['id'].'" class="'.$scorm_color_background.' '.$class_name[$item['status']].' ">';
 
             // Learning path title
             $title = $item['title'];
@@ -3248,7 +3248,7 @@ 
                 $html .= stripslashes($title);
             } else {
                 $this->get_link('http', $item['id'], $toc_list);
-                $html .= '<a class="items-list" href="#" onclick="switch_item(' .$mycurrentitemid . ',' .$item['id'] . ');' .'return false;" >' . stripslashes($title) . '</a>';
+                $html .= '<a class="items-list" href="#" onclick="switch_item('.$mycurrentitemid.','.$item['id'].');'.'return false;" >'.stripslashes($title).'</a>';
             }
             $html .= "</div>";
 
@@ -3282,12 +3282,12 @@ 
             if ($this->get_lp_session_id() == api_get_session_id()) {
                 $html .= '<div id="actions_lp" class="actions_lp"><hr>';
                 $html .= '<div class="btn-group">';
-                $html .= "<a class='btn btn-sm btn-default' href='lp_controller.php?" . api_get_cidreq()."&gradebook=$gradebook&action=build&lp_id=" . $this->lp_id . "&isStudentView=false' target='_parent'>" .
-                    Display::returnFontAwesomeIcon('street-view') . get_lang('Overview') . "</a>";
-                $html .= "<a class='btn btn-sm btn-default' href='lp_controller.php?" . api_get_cidreq()."&action=add_item&type=step&lp_id=" . $this->lp_id . "&isStudentView=false' target='_parent'>" .
-                    Display::returnFontAwesomeIcon('pencil') . get_lang('Edit') . "</a>";
-                $html .= '<a class="btn btn-sm btn-default" href="lp_controller.php?'.api_get_cidreq()."&gradebook=$gradebook&action=edit&lp_id=" . $this->lp_id.'&isStudentView=false">' .
-                    Display::returnFontAwesomeIcon('cog') . get_lang('Settings').'</a>';
+                $html .= "<a class='btn btn-sm btn-default' href='lp_controller.php?".api_get_cidreq()."&gradebook=$gradebook&action=build&lp_id=".$this->lp_id."&isStudentView=false' target='_parent'>".
+                    Display::returnFontAwesomeIcon('street-view').get_lang('Overview')."</a>";
+                $html .= "<a class='btn btn-sm btn-default' href='lp_controller.php?".api_get_cidreq()."&action=add_item&type=step&lp_id=".$this->lp_id."&isStudentView=false' target='_parent'>".
+                    Display::returnFontAwesomeIcon('pencil').get_lang('Edit')."</a>";
+                $html .= '<a class="btn btn-sm btn-default" href="lp_controller.php?'.api_get_cidreq()."&gradebook=$gradebook&action=edit&lp_id=".$this->lp_id.'&isStudentView=false">'.
+                    Display::returnFontAwesomeIcon('cog').get_lang('Settings').'</a>';
                 $html .= '</div>';
                 $html .= '</div>';
             }
@@ -3338,11 +3338,11 @@ 
         $course_id = $this->get_course_int_id();
 
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::get_link(' . $type . ',' . $item_id . ')', 0);
+            error_log('New LP - In learnpath::get_link('.$type.','.$item_id.')', 0);
         }
         if (empty($item_id)) {
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::get_link() - no item id given in learnpath::get_link(), using current: ' . $this->get_current_item_id(), 0);
+                error_log('New LP - In learnpath::get_link() - no item id given in learnpath::get_link(), using current: '.$this->get_current_item_id(), 0);
             }
             $item_id = $this->get_current_item_id();
         }
@@ -3374,7 +3374,7 @@ 
                     ON (li.lp_id = l.id AND l.c_id = $course_id AND li.c_id = $course_id )
         		WHERE li.id = $item_id ";
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_link() - selecting item ' . $sql, 0);
+            error_log('New LP - In learnpath::get_link() - selecting item '.$sql, 0);
         }
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
@@ -3388,9 +3388,9 @@ 
             if (empty($lp_item_params) && strpos($lp_item_path, '?') !== false) {
                 list($lp_item_path, $lp_item_params) = explode('?', $lp_item_path);
             }
-            $sys_course_path = api_get_path(SYS_COURSE_PATH) . api_get_course_path();
+            $sys_course_path = api_get_path(SYS_COURSE_PATH).api_get_course_path();
             if ($type == 'http') {
-                $course_path = api_get_path(WEB_COURSE_PATH) . api_get_course_path(); //web path
+                $course_path = api_get_path(WEB_COURSE_PATH).api_get_course_path(); //web path
             } else {
                 $course_path = $sys_course_path; //system path
             }
@@ -3401,8 +3401,8 @@ 
             }
 
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::get_link() - $lp_type ' . $lp_type, 0);
-                error_log('New LP - In learnpath::get_link() - $lp_item_type ' . $lp_item_type, 0);
+                error_log('New LP - In learnpath::get_link() - $lp_type '.$lp_type, 0);
+                error_log('New LP - In learnpath::get_link() - $lp_item_type '.$lp_item_type, 0);
             }
 
             // Now go through the specific cases to get the end of the path
@@ -3421,7 +3421,7 @@ 
                         );
 
                         if ($this->debug > 0) {
-                            error_log('rl_get_resource_link_for_learnpath - file: ' . $file, 0);
+                            error_log('rl_get_resource_link_for_learnpath - file: '.$file, 0);
                         }
 
                         if ($lp_item_type == 'link') {
@@ -3441,7 +3441,7 @@ 
                                     $linkProtocol = substr($file, 0, 5);
                                     if ($linkProtocol === 'http:') {
                                         //this is the special intervention case
-                                        $file = api_get_path(WEB_CODE_PATH).'newscorm/embed.php?type=nonhttps&source=' .  urlencode($file);
+                                        $file = api_get_path(WEB_CODE_PATH).'newscorm/embed.php?type=nonhttps&source='.urlencode($file);
                                     }
                                 }
                             }
@@ -3481,8 +3481,8 @@ 
                                 $sql = "SELECT count(*) FROM $lp_item_view_table
                                         WHERE
                                             c_id = $course_id AND
-                                            lp_item_id='" . $lp_item_id . "' AND
-                                            lp_view_id ='" . $lp_view_id . "' AND
+                                            lp_item_id='".$lp_item_id."' AND
+                                            lp_view_id ='" . $lp_view_id."' AND
                                             status='completed'";
                                 $result = Database::query($sql);
                                 $row_count = Database :: fetch_row($result);
@@ -3491,7 +3491,7 @@ 
                                 if ($prevent_reinit === 1 && $count_item_view > 0) {
                                     $not_multiple_attempt = 1;
                                 }
-                                $file .= '&not_multiple_attempt=' . $not_multiple_attempt;
+                                $file .= '&not_multiple_attempt='.$not_multiple_attempt;
                             }
 
                             $tmp_array = explode('/', $file);
@@ -3504,7 +3504,7 @@ 
                     break;
                 case 2 :
                     if ($this->debug > 2) {
-                        error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - Item type: ' . $lp_item_type, 0);
+                        error_log('New LP - In learnpath::get_link() '.__LINE__.' - Item type: '.$lp_item_type, 0);
                     }
 
                     if ($lp_item_type != 'dir') {
@@ -3518,19 +3518,19 @@ 
                         //if ($this->prerequisites_match($item_id)) {
                         if (preg_match('#^[a-zA-Z]{2,5}://#', $lp_item_path) != 0) {
                             if ($this->debug > 2) {
-                                error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - Found match for protocol in ' . $lp_item_path, 0);
+                                error_log('New LP - In learnpath::get_link() '.__LINE__.' - Found match for protocol in '.$lp_item_path, 0);
                             }
                             // Distant url, return as is.
                             $file = $lp_item_path;
                         } else {
                             if ($this->debug > 2) {
-                                error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - No starting protocol in ' . $lp_item_path, 0);
+                                error_log('New LP - In learnpath::get_link() '.__LINE__.' - No starting protocol in '.$lp_item_path, 0);
                             }
                             // Prevent getting untranslatable urls.
                             $lp_item_path = preg_replace('/%2F/', '/', $lp_item_path);
                             $lp_item_path = preg_replace('/%3A/', ':', $lp_item_path);
                             // Prepare the path.
-                            $file = $course_path . '/scorm/' . $lp_path . '/' . $lp_item_path;
+                            $file = $course_path.'/scorm/'.$lp_path.'/'.$lp_item_path;
                             // TODO: Fix this for urls with protocol header.
                             $file = str_replace('//', '/', $file);
                             $file = str_replace(':/', '://', $file);
@@ -3538,11 +3538,11 @@ 
                                 $lp_path = substr($lp_path, 0, -1);
                             }
 
-                            if (!is_file(realpath($sys_course_path . '/scorm/' . $lp_path . '/' . $lp_item_path))) {
+                            if (!is_file(realpath($sys_course_path.'/scorm/'.$lp_path.'/'.$lp_item_path))) {
                                 // if file not found.
                                 $decoded = html_entity_decode($lp_item_path);
                                 list ($decoded) = explode('?', $decoded);
-                                if (!is_file(realpath($sys_course_path . '/scorm/' . $lp_path . '/' . $decoded))) {
+                                if (!is_file(realpath($sys_course_path.'/scorm/'.$lp_path.'/'.$decoded))) {
                                     require_once 'resourcelinker.inc.php';
                                     $file = rl_get_resource_link_for_learnpath(
                                         $course_id,
@@ -3562,14 +3562,14 @@ 
                                         }
                                     }
                                 } else {
-                                    $file = $course_path . '/scorm/' . $lp_path . '/' . $decoded;
+                                    $file = $course_path.'/scorm/'.$lp_path.'/'.$decoded;
                                 }
                             }
                         }
 
                         // We want to use parameters if they were defined in the imsmanifest
                         if (strpos($file, 'blank.php') === false) {
-                            $file .= (strstr($file, '?') === false ? '?' : '') . $lp_item_params;
+                            $file .= (strstr($file, '?') === false ? '?' : '').$lp_item_params;
                         }
                     } else {
                         $file = 'lp_content.php?type=dir';
@@ -3577,12 +3577,12 @@ 
                     break;
                 case 3 :
                     if ($this->debug > 2) {
-                        error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - Item type: ' . $lp_item_type, 0);
+                        error_log('New LP - In learnpath::get_link() '.__LINE__.' - Item type: '.$lp_item_type, 0);
                     }
                     // Formatting AICC HACP append URL.
-                    $aicc_append = '?aicc_sid=' . urlencode(session_id()) . '&aicc_url=' . urlencode(api_get_path(WEB_CODE_PATH) . 'newscorm/aicc_hacp.php') . '&';
+                    $aicc_append = '?aicc_sid='.urlencode(session_id()).'&aicc_url='.urlencode(api_get_path(WEB_CODE_PATH).'newscorm/aicc_hacp.php').'&';
                     if (!empty($lp_item_params)) {
-                        $aicc_append .= $lp_item_params . '&';
+                        $aicc_append .= $lp_item_params.'&';
                     }
                     if ($lp_item_type != 'dir') {
                         // Quite complex here:
@@ -3594,7 +3594,7 @@ 
 
                         if (preg_match('#^[a-zA-Z]{2,5}://#', $lp_item_path) != 0) {
                             if ($this->debug > 2) {
-                                error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - Found match for protocol in ' . $lp_item_path, 0);
+                                error_log('New LP - In learnpath::get_link() '.__LINE__.' - Found match for protocol in '.$lp_item_path, 0);
                             }
                             // Distant url, return as is.
                             $file = $lp_item_path;
@@ -3607,19 +3607,19 @@ 
                             if (stripos($file, '<servername>') !== false) {
                                 //$file = str_replace('<servername>',$course_path.'/scorm/'.$lp_path.'/',$lp_item_path);
                                 $web_course_path = str_replace('https://', '', str_replace('http://', '', $course_path));
-                                $file = str_replace('<servername>', $web_course_path . '/scorm/' . $lp_path, $lp_item_path);
+                                $file = str_replace('<servername>', $web_course_path.'/scorm/'.$lp_path, $lp_item_path);
                             }
                             //
                             $file .= $aicc_append;
                         } else {
                             if ($this->debug > 2) {
-                                error_log('New LP - In learnpath::get_link() ' . __LINE__ . ' - No starting protocol in ' . $lp_item_path, 0);
+                                error_log('New LP - In learnpath::get_link() '.__LINE__.' - No starting protocol in '.$lp_item_path, 0);
                             }
                             // Prevent getting untranslatable urls.
                             $lp_item_path = preg_replace('/%2F/', '/', $lp_item_path);
                             $lp_item_path = preg_replace('/%3A/', ':', $lp_item_path);
                             // Prepare the path - lp_path might be unusable because it includes the "aicc" subdir name.
-                            $file = $course_path . '/scorm/' . $lp_path . '/' . $lp_item_path;
+                            $file = $course_path.'/scorm/'.$lp_path.'/'.$lp_item_path;
                             // TODO: Fix this for urls with protocol header.
                             $file = str_replace('//', '/', $file);
                             $file = str_replace(':/', '://', $file);
@@ -3638,7 +3638,7 @@ 
             $file = !empty($file) ? str_replace('&amp;', '&', $file) : '';
         }
         if ($this->debug > 2) {
-            error_log('New LP - In learnpath::get_link() - returning "' . $file . '" from get_link', 0);
+            error_log('New LP - In learnpath::get_link() - returning "'.$file.'" from get_link', 0);
         }
         return $file;
     }
@@ -3656,7 +3656,7 @@ 
         $search = '';
         // Use $attempt_num to enable multi-views management (disabled so far).
         if ($attempt_num != 0 AND intval(strval($attempt_num)) == $attempt_num) {
-            $search = 'AND view_count = ' . $attempt_num;
+            $search = 'AND view_count = '.$attempt_num;
         }
         // When missing $attempt_num, search for a unique lp_view record for this lp and user.
         $lp_view_table = Database :: get_course_table(TABLE_LP_VIEW);
@@ -3666,9 +3666,9 @@ 
 
         $sql = "SELECT id, view_count FROM $lp_view_table
         		WHERE
-        		    c_id = " . $course_id . " AND
-        		    lp_id = " . $this->get_id() . " AND
-        		    user_id = " . $this->get_user_id() . " AND
+        		    c_id = ".$course_id." AND
+        		    lp_id = " . $this->get_id()." AND
+        		    user_id = " . $this->get_user_id()." AND
         		    session_id = $sessionId
         		    $search
                 ORDER BY view_count DESC";
@@ -3679,7 +3679,7 @@ 
         } else if (!api_is_invitee()) {
             // There is no database record, create one.
             $sql = "INSERT INTO $lp_view_table (c_id, lp_id,user_id, view_count, session_id) VALUES
-            		($course_id, " . $this->get_id() . "," . $this->get_user_id() . ", 1, $sessionId)";
+            		($course_id, ".$this->get_id().",".$this->get_user_id().", 1, $sessionId)";
             Database::query($sql);
             $id = Database :: insert_id();
             $this->lp_view_id = $id;
@@ -3779,15 +3779,15 @@ 
     {
         $course_id = api_get_course_int_id();
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::move_item(' . $id . ',' . $direction . ')', 0);
+            error_log('New LP - In learnpath::move_item('.$id.','.$direction.')', 0);
         }
         if (empty($id) || empty($direction)) {
             return false;
         }
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
         $sql_sel = "SELECT *
-                    FROM " . $tbl_lp_item . "
-                    WHERE c_id = ".$course_id." AND id = " . $id;
+                    FROM " . $tbl_lp_item."
+                    WHERE c_id = ".$course_id." AND id = ".$id;
         $res_sel = Database::query($sql_sel);
         // Check if elem exists.
         if (Database :: num_rows($res_sel) < 1) {
@@ -3812,7 +3812,7 @@ 
                                  WHERE c_id = ".$course_id." AND id = $previous";
 
                     if ($this->debug > 2) {
-                        error_log('Selecting previous: ' . $sql_sel2, 0);
+                        error_log('Selecting previous: '.$sql_sel2, 0);
                     }
                     $res_sel2 = Database::query($sql_sel2);
                     if (Database :: num_rows($res_sel2) < 1) {
@@ -3865,7 +3865,7 @@ 
                         }
                         Database::query($sql_upd2);
                     }
-                    $display = $display -1;
+                    $display = $display - 1;
                 }
                 break;
             case 'down':
@@ -3876,7 +3876,7 @@ 
                 } else {
                     $sql_sel2 = "SELECT * FROM $tbl_lp_item WHERE c_id = ".$course_id." AND id = $next";
                     if ($this->debug > 2) {
-                        error_log('Selecting next: ' . $sql_sel2, 0);
+                        error_log('Selecting next: '.$sql_sel2, 0);
                     }
                     $res_sel2 = Database::query($sql_sel2);
                     if (Database :: num_rows($res_sel2) < 1) {
@@ -3914,7 +3914,7 @@ 
                                      WHERE c_id = ".$course_id." AND id = $next_next";
                         Database::query($sql_upd2);
                     }
-                    $display = $display +1;
+                    $display = $display + 1;
                 }
                 break;
             default :
@@ -3937,8 +3937,8 @@ 
         $res = Database::query($sql);
         if ($res === false)
             return false;
-        $lps = array ();
-        $lp_order = array ();
+        $lps = array();
+        $lp_order = array();
         $num = Database :: num_rows($res);
         // First check the order is correct, globally (might be wrong because
         // of versions < 1.8.4)
@@ -3948,7 +3948,7 @@ 
                 if ($row['display_order'] != $i) { // If we find a gap in the order, we need to fix it.
                     $need_fix = true;
                     $sql_u = "UPDATE $lp_table SET display_order = $i
-                              WHERE c_id = ".$course_id." AND id = " . $row['id'];
+                              WHERE c_id = ".$course_id." AND id = ".$row['id'];
                     Database::query($sql_u);
                 }
                 $row['display_order'] = $i;
@@ -3961,10 +3961,10 @@ 
             $order = $lps[$lp_id]['display_order'];
             if ($order > 1) { // If it's the first element, no need to move up.
                 $sql_u1 = "UPDATE $lp_table SET display_order = $order
-                           WHERE c_id = ".$course_id." AND id = " . $lp_order[$order - 1];
+                           WHERE c_id = ".$course_id." AND id = ".$lp_order[$order - 1];
                 Database::query($sql_u1);
-                $sql_u2 = "UPDATE $lp_table SET display_order = " . ($order - 1) . "
-                           WHERE c_id = ".$course_id." AND id = " . $lp_id;
+                $sql_u2 = "UPDATE $lp_table SET display_order = ".($order - 1)."
+                           WHERE c_id = ".$course_id." AND id = ".$lp_id;
                 Database::query($sql_u2);
             }
         }
@@ -3985,8 +3985,8 @@ 
         if ($res === false) {
             return false;
         }
-        $lps = array ();
-        $lp_order = array ();
+        $lps = array();
+        $lp_order = array();
         $num = Database :: num_rows($res);
         $max = 0;
         // First check the order is correct, globally (might be wrong because
@@ -3998,7 +3998,7 @@ 
                 if ($row['display_order'] != $i) { // If we find a gap in the order, we need to fix it.
                     $need_fix = true;
                     $sql_u = "UPDATE $lp_table SET display_order = $i
-                              WHERE c_id = ".$course_id." AND id = " . $row['id'];
+                              WHERE c_id = ".$course_id." AND id = ".$row['id'];
                     Database::query($sql_u);
                 }
                 $row['display_order'] = $i;
@@ -4011,10 +4011,10 @@ 
             $order = $lps[$lp_id]['display_order'];
             if ($order < $max) { // If it's the first element, no need to move up.
                 $sql_u1 = "UPDATE $lp_table SET display_order = $order
-                           WHERE c_id = ".$course_id." AND id = " . $lp_order[$order + 1];
+                           WHERE c_id = ".$course_id." AND id = ".$lp_order[$order + 1];
                 Database::query($sql_u1);
-                $sql_u2 = "UPDATE $lp_table SET display_order = " . ($order + 1) . "
-                           WHERE c_id = ".$course_id." AND id = " . $lp_id;
+                $sql_u2 = "UPDATE $lp_table SET display_order = ".($order + 1)."
+                           WHERE c_id = ".$course_id." AND id = ".$lp_id;
                 Database::query($sql_u2);
             }
         }
@@ -4034,15 +4034,15 @@ 
         $this->autocomplete_parents($this->last);
         $new_index = $this->get_next_index();
         if ($this->debug > 2) {
-            error_log('New LP - New index: ' . $new_index, 0);
+            error_log('New LP - New index: '.$new_index, 0);
         }
         $this->index = $new_index;
         if ($this->debug > 2) {
-            error_log('New LP - Now having orderedlist[' . $new_index . '] = ' . $this->ordered_items[$new_index], 0);
+            error_log('New LP - Now having orderedlist['.$new_index.'] = '.$this->ordered_items[$new_index], 0);
         }
         $this->current = $this->ordered_items[$new_index];
         if ($this->debug > 2) {
-            error_log('New LP - new item id is ' . $this->current . '-' . $this->get_current_item_id(), 0);
+            error_log('New LP - new item id is '.$this->current.'-'.$this->get_current_item_id(), 0);
         }
     }
 
@@ -4106,7 +4106,7 @@ 
             // Clean spaces.
             $prereq_string = str_replace(' ', '', $prereq_string);
             if ($debug > 0) {
-                error_log('Found prereq_string: ' . $prereq_string, 0);
+                error_log('Found prereq_string: '.$prereq_string, 0);
             }
             // Now send to the parse_prereq() function that will check this component's prerequisites.
             $result = $currentItem->parse_prereq(
@@ -4122,12 +4122,12 @@ 
         } else {
             $result = true;
             if ($debug > 1) {
-                error_log('$this->items[' . $itemId . '] was not an object', 0);
+                error_log('$this->items['.$itemId.'] was not an object', 0);
             }
         }
 
         if ($debug > 1) {
-            error_log('End of prerequisites_match(). Error message is now ' . $this->error, 0);
+            error_log('End of prerequisites_match(). Error message is now '.$this->error, 0);
         }
         return $result;
     }
@@ -4193,12 +4193,12 @@ 
             $row = Database :: fetch_array($result);
             $name = domesticate($row['name']);
             if ($set_visibility == 'i') {
-                $s = $name . " " . get_lang('LearnpathNotPublished');
+                $s = $name." ".get_lang('LearnpathNotPublished');
                 $dialogBox = $s;
                 $v = 0;
             }
             if ($set_visibility == 'v') {
-                $s = $name . " " . get_lang('LearnpathPublished');
+                $s = $name." ".get_lang('LearnpathPublished');
                 $dialogBox = $s;
                 $v = 1;
             }
@@ -4281,9 +4281,9 @@ 
         $course_id = api_get_course_int_id();
         $lp_view_table = Database :: get_course_table(TABLE_LP_VIEW);
         $sql = "INSERT INTO $lp_view_table (c_id, lp_id, user_id, view_count, session_id)
-                VALUES ($course_id, " . $this->lp_id . "," . $this->get_user_id() . "," . ($this->attempt + 1) . ", $session_id)";
+                VALUES ($course_id, ".$this->lp_id.",".$this->get_user_id().",".($this->attempt + 1).", $session_id)";
         if ($this->debug > 2) {
-            error_log('New LP - Inserting new lp_view for restart: ' . $sql, 0);
+            error_log('New LP - Inserting new lp_view for restart: '.$sql, 0);
         }
         $res = Database::query($sql);
         $view_id = Database::insert_id();
@@ -4321,10 +4321,10 @@ 
         // TODO: Do a better check on the index pointing to the right item (it is supposed to be working
         // on $ordered_items[] but not sure it's always safe to use with $items[]).
         if ($this->debug > 2) {
-            error_log('New LP - save_current() saving item ' . $this->current, 0);
+            error_log('New LP - save_current() saving item '.$this->current, 0);
         }
         if ($this->debug > 2) {
-            error_log('' . print_r($this->items, true), 0);
+            error_log(''.print_r($this->items, true), 0);
         }
         if (isset($this->items[$this->current]) &&
             is_object($this->items[$this->current])
@@ -4348,7 +4348,7 @@ 
     {
         $debug = $this->debug;
         if ($debug) {
-            error_log('In learnpath::save_item(' . $item_id . ',' . intval($from_outside). ')', 0);
+            error_log('In learnpath::save_item('.$item_id.','.intval($from_outside).')', 0);
         }
         // TODO: Do a better check on the index pointing to the right item (it is supposed to be working
         // on $ordered_items[] but not sure it's always safe to use with $items[]).
@@ -4371,7 +4371,7 @@ 
 
             if ($debug) {
                 error_log('update_queue before:');
-                error_log(print_r($this->update_queue,1));
+                error_log(print_r($this->update_queue, 1));
             }
             $this->autocomplete_parents($item_id);
 
@@ -4379,9 +4379,9 @@ 
             $this->update_queue[$item_id] = $status;
 
             if ($debug) {
-                error_log('get_status(): ' . $status);
+                error_log('get_status(): '.$status);
                 error_log('update_queue after:');
-                error_log(print_r($this->update_queue,1));
+                error_log(print_r($this->update_queue, 1));
             }
             return $res;
         }
@@ -4402,17 +4402,17 @@ 
 
         if (isset($this->current) && !api_is_invitee()) {
             if ($this->debug > 2) {
-                error_log('New LP - Saving current item (' . $this->current . ') for later review', 0);
+                error_log('New LP - Saving current item ('.$this->current.') for later review', 0);
             }
             $sql = "UPDATE $table SET
-                        last_item = " . intval($this->get_current_item_id()). "
+                        last_item = ".intval($this->get_current_item_id())."
                     WHERE
                         c_id = $course_id AND
-                        lp_id = " . $this->get_id() . " AND
+                        lp_id = ".$this->get_id()." AND
                         user_id = " . $this->get_user_id()." ".$session_condition;
 
             if ($this->debug > 2) {
-                error_log('New LP - Saving last item seen : ' . $sql, 0);
+                error_log('New LP - Saving last item seen : '.$sql, 0);
             }
             Database::query($sql);
         }
@@ -4426,7 +4426,7 @@ 
                             progress = $progress
                         WHERE
                             c_id = ".$course_id." AND
-                            lp_id = " . $this->get_id() . " AND
+                            lp_id = " . $this->get_id()." AND
                             user_id = " . $this->get_user_id()." ".$session_condition;
                 // Ignore errors as some tables might not have the progress field just yet.
                 Database::query($sql);
@@ -4442,7 +4442,7 @@ 
     public function set_current_item($item_id = null)
     {
         if ($this->debug > 0) {
-            error_log('New LP - In learnpath::set_current_item(' . $item_id . ')', 0);
+            error_log('New LP - In learnpath::set_current_item('.$item_id.')', 0);
         }
         if (empty ($item_id)) {
             if ($this->debug > 2) {
@@ -4451,7 +4451,7 @@ 
             // Do nothing.
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - New current item given is ' . $item_id . '...', 0);
+                error_log('New LP - New current item given is '.$item_id.'...', 0);
             }
             if (is_numeric($item_id)) {
                 $item_id = intval($item_id);
@@ -4466,10 +4466,10 @@ 
                     }
                 }
                 if ($this->debug > 2) {
-                    error_log('New LP - set_current_item(' . $item_id . ') done. Index is now : ' . $this->index, 0);
+                    error_log('New LP - set_current_item('.$item_id.') done. Index is now : '.$this->index, 0);
                 }
             } else {
-                error_log('New LP - set_current_item(' . $item_id . ') failed. Not a numeric value: ', 0);
+                error_log('New LP - set_current_item('.$item_id.') failed. Not a numeric value: ', 0);
             }
         }
     }
@@ -4494,7 +4494,7 @@ 
             $lp = $this->get_id();
             if ($lp != 0) {
                 $tbl_lp = Database :: get_course_table(TABLE_LP_MAIN);
-                $sql = "UPDATE $tbl_lp SET default_encoding = '$enc' WHERE c_id = ".$course_id." AND id = " . $lp;
+                $sql = "UPDATE $tbl_lp SET default_encoding = '$enc' WHERE c_id = ".$course_id." AND id = ".$lp;
                 $res = Database::query($sql);
                 return $res;
             }
@@ -4518,7 +4518,7 @@ 
 
         if ($lp != 0) {
             $tbl_lp = Database :: get_course_table(TABLE_LP_MAIN);
-            $sql = "UPDATE $tbl_lp SET js_lib = '$lib' WHERE c_id = ".$course_id." AND id = " . $lp;
+            $sql = "UPDATE $tbl_lp SET js_lib = '$lib' WHERE c_id = ".$course_id." AND id = ".$lp;
             $res = Database::query($sql);
             return $res;
         } else {
@@ -4543,10 +4543,10 @@ 
         $course_id = api_get_course_int_id();
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                content_maker = '" . Database::escape_string($this->maker) . "'
+                content_maker = '".Database::escape_string($this->maker)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new content_maker : ' . $this->maker, 0);
+            error_log('New LP - lp updated with new content_maker : '.$this->maker, 0);
         }
         Database::query($sql);
         return true;
@@ -4570,10 +4570,10 @@ 
         $lp_id = $this->get_id();
         $course_id = $this->course_info['real_id'];
         $sql = "UPDATE $lp_table SET
-                name = '" . Database::escape_string($this->name). "'
+                name = '".Database::escape_string($this->name)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new name : ' . $this->name, 0);
+            error_log('New LP - lp updated with new name : '.$this->name, 0);
         }
         $result = Database::query($sql);
         // If the lp is visible on the homepage, change his name there.
@@ -4581,7 +4581,7 @@ 
             $session_id = api_get_session_id();
             $session_condition = api_get_session_condition($session_id);
             $tbl_tool = Database :: get_course_table(TABLE_TOOL_LIST);
-            $link = 'newscorm/lp_controller.php?action=view&lp_id=' . $lp_id.'&id_session='.$session_id;
+            $link = 'newscorm/lp_controller.php?action=view&lp_id='.$lp_id.'&id_session='.$session_id;
             $sql = "UPDATE $tbl_tool SET name = '$this->name'
             	    WHERE
             	        c_id = $course_id AND
@@ -4659,10 +4659,10 @@ 
 
                 // Save it to search engine.
                 foreach ($missing_terms as $term) {
-                    $doc->add_term($prefix . $term, 1);
+                    $doc->add_term($prefix.$term, 1);
                 }
                 foreach ($deprecated_terms as $term) {
-                    $doc->remove_term($prefix . $term);
+                    $doc->remove_term($prefix.$term);
                 }
                 $di->getDb()->replace_document((int) $se_ref['search_did'], $doc);
                 $di->getDb()->flush();
@@ -4687,10 +4687,10 @@ 
         $this->theme = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
-        $sql = "UPDATE $lp_table SET theme = '" . Database::escape_string($this->theme). "'
+        $sql = "UPDATE $lp_table SET theme = '".Database::escape_string($this->theme)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new theme : ' . $this->theme, 0);
+            error_log('New LP - lp updated with new theme : '.$this->theme, 0);
         }
         Database::query($sql);
 
@@ -4713,10 +4713,10 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                preview_image = '" . Database::escape_string($this->preview_image). "'
+                preview_image = '".Database::escape_string($this->preview_image)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new preview image : ' . $this->preview_image, 0);
+            error_log('New LP - lp updated with new preview image : '.$this->preview_image, 0);
         }
         Database::query($sql);
         return true;
@@ -4736,10 +4736,10 @@ 
         $this->author = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
-        $sql = "UPDATE $lp_table SET author = '" . Database::escape_string($name). "'
+        $sql = "UPDATE $lp_table SET author = '".Database::escape_string($name)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new preview author : ' . $this->author, 0);
+            error_log('New LP - lp updated with new preview author : '.$this->author, 0);
         }
         Database::query($sql);
 
@@ -4757,15 +4757,15 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_hide_toc_frame()', 0);
         }
-        if (intval($hide) == $hide){
+        if (intval($hide) == $hide) {
             $this->hide_toc_frame = $hide;
             $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
             $lp_id = $this->get_id();
             $sql = "UPDATE $lp_table SET
-                    hide_toc_frame = '" . $this->hide_toc_frame . "'
+                    hide_toc_frame = '".$this->hide_toc_frame."'
                     WHERE c_id = ".$course_id." AND id = '$lp_id'";
             if ($this->debug > 2) {
-                error_log('New LP - lp updated with new preview hide_toc_frame : ' . $this->author, 0);
+                error_log('New LP - lp updated with new preview hide_toc_frame : '.$this->author, 0);
             }
             Database::query($sql);
 
@@ -4792,7 +4792,7 @@ 
         $sql = "UPDATE $lp_table SET prerequisite = '".$this->prerequisite."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new preview requisite : ' . $this->requisite, 0);
+            error_log('New LP - lp updated with new preview requisite : '.$this->requisite, 0);
         }
         Database::query($sql);
         return true;
@@ -4816,10 +4816,10 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                    content_local = '" . Database::escape_string($name) . "'
+                    content_local = '".Database::escape_string($name)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new proximity : ' . $this->proximity, 0);
+            error_log('New LP - lp updated with new proximity : '.$this->proximity, 0);
         }
         Database::query($sql);
         return true;
@@ -4853,11 +4853,11 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                    use_max_score = '" . $this->use_max_score . "'
+                    use_max_score = '".$this->use_max_score."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
 
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new use_max_score : ' . $this->use_max_score, 0);
+            error_log('New LP - lp updated with new use_max_score : '.$this->use_max_score, 0);
         }
         Database::query($sql);
 
@@ -4884,10 +4884,10 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                expired_on = '" . Database::escape_string($this->expired_on) . "'
+                expired_on = '".Database::escape_string($this->expired_on)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new expired_on : ' . $this->expired_on, 0);
+            error_log('New LP - lp updated with new expired_on : '.$this->expired_on, 0);
         }
         Database::query($sql);
 
@@ -4913,10 +4913,10 @@ 
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET
-                publicated_on = '" . Database::escape_string($this->publicated_on) . "'
+                publicated_on = '".Database::escape_string($this->publicated_on)."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new publicated_on : ' . $this->publicated_on, 0);
+            error_log('New LP - lp updated with new publicated_on : '.$this->publicated_on, 0);
         }
         Database::query($sql);
 
@@ -4936,10 +4936,10 @@ 
         $this->modified_on = api_get_utc_datetime();
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
-        $sql = "UPDATE $lp_table SET modified_on = '" . $this->modified_on . "'
+        $sql = "UPDATE $lp_table SET modified_on = '".$this->modified_on."'
                 WHERE c_id = ".$course_id." AND id = '$lp_id'";
         if ($this->debug > 2) {
-            error_log('New LP - lp updated with new expired_on : ' . $this->modified_on, 0);
+            error_log('New LP - lp updated with new expired_on : '.$this->modified_on, 0);
         }
         Database::query($sql);
         return true;
@@ -5010,13 +5010,13 @@ 
 
         if ($this->last != 0 && $this->last != $this->current && is_object($this->items[$this->last])) {
             if ($this->debug > 2) {
-                error_log('New LP - In learnpath::stop_previous_item() - ' . $this->last . ' is object', 0);
+                error_log('New LP - In learnpath::stop_previous_item() - '.$this->last.' is object', 0);
             }
             switch ($this->get_type()) {
                 case '3' :
                     if ($this->items[$this->last]->get_type() != 'au') {
                         if ($this->debug > 2) {
-                            error_log('New LP - In learnpath::stop_previous_item() - ' . $this->last . ' in lp_type 3 is <> au', 0);
+                            error_log('New LP - In learnpath::stop_previous_item() - '.$this->last.' in lp_type 3 is <> au', 0);
                         }
                         $this->items[$this->last]->close();
                         //$this->autocomplete_parents($this->last);
@@ -5029,7 +5029,7 @@ 
                 case '2' :
                     if ($this->items[$this->last]->get_type() != 'sco') {
                         if ($this->debug > 2) {
-                            error_log('New LP - In learnpath::stop_previous_item() - ' . $this->last . ' in lp_type 2 is <> sco', 0);
+                            error_log('New LP - In learnpath::stop_previous_item() - '.$this->last.' in lp_type 2 is <> sco', 0);
                         }
                         $this->items[$this->last]->close();
                         //$this->autocomplete_parents($this->last);
@@ -5043,7 +5043,7 @@ 
                 case '1' :
                 default :
                     if ($this->debug > 2) {
-                        error_log('New LP - In learnpath::stop_previous_item() - ' . $this->last . ' in lp_type 1 is asset', 0);
+                        error_log('New LP - In learnpath::stop_previous_item() - '.$this->last.' in lp_type 1 is asset', 0);
                     }
                     $this->items[$this->last]->close();
                     break;
@@ -5069,7 +5069,7 @@ 
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $sql = "SELECT * FROM $lp_table
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5090,14 +5090,14 @@ 
                     break;
             }
             $sql = "UPDATE $lp_table SET default_view_mod = '$view_mode'
-                    WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                    WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             Database::query($sql);
             $this->mode = $view_mode;
 
             return $view_mode;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in update_default_view() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in update_default_view() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5115,7 +5115,7 @@ 
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $sql = "SELECT * FROM $lp_table
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5128,14 +5128,14 @@ 
                 $force_return = true;
             }
             $sql = "UPDATE $lp_table SET force_commit = $force
-                    WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                    WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             Database::query($sql);
             $this->force_commit = $force_return;
 
             return $force_return;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in update_default_scorm_commit() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in update_default_scorm_commit() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5164,7 +5164,7 @@ 
                 if ($row['display_order'] != $i) { // If we find a gap in the order, we need to fix it.
                     $need_fix = true;
                     $sql = "UPDATE $lp_table SET display_order = $i
-                            WHERE c_id = ".$course_id." AND id = " . $row['id'];
+                            WHERE c_id = ".$course_id." AND id = ".$row['id'];
                     Database::query($sql);
                 }
                 $i++;
@@ -5185,7 +5185,7 @@ 
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $sql = "SELECT * FROM $lp_table
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5196,13 +5196,13 @@ 
                 $force = 1;
             }
             $sql = "UPDATE $lp_table SET prevent_reinit = $force
-                    WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                    WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             Database::query($sql);
             $this->prevent_reinit = $force;
             return $force;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in update_reinit() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in update_reinit() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5218,11 +5218,11 @@ 
     {
         //Set default value for seriousgame_mode
         if (!isset($this->seriousgame_mode)) {
-            $this->seriousgame_mode=0;
+            $this->seriousgame_mode = 0;
         }
         // Set default value for prevent_reinit
         if (!isset($this->prevent_reinit)) {
-            $this->prevent_reinit =1;
+            $this->prevent_reinit = 1;
         }
         if ($this->seriousgame_mode == 1 && $this->prevent_reinit == 1) {
             return 'seriousgame';
@@ -5270,7 +5270,7 @@ 
         $sql = "UPDATE $lp_table SET
                 prevent_reinit = $prevent_reinit ,
                 seriousgame_mode = $sg_mode
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if ($res) {
             return true;
@@ -5322,7 +5322,7 @@ 
             error_log('New LP - In learnpath::set_seriousgame_mode()', 0);
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
-        $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+        $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5333,13 +5333,13 @@ 
                 $force = 1;
             }
             $sql = "UPDATE $lp_table SET seriousgame_mode = $force
-			        WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+			        WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             Database::query($sql);
             $this->seriousgame_mode = $force;
             return $force;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in set_seriousgame_mode() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in set_seriousgame_mode() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5357,7 +5357,7 @@ 
         }
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $sql = "SELECT * FROM $lp_table
-                WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                WHERE c_id = ".$course_id." AND id = ".$this->get_id();
         $res = Database::query($sql);
         if (Database :: num_rows($res) > 0) {
             $row = Database :: fetch_array($res);
@@ -5368,13 +5368,13 @@ 
                 $force = 1;
             }
             $sql = "UPDATE $lp_table SET debug = $force
-                    WHERE c_id = ".$course_id." AND id = " . $this->get_id();
+                    WHERE c_id = ".$course_id." AND id = ".$this->get_id();
             $res = Database::query($sql);
             $this->scorm_debug = $force;
             return $force;
         } else {
             if ($this->debug > 2) {
-                error_log('New LP - Problem in update_scorm_debug() - could not find LP ' . $this->get_id() . ' in DB', 0);
+                error_log('New LP - Problem in update_scorm_debug() - could not find LP '.$this->get_id().' in DB', 0);
             }
         }
         return -1;
@@ -5403,7 +5403,7 @@ 
      * @param int $depth
      * @param array $tmp
      */
-    public function create_tree_array($array, $parent = 0, $depth = -1, $tmp = array ())
+    public function create_tree_array($array, $parent = 0, $depth = -1, $tmp = array())
     {
         if ($this->debug > 1) {
             error_log('New LP - In learnpath::create_tree_array())', 0);
@@ -5489,7 +5489,7 @@ 
 
         // we need to start a form when we want to update all the mp3 files
         if ($update_audio == 'true') {
-            $return .= '<form action="' . api_get_self() . '?cidReq=' . Security :: remove_XSS($_GET['cidReq']) . '&updateaudio=' . Security :: remove_XSS($_GET['updateaudio']) .'&action=' . Security :: remove_XSS($_GET['action']) . '&lp_id=' . $_SESSION['oLP']->lp_id . '" method="post" enctype="multipart/form-data" name="updatemp3" id="updatemp3">';
+            $return .= '<form action="'.api_get_self().'?cidReq='.Security :: remove_XSS($_GET['cidReq']).'&updateaudio='.Security :: remove_XSS($_GET['updateaudio']).'&action='.Security :: remove_XSS($_GET['action']).'&lp_id='.$_SESSION['oLP']->lp_id.'" method="post" enctype="multipart/form-data" name="updatemp3" id="updatemp3">';
         }
         $return .= '<div id="message"></div>';
         if (count($this->items) == 0) {
@@ -5497,14 +5497,14 @@ 
         } else {
             $return_audio = '<table class="data_table">';
             $return_audio .= '<tr>';
-            $return_audio .= '<th width="40%">' . get_lang('Title') . '</th>';
-            $return_audio .= '<th>' . get_lang('Audio') . '</th>';
+            $return_audio .= '<th width="40%">'.get_lang('Title').'</th>';
+            $return_audio .= '<th>'.get_lang('Audio').'</th>';
             $return_audio .= '</tr>';
 
             if ($update_audio != 'true') {
                 $return .= '<div class="col-md-12">';
                 $return .= self::return_new_tree($update_audio);
-                $return .='</div>';
+                $return .= '</div>';
                 $return .= Display::div(Display::url(get_lang('Save'), '#', array('id'=>'listSubmit', 'class'=>'btn btn-primary')), array('style'=>'float:left; margin-top:15px;width:100%'));
             } else {
                 $return_audio .= self::return_new_tree($update_audio);
@@ -5514,7 +5514,7 @@ 
             // We need to close the form when we are updating the mp3 files.
             if ($update_audio == 'true') {
                 $return .= '<div class="footer-audio">';
-                $return .= Display::button('save_audio','<em class="fa fa-file-audio-o"></em> '. get_lang('SaveAudioAndOrganization'),array('class'=>'btn btn-primary','type'=>'submit'));
+                $return .= Display::button('save_audio', '<em class="fa fa-file-audio-o"></em> '.get_lang('SaveAudioAndOrganization'), array('class'=>'btn btn-primary', 'type'=>'submit'));
                 $return .= '</div>';
                 //$return .= '<div><button class="btn btn-primary" type="submit" name="save_audio" id="save_audio">' . get_lang('SaveAudioAndOrganization') . '</button></div>'; // TODO: What kind of language variable is this?
             }
@@ -5535,7 +5535,7 @@ 
     public function return_new_tree($update_audio = 'false', $drop_element_here = false)
     {
         $return = '';
-        $is_allowed_to_edit = api_is_allowed_to_edit(null,true);
+        $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
 
         $course_id = api_get_course_int_id();
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
@@ -5583,7 +5583,7 @@ 
 
             //Link for the documents
             if ($arrLP[$i]['item_type'] == 'document') {
-                $url = api_get_self() . '?'.api_get_cidreq().'&action=view_item&mode=preview_document&id=' . $arrLP[$i]['id'] . '&lp_id=' . $this->lp_id;
+                $url = api_get_self().'?'.api_get_cidreq().'&action=view_item&mode=preview_document&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id;
                 $title_cut = Display::url(
                     $title_cut,
                     $url,
@@ -5599,23 +5599,23 @@ 
             } else {
                 $oddClass = 'row_even';
             }
-            $return_audio .= '<tr id ="lp_item_'.$arrLP[$i]['id'] .'" class="' . $oddClass . '">';
+            $return_audio .= '<tr id ="lp_item_'.$arrLP[$i]['id'].'" class="'.$oddClass.'">';
 
             $icon_name = str_replace(' ', '', $arrLP[$i]['item_type']);
 
             $icon = '';
-            if (file_exists('../img/lp_' . $icon_name . '.png')) {
-                $icon = '<img src="../img/lp_' . $icon_name . '.png" />';
+            if (file_exists('../img/lp_'.$icon_name.'.png')) {
+                $icon = '<img src="../img/lp_'.$icon_name.'.png" />';
             } else {
-                if (file_exists('../img/lp_' . $icon_name . '.gif')) {
-                    $icon = '<img src="../img/lp_' . $icon_name . '.gif"  />';
+                if (file_exists('../img/lp_'.$icon_name.'.gif')) {
+                    $icon = '<img src="../img/lp_'.$icon_name.'.gif"  />';
                 } else {
                     $icon = '<img src="../img/folder_document.gif" />';
                 }
             }
 
             // The audio column.
-            $return_audio  .= '<td align="left" style="padding-left:10px;">';
+            $return_audio .= '<td align="left" style="padding-left:10px;">';
 
             $audio = '';
 
@@ -5635,10 +5635,10 @@ 
             } else {
                 $types = self::getChapterTypes();
                 if (!in_array($arrLP[$i]['item_type'], $types)) {
-                    $audio .= '<input type="file" name="mp3file' . $arrLP[$i]['id'] . '" id="mp3file" />';
+                    $audio .= '<input type="file" name="mp3file'.$arrLP[$i]['id'].'" id="mp3file" />';
                     if (!empty ($arrLP[$i]['audio'])) {
                         $audio .= '<br />'.Security::remove_XSS($arrLP[$i]['audio']).'<br />
-                        <input type="checkbox" name="removemp3' . $arrLP[$i]['id'] . '" id="checkbox' . $arrLP[$i]['id'] . '" />' . get_lang('RemoveAudio');
+                        <input type="checkbox" name="removemp3' . $arrLP[$i]['id'].'" id="checkbox'.$arrLP[$i]['id'].'" />'.get_lang('RemoveAudio');
                     }
                 }
             }
@@ -5662,7 +5662,7 @@ 
                 // No edit for this item types
                 if (!in_array($arrLP[$i]['item_type'], array('sco', 'asset'))) {
                     if (!in_array($arrLP[$i]['item_type'], array('dokeos_chapter', 'dokeos_module'))) {
-                        $edit_icon .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit_item&view=build&id=' . $arrLP[$i]['id'] . '&lp_id=' . $this->lp_id . '&path_item=' . $arrLP[$i]['path'] . '" class="btn btn-default">';
+                        $edit_icon .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit_item&view=build&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id.'&path_item='.$arrLP[$i]['path'].'" class="btn btn-default">';
                         $edit_icon .= Display::return_icon('edit.png', get_lang('LearnpathEditModule'), array(), ICON_SIZE_TINY);
                         $edit_icon .= '</a>';
 
@@ -5675,7 +5675,7 @@ 
                                 $this->lp_session_id
                             )
                             ) {
-                                $forumIconUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+                                $forumIconUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
                                     'action' => 'dissociate_forum',
                                     'id' => $arrLP[$i]['id'],
                                     'lp_id' => $this->lp_id
@@ -5686,7 +5686,7 @@ 
                                     ['class' => 'btn btn-default lp-btn-dissociate-forum']
                                 );
                             } else {
-                                $forumIconUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
+                                $forumIconUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
                                     'action' => 'create_forum',
                                     'id' => $arrLP[$i]['id'],
                                     'lp_id' => $this->lp_id
@@ -5699,17 +5699,17 @@ 
                             }
                         }
                     } else {
-                        $edit_icon .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit_item&id=' . $arrLP[$i]['id'] . '&lp_id=' . $this->lp_id . '&path_item=' . $arrLP[$i]['path'] . '" class="btn btn-default">';
+                        $edit_icon .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=edit_item&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id.'&path_item='.$arrLP[$i]['path'].'" class="btn btn-default">';
                         $edit_icon .= Display::return_icon('edit.png', get_lang('LearnpathEditModule'), array(), ICON_SIZE_TINY);
                         $edit_icon .= '</a>';
                     }
                 }
 
-                $delete_icon .= ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete_item&id=' . $arrLP[$i]['id'] . '&lp_id=' . $this->lp_id . '" onclick="return confirmation(\'' . addslashes($title) . '\');" class="btn btn-default">';
+                $delete_icon .= ' <a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete_item&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id.'" onclick="return confirmation(\''.addslashes($title).'\');" class="btn btn-default">';
                 $delete_icon .= Display::return_icon('delete.png', get_lang('LearnpathDeleteModule'), array(), ICON_SIZE_TINY);
                 $delete_icon .= '</a>';
 
-                $url = api_get_self() . '?'.api_get_cidreq().'&view=build&id='.$arrLP[$i]['id'] .'&lp_id='.$this->lp_id;
+                $url = api_get_self().'?'.api_get_cidreq().'&view=build&id='.$arrLP[$i]['id'].'&lp_id='.$this->lp_id;
 
                 if (!in_array($arrLP[$i]['item_type'], array('dokeos_chapter', 'dokeos_module', 'dir'))) {
                     $prerequisities_icon = Display::url(Display::return_icon('accept.png', get_lang('LearnpathPrerequisites'), array(), ICON_SIZE_TINY), $url.'&action=edit_item_prereq', ['class' => 'btn btn-default']);
@@ -5718,8 +5718,8 @@ 
                 }
             }
             if ($update_audio != 'true') {
-                $row = $move_icon . ' ' . $icon .
-                    Display::span($title_cut) .
+                $row = $move_icon.' '.$icon.
+                    Display::span($title_cut).
                     Display::tag(
                         'div',
                         "<div class=\"btn-group btn-group-xs\">$audio $edit_icon $forumIcon $prerequisities_icon $move_item_icon $audio_icon $delete_icon</div>",
@@ -5740,8 +5740,8 @@ 
                 $parent_arrays = array();
                 if ($arrLP[$i]['depth'] > 1) {
                     //Getting list of parents
-                    for($j = 0; $j < $arrLP[$i]['depth']; $j++) {
-                        foreach($arrLP as $item) {
+                    for ($j = 0; $j < $arrLP[$i]['depth']; $j++) {
+                        foreach ($arrLP as $item) {
                             if ($item['id'] == $parent_id) {
                                 if ($item['parent_item_id'] == 0) {
                                     $parent_id = $item['id'];
@@ -5763,8 +5763,8 @@ 
                     $parent_arrays = array_reverse($parent_arrays);
                     $val = '$elements';
                     $x = 0;
-                    foreach($parent_arrays as $item) {
-                        if ($x != count($parent_arrays) -1) {
+                    foreach ($parent_arrays as $item) {
+                        if ($x != count($parent_arrays) - 1) {
                             $val .= '["'.$item.'"]["children"]';
                         } else {
                             $val .= '["'.$item.'"]["children"]';
@@ -5827,7 +5827,7 @@ 
                 if (isset($_REQUEST['id']) && $key == $_REQUEST['id']) {
                     $active = 'active';
                 }
-                $return  .= Display::tag('li', Display::div($item['data'], array('class'=>"item_data $active")).$sub_list, array('id'=>$key, 'class'=>'record li_container'));
+                $return .= Display::tag('li', Display::div($item['data'], array('class'=>"item_data $active")).$sub_list, array('id'=>$key, 'class'=>'record li_container'));
             } else {
                 //sections
                 if (isset($item['children'])) {
@@ -5850,17 +5850,17 @@ 
     {
         $gradebook = isset($_GET['gradebook']) ? Security :: remove_XSS($_GET['gradebook']) : null;
         $return = '<div class="actions">';
-        $return .=  '<a href="lp_controller.php?'.api_get_cidreq().'&gradebook=' . $gradebook . '&action=view&lp_id=' . $_SESSION['oLP']->lp_id . '&isStudentView=true">' . Display :: return_icon('preview_view.png', get_lang('Display'),'',ICON_SIZE_MEDIUM).'</a> ';
-        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=admin_view&lp_id=' . $_SESSION['oLP']->lp_id . '&updateaudio=true">' . Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'),'',ICON_SIZE_MEDIUM).'</a>';
-        $return .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=edit&lp_id=' . $_SESSION['oLP']->lp_id . '">' . Display :: return_icon('settings.png', get_lang('CourseSettings'),'',ICON_SIZE_MEDIUM).'</a>';
+        $return .= '<a href="lp_controller.php?'.api_get_cidreq().'&gradebook='.$gradebook.'&action=view&lp_id='.$_SESSION['oLP']->lp_id.'&isStudentView=true">'.Display :: return_icon('preview_view.png', get_lang('Display'), '', ICON_SIZE_MEDIUM).'</a> ';
+        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=admin_view&lp_id='.$_SESSION['oLP']->lp_id.'&updateaudio=true">'.Display :: return_icon('upload_audio.png', get_lang('UpdateAllAudioFragments'), '', ICON_SIZE_MEDIUM).'</a>';
+        $return .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=edit&lp_id='.$_SESSION['oLP']->lp_id.'">'.Display :: return_icon('settings.png', get_lang('CourseSettings'), '', ICON_SIZE_MEDIUM).'</a>';
         $buttons = array(
             array(
                 'title' => get_lang('SetPrerequisiteForEachItem'),
-                'href' => 'lp_controller.php?'.api_get_cidreq().'&action=set_previous_step_as_prerequisite&lp_id=' . $_SESSION['oLP']->lp_id,
+                'href' => 'lp_controller.php?'.api_get_cidreq().'&action=set_previous_step_as_prerequisite&lp_id='.$_SESSION['oLP']->lp_id,
             ),
             array(
                 'title' => get_lang('ClearAllPrerequisites'),
-                'href' => 'lp_controller.php?'.api_get_cidreq().'&action=clear_prerequisites&lp_id=' . $_SESSION['oLP']->lp_id,
+                'href' => 'lp_controller.php?'.api_get_cidreq().'&action=clear_prerequisites&lp_id='.$_SESSION['oLP']->lp_id,
             ),
         );
         $return .= Display::group_button(get_lang('PrerequisitesOptions'), $buttons);
@@ -5881,7 +5881,7 @@ 
     {
         // Creating learning_path folder
         $dir = '/learning_path';
-        $filepath = api_get_path(SYS_COURSE_PATH).$course['path'] . '/document';
+        $filepath = api_get_path(SYS_COURSE_PATH).$course['path'].'/document';
         $folder = false;
         if (!is_dir($filepath.'/'.$dir)) {
             $folderData = create_unexisting_directory(
@@ -5922,9 +5922,9 @@ 
         // Creating LP folder
         if ($folder) {
             //Limits title size
-            $title = api_substr(api_replace_dangerous_char($lp_name), 0 , 80);
+            $title = api_substr(api_replace_dangerous_char($lp_name), 0, 80);
             $dir   = $dir.$title;
-            $filepath = api_get_path(SYS_COURSE_PATH) . $course['path'] . '/document';
+            $filepath = api_get_path(SYS_COURSE_PATH).$course['path'].'/document';
             if (!is_dir($filepath.'/'.$dir)) {
                 $folderData = create_unexisting_directory(
                     $course,
@@ -5944,7 +5944,7 @@ 
             }
             $dir = $dir.'/';
             if ($folder) {
-                $filepath = api_get_path(SYS_COURSE_PATH) . $course['path'] . '/document'.$dir;
+                $filepath = api_get_path(SYS_COURSE_PATH).$course['path'].'/document'.$dir;
             }
         }
         $array = array(
@@ -5983,12 +5983,12 @@ 
             $dir = substr($dir, 1);
         }
         if (!empty($dir[0]) && $dir[0] != '/') {
-            $dir = '/' . $dir;
+            $dir = '/'.$dir;
         }
         if (isset($dir[strlen($dir) - 1]) && $dir[strlen($dir) - 1] != '/') {
             $dir .= '/';
         }
-        $filepath = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document' . $dir;
+        $filepath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document'.$dir;
 
         if (empty($_POST['dir']) && empty($_GET['dir'])) {
             //Generates folder
@@ -5998,7 +5998,7 @@ 
         }
 
         if (!is_dir($filepath)) {
-            $filepath = api_get_path(SYS_COURSE_PATH) . $courseInfo['path'] . '/document/';
+            $filepath = api_get_path(SYS_COURSE_PATH).$courseInfo['path'].'/document/';
             $dir = '/';
         }
 
@@ -6021,10 +6021,10 @@ 
         $tmp_filename = $filename;
 
         $i = 0;
-        while (file_exists($filepath . $tmp_filename . '.'.$extension))
-            $tmp_filename = $filename . '_' . ++ $i;
+        while (file_exists($filepath.$tmp_filename.'.'.$extension))
+            $tmp_filename = $filename.'_'.++ $i;
 
-        $filename = $tmp_filename . '.'.$extension;
+        $filename = $tmp_filename.'.'.$extension;
         if ($extension == 'html') {
             $content = stripslashes($content);
             $content = str_replace(
@@ -6059,12 +6059,12 @@ 
             );
         }
 
-        if (!file_exists($filepath . $filename)) {
-            if ($fp = @ fopen($filepath . $filename, 'w')) {
+        if (!file_exists($filepath.$filename)) {
+            if ($fp = @ fopen($filepath.$filename, 'w')) {
                 fputs($fp, $content);
                 fclose($fp);
 
-                $file_size = filesize($filepath . $filename);
+                $file_size = filesize($filepath.$filename);
                 $save_file_path = $dir.$filename;
 
                 $document_id = add_document(
@@ -6096,12 +6096,12 @@ 
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                         $ct = '';
                         if ($new_comment)
-                            $ct .= ", comment='" . Database::escape_string($new_comment). "'";
+                            $ct .= ", comment='".Database::escape_string($new_comment)."'";
                         if ($new_title)
-                            $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                            $ct .= ", title='".Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
 
-                        $sql = "UPDATE " . $tbl_doc ." SET " . substr($ct, 1)."
-                               WHERE c_id = ".$course_id." AND id = " . $document_id;
+                        $sql = "UPDATE ".$tbl_doc." SET ".substr($ct, 1)."
+                               WHERE c_id = ".$course_id." AND id = ".$document_id;
                         Database::query($sql);
                     }
                 }
@@ -6129,42 +6129,42 @@ 
             $dir = substr($dir, 1);
 
         if ($dir[0] != '/')
-            $dir = '/' . $dir;
+            $dir = '/'.$dir;
 
         if ($dir[strlen($dir) - 1] != '/')
             $dir .= '/';
 
-        $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
+        $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
         if (!is_dir($filepath)) {
-            $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document/';
+            $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
             $dir = '/';
         }
 
         $table_doc = Database :: get_course_table(TABLE_DOCUMENT);
         if (isset($_POST['path']) && !empty($_POST['path'])) {
             $document_id = intval($_POST['path']);
-            $sql = "SELECT path FROM " . $table_doc . "
-                    WHERE c_id = $course_id AND id = " . $document_id;
+            $sql = "SELECT path FROM ".$table_doc."
+                    WHERE c_id = $course_id AND id = ".$document_id;
             $res = Database::query($sql);
             $row = Database :: fetch_array($res);
             $content = stripslashes($_POST['content_lp']);
-            $file = $filepath . $row['path'];
+            $file = $filepath.$row['path'];
 
             if ($fp = @ fopen($file, 'w')) {
-                $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'] . '/courses/', $content);
+                $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
 
                 // Change the path of mp3 to absolute.
                 // The first regexp deals with :// urls.
-                $content = preg_replace("|(flashvars=\"file=)([^:/]+)/|", "$1" . api_get_path(REL_COURSE_PATH) . $_course['path'] . '/document/', $content);
+                $content = preg_replace("|(flashvars=\"file=)([^:/]+)/|", "$1".api_get_path(REL_COURSE_PATH).$_course['path'].'/document/', $content);
                 // The second regexp deals with audio/ urls.
-                $content = preg_replace("|(flashvars=\"file=)([^:/]+)/|", "$1" . api_get_path(REL_COURSE_PATH) . $_course['path'] . '/document/$2/', $content);
+                $content = preg_replace("|(flashvars=\"file=)([^:/]+)/|", "$1".api_get_path(REL_COURSE_PATH).$_course['path'].'/document/$2/', $content);
                 fputs($fp, $content);
                 fclose($fp);
 
-                $sql = "UPDATE " . $table_doc ." SET
+                $sql = "UPDATE ".$table_doc." SET
                             title='".Database::escape_string($_POST['title'])."'
-                        WHERE c_id = ".$course_id." AND id = " . $document_id;
+                        WHERE c_id = ".$course_id." AND id = ".$document_id;
                 Database::query($sql);
             }
         }
@@ -6182,10 +6182,10 @@ 
         $return = '';
         if (is_numeric($item_id)) {
             $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
-            $sql = "SELECT lp.* FROM " . $tbl_lp_item . " as lp
-                    WHERE c_id = ".$course_id." AND lp.id = " . intval($item_id);
+            $sql = "SELECT lp.* FROM ".$tbl_lp_item." as lp
+                    WHERE c_id = ".$course_id." AND lp.id = ".intval($item_id);
             $result = Database::query($sql);
-            while ($row = Database :: fetch_array($result,'ASSOC')) {
+            while ($row = Database :: fetch_array($result, 'ASSOC')) {
                 $_SESSION['parent_item_id'] = ($row['item_type'] == 'dokeos_chapter' || $row['item_type'] == 'dokeos_module' || $row['item_type'] == 'dir') ? $item_id : 0;
 
                 // Prevents wrong parent selection for document, see Bug#1251.
@@ -6212,8 +6212,8 @@ 
                         break;
                     case TOOL_DOCUMENT:
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
-                        $sql_doc = "SELECT path FROM " . $tbl_doc . "
-                                    WHERE c_id = ".$course_id." AND id = " . intval($row['path']);
+                        $sql_doc = "SELECT path FROM ".$tbl_doc."
+                                    WHERE c_id = ".$course_id." AND id = ".intval($row['path']);
                         $result = Database::query($sql_doc);
                         $path_file = Database::result($result, 0, 0);
                         $path_parts = pathinfo($path_file);
@@ -6252,7 +6252,7 @@ 
         if (is_numeric($item_id)) {
             $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
             $sql = "SELECT * FROM $tbl_lp_item
-                    WHERE c_id = ".$course_id." AND id = " . intval($item_id);
+                    WHERE c_id = ".$course_id." AND id = ".intval($item_id);
             $res = Database::query($sql);
             $row = Database::fetch_array($res);
 
@@ -6263,21 +6263,21 @@ 
                 case 'sco' :
                     if (isset ($_GET['view']) && $_GET['view'] == 'build') {
                         $return .= $this->display_manipulate($item_id, $row['item_type']);
-                        $return .= $this->display_item_form($row['item_type'], get_lang('EditCurrentChapter') . ' :', 'edit', $item_id, $row);
+                        $return .= $this->display_item_form($row['item_type'], get_lang('EditCurrentChapter').' :', 'edit', $item_id, $row);
                     } else {
-                        $return .= $this->display_item_small_form($row['item_type'], get_lang('EditCurrentChapter') . ' :', $row);
+                        $return .= $this->display_item_small_form($row['item_type'], get_lang('EditCurrentChapter').' :', $row);
                     }
                     break;
                 case TOOL_DOCUMENT :
                     $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                     $sql = "SELECT lp.*, doc.path as dir
-                            FROM " . $tbl_lp_item . " as lp
-                            LEFT JOIN " . $tbl_doc . " as doc
+                            FROM " . $tbl_lp_item." as lp
+                            LEFT JOIN " . $tbl_doc." as doc
                             ON doc.id = lp.path
                             WHERE
                                 lp.c_id = $course_id AND
                                 doc.c_id = $course_id AND
-                                lp.id = " . intval($item_id);
+                                lp.id = ".intval($item_id);
                     $res_step = Database::query($sql);
                     $row_step = Database :: fetch_array($res_step);
                     $return .= $this->display_manipulate($item_id, $row['item_type']);
@@ -6287,8 +6287,8 @@ 
                     $link_id = (string) $row['path'];
                     if (ctype_digit($link_id)) {
                         $tbl_link = Database :: get_course_table(TABLE_LINK);
-                        $sql_select = 'SELECT url FROM ' . $tbl_link . '
-                                       WHERE c_id = '.$course_id.' AND id = ' . intval($link_id);
+                        $sql_select = 'SELECT url FROM '.$tbl_link.'
+                                       WHERE c_id = '.$course_id.' AND id = '.intval($link_id);
                         $res_link = Database::query($sql_select);
                         $row_link = Database :: fetch_array($res_link);
                         if (is_array($row_link)) {
@@ -6301,9 +6301,9 @@ 
                 case 'dokeos_module' :
                     if (isset ($_GET['view']) && $_GET['view'] == 'build') {
                         $return .= $this->display_manipulate($item_id, $row['item_type']);
-                        $return .= $this->display_item_form($row['item_type'], get_lang('EditCurrentModule') . ' :', 'edit', $item_id, $row);
+                        $return .= $this->display_item_form($row['item_type'], get_lang('EditCurrentModule').' :', 'edit', $item_id, $row);
                     } else {
-                        $return .= $this->display_item_small_form($row['item_type'], get_lang('EditCurrentModule') . ' :', $row);
+                        $return .= $this->display_item_small_form($row['item_type'], get_lang('EditCurrentModule').' :', $row);
                     }
                     break;
                 case TOOL_QUIZ :
@@ -6358,7 +6358,7 @@ 
 
         $headers = array(
             Display::return_icon('folder_document.png', get_lang('Documents'), array(), ICON_SIZE_BIG),
-            Display::return_icon('quiz.png',  get_lang('Quiz'), array(), ICON_SIZE_BIG),
+            Display::return_icon('quiz.png', get_lang('Quiz'), array(), ICON_SIZE_BIG),
             Display::return_icon('links.png', get_lang('Links'), array(), ICON_SIZE_BIG),
             Display::return_icon('works.png', get_lang('Works'), array(), ICON_SIZE_BIG),
             Display::return_icon('forum.png', get_lang('Forums'), array(), ICON_SIZE_BIG),
@@ -6398,16 +6398,16 @@ 
         $course_id = api_get_course_int_id();
         $return = '';
         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
-        $sql_doc = "SELECT * FROM " . $tbl_doc . "
-                    WHERE c_id = ".$course_id." AND id = " . $id;
+        $sql_doc = "SELECT * FROM ".$tbl_doc."
+                    WHERE c_id = ".$course_id." AND id = ".$id;
         $res_doc = Database::query($sql_doc);
         $row_doc = Database :: fetch_array($res_doc);
 
         // TODO: Add a path filter.
         if ($iframe) {
-            $return .= '<iframe id="learnpath_preview_frame" frameborder="0" height="400" width="100%" scrolling="auto" src="' . api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/document' . str_replace('%2F', '/', urlencode($row_doc['path'])) . '?' . api_get_cidreq() . '"></iframe>';
+            $return .= '<iframe id="learnpath_preview_frame" frameborder="0" height="400" width="100%" scrolling="auto" src="'.api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.str_replace('%2F', '/', urlencode($row_doc['path'])).'?'.api_get_cidreq().'"></iframe>';
         } else {
-            $return .= file_get_contents(api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $row_doc['path']);
+            $return .= file_get_contents(api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$row_doc['path']);
         }
 
         return $return;
@@ -6431,8 +6431,8 @@ 
             $item_description = $extra_info['description'];
         } elseif (is_numeric($extra_info)) {
             $sql = "SELECT title, description
-                    FROM " . $tbl_quiz . "
-                    WHERE c_id = ".$course_id." AND id = " . $extra_info;
+                    FROM " . $tbl_quiz."
+                    WHERE c_id = ".$course_id." AND id = ".$extra_info;
 
             $result = Database::query($sql);
             $row = Database::fetch_array($result);
@@ -6442,8 +6442,8 @@ 
             $item_title = '';
             $item_description = '';
         }
-        $item_title			= Security::remove_XSS($item_title);
-        $item_description 	= Security::remove_XSS($item_description);
+        $item_title = Security::remove_XSS($item_title);
+        $item_description = Security::remove_XSS($item_description);
 
         $legend = '<legend>';
         if ($id != 0 && is_array($extra_info))
@@ -6451,13 +6451,13 @@ 
         else
             $parent = 0;
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
 
         $result = Database::query($sql);
-        $arrLP = array ();
+        $arrLP = array();
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -6480,15 +6480,15 @@ 
         unset ($this->arrMenu);
 
         if ($action == 'add') {
-            $legend .= get_lang('CreateTheExercise') . '&nbsp;:';
+            $legend .= get_lang('CreateTheExercise').'&nbsp;:';
         } elseif ($action == 'move') {
-            $legend .= get_lang('MoveTheCurrentExercise') . '&nbsp;:';
+            $legend .= get_lang('MoveTheCurrentExercise').'&nbsp;:';
         } else {
-            $legend .= get_lang('EditCurrentExecice') . '&nbsp;:';
+            $legend .= get_lang('EditCurrentExecice').'&nbsp;:';
         }
 
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
-            $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
+            $legend .= Display :: return_warning_message(get_lang('Warning').' ! '.get_lang('WarningEditingDocument'));
         }
 
         $legend .= '</legend>';
@@ -6501,34 +6501,34 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . '</label></td>';
-            $return .= '<td class="input"><input id="idTitle" name="title" size="44" type="text" value="' . $item_title . '" /></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').'</label></td>';
+            $return .= '<td class="input"><input id="idTitle" name="title" size="44" type="text" value="'.$item_title.'" /></td>';
             $return .= '</tr>';
         }
 
         $return .= '<tr>';
 
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . '</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').'</label></td>';
         $return .= '<td class="input">';
 
         // Select for Parent item, root or chapter
         $return .= '<select id="idParent" style="width:100%;" name="parent" onChange="javascript: load_cbo(this.value);" size="1">';
 
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
 
-        $arrHide = array (
+        $arrHide = array(
             $id
         );
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($action != 'add') {
                 if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 } else {
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
                 if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
             }
         }
         if (is_array($arrLP)) {
@@ -6540,11 +6540,11 @@ 
         $return .= '</tr>';
         $return .= '<tr>';
 
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . '</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').'</label></td>';
         $return .= '<td class="input">';
 
         $return .= '<select class="learnpath_item_form" style="width:100%;" id="previous" name="previous" size="1">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $return .= '<option class="top" value="0">'.get_lang('FirstPosition').'</option>';
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
                 if (is_array($extra_info)) {
@@ -6556,7 +6556,7 @@ 
                 } else {
                     $selected = '';
                 }
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
         $return .= '</select>';
@@ -6573,7 +6573,7 @@ 
                     }
                 }
             }
-            $arrHide = array ();
+            $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
                     if (is_array($extra_info)) {
@@ -6619,27 +6619,27 @@ 
 
         $return .= '<tr>';
         if ($action == 'add') {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">' . get_lang('AddExercise') . '</button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">'.get_lang('AddExercise').'</button></td>';
         } else {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">' . get_lang('EditCurrentExecice') . '</button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">'.get_lang('EditCurrentExecice').'</button></td>';
         }
 
         $return .= '</tr>';
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         } elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
 
-        $return .= '<input name="type" type="hidden" value="' . TOOL_QUIZ . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_QUIZ.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
 
         $return .= '</form>';
         $return .= '</div>';
@@ -6666,11 +6666,11 @@ 
         } elseif (is_numeric($extra_info)) {
             $TBL_DOCUMENT = Database :: get_course_table(TABLE_DOCUMENT);
 
-            $sql = "SELECT * FROM " . $TBL_DOCUMENT . "
+            $sql = "SELECT * FROM ".$TBL_DOCUMENT."
                     WHERE
                         c_id = ".$course_id." AND
-                        path LIKE '" . $uploadPath . "/%/%htm%' AND
-                        id = " . (int) $extra_info . "
+                        path LIKE '" . $uploadPath."/%/%htm%' AND
+                        id = " . (int) $extra_info."
                     ORDER BY id ASC";
 
             $res_hot = Database::query($sql);
@@ -6694,11 +6694,11 @@ 
         }
 
         $sql = "SELECT * FROM $tbl_lp_item
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         $result = Database::query($sql);
-        $arrLP = array ();
+        $arrLP = array();
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -6723,7 +6723,7 @@ 
         else
             $legend .= get_lang('EditCurrentExecice');
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
-            $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
+            $legend .= Display :: return_warning_message(get_lang('Warning').' ! '.get_lang('WarningEditingDocument'));
         }
         $legend .= '</legend>';
 
@@ -6731,11 +6731,11 @@ 
         $return .= $legend;
         $return .= '<table cellpadding="0" cellspacing="0" class="lp_form">';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . ' :</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').' :</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="idParent" name="parent" onChange="javascript: load_cbo(this.value);" size="1">';
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
-        $arrHide = array (
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
+        $arrHide = array(
             $id
         );
 
@@ -6743,13 +6743,13 @@ 
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($action != 'add') {
                     if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                        $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                        $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                     } else {
                         $arrHide[] = $arrLP[$i]['id'];
                     }
                 } else {
                     if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                        $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                        $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 }
             }
 
@@ -6760,10 +6760,10 @@ 
         $return .= '</td>';
         $return .= '</tr>';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . ' :</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').' :</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="previous" name="previous" size="1">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $return .= '<option class="top" value="0">'.get_lang('FirstPosition').'</option>';
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
@@ -6773,7 +6773,7 @@ 
                 else
                     $selected = '';
 
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
 
@@ -6783,8 +6783,8 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . ' :</label></td>';
-            $return .= '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" /></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').' :</label></td>';
+            $return .= '<td class="input"><input id="idTitle" name="title" type="text" value="'.$item_title.'" /></td>';
             $return .= '</tr>';
             $id_prerequisite = 0;
             if (is_array($arrLP) && count($arrLP) > 0) {
@@ -6795,7 +6795,7 @@ 
                     }
                 }
 
-                $arrHide = array ();
+                $arrHide = array();
                 for ($i = 0; $i < count($arrLP); $i++) {
                     if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
                         if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
@@ -6809,22 +6809,22 @@ 
         }
 
         $return .= '<tr>';
-        $return .= '<td>&nbsp; </td><td><button class="save" name="submit_button" action="edit" type="submit">' . get_lang('SaveHotpotatoes') . '</button></td>';
+        $return .= '<td>&nbsp; </td><td><button class="save" name="submit_button" action="edit" type="submit">'.get_lang('SaveHotpotatoes').'</button></td>';
         $return .= '</tr>';
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         } elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
-        $return .= '<input name="type" type="hidden" value="' . TOOL_HOTPOTATOES . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_HOTPOTATOES.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
         $return .= '</form>';
 
         return $return;
@@ -6847,8 +6847,8 @@ 
             $item_title = stripslashes($extra_info['title']);
         } elseif (is_numeric($extra_info)) {
             $sql = "SELECT forum_title as title, forum_comment as comment
-                    FROM " . $tbl_forum . "
-                    WHERE c_id = ".$course_id." AND forum_id = " . $extra_info;
+                    FROM " . $tbl_forum."
+                    WHERE c_id = ".$course_id." AND forum_id = ".$extra_info;
 
             $result = Database::query($sql);
             $row = Database :: fetch_array($result);
@@ -6868,7 +6868,7 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
+        $sql = "SELECT * FROM ".$tbl_lp_item."
                 WHERE
                     c_id = ".$course_id." AND
                     lp_id = " . $this->lp_id;
@@ -6876,7 +6876,7 @@ 
         $arrLP = array();
 
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -6898,10 +6898,10 @@ 
         unset($this->arrMenu);
 
         if ($action == 'add')
-            $legend .= get_lang('CreateTheForum') . '&nbsp;:';
-        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentForum') . '&nbsp;:';
+            $legend .= get_lang('CreateTheForum').'&nbsp;:';
+        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentForum').'&nbsp;:';
         else
-            $legend .= get_lang('EditCurrentForum') . '&nbsp;:';
+            $legend .= get_lang('EditCurrentForum').'&nbsp;:';
 
         $legend .= '</legend>';
         $return = '<div class="sectioncomment">';
@@ -6911,16 +6911,16 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . '</label></td>';
-            $return .= '<td class="input"><input id="idTitle" size="44" name="title" type="text" value="' . $item_title . '" class="learnpath_item_form" /></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').'</label></td>';
+            $return .= '<td class="input"><input id="idTitle" size="44" name="title" type="text" value="'.$item_title.'" class="learnpath_item_form" /></td>';
             $return .= '</tr>';
         }
 
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . '</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="idParent" style="width:100%;" name="parent" onChange="javascript: load_cbo(this.value);" class="learnpath_item_form" size="1">';
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
         $arrHide = array(
             $id
         );
@@ -6929,13 +6929,13 @@ 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($action != 'add') {
                 if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 } else {
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
                 if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
             }
         }
         if (is_array($arrLP)) {
@@ -6946,10 +6946,10 @@ 
         $return .= '</td>';
         $return .= '</tr>';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . '</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="previous" name="previous" style="width:100%;" size="1" class="learnpath_item_form">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $return .= '<option class="top" value="0">'.get_lang('FirstPosition').'</option>';
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
@@ -6959,8 +6959,8 @@ 
                 else
                     $selected = '';
 
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' .
-                    get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.
+                    get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
 
@@ -6994,25 +6994,25 @@ 
         $return .= '<tr>';
 
         if ($action == 'add') {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit"> ' . get_lang('AddForumToCourse') . ' </button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit"> '.get_lang('AddForumToCourse').' </button></td>';
         } else {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit"> ' . get_lang('EditCurrentForum') . ' </button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit"> '.get_lang('EditCurrentForum').' </button></td>';
         }
         $return .= '</tr>';
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         } elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
-        $return .= '<input name="type" type="hidden" value="' . TOOL_FORUM . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_FORUM.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
         $return .= '</form>';
         $return .= '</div>';
 
@@ -7039,7 +7039,7 @@ 
             $item_title = stripslashes($extra_info['title']);
         } elseif (is_numeric($extra_info)) {
             $sql = "SELECT thread_title as title FROM $tbl_forum
-                    WHERE c_id = $course_id AND thread_id = " . $extra_info;
+                    WHERE c_id = $course_id AND thread_id = ".$extra_info;
 
             $result = Database::query($sql);
             $row = Database :: fetch_array($result);
@@ -7059,15 +7059,15 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
 
         $result = Database::query($sql);
 
-        $arrLP = array ();
+        $arrLP = array();
 
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -7090,31 +7090,31 @@ 
 
         $return .= '<form method="POST">';
         if ($action == 'add')
-            $return .= '<legend>' . get_lang('CreateTheForum') . '</legend>';
-        elseif ($action == 'move') $return .= '<p class="lp_title">' . get_lang('MoveTheCurrentForum') . '&nbsp;:</p>';
+            $return .= '<legend>'.get_lang('CreateTheForum').'</legend>';
+        elseif ($action == 'move') $return .= '<p class="lp_title">'.get_lang('MoveTheCurrentForum').'&nbsp;:</p>';
         else
-            $return .= '<legend>' . get_lang('EditCurrentForum') . '</legend>';
+            $return .= '<legend>'.get_lang('EditCurrentForum').'</legend>';
 
         $return .= '<table cellpadding="0" cellspacing="0" class="lp_form">';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . '</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="idParent" name="parent" onChange="javascript: load_cbo(this.value);" size="1">';
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
-        $arrHide = array (
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
+        $arrHide = array(
             $id
         );
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($action != 'add') {
                 if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 } else {
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
                 if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
             }
         }
 
@@ -7126,10 +7126,10 @@ 
         $return .= '</td>';
         $return .= '</tr>';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . '</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="previous" name="previous" size="1">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $return .= '<option class="top" value="0">'.get_lang('FirstPosition').'</option>';
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
                 if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
@@ -7138,7 +7138,7 @@ 
                 else
                     $selected = '';
 
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
         $return .= '</select>';
@@ -7146,8 +7146,8 @@ 
         $return .= '</tr>';
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . '</label></td>';
-            $return .= '<td class="input"><input id="idTitle" name="title" type="text" value="' . $item_title . '" /></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').'</label></td>';
+            $return .= '<td class="input"><input id="idTitle" name="title" type="text" value="'.$item_title.'" /></td>';
             $return .= '</tr>';
             $return .= '<tr>';
             $return .= '</tr>';
@@ -7174,17 +7174,17 @@ 
             }
 
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idPrerequisites">' . get_lang('LearnpathPrerequisites') . '</label></td>';
-            $return .= '<td class="input"><select name="prerequisites" id="prerequisites"><option value="0">' . get_lang('NoPrerequisites') . '</option>';
+            $return .= '<td class="label"><label for="idPrerequisites">'.get_lang('LearnpathPrerequisites').'</label></td>';
+            $return .= '<td class="input"><select name="prerequisites" id="prerequisites"><option value="0">'.get_lang('NoPrerequisites').'</option>';
 
             foreach ($arrHide as $key => $value) {
                 if ($key == $s_selected_position && $action == 'add') {
-                    $return .= '<option value="' . $key . '" selected="selected">' . $value['value'] . '</option>';
+                    $return .= '<option value="'.$key.'" selected="selected">'.$value['value'].'</option>';
                 }
                 elseif ($key == $id_prerequisite && $action == 'edit') {
-                    $return .= '<option value="' . $key . '" selected="selected">' . $value['value'] . '</option>';
+                    $return .= '<option value="'.$key.'" selected="selected">'.$value['value'].'</option>';
                 } else {
-                    $return .= '<option value="' . $key . '">' . $value['value'] . '</option>';
+                    $return .= '<option value="'.$key.'">'.$value['value'].'</option>';
                 }
             }
             $return .= "</select></td>";
@@ -7198,19 +7198,19 @@ 
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         }
         elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
 
-        $return .= '<input name="type" type="hidden" value="' . TOOL_THREAD . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_THREAD.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
         $return .= '</form>';
         $return .= '</div>';
 
@@ -7236,10 +7236,10 @@ 
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
 
         if ($id != 0 && is_array($extra_info)) {
-            $item_title 		= $extra_info['title'];
-            $item_description 	= $extra_info['description'];
-            $item_path = api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/scorm/' . $this->path . '/' . stripslashes($extra_info['path']);
-            $item_path_fck = '/scorm/' . $this->path . '/' . stripslashes($extra_info['path']);
+            $item_title = $extra_info['title'];
+            $item_description = $extra_info['description'];
+            $item_path = api_get_path(WEB_COURSE_PATH).$_course['path'].'/scorm/'.$this->path.'/'.stripslashes($extra_info['path']);
+            $item_path_fck = '/scorm/'.$this->path.'/'.stripslashes($extra_info['path']);
         } else {
             $item_title = '';
             $item_description = '';
@@ -7253,17 +7253,17 @@ 
         }
 
         $id  = intval($id);
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
+        $sql = "SELECT * FROM ".$tbl_lp_item."
                 WHERE
                     c_id = ".$course_id." AND
-                    lp_id = " . $this->lp_id . " AND
+                    lp_id = " . $this->lp_id." AND
                     id != $id";
 
         if ($item_type == 'module')
             $sql .= " AND parent_item_id = 0";
 
         $result = Database::query($sql);
-        $arrLP = array ();
+        $arrLP = array();
 
         while ($row = Database :: fetch_array($result)) {
             $arrLP[] = array(
@@ -7291,9 +7291,9 @@ 
 
         $gradebook = isset($_GET['gradebook']) ? Security :: remove_XSS($_GET['gradebook']) : null;
 
-        $url = api_get_self() . '?' .api_get_cidreq().'&gradeboook='.$gradebook.'&action='.$action.'&type='.$item_type.'&lp_id='.$this->lp_id;
+        $url = api_get_self().'?'.api_get_cidreq().'&gradeboook='.$gradebook.'&action='.$action.'&type='.$item_type.'&lp_id='.$this->lp_id;
 
-        $form = new FormValidator('form', 'POST',  $url);
+        $form = new FormValidator('form', 'POST', $url);
 
         $defaults['title'] = api_html_entity_decode($item_title, ENT_QUOTES, $charset);
         $defaults['description'] = $item_description;
@@ -7337,7 +7337,7 @@ 
             $parent_select = $form->addElement('select', 'parent', get_lang('Parent'), '', array('id' => 'idParent', 'onchange' => "javascript: load_cbo(this.value);"));
 
             foreach ($arrHide as $key => $value) {
-                $parent_select->addOption($value['value'], $key, 'style="padding-left:' . $value['padding'] . 'px;"');
+                $parent_select->addOption($value['value'], $key, 'style="padding-left:'.$value['padding'].'px;"');
             }
             if (!empty($s_selected_parent)) {
                 $parent_select->setSelected($s_selected_parent);
@@ -7359,16 +7359,16 @@ 
                     $s_selected_position = $arrLP[$i]['id'];
                 }
 
-                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After') . ' "' . $arrLP[$i]['title'] . '"';
+                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After').' "'.$arrLP[$i]['title'].'"';
             }
         }
 
         $position = $form->addElement('select', 'previous', get_lang('Position'), '', array('id' => 'previous'));
         $padding = isset($value['padding']) ? $value['padding'] : 0;
-        $position->addOption(get_lang('FirstPosition'), 0, 'style="padding-left:' . $padding . 'px;"');
+        $position->addOption(get_lang('FirstPosition'), 0, 'style="padding-left:'.$padding.'px;"');
 
         foreach ($arrHide as $key => $value) {
-            $position->addOption($value['value'] . '"', $key, 'style="padding-left:' . $padding . 'px;"');
+            $position->addOption($value['value'].'"', $key, 'style="padding-left:'.$padding.'px;"');
         }
 
         if (!empty ($s_selected_position)) {
@@ -7397,23 +7397,23 @@ 
         //assets can't be modified
 
         //$item_type == 'asset' ||
-        if (( $item_type == 'sco') && ($extension == 'html' || $extension == 'htm')) {
+        if (($item_type == 'sco') && ($extension == 'html' || $extension == 'htm')) {
 
             if ($item_type == 'sco') {
-                $form->addElement('html', '<script type="text/javascript">alert("' . get_lang('WarningWhenEditingScorm') . '")</script>');
+                $form->addElement('html', '<script type="text/javascript">alert("'.get_lang('WarningWhenEditingScorm').'")</script>');
             }
             $renderer = $form->defaultRenderer();
             $renderer->setElementTemplate('<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{label}<br />{element}', 'content_lp');
 
             $relative_prefix = '';
 
-            $editor_config = array( 'ToolbarSet' 			=> 'LearningPathDocuments',
+            $editor_config = array('ToolbarSet' 			=> 'LearningPathDocuments',
                 'Width' 				=> '100%',
                 'Height' 				=> '500',
                 'FullPage' 				=> true,
                 'CreateDocumentDir' 	=> $relative_prefix,
-                'CreateDocumentWebDir' 	=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().'/scorm/',
-                'BaseHref' 				=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().$item_path_fck
+                'CreateDocumentWebDir' 	=> api_get_path(WEB_COURSE_PATH).api_get_course_path().'/scorm/',
+                'BaseHref' 				=> api_get_path(WEB_COURSE_PATH).api_get_course_path().$item_path_fck
             );
 
             $form->addElement('html_editor', 'content_lp', '', null, $editor_config);
@@ -7422,7 +7422,7 @@ 
             $defaults['content_lp'] = file_get_contents($content_path);
         }
 
-        $form->addElement('hidden', 'type', 'dokeos_' . $item_type);
+        $form->addElement('hidden', 'type', 'dokeos_'.$item_type);
         $form->addElement('hidden', 'post_time', time());
         $form->setDefaults($defaults);
         return $form->return_form();
@@ -7460,8 +7460,8 @@ 
         // We don't display the document form if it's not an editable document (html or txt file).
         if ($action == "add") {
             if (is_numeric($extra_info)) {
-                $sql_doc = "SELECT path FROM " . $tbl_doc . "
-                            WHERE c_id = ".$course_id." AND id = " . intval($extra_info);
+                $sql_doc = "SELECT path FROM ".$tbl_doc."
+                            WHERE c_id = ".$course_id." AND id = ".intval($extra_info);
                 $result = Database::query($sql_doc);
                 $path_file = Database :: result($result, 0, 0);
                 $path_parts = pathinfo($path_file);
@@ -7479,13 +7479,13 @@ 
                 $item_title = stripslashes($path_parts['filename']);
             }
         } elseif (is_numeric($extra_info)) {
-            $sql_doc = "SELECT path, title FROM " . $tbl_doc . "
+            $sql_doc = "SELECT path, title FROM ".$tbl_doc."
                         WHERE
                             c_id = ".$course_id." AND
                             id = " . intval($extra_info);
 
             $result = Database::query($sql_doc);
-            $row 	= Database::fetch_array($result);
+            $row = Database::fetch_array($result);
             $item_title = $row['title'];
             $item_title = str_replace('_', ' ', $item_title);
             if (empty ($item_title)) {
@@ -7504,11 +7504,11 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
 
         $result = Database::query($sql);
-        $arrLP = array ();
+        $arrLP = array();
         while ($row = Database :: fetch_array($result)) {
             $arrLP[] = array(
                 'id' => $row['id'],
@@ -7542,9 +7542,9 @@ 
         $return .= '</legend>';
 
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
-            $return .= Display :: return_warning_message('<strong>' . get_lang('Warning') . ' !</strong><br />' . get_lang('WarningEditingDocument'), false);
+            $return .= Display :: return_warning_message('<strong>'.get_lang('Warning').' !</strong><br />'.get_lang('WarningEditingDocument'), false);
         }
-        $form = new FormValidator('form', 'POST', api_get_self() . '?' .$_SERVER['QUERY_STRING'], '', array('enctype'=> "multipart/form-data"));
+        $form = new FormValidator('form', 'POST', api_get_self().'?'.$_SERVER['QUERY_STRING'], '', array('enctype'=> "multipart/form-data"));
         $defaults['title'] = Security :: remove_XSS($item_title);
         if (empty($item_title)) {
             $defaults['title'] = Security::remove_XSS($item_title);
@@ -7580,15 +7580,15 @@ 
         }
 
         $parent_select = $form->addElement('select', 'parent', get_lang('Parent'), '', 'class="form-control" id="idParent" " onchange="javascript: load_cbo(this.value);"');
-        $my_count=0;
+        $my_count = 0;
         foreach ($arrHide as $key => $value) {
-            if ($my_count!=0) {
+            if ($my_count != 0) {
                 // The LP name is also the first section and is not in the same charset like the other sections.
                 $value['value'] = Security :: remove_XSS($value['value']);
-                $parent_select->addOption($value['value'], $key, 'style="padding-left:' . $value['padding'] . 'px;"');
+                $parent_select->addOption($value['value'], $key, 'style="padding-left:'.$value['padding'].'px;"');
             } else {
                 $value['value'] = Security :: remove_XSS($value['value']);
-                $parent_select->addOption($value['value'], $key, 'style="padding-left:' . $value['padding'] . 'px;"');
+                $parent_select->addOption($value['value'], $key, 'style="padding-left:'.$value['padding'].'px;"');
             }
             $my_count++;
         }
@@ -7596,7 +7596,7 @@ 
         if (!empty($id)) {
             $parent_select->setSelected($parent);
         } else {
-            $parent_item_id = isset($_SESSION['parent_item_id']) ? $_SESSION['parent_item_id'] : 0 ;
+            $parent_item_id = isset($_SESSION['parent_item_id']) ? $_SESSION['parent_item_id'] : 0;
             $parent_select->setSelected($parent_item_id);
         }
 
@@ -7613,7 +7613,7 @@ 
                 if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
                     $s_selected_position = $arrLP[$i]['id'];
                 elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
-                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After') . ' "' . $arrLP[$i]['title'] . '"';
+                $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After').' "'.$arrLP[$i]['title'].'"';
             }
         }
 
@@ -7621,8 +7621,8 @@ 
         $position->addOption(get_lang('FirstPosition'), 0);
 
         foreach ($arrHide as $key => $value) {
-            $padding = isset($value['padding']) ? $value['padding']: 0;
-            $position->addOption($value['value'], $key, 'style="padding-left:' . $padding . 'px;"');
+            $padding = isset($value['padding']) ? $value['padding'] : 0;
+            $position->addOption($value['value'], $key, 'style="padding-left:'.$padding.'px;"');
         }
         $position->setSelected($s_selected_position);
 
@@ -7692,7 +7692,7 @@ 
                             $relative_path 	 = array_slice($relative_path, 1, $cnt);
                             $relative_path 	 = implode('/', $relative_path);
                             if (strlen($relative_path) > 0) {
-                                $relative_path = $relative_path . '/';
+                                $relative_path = $relative_path.'/';
                             }
                         } else {
                             $result = $this->generate_lp_folder($_course);
@@ -7706,8 +7706,8 @@ 
                             'Height' 				=> '500',
                             'FullPage' 				=> true,
                             'CreateDocumentDir' 	=> $relative_prefix,
-                            'CreateDocumentWebDir' 	=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().'/document/',
-                            'BaseHref' 				=> api_get_path(WEB_COURSE_PATH) . api_get_course_path().'/document/'.$relative_path
+                            'CreateDocumentWebDir' 	=> api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/',
+                            'BaseHref' 				=> api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/'.$relative_path
                         );
 
                         if ($_GET['action'] == 'add_item') {
@@ -7774,8 +7774,8 @@ 
             $item_url = stripslashes($extra_info['url']);
         } elseif (is_numeric($extra_info)) {
             $extra_info = intval($extra_info);
-            $sql = "SELECT title, description, url FROM " . $tbl_link . "
-                    WHERE c_id = ".$course_id." AND id = " . $extra_info;
+            $sql = "SELECT title, description, url FROM ".$tbl_link."
+                    WHERE c_id = ".$course_id." AND id = ".$extra_info;
             $result = Database::query($sql);
             $row = Database :: fetch_array($result);
             $item_title       = $row['title'];
@@ -7795,8 +7795,8 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         $result = Database::query($sql);
         $arrLP = array();
 
@@ -7823,10 +7823,10 @@ 
         unset ($this->arrMenu);
 
         if ($action == 'add')
-            $legend .= get_lang('CreateTheLink') . '&nbsp;:';
-        elseif ($action == 'move') $legend .= get_lang('MoveCurrentLink') . '&nbsp;:';
+            $legend .= get_lang('CreateTheLink').'&nbsp;:';
+        elseif ($action == 'move') $legend .= get_lang('MoveCurrentLink').'&nbsp;:';
         else
-            $legend .= get_lang('EditCurrentLink') . '&nbsp;:';
+            $legend .= get_lang('EditCurrentLink').'&nbsp;:';
 
         $legend .= '</legend>';
 
@@ -7837,16 +7837,16 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idTitle">' . get_lang('Title') . '</label></td>';
-            $return .= '<td class="input"><input id="idTitle" name="title" size="44" type="text" value="' . $item_title . '" class="learnpath_item_form"/></td>';
+            $return .= '<td class="label"><label for="idTitle">'.get_lang('Title').'</label></td>';
+            $return .= '<td class="input"><input id="idTitle" name="title" size="44" type="text" value="'.$item_title.'" class="learnpath_item_form"/></td>';
             $return .= '</tr>';
         }
 
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="idParent">' . get_lang('Parent') . '</label></td>';
+        $return .= '<td class="label"><label for="idParent">'.get_lang('Parent').'</label></td>';
         $return .= '<td class="input">';
         $return .= '<select id="idParent" style="width:100%;" name="parent" onChange="javascript: load_cbo(this.value);" class="learnpath_item_form" size="1">';
-        $return .= '<option class="top" value="0">' . $this->name . '</option>';
+        $return .= '<option class="top" value="0">'.$this->name.'</option>';
         $arrHide = array(
             $id
         );
@@ -7856,13 +7856,13 @@ 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($action != 'add') {
                 if (($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)) {
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
                 } else {
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
                 if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent_item_id == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    $return .= '<option '.(($parent_item_id == $arrLP[$i]['id']) ? 'selected="selected" ' : '').'style="padding-left:'.($arrLP[$i]['depth'] * 10).'px;" value="'.$arrLP[$i]['id'].'">'.$arrLP[$i]['title'].'</option>';
             }
         }
 
@@ -7874,11 +7874,11 @@ 
         $return .= '</td>';
         $return .= '</tr>';
         $return .= '<tr>';
-        $return .= '<td class="label"><label for="previous">' . get_lang('Position') . '</label></td>';
+        $return .= '<td class="label"><label for="previous">'.get_lang('Position').'</label></td>';
         $return .= '<td class="input">';
 
         $return .= '<select id="previous" name="previous" style="width:100%;" size="1" class="learnpath_item_form">';
-        $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
+        $return .= '<option class="top" value="0">'.get_lang('FirstPosition').'</option>';
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
                 if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
@@ -7888,7 +7888,7 @@ 
                 else
                     $selected = '';
 
-                $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
+                $return .= '<option '.$selected.'value="'.$arrLP[$i]['id'].'">'.get_lang('After').' "'.$arrLP[$i]['title'].'"</option>';
             }
         }
         $return .= '</select>';
@@ -7897,8 +7897,8 @@ 
 
         if ($action != 'move') {
             $return .= '<tr>';
-            $return .= '<td class="label"><label for="idURL">' . get_lang('Url') . '</label></td>';
-            $return .= '<td class="input"><input' . (is_numeric($extra_info) ? ' disabled="disabled"' : '') . ' id="idURL" name="url" style="width:99%;" type="text" value="' . $item_url . '" class="learnpath_item_form" /></td>';
+            $return .= '<td class="label"><label for="idURL">'.get_lang('Url').'</label></td>';
+            $return .= '<td class="input"><input'.(is_numeric($extra_info) ? ' disabled="disabled"' : '').' id="idURL" name="url" style="width:99%;" type="text" value="'.$item_url.'" class="learnpath_item_form" /></td>';
             $return .= '</tr>';
             $id_prerequisite = 0;
             if (is_array($arrLP)) {
@@ -7925,25 +7925,25 @@ 
 
         $return .= '<tr>';
         if ($action == 'add') {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">' . get_lang('AddLinkToCourse') . '</button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">'.get_lang('AddLinkToCourse').'</button></td>';
         } else {
-            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">' . get_lang('EditCurrentLink') . '</button></td>';
+            $return .= '<td>&nbsp;</td><td><button class="save" name="submit_button" type="submit">'.get_lang('EditCurrentLink').'</button></td>';
         }
         $return .= '</tr>';
         $return .= '</table>';
 
         if ($action == 'move') {
-            $return .= '<input name="title" type="hidden" value="' . $item_title . '" />';
-            $return .= '<input name="description" type="hidden" value="' . $item_description . '" />';
+            $return .= '<input name="title" type="hidden" value="'.$item_title.'" />';
+            $return .= '<input name="description" type="hidden" value="'.$item_description.'" />';
         }
 
         if (is_numeric($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info.'" />';
         } elseif (is_array($extra_info)) {
-            $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
+            $return .= '<input name="path" type="hidden" value="'.$extra_info['path'].'" />';
         }
-        $return .= '<input name="type" type="hidden" value="' . TOOL_LINK . '" />';
-        $return .= '<input name="post_time" type="hidden" value="' . time() . '" />';
+        $return .= '<input name="type" type="hidden" value="'.TOOL_LINK.'" />';
+        $return .= '<input name="post_time" type="hidden" value="'.time().'" />';
         $return .= '</form>';
         $return .= '</div>';
 
@@ -7969,8 +7969,8 @@ 
         } elseif (is_numeric($extra_info)) {
             $extra_info = intval($extra_info);
             $sql = "SELECT title, description
-                    FROM " . $tbl_publication . "
-                    WHERE c_id = ".$course_id." AND id = " . $extra_info;
+                    FROM " . $tbl_publication."
+                    WHERE c_id = ".$course_id." AND id = ".$extra_info;
 
             $result = Database::query($sql);
             $row = Database :: fetch_array($result);
@@ -7986,13 +7986,13 @@ 
             $parent = 0;
         }
 
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
 
         $result = Database::query($sql);
         $arrLP = array();
         while ($row = Database :: fetch_array($result)) {
-            $arrLP[] = array (
+            $arrLP[] = array(
                 'id' => $row['id'],
                 'item_type' => $row['item_type'],
                 'title' => $row['title'],
@@ -8038,7 +8038,7 @@ 
             ]
         );
 
-        $arrHide = array (
+        $arrHide = array(
             $id
         );
 
@@ -8056,7 +8056,7 @@ 
                     $parentSelect->addOption(
                         $arrLP[$i]['title'],
                         $arrLP[$i]['id'],
-                        ['style' => 'padding-left: ' . (($arrLP[$i]['depth'] * 10) + 20) . 'px;']
+                        ['style' => 'padding-left: '.(($arrLP[$i]['depth'] * 10) + 20).'px;']
                     );
 
                     if ($parent == $arrLP[$i]['id']) {
@@ -8073,7 +8073,7 @@ 
                     $parentSelect->addOption(
                         $arrLP[$i]['title'],
                         $arrLP[$i]['id'],
-                        ['style' => 'padding-left: ' . (($arrLP[$i]['depth'] * 10) + 20) . 'px;']
+                        ['style' => 'padding-left: '.(($arrLP[$i]['depth'] * 10) + 20).'px;']
                     );
 
                     if ($parent == $arrLP[$i]['id']) {
@@ -8097,7 +8097,7 @@ 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
                 $previousSelect->addOption(
-                    get_lang('After') . ' "' . $arrLP[$i]['title'] . '"',
+                    get_lang('After').' "'.$arrLP[$i]['title'].'"',
                     $arrLP[$i]['id']
                 );
 
@@ -8119,7 +8119,7 @@ 
                     }
                 }
             }
-            $arrHide = array ();
+            $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
                     if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
@@ -8211,8 +8211,8 @@ 
 
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
         $item_id = intval($item_id);
-        $sql = "SELECT * FROM " . $tbl_lp_item . " as lp
-                WHERE lp.c_id = ".$course_id." AND lp.id = " . $item_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item." as lp
+                WHERE lp.c_id = ".$course_id." AND lp.id = ".$item_id;
         $result = Database::query($sql);
         $row = Database::fetch_assoc($result);
 
@@ -8226,16 +8226,16 @@ 
             $audio_player .= '<script>
                                 var s1 = new SWFObject("../inc/lib/mediaplayer/player.swf","ply","250","20","9","#FFFFFF");
                                 s1.addParam("allowscriptaccess","always");
-                                s1.addParam("flashvars","file=../../courses/' . $_course['path'] . '/document/audio/' . $row['audio'] . '&autostart=true");
+                                s1.addParam("flashvars","file=../../courses/' . $_course['path'].'/document/audio/'.$row['audio'].'&autostart=true");
                                 s1.write("container");
                             </script>';
         }
 
-        $url = api_get_self().'?cidReq='.Security::remove_XSS($_GET['cidReq']).'&view=build&id='.$item_id .'&lp_id='.$this->lp_id;
+        $url = api_get_self().'?cidReq='.Security::remove_XSS($_GET['cidReq']).'&view=build&id='.$item_id.'&lp_id='.$this->lp_id;
 
         $return .= Display::url(
             Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL),
-            $url.'&action=edit_item&path_item=' . $row['path']
+            $url.'&action=edit_item&path_item='.$row['path']
         );
 
         $return .= Display::url(
@@ -8255,12 +8255,12 @@ 
             $url.'&action=delete_item'
         );
 
-        if ($item_type == TOOL_HOTPOTATOES ) {
+        if ($item_type == TOOL_HOTPOTATOES) {
             $document_data = DocumentManager::get_document_data_by_id($row['path'], $course_code);
             $return .= get_lang('File').': '.$document_data['absolute_path_from_document'];
         }
 
-        if ($item_type == TOOL_DOCUMENT ) {
+        if ($item_type == TOOL_DOCUMENT) {
             $document_data = DocumentManager::get_document_data_by_id($row['path'], $course_code);
             $return .= get_lang('File').': '.$document_data['absolute_path_from_document'];
         }
@@ -8281,13 +8281,13 @@ 
     public function get_js_dropdown_array()
     {
         $course_id = api_get_course_int_id();
-        $return = 'var child_name = new Array();' . "\n";
-        $return .= 'var child_value = new Array();' . "\n\n";
-        $return .= 'child_name[0] = new Array();' . "\n";
-        $return .= 'child_value[0] = new Array();' . "\n\n";
+        $return = 'var child_name = new Array();'."\n";
+        $return .= 'var child_value = new Array();'."\n\n";
+        $return .= 'child_name[0] = new Array();'."\n";
+        $return .= 'child_value[0] = new Array();'."\n\n";
         $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
-        $sql_zero = "SELECT * FROM " . $tbl_lp_item . "
-                    WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id . " AND parent_item_id = 0
+        $sql_zero = "SELECT * FROM ".$tbl_lp_item."
+                    WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id." AND parent_item_id = 0
                     ORDER BY display_order ASC";
         $res_zero = Database::query($sql_zero);
         $i = 0;
@@ -8297,28 +8297,28 @@ 
                 $row_zero['title'] = Exercise::get_formated_title_variable($row_zero['title']);
             }
             $js_var = json_encode(get_lang('After').' '.$row_zero['title']);
-            $return .= 'child_name[0][' . $i . '] = '.$js_var.' ;' . "\n";
-            $return .= 'child_value[0][' . $i++ . '] = "' . $row_zero['id'] . '";' . "\n";
+            $return .= 'child_name[0]['.$i.'] = '.$js_var.' ;'."\n";
+            $return .= 'child_value[0]['.$i++.'] = "'.$row_zero['id'].'";'."\n";
         }
         $return .= "\n";
-        $sql = "SELECT * FROM " . $tbl_lp_item . "
-                WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
+        $sql = "SELECT * FROM ".$tbl_lp_item."
+                WHERE c_id = ".$course_id." AND lp_id = ".$this->lp_id;
         $res = Database::query($sql);
         while ($row = Database :: fetch_array($res)) {
-            $sql_parent = "SELECT * FROM " . $tbl_lp_item . "
+            $sql_parent = "SELECT * FROM ".$tbl_lp_item."
                            WHERE
                                 c_id = ".$course_id." AND
-                                parent_item_id = " . $row['id'] . "
+                                parent_item_id = " . $row['id']."
                            ORDER BY display_order ASC";
             $res_parent = Database::query($sql_parent);
             $i = 0;
-            $return .= 'child_name[' . $row['id'] . '] = new Array();' . "\n";
-            $return .= 'child_value[' . $row['id'] . '] = new Array();' . "\n\n";
+            $return .= 'child_name['.$row['id'].'] = new Array();'."\n";
+            $return .= 'child_value['.$row['id'].'] = new Array();'."\n\n";
 
             while ($row_parent = Database :: fetch_array($res_parent)) {
                 $js_var = json_encode(get_lang('After').' '.$row_parent['title']);
-                $return .= 'child_name[' . $row['id'] . '][' . $i . '] =   '.$js_var.' ;' . "\n";
-                $return .= 'child_value[' . $row['id'] . '][' . $i++ . '] = "' . $row_parent['id'] . '";' . "\n";
+                $return .= 'child_name['.$row['id'].']['.$i.'] =   '.$js_var.' ;'."\n";
+                $return .= 'child_value['.$row['id'].']['.$i++.'] = "'.$row_parent['id'].'";'."\n";
             }
             $return .= "\n";
         }
@@ -8339,8 +8339,8 @@ 
         if (is_numeric($item_id)) {
             $tbl_lp_item = Database :: get_course_table(TABLE_LP_ITEM);
 
-            $sql = "SELECT * FROM " . $tbl_lp_item . "
-                    WHERE c_id = ".$course_id." AND id = " . $item_id;
+            $sql = "SELECT * FROM ".$tbl_lp_item."
+                    WHERE c_id = ".$course_id." AND id = ".$item_id;
 
             $res = Database::query($sql);
             $row = Database :: fetch_array($res);
@@ -8399,7 +8399,7 @@ 
      */
     public function display_item_small_form($item_type, $title = '', $data = array())
     {
-        $url = api_get_self() . '?' .api_get_cidreq().'&action=edit_item&lp_id='.$this->lp_id;
+        $url = api_get_self().'?'.api_get_cidreq().'&action=edit_item&lp_id='.$this->lp_id;
         $form = new FormValidator('small_form', 'post', $url);
         $form->addElement('header', $title);
         $form->addElement('text', 'title', get_lang('Title'));
@@ -8425,7 +8425,7 @@ 
         $item_id = intval($item_id);
         /* Current prerequisite */
         $sql = "SELECT * FROM $tbl_lp_item
-                WHERE c_id = $course_id AND id = " . $item_id;
+                WHERE c_id = $course_id AND id = ".$item_id;
         $result = Database::query($sql);
         $row    = Database::fetch_array($result);
         $prerequisiteId = $row['prerequisite'];
@@ -8435,20 +8435,20 @@ 
         $return .= '<form method="POST">';
         $return .= '<table class="data_table">';
         $return .= '<tr>';
-        $return .= '<th height="24">' . get_lang('LearnpathPrerequisites') . '</th>';
-        $return .= '<th width="70" >' . get_lang('Minimum') . '</th>';
-        $return .= '<th width="70">' . get_lang('Maximum') . '</th>';
+        $return .= '<th height="24">'.get_lang('LearnpathPrerequisites').'</th>';
+        $return .= '<th width="70" >'.get_lang('Minimum').'</th>';
+        $return .= '<th width="70">'.get_lang('Maximum').'</th>';
         $return .= '</tr>';
 
         // Adding the none option to the prerequisites see http://www.chamilo.org/es/node/146
         $return .= '<tr >';
         $return .= '<td colspan="3" class="radio">';
         $return .= '<input checked="checked" id="idNone" name="prerequisites"  style="margin-left:0px; margin-right:10px;" type="radio" />';
-        $return .= '<label for="idNone">' . get_lang('None') . '</label>';
+        $return .= '<label for="idNone">'.get_lang('None').'</label>';
         $return .= '</tr>';
 
         $sql = "SELECT * FROM $tbl_lp_item
-                WHERE c_id = $course_id AND lp_id = " . $this->lp_id;
+                WHERE c_id = $course_id AND lp_id = ".$this->lp_id;
         $result = Database::query($sql);
         $arrLP = array();
 
@@ -8491,24 +8491,24 @@ 
             }
 
             $selectedMaxScoreValue = isset($selectedMaxScore[$item['id']]) ? $selectedMaxScore[$item['id']] : $item['max_score'];
-            $selectedMinScoreValue = isset($selectedMinScore[$item['id']]) ? $selectedMinScore[$item['id']]: 0;
+            $selectedMinScoreValue = isset($selectedMinScore[$item['id']]) ? $selectedMinScore[$item['id']] : 0;
 
             $return .= '<tr>';
-            $return .= '<td class="radio"' . (($item['item_type'] != TOOL_QUIZ && $item['item_type'] != TOOL_HOTPOTATOES) ? ' colspan="3"' : '') . '>';
-            $return .= '<label for="id' . $item['id'] . '">';
-            $return .= '<input' . (in_array($prerequisiteId, array($item['id'], $item['ref'])) ? ' checked="checked" ' : '') . (($item['item_type'] == 'dokeos_module' || $item['item_type'] == 'dokeos_chapter') ? ' disabled="disabled" ' : ' ') . 'id="id' . $item['id'] . '" name="prerequisites" style="margin-left:' . $item['depth'] * 10 . 'px; margin-right:10px;" type="radio" value="' . $item['id'] . '" />';
+            $return .= '<td class="radio"'.(($item['item_type'] != TOOL_QUIZ && $item['item_type'] != TOOL_HOTPOTATOES) ? ' colspan="3"' : '').'>';
+            $return .= '<label for="id'.$item['id'].'">';
+            $return .= '<input'.(in_array($prerequisiteId, array($item['id'], $item['ref'])) ? ' checked="checked" ' : '').(($item['item_type'] == 'dokeos_module' || $item['item_type'] == 'dokeos_chapter') ? ' disabled="disabled" ' : ' ').'id="id'.$item['id'].'" name="prerequisites" style="margin-left:'.$item['depth'] * 10.'px; margin-right:10px;" type="radio" value="'.$item['id'].'" />';
             $icon_name = str_replace(' ', '', $item['item_type']);
 
-            if (file_exists('../img/lp_' . $icon_name . '.png')) {
-                $return .= '<img alt="" src="../img/lp_' . $icon_name . '.png" style="margin-right:5px;" title="" />';
+            if (file_exists('../img/lp_'.$icon_name.'.png')) {
+                $return .= '<img alt="" src="../img/lp_'.$icon_name.'.png" style="margin-right:5px;" title="" />';
             } else {
-                if (file_exists('../img/lp_' . $icon_name . '.gif')) {
-                    $return .= '<img alt="" src="../img/lp_' . $icon_name . '.gif" style="margin-right:5px;" title="" />';
+                if (file_exists('../img/lp_'.$icon_name.'.gif')) {
+                    $return .= '<img alt="" src="../img/lp_'.$icon_name.'.gif" style="margin-right:5px;" title="" />';
                 } else {
-                    $return .= Display::return_icon('folder_document.gif','',array('style'=>'margin-right:5px;'));
+                    $return .= Display::return_icon('folder_document.gif', '', array('style'=>'margin-right:5px;'));
                 }
             }
-            $return .=  $item['title'] . '</label>';
+            $return .= $item['title'].'</label>';
             $return .= '</td>';
 
             if ($item['item_type'] == TOOL_QUIZ) {
@@ -8522,19 +8522,19 @@ 
                 $item['max_score'] = $tmp_obj_lp_item->max_score;
 
                 $return .= '<td class="exercise">';
-                $return .= '<input size="4" maxlength="3" name="min_' . $item['id'] . '" type="number" min="0" step="any" max="'.$item['max_score'].'" value="' . $selectedMinScoreValue. '" />';
+                $return .= '<input size="4" maxlength="3" name="min_'.$item['id'].'" type="number" min="0" step="any" max="'.$item['max_score'].'" value="'.$selectedMinScoreValue.'" />';
                 $return .= '</td>';
                 $return .= '<td class="exercise">';
-                $return .= '<input size="4" maxlength="3" name="max_' . $item['id'] . '" type="number" min="0" step="any" max="'.$item['max_score'].'" value="' . $selectedMaxScoreValue . '" />';
+                $return .= '<input size="4" maxlength="3" name="max_'.$item['id'].'" type="number" min="0" step="any" max="'.$item['max_score'].'" value="'.$selectedMaxScoreValue.'" />';
                 $return .= '</td>';
             }
 
             if ($item['item_type'] == TOOL_HOTPOTATOES) {
                 $return .= '<td class="exercise">';
-                $return .= '<center><input size="4" maxlength="3" name="min_' . $item['id'] . '" type="number" min="0" step="any" max="'.$item['max_score'].'" value="' . $selectedMinScoreValue . '" /></center>';
+                $return .= '<center><input size="4" maxlength="3" name="min_'.$item['id'].'" type="number" min="0" step="any" max="'.$item['max_score'].'" value="'.$selectedMinScoreValue.'" /></center>';
                 $return .= '</td>';
                 $return .= '<td class="exercise"">';
-                $return .= '<center><input size="4" maxlength="3" name="max_' . $item['id'] . '" type="number" min="0" step="any" max="'.$item['max_score'].'"  value="'.$selectedMaxScoreValue . '" /></center>';
+                $return .= '<center><input size="4" maxlength="3" name="max_'.$item['id'].'" type="number" min="0" step="any" max="'.$item['max_score'].'"  value="'.$selectedMaxScoreValue.'" /></center>';
                 $return .= '</td>';
             }
             $return .= '</tr>';
@@ -8543,7 +8543,7 @@ 
         $return .= '</tr>';
         $return .= '</table>';
         $return .= '<div style="padding-top:3px;">';
-        $return .= '<button class="btn btn-primary" name="submit_button" type="submit">' . get_lang('ModifyPrerequisites') . '</button>';
+        $return .= '<button class="btn btn-primary" name="submit_button" type="submit">'.get_lang('ModifyPrerequisites').'</button>';
         $return .= '</form>';
 
         return $return;
@@ -8579,7 +8579,7 @@ 
                 if ($row['id'] == $lp_id) {
                     continue;
                 }
-                $return .= '<option value="'.$row['id'].'" '.(($row['id']==$prerequisiteId)?' selected ' : '').'>'.$row['name'].'</option>';
+                $return .= '<option value="'.$row['id'].'" '.(($row['id'] == $prerequisiteId) ? ' selected ' : '').'>'.$row['name'].'</option>';
             }
         }
         $return .= '</select>';
@@ -8632,8 +8632,8 @@ 
                      WHERE c_id = $course_id AND active<>'-1' $condition_session
                      ORDER BY title ASC";
 
-        $sql_hot  = "SELECT * FROM $tbl_doc
-                     WHERE c_id = $course_id AND path LIKE '" . $uploadPath . "/%/%htm%'  $condition_session
+        $sql_hot = "SELECT * FROM $tbl_doc
+                     WHERE c_id = $course_id AND path LIKE '".$uploadPath."/%/%htm%'  $condition_session
                      ORDER BY id ASC";
 
         $res_quiz = Database::query($sql_quiz);
@@ -8643,8 +8643,8 @@ 
 
         $return .= '<li class="lp_resource_element">';
         $return .= '<img alt="" src="../img/new_test_small.gif" style="margin-right:5px;" title="" />';
-        $return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'exercice/exercise_admin.php?'.api_get_cidreq().'&lp_id=' . $this->lp_id . '">' .
-            get_lang('NewExercise') . '</a>';
+        $return .= '<a href="'.api_get_path(REL_CODE_PATH).'exercice/exercise_admin.php?'.api_get_cidreq().'&lp_id='.$this->lp_id.'">'.
+            get_lang('NewExercise').'</a>';
         $return .= '</li>';
 
         // Display hotpotatoes
@@ -8656,8 +8656,8 @@ 
             $return .= '</a> ';
 
             $return .= '<img src="../img/hotpotatoes_s.png" style="margin-right:5px;" title="" width="16px" />';
-            $return .= '<a href="' . api_get_self() . '?' . api_get_cidreq().'&action=add_item&type=' . TOOL_HOTPOTATOES . '&file=' . $row_hot['id'] . '&lp_id=' . $this->lp_id . '">'.
-                ((!empty ($row_hot['comment'])) ? $row_hot['comment'] : Security :: remove_XSS($row_hot['title'])) . '</a>';
+            $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_HOTPOTATOES.'&file='.$row_hot['id'].'&lp_id='.$this->lp_id.'">'.
+                ((!empty ($row_hot['comment'])) ? $row_hot['comment'] : Security :: remove_XSS($row_hot['title'])).'</a>';
             $return .= '</li>';
         }
 
@@ -8667,7 +8667,7 @@ 
             $return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
             $return .= '</a> ';
             $return .= '<img alt="" src="../img/quizz_small.gif" style="margin-right:5px;" title="" />';
-            $return .= '<a href="' . api_get_self() . '?'.api_get_cidreq().'&action=add_item&type=' . TOOL_QUIZ . '&file=' . $row_quiz['id'] . '&lp_id=' . $this->lp_id . '">' .
+            $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_QUIZ.'&file='.$row_quiz['id'].'&lp_id='.$this->lp_id.'">'.
                 Security :: remove_XSS(cut($row_quiz['title'], 80)).
                 '</a>';
             $return .= '</li>';
@@ -8721,10 +8721,10 @@ 
             function toggle_tool(tool, id){
                 if(document.getElementById(tool+"_"+id+"_content").style.display == "none"){
                     document.getElementById(tool+"_"+id+"_content").style.display = "block";
-                    document.getElementById(tool+"_"+id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'remove.gif";
+                    document.getElementById(tool+"_"+id+"_opener").src = "' . api_get_path(WEB_IMG_PATH).'remove.gif";
                 } else {
                     document.getElementById(tool+"_"+id+"_content").style.display = "none";
-                    document.getElementById(tool+"_"+id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'add.gif";
+                    document.getElementById(tool+"_"+id+"_opener").src = "' . api_get_path(WEB_IMG_PATH).'add.gif";
                 }
             }
         </script>
@@ -8737,7 +8737,7 @@ 
         foreach ($categorizedLinks as $categoryId => $links) {
             $linkNodes = null;
             foreach ($links as $key => $title) {
-                if (api_get_item_visibility($course, TOOL_LINK, $key, $session_id) != 2)  {
+                if (api_get_item_visibility($course, TOOL_LINK, $key, $session_id) != 2) {
                     $linkNodes .=
                         '<li class="lp_resource_element" data_id="'.$key.
                         '" data_type="'.TOOL_LINK.'" title="'.$title.'" >
@@ -8777,7 +8777,7 @@ 
         $return = '<div class="lp_resource" >';
         $return .= '<div class="lp_resource_element">';
         $return .= '<img align="left" alt="" src="../img/works_small.gif" style="margin-right:5px;" title="" />';
-        $return .= '<a href="' . api_get_self() . '?' . api_get_cidreq() . '&action=add_item&type=' . TOOL_STUDENTPUBLICATION . '&lp_id=' . $this->lp_id . '">' . get_lang('AddAssignmentPage') . '</a>';
+        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_STUDENTPUBLICATION.'&lp_id='.$this->lp_id.'">'.get_lang('AddAssignmentPage').'</a>';
         $return .= '</div>';
         $return .= '</div>';
         return $return;
@@ -8799,17 +8799,17 @@ 
         //First add link
         $return .= '<li class="lp_resource_element">';
         $return .= '<img alt="" src="../img/forum_new_small.gif" style="margin-right:5px;" title="" />';
-        $return .= '<a href="' . api_get_path(REL_CODE_PATH) . 'forum/index.php?' . api_get_cidreq() . '&action=add&content=forum&origin=learnpath&lp_id=' . $this->lp_id . '" title="' . get_lang('CreateANewForum') . '">' . get_lang('CreateANewForum') . '</a>';
+        $return .= '<a href="'.api_get_path(REL_CODE_PATH).'forum/index.php?'.api_get_cidreq().'&action=add&content=forum&origin=learnpath&lp_id='.$this->lp_id.'" title="'.get_lang('CreateANewForum').'">'.get_lang('CreateANewForum').'</a>';
         $return .= '</li>';
 
         $return .= '<script>
                     function toggle_forum(forum_id){
                         if(document.getElementById("forum_"+forum_id+"_content").style.display == "none"){
                             document.getElementById("forum_"+forum_id+"_content").style.display = "block";
-                            document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'remove.gif";
+                            document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH).'remove.gif";
                         } else {
                             document.getElementById("forum_"+forum_id+"_content").style.display = "none";
-                            document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH) . 'add.gif";
+                            document.getElementById("forum_"+forum_id+"_opener").src = "' . api_get_path(WEB_IMG_PATH).'add.gif";
                         }
                     }
                 </script>';
@@ -8821,15 +8821,15 @@ 
                 $return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
                 $return .= ' </a>';
                 $return .= '<img alt="" src="../img/lp_forum.gif" style="margin-right:5px;" title="" />';
-                $return .= '<a style="cursor:hand" onclick="javascript: toggle_forum(' . $forum['forum_id'] . ')" style="vertical-align:middle">
-                                <img src="' . api_get_path(WEB_IMG_PATH) . 'add.gif" id="forum_' . $forum['forum_id'] . '_opener" align="absbottom" />
+                $return .= '<a style="cursor:hand" onclick="javascript: toggle_forum('.$forum['forum_id'].')" style="vertical-align:middle">
+                                <img src="' . api_get_path(WEB_IMG_PATH).'add.gif" id="forum_'.$forum['forum_id'].'_opener" align="absbottom" />
                             </a>
-                            <a href="' . api_get_self() . '?'.api_get_cidreq().'&action=add_item&type=' . TOOL_FORUM . '&forum_id=' . $forum['forum_id'] . '&lp_id=' . $this->lp_id . '" style="vertical-align:middle">' .
-                    Security :: remove_XSS($forum['forum_title']) . '</a>';
+                            <a href="' . api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_FORUM.'&forum_id='.$forum['forum_id'].'&lp_id='.$this->lp_id.'" style="vertical-align:middle">'.
+                    Security :: remove_XSS($forum['forum_title']).'</a>';
 
                 $return .= '</li>';
 
-                $return .= '<div style="display:none" id="forum_' . $forum['forum_id'] . '_content">';
+                $return .= '<div style="display:none" id="forum_'.$forum['forum_id'].'_content">';
                 $a_threads = get_threads($forum['forum_id']);
                 if (is_array($a_threads)) {
                     foreach ($a_threads as $thread) {
@@ -8838,8 +8838,8 @@ 
                         $return .= Display::return_icon('move_everywhere.png', get_lang('Move'), array(), ICON_SIZE_TINY);
                         $return .= ' </a>';
                         $return .= Display::return_icon('forumthread.png', get_lang('Thread'), array(), ICON_SIZE_TINY);
-                        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type=' . TOOL_THREAD . '&thread_id=' . $thread['thread_id'] . '&lp_id=' . $this->lp_id . '">' .
-                            Security :: remove_XSS($thread['thread_title']) . '</a>';
+                        $return .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add_item&type='.TOOL_THREAD.'&thread_id='.$thread['thread_id'].'&lp_id='.$this->lp_id.'">'.
+                            Security :: remove_XSS($thread['thread_title']).'</a>';
                         $return .= '</li>';
                     }
                 }
@@ -8910,7 +8910,7 @@ 
         if (is_dir($current_course_path.'/scorm/'.$this->path) && is_file($current_course_path.'/scorm/'.$this->path.'/imsmanifest.xml')) {
             // Remove the possible . at the end of the path.
             $dest_path_to_lp = substr($this->path, -1) == '.' ? substr($this->path, 0, -1) : $this->path;
-            $dest_path_to_scorm_folder = str_replace('//','/',$temp_zip_dir.'/scorm/'.$dest_path_to_lp);
+            $dest_path_to_scorm_folder = str_replace('//', '/', $temp_zip_dir.'/scorm/'.$dest_path_to_lp);
             mkdir($dest_path_to_scorm_folder, api_get_permissions_for_new_directories(), true);
             $zip_files_dist = copyr($current_course_path.'/scorm/'.$this->path, $dest_path_to_scorm_folder, array('imsmanifest'), $zip_files);
         }
@@ -8978,7 +8978,7 @@ 
                 if ($item->type == 'sco') {
                     $inc_docs = $item->get_resources_from_source(
                         null,
-                        api_get_path(SYS_COURSE_PATH) . api_get_course_path() . '/' . 'scorm/' . $this->path . '/' . $item->get_path()
+                        api_get_path(SYS_COURSE_PATH).api_get_course_path().'/'.'scorm/'.$this->path.'/'.$item->get_path()
                     );
                 } else {
                     $inc_docs = $item->get_resources_from_source();
@@ -9194,7 +9194,7 @@ 
                                         $file_path = substr($file_path, strlen($current_dir)); // We get the relative path.
                                         $zip_files[] = $my_sub_dir.'/'.$file_path;
                                         $link_updates[$my_file_path][] = array('orig' => $doc_info[0], 'dest' => $file_path);
-                                        $my_dep_file->setAttribute('href','document/'.$file_path);
+                                        $my_dep_file->setAttribute('href', 'document/'.$file_path);
                                         $my_dep->setAttribute('xml:base', '');
                                     }
                                 }
@@ -9325,7 +9325,7 @@ 
                         //$my_item->appendChild($my_max_score);
                         // Give a child element <adlcp:prerequisites> to the <item> element.
                         $my_prereqs = $xmldoc->createElement('adlcp:prerequisites', $item->get_prereq_string());
-                        $my_prereqs->setAttribute('type','aicc_script');
+                        $my_prereqs->setAttribute('type', 'aicc_script');
                         $my_item->appendChild($my_prereqs);
                         // Give a child element <adlcp:masteryscore> to the <item> element.
                         $my_masteryscore = $xmldoc->createElement('adlcp:masteryscore', $item->get_mastery_score());
@@ -9378,7 +9378,7 @@ 
                         $my_resource->appendChild($my_file);
 
                         // Get included docs.
-                        $inc_docs = $item->get_resources_from_source(null,$tmp_file_path);
+                        $inc_docs = $item->get_resources_from_source(null, $tmp_file_path);
                         // Dependency to other files - not yet supported.
                         $i = 1;
                         foreach ($inc_docs as $doc_info) {
@@ -9439,7 +9439,7 @@ 
                                         $my_dep_file->setAttribute('href', $file_path);
                                         $my_dep->setAttribute('xml:base', '');
 
-                                        if (strstr($file_path,$main_path) !== false) {
+                                        if (strstr($file_path, $main_path) !== false) {
                                             // The calculated real path is really inside the chamilo root path.
                                             // Reduce file path to what's under the DocumentRoot.
                                             $file_path = substr($file_path, strlen($root_path));
@@ -9457,7 +9457,7 @@ 
                                             $file_path = $_SERVER['DOCUMENT_ROOT'].$doc_info[0];
                                             $file_path = str_replace('//', '/', $file_path);
                                             if (file_exists($file_path)) {
-                                                $file_path = substr($file_path,strlen($current_dir)); // We get the relative path.
+                                                $file_path = substr($file_path, strlen($current_dir)); // We get the relative path.
                                                 $zip_files[] = $my_sub_dir.'/'.$file_path;
                                                 $link_updates[$my_file_path][] = array('orig' => $doc_info[0], 'dest' => $file_path);
                                                 $my_dep_file->setAttribute('href', 'document/'.$file_path);
@@ -9686,7 +9686,7 @@ 
             if (strpos($extra_file, '.') === 0)
                 continue;
             else {
-                $dest_file = $archive_path . $temp_dir_short . '/' . $extra_file;
+                $dest_file = $archive_path.$temp_dir_short.'/'.$extra_file;
                 $this->create_path($dest_file);
                 copy($main_code_path.$extra_file, $dest_file);
             }
@@ -9739,7 +9739,7 @@ 
                             }
                             $file_path = api_get_path(SYS_COURSE_PATH).$course_data['path'].'/document'.$file_data['path'];
                             if (file_exists($file_path)) {
-                                $files_to_export[] = array('title'=>$item->get_title(),'path'=>$file_path);
+                                $files_to_export[] = array('title'=>$item->get_title(), 'path'=>$file_path);
                             }
                             break;
                         case 'asset': //commes from a scorm package generated by chamilo
@@ -9779,12 +9779,12 @@ 
 
         foreach ($path_bits as $bit) {
             if (!empty ($bit)) {
-                $new_path = $path_built . $bit;
+                $new_path = $path_built.$bit;
                 if (is_dir($new_path)) {
-                    $path_built = $new_path . '/';
+                    $path_built = $new_path.'/';
                 } else {
                     mkdir($new_path, api_get_permissions_for_new_directories());
-                    $path_built = $new_path . '/';
+                    $path_built = $new_path.'/';
                 }
             }
         }
@@ -9828,9 +9828,9 @@ 
 
         if ($upload_ok) {
             if ($has_attachment) {
-                $courseDir = api_get_course_path() . '/upload/learning_path/images';
+                $courseDir = api_get_course_path().'/upload/learning_path/images';
                 $sys_course_path = api_get_path(SYS_COURSE_PATH);
-                $updir = $sys_course_path . $courseDir;
+                $updir = $sys_course_path.$courseDir;
                 // Try to add an extension to the file if it hasn't one.
                 $new_file_name = add_ext_on_mime(stripslashes($image_array['name']), $image_array['type']);
 
@@ -9885,7 +9885,7 @@ 
             //Setting my lp_id to autolaunch = 1
             $attributes['autolaunch'] = 1;
             $where = array('id = ? AND session_id = ? AND c_id = ?'=> array($lp_id, api_get_session_id(), $course_id));
-            Database::update($lp_table, $attributes, $where );
+            Database::update($lp_table, $attributes, $where);
         }
     }
 
@@ -9904,13 +9904,13 @@ 
 
         // Get the max order of the items
         $sql_max_order = "SELECT max(display_order) AS display_order FROM $table_lp_item
-    	                  WHERE c_id = $course_id AND lp_id = '" . $this->lp_id . "'";
+    	                  WHERE c_id = $course_id AND lp_id = '".$this->lp_id."'";
         $rs_max_order = Database::query($sql_max_order);
         $row_max_order = Database::fetch_object($rs_max_order);
         $max_order = $row_max_order->display_order;
         // Get the previous item ID
         $sql = "SELECT id as previous FROM $table_lp_item
-                WHERE c_id = $course_id AND lp_id = '" . $this->lp_id . "' AND display_order = '".$max_order."' ";
+                WHERE c_id = $course_id AND lp_id = '".$this->lp_id."' AND display_order = '".$max_order."' ";
         $rs_max = Database::query($sql);
         $row_max = Database::fetch_object($rs_max);
 
@@ -9966,9 +9966,9 @@ 
         $documents_total_space = DocumentManager::documents_total_space();
         $course_max_space = DocumentManager::get_course_quota();
         $total_size = filesize($s) + $documents_total_space;
-        if (filesize($s)>$post_max || filesize($s)>$upl_max  || $total_size>$course_max_space ){
+        if (filesize($s) > $post_max || filesize($s) > $upl_max || $total_size > $course_max_space) {
             return true;
-        } else{
+        } else {
             return false;
         }
     }
@@ -10308,7 +10308,7 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_subscribe_users()', 0);
         }
-        $this->subscribeUsers = intval($value);;
+        $this->subscribeUsers = intval($value); ;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $lp_id = $this->get_id();
         $sql = "UPDATE $lp_table SET subscribe_users = ".$this->subscribeUsers."
@@ -10654,7 +10654,7 @@ 
      */
     public function createForum($forumCategoryId)
     {
-        require_once api_get_path(SYS_CODE_PATH) . '/forum/forumfunction.inc.php';
+        require_once api_get_path(SYS_CODE_PATH).'/forum/forumfunction.inc.php';
 
         $forumId = store_forum(
             [

Braces +167 added lines, -117 removed lines

@@ -3935,8 +3935,9 @@ 
                 WHERE c_id = ".$course_id."
                 ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
         $lps = array ();
         $lp_order = array ();
         $num = Database :: num_rows($res);
@@ -4536,8 +4537,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_maker()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
         $this->maker = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $course_id = api_get_course_int_id();
@@ -4602,8 +4604,9 @@ 
     public function set_terms_by_prefix($terms_string, $prefix)
     {
         $course_id = api_get_course_int_id();
-        if (api_get_setting('search_enabled') !== 'true')
-            return false;
+        if (api_get_setting('search_enabled') !== 'true') {
+                    return false;
+        }
 
         if (!extension_loaded('xapian')) {
             return false;
@@ -4616,8 +4619,9 @@ 
         $stored_terms = $this->get_common_index_terms_by_prefix($prefix);
 
         // Don't do anything if no change, verify only at DB, not the search engine.
-        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
-            return false;
+        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) {
+                    return false;
+        }
 
         require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API.
         require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
@@ -4809,8 +4813,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_proximity()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
 
         $this->proximity = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
@@ -5152,8 +5157,9 @@ 
 
         $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
 
         $num = Database :: num_rows($res);
         // First check the order is correct, globally (might be wrong because
@@ -5464,8 +5470,9 @@ 
             $position[$key] = $row['display_order'];
         }
 
-        if (count($array) > 0)
-            array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        if (count($array) > 0) {
+                    array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        }
 
         return $array;
     }
@@ -6021,8 +6028,9 @@ 
         $tmp_filename = $filename;
 
         $i = 0;
-        while (file_exists($filepath . $tmp_filename . '.'.$extension))
-            $tmp_filename = $filename . '_' . ++ $i;
+        while (file_exists($filepath . $tmp_filename . '.'.$extension)) {
+                    $tmp_filename = $filename . '_' . ++ $i;
+        }
 
         $filename = $tmp_filename . '.'.$extension;
         if ($extension == 'html') {
@@ -6095,10 +6103,12 @@ 
                     if ($new_comment || $new_title) {
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                         $ct = '';
-                        if ($new_comment)
-                            $ct .= ", comment='" . Database::escape_string($new_comment). "'";
-                        if ($new_title)
-                            $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                        if ($new_comment) {
+                                                    $ct .= ", comment='" . Database::escape_string($new_comment). "'";
+                        }
+                        if ($new_title) {
+                                                    $ct .= ", title='" . Database::escape_string(htmlspecialchars($new_title, ENT_QUOTES, $charset))."' ";
+                        }
 
                         $sql = "UPDATE " . $tbl_doc ." SET " . substr($ct, 1)."
                                WHERE c_id = ".$course_id." AND id = " . $document_id;
@@ -6122,17 +6132,21 @@ 
         // Please, do not modify this dirname formatting.
         $dir = isset($_GET['dir']) ? $_GET['dir'] : $_POST['dir'];
 
-        if (strstr($dir, '..'))
-            $dir = '/';
+        if (strstr($dir, '..')) {
+                    $dir = '/';
+        }
 
-        if ($dir[0] == '.')
-            $dir = substr($dir, 1);
+        if ($dir[0] == '.') {
+                    $dir = substr($dir, 1);
+        }
 
-        if ($dir[0] != '/')
-            $dir = '/' . $dir;
+        if ($dir[0] != '/') {
+                    $dir = '/' . $dir;
+        }
 
-        if ($dir[strlen($dir) - 1] != '/')
-            $dir .= '/';
+        if ($dir[strlen($dir) - 1] != '/') {
+                    $dir .= '/';
+        }
 
         $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
 
@@ -6198,8 +6212,9 @@ 
                 }
                 $return .= '<div style="padding:10px;">';
 
-                if ($msg != '')
-                    $return .= $msg;
+                if ($msg != '') {
+                                    $return .= $msg;
+                }
 
                 $return .= '<h3>'.$row['title'].'</h3>';
                 switch ($row['item_type']) {
@@ -6446,10 +6461,11 @@ 
         $item_description 	= Security::remove_XSS($item_description);
 
         $legend = '<legend>';
-        if ($id != 0 && is_array($extra_info))
-            $parent = $extra_info['parent_item_id'];
-        else
-            $parent = 0;
+        if ($id != 0 && is_array($extra_info)) {
+                    $parent = $extra_info['parent_item_id'];
+        } else {
+                    $parent = 0;
+        }
 
         $sql = "SELECT * FROM " . $tbl_lp_item . "
                 WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
@@ -6527,8 +6543,9 @@ 
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
-                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                }
             }
         }
         if (is_array($arrLP)) {
@@ -6717,11 +6734,13 @@ 
         }
 
         $legend = '<legend>';
-        if ($action == 'add')
-            $legend .= get_lang('CreateTheExercise');
-        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentExercise');
-        else
-            $legend .= get_lang('EditCurrentExecice');
+        if ($action == 'add') {
+                    $legend .= get_lang('CreateTheExercise');
+        } elseif ($action == 'move') {
+            $legend .= get_lang('MoveTheCurrentExercise');
+        } else {
+                    $legend .= get_lang('EditCurrentExecice');
+        }
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
             $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
         }
@@ -6748,8 +6767,9 @@ 
                         $arrHide[] = $arrLP[$i]['id'];
                     }
                 } else {
-                    if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                        $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                            $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    }
                 }
             }
 
@@ -6767,11 +6787,13 @@ 
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
             }
@@ -6798,9 +6820,11 @@ 
                 $arrHide = array ();
                 for ($i = 0; $i < count($arrLP); $i++) {
                     if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                            $s_selected_position = $arrLP[$i]['id'];
-                        elseif ($action == 'add') $s_selected_position = 0;
+                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                                    $s_selected_position = $arrLP[$i]['id'];
+                        } elseif ($action == 'add') {
+                            $s_selected_position = 0;
+                        }
                         $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                     }
@@ -6897,11 +6921,13 @@ 
         $arrLP = isset($this->arrMenu) ? $this->arrMenu : null;
         unset($this->arrMenu);
 
-        if ($action == 'add')
-            $legend .= get_lang('CreateTheForum') . '&nbsp;:';
-        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentForum') . '&nbsp;:';
-        else
-            $legend .= get_lang('EditCurrentForum') . '&nbsp;:';
+        if ($action == 'add') {
+                    $legend .= get_lang('CreateTheForum') . '&nbsp;:';
+        } elseif ($action == 'move') {
+            $legend .= get_lang('MoveTheCurrentForum') . '&nbsp;:';
+        } else {
+                    $legend .= get_lang('EditCurrentForum') . '&nbsp;:';
+        }
 
         $legend .= '</legend>';
         $return = '<div class="sectioncomment">';
@@ -6934,8 +6960,9 @@ 
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
-                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                }
             }
         }
         if (is_array($arrLP)) {
@@ -6953,11 +6980,13 @@ 
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' .
                     get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
@@ -6983,9 +7012,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
                 }
             }
@@ -7089,11 +7120,13 @@ 
         unset ($this->arrMenu);
 
         $return .= '<form method="POST">';
-        if ($action == 'add')
-            $return .= '<legend>' . get_lang('CreateTheForum') . '</legend>';
-        elseif ($action == 'move') $return .= '<p class="lp_title">' . get_lang('MoveTheCurrentForum') . '&nbsp;:</p>';
-        else
-            $return .= '<legend>' . get_lang('EditCurrentForum') . '</legend>';
+        if ($action == 'add') {
+                    $return .= '<legend>' . get_lang('CreateTheForum') . '</legend>';
+        } elseif ($action == 'move') {
+            $return .= '<p class="lp_title">' . get_lang('MoveTheCurrentForum') . '&nbsp;:</p>';
+        } else {
+                    $return .= '<legend>' . get_lang('EditCurrentForum') . '</legend>';
+        }
 
         $return .= '<table cellpadding="0" cellspacing="0" class="lp_form">';
         $return .= '<tr>';
@@ -7113,8 +7146,9 @@ 
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
-                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                    $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                }
             }
         }
 
@@ -7132,11 +7166,13 @@ 
         $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
             }
@@ -7165,9 +7201,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -7180,8 +7218,7 @@ 
             foreach ($arrHide as $key => $value) {
                 if ($key == $s_selected_position && $action == 'add') {
                     $return .= '<option value="' . $key . '" selected="selected">' . $value['value'] . '</option>';
-                }
-                elseif ($key == $id_prerequisite && $action == 'edit') {
+                } elseif ($key == $id_prerequisite && $action == 'edit') {
                     $return .= '<option value="' . $key . '" selected="selected">' . $value['value'] . '</option>';
                 } else {
                     $return .= '<option value="' . $key . '">' . $value['value'] . '</option>';
@@ -7204,8 +7241,7 @@ 
 
         if (is_numeric($extra_info)) {
             $return .= '<input name="path" type="hidden" value="' . $extra_info . '" />';
-        }
-        elseif (is_array($extra_info)) {
+        } elseif (is_array($extra_info)) {
             $return .= '<input name="path" type="hidden" value="' . $extra_info['path'] . '" />';
         }
 
@@ -7259,8 +7295,9 @@ 
                     lp_id = " . $this->lp_id . " AND
                     id != $id";
 
-        if ($item_type == 'module')
-            $sql .= " AND parent_item_id = 0";
+        if ($item_type == 'module') {
+                    $sql .= " AND parent_item_id = 0";
+        }
 
         $result = Database::query($sql);
         $arrLP = array ();
@@ -7610,9 +7647,11 @@ 
         //POSITION
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $s_selected_position = $arrLP[$i]['id'];
+                } elseif ($action == 'add') {
                     $s_selected_position = $arrLP[$i]['id'];
-                elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
+                }
                 $arrHide[$arrLP[$i]['id']]['value'] = get_lang('After') . ' "' . $arrLP[$i]['title'] . '"';
             }
         }
@@ -7645,9 +7684,11 @@ 
 
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
                         $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
+                    }
 
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
@@ -7658,17 +7699,18 @@ 
                 $item_type = isset($extra_info['item_type']) ? $extra_info['item_type'] : null;
                 $edit = isset($_GET['edit']) ? $_GET['edit'] : null;
                 if (($extra_info == 'new' || $item_type == TOOL_DOCUMENT || $edit == 'true')) {
-                    if (isset ($_POST['content']))
-                        $content = stripslashes($_POST['content']);
-                    elseif (is_array($extra_info)) {
+                    if (isset ($_POST['content'])) {
+                                            $content = stripslashes($_POST['content']);
+                    } elseif (is_array($extra_info)) {
                         //If it's an html document or a text file
                         if (!$no_display_edit_textarea) {
                             $content = $this->display_document($extra_info['path'], false, false);
                         }
-                    } elseif (is_numeric($extra_info))
-                        $content = $this->display_document($extra_info, false, false);
-                    else
-                        $content = '';
+                    } elseif (is_numeric($extra_info)) {
+                                            $content = $this->display_document($extra_info, false, false);
+                    } else {
+                                            $content = '';
+                    }
 
                     if (!$no_display_edit_textarea) {
                         // We need to calculate here some specific settings for the online editor.
@@ -7822,11 +7864,13 @@ 
         $arrLP = isset($this->arrMenu) ? $this->arrMenu : null;
         unset ($this->arrMenu);
 
-        if ($action == 'add')
-            $legend .= get_lang('CreateTheLink') . '&nbsp;:';
-        elseif ($action == 'move') $legend .= get_lang('MoveCurrentLink') . '&nbsp;:';
-        else
-            $legend .= get_lang('EditCurrentLink') . '&nbsp;:';
+        if ($action == 'add') {
+                    $legend .= get_lang('CreateTheLink') . '&nbsp;:';
+        } elseif ($action == 'move') {
+            $legend .= get_lang('MoveCurrentLink') . '&nbsp;:';
+        } else {
+                    $legend .= get_lang('EditCurrentLink') . '&nbsp;:';
+        }
 
         $legend .= '</legend>';
 
@@ -7861,8 +7905,9 @@ 
                     $arrHide[] = $arrLP[$i]['id'];
                 }
             } else {
-                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir')
-                    $return .= '<option ' . (($parent_item_id == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                if ($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') {
+                                    $return .= '<option ' . (($parent_item_id == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                }
             }
         }
 
@@ -7881,12 +7926,13 @@ 
         $return .= '<option class="top" value="0">' . get_lang('FirstPosition') . '</option>';
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                    $selected = 'selected="selected" ';
-                elseif ($action == 'add')
-                    $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
+                                    $selected = 'selected="selected" ';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
             }
@@ -7913,9 +7959,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -8122,9 +8170,11 @@ 
             $arrHide = array ();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dokeos_chapter') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -9683,9 +9733,9 @@ 
         $main_code_path = api_get_path(SYS_CODE_PATH).'newscorm/packaging/';
         $extra_files = scandir($main_code_path);
         foreach ($extra_files as $extra_file) {
-            if (strpos($extra_file, '.') === 0)
-                continue;
-            else {
+            if (strpos($extra_file, '.') === 0) {
+                            continue;
+            } else {
                 $dest_file = $archive_path . $temp_dir_short . '/' . $extra_file;
                 $this->create_path($dest_file);
                 copy($main_code_path.$extra_file, $dest_file);

main/newscorm/learnpath_functions.inc.php

Doc Comments +1 added lines

@@ -60,6 +60,7 @@
 /**
  * This function deletes an entire directory
  * @param	string	The directory path
+ * @param string $dir
  * @return boolean	True on success, false on failure
  */
 function deldir($dir) {

main/newscorm/learnpathItem.class.php

Doc Comments +6 added lines, -6 removed lines

@@ -1869,7 +1869,7 @@ 
 
     /**
      * Get the extra terms (tags) that identify this item
-     * @return mixed
+     * @return string
      */
     public function get_terms()
     {
@@ -2069,7 +2069,7 @@ 
 
     /**
      * Opens/launches the item. Initialises runtime values.
-     * @return    boolean    True on success, false on failure.
+     * @return    boolean|null    True on success, false on failure.
      */
     public function open($allow_new_attempt = false)
     {
@@ -3494,7 +3494,7 @@ 
 
     /**
      * Checks if the current status is part of the list of status given
-     * @param  array  $list  An array of status to check for.
+     * @param  string[]  $list  An array of status to check for.
      * If the current status is one of the strings, return true
      *
      * @return boolean True if the status was one of the given strings,
@@ -3671,7 +3671,7 @@ 
     /**
      * Write objectives to DB. This method is separate from write_to_db() because otherwise
      * objectives are lost as a side effect to AJAX and session concurrent access
-     * @return    boolean        True or false on error
+     * @return    boolean|null        True or false on error
      */
     public function write_objectives_to_db()
     {
@@ -4312,7 +4312,7 @@ 
      * Removes the relation between the current item and an audio file. The file
      * is only removed from the lp_item table, but remains in the document table
      * and directory
-     * @return bool
+     * @return false|null
      */
     public function remove_audio()
     {
@@ -4333,7 +4333,7 @@ 
      * @param $status
      * @param bool $decorate
      * @param string $type classic|simple
-     * @return array|string
+     * @return string
      */
     static function humanize_status($status, $decorate = true, $type = 'classic')
     {

Spacing +247 added lines, -247 removed lines

@@ -199,13 +199,13 @@ 
             $res = Database::query($sql);
             if (Database::num_rows($res) > 0) {
                 $se_ref = Database::fetch_array($res);
-                $this->search_did = (int)$se_ref['search_did'];
+                $this->search_did = (int) $se_ref['search_did'];
             }
         }
         $this->audio = $row['audio'];
         if (self::debug > 0) {
             error_log(
-                'New LP - End of learnpathItem constructor for item ' . $id,
+                'New LP - End of learnpathItem constructor for item '.$id,
                 0
             );
         }
@@ -314,7 +314,7 @@ 
     public function delete()
     {
         if (self::debug > 0) {
-            error_log('learnpath_item::delete() for item ' . $this->db_id, 0);
+            error_log('learnpath_item::delete() for item '.$this->db_id, 0);
         }
         $lp_item_view = Database::get_course_table(TABLE_LP_ITEM_VIEW);
         $lp_item = Database::get_course_table(TABLE_LP_ITEM);
@@ -322,29 +322,29 @@ 
         $course_id = api_get_course_int_id();
 
         $sql = "DELETE FROM $lp_item_view
-                WHERE c_id = $course_id AND lp_item_id = " . $this->db_id;
+                WHERE c_id = $course_id AND lp_item_id = ".$this->db_id;
         if (self::debug > 0) {
-            error_log('Deleting from lp_item_view: ' . $sql, 0);
+            error_log('Deleting from lp_item_view: '.$sql, 0);
         }
         Database::query($sql);
 
         $sql = "SELECT * FROM $lp_item
-                WHERE c_id = $course_id AND id = " . $this->db_id;
+                WHERE c_id = $course_id AND id = ".$this->db_id;
         $res_sel = Database::query($sql);
         if (Database::num_rows($res_sel) < 1) {
             return false;
         }
 
         $sql = "DELETE FROM $lp_item
-                WHERE c_id = $course_id AND id = " . $this->db_id;
+                WHERE c_id = $course_id AND id = ".$this->db_id;
         Database::query($sql);
         if (self::debug > 0) {
-            error_log('Deleting from lp_item: ' . $sql);
+            error_log('Deleting from lp_item: '.$sql);
         }
 
         if (api_get_setting('search_enabled') == 'true') {
             if (!is_null($this->search_did)) {
-                require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloIndexer.class.php';
+                require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
                 $di = new ChamiloIndexer();
                 $di->remove_document($this->search_did);
             }
@@ -380,7 +380,7 @@ 
     {
         if (self::debug > 0) {
             error_log(
-                'learnpathItem::get_attempt_id() on item ' . $this->db_id,
+                'learnpathItem::get_attempt_id() on item '.$this->db_id,
                 0
             );
         }
@@ -390,8 +390,8 @@ 
         }
         if (self::debug > 0) {
             error_log(
-                'New LP - End of learnpathItem::get_attempt_id() on item ' .
-                $this->db_id . ' - Returning ' . $res,
+                'New LP - End of learnpathItem::get_attempt_id() on item '.
+                $this->db_id.' - Returning '.$res,
                 0
             );
         }
@@ -453,12 +453,12 @@ 
             if (self::debug > 2) {
                 error_log(
                     'learnpathItem::get_credit() - get_prevent_reinit!=0 and '.
-                    'status is ' . $status,
+                    'status is '.$status,
                     0
                 );
             }
             //0=not attempted - 1 = incomplete
-            if ($status != $this->possible_status[0]&&
+            if ($status != $this->possible_status[0] &&
                 $status != $this->possible_status[1]
             ) {
                 $credit = 'no-credit';
@@ -532,13 +532,13 @@ 
                 case TOOL_DOCUMENT:
                     $table_doc = Database::get_course_table(TABLE_DOCUMENT);
                     $sql = 'SELECT path
-                            FROM ' . $table_doc . '
+                            FROM ' . $table_doc.'
                             WHERE
-                                c_id = ' . $course_id . ' AND
+                                c_id = ' . $course_id.' AND
                                 id = ' . $path;
                     $res = Database::query($sql);
                     $row = Database::fetch_array($res);
-                    $real_path = 'document' . $row['path'];
+                    $real_path = 'document'.$row['path'];
                     return $real_path;
                 case TOOL_STUDENTPUBLICATION:
                 case TOOL_QUIZ:
@@ -550,7 +550,7 @@ 
             }
         } else {
             if (!empty($path_to_scorm_dir)) {
-                $path = $path_to_scorm_dir . $path;
+                $path = $path_to_scorm_dir.$path;
             }
             return $path;
         }
@@ -586,8 +586,8 @@ 
         $sql = "SELECT id FROM $tbl
                 WHERE
                     c_id = $course_id AND
-                    lp_item_id = " . $this->db_id . " AND
-                    lp_view_id = " . $this->view_id . " AND
+                    lp_item_id = ".$this->db_id." AND
+                    lp_view_id = " . $this->view_id." AND
                     view_count = " . $this->attempt_id;
         $res = Database::query($sql);
         if (Database::num_rows($res) > 0) {
@@ -630,8 +630,8 @@ 
             $sql = "SELECT id FROM $tbl
                     WHERE
                         c_id = $course_id AND
-                        lp_item_id = " . $this->db_id . " AND
-                        lp_view_id = " . $this->view_id ." AND
+                        lp_item_id = ".$this->db_id." AND
+                        lp_view_id = " . $this->view_id." AND
                         view_count = " . $this->get_attempt_id();
             $res = Database::query($sql);
             if (Database::num_rows($res) > 0) {
@@ -671,13 +671,13 @@ 
         foreach ($this->interactions as $id => $in) {
             $return .= "[
                 '$id',
-                '" . $in[1] . "',
-                '" . $in[2] . "',
-                '" . $in[3] . "',
-                '" . $in[4] . "',
-                '" . $in[5] . "',
-                '" . $in[6] . "',
-                '" . $in[7] . "'],";
+                '".$in[1]."',
+                '" . $in[2]."',
+                '" . $in[3]."',
+                '" . $in[4]."',
+                '" . $in[5]."',
+                '" . $in[6]."',
+                '" . $in[7]."'],";
         }
         if (!empty($return)) {
             $return = substr($return, 0, -1);
@@ -919,7 +919,7 @@ 
                 $table = Database::get_course_table(TABLE_LP_MAIN);
                 $sql = "SELECT prevent_reinit
                     FROM $table
-                    WHERE c_id = $course_id AND id = " . $this->lp_id;
+                    WHERE c_id = $course_id AND id = ".$this->lp_id;
                 $res = Database::query($sql);
                 if (Database::num_rows($res) < 1) {
                     $this->error = "Could not find parent learnpath in lp table";
@@ -941,7 +941,7 @@ 
         }
         if (self::debug > 2) {
             error_log(
-                'New LP - End of learnpathItem::get_prevent_reinit() - Returned ' . $this->prevent_reinit,
+                'New LP - End of learnpathItem::get_prevent_reinit() - Returned '.$this->prevent_reinit,
                 0
             );
         }
@@ -966,7 +966,7 @@ 
                 $table = Database::get_course_table(TABLE_LP_MAIN);
                 $sql = "SELECT seriousgame_mode
                         FROM $table
-                        WHERE c_id = $course_id AND id = " . $this->lp_id;
+                        WHERE c_id = $course_id AND id = ".$this->lp_id;
                 $res = Database::query($sql);
                 if (Database::num_rows($res) < 1) {
                     $this->error = "Could not find parent learnpath in learnpath table";
@@ -987,7 +987,7 @@ 
         }
         if (self::debug > 2) {
             error_log(
-                'New LP - End of learnpathItem::get_seriousgame_mode() - Returned ' . $this->seriousgame_mode,
+                'New LP - End of learnpathItem::get_seriousgame_mode() - Returned '.$this->seriousgame_mode,
                 0
             );
         }
@@ -1032,7 +1032,7 @@ 
         }
         if (!isset($abs_path)) {
             $path = $this->get_file_path();
-            $abs_path = api_get_path(SYS_COURSE_PATH) . api_get_course_path() . '/' . $path;
+            $abs_path = api_get_path(SYS_COURSE_PATH).api_get_course_path().'/'.$path;
         }
 
         $files_list = array();
@@ -1307,7 +1307,7 @@ 
                                                             $abs_path
                                                         );
                                                         $new_abs_path = realpath(
-                                                            $dir . '/' . $second_part
+                                                            $dir.'/'.$second_part
                                                         );
                                                         $in_files_list[] = learnpathItem::get_resources_from_source(
                                                             TOOL_DOCUMENT,
@@ -1345,7 +1345,7 @@ 
                                                             $abs_path
                                                         );
                                                         $new_abs_path = realpath(
-                                                            $dir . '/' . $second_part
+                                                            $dir.'/'.$second_part
                                                         );
                                                         $in_files_list[] = learnpathItem::get_resources_from_source(
                                                             TOOL_DOCUMENT,
@@ -1452,7 +1452,7 @@ 
                                                             $abs_path
                                                         );
                                                         $new_abs_path = realpath(
-                                                            $dir . '/' . $source
+                                                            $dir.'/'.$source
                                                         );
                                                         $in_files_list[] = learnpathItem::get_resources_from_source(
                                                             TOOL_DOCUMENT,
@@ -1490,7 +1490,7 @@ 
                                                             $abs_path
                                                         );
                                                         $new_abs_path = realpath(
-                                                            $dir . '/' . $source
+                                                            $dir.'/'.$source
                                                         );
                                                         $in_files_list[] = learnpathItem::get_resources_from_source(
                                                             TOOL_DOCUMENT,
@@ -1574,7 +1574,7 @@ 
                                                 );
                                                 $dir = dirname($abs_path);
                                                 $new_abs_path = realpath(
-                                                    $dir . '/' . $source
+                                                    $dir.'/'.$source
                                                 );
                                                 $in_files_list[] = learnpathItem::get_resources_from_source(
                                                     TOOL_DOCUMENT,
@@ -1619,7 +1619,7 @@ 
                                                 );
                                                 $dir = dirname($abs_path);
                                                 $new_abs_path = realpath(
-                                                    $dir . '/' . $source
+                                                    $dir.'/'.$source
                                                 );
                                                 $in_files_list[] = learnpathItem::get_resources_from_source(
                                                     TOOL_DOCUMENT,
@@ -1679,7 +1679,7 @@ 
         }
         if (self::debug > 1) {
             error_log(
-                'New LP - Out of learnpathItem::get_score() - returning ' . $res,
+                'New LP - Out of learnpathItem::get_score() - returning '.$res,
                 0
             );
         }
@@ -1699,7 +1699,7 @@ 
         $course_id = api_get_course_int_id();
         $debug = self::debug;
         if ($debug > 0) {
-            error_log('learnpathItem::get_status() on item ' . $this->db_id, 0);
+            error_log('learnpathItem::get_status() on item '.$this->db_id, 0);
         }
         if ($check_db) {
             if ($debug > 2) {
@@ -1710,12 +1710,12 @@ 
                 $sql = "SELECT status FROM $table
                         WHERE
                             c_id = $course_id AND
-                            id = '" . $this->db_item_view_id . "' AND
-                            view_count = '" . $this->get_attempt_id() . "'";
+                            id = '".$this->db_item_view_id."' AND
+                            view_count = '" . $this->get_attempt_id()."'";
 
                 if ($debug > 2) {
                     error_log(
-                        'learnpathItem::get_status() - Checking DB: ' . $sql,
+                        'learnpathItem::get_status() - Checking DB: '.$sql,
                         0
                     );
                 }
@@ -1726,7 +1726,7 @@ 
                     if ($update_local) {
                         if ($debug > 2) {
                             error_log(
-                                'learnpathItem::set_status() :' . $row['status'],
+                                'learnpathItem::set_status() :'.$row['status'],
                                 0
                             );
                         }
@@ -1734,7 +1734,7 @@ 
                     }
                     if ($debug > 2) {
                         error_log(
-                            'learnpathItem::get_status() - Returning db value ' . $row['status'],
+                            'learnpathItem::get_status() - Returning db value '.$row['status'],
                             0
                         );
                     }
@@ -1751,7 +1751,7 @@ 
             if (!empty($this->status)) {
                 if ($debug > 2) {
                     error_log(
-                        'learnpathItem::get_status() - Returning attrib: ' . $this->status,
+                        'learnpathItem::get_status() - Returning attrib: '.$this->status,
                         0
                     );
                 }
@@ -1761,7 +1761,7 @@ 
 
         if ($debug > 2) {
             error_log(
-                'learnpathItem::get_status() - Returning default ' . $this->possible_status[0],
+                'learnpathItem::get_status() - Returning default '.$this->possible_status[0],
                 0
             );
         }
@@ -1801,7 +1801,7 @@ 
             if ($origin == 'js') {
                 return '00 : 00: 00';
             } else {
-                return '00 ' . $h . ' 00 \' 00"';
+                return '00 '.$h.' 00 \' 00"';
             }
         } else {
             return api_format_time($time, $origin);
@@ -1826,7 +1826,7 @@ 
         if (!isset($given_time)) {
             if (self::debug > 2) {
                 error_log(
-                    'learnpathItem::get_scorm_time(): given time empty, current_start_time = ' . $this->current_start_time,
+                    'learnpathItem::get_scorm_time(): given time empty, current_start_time = '.$this->current_start_time,
                     0
                 );
             }
@@ -1836,8 +1836,8 @@ 
                         FROM $table
                         WHERE
                             c_id = $course_id AND
-                            id = '" . $this->db_item_view_id . "' AND
-                            view_count = '" . $this->get_attempt_id() . "'";
+                            id = '".$this->db_item_view_id."' AND
+                            view_count = '" . $this->get_attempt_id()."'";
                 $res = Database::query($sql);
                 $row = Database::fetch_array($res);
                 $start = $row['start_time'];
@@ -1858,7 +1858,7 @@ 
         }
         if (self::debug > 2) {
             error_log(
-                'learnpathItem::get_scorm_time(): intermediate = ' . $time,
+                'learnpathItem::get_scorm_time(): intermediate = '.$time,
                 0
             );
         }
@@ -1878,7 +1878,7 @@ 
         $sql = "SELECT * FROM $lp_item
                 WHERE
                     c_id = $course_id AND
-                    id='" . intval($this->db_id) . "'";
+                    id='".intval($this->db_id)."'";
         $res = Database::query($sql);
         $row = Database::fetch_array($res);
         return $row['terms'];
@@ -1907,9 +1907,9 @@ 
     {
         if (self::debug > 0) {
             error_log(
-                'learnpathItem::get_total_time() for item ' . $this->db_id .
-                ' - Initially, current_start_time = ' . $this->current_start_time .
-                ' and current_stop_time = ' . $this->current_stop_time,
+                'learnpathItem::get_total_time() for item '.$this->db_id.
+                ' - Initially, current_start_time = '.$this->current_start_time.
+                ' and current_stop_time = '.$this->current_stop_time,
                 0
             );
         }
@@ -1950,9 +1950,9 @@ 
         } else {
             if (self::debug > 2) {
                 error_log(
-                    'learnpathItem::get_total_time() - Current start time = ' .
-                    $this->current_start_time . ', current stop time = ' .
-                    $this->current_stop_time . ' Returning ' . $time . "-----------\n",
+                    'learnpathItem::get_total_time() - Current start time = '.
+                    $this->current_start_time.', current stop time = '.
+                    $this->current_stop_time.' Returning '.$time."-----------\n",
                     0
                 );
             }
@@ -1972,7 +1972,7 @@ 
         }
         if (self::debug > 2) {
             error_log(
-                'learnpathItem::get_type() - Returning ' . $res . ' for item ' . $this->db_id,
+                'learnpathItem::get_type() - Returning '.$res.' for item '.$this->db_id,
                 0
             );
         }
@@ -2012,8 +2012,8 @@ 
         if ($this->status_is($completedStatusList)) {
             if (self::debug > 2) {
                 error_log(
-                    'learnpath::is_done() - Item ' . $this->get_id(
-                    ) . ' is complete',
+                    'learnpath::is_done() - Item '.$this->get_id(
+                    ).' is complete',
                     0
                 );
             }
@@ -2022,8 +2022,8 @@ 
         } else {
             if (self::debug > 2) {
                 error_log(
-                    'learnpath::is_done() - Item ' . $this->get_id(
-                    ) . ' is not complete',
+                    'learnpath::is_done() - Item '.$this->get_id(
+                    ).' is not complete',
                     0
                 );
             }
@@ -2060,7 +2060,7 @@ 
         }
         if (self::debug > 2) {
             error_log(
-                'New LP - End of learnpathItem::is_restart_allowed() - Returning ' . $restart,
+                'New LP - End of learnpathItem::is_restart_allowed() - Returning '.$restart,
                 0
             );
         }
@@ -2139,7 +2139,7 @@ 
     {
         if (self::debug > 0) {
             error_log(
-                'learnpathItem::parse_prereq() for learnpath ' . $this->lp_id . ' with string ' . $prereqs_string,
+                'learnpathItem::parse_prereq() for learnpath '.$this->lp_id.' with string '.$prereqs_string,
                 0
             );
         }
@@ -2332,7 +2332,7 @@ 
                                 // Strange...
                                 if (self::debug > 1) {
                                     error_log(
-                                        'New LP - Found ~ but strange string: ' . $prereqs_string,
+                                        'New LP - Found ~ but strange string: '.$prereqs_string,
                                         0
                                     );
                                 }
@@ -2360,7 +2360,7 @@ 
                                     //  the big brackets-enclosed condition.
                                     if (self::debug > 1) {
                                         error_log(
-                                            'New LP - Dealing with group ' . $gr,
+                                            'New LP - Dealing with group '.$gr,
                                             0
                                         );
                                     }
@@ -2374,7 +2374,7 @@ 
                                     ) {
                                         if (self::debug > 1) {
                                             error_log(
-                                                'New LP - Found multiplier ' . $multi[0],
+                                                'New LP - Found multiplier '.$multi[0],
                                                 0
                                             );
                                         }
@@ -2390,7 +2390,7 @@ 
                                                     $mytrue++;
                                                     if (self::debug > 1) {
                                                         error_log(
-                                                            'New LP - Found true item, counting.. (' . ($mytrue) . ')',
+                                                            'New LP - Found true item, counting.. ('.($mytrue).')',
                                                             0
                                                         );
                                                     }
@@ -2398,7 +2398,7 @@ 
                                             } else {
                                                 if (self::debug > 1) {
                                                     error_log(
-                                                        'New LP - item ' . $cond . ' does not exist in items list',
+                                                        'New LP - item '.$cond.' does not exist in items list',
                                                         0
                                                     );
                                                 }
@@ -2445,7 +2445,7 @@ 
                                                 } else {
                                                     if (self::debug > 1) {
                                                         error_log(
-                                                            'New LP - ' .
+                                                            'New LP - '.
                                                             ' Found false item, the set is not true, return false',
                                                             0
                                                         );
@@ -2456,7 +2456,7 @@ 
                                             } else {
                                                 if (self::debug > 1) {
                                                     error_log(
-                                                        'New LP - item ' . $cond . ' does not exist in items list',
+                                                        'New LP - item '.$cond.' does not exist in items list',
                                                         0
                                                     );
                                                 }
@@ -2482,7 +2482,7 @@ 
                                 //  value of the corresponding resource completion status.
                                 if (self::debug > 1) {
                                     error_log(
-                                        'New LP - Didnt find any group, returning value for ' . $prereqs_string,
+                                        'New LP - Didnt find any group, returning value for '.$prereqs_string,
                                         0
                                     );
                                 }
@@ -2499,14 +2499,14 @@ 
                                         if (!$returnstatus) {
                                             if (self::debug > 1) {
                                                 error_log(
-                                                    'New LP - Prerequisite ' . $prereqs_string . ' not complete',
+                                                    'New LP - Prerequisite '.$prereqs_string.' not complete',
                                                     0
                                                 );
                                             }
                                         } else {
                                             if (self::debug > 1) {
                                                 error_log(
-                                                    'New LP - Prerequisite ' . $prereqs_string . ' complete',
+                                                    'New LP - Prerequisite '.$prereqs_string.' complete',
                                                     0
                                                 );
                                             }
@@ -2518,12 +2518,12 @@ 
                                             if ($returnstatus) {
                                                 //AND origin_lp_item_id = '.$user_id.'
                                                 $sql = 'SELECT exe_result, exe_weighting
-                                                        FROM ' . Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES) . '
+                                                        FROM ' . Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES).'
                                                         WHERE
-                                                            exe_exo_id = ' . $items[$refs_list[$prereqs_string]]->path . ' AND
-                                                            exe_user_id = ' . $user_id . ' AND
-                                                            orig_lp_id = ' . $this->lp_id . ' AND
-                                                            orig_lp_item_id = ' . $prereqs_string . ' AND
+                                                            exe_exo_id = ' . $items[$refs_list[$prereqs_string]]->path.' AND
+                                                            exe_user_id = ' . $user_id.' AND
+                                                            orig_lp_id = ' . $this->lp_id.' AND
+                                                            orig_lp_item_id = ' . $prereqs_string.' AND
                                                             status <> "incomplete"
                                                         ORDER BY exe_date DESC
                                                         LIMIT 0, 1';
@@ -2561,12 +2561,12 @@ 
 
                                             // Checking in the database.
                                             $sql = 'SELECT exe_result, exe_weighting
-                                                    FROM ' . Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES) . '
+                                                    FROM ' . Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES).'
                                                     WHERE
-                                                        exe_exo_id = ' . $items[$refs_list[$prereqs_string]]->path . ' AND
-                                                        exe_user_id = ' . $user_id . ' AND
-                                                        orig_lp_id = ' . $this->lp_id . ' AND
-                                                        orig_lp_item_id = ' . $prereqs_string . ' ';
+                                                        exe_exo_id = ' . $items[$refs_list[$prereqs_string]]->path.' AND
+                                                        exe_user_id = ' . $user_id.' AND
+                                                        orig_lp_id = ' . $this->lp_id.' AND
+                                                        orig_lp_item_id = ' . $prereqs_string.' ';
 
                                             $rs_quiz = Database::query($sql);
                                             if (Database::num_rows($rs_quiz) > 0) {
@@ -2612,14 +2612,14 @@ 
                                         if (!$returnstatus) {
                                             if (self::debug > 1) {
                                                 error_log(
-                                                    'New LP - Prerequisite ' . $prereqs_string . ' not complete',
+                                                    'New LP - Prerequisite '.$prereqs_string.' not complete',
                                                     0
                                                 );
                                             }
                                         } else {
                                             if (self::debug > 1) {
                                                 error_log(
-                                                    'New LP - Prerequisite ' . $prereqs_string . ' complete',
+                                                    'New LP - Prerequisite '.$prereqs_string.' complete',
                                                     0
                                                 );
                                             }
@@ -2634,11 +2634,11 @@ 
                                                 TABLE_LP_VIEW
                                             );
 
-                                            $sql = 'SELECT id FROM ' . $lp_view . '
+                                            $sql = 'SELECT id FROM '.$lp_view.'
                                                     WHERE
-                                                        c_id = ' . $course_id . ' AND
-                                                        user_id = ' . $user_id . '  AND
-                                                        lp_id = ' . $this->lp_id . ' AND
+                                                        c_id = ' . $course_id.' AND
+                                                        user_id = ' . $user_id.'  AND
+                                                        lp_id = ' . $this->lp_id.' AND
                                                         session_id = '.$sessionId.'
                                                     LIMIT 0, 1';
                                             $rs_lp = Database::query($sql);
@@ -2647,11 +2647,11 @@ 
                                             );
                                             $my_lp_id = $lp_id[0];
 
-                                            $sql = 'SELECT status FROM ' . $lp_item_view . '
+                                            $sql = 'SELECT status FROM '.$lp_item_view.'
                                                    WHERE
-                                                        c_id = ' . $course_id . ' AND
-                                                        lp_view_id = ' . $my_lp_id . ' AND
-                                                        lp_item_id = ' . $refs_list[$prereqs_string] . '
+                                                        c_id = ' . $course_id.' AND
+                                                        lp_view_id = ' . $my_lp_id.' AND
+                                                        lp_item_id = ' . $refs_list[$prereqs_string].'
                                                     LIMIT 0, 1';
                                             $rs_lp = Database::query($sql);
                                             $status_array = Database :: fetch_row(
@@ -2668,14 +2668,14 @@ 
                                             if (!$returnstatus) {
                                                 if (self::debug > 1) {
                                                     error_log(
-                                                        'New LP - Prerequisite ' . $prereqs_string . ' not complete',
+                                                        'New LP - Prerequisite '.$prereqs_string.' not complete',
                                                         0
                                                     );
                                                 }
                                             } else {
                                                 if (self::debug > 1) {
                                                     error_log(
-                                                        'New LP - Prerequisite ' . $prereqs_string . ' complete',
+                                                        'New LP - Prerequisite '.$prereqs_string.' complete',
                                                         0
                                                     );
                                                 }
@@ -2686,7 +2686,7 @@ 
                                 } else {
                                     if (self::debug > 1) {
                                         error_log(
-                                            'New LP - Could not find ' . $prereqs_string . ' in ' . print_r(
+                                            'New LP - Could not find '.$prereqs_string.' in '.print_r(
                                                 $refs_list,
                                                 true
                                             ),
@@ -2709,7 +2709,7 @@ 
                 foreach ($list as $condition) {
                     if (self::debug > 1) {
                         error_log(
-                            'New LP - Found OR, adding it (' . $condition . ')',
+                            'New LP - Found OR, adding it ('.$condition.')',
                             0
                         );
                     }
@@ -2762,7 +2762,7 @@ 
 
         if (self::debug > 1) {
             error_log(
-                'New LP - End of parse_prereq. Error code is now ' . $this->prereq_alert,
+                'New LP - End of parse_prereq. Error code is now '.$this->prereq_alert,
                 0
             );
         }
@@ -2880,7 +2880,7 @@ 
                                 $this->set_score($value);
                                 if (self::debug > 2) {
                                     error_log(
-                                        'learnpathItem::save() - setting score to ' . $value,
+                                        'learnpathItem::save() - setting score to '.$value,
                                         0
                                     );
                                 }
@@ -2889,7 +2889,7 @@ 
                                 $this->set_max_score($value);
                                 if (self::debug > 2) {
                                     error_log(
-                                        'learnpathItem::save() - setting view_max_score to ' . $value,
+                                        'learnpathItem::save() - setting view_max_score to '.$value,
                                         0
                                     );
                                 }
@@ -2898,7 +2898,7 @@ 
                                 $this->min_score = $value;
                                 if (self::debug > 2) {
                                     error_log(
-                                        'learnpathItem::save() - setting min_score to ' . $value,
+                                        'learnpathItem::save() - setting min_score to '.$value,
                                         0
                                     );
                                 }
@@ -2908,7 +2908,7 @@ 
                                     $this->set_status($value);
                                     if (self::debug > 2) {
                                         error_log(
-                                            'learnpathItem::save() - setting status to ' . $value,
+                                            'learnpathItem::save() - setting status to '.$value,
                                             0
                                         );
                                     }
@@ -2918,7 +2918,7 @@ 
                                 $this->set_time($value);
                                 if (self::debug > 2) {
                                     error_log(
-                                        'learnpathItem::save() - setting time to ' . $value,
+                                        'learnpathItem::save() - setting time to '.$value,
                                         0
                                     );
                                 }
@@ -2927,7 +2927,7 @@ 
                                 $this->current_data = $value;
                                 if (self::debug > 2) {
                                     error_log(
-                                        'learnpathItem::save() - setting suspend_data to ' . $value,
+                                        'learnpathItem::save() - setting suspend_data to '.$value,
                                         0
                                     );
                                 }
@@ -2936,7 +2936,7 @@ 
                                 $this->set_lesson_location($value);
                                 if (self::debug > 2) {
                                     error_log(
-                                        'learnpathItem::save() - setting lesson_location to ' . $value,
+                                        'learnpathItem::save() - setting lesson_location to '.$value,
                                         0
                                     );
                                 }
@@ -2945,7 +2945,7 @@ 
                                 $this->set_core_exit($value);
                                 if (self::debug > 2) {
                                     error_log(
-                                        'learnpathItem::save() - setting core_exit to ' . $value,
+                                        'learnpathItem::save() - setting core_exit to '.$value,
                                         0
                                     );
                                 }
@@ -3092,7 +3092,7 @@ 
     public function set_level($int = 0)
     {
         if (self::debug > 0) {
-            error_log('learnpathItem::set_level(' . $int . ')', 0);
+            error_log('learnpathItem::set_level('.$int.')', 0);
         }
         if (!empty($int) AND $int == strval(intval($int))) {
             $this->level = $int;
@@ -3121,7 +3121,7 @@ 
         if (empty($lpItemId)) {
             if (self::debug > 0) {
                 error_log(
-                    'learnpathItem::set_lp_view(' . $lp_view_id . ') $lpItemId is empty',
+                    'learnpathItem::set_lp_view('.$lp_view_id.') $lpItemId is empty',
                     0
                 );
             }
@@ -3132,7 +3132,7 @@ 
         if (empty($lp_view_id)) {
             if (self::debug > 0) {
                 error_log(
-                    'learnpathItem::set_lp_view(' . $lp_view_id . ') $lp_view_id is empty',
+                    'learnpathItem::set_lp_view('.$lp_view_id.') $lp_view_id is empty',
                     0
                 );
             }
@@ -3141,7 +3141,7 @@ 
         }
 
         if (self::debug > 0) {
-            error_log('learnpathItem::set_lp_view(' . $lp_view_id . ')', 0);
+            error_log('learnpathItem::set_lp_view('.$lp_view_id.')', 0);
         }
 
         $this->view_id = $lp_view_id;
@@ -3151,13 +3151,13 @@ 
         $sql = "SELECT * FROM $item_view_table
                 WHERE
                     c_id = $course_id AND
-                    lp_item_id = " . $lpItemId . " AND
-                    lp_view_id = " . $lp_view_id . "
+                    lp_item_id = ".$lpItemId." AND
+                    lp_view_id = " . $lp_view_id."
                 ORDER BY view_count DESC";
 
         if (self::debug > 2) {
             error_log(
-                'learnpathItem::set_lp_view() - Querying lp_item_view: ' . $sql,
+                'learnpathItem::set_lp_view() - Querying lp_item_view: '.$sql,
                 0
             );
         }
@@ -3189,7 +3189,7 @@ 
             $sql = "SELECT * FROM $item_view_interaction_table
                     WHERE
                         c_id = $course_id AND
-                        lp_iv_id = '" . $this->db_item_view_id . "'";
+                        lp_iv_id = '".$this->db_item_view_id."'";
 
             $res = Database::query($sql);
             if ($res !== false) {
@@ -3204,7 +3204,7 @@ 
             $sql = "SELECT * FROM $item_view_objective_table
                     WHERE
                         c_id = $course_id AND
-                        lp_iv_id = '" . $this->db_item_view_id . "'";
+                        lp_iv_id = '".$this->db_item_view_id."'";
 
             $res = Database::query($sql);
             if ($res !== false) {
@@ -3265,7 +3265,7 @@ 
     {
         $debug = self::debug;
         if ($debug > 0) {
-            error_log('learnpathItem::set_score(' . $score . ')', 0);
+            error_log('learnpathItem::set_score('.$score.')', 0);
         }
         if (($this->max_score <= 0 || $score <= $this->max_score) && ($score >= $this->min_score)) {
             $this->current_score = $score;
@@ -3278,9 +3278,9 @@ 
             }
 
             if ($debug > 0) {
-                error_log('get_mastery_score: ' . $masteryScore);
-                error_log('current_status: ' . $current_status);
-                error_log('current score : ' . $this->current_score);
+                error_log('get_mastery_score: '.$masteryScore);
+                error_log('current_status: '.$current_status);
+                error_log('current score : '.$this->current_score);
             }
 
             // If mastery_score is set AND the current score reaches the mastery
@@ -3308,15 +3308,15 @@ 
     public function set_max_score($score)
     {
         if (self::debug > 0) {
-            error_log('learnpathItem::set_max_score(' . $score . ')', 0);
+            error_log('learnpathItem::set_max_score('.$score.')', 0);
         }
         if (is_int($score) || $score == '') {
             $this->view_max_score = $score;
             if (self::debug > 1) {
                 error_log(
-                    'learnpathItem::set_max_score() - ' .
-                    'Updated object score of item ' . $this->db_id .
-                    ' to ' . $this->view_max_score,
+                    'learnpathItem::set_max_score() - '.
+                    'Updated object score of item '.$this->db_id.
+                    ' to '.$this->view_max_score,
                     0
                 );
             }
@@ -3334,12 +3334,12 @@ 
     public function set_status($status)
     {
         if (self::debug > 0) {
-            error_log('learnpathItem::set_status(' . $status . ')', 0);
+            error_log('learnpathItem::set_status('.$status.')', 0);
         }
 
         $found = false;
         foreach ($this->possible_status as $possible) {
-            if (preg_match('/^' . $possible . '$/i', $status)) {
+            if (preg_match('/^'.$possible.'$/i', $status)) {
                 $found = true;
             }
         }
@@ -3349,8 +3349,8 @@ 
             if (self::debug > 1) {
                 error_log(
                     'learnpathItem::set_status() - '.
-                        'Updated object status of item ' . $this->db_id .
-                        ' to ' . $this->status,
+                        'Updated object status of item '.$this->db_id.
+                        ' to '.$this->status,
                     0
                 );
             }
@@ -3374,7 +3374,7 @@ 
         $lp_item = Database::get_course_table(TABLE_LP_ITEM);
         require_once api_get_path(
                 LIBRARY_PATH
-            ) . 'search/ChamiloIndexer.class.php';
+            ).'search/ChamiloIndexer.class.php';
         $a_terms = preg_split('/,/', $terms);
         $i_terms = preg_split('/,/', $this->get_terms());
         foreach ($i_terms as $term) {
@@ -3391,7 +3391,7 @@ 
                 SET terms = '$terms'
                 WHERE
                     c_id = $course_id AND
-                    id=" . $this->get_id();
+                    id=".$this->get_id();
         Database::query($sql);
         // Save it to search engine.
         if (api_get_setting('search_enabled') == 'true') {
@@ -3419,7 +3419,7 @@ 
     public function set_time($scorm_time, $format = 'scorm')
     {
         if (self::debug > 0) {
-            error_log('learnpathItem::set_time(' . $scorm_time . ')', 0);
+            error_log('learnpathItem::set_time('.$scorm_time.')', 0);
         }
         if ($scorm_time == '0'
                 and ($this->type != 'sco')
@@ -3430,8 +3430,8 @@ 
                 $this->update_time($my_time);
                 if (self::debug > 0) {
                     error_log(
-                        'learnpathItem::set_time(' . $scorm_time . ') - ' .
-                            'found asset - set time to ' . $my_time,
+                        'learnpathItem::set_time('.$scorm_time.') - '.
+                            'found asset - set time to '.$my_time,
                         0
                     );
                 }
@@ -3504,10 +3504,10 @@ 
     {
         if (self::debug > 1) {
             error_log(
-                'learnpathItem::status_is(' . print_r(
+                'learnpathItem::status_is('.print_r(
                     $list,
                     true
-                ) . ') on item ' . $this->db_id,
+                ).') on item '.$this->db_id,
                 0
             );
         }
@@ -3517,11 +3517,11 @@ 
         }
         $found = false;
         foreach ($list as $status) {
-            if (preg_match('/^' . $status . '$/i', $currentStatus)) {
+            if (preg_match('/^'.$status.'$/i', $currentStatus)) {
                 if (self::debug > 2) {
                     error_log(
-                        'New LP - learnpathItem::status_is() - Found status ' .
-                            $status . ' corresponding to current status',
+                        'New LP - learnpathItem::status_is() - Found status '.
+                            $status.' corresponding to current status',
                         0
                     );
                 }
@@ -3532,8 +3532,8 @@ 
         }
         if (self::debug > 2) {
             error_log(
-                'New LP - learnpathItem::status_is() - Status ' .
-                    $currentStatus . ' did not match request',
+                'New LP - learnpathItem::status_is() - Status '.
+                    $currentStatus.' did not match request',
                 0
             );
         }
@@ -3550,7 +3550,7 @@ 
     public function update_time($total_sec = 0)
     {
         if (self::debug > 0) {
-            error_log('learnpathItem::update_time(' . $total_sec . ')', 0);
+            error_log('learnpathItem::update_time('.$total_sec.')', 0);
         }
         if ($total_sec >= 0) {
             // Getting start time from finish time. The only problem in the calculation is it might be
@@ -3602,11 +3602,11 @@ 
         $item_view_table = Database::get_course_table(TABLE_LP_ITEM_VIEW);
         $course_id = api_get_course_int_id();
 
-        $get_view_sql = 'SELECT total_time, status FROM ' . $item_view_table . '
-                         WHERE c_id = ' . $course_id . '
-                            AND lp_item_id="' . $this->db_id . '"
-                            AND lp_view_id="' . $this->view_id . '"
-                            AND view_count="' . $this->attempt_id . '" ;';
+        $get_view_sql = 'SELECT total_time, status FROM '.$item_view_table.'
+                         WHERE c_id = ' . $course_id.'
+                            AND lp_item_id="' . $this->db_id.'"
+                            AND lp_view_id="' . $this->view_id.'"
+                            AND view_count="' . $this->attempt_id.'" ;';
         $result = Database::query($get_view_sql);
         $row = Database::fetch_array($result);
 
@@ -3659,12 +3659,12 @@ 
     {
         $item_view_table = Database::get_course_table(TABLE_LP_ITEM_VIEW);
         $course_id = api_get_course_int_id();
-        $sql = 'UPDATE ' . $item_view_table . '
-                SET total_time = 0, start_time=' . time() . '
-                WHERE c_id = ' . $course_id . '
-                    AND lp_item_id="' . $this->db_id . '"
-                    AND lp_view_id="' . $this->view_id . '"
-                    AND view_count="' . $this->attempt_id . '" ;';
+        $sql = 'UPDATE '.$item_view_table.'
+                SET total_time = 0, start_time=' . time().'
+                WHERE c_id = ' . $course_id.'
+                    AND lp_item_id="' . $this->db_id.'"
+                    AND lp_view_id="' . $this->view_id.'"
+                    AND view_count="' . $this->attempt_id.'" ;';
         Database::query($sql);
     }
 
@@ -3686,8 +3686,8 @@ 
                     FROM $tbl
                     WHERE
                         c_id = $course_id AND
-                        lp_item_id = " . $this->db_id . " AND
-                        lp_view_id = " . $this->view_id . " AND
+                        lp_item_id = ".$this->db_id." AND
+                        lp_view_id = " . $this->view_id." AND
                         view_count = " . $this->attempt_id;
             $res = Database::query($sql);
             if (Database::num_rows($res) > 0) {
@@ -3695,8 +3695,8 @@ 
                 $lp_iv_id = $row[0];
                 if (self::debug > 2) {
                     error_log(
-                        'learnpathItem::write_to_db() - Got item_view_id ' .
-                            $lp_iv_id . ', now checking objectives ',
+                        'learnpathItem::write_to_db() - Got item_view_id '.
+                            $lp_iv_id.', now checking objectives ',
                         0
                     );
                 }
@@ -3708,7 +3708,7 @@ 
                                 WHERE
                                     c_id = $course_id AND
                                     lp_iv_id = $lp_iv_id AND
-                                    objective_id = '" . Database::escape_string($objective[0]) . "'";
+                                    objective_id = '".Database::escape_string($objective[0])."'";
                     $iva_res = Database::query($iva_sql);
                     // id(0), type(1), time(2), weighting(3),
                     // correct_responses(4), student_response(5),
@@ -3717,22 +3717,22 @@ 
                         // Update (or don't).
                         $iva_row = Database::fetch_array($iva_res);
                         $iva_id = $iva_row[0];
-                        $ivau_sql = "UPDATE $iva_table " .
-                            "SET objective_id = '" . Database::escape_string(
+                        $ivau_sql = "UPDATE $iva_table ".
+                            "SET objective_id = '".Database::escape_string(
                                 $objective[0]
-                            ) . "'," .
-                            "status = '" . Database::escape_string(
+                            )."',".
+                            "status = '".Database::escape_string(
                                 $objective[1]
-                            ) . "'," .
-                            "score_raw = '" . Database::escape_string(
+                            )."',".
+                            "score_raw = '".Database::escape_string(
                                 $objective[2]
-                            ) . "'," .
-                            "score_min = '" . Database::escape_string(
+                            )."',".
+                            "score_min = '".Database::escape_string(
                                 $objective[4]
-                            ) . "'," .
-                            "score_max = '" . Database::escape_string(
+                            )."',".
+                            "score_max = '".Database::escape_string(
                                 $objective[3]
-                            ) . "' " .
+                            )."' ".
                             "WHERE c_id = $course_id AND id = $iva_id";
                         Database::query($ivau_sql);
                     } else {
@@ -3782,12 +3782,12 @@ 
         $credit = $this->get_credit();
 
         $item_view_table = Database::get_course_table(TABLE_LP_ITEM_VIEW);
-        $sql = 'SELECT status FROM ' . $item_view_table . '
+        $sql = 'SELECT status FROM '.$item_view_table.'
                 WHERE
-                    c_id = ' . $course_id . ' AND
-                    lp_item_id="' . $this->db_id . '" AND
-                    lp_view_id="' . $this->view_id . '" AND
-                    view_count="' . $this->get_attempt_id() . '" ';
+                    c_id = ' . $course_id.' AND
+                    lp_item_id="' . $this->db_id.'" AND
+                    lp_view_id="' . $this->view_id.'" AND
+                    view_count="' . $this->get_attempt_id().'" ';
         $rs_verified = Database::query($sql);
         $row_verified = Database::fetch_array($rs_verified);
 
@@ -3815,8 +3815,8 @@ 
                     "This info shouldn't be saved as the credit or lesson mode info prevent it"
                 );
                 error_log(
-                    'learnpathItem::write_to_db() - credit(' . $credit . ') or'.
-                        ' lesson_mode(' . $mode . ') prevent recording!',
+                    'learnpathItem::write_to_db() - credit('.$credit.') or'.
+                        ' lesson_mode('.$mode.') prevent recording!',
                     0
                 );
             }
@@ -3840,14 +3840,14 @@ 
                     "max_score" => $this->get_max(),
                     "lp_item_id" => $this->db_id,
                     "lp_view_id" => $this->view_id,
-                    "view_count" => $this->get_attempt_id() ,
+                    "view_count" => $this->get_attempt_id(),
                     "suspend_data" => $this->current_data,
                     //"max_time_allowed" => ,
                     "lesson_location" => $this->lesson_location
                 );
                 if (self::debug > 2) {
                     error_log(
-                        'learnpathItem::write_to_db() - Inserting into item_view forced: ' . print_r($params, 1),
+                        'learnpathItem::write_to_db() - Inserting into item_view forced: '.print_r($params, 1),
                         0
                     );
                 }
@@ -3855,7 +3855,7 @@ 
 
                 if ($this->db_item_view_id) {
                     $sql = "UPDATE $item_view_table SET id = iid
-                            WHERE iid = " . $this->db_item_view_id;
+                            WHERE iid = ".$this->db_item_view_id;
                     Database::query($sql);
                     $inserted = true;
                 }
@@ -3865,12 +3865,12 @@ 
             $sql = "SELECT * FROM $item_view_table
                     WHERE
                         c_id = $course_id AND
-                        lp_item_id = " . $this->db_id . " AND
-                        lp_view_id = " . $this->view_id . " AND
+                        lp_item_id = ".$this->db_id." AND
+                        lp_view_id = " . $this->view_id." AND
                         view_count = " . intval($this->get_attempt_id());
             if (self::debug > 2) {
                 error_log(
-                    'learnpathItem::write_to_db() - Querying item_view: ' . $sql,
+                    'learnpathItem::write_to_db() - Querying item_view: '.$sql,
                     0
                 );
             }
@@ -3887,7 +3887,7 @@ 
                     "max_score" => $this->get_max(),
                     "lp_item_id" => $this->db_id,
                     "lp_view_id" => $this->view_id,
-                    "view_count" => $this->get_attempt_id() ,
+                    "view_count" => $this->get_attempt_id(),
                     "suspend_data" => $this->current_data,
                     //"max_time_allowed" => ,$this->get_max_time_allowed()
                     "lesson_location" => $this->lesson_location
@@ -3895,7 +3895,7 @@ 
 
                 if (self::debug > 2) {
                     error_log(
-                        'learnpathItem::write_to_db() - Inserting into item_view forced: ' . print_r($params, 1),
+                        'learnpathItem::write_to_db() - Inserting into item_view forced: '.print_r($params, 1),
                         0
                     );
                 }
@@ -3904,7 +3904,7 @@ 
 
                 if ($this->db_item_view_id) {
                     $sql = "UPDATE $item_view_table SET id = iid
-                            WHERE iid = " . $this->db_item_view_id;
+                            WHERE iid = ".$this->db_item_view_id;
                     Database::query($sql);
                 }
             } else {
@@ -3944,8 +3944,8 @@ 
                             $time_exe_date = convert_sql_date(
                                 $row_dates['exe_date']
                             );
-                            $mytime = ((int)$time_exe_date - (int)$time_start_date);
-                            $total_time = " total_time = " . $mytime . ", ";
+                            $mytime = ((int) $time_exe_date - (int) $time_start_date);
+                            $total_time = " total_time = ".$mytime.", ";
                         }
                     } else {
                         $my_type_lp = learnpath::get_type_static($this->lp_id);
@@ -3959,16 +3959,16 @@ 
 
                         // Is not multiple attempts
                         if ($this->seriousgame_mode == 1 && $this->type == 'sco') {
-                            $total_time = " total_time = total_time +" . $this->get_total_time() . ", ";
-                            $my_status = " status = '" . $this->get_status(false) . "' ,";
+                            $total_time = " total_time = total_time +".$this->get_total_time().", ";
+                            $my_status = " status = '".$this->get_status(false)."' ,";
                         } elseif ($this->get_prevent_reinit() == 1) {
                             // Process of status verified into data base.
-                            $sql = 'SELECT status FROM ' . $item_view_table . '
+                            $sql = 'SELECT status FROM '.$item_view_table.'
                                     WHERE
-                                        c_id = ' . $course_id . ' AND
-                                        lp_item_id="' . $this->db_id . '" AND
-                                        lp_view_id="' . $this->view_id . '" AND
-                                        view_count="' . $this->get_attempt_id() . '"
+                                        c_id = ' . $course_id.' AND
+                                        lp_item_id="' . $this->db_id.'" AND
+                                        lp_view_id="' . $this->view_id.'" AND
+                                        view_count="' . $this->get_attempt_id().'"
                                     ';
                             $rs_verified = Database::query($sql);
                             $row_verified = Database::fetch_array($rs_verified);
@@ -3978,26 +3978,26 @@ 
                             if (!in_array($this->get_status(false), $case_completed) &&
                                 $my_type_lp == 2
                             ) {
-                                $total_time = " total_time = total_time +" . $this->get_total_time() . ", ";
-                                $my_status = " status = '" . $this->get_status(false) . "' ,";
+                                $total_time = " total_time = total_time +".$this->get_total_time().", ";
+                                $my_status = " status = '".$this->get_status(false)."' ,";
                             } else {
                                 // Verified into database.
                                 if (!in_array($row_verified['status'], $case_completed) &&
                                     $my_type_lp == 2
                                 ) {
-                                    $total_time = " total_time = total_time +" . $this->get_total_time() . ", ";
-                                    $my_status = " status = '" . $this->get_status(false) . "' ,";
-                                } elseif (in_array($row_verified['status'], $case_completed ) &&
+                                    $total_time = " total_time = total_time +".$this->get_total_time().", ";
+                                    $my_status = " status = '".$this->get_status(false)."' ,";
+                                } elseif (in_array($row_verified['status'], $case_completed) &&
                                     $my_type_lp == 2 && $this->type != 'sco'
                                 ) {
-                                    $total_time = " total_time = total_time +" . $this->get_total_time() . ", ";
-                                    $my_status = " status = '" . $this->get_status(false) . "' ,";
+                                    $total_time = " total_time = total_time +".$this->get_total_time().", ";
+                                    $my_status = " status = '".$this->get_status(false)."' ,";
                                 } else {
                                     if (($my_type_lp == 3 && $this->type == 'au') ||
                                         ($my_type_lp == 1 && $this->type != 'chapter')) {
                                         // Is AICC or Chamilo LP
-                                        $total_time = " total_time = total_time + " . $this->get_total_time() . ", ";
-                                        $my_status = " status = '" . $this->get_status(false) . "' ,";
+                                        $total_time = " total_time = total_time + ".$this->get_total_time().", ";
+                                        $my_status = " status = '".$this->get_status(false)."' ,";
                                     }
                                 }
                             }
@@ -4009,27 +4009,27 @@ 
                                 ) && $my_type_lp == 2
                             ) {
                                 // Reset zero new attempt ?
-                                $my_status = " status = '" . $this->get_status(false) . "' ,";
+                                $my_status = " status = '".$this->get_status(false)."' ,";
                             } elseif (!in_array($this->get_status(false), $case_completed) &&
                                 $my_type_lp == 2
                             ) {
-                                $total_time = " total_time = " . $this->get_total_time() . ", ";
-                                $my_status = " status = '" . $this->get_status(false) . "' ,";
+                                $total_time = " total_time = ".$this->get_total_time().", ";
+                                $my_status = " status = '".$this->get_status(false)."' ,";
                             } else {
                                 // It is chamilo LP.
-                                $total_time = " total_time = total_time +" . $this->get_total_time() . ", ";
-                                $my_status = " status = '" . $this->get_status(false) . "' ,";
+                                $total_time = " total_time = total_time +".$this->get_total_time().", ";
+                                $my_status = " status = '".$this->get_status(false)."' ,";
                             }
 
                             // This code line fixes the problem of wrong status.
                             if ($my_type_lp == 2) {
                                 // Verify current status in multiples attempts.
-                                $sql = 'SELECT status FROM ' . $item_view_table . '
+                                $sql = 'SELECT status FROM '.$item_view_table.'
                                         WHERE
-                                            c_id = ' . $course_id . ' AND
-                                            lp_item_id="' . $this->db_id . '" AND
-                                            lp_view_id="' . $this->view_id . '" AND
-                                            view_count="' . $this->get_attempt_id() . '" ';
+                                            c_id = ' . $course_id.' AND
+                                            lp_item_id="' . $this->db_id.'" AND
+                                            lp_view_id="' . $this->view_id.'" AND
+                                            view_count="' . $this->get_attempt_id().'" ';
                                 $rs_status = Database::query($sql);
                                 $current_status = Database::result(
                                     $rs_status,
@@ -4040,7 +4040,7 @@ 
                                     $my_status = '';
                                     $total_time = '';
                                 } else {
-                                    $total_time = " total_time = total_time +" . $this->get_total_time() . ", ";
+                                    $total_time = " total_time = total_time +".$this->get_total_time().", ";
                                 }
                             }
                         }
@@ -4051,38 +4051,38 @@ 
                         //" . //start_time = ".$this->get_current_start_time().", " . //scorm_init_time does it
                         ////" max_time_allowed = '".$this->get_max_time_allowed()."'," .
                         $sql = "UPDATE $item_view_table SET
-                                    score = " . $this->get_score() . ",
+                                    score = ".$this->get_score().",
                                     $my_status
-                                    max_score = '" . $this->get_max() . "',
-                                    suspend_data = '" . Database::escape_string($this->current_data) . "',
-                                    lesson_location = '" . $this->lesson_location . "'
+                                    max_score = '".$this->get_max()."',
+                                    suspend_data = '" . Database::escape_string($this->current_data)."',
+                                    lesson_location = '" . $this->lesson_location."'
                                 WHERE
                                     c_id = $course_id AND
-                                    lp_item_id = " . $this->db_id . " AND
-                                    lp_view_id = " . $this->view_id . "  AND
+                                    lp_item_id = ".$this->db_id." AND
+                                    lp_view_id = " . $this->view_id."  AND
                                     view_count = " . $this->get_attempt_id();
 
                     } else {
                         //" max_time_allowed = '".$this->get_max_time_allowed()."'," .
                         $sql = "UPDATE $item_view_table SET
                                     $total_time
-                                    start_time = " . $this->get_current_start_time() . ",
-                                    score = " . $this->get_score() . ",
+                                    start_time = ".$this->get_current_start_time().",
+                                    score = " . $this->get_score().",
                                     $my_status
-                                    max_score = '" . $this->get_max() . "',
-                                    suspend_data = '" . Database::escape_string($this->current_data) . "',
-                                    lesson_location = '" . $this->lesson_location . "'
+                                    max_score = '".$this->get_max()."',
+                                    suspend_data = '" . Database::escape_string($this->current_data)."',
+                                    lesson_location = '" . $this->lesson_location."'
                                 WHERE
                                     c_id = $course_id AND
-                                    lp_item_id = " . $this->db_id . " AND
-                                    lp_view_id = " . $this->view_id . " AND
+                                    lp_item_id = ".$this->db_id." AND
+                                    lp_view_id = " . $this->view_id." AND
                                     view_count = " . $this->get_attempt_id();
                     }
                     $this->current_start_time = time();
                 }
                 if (self::debug > 2) {
                     error_log(
-                        'learnpathItem::write_to_db() - Updating item_view: ' . $sql,
+                        'learnpathItem::write_to_db() - Updating item_view: '.$sql,
                         0
                     );
                 }
@@ -4095,8 +4095,8 @@ 
                 $sql = "SELECT id FROM $tbl
                         WHERE
                             c_id = $course_id AND
-                            lp_item_id = " . $this->db_id . " AND
-                            lp_view_id = " . $this->view_id . " AND
+                            lp_item_id = ".$this->db_id." AND
+                            lp_view_id = " . $this->view_id." AND
                             view_count = " . $this->get_attempt_id();
                 $res = Database::query($sql);
                 if (Database::num_rows($res) > 0) {
@@ -4104,8 +4104,8 @@ 
                     $lp_iv_id = $row[0];
                     if (self::debug > 2) {
                         error_log(
-                            'learnpathItem::write_to_db() - Got item_view_id ' .
-                                $lp_iv_id . ', now checking interactions ',
+                            'learnpathItem::write_to_db() - Got item_view_id '.
+                                $lp_iv_id.', now checking interactions ',
                             0
                         );
                     }
@@ -4116,7 +4116,7 @@ 
                             ) && !empty($interaction[4][0])
                         ) {
                             foreach ($interaction[4] as $resp) {
-                                $correct_resp .= $resp . ',';
+                                $correct_resp .= $resp.',';
                             }
                             $correct_resp = substr(
                                 $correct_resp,
@@ -4135,7 +4135,7 @@ 
                                         lp_iv_id = $lp_iv_id AND
                                         (
                                             order_id = $index OR
-                                            interaction_id = '" . Database::escape_string($interaction[0]) . "'
+                                            interaction_id = '".Database::escape_string($interaction[0])."'
                                         )
                                     ";
                         $iva_res = Database::query($iva_sql);
@@ -4208,11 +4208,11 @@ 
     public function add_audio()
     {
         $course_info = api_get_course_info();
-        $filepath = api_get_path(SYS_COURSE_PATH) . $course_info['path'] . '/document/';
+        $filepath = api_get_path(SYS_COURSE_PATH).$course_info['path'].'/document/';
 
-        if (!is_dir($filepath . 'audio')) {
+        if (!is_dir($filepath.'audio')) {
             mkdir(
-                $filepath . 'audio',
+                $filepath.'audio',
                 api_get_permissions_for_new_directories()
             );
             $audio_id = add_document(
@@ -4271,10 +4271,10 @@ 
             // Store the mp3 file in the lp_item table.
             $tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
             $sql = "UPDATE $tbl_lp_item SET
-                        audio = '" . Database::escape_string($file_path) . "'
+                        audio = '".Database::escape_string($file_path)."'
                     WHERE
                         c_id = {$course_info['real_id']} AND
-                        id = '" . intval($this->db_id) . "'";
+                        id = '".intval($this->db_id)."'";
             Database::query($sql);
         }
 
@@ -4299,10 +4299,10 @@ 
             // Store the mp3 file in the lp_item table.
             $tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
             $sql = "UPDATE $tbl_lp_item SET
-                        audio = '" . Database::escape_string($file_path) . "'
+                        audio = '".Database::escape_string($file_path)."'
                     WHERE
                         c_id = {$course_info['real_id']} AND
-                        id = " . intval($this->db_id);
+                        id = ".intval($this->db_id);
             Database::query($sql);
         }
         return $file_path;
@@ -4323,7 +4323,7 @@ 
         }
         $sql = "UPDATE $tbl_lp_item SET
                 audio = ''
-                WHERE c_id = $course_id AND id IN (" . $this->db_id . ")";
+                WHERE c_id = $course_id AND id IN (".$this->db_id.")";
         Database::query($sql);
     }
 
@@ -4369,7 +4369,7 @@ 
 
         if ($type == 'simple') {
             if (in_array($status, array('failed', 'passed', 'browsed'))) {
-                $myLessonStatus = get_lang('ScormIncomplete');;
+                $myLessonStatus = get_lang('ScormIncomplete'); ;
                 $classStatus = 'warning';
             }
         }
@@ -4518,7 +4518,7 @@ 
      */
     public function createForumThread($currentForumId)
     {
-        require_once api_get_path(SYS_CODE_PATH) . '/forum/forumfunction.inc.php';
+        require_once api_get_path(SYS_CODE_PATH).'/forum/forumfunction.inc.php';
 
         $em = Database::getManager();
         $threadRepo = $em->getRepository('ChamiloCourseBundle:CForumThread');

main/newscorm/learnpathList.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      * @param   int     $categoryId
      * @param bool $ignoreCategoryFilter
      *
-     * @return	void
+     * @return	false|null
      */
     public function __construct(
         $user_id,

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
                     ";
         $res = Database::query($sql);
         $names = array();
-        while ($row = Database::fetch_array($res,'ASSOC')) {
+        while ($row = Database::fetch_array($res, 'ASSOC')) {
             // Use domesticate here instead of Database::escape_string because
             // it prevents ' to be slashed and the input (done by learnpath.class.php::toggle_visibility())
             // is done using domesticate()
@@ -235,7 +235,7 @@ 
 
         $lessons = array();
         while ($row = Database::fetch_array($result)) {
-            if (api_get_item_visibility($course, 'learnpath', $row['id'],  $session_id)) {
+            if (api_get_item_visibility($course, 'learnpath', $row['id'], $session_id)) {
                 $lessons[$row['id']] = $row;
             }
         }

main/newscorm/lp_ajax_save_item.php

Doc Comments +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  * @param   int $user_id User ID
  * @param   int $view_id View ID
  * @param   int $item_id Item ID
- * @param   float  $score Current score
- * @param   float  $max Maximum score
- * @param   float  $min Minimum score
+ * @param   integer  $score Current score
+ * @param   integer  $max Maximum score
+ * @param   integer  $min Minimum score
  * @param   string  $status Lesson status
  * @param   int  $time Session time
  * @param   string  $suspend Suspend data

Indentation +1 added lines, -1 removed lines

@@ -458,7 +458,7 @@
     }
 
     if ($myLP->get_type() == 2) {
-         $return .= "update_stats();";
+            $return .= "update_stats();";
     }
 
     // To be sure progress is updated.

Spacing +3 added lines, -3 removed lines

@@ -163,7 +163,7 @@ 
         // Set status to completed for hotpotatoes if score > 80%.
         if ($my_type == 'hotpotatoes') {
             if ((empty($status) || $status == 'undefined' || $status == 'not attempted') && $max > 0) {
-                if (($score/$max) > 0.8) {
+                if (($score / $max) > 0.8) {
                     $myStatus = 'completed';
                     if ($debug > 1) {
                         error_log('Calling set_status('.$myStatus.') for hotpotatoes', 0);
@@ -174,7 +174,7 @@ 
                         error_log('Done calling set_status for hotpotatoes - now '.$myLPI->get_status(false), 0);
                     }
                 }
-            } elseif ($status == 'completed' && $max > 0 && ($score/$max) < 0.8) {
+            } elseif ($status == 'completed' && $max > 0 && ($score / $max) < 0.8) {
                 $myStatus = 'failed';
                 if ($debug > 1) {
                     error_log('Calling set_status('.$myStatus.') for hotpotatoes', 0);
@@ -367,7 +367,7 @@ 
             $myLPI->current_data = $suspend;
         }
 
-        if (isset($location) && $location != '' && $location!='undefined') {
+        if (isset($location) && $location != '' && $location != 'undefined') {
             $myLPI->set_lesson_location($location);
         }