chamilo / chamilo-lms

main/inc/lib/pear/Pager/Common.php

Indentation +25 added lines, -25 removed lines

@@ -626,7 +626,7 @@ 
             return array(
                         max(($this->_perPage * ($pageID - 1)) + 1, 1),
                         min($this->_totalItems, $this->_perPage * $pageID)
-                   );
+                    );
         }
         return array(0, 0);
     }
@@ -848,16 +848,16 @@ 
                 $onclick = str_replace('%d', $this->_linkData[$this->_urlVar], $this->_onclick);
             }
             return sprintf('<a href="%s"%s%s%s%s title="%s">%s</a>',
-                           // Modified by Ivan Tcholakov, 17-OCT-2008.
-                           //htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8'),
-                           api_htmlentities($this->_url . $href),
-                           //
-                           empty($this->_classString) ? '' : ' '.$this->_classString,
-                           empty($this->_attributes)  ? '' : ' '.$this->_attributes,
-                           empty($this->_accesskey)   ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"',
-                           empty($onclick)            ? '' : ' onclick="'.$onclick.'"',
-                           $altText,
-                           $linkText
+                            // Modified by Ivan Tcholakov, 17-OCT-2008.
+                            //htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8'),
+                            api_htmlentities($this->_url . $href),
+                            //
+                            empty($this->_classString) ? '' : ' '.$this->_classString,
+                            empty($this->_attributes)  ? '' : ' '.$this->_attributes,
+                            empty($this->_accesskey)   ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"',
+                            empty($onclick)            ? '' : ' onclick="'.$onclick.'"',
+                            $altText,
+                            $linkText
             );
         } elseif ($this->_httpMethod == 'POST') {
             $href = $this->_url;
@@ -865,12 +865,12 @@ 
                 $href .= '?' . $this->_http_build_query_wrapper($_GET);
             }
             return sprintf("<a href='javascript:void(0)' onclick='%s'%s%s%s title='%s'>%s</a>",
-                           $this->_generateFormOnClick($href, $this->_linkData),
-                           empty($this->_classString) ? '' : ' '.$this->_classString,
-                           empty($this->_attributes)  ? '' : ' '.$this->_attributes,
-                           empty($this->_accesskey)   ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'',
-                           $altText,
-                           $linkText
+                            $this->_generateFormOnClick($href, $this->_linkData),
+                            empty($this->_classString) ? '' : ' '.$this->_classString,
+                            empty($this->_attributes)  ? '' : ' '.$this->_attributes,
+                            empty($this->_accesskey)   ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'',
+                            $altText,
+                            $linkText
             );
         }
         return '';
@@ -1120,10 +1120,10 @@ 
         if ($this->_currentPage > 1) {
             $this->_linkData[$this->_urlVar] = $this->getPreviousPageID();
             $back = $this->_renderLink($this->_altPrev, $this->_prevImg)
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                    . $this->_spacesBefore . $this->_spacesAfter;
         } else if ($this->_prevImgEmpty !== null && $this->_totalPages > 1) {
             $back = $this->_prevImgEmpty
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                    . $this->_spacesBefore . $this->_spacesAfter;
         }
         return $back;
     }
@@ -1171,12 +1171,12 @@ 
         if ($this->_currentPage < $this->_totalPages) {
             $this->_linkData[$this->_urlVar] = $this->getNextPageID();
             $next = $this->_spacesAfter
-                  . $this->_renderLink($this->_altNext, $this->_nextImg)
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                    . $this->_renderLink($this->_altNext, $this->_nextImg)
+                    . $this->_spacesBefore . $this->_spacesAfter;
         } else if ($this->_nextImgEmpty !== null && $this->_totalPages > 1) {
             $next = $this->_spacesAfter
-                  . $this->_nextImgEmpty
-                  . $this->_spacesBefore . $this->_spacesAfter;
+                    . $this->_nextImgEmpty
+                    . $this->_spacesBefore . $this->_spacesAfter;
         }
         return $next;
     }
@@ -1632,7 +1632,7 @@ 
         }
 
         if (!empty($_SESSION[$this->_sessionVar]) && $this->_useSessions) {
-             $this->_perPage = $_SESSION[$this->_sessionVar];
+                $this->_perPage = $_SESSION[$this->_sessionVar];
         }
 
         if ($this->_closeSession) {
@@ -1713,7 +1713,7 @@ 
                 ERROR_PAGER_INVALID             => 'invalid',
                 ERROR_PAGER_INVALID_PLACEHOLDER => 'invalid format - use "%d" as placeholder.',
                 ERROR_PAGER_INVALID_USAGE       => 'if $options[\'append\'] is set to false, '
-                                                  .' $options[\'fileName\'] MUST contain the "%d" placeholder.',
+                                                    .' $options[\'fileName\'] MUST contain the "%d" placeholder.',
                 ERROR_PAGER_NOT_IMPLEMENTED     => 'not implemented'
             );
         }

main/inc/lib/api.lib.php

Indentation +2 added lines, -4 removed lines

@@ -625,7 +625,6 @@ 
  * The other configuration parameters have not been changed.
  *
  * This is how we can get most used paths, for common purpose:
-
  * api_get_path(REL_PATH)                       /chamilo/
  * api_get_path(REL_COURSE_PATH)                /chamilo/courses/
  * api_get_path(REL_CODE_PATH)                  /chamilo/main/
@@ -1803,7 +1802,6 @@ 
 
 /**
  * Returns the current course info array.
-
  * Now if the course_code is given, the returned array gives info about that
  * particular course, not specially the current one.
  * @param int $id Numeric ID of the course
@@ -2734,7 +2732,7 @@ 
         switch ($session_user_status) {
             case 0:
                 $session_status['status'] = 'student';
-               break;
+                break;
             case 2:
                 $session_status['status'] = 'coach';
             break;
@@ -6492,7 +6490,7 @@ 
 function api_get_jquery_ui_js($include_jqgrid = false) {
     $libraries = array();
     if ($include_jqgrid) {
-       $libraries[]='jqgrid';
+        $libraries[]='jqgrid';
     }
     return api_get_jquery_libraries_js($libraries);
 }

main/install/install.lib.php

Indentation +2 added lines, -2 removed lines

@@ -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>

main/newscorm/lp_add_item.php

Indentation +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 
 // Using the resource linker as a tool for adding resources to the learning path.
 if ($action == 'add' && $type == 'learnpathitem') {
-     $htmlHeadXtra[] = "<script type='text/javascript'> window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\"; </script>";
+        $htmlHeadXtra[] = "<script type='text/javascript'> window.location=\"../resourcelinker/resourcelinker.php?source_id=5&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no\"; </script>";
 }
 if ((!$is_allowed_to_edit)) {
     error_log('New LP - User not authorized in lp_add_item.php');

main/newscorm/lp_move_item.php

Indentation +3 added lines, -3 removed lines

@@ -47,10 +47,10 @@
 " .
 "\n" .
 '$().ready(function() {'."\n" .
-  'if ($(\'#previous\')) {'."\n" .
+    'if ($(\'#previous\')) {'."\n" .
     'if(\'parent is\'+$(\'#idParent\').val()) {'.
-      'load_cbo($(\'#idParent\').val());'."\n" .
-  '}}'."\n" .
+        'load_cbo($(\'#idParent\').val());'."\n" .
+    '}}'."\n" .
 '});</script>'."\n" ;
 
 /* Constants and variables */

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

Indentation +512 added lines, -512 removed lines

@@ -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
-	 *
-	 */
-	public function __construct($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
+     *
+     */
+    public function __construct($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/ajax/course_home.ajax.php

Indentation +24 added lines, -24 removed lines

@@ -63,12 +63,12 @@ 
             echo json_encode($response_data);
         }
         break;
-	case 'show_course_information' :
-		require_once '../global.inc.php';
+    case 'show_course_information' :
+        require_once '../global.inc.php';
 
-		// Get the name of the database course.
-		$tbl_course_description = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
-		$course_info = api_get_course_info($_GET['code']);
+        // Get the name of the database course.
+        $tbl_course_description = Database::get_course_table(TABLE_COURSE_DESCRIPTION);
+        $course_info = api_get_course_info($_GET['code']);
 
         if (
             api_get_setting('course_catalog_hide_private') === 'true' &&
@@ -77,27 +77,27 @@ 
             echo get_lang('PrivateAccess');
             break;
         }
-		//echo Display::tag('h2', $course_info['name']);
-		//echo '<br />';
+        //echo Display::tag('h2', $course_info['name']);
+        //echo '<br />';
 
-		$sql = "SELECT * FROM $tbl_course_description
+        $sql = "SELECT * FROM $tbl_course_description
 		        WHERE c_id = ".$course_info['real_id']." AND session_id = 0
 		        ORDER BY id";
-		$result = Database::query($sql);
-		if (Database::num_rows($result) > 0 ) {
-		    while ($description = Database::fetch_object($result)) {
-			    $descriptions[$description->id] = $description;
-		    }
+        $result = Database::query($sql);
+        if (Database::num_rows($result) > 0 ) {
+            while ($description = Database::fetch_object($result)) {
+                $descriptions[$description->id] = $description;
+            }
             // Function that displays the details of the course description in html.
-		    echo CourseManager::get_details_course_description_html(
+            echo CourseManager::get_details_course_description_html(
                 $descriptions,
                 api_get_system_encoding(),
                 false
             );
-		} else {
-		    echo get_lang('NoDescription');
-		}
-	    break;
+        } else {
+            echo get_lang('NoDescription');
+        }
+        break;
     case 'session_courses_lp_default':
         /**
          * @todo this functions need to belong to a class or a special
@@ -112,7 +112,7 @@ 
         $sidx  = isset($_REQUEST['sidx']) && !empty($_REQUEST['sidx']) ? $_REQUEST['sidx'] : 'id';
         $sord  = $_REQUEST['sord'];    //asc or desc
         if (!in_array($sord, array('asc','desc'))) {
-        	$sord = 'desc';
+            $sord = 'desc';
         }
         $session_id  = intval($_REQUEST['session_id']);
         $course_id   = intval($_REQUEST['course_id']);
@@ -127,7 +127,7 @@ 
                     $my_session_list[] = $item['id_session'];
             }
             if (!in_array($session_id, $my_session_list)) {
-            	break;
+                break;
             }
         }
 
@@ -312,7 +312,7 @@ 
                     $date = '-';
                 }
 
-                 //Checking LP publicated and expired_on dates
+                    //Checking LP publicated and expired_on dates
 
                 if (!empty($lp_item['publicated_on']) && $lp_item['publicated_on'] != '0000-00-00 00:00:00') {
                     $week_data = date('Y', api_strtotime($lp_item['publicated_on'], 'UTC')).' - '.get_week_from_day($lp_item['publicated_on']);
@@ -440,7 +440,7 @@ 
                     $date = '-';
                 }
 
-                 //Checking LP publicated and expired_on dates
+                    //Checking LP publicated and expired_on dates
                 if (!empty($lp_item['publicated_on']) && $lp_item['publicated_on'] != '0000-00-00 00:00:00') {
                     if ($now < api_strtotime($lp_item['publicated_on'], 'UTC')) {
                         continue;
@@ -494,7 +494,7 @@ 
 
         echo json_encode($response);
         break;
-	default:
-		echo '';
+    default:
+        echo '';
 }
 exit;

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

Indentation +242 added lines, -242 removed lines

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

main/admin/user_list.php

Indentation +127 added lines, -127 removed lines

@@ -308,13 +308,13 @@ 
     $firstname = $userInfo['firstname'];
     $lastname = $userInfo['lastname'];
 
-	if (api_is_western_name_order()) {
-		$message = sprintf(get_lang('AttemptingToLoginAs'),$firstname, $lastname, $userId);
-	} else {
-		$message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
-	}
+    if (api_is_western_name_order()) {
+        $message = sprintf(get_lang('AttemptingToLoginAs'),$firstname, $lastname, $userId);
+    } else {
+        $message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
+    }
 
-	if ($userId) {
+    if ($userId) {
 
         // Logout the current user
         LoginDelete(api_get_user_id());
@@ -349,7 +349,7 @@ 
         Display :: display_footer();
         exit;
 
-	}
+    }
 }
 
 /**
@@ -388,7 +388,7 @@ 
     }*/
 
     if (!in_array($direction, array('ASC','DESC'))) {
-    	$direction = 'ASC';
+        $direction = 'ASC';
     }
     $column = intval($column);
     $from 	= intval($from);
@@ -399,23 +399,23 @@ 
         $sql .= " WHERE u.creator_id = ".api_get_user_id();
     }
 
-	$sql .= " ORDER BY col$column $direction ";
-	$sql .= " LIMIT $from,$number_of_items";
+    $sql .= " ORDER BY col$column $direction ";
+    $sql .= " LIMIT $from,$number_of_items";
 
-	$res = Database::query($sql);
+    $res = Database::query($sql);
 
-	$users = array ();
+    $users = array ();
     $t = time();
-	while ($user = Database::fetch_row($res)) {
-		$userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
-		$photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
+    while ($user = Database::fetch_row($res)) {
+        $userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
+        $photo = '<img src="'.$userPicture.'" width="22" height="22" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
 
         if ($user[7] == 1 && !empty($user[10])) {
             // check expiration date
             $expiration_time = convert_sql_date($user[10]);
             // if expiration date is passed, store a special value for active field
             if ($expiration_time < $t) {
-        	   $user[7] = '-1';
+                $user[7] = '-1';
             }
         }
 
@@ -433,9 +433,9 @@ 
             api_get_local_time($user[9]),
             $user[0]
         );
-	}
+    }
 
-	return $users;
+    return $users;
 }
 
 /**
@@ -444,7 +444,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function email_filter($email) {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 
 /**
@@ -453,7 +453,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function user_filter($name, $params, $row) {
-	return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
+    return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
 }
 
 /**
@@ -464,84 +464,84 @@ 
  * @return string Some HTML-code with modify-buttons
  */
 function modify_filter($user_id, $url_params, $row) {
-	global $charset, $_admins_list;
-	$is_admin   = in_array($user_id,$_admins_list);
-	$statusname = api_get_status_langvars();
-	$user_is_anonymous = false;
+    global $charset, $_admins_list;
+    $is_admin   = in_array($user_id,$_admins_list);
+    $statusname = api_get_status_langvars();
+    $user_is_anonymous = false;
     $current_user_status_label = $row['7'];
 
-	if ($current_user_status_label == $statusname[ANONYMOUS]) {
-		$user_is_anonymous =true;
-	}
-	$result = '';
-	if (!$user_is_anonymous) {
-		$icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
+    if ($current_user_status_label == $statusname[ANONYMOUS]) {
+        $user_is_anonymous =true;
+    }
+    $result = '';
+    if (!$user_is_anonymous) {
+        $icon = Display::return_icon('course.png', get_lang('Courses'), array('onmouseout' => 'clear_course_list (\'div_'.$user_id.'\')'));
+        $result .= '<a href="javascript:void(0)" onclick="load_course_list(\'div_'.$user_id.'\','.$user_id.')" >
 			        '.$icon.'
 					<div class="blackboard_hide" id="div_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
 
         $icon = Display::return_icon('session.png', get_lang('Sessions'), array('onmouseout' => 'clear_session_list (\'div_s_'.$user_id.'\')'));
-		$result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
+        $result .= '<a href="javascript:void(0)" onclick="load_session_list(\'div_s_'.$user_id.'\','.$user_id.')" >
 					'.$icon.'
 					<div class="blackboard_hide" id="div_s_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
-	} else {
-		$result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
-		$result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
-	}
+    } else {
+        $result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
+    }
 
-	if (api_is_platform_admin()) {
-		if (!$user_is_anonymous) {
-			$result .= '<a href="user_information.php?user_id='.$user_id.'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>&nbsp;&nbsp;';
-		} else {
-			$result .= Display::return_icon('synthese_view_na.gif', get_lang('Info')).'&nbsp;&nbsp;';
-		}
-	}
+    if (api_is_platform_admin()) {
+        if (!$user_is_anonymous) {
+            $result .= '<a href="user_information.php?user_id='.$user_id.'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>&nbsp;&nbsp;';
+        } else {
+            $result .= Display::return_icon('synthese_view_na.gif', get_lang('Info')).'&nbsp;&nbsp;';
+        }
+    }
 
     //only allow platform admins to login_as, or session admins only for students (not teachers nor other admins)
     if (api_is_platform_admin() || (api_is_session_admin() && $current_user_status_label == $statusname[STUDENT])) {
-    	if (!$user_is_anonymous) {
+        if (!$user_is_anonymous) {
             if (api_global_admin_can_edit_admin($user_id)) {
                 $result .= '<a href="user_list.php?action=login_as&user_id='.$user_id.'&sec_token='.$_SESSION['sec_token'].'">'.Display::return_icon('login_as.png', get_lang('LoginAs')).'</a>&nbsp;&nbsp;';
             } else {
                 $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
             }
-    	} else {
-    		$result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
-    	}
+        } else {
+            $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
+        }
     } else {
-    	$result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
+        $result .= Display::return_icon('login_as_na.png', get_lang('LoginAs')).'&nbsp;&nbsp;';
     }
 
-	if ($current_user_status_label != $statusname[STUDENT]) {
-		$result .= Display::return_icon('statistics_na.gif', get_lang('Reporting')).'&nbsp;&nbsp;';
-	} else {
-		$result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;&nbsp;';
-	}
+    if ($current_user_status_label != $statusname[STUDENT]) {
+        $result .= Display::return_icon('statistics_na.gif', get_lang('Reporting')).'&nbsp;&nbsp;';
+    } else {
+        $result .= '<a href="../mySpace/myStudents.php?student='.$user_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;&nbsp;';
+    }
 
-	if (api_is_platform_admin(true)) {
+    if (api_is_platform_admin(true)) {
         $editProfileUrl = Display::getProfileEditionLink($user_id, true);
 
         if (!$user_is_anonymous && api_global_admin_can_edit_admin($user_id, null, true)) {
             $result .= '<a href="' . $editProfileUrl . '">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-		} else {
+        } else {
             $result .= Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
-		}
-	}
+        }
+    }
 
-	if ($is_admin) {
-		$result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
-	} else {
-		$result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
-	}
+    if ($is_admin) {
+        $result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
+    } else {
+        $result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
+    }
 
-	// actions for assigning sessions, courses or users
-	if (api_is_session_admin()) {
-		/*if ($row[0] == api_get_user_id()) {
+    // actions for assigning sessions, courses or users
+    if (api_is_session_admin()) {
+        /*if ($row[0] == api_get_user_id()) {
 			$result .= '<a href="dashboard_add_sessions_to_user.php?user='.$user_id.'">'.Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')).'</a>&nbsp;&nbsp;';
 		}*/
-	} else {
+    } else {
         if ($current_user_status_label == $statusname[SESSIONADMIN]) {
             $result .= Display::url(
                 Display::return_icon('view_more_stats.gif', get_lang('AssignSessions')),
@@ -571,7 +571,7 @@ 
                 );
             }
         }
-	}
+    }
 
     if (api_is_platform_admin()) {
         $result .= ' <a data-title="'.get_lang('FreeBusyCalendar').'" href="'.api_get_path(WEB_AJAX_PATH).'agenda.ajax.php?a=get_user_agenda&user_id='.$user_id.'&modal_size=lg" class="agenda_opener ajax">'.
@@ -589,7 +589,7 @@ 
             }
         }
     }
-	return $result;
+    return $result;
 }
 
 
@@ -622,10 +622,10 @@ 
     if ($action == 'edit') {
         $result = Display::return_icon($image.'.png', get_lang('AccountExpired'), array(), 16);
     } elseif ($row['0']<>$_user['user_id']) {
-    	// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
-	}
-	return $result;
+        // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
+        $result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
+    }
+    return $result;
 }
 
 /**
@@ -638,8 +638,8 @@ 
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
  */
 function status_filter($status) {
-	$statusname = api_get_status_langvars();
-	return $statusname[$status];
+    $statusname = api_get_status_langvars();
+    return $statusname[$status];
 }
 
 if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
@@ -655,8 +655,8 @@ 
 
 if (!empty($action)) {
     $check = Security::check_token('get');
-	if ($check) {
-		switch ($action) {
+    if ($check) {
+        switch ($action) {
             case 'add_user_to_my_url':
                 $user_id = $_REQUEST["user_id"];
                 $result = UrlManager::add_user_to_url($user_id, $current_access_url_id);
@@ -666,45 +666,45 @@ 
                     $message  = Display::return_message($message, 'confirmation');
                 }
                 break;
-			case 'delete_user':
-				if (api_is_platform_admin()) {
+            case 'delete_user':
+                if (api_is_platform_admin()) {
                     $user_to_delete = $_GET['user_id'];
                     $current_user_id = api_get_user_id();
 
-					if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
-						if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
-							$message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
-						} else {
-							$message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
-						}
-					} else {
-						$message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
-					}
-				}
-				break;
+                    if ($deleteUserAvailable && api_global_admin_can_edit_admin($_GET['user_id'])) {
+                        if ($user_to_delete != $current_user_id && UserManager :: delete_user($_GET['user_id'])) {
+                            $message = Display :: return_message(get_lang('UserDeleted'), 'confirmation');
+                        } else {
+                            $message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
+                        }
+                    } else {
+                        $message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
+                    }
+                }
+                break;
             case 'delete':
-				if (api_is_platform_admin()) {
-					$number_of_selected_users = count($_POST['id']);
-					$number_of_deleted_users = 0;
-					if (is_array($_POST['id'])) {
-						foreach ($_POST['id'] as $index => $user_id) {
-							if ($user_id != $_user['user_id']) {
-								if (UserManager::delete_user($user_id)) {
-									$number_of_deleted_users++;
-								}
-							}
-						}
-					}
-					if ($number_of_selected_users == $number_of_deleted_users) {
+                if (api_is_platform_admin()) {
+                    $number_of_selected_users = count($_POST['id']);
+                    $number_of_deleted_users = 0;
+                    if (is_array($_POST['id'])) {
+                        foreach ($_POST['id'] as $index => $user_id) {
+                            if ($user_id != $_user['user_id']) {
+                                if (UserManager::delete_user($user_id)) {
+                                    $number_of_deleted_users++;
+                                }
+                            }
+                        }
+                    }
+                    if ($number_of_selected_users == $number_of_deleted_users) {
                         $message = Display :: return_message(get_lang('SelectedUsersDeleted'), 'confirmation');
-					} else {
+                    } else {
                         $message = Display :: return_message(get_lang('SomeUsersNotDeleted'), 'error');
-					}
-				}
-				break;
-		}
-		Security::clear_token();
-	}
+                    }
+                }
+                break;
+        }
+        Security::clear_token();
+    }
 }
 
 // Create a search-box
@@ -724,24 +724,24 @@ 
 
 $actions  = '';
 if (api_is_platform_admin()) {
-	$actions .= '<div style="float:right;">'.
-		 '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
-         Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
-		 '</div>';
+    $actions .= '<div style="float:right;">'.
+            '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
+            Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
+            '</div>';
 }
 $actions .= $form->return_form();
 
 if (isset ($_GET['keyword'])) {
-	$parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
+    $parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
 } elseif (isset ($_GET['keyword_firstname'])) {
-	$parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
-	$parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
-	$parameters['keyword_username']	 	= Security::remove_XSS($_GET['keyword_username']);
-	$parameters['keyword_email'] 	 	= Security::remove_XSS($_GET['keyword_email']);
-	$parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
-	$parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
-	$parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
-	$parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
+    $parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
+    $parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
+    $parameters['keyword_username']	 	= Security::remove_XSS($_GET['keyword_username']);
+    $parameters['keyword_email'] 	 	= Security::remove_XSS($_GET['keyword_email']);
+    $parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
+    $parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
+    $parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
+    $parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
 }
 // Create a sortable table with user-data
 $parameters['sec_token'] = Security::get_token();
@@ -752,7 +752,7 @@ 
 $res_admin = Database::query($sql_admin);
 $_admins_list = array();
 while ($row_admin = Database::fetch_row($res_admin)) {
-	$_admins_list[] = $row_admin[0];
+    $_admins_list[] = $row_admin[0];
 }
 
 // Display Advanced search form.
@@ -808,11 +808,11 @@ 
 $table->set_header(2, get_lang('OfficialCode'));
 
 if (api_is_western_name_order()) {
-	$table->set_header(3, get_lang('FirstName'));
-	$table->set_header(4, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
+    $table->set_header(4, get_lang('LastName'));
 } else {
-	$table->set_header(3, get_lang('LastName'));
-	$table->set_header(4, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
+    $table->set_header(4, get_lang('FirstName'));
 }
 $table->set_header(5, get_lang('LoginName'));
 $table->set_header(6, get_lang('Email'));