chamilo / chamilo-lms

plugin/ims_lti/OAuthSimple.php

Indentation +186 added lines, -186 removed lines

@@ -18,24 +18,24 @@ 
     private $_nonce_chars;
 
     /**
-	 * Constructor
+     * Constructor
      *
-	 * @access public
+     * @access public
      * @param api_key (String) The API Key (sometimes referred to as the consumer key) This value is usually supplied by the site you wish to use.
      * @param shared_secret (String) The shared secret. This value is also usually provided by the site you wish to use.
-	 * @return OAuthSimple (Object)
+     * @return OAuthSimple (Object)
      */
     function __construct ($APIKey = "", $sharedSecret=""){
 
         if (!empty($APIKey))
-		{
-			$this->_secrets['consumer_key'] = $APIKey;
-		}
+        {
+            $this->_secrets['consumer_key'] = $APIKey;
+        }
 
         if (!empty($sharedSecret))
-		{
-			$this->_secrets['shared_secret'] = $sharedSecret;
-		}
+        {
+            $this->_secrets['shared_secret'] = $sharedSecret;
+        }
 
         $this->_default_signature_method = "HMAC-SHA1";
         $this->_action = "GET";
@@ -45,11 +45,11 @@ 
     }
 
     /**
-	 * Reset the parameters and URL
-	 *
-	 * @access public
-	 * @return OAuthSimple (Object)
-	 */
+     * Reset the parameters and URL
+     *
+     * @access public
+     * @return OAuthSimple (Object)
+     */
     public function reset() {
         $this->_parameters = Array();
         $this->path = NULL;
@@ -59,87 +59,87 @@ 
     }
 
     /**
-	 * Set the parameters either from a hash or a string
-	 *
-	 * @access public
-	 * @param(string, object) List of parameters for the call, this can either be a URI string (e.g. "foo=bar&gorp=banana" or an object/hash)
-	 * @return OAuthSimple (Object)
-	 */
+     * Set the parameters either from a hash or a string
+     *
+     * @access public
+     * @param(string, object) List of parameters for the call, this can either be a URI string (e.g. "foo=bar&gorp=banana" or an object/hash)
+     * @return OAuthSimple (Object)
+     */
     public function setParameters ($parameters=Array()) {
 
         if (is_string($parameters))
-		{
-			$parameters = $this->_parseParameterString($parameters);
-		}
+        {
+            $parameters = $this->_parseParameterString($parameters);
+        }
         if (empty($this->_parameters))
-		{
-			$this->_parameters = $parameters;
-		}
+        {
+            $this->_parameters = $parameters;
+        }
         else if (!empty($parameters))
-		{
-			$this->_parameters = array_merge($this->_parameters,$parameters);
-		}
+        {
+            $this->_parameters = array_merge($this->_parameters,$parameters);
+        }
         if (empty($this->_parameters['oauth_nonce']))
-		{
-			$this->_getNonce();
-		}
+        {
+            $this->_getNonce();
+        }
         if (empty($this->_parameters['oauth_timestamp']))
-		{
-			 $this->_getTimeStamp();
-		}
+        {
+                $this->_getTimeStamp();
+        }
         if (empty($this->_parameters['oauth_consumer_key']))
-		{
-			$this->_getApiKey();
-		}
+        {
+            $this->_getApiKey();
+        }
         if (empty($this->_parameters['oauth_token']))
-		{
-			  $this->_getAccessToken();
-		}
+        {
+                $this->_getAccessToken();
+        }
         if (empty($this->_parameters['oauth_signature_method']))
-		{
+        {
             $this->setSignatureMethod();
-		}
+        }
         if (empty($this->_parameters['oauth_version']))
-		{
+        {
             $this->_parameters['oauth_version']="1.0";
-		}
+        }
 
         return $this;
     }
 
     /**
-	 * Convenience method for setParameters
-	 *
-	 * @access public
-	 * @see setParameters
-	 */
+     * Convenience method for setParameters
+     *
+     * @access public
+     * @see setParameters
+     */
     public function setQueryString ($parameters)
     {
         return $this->setParameters($parameters);
     }
 
     /**
-	 * Set the target URL (does not include the parameters)
-	 *
+     * Set the target URL (does not include the parameters)
+     *
      * @param path (String) the fully qualified URI (excluding query arguments) (e.g "http://example.org/foo")
-	 * @return OAuthSimple (Object)
+     * @return OAuthSimple (Object)
      */
     public function setURL ($path)
-	{
+    {
         if (empty($path))
-		{
+        {
             throw new OAuthSimpleException('No path specified for OAuthSimple.setURL');
-		}
+        }
         $this->_path=$path;
 
         return $this;
     }
 
     /**
-	 * Convenience method for setURL
+     * Convenience method for setURL
      *
      * @param path (String)
-	 * @see setURL
+     * @see setURL
      */
     public function setPath ($path)
     {
@@ -147,39 +147,39 @@ 
     }
 
     /**
-	 * Set the "action" for the url, (e.g. GET,POST, DELETE, etc.)
+     * Set the "action" for the url, (e.g. GET,POST, DELETE, etc.)
      *
      * @param action (String) HTTP Action word.
-	 * @return OAuthSimple (Object)
+     * @return OAuthSimple (Object)
      */
     public function setAction ($action)
     {
         if (empty($action))
-		{
-			$action = 'GET';
-		}
+        {
+            $action = 'GET';
+        }
         $action = strtoupper($action);
         if (preg_match('/[^A-Z]/',$action))
-		{
+        {
             throw new OAuthSimpleException('Invalid action specified for OAuthSimple.setAction');
-		}
+        }
         $this->_action = $action;
 
         return $this;
     }
 
     /**
-	 * Set the signatures (as well as validate the ones you have)
+     * Set the signatures (as well as validate the ones you have)
      *
      * @param signatures (object) object/hash of the token/signature pairs {api_key:, shared_secret:, oauth_token: oauth_secret:}
-	 * @return OAuthSimple (Object)
+     * @return OAuthSimple (Object)
      */
     public function signatures ($signatures)
     {
         if (!empty($signatures) && !is_array($signatures))
-		{
+        {
             throw new OAuthSimpleException('Must pass dictionary array to OAuthSimple.signatures');
-		}
+        }
         if (!empty($signatures))
         {
             if (empty($this->_secrets))
@@ -189,33 +189,33 @@ 
             $this->_secrets=array_merge($this->_secrets,$signatures);
         }
         if (isset($this->_secrets['api_key']))
-		{
+        {
             $this->_secrets['consumer_key'] = $this->_secrets['api_key'];
-		}
+        }
         if (isset($this->_secrets['access_token']))
-		{
+        {
             $this->_secrets['oauth_token'] = $this->_secrets['access_token'];
-		}
+        }
         if (isset($this->_secrets['access_secret']))
-		{
+        {
             $this->_secrets['shared_secret'] = $this->_secrets['access_secret'];
         }
         if (isset($this->_secrets['oauth_token_secret']))
-		{
+        {
             $this->_secrets['oauth_secret'] = $this->_secrets['oauth_token_secret'];
-		}
+        }
         if (empty($this->_secrets['consumer_key']))
-		{
+        {
             throw new OAuthSimpleException('Missing required consumer_key in OAuthSimple.signatures');
         }
         if (empty($this->_secrets['shared_secret']))
-		{
+        {
             throw new OAuthSimpleException('Missing requires shared_secret in OAuthSimple.signatures');
-		}
+        }
         if (!empty($this->_secrets['oauth_token']) && empty($this->_secrets['oauth_secret']))
-		{
+        {
             throw new OAuthSimpleException('Missing oauth_secret for supplied oauth_token in OAuthSimple.signatures');
-		}
+        }
 
         return $this;
     }
@@ -226,30 +226,30 @@ 
     }
 
     /**
-	 * Set the signature method (currently only Plaintext or SHA-MAC1)
+     * Set the signature method (currently only Plaintext or SHA-MAC1)
      *
      * @param method (String) Method of signing the transaction (only PLAINTEXT and SHA-MAC1 allowed for now)
-	 * @return OAuthSimple (Object)
-    */
+     * @return OAuthSimple (Object)
+     */
     public function setSignatureMethod ($method="")
-	{
+    {
         if (empty($method))
-		{
+        {
             $method = $this->_default_signature_method;
-		}
+        }
         $method = strtoupper($method);
         switch($method)
         {
             case 'PLAINTEXT':
             case 'HMAC-SHA1':
                 $this->_parameters['oauth_signature_method']=$method;
-				break;
+                break;
             default:
                 throw new OAuthSimpleException ("Unknown signing method $method specified for OAuthSimple.setSignatureMethod");
-				break;
+                break;
         }
 
-		return $this;
+        return $this;
     }
 
     /** sign the request
@@ -258,30 +258,30 @@ 
      * other helper functions.
      *
      * @param args (Array) hash of arguments for the call {action, path, parameters (array), method, signatures (array)} all arguments are optional.
-	 * @return (Array) signed values
+     * @return (Array) signed values
      */
     public function sign($args=array())
     {
         if (!empty($args['action']))
-		{
+        {
             $this->setAction($args['action']);
-		}
+        }
         if (!empty($args['path']))
-		{
+        {
             $this->setPath($args['path']);
         }
         if (!empty($args['method']))
-		{
+        {
             $this->setSignatureMethod($args['method']);
-		}
+        }
         if (!empty($args['signatures']))
-		{
+        {
             $this->signatures($args['signatures']);
-		}
+        }
         if (empty($args['parameters']))
-		{
+        {
             $args['parameters']=array();
-		}
+        }
         $this->setParameters($args['parameters']);
         $normParams = $this->_normalizedParameters();
 
@@ -295,29 +295,29 @@ 
     }
 
     /**
-	 * Return a formatted "header" string
+     * Return a formatted "header" string
      *
      * NOTE: This doesn't set the "Authorization: " prefix, which is required.
      * It's not set because various set header functions prefer different
      * ways to do that.
      *
      * @param args (Array)
-	 * @return $result (String)
-    */
+     * @return $result (String)
+     */
     public function getHeaderString ($args=array())
     {
         if (empty($this->_parameters['oauth_signature']))
-		{
+        {
             $this->sign($args);
-		}
+        }
         $result = 'OAuth ';
 
         foreach ($this->_parameters as $pName => $pValue)
         {
             if (strpos($pName,'oauth_') !== 0)
-			{
+            {
                 continue;
-			}
+            }
             if (is_array($pValue))
             {
                 foreach ($pValue as $val)
@@ -342,19 +342,19 @@ 
         {
             list ($key,$token) = explode('=',$element);
             if ($token)
-			{
+            {
                 $token = urldecode($token);
-			}
+            }
             if (!empty($result[$key]))
             {
                 if (!is_array($result[$key]))
-				{
+                {
                     $result[$key] = array($result[$key],$token);
-				}
+                }
                 else
-				{
+                {
                     array_push($result[$key],$token);
-				}
+                }
             }
             else
                 $result[$key]=$token;
@@ -366,14 +366,14 @@ 
     private static function _oauthEscape($string)
     {
         if ($string === 0) { return 0; }
-		if ($string == '0') { return '0'; }
+        if ($string == '0') { return '0'; }
         if (strlen($string) == 0) { return ''; }
         if (is_array($string)) {
             throw new OAuthSimpleException('Array passed to _oauthEscape');
-		}
+        }
         $string = urlencode($string);
 
-	    //FIX: urlencode of ~ and '+'
+        //FIX: urlencode of ~ and '+'
         $string = str_replace(
             Array('%7E','+'  ), // Replace these
             Array('~',  '%20'), // with these
@@ -410,13 +410,13 @@ 
     private function _getAccessToken()
     {
         if (!isset($this->_secrets['oauth_secret']))
-		{
+        {
             return '';
-		}
+        }
         if (!isset($this->_secrets['oauth_token']))
-		{
+        {
             throw new OAuthSimpleException('No access token (oauth_token) set for OAuthSimple.');
-		}
+        }
         $this->_parameters['oauth_token'] = $this->_secrets['oauth_token'];
 
         return $this->_parameters['oauth_token'];
@@ -429,8 +429,8 @@ 
 
     private function _normalizedParameters()
     {
-		$normalized_keys = array();
-		$return_array = array();
+        $normalized_keys = array();
+        $return_array = array();
 
         foreach ( $this->_parameters as $paramName=>$paramValue) {
             if (preg_match('/w+_secret/', $paramName) OR
@@ -439,59 +439,59 @@ 
                 }
             // Read parameters from a file. Hope you're practicing safe PHP.
             //if (strpos($paramValue, '@') !== 0 && !file_exists(substr($paramValue, 1)))
-			//{
-				if (is_array($paramValue))
-				{
-					$normalized_keys[self::_oauthEscape($paramName)] = array();
-					foreach($paramValue as $item)
-					{
-						array_push($normalized_keys[self::_oauthEscape($paramName)],  self::_oauthEscape($item));
-					}
-				}
-				else
-				{
-					$normalized_keys[self::_oauthEscape($paramName)] = self::_oauthEscape($paramValue);
-				}
-			//}
-        }
-
-		ksort($normalized_keys);
-
-		foreach($normalized_keys as $key=>$val)
-		{
-			if (is_array($val))
-			{
-				sort($val);
-				foreach($val as $element)
-				{
-					array_push($return_array, $key . "=" . $element);
-				}
-			}
-			else
-			{
-				array_push($return_array, $key .'='. $val);
-			}
+            //{
+                if (is_array($paramValue))
+                {
+                    $normalized_keys[self::_oauthEscape($paramName)] = array();
+                    foreach($paramValue as $item)
+                    {
+                        array_push($normalized_keys[self::_oauthEscape($paramName)],  self::_oauthEscape($item));
+                    }
+                }
+                else
+                {
+                    $normalized_keys[self::_oauthEscape($paramName)] = self::_oauthEscape($paramValue);
+                }
+            //}
+        }
+
+        ksort($normalized_keys);
+
+        foreach($normalized_keys as $key=>$val)
+        {
+            if (is_array($val))
+            {
+                sort($val);
+                foreach($val as $element)
+                {
+                    array_push($return_array, $key . "=" . $element);
+                }
+            }
+            else
+            {
+                array_push($return_array, $key .'='. $val);
+            }
 
         }
         $presig = join("&", $return_array);
         $sig = $this->_generateSignature($presig);
         $this->_parameters['oauth_signature']=$sig;
         array_push($return_array, "oauth_signature=$sig");
-		return join("&", $return_array);
+        return join("&", $return_array);
     }
 
 
     private function _generateSignature ($parameters="")
     {
         $secretKey = '';
-		if(isset($this->_secrets['shared_secret']))
-		{
-			$secretKey = self::_oauthEscape($this->_secrets['shared_secret']);
-		}
-
-		$secretKey .= '&';
-		if(isset($this->_secrets['oauth_secret']))
-		{
+        if(isset($this->_secrets['shared_secret']))
+        {
+            $secretKey = self::_oauthEscape($this->_secrets['shared_secret']);
+        }
+
+        $secretKey .= '&';
+        if(isset($this->_secrets['oauth_secret']))
+        {
             $secretKey .= self::_oauthEscape($this->_secrets['oauth_secret']);
         }
         if(!empty($parameters)){
@@ -507,33 +507,33 @@ 
                 return base64_encode(hash_hmac('sha1',$this->sbs,$secretKey,TRUE));
             default:
                 throw new OAuthSimpleException('Unknown signature method for OAuthSimple');
-				break;
+                break;
         }
     }
 }
 
 class OAuthSimpleException extends Exception {
 
-	public function __construct($err, $isDebug = FALSE)
-	{
-		self::log_error($err);
-		if ($isDebug)
-		{
-			self::display_error($err, TRUE);
-		}
-	}
-
-	public static function log_error($err)
-	{
-		error_log($err, 0);
-	}
-
-	public static function display_error($err, $kill = FALSE)
-	{
-		print_r($err);
-		if ($kill === FALSE)
-		{
-			die();
-		}
-	}
+    public function __construct($err, $isDebug = FALSE)
+    {
+        self::log_error($err);
+        if ($isDebug)
+        {
+            self::display_error($err, TRUE);
+        }
+    }
+
+    public static function log_error($err)
+    {
+        error_log($err, 0);
+    }
+
+    public static function display_error($err, $kill = FALSE)
+    {
+        print_r($err);
+        if ($kill === FALSE)
+        {
+            die();
+        }
+    }
 }

main/dropbox/index.php

Indentation +424 added lines, -424 removed lines

@@ -7,12 +7,12 @@ 
 $last_access = '';
 // get the last time the user accessed the tool
 if (isset($_SESSION[$_course['id']]) && $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] == '') {
-	$last_access = get_last_tool_access(TOOL_DROPBOX);
-	$_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] = $last_access;
+    $last_access = get_last_tool_access(TOOL_DROPBOX);
+    $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] = $last_access;
 } else {
-	if (isset($_SESSION[$_course['id']])) {
-		$last_access = $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX];
-	}
+    if (isset($_SESSION[$_course['id']])) {
+        $last_access = $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX];
+    }
 }
 
 $postAction = isset($_POST['action']) ? $_POST['action'] : null;
@@ -50,9 +50,9 @@ 
 
 // Display the form for adding a new dropbox item.
 if ($action == 'add') {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
     display_add_form(
         $dropbox_unid,
         $viewReceivedCategory,
@@ -62,56 +62,56 @@ 
 }
 
 if (isset($_POST['submitWork'])) {
-	$check = Security::check_token();
-	if ($check) {
+    $check = Security::check_token();
+    if ($check) {
         store_add_dropbox();
-	}
+    }
 }
 
 // Display the form for adding a category
 if ($action == 'addreceivedcategory' || $action == 'addsentcategory') {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$categoryName = isset($_POST['category_name']) ? $_POST['category_name'] : '';
-	display_addcategory_form($categoryName, '', $_GET['action']);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $categoryName = isset($_POST['category_name']) ? $_POST['category_name'] : '';
+    display_addcategory_form($categoryName, '', $_GET['action']);
 }
 
 // Editing a category: displaying the form
 if ($action == 'editcategory' && isset($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	if (!$_POST) {
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			api_not_allowed();
-		}
-		display_addcategory_form('', $_GET['id'], 'editcategory');
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    if (!$_POST) {
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            api_not_allowed();
+        }
+        display_addcategory_form('', $_GET['id'], 'editcategory');
+    }
 }
 
 // Storing a new or edited category
 if (isset($_POST['StoreCategory'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$return_information = store_addcategory();
-	if ($return_information['type'] == 'confirmation') {
-		Display :: display_confirmation_message($return_information['message']);
-	}
-	if ($return_information['type'] == 'error') {
-		Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message']);
-		display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $return_information = store_addcategory();
+    if ($return_information['type'] == 'confirmation') {
+        Display :: display_confirmation_message($return_information['message']);
+    }
+    if ($return_information['type'] == 'error') {
+        Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message']);
+        display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
+    }
 }
 
 
 // Move a File
 if (($action == 'movesent' || $action == 'movereceived') AND isset($_GET['move_id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	display_move_form(
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    display_move_form(
         str_replace('move', '', $action),
         $_GET['move_id'],
         get_dropbox_categories(str_replace('move', '', $action)),
@@ -122,33 +122,33 @@ 
     );
 }
 if (isset($_POST['do_move'])) {
-	Display :: display_confirmation_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']));
+    Display :: display_confirmation_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']));
 }
 
 // Delete a file
 if (($action == 'deletereceivedfile' || $action == 'deletesentfile') AND isset($_GET['id']) AND is_numeric($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$dropboxfile = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-	if ($action == 'deletereceivedfile') {
-		$dropboxfile->deleteReceivedWork($_GET['id']);
-		$message = get_lang('ReceivedFileDeleted');
-	}
-	if ($action == 'deletesentfile') {
-		$dropboxfile->deleteSentWork($_GET['id']);
-		$message = get_lang('SentFileDeleted');
-	}
-	Display :: display_confirmation_message($message);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $dropboxfile = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+    if ($action == 'deletereceivedfile') {
+        $dropboxfile->deleteReceivedWork($_GET['id']);
+        $message = get_lang('ReceivedFileDeleted');
+    }
+    if ($action == 'deletesentfile') {
+        $dropboxfile->deleteSentWork($_GET['id']);
+        $message = get_lang('SentFileDeleted');
+    }
+    Display :: display_confirmation_message($message);
 }
 
 // Delete a category
 if (($action == 'deletereceivedcategory' || $action == 'deletesentcategory') AND isset($_GET['id']) AND is_numeric($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$message = delete_category($action, $_GET['id']);
-	Display :: display_confirmation_message($message);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $message = delete_category($action, $_GET['id']);
+    Display :: display_confirmation_message($message);
 }
 
 // Do an action on multiple files
@@ -163,27 +163,27 @@ 
     $postAction == 'delete_sent' ||
     $postAction == 'download_sent')
 ) {
-	$display_message = handle_multiple_actions();
-	Display :: display_normal_message($display_message);
+    $display_message = handle_multiple_actions();
+    Display :: display_normal_message($display_message);
 }
 
 // Store Feedback
 
 if (isset($_POST['feedback'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$check = Security::check_token();
-	if ($check) {
-		$display_message = store_feedback();
-		Display :: display_normal_message($display_message);
-		Security::check_token();
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $check = Security::check_token();
+    if ($check) {
+        $display_message = store_feedback();
+        Display :: display_normal_message($display_message);
+        Security::check_token();
+    }
 }
 
 // Error Message
 if (isset($_GET['error']) AND !empty($_GET['error'])) {
-	Display :: display_normal_message(get_lang($_GET['error']));
+    Display :: display_normal_message(get_lang($_GET['error']));
 }
 
 $dropbox_data_sent = array();
@@ -191,96 +191,96 @@ 
 $dropbox_data_recieved = array();
 
 if ($action != 'add') {
-	// Getting all the categories in the dropbox for the given user
-	$dropbox_categories = get_dropbox_categories();
-	// Greating the arrays with the categories for the received files and for the sent files
-	foreach ($dropbox_categories as $category) {
-		if ($category['received'] == '1') {
-			$dropbox_received_category[] = $category;
-		}
-		if ($category['sent'] == '1') {
-			$dropbox_sent_category[] = $category;
-		}
-	}
-
-	// ACTIONS
-	if ($view == 'received' || !$showSentReceivedTabs) {
-		//echo '<h3>'.get_lang('ReceivedFiles').'</h3>';
-
-		// This is for the categories
-		if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
-			$view_dropbox_category_received = $viewReceivedCategory;
-		} else {
-			$view_dropbox_category_received = 0;
-		}
-
-		/* Menu Received */
-
-		if (api_get_session_id() == 0) {
-			echo '<div class="actions">';
-			if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
-				$movelist[0] = 'Root'; // move_received selectbox content
-			} else {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
-			}
-			echo '</div>';
-		} else {
-			if (api_is_allowed_to_session_edit(false, true)) {
-				echo '<div class="actions">';
-				if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-					echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
-					$movelist[0] = 'Root'; // move_received selectbox content
-				} else {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
-				}
-				echo '</div>';
-			}
-		}
-	}
-
-	if (!$view || $view == 'sent' || !$showSentReceivedTabs) {
-		// This is for the categories
-		if (isset($viewSentCategory) AND $viewSentCategory != '') {
-			$view_dropbox_category_sent = $viewSentCategory;
-		} else {
-			$view_dropbox_category_sent = 0;
-		}
-
-		/* Menu Sent */
-
-		if (api_get_session_id() == 0) {
-			echo '<div class="actions">';
-			if ($view_dropbox_category_sent != 0) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
-			} else {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
-			}
-			if (empty($viewSentCategory)) {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
-			}
-			echo '</div>';
-		} else {
-			if (api_is_allowed_to_session_edit(false, true)) {
-				echo '<div class="actions">';
-				if ($view_dropbox_category_sent != 0) {
-					echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				} else {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
-				}
-				if (empty($viewSentCategory)) {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
-				}
-				echo '</div>';
-			}
-		}
-	}
-	/*	THE MENU TABS */
-	if ($showSentReceivedTabs) {
+    // Getting all the categories in the dropbox for the given user
+    $dropbox_categories = get_dropbox_categories();
+    // Greating the arrays with the categories for the received files and for the sent files
+    foreach ($dropbox_categories as $category) {
+        if ($category['received'] == '1') {
+            $dropbox_received_category[] = $category;
+        }
+        if ($category['sent'] == '1') {
+            $dropbox_sent_category[] = $category;
+        }
+    }
+
+    // ACTIONS
+    if ($view == 'received' || !$showSentReceivedTabs) {
+        //echo '<h3>'.get_lang('ReceivedFiles').'</h3>';
+
+        // This is for the categories
+        if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
+            $view_dropbox_category_received = $viewReceivedCategory;
+        } else {
+            $view_dropbox_category_received = 0;
+        }
+
+        /* Menu Received */
+
+        if (api_get_session_id() == 0) {
+            echo '<div class="actions">';
+            if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
+                $movelist[0] = 'Root'; // move_received selectbox content
+            } else {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+            }
+            echo '</div>';
+        } else {
+            if (api_is_allowed_to_session_edit(false, true)) {
+                echo '<div class="actions">';
+                if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                    echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
+                    $movelist[0] = 'Root'; // move_received selectbox content
+                } else {
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+                }
+                echo '</div>';
+            }
+        }
+    }
+
+    if (!$view || $view == 'sent' || !$showSentReceivedTabs) {
+        // This is for the categories
+        if (isset($viewSentCategory) AND $viewSentCategory != '') {
+            $view_dropbox_category_sent = $viewSentCategory;
+        } else {
+            $view_dropbox_category_sent = 0;
+        }
+
+        /* Menu Sent */
+
+        if (api_get_session_id() == 0) {
+            echo '<div class="actions">';
+            if ($view_dropbox_category_sent != 0) {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
+            } else {
+                echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+            }
+            if (empty($viewSentCategory)) {
+                echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+            }
+            echo '</div>';
+        } else {
+            if (api_is_allowed_to_session_edit(false, true)) {
+                echo '<div class="actions">';
+                if ($view_dropbox_category_sent != 0) {
+                    echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                } else {
+                    echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+                }
+                if (empty($viewSentCategory)) {
+                    echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+                }
+                echo '</div>';
+            }
+        }
+    }
+    /*	THE MENU TABS */
+    if ($showSentReceivedTabs) {
 ?>
 <ul class="nav nav-tabs">
     <li <?php if (!$view || $view == 'sent') { echo 'class="active"'; } ?> >
@@ -294,80 +294,80 @@ 
     </li>
 </ul>
 <?php
-	}
+    }
     /*	RECEIVED FILES */
-	if ($view == 'received' || !$showSentReceivedTabs) {
-		// This is for the categories
-		if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
-			$view_dropbox_category_received = $viewReceivedCategory;
-		} else {
-			$view_dropbox_category_received = 0;
-		}
-
-		// Object initialisation
-		$dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-		 // note: are the $is_courseAdmin and $is_courseTutor parameters needed????
-
-		// Constructing the array that contains the total number of feedback messages per document.
-		$number_feedback = get_total_number_feedback();
-
-		// Sorting and paging options
-		$sorting_options = array();
-		$paging_options = array();
-
-		// The headers of the sortable tables
-		$column_header = array();
-		$column_header[] = array('', false, '');
-		$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
-		$column_header[] = array(get_lang('ReceivedTitle'), true, '');
-		$column_header[] = array(get_lang('Size'), true, '');
-		$column_header[] = array(get_lang('Authors'), true, '');
-		$column_header[] = array(get_lang('LastResent'), true);
-
-		if (api_get_session_id() == 0) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		} elseif (api_is_allowed_to_session_edit(false,true)) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		}
-
-		$column_header[] = array('RealDate', true);
-		$column_header[] = array('RealSize', true);
-
-		// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-
-		if (api_get_session_id() == 0) {
-			$column_show[] = 1;
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_show[] = 1;
-		}
-		$column_show[] = 0;
-
-		// Here we change the way how the columns are going to be sort
-		// in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
-		// because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
-
-		$column_order[3] = 8;
-		$column_order[5] = 7;
-
-		// The content of the sortable table = the received files
-		foreach ($dropbox_person -> receivedWork as $dropbox_file) {
-			$dropbox_file_data = array();
-			if ($view_dropbox_category_received == $dropbox_file->category) {
+    if ($view == 'received' || !$showSentReceivedTabs) {
+        // This is for the categories
+        if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
+            $view_dropbox_category_received = $viewReceivedCategory;
+        } else {
+            $view_dropbox_category_received = 0;
+        }
+
+        // Object initialisation
+        $dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+            // note: are the $is_courseAdmin and $is_courseTutor parameters needed????
+
+        // Constructing the array that contains the total number of feedback messages per document.
+        $number_feedback = get_total_number_feedback();
+
+        // Sorting and paging options
+        $sorting_options = array();
+        $paging_options = array();
+
+        // The headers of the sortable tables
+        $column_header = array();
+        $column_header[] = array('', false, '');
+        $column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
+        $column_header[] = array(get_lang('ReceivedTitle'), true, '');
+        $column_header[] = array(get_lang('Size'), true, '');
+        $column_header[] = array(get_lang('Authors'), true, '');
+        $column_header[] = array(get_lang('LastResent'), true);
+
+        if (api_get_session_id() == 0) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        } elseif (api_is_allowed_to_session_edit(false,true)) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        }
+
+        $column_header[] = array('RealDate', true);
+        $column_header[] = array('RealSize', true);
+
+        // An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+
+        if (api_get_session_id() == 0) {
+            $column_show[] = 1;
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_show[] = 1;
+        }
+        $column_show[] = 0;
+
+        // Here we change the way how the columns are going to be sort
+        // in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
+        // because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
+
+        $column_order[3] = 8;
+        $column_order[5] = 7;
+
+        // The content of the sortable table = the received files
+        foreach ($dropbox_person -> receivedWork as $dropbox_file) {
+            $dropbox_file_data = array();
+            if ($view_dropbox_category_received == $dropbox_file->category) {
                 // we only display the files that are in the category that we are in.
-				$dropbox_file_data[] = $dropbox_file->id;
+                $dropbox_file_data[] = $dropbox_file->id;
 
-				if (isset($_SESSION['_seen']) && !is_array($_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) {
-					$_SESSION['_seen'][$_course['id']][TOOL_DROPBOX] = array();
-				}
+                if (isset($_SESSION['_seen']) && !is_array($_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) {
+                    $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX] = array();
+                }
 
-				// New icon
-				$new_icon = '';
+                // New icon
+                $new_icon = '';
                 if (isset($_SESSION['_seen'])) {
                     if ($dropbox_file->last_upload_date > $last_access &&
                         !in_array(
@@ -384,12 +384,12 @@ 
                     }
                 }
 
-				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
-				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
-				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
+                $link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
+                $dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
+                $dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
                     Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a>'.$new_icon.'<br />'.$dropbox_file->description;
-				$file_size = $dropbox_file->filesize;
-				$dropbox_file_data[] = format_file_size($file_size);
+                $file_size = $dropbox_file->filesize;
+                $dropbox_file_data[] = format_file_size($file_size);
 
                 $authorInfo = api_get_user_info($dropbox_file->uploader_id);
                 if ($authorInfo) {
@@ -398,62 +398,62 @@ 
                     $dropbox_file_data[] = '';
                 }
 
-				$last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
-				$dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
+                $last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
+                $dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
                     api_format_date($last_upload_date).'</span>';
 
-				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
+                $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movereceived&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.
                 Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
 
-				// This is a hack to have an additional row in a sortable table
-
-				if ($action == 'viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id == $_GET['id']) {
-					$action_icons .= "</td></tr>"; // Ending the normal row of the sortable table
-					$action_icons .= '<tr><td colspan="2"><a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a></td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
-				}
-				if (api_get_session_id() == 0) {
-					$dropbox_file_data[] = $action_icons;
-				} elseif (api_is_allowed_to_session_edit(false, true)) {
-					$dropbox_file_data[] = $action_icons;
-				}
-				$action_icons = '';
-				$dropbox_file_data[] = $last_upload_date;
-				$dropbox_file_data[] = $file_size;
-				$dropbox_data_recieved[] = $dropbox_file_data;
-			}
-		}
-
-		// The content of the sortable table = the categories (if we are not in the root)
-		if ($view_dropbox_category_received == 0) {
-			foreach ($dropbox_categories as $category) {
-			    /*  Note: This can probably be shortened since the categories
+                // This is a hack to have an additional row in a sortable table
+
+                if ($action == 'viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id == $_GET['id']) {
+                    $action_icons .= "</td></tr>"; // Ending the normal row of the sortable table
+                    $action_icons .= '<tr><td colspan="2"><a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a></td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
+                }
+                if (api_get_session_id() == 0) {
+                    $dropbox_file_data[] = $action_icons;
+                } elseif (api_is_allowed_to_session_edit(false, true)) {
+                    $dropbox_file_data[] = $action_icons;
+                }
+                $action_icons = '';
+                $dropbox_file_data[] = $last_upload_date;
+                $dropbox_file_data[] = $file_size;
+                $dropbox_data_recieved[] = $dropbox_file_data;
+            }
+        }
+
+        // The content of the sortable table = the categories (if we are not in the root)
+        if ($view_dropbox_category_received == 0) {
+            foreach ($dropbox_categories as $category) {
+                /*  Note: This can probably be shortened since the categories
 			    for the received files are already in the
 			    $dropbox_received_category array;*/
-				$dropbox_category_data = array();
-				if ($category['received'] == '1') {
-					$movelist[$category['cat_id']] = $category['cat_name'];
+                $dropbox_category_data = array();
+                if ($category['received'] == '1') {
+                    $movelist[$category['cat_id']] = $category['cat_name'];
                     // This is where the checkbox icon for the files appear
-					$dropbox_category_data[] = $category['cat_id'];
-					// The icon of the category
-					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
-					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
+                    $dropbox_category_data[] = $category['cat_id'];
+                    // The icon of the category
+                    $link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
+                    $dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
+                    $dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
 										  <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				}
-				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
-					$dropbox_data_recieved[] = $dropbox_category_data;
-				}
-			}
-		}
-
-		// Displaying the table
+                }
+                if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
+                    $dropbox_data_recieved[] = $dropbox_category_data;
+                }
+            }
+        }
+
+        // Displaying the table
         $additional_get_parameters = array(
             'view' => $view,
             'view_received_category' => $viewReceivedCategory,
@@ -464,15 +464,15 @@ 
             'download_received' => get_lang('Download')
         );
 
-		if (is_array($movelist)) {
-			foreach ($movelist as $catid => $catname){
-				$selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
-			}
-		}
+        if (is_array($movelist)) {
+            foreach ($movelist as $catid => $catname){
+                $selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
+            }
+        }
 
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			$selectlist = array();
-		}
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            $selectlist = array();
+        }
         echo '<div class="files-table">';
         Display::display_sortable_config_table(
             'dropbox',
@@ -486,154 +486,154 @@ 
             $selectlist
         );
         echo '</div>';
-	}
-
-	/*	SENT FILES */
-
-	if (!$view || $view == 'sent' || !$showSentReceivedTabs) {
-		// This is for the categories
-		if (isset($viewSentCategory) AND $viewSentCategory != '') {
-			$view_dropbox_category_sent = $viewSentCategory;
-		} else {
-			$view_dropbox_category_sent = 0;
-		}
-
-		// Object initialisation
-		$dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-
-		// Constructing the array that contains the total number of feedback messages per document.
-		$number_feedback = get_total_number_feedback();
-
-		// Sorting and paging options
-		$sorting_options = array();
-		$paging_options = array();
-
-		// The headers of the sortable tables
-		$column_header = array();
-
-		$column_header[] = array('', false, '');
-		$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
-		$column_header[] = array(get_lang('SentTitle'), true, '');
-		$column_header[] = array(get_lang('Size'), true, '');
-		$column_header[] = array(get_lang('SentTo'), true, '');
-		$column_header[] = array(get_lang('LastResent'), true, '');
-
-		if (api_get_session_id() == 0) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		}
-
-		$column_header[] = array('RealDate', true);
-		$column_header[] = array('RealSize', true);
-
-		$column_show = array();
-		$column_order = array();
-
-		// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		if (api_get_session_id() == 0) {
-			$column_show[] = 1;
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_show[] = 1;
-		}
-		$column_show[] = 0;
-
-		// Here we change the way how the colums are going to be sort
-		// in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
-		// because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
-
-		$column_order[3] = 8;
-		$column_order[5] = 7;
-
-		// The content of the sortable table = the received files
-		foreach ($dropbox_person->sentWork as $dropbox_file) {
-			$dropbox_file_data = array();
-
-			if ($view_dropbox_category_sent == $dropbox_file->category) {
-				$dropbox_file_data[] = $dropbox_file->id;
-				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
-				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
-				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
+    }
+
+    /*	SENT FILES */
+
+    if (!$view || $view == 'sent' || !$showSentReceivedTabs) {
+        // This is for the categories
+        if (isset($viewSentCategory) AND $viewSentCategory != '') {
+            $view_dropbox_category_sent = $viewSentCategory;
+        } else {
+            $view_dropbox_category_sent = 0;
+        }
+
+        // Object initialisation
+        $dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+
+        // Constructing the array that contains the total number of feedback messages per document.
+        $number_feedback = get_total_number_feedback();
+
+        // Sorting and paging options
+        $sorting_options = array();
+        $paging_options = array();
+
+        // The headers of the sortable tables
+        $column_header = array();
+
+        $column_header[] = array('', false, '');
+        $column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
+        $column_header[] = array(get_lang('SentTitle'), true, '');
+        $column_header[] = array(get_lang('Size'), true, '');
+        $column_header[] = array(get_lang('SentTo'), true, '');
+        $column_header[] = array(get_lang('LastResent'), true, '');
+
+        if (api_get_session_id() == 0) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        }
+
+        $column_header[] = array('RealDate', true);
+        $column_header[] = array('RealSize', true);
+
+        $column_show = array();
+        $column_order = array();
+
+        // An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        if (api_get_session_id() == 0) {
+            $column_show[] = 1;
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_show[] = 1;
+        }
+        $column_show[] = 0;
+
+        // Here we change the way how the colums are going to be sort
+        // in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
+        // because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
+
+        $column_order[3] = 8;
+        $column_order[5] = 7;
+
+        // The content of the sortable table = the received files
+        foreach ($dropbox_person->sentWork as $dropbox_file) {
+            $dropbox_file_data = array();
+
+            if ($view_dropbox_category_sent == $dropbox_file->category) {
+                $dropbox_file_data[] = $dropbox_file->id;
+                $link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
+                $dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
+                $dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
                     Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a><br />'.$dropbox_file->description;
-				$file_size = $dropbox_file->filesize;
-				$dropbox_file_data[] = format_file_size($file_size);
+                $file_size = $dropbox_file->filesize;
+                $dropbox_file_data[] = format_file_size($file_size);
                 $receivers_celldata = null;
-				foreach ($dropbox_file->recipients as $recipient) {
-					$userInfo = api_get_user_info($recipient['user_id']);
-					$receivers_celldata = UserManager::getUserProfileLink($userInfo).', '.$receivers_celldata;
-				}
-				$receivers_celldata = trim(trim($receivers_celldata), ','); // Removing the trailing comma.
-				$dropbox_file_data[] = $receivers_celldata;
-				$last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
-				$dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
-					api_format_date($last_upload_date).'</span>';
-
-				//$dropbox_file_data[] = $dropbox_file->author;
-				$receivers_celldata = '';
-
-				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
+                foreach ($dropbox_file->recipients as $recipient) {
+                    $userInfo = api_get_user_info($recipient['user_id']);
+                    $receivers_celldata = UserManager::getUserProfileLink($userInfo).', '.$receivers_celldata;
+                }
+                $receivers_celldata = trim(trim($receivers_celldata), ','); // Removing the trailing comma.
+                $dropbox_file_data[] = $receivers_celldata;
+                $last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
+                $dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
+                    api_format_date($last_upload_date).'</span>';
+
+                //$dropbox_file_data[] = $dropbox_file->author;
+                $receivers_celldata = '';
+
+                $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movesent&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				// This is a hack to have an additional row in a sortable table
-				if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
-					$action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
-					$action_icons .= "<tr><td colspan=\"2\">";
-					$action_icons .= "<a href=\"".api_get_path(WEB_CODE_PATH)."dropbox/index.php?".api_get_cidreq()."&view_received_category=".$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a>";
-					$action_icons .= "</td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
-				}
-				$dropbox_file_data[] = $action_icons;
-				$dropbox_file_data[] = $last_upload_date;
-				$dropbox_file_data[] = $file_size;
-				$action_icons = '';
-				$dropbox_data_sent[] = $dropbox_file_data;
-			}
-		}
+                // This is a hack to have an additional row in a sortable table
+                if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
+                    $action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
+                    $action_icons .= "<tr><td colspan=\"2\">";
+                    $action_icons .= "<a href=\"".api_get_path(WEB_CODE_PATH)."dropbox/index.php?".api_get_cidreq()."&view_received_category=".$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a>";
+                    $action_icons .= "</td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
+                }
+                $dropbox_file_data[] = $action_icons;
+                $dropbox_file_data[] = $last_upload_date;
+                $dropbox_file_data[] = $file_size;
+                $action_icons = '';
+                $dropbox_data_sent[] = $dropbox_file_data;
+            }
+        }
 
         $moveList = array();
-		// The content of the sortable table = the categories (if we are not in the root)
-		if ($view_dropbox_category_sent == 0) {
-			foreach ($dropbox_categories as $category) {
-				$dropbox_category_data = array();
+        // The content of the sortable table = the categories (if we are not in the root)
+        if ($view_dropbox_category_sent == 0) {
+            foreach ($dropbox_categories as $category) {
+                $dropbox_category_data = array();
 
-				if ($category['sent'] == '1') {
+                if ($category['sent'] == '1') {
 
                     $moveList[$category['cat_id']] = $category['cat_name'];
-					$dropbox_category_data[] = $category['cat_id'];
-					// This is where the checkbox icon for the files appear.
-					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
-					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
-					//$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					//$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
+                    $dropbox_category_data[] = $category['cat_id'];
+                    // This is where the checkbox icon for the files appear.
+                    $link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
+                    $dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
+                    $dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
+                    //$dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    //$dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
                                     Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
 									<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.
                                     Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				}
-				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
-					$dropbox_data_sent[] = $dropbox_category_data;
-				}
-			}
-		}
-
-		// Displaying the table
-		$additional_get_parameters = array(
+                }
+                if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
+                    $dropbox_data_sent[] = $dropbox_category_data;
+                }
+            }
+        }
+
+        // Displaying the table
+        $additional_get_parameters = array(
             'view' => $view,
             'view_received_category' => $viewReceivedCategory,
             'view_sent_category' => $viewSentCategory
         );
 
-		$selectlist = array(
+        $selectlist = array(
             'delete_received' => get_lang('Delete'),
             'download_received' => get_lang('Download')
         );
@@ -644,12 +644,12 @@ 
             }
         }
 
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			$selectlist = array('download_received' => get_lang('Download'));
-		}
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            $selectlist = array('download_received' => get_lang('Download'));
+        }
 
         echo '<div class="files-table">';
-		Display::display_sortable_config_table(
+        Display::display_sortable_config_table(
             'dropbox',
             $column_header,
             $dropbox_data_sent,
@@ -661,7 +661,7 @@ 
             $selectlist
         );
         echo '</div>';
-	}
+    }
 }
 
 Display::display_footer();

main/dropbox/dropbox_class.inc.php

Indentation +324 added lines, -324 removed lines

@@ -76,20 +76,20 @@ 
         }
     }
 
-	/**
-	 * private function creating a new work object
-	 *
-	 * @param int $uploader_id
-	 * @param string $title
-	 * @param string $description
-	 * @param string $author
-	 * @param string $filename
-	 * @param int $filesize
-	 *
-	 * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
-	 * 			As a consequence this parameter can be removed
-	 */
-	public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
+    /**
+     * private function creating a new work object
+     *
+     * @param int $uploader_id
+     * @param string $title
+     * @param string $description
+     * @param string $author
+     * @param string $filename
+     * @param int $filesize
+     *
+     * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
+     * 			As a consequence this parameter can be removed
+     */
+    public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
     {
         // Fill in the properties
         $this->uploader_id = intval($uploader_id);
@@ -104,17 +104,17 @@ 
         // Check if object exists already. If it does, the old object is used
         // with updated information (authors, description, upload_date)
         $this->isOldWork = false;
-		$sql = "SELECT id, upload_date FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
+        $sql = "SELECT id, upload_date FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
 				WHERE c_id = $course_id AND filename = '".Database::escape_string($this->filename)."'";
         $result = Database::query($sql);
-		$res = Database::fetch_array($result);
-		if ($res) {
-			$this->isOldWork = true;
-		}
-		// Insert or update the dropbox_file table and set the id property
-		if ($this->isOldWork) {
-			$this->id = $res['id'];
-			$this->upload_date = $res['upload_date'];
+        $res = Database::fetch_array($result);
+        if ($res) {
+            $this->isOldWork = true;
+        }
+        // Insert or update the dropbox_file table and set the id property
+        if ($this->isOldWork) {
+            $this->id = $res['id'];
+            $this->upload_date = $res['upload_date'];
 
             $params = [
                 'filesize' => $this->filesize,
@@ -130,9 +130,9 @@ 
                 $params,
                 ['c_id = ? AND id = ?' => [$course_id, $this->id]]
             );
-		} else {
-			$this->upload_date = $this->last_upload_date;
-			$params = [
+        } else {
+            $this->upload_date = $this->last_upload_date;
+            $params = [
                 'c_id' => $course_id,
                 'uploader_id' => $this->uploader_id,
                 'filename' => $this->filename,
@@ -144,14 +144,14 @@ 
                 'last_upload_date' => $this->last_upload_date,
                 'session_id' => api_get_session_id(),
                 'cat_id' => 0
-			];
+            ];
 
-			$this->id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FILE), $params);
-			if ($this->id) {
-				$sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FILE) ." SET id = iid WHERE iid = {$this->id}";
-				Database::query($sql);
-			}
-		}
+            $this->id = Database::insert(Database::get_course_table(TABLE_DROPBOX_FILE), $params);
+            if ($this->id) {
+                $sql = "UPDATE ". Database::get_course_table(TABLE_DROPBOX_FILE) ." SET id = iid WHERE iid = {$this->id}";
+                Database::query($sql);
+            }
+        }
 
         $sql = "SELECT count(file_id) as count
         		FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
@@ -165,16 +165,16 @@ 
                     VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")";
             Database::query($sql);
         }
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param int $id
-	 */
-	public function _createExistingWork($id)
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param int $id
+     */
+    public function _createExistingWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
 
@@ -222,52 +222,52 @@ 
             }
             $this->feedback2= $feedback2;
         }
-	}
+    }
 }
 
 class Dropbox_SentWork extends Dropbox_Work
 {
-	public $recipients;	//array of ['id']['name'] arrays
-
-	/**
-	 * Constructor calls private functions to create a new work or retreive an existing work from DB
-	 * depending on the number of parameters
-	 *
-	 * @param unknown_type $arg1
-	 * @param unknown_type $arg2
-	 * @param unknown_type $arg3
-	 * @param unknown_type $arg4
-	 * @param unknown_type $arg5
-	 * @param unknown_type $arg6
-	 * @param unknown_type $arg7
-	 * @return Dropbox_SentWork
-	 */
-	public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
+    public $recipients;	//array of ['id']['name'] arrays
+
+    /**
+     * Constructor calls private functions to create a new work or retreive an existing work from DB
+     * depending on the number of parameters
+     *
+     * @param unknown_type $arg1
+     * @param unknown_type $arg2
+     * @param unknown_type $arg3
+     * @param unknown_type $arg4
+     * @param unknown_type $arg5
+     * @param unknown_type $arg6
+     * @param unknown_type $arg7
+     * @return Dropbox_SentWork
+     */
+    public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
     {
-		if (func_num_args() > 1) {
-		    $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
-		} else {
-			$this->_createExistingSentWork($arg1);
-		}
-	}
-
-	/**
-	 * private function creating a new SentWork object
-	 *
-	 * @param int $uploader_id
-	 * @param string $title
-	 * @param string $description
-	 * @param string $author
-	 * @param string $filename
-	 * @param int $filesize
-	 * @param array $recipient_ids
-	 */
-	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
+        if (func_num_args() > 1) {
+            $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
+        } else {
+            $this->_createExistingSentWork($arg1);
+        }
+    }
+
+    /**
+     * private function creating a new SentWork object
+     *
+     * @param int $uploader_id
+     * @param string $title
+     * @param string $description
+     * @param string $author
+     * @param string $filename
+     * @param int $filesize
+     * @param array $recipient_ids
+     */
+    public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {
         $dropbox_cnf = getDropboxConf();
         $_course = api_get_course_info();
 
-		// Call constructor of Dropbox_Work object
+        // Call constructor of Dropbox_Work object
         parent::__construct(
             $uploader_id,
             $title,
@@ -277,33 +277,33 @@ 
             $filesize
         );
 
-		$course_id = api_get_course_int_id();
-
-		// Do sanity checks on recipient_ids array & property fillin
-		// The sanity check for ex-coursemembers is already done in base constructor
-		$uploader_id = (int) $uploader_id;
+        $course_id = api_get_course_int_id();
 
-		$justSubmit = false;
-		if (is_int($recipient_ids)) {
-			$justSubmit = true;
-			$recipient_ids = array($recipient_ids + $this->id);
-		} elseif (count($recipient_ids) == 0) {
-			$justSubmit = true;
-			$recipient_ids = array($uploader_id);
-		}
+        // Do sanity checks on recipient_ids array & property fillin
+        // The sanity check for ex-coursemembers is already done in base constructor
+        $uploader_id = (int) $uploader_id;
+
+        $justSubmit = false;
+        if (is_int($recipient_ids)) {
+            $justSubmit = true;
+            $recipient_ids = array($recipient_ids + $this->id);
+        } elseif (count($recipient_ids) == 0) {
+            $justSubmit = true;
+            $recipient_ids = array($uploader_id);
+        }
 
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
-			die(get_lang('GeneralError').' (code 209)');
-		}
+        if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
+            die(get_lang('GeneralError').' (code 209)');
+        }
 
-		foreach ($recipient_ids as $rec) {
-			if (empty($rec)) {
-			    continue;
+        foreach ($recipient_ids as $rec) {
+            if (empty($rec)) {
+                continue;
             }
 
             //this check is done when validating submitted data
-			$this->recipients[] = array('id' => $rec);
-		}
+            $this->recipients[] = array('id' => $rec);
+        }
 
         $table_post = Database::get_course_table(TABLE_DROPBOX_POST);
         $table_person = Database::get_course_table(TABLE_DROPBOX_PERSON);
@@ -313,12 +313,12 @@ 
         $mailId = get_mail_id_base();
 
         // Insert data in dropbox_post and dropbox_person table for each recipient
-		foreach ($this->recipients as $rec) {
+        foreach ($this->recipients as $rec) {
             $file_id = (int)$this->id;
             $user_id = (int)$rec['id'];
-			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
+            $sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
                     VALUES ($course_id, $file_id, $user_id, $session_id, '$now', 0)";
-	        Database::query($sql);
+            Database::query($sql);
             // If work already exists no error is generated
 
             /**
@@ -335,13 +335,13 @@ 
                 }
             }
 
-			// Update item_property table for each recipient
-			if (($ownerid = $this->uploader_id) > $mailId) {
-			    $ownerid = getUserOwningThisMailing($ownerid);
-			}
-			if (($recipid = $rec["id"]) > $mailId) {
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
-			}
+            // Update item_property table for each recipient
+            if (($ownerid = $this->uploader_id) > $mailId) {
+                $ownerid = getUserOwningThisMailing($ownerid);
+            }
+            if (($recipid = $rec["id"]) > $mailId) {
+                $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
+            }
             api_item_property_update(
                 $_course,
                 TOOL_DROPBOX,
@@ -351,90 +351,90 @@ 
                 null,
                 $recipid
             );
-		}
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param unknown_type $id
-	 */
-	public function _createExistingSentWork($id)
+        }
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param unknown_type $id
+     */
+    public function _createExistingSentWork($id)
     {
         $id = intval($id);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Call constructor of Dropbox_Work object
-		parent::__construct($id);
+        // Call constructor of Dropbox_Work object
+        parent::__construct($id);
 
-		// Fill in recipients array
-		$this->recipients = array();
-		$sql = "SELECT dest_user_id, feedback_date, feedback
+        // Fill in recipients array
+        $this->recipients = array();
+        $sql = "SELECT dest_user_id, feedback_date, feedback
 				FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
 				WHERE c_id = $course_id AND file_id = ".intval($id)."";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result, 'ASSOC')) {
-			// Check for deleted users
-			$dest_user_id = $res['dest_user_id'];
-			$user_info = api_get_user_info($dest_user_id);
-			//$this->category = $res['cat_id'];
-			if (!$user_info) {
-				$this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
-			} else {
-				$this->recipients[] = array(
+        while ($res = Database::fetch_array($result, 'ASSOC')) {
+            // Check for deleted users
+            $dest_user_id = $res['dest_user_id'];
+            $user_info = api_get_user_info($dest_user_id);
+            //$this->category = $res['cat_id'];
+            if (!$user_info) {
+                $this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
+            } else {
+                $this->recipients[] = array(
                     'id' => $dest_user_id,
                     'name' => $user_info['complete_name'],
                     'user_id' => $dest_user_id,
-				    'feedback_date' => $res['feedback_date'],
+                    'feedback_date' => $res['feedback_date'],
                     'feedback' => $res['feedback']
                 );
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 class Dropbox_Person
 {
-	// The receivedWork and the sentWork arrays are sorted.
-	public $receivedWork;	// an array of Dropbox_Work objects
-	public $sentWork;		// an array of Dropbox_SentWork objects
-
-	public $userId = 0;
-	public $isCourseAdmin = false;
-	public $isCourseTutor = false;
-	public $_orderBy = '';	// private property that determines by which field
-
-	/**
-	 * Constructor for recreating the Dropbox_Person object
-	 *
-	 * @param int $userId
-	 * @param bool $isCourseAdmin
-	 * @param bool $isCourseTutor
-	 * @return Dropbox_Person
-	 */
-	public function __construct($userId, $isCourseAdmin, $isCourseTutor)
+    // The receivedWork and the sentWork arrays are sorted.
+    public $receivedWork;	// an array of Dropbox_Work objects
+    public $sentWork;		// an array of Dropbox_SentWork objects
+
+    public $userId = 0;
+    public $isCourseAdmin = false;
+    public $isCourseTutor = false;
+    public $_orderBy = '';	// private property that determines by which field
+
+    /**
+     * Constructor for recreating the Dropbox_Person object
+     *
+     * @param int $userId
+     * @param bool $isCourseAdmin
+     * @param bool $isCourseTutor
+     * @return Dropbox_Person
+     */
+    public function __construct($userId, $isCourseAdmin, $isCourseTutor)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Fill in properties
+        // Fill in properties
         $this->userId = $userId;
         $this->isCourseAdmin = $isCourseAdmin;
         $this->isCourseTutor = $isCourseTutor;
         $this->receivedWork = array();
         $this->sentWork = array();
 
-		// Note: perhaps include an ex coursemember check to delete old files
+        // Note: perhaps include an ex coursemember check to delete old files
 
-		$session_id = api_get_session_id();
-		$condition_session = api_get_session_condition($session_id);
+        $session_id = api_get_session_id();
+        $condition_session = api_get_session_condition($session_id);
 
-		$post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
-		$person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
-		$file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
+        $post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
+        $person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
+        $file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
 
         // Find all entries where this person is the recipient
-		$sql = "SELECT DISTINCT r.file_id, r.cat_id
+        $sql = "SELECT DISTINCT r.file_id, r.cat_id
                 FROM $post_tbl r
                 INNER JOIN $person_tbl p
                     ON (r.file_id = p.file_id AND r.c_id = $course_id AND p.c_id = $course_id )
@@ -443,12 +443,12 @@ 
                      r.dest_user_id = ".intval($this->userId)." $condition_session ";
 
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$temp = new Dropbox_Work($res['file_id']);
-			$temp->category = $res['cat_id'];
-			$this->receivedWork[] = $temp;
-		}
-		// Find all entries where this person is the sender/uploader
+        while ($res = Database::fetch_array($result)) {
+            $temp = new Dropbox_Work($res['file_id']);
+            $temp->category = $res['cat_id'];
+            $this->receivedWork[] = $temp;
+        }
+        // Find all entries where this person is the sender/uploader
         $sql = "SELECT DISTINCT f.id
 				FROM $file_tbl f
 				INNER JOIN $person_tbl p
@@ -459,160 +459,160 @@ 
                     $condition_session
                 ";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$this->sentWork[] = new Dropbox_SentWork($res['id']);
-		}
-	}
-
-	/**
-	 * Deletes all the received work of this person
-	 */
-	public function deleteAllReceivedWork()
+        while ($res = Database::fetch_array($result)) {
+            $this->sentWork[] = new Dropbox_SentWork($res['id']);
+        }
+    }
+
+    /**
+     * Deletes all the received work of this person
+     */
+    public function deleteAllReceivedWork()
     {
-	    $course_id = api_get_course_int_id();
-		// Delete entries in person table concerning received works
-		foreach ($this->receivedWork as $w) {
+        $course_id = api_get_course_int_id();
+        // Delete entries in person table concerning received works
+        foreach ($this->receivedWork as $w) {
             $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
 			        WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-		}
+            Database::query($sql);
+        }
         // Check for unused files
-		removeUnusedFiles();
-	}
-
-	/**
-	 * Deletes all the received categories and work of this person
-	 * @param integer $id
-	 */
-	public function deleteReceivedWorkFolder($id)
+        removeUnusedFiles();
+    }
+
+    /**
+     * Deletes all the received categories and work of this person
+     * @param integer $id
+     */
+    public function deleteReceivedWorkFolder($id)
     {
         $course_id = api_get_course_int_id();
 
-		$id = intval($id);
-		$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
+        $id = intval($id);
+        $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_FILE) ."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_CATEGORY) ."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ".Database::get_course_table(TABLE_DROPBOX_POST)."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		return true;
-	}
-
-	/**
-	 * Deletes a received dropbox file of this person with id=$id
-	 *
-	 * @param integer $id
-	 */
-	public function deleteReceivedWork($id)
+        if (!Database::query($sql)) return false;
+        return true;
+    }
+
+    /**
+     * Deletes a received dropbox file of this person with id=$id
+     *
+     * @param integer $id
+     */
+    public function deleteReceivedWork($id)
     {
-	    $course_id = api_get_course_int_id();
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->receivedWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 216)');
-			}
-		}
-		// Delete entries in person table concerning received works
+        $course_id = api_get_course_int_id();
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->receivedWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 216)');
+            }
+        }
+        // Delete entries in person table concerning received works
         $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
-		Database::query($sql);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes all the sent dropbox files of this person
-	 */
-	public function deleteAllSentWork()
+        Database::query($sql);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes all the sent dropbox files of this person
+     */
+    public function deleteAllSentWork()
     {
-	    $course_id = api_get_course_int_id();
-		//delete entries in person table concerning sent works
-		foreach ($this->sentWork as $w) {
+        $course_id = api_get_course_int_id();
+        //delete entries in person table concerning sent works
+        foreach ($this->sentWork as $w) {
             $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
                     WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-			removeMoreIfMailing($w->id);
-		}
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes a sent dropbox file of this person with id=$id
-	 *
-	 * @param unknown_type $id
-	 */
-	public function deleteSentWork($id)
+            Database::query($sql);
+            removeMoreIfMailing($w->id);
+        }
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes a sent dropbox file of this person with id=$id
+     *
+     * @param unknown_type $id
+     */
+    public function deleteSentWork($id)
     {
-	    $course_id = api_get_course_int_id();
-
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->sentWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 219)');
-			}
-		}
-		//$file_id = $this->sentWork[$index]->id;
-		// Delete entries in person table concerning sent works
+        $course_id = api_get_course_int_id();
+
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->sentWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 219)');
+            }
+        }
+        //$file_id = $this->sentWork[$index]->id;
+        // Delete entries in person table concerning sent works
         $sql = "DELETE FROM ". Database::get_course_table(TABLE_DROPBOX_PERSON) ."
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
-		Database::query($sql);
-		removeMoreIfMailing($id);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Updates feedback for received work of this person with id=$id
-	 *
-	 * @param string $id
-	 * @param string $text
-	 */
-	public function updateFeedback($id, $text)
+        Database::query($sql);
+        removeMoreIfMailing($id);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Updates feedback for received work of this person with id=$id
+     *
+     * @param string $id
+     * @param string $text
+     */
+    public function updateFeedback($id, $text)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $_course = api_get_course_info();
         $dropbox_cnf = getDropboxConf();
 
-		$id = intval($id);
+        $id = intval($id);
 
-		// index check
-		$found = false;
-		$wi = -1;
-		foreach ($this->receivedWork as $w) {
-			$wi++;
-			if ($w->id == $id){
-			   $found = true;
-			   break;
-			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
-		}
+        // index check
+        $found = false;
+        $wi = -1;
+        foreach ($this->receivedWork as $w) {
+            $wi++;
+            if ($w->id == $id){
+                $found = true;
+                break;
+            }  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
+        }
 
-		if (!$found) {
-			return false;
-		}
+        if (!$found) {
+            return false;
+        }
 
-		$feedback_date = api_get_utc_datetime();
-		$this->receivedWork[$wi]->feedback_date = $feedback_date;
-		$this->receivedWork[$wi]->feedback = $text;
+        $feedback_date = api_get_utc_datetime();
+        $this->receivedWork[$wi]->feedback_date = $feedback_date;
+        $this->receivedWork[$wi]->feedback = $text;
 
         $params = [
             'feedback_date' => $feedback_date,
@@ -630,11 +630,11 @@ 
             ]
         );
 
-		// Update item_property table
+        // Update item_property table
         $mailId = get_mail_id_base();
-		if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $mailId) {
-		    $ownerid = getUserOwningThisMailing($ownerid);
-		}
+        if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $mailId) {
+            $ownerid = getUserOwningThisMailing($ownerid);
+        }
 
         api_item_property_update(
             $_course,
@@ -646,33 +646,33 @@ 
             $ownerid
         );
 
-	}
+    }
 
-	/**
-	 * Filter the received work
-	 * @param string $type
-	 * @param string $value
-	 */
-	public function filter_received_work($type, $value)
+    /**
+     * Filter the received work
+     * @param string $type
+     * @param string $value
+     */
+    public function filter_received_work($type, $value)
     {
         $dropbox_cnf = getDropboxConf();
-    	$new_received_work = array();
+        $new_received_work = array();
         $mailId = get_mail_id_base();
         foreach ($this->receivedWork as $work) {
-			switch ($type) {
-				case 'uploader_id':
-					if ($work->uploader_id == $value ||
-						($work->uploader_id > $mailId &&
+            switch ($type) {
+                case 'uploader_id':
+                    if ($work->uploader_id == $value ||
+                        ($work->uploader_id > $mailId &&
                         getUserOwningThisMailing($work->uploader_id) == $value)
                     ) {
-						$new_received_work[] = $work;
-					}
-					break;
-				default:
-					$new_received_work[] = $work;
+                        $new_received_work[] = $work;
+                    }
+                    break;
+                default:
+                    $new_received_work[] = $work;
                     break;
-			}
-		}
-		$this->receivedWork = $new_received_work;
-	}
+            }
+        }
+        $this->receivedWork = $new_received_work;
+    }
 }

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

Indentation +253 added lines, -253 removed lines

@@ -10,46 +10,46 @@ 
  */
 class ForumThreadLink extends AbstractLink
 {
-	private $forum_thread_table = null;
-	private $itemprop_table = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->set_type(LINK_FORUM_THREAD);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_type_name()
-	{
-		return get_lang('ForumThreads');
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function is_allowed_to_change_name()
-	{
-		return false;
-	}
-
-	/**
-	 * Generate an array of exercises 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()
-	{
-		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 thread_id,thread_title,thread_title_qualify 
+    private $forum_thread_table = null;
+    private $itemprop_table = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->set_type(LINK_FORUM_THREAD);
+    }
+
+    /**
+     * @return string
+     */
+    public function get_type_name()
+    {
+        return get_lang('ForumThreads');
+    }
+
+    /**
+     * @return bool
+     */
+    public function is_allowed_to_change_name()
+    {
+        return false;
+    }
+
+    /**
+     * Generate an array of exercises 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()
+    {
+        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 thread_id,thread_title,thread_title_qualify 
 		        FROM '.$this->get_forum_thread_table().'
 			    forum_thread WHERE thread_id NOT IN
 			    (
@@ -60,7 +60,7 @@ 
                 ) 
                 AND forum_thread.session_id='.api_get_session_id();
 
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
         $cats = array();
         while ($data = Database::fetch_array($result)) {
@@ -75,29 +75,29 @@ 
         }
 
         return $cats;
-	}
-
-	/**
-	 * Generate an array of all exercises 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');
-		}
-
-		$tbl_grade_links 	= Database :: get_course_table(TABLE_FORUM_THREAD);
-		$tbl_item_property	= Database :: get_course_table(TABLE_ITEM_PROPERTY);
-		$session_id = api_get_session_id();
-
-		if ($session_id) {
-			$session_condition = 'tl.session_id='.api_get_session_id();
-		} else {
-			$session_condition = '(tl.session_id = 0 OR tl.session_id IS NULL)';
-		}
-
-		$sql = 'SELECT tl.thread_id, tl.thread_title, tl.thread_title_qualify
+    }
+
+    /**
+     * Generate an array of all exercises 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');
+        }
+
+        $tbl_grade_links 	= Database :: get_course_table(TABLE_FORUM_THREAD);
+        $tbl_item_property	= Database :: get_course_table(TABLE_ITEM_PROPERTY);
+        $session_id = api_get_session_id();
+
+        if ($session_id) {
+            $session_condition = 'tl.session_id='.api_get_session_id();
+        } else {
+            $session_condition = '(tl.session_id = 0 OR tl.session_id IS NULL)';
+        }
+
+        $sql = 'SELECT tl.thread_id, tl.thread_title, tl.thread_title_qualify
 				FROM '.$tbl_grade_links.' tl INNER JOIN '.$tbl_item_property.' ip
 				ON (tl.thread_id = ip.ref AND tl.c_id = ip.c_id)
 				WHERE
@@ -108,23 +108,23 @@ 
                     '.$session_condition.'
                 ';
 
-		$result = Database::query($sql);
-		while ($data = Database::fetch_array($result)) {
-			if ( isset($data['thread_title_qualify']) && $data['thread_title_qualify'] != "") {
-				$cats[] = array($data['thread_id'], $data['thread_title_qualify']);
-			} else {
-				$cats[] = array($data['thread_id'], $data['thread_title']);
-			}
-		}
-		$my_cats = isset($cats) ? $cats : null;
+        $result = Database::query($sql);
+        while ($data = Database::fetch_array($result)) {
+            if ( isset($data['thread_title_qualify']) && $data['thread_title_qualify'] != "") {
+                $cats[] = array($data['thread_id'], $data['thread_title_qualify']);
+            } else {
+                $cats[] = array($data['thread_id'], $data['thread_title']);
+            }
+        }
+        $my_cats = isset($cats) ? $cats : null;
 
-		return $my_cats;
-	}
+        return $my_cats;
+    }
 
     /**
-    * Has anyone done this exercise yet ?
-    * @return boolean
-    */
+     * Has anyone done this exercise yet ?
+     * @return boolean
+     */
     public function has_results()
     {
         $table = Database :: get_course_table(TABLE_FORUM_POST);
@@ -138,50 +138,50 @@ 
         $number = Database::fetch_row($result);
 
         return $number[0] != 0;
-	}
+    }
 
-	/**
-	 * @param int    $stud_id
+    /**
+     * @param int    $stud_id
      * @param string $type
      *
-	 * @return array|null
-	 */
-	public function calc_score($stud_id = null, $type = null)
-	{
+     * @return array|null
+     */
+    public function calc_score($stud_id = null, $type = null)
+    {
         require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
         $threadInfo = get_thread_information('', $this->get_ref_id());
 
-		$thread_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
+        $thread_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
 
         $sessionId = $this->get_session_id();
         $sessionCondition = api_get_session_condition($sessionId, true, false, 'session_id');
 
-		$sql = 'SELECT thread_qualify_max
+        $sql = 'SELECT thread_qualify_max
 		        FROM '.Database :: get_course_table(TABLE_FORUM_THREAD)."
   				WHERE 
   				    c_id = ".$this->course_id." AND 
   				    thread_id = '".$this->get_ref_id()."'
   				    $sessionCondition
                 ";
-		$query = Database::query($sql);
-		$assignment = Database::fetch_array($query);
+        $query = Database::query($sql);
+        $assignment = Database::fetch_array($query);
 
-		$sql = "SELECT * FROM $thread_qualify
+        $sql = "SELECT * FROM $thread_qualify
 				WHERE 
 				    c_id = ".$this->course_id." AND 
 				    thread_id = ".$this->get_ref_id()."
 				    $sessionCondition
                 ";
-		if (isset($stud_id)) {
-			$sql .= ' AND user_id = '.intval($stud_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 qualify_time DESC';
-		$scores = Database::query($sql);
+        // order by id, that way the student's first attempt is accessed first
+        $sql .= ' ORDER BY qualify_time DESC';
+        $scores = Database::query($sql);
 
-		// for 1 student
-		if (isset($stud_id)) {
+        // for 1 student
+        if (isset($stud_id)) {
             if ($threadInfo['thread_peer_qualify'] == 0) {
                 // Classic way of calculate score
                 if ($data = Database::fetch_array($scores)) {
@@ -209,175 +209,175 @@ 
                 }
                 return [$score/$counter, $assignment['thread_qualify_max']];
             }
-		} else {
-			// All students -> get average
-			$students = array();  // user list, needed to make sure we only
-			// take first attempts into account
-			$counter = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			$sumResult = 0;
-
-			while ($data = Database::fetch_array($scores)) {
-				if (!(array_key_exists($data['user_id'], $students))) {
-					if ($assignment['thread_qualify_max'] != 0) {
-						$students[$data['user_id']] = $data['qualify'];
-						$counter++;
-						$sum += $data['qualify'] / $assignment['thread_qualify_max'];
-						$sumResult += $data['qualify'];
-						if ($data['qualify'] > $bestResult) {
-							$bestResult = $data['qualify'];
-						}
-						$weight = $assignment['thread_qualify_max'];
-					}
-				}
-			}
-
-			if ($counter == 0) {
-				return null;
-			} else {
-				switch ($type) {
-					case 'best':
-						return array($bestResult, $weight);
-						break;
-					case 'average':
-						return array($sumResult/$counter, $weight);
-						break;
-					case 'ranking':
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
-						break;
-					default:
-						return array($sum, $counter);
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Lazy load function to get the database table of the student publications
-	 */
-	private function get_forum_thread_table()
-	{
-		return $this->forum_thread_table = Database :: get_course_table(TABLE_FORUM_THREAD);
-	}
-
-	public function needs_name_and_description()
-	{
-		return false;
-	}
-
-	public function needs_max()
-	{
-		return false;
-	}
-
-	public function needs_results()
-	{
-		return false;
-	}
+        } else {
+            // All students -> get average
+            $students = array();  // user list, needed to make sure we only
+            // take first attempts into account
+            $counter = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            $sumResult = 0;
+
+            while ($data = Database::fetch_array($scores)) {
+                if (!(array_key_exists($data['user_id'], $students))) {
+                    if ($assignment['thread_qualify_max'] != 0) {
+                        $students[$data['user_id']] = $data['qualify'];
+                        $counter++;
+                        $sum += $data['qualify'] / $assignment['thread_qualify_max'];
+                        $sumResult += $data['qualify'];
+                        if ($data['qualify'] > $bestResult) {
+                            $bestResult = $data['qualify'];
+                        }
+                        $weight = $assignment['thread_qualify_max'];
+                    }
+                }
+            }
+
+            if ($counter == 0) {
+                return null;
+            } else {
+                switch ($type) {
+                    case 'best':
+                        return array($bestResult, $weight);
+                        break;
+                    case 'average':
+                        return array($sumResult/$counter, $weight);
+                        break;
+                    case 'ranking':
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                        break;
+                    default:
+                        return array($sum, $counter);
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Lazy load function to get the database table of the student publications
+     */
+    private function get_forum_thread_table()
+    {
+        return $this->forum_thread_table = Database :: get_course_table(TABLE_FORUM_THREAD);
+    }
+
+    public function needs_name_and_description()
+    {
+        return false;
+    }
+
+    public function needs_max()
+    {
+        return false;
+    }
+
+    public function needs_results()
+    {
+        return false;
+    }
 
     /**
      * @return string
      */
-	public function get_name()
-	{
-		$this->get_exercise_data();
-		$thread_title=isset($this->exercise_data['thread_title']) ? $this->exercise_data['thread_title'] : '';
-		$thread_title_qualify=isset($this->exercise_data['thread_title_qualify']) ? $this->exercise_data['thread_title_qualify'] : '';
-		if ( isset($thread_title_qualify) && $thread_title_qualify!="") {
-			return $this->exercise_data['thread_title_qualify'];
-		} else {
-			return $thread_title;
-		}
-	}
+    public function get_name()
+    {
+        $this->get_exercise_data();
+        $thread_title=isset($this->exercise_data['thread_title']) ? $this->exercise_data['thread_title'] : '';
+        $thread_title_qualify=isset($this->exercise_data['thread_title_qualify']) ? $this->exercise_data['thread_title_qualify'] : '';
+        if ( isset($thread_title_qualify) && $thread_title_qualify!="") {
+            return $this->exercise_data['thread_title_qualify'];
+        } else {
+            return $thread_title;
+        }
+    }
 
     /**
      * @return string
      */
-	public function get_description()
-	{
-		return '';//$this->exercise_data['description'];
-	}
-
-	/**
-	 * Check if this still links to an exercise
-	 */
-	public function is_valid_link()
-	{
-		$sql = 'SELECT count(id) from '.$this->get_forum_thread_table().'
+    public function get_description()
+    {
+        return '';//$this->exercise_data['description'];
+    }
+
+    /**
+     * Check if this still links to an exercise
+     */
+    public function is_valid_link()
+    {
+        $sql = 'SELECT count(id) from '.$this->get_forum_thread_table().'
         		WHERE c_id = '.$this->course_id.' AND thread_id = '.$this->get_ref_id().' AND session_id='.api_get_session_id().'';
-		$result = Database::query($sql);
-		$number = Database::fetch_row($result);
-		return ($number[0] != 0);
-	}
-
-	public function get_test_id()
-	{
-		return 'DEBUG:ID';
-	}
-
-	public function get_link()
-	{
-		$sessionId = api_get_session_id();
-		//it was extracts the forum id
-		$sql = 'SELECT * FROM '.$this->get_forum_thread_table()."
+        $result = Database::query($sql);
+        $number = Database::fetch_row($result);
+        return ($number[0] != 0);
+    }
+
+    public function get_test_id()
+    {
+        return 'DEBUG:ID';
+    }
+
+    public function get_link()
+    {
+        $sessionId = api_get_session_id();
+        //it was extracts the forum id
+        $sql = 'SELECT * FROM '.$this->get_forum_thread_table()."
     			WHERE c_id = '.$this->course_id.' AND thread_id = '".$this->get_ref_id()."' AND session_id = ".$sessionId."";
-		$result = Database::query($sql);
-		$row    = Database::fetch_array($result,'ASSOC');
-		$forum_id=$row['forum_id'];
-
-		$url = api_get_path(WEB_PATH).'main/forum/viewthread.php?'.api_get_cidreq_params($this->get_course_code(), $sessionId).'&thread='.$this->get_ref_id().'&gradebook=view&forum='.$forum_id;
-		return $url;
-	}
-
-	private function get_exercise_data()
-	{
-		$session_id = api_get_session_id();
-		if ($session_id) {
-			$session_condition = 'session_id='.api_get_session_id();
-		} else {
-			$session_condition = '(session_id = 0 OR session_id IS NULL)';
-		}
-
-		if (!isset($this->exercise_data)) {
-			$sql = 'SELECT * FROM '.$this->get_forum_thread_table().'
+        $result = Database::query($sql);
+        $row    = Database::fetch_array($result,'ASSOC');
+        $forum_id=$row['forum_id'];
+
+        $url = api_get_path(WEB_PATH).'main/forum/viewthread.php?'.api_get_cidreq_params($this->get_course_code(), $sessionId).'&thread='.$this->get_ref_id().'&gradebook=view&forum='.$forum_id;
+        return $url;
+    }
+
+    private function get_exercise_data()
+    {
+        $session_id = api_get_session_id();
+        if ($session_id) {
+            $session_condition = 'session_id='.api_get_session_id();
+        } else {
+            $session_condition = '(session_id = 0 OR session_id IS NULL)';
+        }
+
+        if (!isset($this->exercise_data)) {
+            $sql = 'SELECT * FROM '.$this->get_forum_thread_table().'
                     WHERE c_id = '.$this->course_id.' AND  thread_id = '.$this->get_ref_id().' AND '.$session_condition;
-			$query = Database::query($sql);
-			$this->exercise_data = Database::fetch_array($query);
-		}
-		return $this->exercise_data;
-	}
-
-	public function get_icon_name()
-	{
-		return 'forum';
-	}
-
-	function save_linked_data()
-	{
-		$weight = (float)$this->get_weight();
-		$ref_id = $this->get_ref_id();
-
-		if (!empty($ref_id)) {
-			$sql = 'UPDATE '.$this->get_forum_thread_table().' SET thread_weight='.$weight.'
+            $query = Database::query($sql);
+            $this->exercise_data = Database::fetch_array($query);
+        }
+        return $this->exercise_data;
+    }
+
+    public function get_icon_name()
+    {
+        return 'forum';
+    }
+
+    function save_linked_data()
+    {
+        $weight = (float)$this->get_weight();
+        $ref_id = $this->get_ref_id();
+
+        if (!empty($ref_id)) {
+            $sql = 'UPDATE '.$this->get_forum_thread_table().' SET thread_weight='.$weight.'
                     WHERE c_id = '.$this->course_id.' AND thread_id= '.$ref_id;
-			Database::query($sql);
-		}
-	}
-
-	function delete_linked_data()
-	{
-		$ref_id = $this->get_ref_id();
-		if (!empty($ref_id)) {
-			//Cleans forum
-			$sql = 'UPDATE '.$this->get_forum_thread_table().' SET
+            Database::query($sql);
+        }
+    }
+
+    function delete_linked_data()
+    {
+        $ref_id = $this->get_ref_id();
+        if (!empty($ref_id)) {
+            //Cleans forum
+            $sql = 'UPDATE '.$this->get_forum_thread_table().' SET
 			        thread_qualify_max = 0,
 			        thread_weight = 0,
 			        thread_title_qualify = ""
                     WHERE c_id = '.$this->course_id.' AND thread_id= '.$ref_id;
-			Database::query($sql);
-		}
-	}
+            Database::query($sql);
+        }
+    }
 }

main/exercise/Hpdownload.php

Indentation +41 added lines, -41 removed lines

@@ -23,14 +23,14 @@ 
 //Event::event_download($doc_url);
 if (isset($_course['path'])) {
     $course_path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-	$full_file_name = $course_path.Security::remove_XSS($doc_url);
+    $full_file_name = $course_path.Security::remove_XSS($doc_url);
 } else {
     $course_path = api_get_path(SYS_COURSE_PATH).$cid.'/document';
-	$full_file_name = $course_path.Security::remove_XSS($doc_url);
+    $full_file_name = $course_path.Security::remove_XSS($doc_url);
 }
 
 if(!is_file($full_file_name)) {
-	exit;
+    exit;
 }
 
 if (!Security::check_abs_path($full_file_name, $course_path.'/')) {
@@ -41,16 +41,16 @@ 
 $extension=strtolower($extension[sizeof($extension)-1]);
 
 switch($extension) {
-	case 'gz':		$content_type='application/x-gzip';			break;
-	case 'zip':		$content_type='application/zip';			break;
-	case 'pdf':		$content_type='application/pdf';			break;
-	case 'png':		$content_type='image/png';					break;
-	case 'gif':		$content_type='image/gif';					break;
-	case 'jpg':		$content_type='image/jpeg';					break;
-	case 'txt':		$content_type='text/plain';					break;
-	case 'htm':		$content_type='text/html';					break;
-	case 'html':	$content_type='text/html';					break;
-	default:		$content_type='application/octet-stream';	break;
+    case 'gz':		$content_type='application/x-gzip';			break;
+    case 'zip':		$content_type='application/zip';			break;
+    case 'pdf':		$content_type='application/pdf';			break;
+    case 'png':		$content_type='image/png';					break;
+    case 'gif':		$content_type='image/gif';					break;
+    case 'jpg':		$content_type='image/jpeg';					break;
+    case 'txt':		$content_type='text/plain';					break;
+    case 'htm':		$content_type='text/html';					break;
+    case 'html':	$content_type='text/html';					break;
+    default:		$content_type='application/octet-stream';	break;
 }
 
 header('Content-disposition: filename='.$filename);
@@ -68,30 +68,30 @@ 
 */
 
 if ($content_type == 'text/html') {
-	$directory_name = dirname($full_file_name);
+    $directory_name = dirname($full_file_name);
 
-	$dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
+    $dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
 
-	if($dir[strlen($dir)-1] != '/') {
-		$dir.='/';
-	}
+    if($dir[strlen($dir)-1] != '/') {
+        $dir.='/';
+    }
 
 
-	//Parse whole file at one
-	$fp = fopen($full_file_name, "r");
-	$file_content = fread ($fp, filesize ($full_file_name));
-	fclose($fp);
+    //Parse whole file at one
+    $fp = fopen($full_file_name, "r");
+    $file_content = fread ($fp, filesize ($full_file_name));
+    fclose($fp);
     $exercisePath = api_get_self();
-  	$exfile = explode('/',$exercisePath);
-  	$exfile = $exfile[sizeof($exfile)-1];
-  	$exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile));
-  	$exercisePath = $exercisePath;
+        $exfile = explode('/',$exercisePath);
+        $exfile = $exfile[sizeof($exfile)-1];
+        $exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile));
+        $exercisePath = $exercisePath;
 
-		$content = $file_content;
-		$mit = "function Finish(){";
+        $content = $file_content;
+        $mit = "function Finish(){";
 
-		$js_content = "var SaveScoreVariable = 0; // This variable included by Dokeos System\n".
-		"function mySaveScore() // This function included by Dokeos System\n".
+        $js_content = "var SaveScoreVariable = 0; // This variable included by Dokeos System\n".
+        "function mySaveScore() // This function included by Dokeos System\n".
 "{\n".
 "   if (SaveScoreVariable==0)\n".
 "		{\n".
@@ -109,23 +109,23 @@ 
 "// Must be included \n".
 "function Finish(){\n".
 " mySaveScore();";
-		$newcontent = str_replace($mit,$js_content,$content);
+        $newcontent = str_replace($mit,$js_content,$content);
 
-		$prehref="javascript:void(0);";
-		$posthref = api_get_path(WEB_CODE_PATH) . "main/exercise/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+        $prehref="javascript:void(0);";
+        $posthref = api_get_path(WEB_CODE_PATH) . "main/exercise/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
+        $newcontent = str_replace($prehref,$posthref,$newcontent);
 
 
-		$prehref="class=\"GridNum\" onclick=";
-		$posthref="class=\"GridNum\" onMouseover=";
-		$newcontent = str_replace($prehref,$posthref,$newcontent);
+        $prehref="class=\"GridNum\" onclick=";
+        $posthref="class=\"GridNum\" onMouseover=";
+        $newcontent = str_replace($prehref,$posthref,$newcontent);
 
 
-		header('Content-length: '.strlen($newcontent));
-		// Dipsp.
-		echo $newcontent;
+        header('Content-length: '.strlen($newcontent));
+        // Dipsp.
+        echo $newcontent;
 
-	exit();
+    exit();
 }
 
 //normal case, all non-html files

main/webservices/cm_webservice.php

Indentation +137 added lines, -137 removed lines

@@ -82,12 +82,12 @@ 
  */
 interface WSCMErrorHandler
 {
-	/**
-	 * Handle method
-	 *
-	 * @param WSError Error
-	 */
-	public function handle($error);
+    /**
+     * Handle method
+     *
+     * @param WSError Error
+     */
+    public function handle($error);
 }
 
 /**
@@ -95,57 +95,57 @@ 
  */
 class WSCM
 {
-	/**
-	 * Chamilo configuration
-	 *
-	 * @var array
-	 */
-	protected $_configuration;
+    /**
+     * Chamilo configuration
+     *
+     * @var array
+     */
+    protected $_configuration;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
+    /**
+     * Constructor
+     */
+    public function __construct()
     {
-		$this->_configuration = $GLOBALS['_configuration'];
-	}
+        $this->_configuration = $GLOBALS['_configuration'];
+    }
 
-	/**
-	 * Verifies the API key
-	 *
-	 * @param string Secret key
-	 * @return mixed WSError in case of failure, null in case of success
-	 */
-	protected function verifyKey($secret_key)
+    /**
+     * Verifies the API key
+     *
+     * @param string Secret key
+     * @return mixed WSError in case of failure, null in case of success
+     */
+    protected function verifyKey($secret_key)
     {
-		$ip = trim($_SERVER['REMOTE_ADDR']);
-		// if we are behind a reverse proxy, assume it will send the
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-		  list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
-		  $ip = trim($ip1);
-		}
-		$security_key = $ip.$this->_configuration['security_key'];
+        $ip = trim($_SERVER['REMOTE_ADDR']);
+        // if we are behind a reverse proxy, assume it will send the
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
+            $ip = trim($ip1);
+        }
+        $security_key = $ip.$this->_configuration['security_key'];
 
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
-			return new WSCMError(1, "API key is invalid");
-		} else {
-			return null;
-		}
-	}
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
+            return new WSCMError(1, "API key is invalid");
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * Verifies if the user is valid
-	 *
-	 * @param <String> $username of the user in chamilo
-	 * @param <String> $pass of the same user (in MD5 of SHA)
-	 *
-	 * return "valid" if username e password are correct! Else, return a message error
-	 */
-	public function verifyUserPass($username, $pass)
+    /**
+     * Verifies if the user is valid
+     *
+     * @param <String> $username of the user in chamilo
+     * @param <String> $pass of the same user (in MD5 of SHA)
+     *
+     * return "valid" if username e password are correct! Else, return a message error
+     */
+    public function verifyUserPass($username, $pass)
     {
-		$login = $username;
-		$password = $pass;
+        $login = $username;
+        $password = $pass;
 
         $userRepo = UserManager::getRepository();
         /** @var User $uData */
@@ -178,17 +178,17 @@ 
             }
         }
         return get_lang('InvalidId');
-	}
+    }
 
-	/**
-	 * Gets the real user id based on the user id field name and value.
-	 * Note that if the user id field name is "chamilo_user_id", it will use the user id
-	 * in the system database
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @return mixed System user id if the user was found, WSError otherwise
-	 */
+    /**
+     * Gets the real user id based on the user id field name and value.
+     * Note that if the user id field name is "chamilo_user_id", it will use the user id
+     * in the system database
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @return mixed System user id if the user was found, WSError otherwise
+     */
     protected function getUserId($user_id_field_name, $user_id_value)
     {
         if ($user_id_field_name == "chamilo_user_id") {
@@ -210,16 +210,16 @@ 
         }
     }
 
-	/**
-	 * Gets the real course id based on the course id field name and value.
-	 * Note that if the course id field name is "chamilo_course_id", it will use the course id
-	 * in the system database
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed System course id if the course was found, WSError otherwise
-	 */
-	protected function getCourseId($course_id_field_name, $course_id_value)
+    /**
+     * Gets the real course id based on the course id field name and value.
+     * Note that if the course id field name is "chamilo_course_id", it will use the course id
+     * in the system database
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed System course id if the course was found, WSError otherwise
+     */
+    protected function getCourseId($course_id_field_name, $course_id_value)
     {
         if ($course_id_field_name == "chamilo_course_id") {
             if (CourseManager::get_course_code_from_course_id($course_id_value) != null) {
@@ -238,78 +238,78 @@ 
                 return $courseId;
             }
         }
-	}
+    }
 
-	/**
-	 * Gets the real session id based on the session id field name and value.
-	 * Note that if the session id field name is "chamilo_session_id", it will use the session id
-	 * in the system database
-	 *
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @return mixed System session id if the session was found, WSError otherwise
-	 */
-	protected function getSessionId($session_id_field_name, $session_id_value)
-	{
-		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
-			if(!empty($session)) {
-				return intval($session_id_value);
-			} else {
-				return new WSCMError(300, "Session not found");
-			}
-		} else {
-			$session_id = SessionManager::getSessionIdFromOriginalId(
-				$session_id_value,
-				$session_id_field_name
-			);
-			if($session_id == 0) {
-				return new WSCMError(300, "Session not found");
-			} else {
-				return $session_id;
-			}
-		}
-	}
+    /**
+     * Gets the real session id based on the session id field name and value.
+     * Note that if the session id field name is "chamilo_session_id", it will use the session id
+     * in the system database
+     *
+     * @param string Session id field name
+     * @param string Session id value
+     * @return mixed System session id if the session was found, WSError otherwise
+     */
+    protected function getSessionId($session_id_field_name, $session_id_value)
+    {
+        if ($session_id_field_name == "chamilo_session_id") {
+            $session = SessionManager::fetch((int)$session_id_value);
+            if(!empty($session)) {
+                return intval($session_id_value);
+            } else {
+                return new WSCMError(300, "Session not found");
+            }
+        } else {
+            $session_id = SessionManager::getSessionIdFromOriginalId(
+                $session_id_value,
+                $session_id_field_name
+            );
+            if($session_id == 0) {
+                return new WSCMError(300, "Session not found");
+            } else {
+                return $session_id;
+            }
+        }
+    }
 
-	/**
-	 * Handles an error by calling the WSError error handler
-	 *
-	 * @param WSError Error
-	 */
-	protected function handleError($error)
-	{
-		$handler = WSCMError::getErrorHandler();
-		$handler->handle($error);
-	}
+    /**
+     * Handles an error by calling the WSError error handler
+     *
+     * @param WSError Error
+     */
+    protected function handleError($error)
+    {
+        $handler = WSCMError::getErrorHandler();
+        $handler->handle($error);
+    }
 
-	/**
-	 * Gets a successful result
-	 *
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
-	 */
-	protected function getSuccessfulResult()
-	{
-		return array('code' => 0, 'message' => 'Operation was successful');
-	}
+    /**
+     * Gets a successful result
+     *
+     * @return array Array with a code of 0 and a message 'Operation was successful'
+     */
+    protected function getSuccessfulResult()
+    {
+        return array('code' => 0, 'message' => 'Operation was successful');
+    }
 
-	/**
-	 * Test function. Returns the string success
-	 *
-	 * @return string Success
-	 */
-	public function test()
-	{
-		return "success";
-	}
+    /**
+     * Test function. Returns the string success
+     *
+     * @return string Success
+     */
+    public function test()
+    {
+        return "success";
+    }
 
-	/**
-	 * *Strictly* reverts PHP's nl2br() effects (whether it was used in XHTML mode or not)
-	 * @param <type> $string
-	 * @return <type> $string
-	 */
-	public function nl2br_revert($string)
+    /**
+     * *Strictly* reverts PHP's nl2br() effects (whether it was used in XHTML mode or not)
+     * @param <type> $string
+     * @return <type> $string
+     */
+    public function nl2br_revert($string)
     {
-		return preg_replace('`<br(?: /)?>([\\n\\r])`', '$1', $string);
-	}
+        return preg_replace('`<br(?: /)?>([\\n\\r])`', '$1', $string);
+    }
 }
 

main/webservices/cm_webservice_user.php

Indentation +14 added lines, -14 removed lines

@@ -13,21 +13,21 @@ 
 
     public function find_id_user($username, $password, $name)
     {
-         if ($this->verifyUserPass($username, $password) == "valid") {
+            if ($this->verifyUserPass($username, $password) == "valid") {
             $listResult = "#";
 
             $listArrayResult = Array();
             $listArray = Array();
 
             $list = $this->get_user_list_like_start(array('firstname'=>$name), array('firstname'));
-             foreach ($list as $userData) {
-                 $listArray[] = $userData['user_id'];
-             }
+                foreach ($list as $userData) {
+                    $listArray[] = $userData['user_id'];
+                }
 
             $list = $this->get_user_list_like_start(array('lastname'=>$name), array('firstname'));
-             foreach ($list as $userData) {
-                 $listArray[] = $userData['user_id'];
-             }
+                foreach ($list as $userData) {
+                    $listArray[] = $userData['user_id'];
+                }
 
             $list = $this->get_user_list_like_start(array('email'=>$name), array('firstname'));
             foreach ($list as $userData) {
@@ -89,7 +89,7 @@ 
     {
         global $charset;
         if ($this->verifyUserPass($username, $password) == "valid") {
-		    $user_id = UserManager::get_user_id_from_username($username);
+            $user_id = UserManager::get_user_id_from_username($username);
             $message_title = get_lang('Invitation');
             $count_is_true = SocialManager::send_invitation_friend($user_id,$userfriend_id, $message_title, $content_message);
 
@@ -129,14 +129,14 @@ 
 
 
     /**
-    * Get a list of users of which the given conditions match with a LIKE '%cond%'
-    * @param array $conditions a list of condition (exemple : status=>STUDENT)
-    * @param array $order_by a list of fields on which sort
-    * @return array An array with all users of the platform.
-    * @todo optional course code parameter, optional sorting parameters...
+     * Get a list of users of which the given conditions match with a LIKE '%cond%'
+     * @param array $conditions a list of condition (exemple : status=>STUDENT)
+     * @param array $order_by a list of fields on which sort
+     * @return array An array with all users of the platform.
+     * @todo optional course code parameter, optional sorting parameters...
      *@todo Use the UserManager class
      * @todo security filter order by
-    */
+     */
     private static function get_user_list_like_start($conditions = array(), $order_by = array())
     {
         $user_table = Database :: get_main_table(TABLE_MAIN_USER);

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

Indentation +1 added lines, -1 removed lines

@@ -195,7 +195,7 @@
         $parentId = !$assignment ? 0 : $assignment->getId();
 
         if (empty($session)) {
-           $dql = 'SELECT a FROM ChamiloCourseBundle:CStudentPublication a
+            $dql = 'SELECT a FROM ChamiloCourseBundle:CStudentPublication a
                    WHERE
                         a.cId = :course AND
                         a.active = :active AND

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

Indentation +745 added lines, -745 removed lines

@@ -9,365 +9,365 @@ 
  */
 class Evaluation implements GradebookItem
 {
-	private $id;
-	private $name;
-	private $description;
-	private $user_id;
-	private $course_code;
-	/** @var Category */
-	private $category;
-	private $created_at;
-	private $weight;
-	private $eval_max;
-	private $visible;
-	private $sessionId;
-	public $studentList;
-
-	/**
-	 * Construct
-	 */
-	public function __construct()
-	{
-	}
-
-	/**
-	 * @return Category
-	 */
-	public function getCategory()
-	{
-		return $this->category;
-	}
-
-	/**
-	 * @param Category $category
-	 */
-	public function setCategory($category)
-	{
-		$this->category = $category;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_category_id()
-	{
-		return $this->category->get_id();
-	}
-
-	/**
-	 * @param int $category_id
-	 */
-	public function set_category_id($category_id)
-	{
-		$categories = Category::load($category_id);
-		if (isset($categories[0])) {
-			$this->setCategory($categories[0]);
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function get_id()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_name()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function get_description()
-	{
-		return $this->description;
-	}
-
-	public function get_user_id()
-	{
-		return $this->user_id;
-	}
-
-	public function get_course_code()
-	{
-		return $this->course_code;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getSessionId()
-	{
-		return $this->sessionId;
-	}
-
-	/**
-	 * @param int $sessionId
-	 */
-	public function setSessionId($sessionId)
-	{
-		$this->sessionId = intval($sessionId);
-	}
-
-	public function get_date()
-	{
-		return $this->created_at;
-	}
-
-	public function get_weight()
-	{
-		return $this->weight;
-	}
-
-	public function get_max()
-	{
-		return $this->eval_max;
-	}
-
-	public function get_type()
-	{
-		return $this->type;
-	}
-
-	public function is_visible()
-	{
-		return $this->visible;
-	}
-
-	public function get_locked()
-	{
-		return $this->locked;
-	}
-
-	public function is_locked()
-	{
-		return isset($this->locked) && $this->locked == 1 ? true : false;
-	}
-
-	public function set_id($id)
-	{
-		$this->id = $id;
-	}
-
-	public function set_name($name)
-	{
-		$this->name = $name;
-	}
-
-	public function set_description($description)
-	{
-		$this->description = $description;
-	}
-
-	public function set_user_id($user_id)
-	{
-		$this->user_id = $user_id;
-	}
-
-	public function set_course_code($course_code)
-	{
-		$this->course_code = $course_code;
-	}
-
-	public function set_date($date)
-	{
-		$this->created_at = $date;
-	}
-
-	public function set_weight($weight)
-	{
-		$this->weight = $weight;
-	}
-
-	public function set_max($max)
-	{
-		$this->eval_max = $max;
-	}
-
-	public function set_visible($visible)
-	{
-		$this->visible = $visible;
-	}
-
-	public function set_type($type)
-	{
-		$this->type = $type;
-	}
-
-	public function set_locked($locked)
-	{
-		$this->locked = $locked;
-	}
-
-	/**
-	 * Retrieve evaluations and return them as an array of Evaluation objects
-	 * @param int $id evaluation id
-	 * @param int $user_id user id (evaluation owner)
-	 * @param string $course_code course code
-	 * @param int $category_id parent category
-	 * @param integer $visible visible
-	 */
-	public static function load(
-		$id = null,
-		$user_id = null,
-		$course_code = null,
-		$category_id = null,
-		$visible = null,
-		$locked = null
-	) {
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations;
-		$paramcount = 0;
-
-		if (isset ($id)) {
-			$sql.= ' WHERE id = '.intval($id);
-			$paramcount ++;
-		}
-
-		if (isset($user_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' user_id = '.intval($user_id);
-			$paramcount ++;
-		}
-
-		if (isset($course_code) && $course_code <> '-1') {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= " course_code = '".Database::escape_string($course_code)."'";
-			$paramcount ++;
-		}
-
-		if (isset($category_id)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' category_id = '.intval($category_id);
-			$paramcount ++;
-		}
-
-		if (isset($visible)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' visible = '.intval($visible);
-			$paramcount ++;
-		}
-
-		if (isset($locked)) {
-			if ($paramcount != 0) $sql .= ' AND';
-			else $sql .= ' WHERE';
-			$sql .= ' locked = '.intval($locked);
-		}
-
-		$result = Database::query($sql);
-		$allEval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $allEval;
-	}
-
-	/**
-	 * @param array $result
-	 * @return array
-	 */
-	private static function create_evaluation_objects_from_sql_result($result)
-	{
-		$alleval = array();
-		if (Database::num_rows($result)) {
-			while ($data = Database::fetch_array($result)) {
-				$eval= new Evaluation();
-				$eval->set_id($data['id']);
-				$eval->set_name($data['name']);
-				$eval->set_description($data['description']);
-				$eval->set_user_id($data['user_id']);
-				$eval->set_course_code($data['course_code']);
-				$eval->set_category_id($data['category_id']);
-				$eval->set_date(api_get_local_time($data['created_at']));
-				$eval->set_weight($data['weight']);
-				$eval->set_max($data['max']);
-				$eval->set_visible($data['visible']);
-				$eval->set_type($data['type']);
-				$eval->set_locked($data['locked']);
-				$eval->setSessionId(api_get_session_id());
-
-				$alleval[] = $eval;
-			}
-		}
-
-		return $alleval;
-	}
-
-	/**
-	 * Insert this evaluation into the database
-	 */
+    private $id;
+    private $name;
+    private $description;
+    private $user_id;
+    private $course_code;
+    /** @var Category */
+    private $category;
+    private $created_at;
+    private $weight;
+    private $eval_max;
+    private $visible;
+    private $sessionId;
+    public $studentList;
+
+    /**
+     * Construct
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * @return Category
+     */
+    public function getCategory()
+    {
+        return $this->category;
+    }
+
+    /**
+     * @param Category $category
+     */
+    public function setCategory($category)
+    {
+        $this->category = $category;
+    }
+
+    /**
+     * @return int
+     */
+    public function get_category_id()
+    {
+        return $this->category->get_id();
+    }
+
+    /**
+     * @param int $category_id
+     */
+    public function set_category_id($category_id)
+    {
+        $categories = Category::load($category_id);
+        if (isset($categories[0])) {
+            $this->setCategory($categories[0]);
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function get_id()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_description()
+    {
+        return $this->description;
+    }
+
+    public function get_user_id()
+    {
+        return $this->user_id;
+    }
+
+    public function get_course_code()
+    {
+        return $this->course_code;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSessionId()
+    {
+        return $this->sessionId;
+    }
+
+    /**
+     * @param int $sessionId
+     */
+    public function setSessionId($sessionId)
+    {
+        $this->sessionId = intval($sessionId);
+    }
+
+    public function get_date()
+    {
+        return $this->created_at;
+    }
+
+    public function get_weight()
+    {
+        return $this->weight;
+    }
+
+    public function get_max()
+    {
+        return $this->eval_max;
+    }
+
+    public function get_type()
+    {
+        return $this->type;
+    }
+
+    public function is_visible()
+    {
+        return $this->visible;
+    }
+
+    public function get_locked()
+    {
+        return $this->locked;
+    }
+
+    public function is_locked()
+    {
+        return isset($this->locked) && $this->locked == 1 ? true : false;
+    }
+
+    public function set_id($id)
+    {
+        $this->id = $id;
+    }
+
+    public function set_name($name)
+    {
+        $this->name = $name;
+    }
+
+    public function set_description($description)
+    {
+        $this->description = $description;
+    }
+
+    public function set_user_id($user_id)
+    {
+        $this->user_id = $user_id;
+    }
+
+    public function set_course_code($course_code)
+    {
+        $this->course_code = $course_code;
+    }
+
+    public function set_date($date)
+    {
+        $this->created_at = $date;
+    }
+
+    public function set_weight($weight)
+    {
+        $this->weight = $weight;
+    }
+
+    public function set_max($max)
+    {
+        $this->eval_max = $max;
+    }
+
+    public function set_visible($visible)
+    {
+        $this->visible = $visible;
+    }
+
+    public function set_type($type)
+    {
+        $this->type = $type;
+    }
+
+    public function set_locked($locked)
+    {
+        $this->locked = $locked;
+    }
+
+    /**
+     * Retrieve evaluations and return them as an array of Evaluation objects
+     * @param int $id evaluation id
+     * @param int $user_id user id (evaluation owner)
+     * @param string $course_code course code
+     * @param int $category_id parent category
+     * @param integer $visible visible
+     */
+    public static function load(
+        $id = null,
+        $user_id = null,
+        $course_code = null,
+        $category_id = null,
+        $visible = null,
+        $locked = null
+    ) {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations;
+        $paramcount = 0;
+
+        if (isset ($id)) {
+            $sql.= ' WHERE id = '.intval($id);
+            $paramcount ++;
+        }
+
+        if (isset($user_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' user_id = '.intval($user_id);
+            $paramcount ++;
+        }
+
+        if (isset($course_code) && $course_code <> '-1') {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= " course_code = '".Database::escape_string($course_code)."'";
+            $paramcount ++;
+        }
+
+        if (isset($category_id)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' category_id = '.intval($category_id);
+            $paramcount ++;
+        }
+
+        if (isset($visible)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' visible = '.intval($visible);
+            $paramcount ++;
+        }
+
+        if (isset($locked)) {
+            if ($paramcount != 0) $sql .= ' AND';
+            else $sql .= ' WHERE';
+            $sql .= ' locked = '.intval($locked);
+        }
+
+        $result = Database::query($sql);
+        $allEval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $allEval;
+    }
+
+    /**
+     * @param array $result
+     * @return array
+     */
+    private static function create_evaluation_objects_from_sql_result($result)
+    {
+        $alleval = array();
+        if (Database::num_rows($result)) {
+            while ($data = Database::fetch_array($result)) {
+                $eval= new Evaluation();
+                $eval->set_id($data['id']);
+                $eval->set_name($data['name']);
+                $eval->set_description($data['description']);
+                $eval->set_user_id($data['user_id']);
+                $eval->set_course_code($data['course_code']);
+                $eval->set_category_id($data['category_id']);
+                $eval->set_date(api_get_local_time($data['created_at']));
+                $eval->set_weight($data['weight']);
+                $eval->set_max($data['max']);
+                $eval->set_visible($data['visible']);
+                $eval->set_type($data['type']);
+                $eval->set_locked($data['locked']);
+                $eval->setSessionId(api_get_session_id());
+
+                $alleval[] = $eval;
+            }
+        }
+
+        return $alleval;
+    }
+
+    /**
+     * Insert this evaluation into the database
+     */
     public function add()
-	{
-		if (isset($this->name) &&
-			isset($this->user_id) &&
-			isset($this->weight) &&
-			isset ($this->eval_max) &&
-			isset($this->visible)
-		) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-
-			$sql = 'INSERT INTO '.$tbl_grade_evaluations
-				.' (name, user_id, weight, max, visible';
-			if (isset($this->description)) {
-				$sql .= ',description';
-			}
-			if (isset($this->course_code)) {
-				$sql .= ', course_code';
-			}
-			if (isset($this->category)) {
-				$sql .= ', category_id';
-			}
-			$sql .= ', created_at';
-			$sql .= ',type';
-			$sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
-				.','.intval($this->get_user_id())
-				.','.floatval($this->get_weight())
-				.','.intval($this->get_max())
-				.','.intval($this->is_visible());
-			if (isset($this->description)) {
-				$sql .= ",'".Database::escape_string($this->get_description())."'";
-			}
-			if (isset($this->course_code)) {
-				$sql .= ",'".Database::escape_string($this->get_course_code())."'";
-			}
-			if (isset($this->category)) {
-				$sql .= ','.intval($this->get_category_id());
-			}
-			if (empty($this->type)) {
-				$this->type = 'evaluation';
-			}
-			$sql .= ", '".api_get_utc_datetime()."'";
-			$sql .= ',\''.Database::escape_string($this->type).'\'';
-			$sql .= ")";
-
-			Database::query($sql);
-			$this->set_id(Database::insert_id());
-		} else {
-			die('Error in Evaluation add: required field empty');
-		}
-	}
-
-	/**
-	 * @param int $idevaluation
-	 */
-	public function add_evaluation_log($idevaluation)
-	{
-		if (!empty($idevaluation)) {
-			$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-			$tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
-			$eval = new Evaluation();
-			$dateobject = $eval->load($idevaluation,null,null,null,null);
-			$arreval = get_object_vars($dateobject[0]);
-			if (!empty($arreval['id'])) {
-				$sql = 'SELECT weight from '.$tbl_grade_evaluations.'
+    {
+        if (isset($this->name) &&
+            isset($this->user_id) &&
+            isset($this->weight) &&
+            isset ($this->eval_max) &&
+            isset($this->visible)
+        ) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+
+            $sql = 'INSERT INTO '.$tbl_grade_evaluations
+                .' (name, user_id, weight, max, visible';
+            if (isset($this->description)) {
+                $sql .= ',description';
+            }
+            if (isset($this->course_code)) {
+                $sql .= ', course_code';
+            }
+            if (isset($this->category)) {
+                $sql .= ', category_id';
+            }
+            $sql .= ', created_at';
+            $sql .= ',type';
+            $sql .= ") VALUES ('".Database::escape_string($this->get_name())."'"
+                .','.intval($this->get_user_id())
+                .','.floatval($this->get_weight())
+                .','.intval($this->get_max())
+                .','.intval($this->is_visible());
+            if (isset($this->description)) {
+                $sql .= ",'".Database::escape_string($this->get_description())."'";
+            }
+            if (isset($this->course_code)) {
+                $sql .= ",'".Database::escape_string($this->get_course_code())."'";
+            }
+            if (isset($this->category)) {
+                $sql .= ','.intval($this->get_category_id());
+            }
+            if (empty($this->type)) {
+                $this->type = 'evaluation';
+            }
+            $sql .= ", '".api_get_utc_datetime()."'";
+            $sql .= ',\''.Database::escape_string($this->type).'\'';
+            $sql .= ")";
+
+            Database::query($sql);
+            $this->set_id(Database::insert_id());
+        } else {
+            die('Error in Evaluation add: required field empty');
+        }
+    }
+
+    /**
+     * @param int $idevaluation
+     */
+    public function add_evaluation_log($idevaluation)
+    {
+        if (!empty($idevaluation)) {
+            $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+            $tbl_grade_linkeval_log = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
+            $eval = new Evaluation();
+            $dateobject = $eval->load($idevaluation,null,null,null,null);
+            $arreval = get_object_vars($dateobject[0]);
+            if (!empty($arreval['id'])) {
+                $sql = 'SELECT weight from '.$tbl_grade_evaluations.'
                         WHERE id='.$arreval['id'];
                 $rs = Database::query($sql);
                 $row_old_weight = Database::fetch_array($rs, 'ASSOC');
@@ -383,426 +383,426 @@ 
                     'user_id_log' => api_get_user_id()
                 ];
                 Database::insert($tbl_grade_linkeval_log, $params);
-			}
-		}
-	}
-
-	/**
-	 * Update the properties of this evaluation in the database
-	 */
-	public function save()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'UPDATE '.$tbl_grade_evaluations
-			." SET name = '".Database::escape_string($this->get_name())."'"
-			.', description = ';
-		if (isset($this->description)) {
-			$sql .= "'".Database::escape_string($this->get_description())."'";
-		}else {
-			$sql .= 'null';
-		}
-		$sql .= ', user_id = '.intval($this->get_user_id())
-			.', course_code = ';
-		if (isset($this->course_code)) {
-			$sql .= "'".Database::escape_string($this->get_course_code())."'";
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', category_id = ';
-		if (isset($this->category)) {
-			$sql .= intval($this->get_category_id());
-		} else {
-			$sql .= 'null';
-		}
-		$sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
-			.', max = '.intval($this->get_max())
-			.', visible = '.intval($this->is_visible())
-			.' WHERE id = '.intval($this->id);
-		//recorded history
-
-		$eval_log = new Evaluation();
-		$eval_log->add_evaluation_log($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Delete this evaluation from the database
-	 */
-	public function delete()
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Check if an evaluation name (with the same parent category) already exists
-	 * @param $name name to check (if not given, the name property of this object will be checked)
-	 * @param $parent parent category
-	 */
-	public function does_name_exist($name, $parent)
-	{
-		if (!isset ($name)) {
-			$name = $this->name;
-			$parent = $this->category;
-		}
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = 'SELECT count(id) AS number'
-			.' FROM '.$tbl_grade_evaluations
-			." WHERE name = '".Database::escape_string($name)."'";
-
-		if (api_is_allowed_to_edit()) {
-			$parent = Category::load($parent);
-			$code = $parent[0]->get_course_code();
-			$courseInfo = api_get_course_info($code);
-			$courseId = $courseInfo['real_id'];
-
-			if (isset($code) && $code != '0') {
-				$main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-				$sql .= ' AND user_id IN (
+            }
+        }
+    }
+
+    /**
+     * Update the properties of this evaluation in the database
+     */
+    public function save()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'UPDATE '.$tbl_grade_evaluations
+            ." SET name = '".Database::escape_string($this->get_name())."'"
+            .', description = ';
+        if (isset($this->description)) {
+            $sql .= "'".Database::escape_string($this->get_description())."'";
+        }else {
+            $sql .= 'null';
+        }
+        $sql .= ', user_id = '.intval($this->get_user_id())
+            .', course_code = ';
+        if (isset($this->course_code)) {
+            $sql .= "'".Database::escape_string($this->get_course_code())."'";
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', category_id = ';
+        if (isset($this->category)) {
+            $sql .= intval($this->get_category_id());
+        } else {
+            $sql .= 'null';
+        }
+        $sql .= ', weight = "'.Database::escape_string($this->get_weight()).'" '
+            .', max = '.intval($this->get_max())
+            .', visible = '.intval($this->is_visible())
+            .' WHERE id = '.intval($this->id);
+        //recorded history
+
+        $eval_log = new Evaluation();
+        $eval_log->add_evaluation_log($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Delete this evaluation from the database
+     */
+    public function delete()
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'DELETE FROM '.$tbl_grade_evaluations.' WHERE id = '.intval($this->id);
+        Database::query($sql);
+    }
+
+    /**
+     * Check if an evaluation name (with the same parent category) already exists
+     * @param $name name to check (if not given, the name property of this object will be checked)
+     * @param $parent parent category
+     */
+    public function does_name_exist($name, $parent)
+    {
+        if (!isset ($name)) {
+            $name = $this->name;
+            $parent = $this->category;
+        }
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = 'SELECT count(id) AS number'
+            .' FROM '.$tbl_grade_evaluations
+            ." WHERE name = '".Database::escape_string($name)."'";
+
+        if (api_is_allowed_to_edit()) {
+            $parent = Category::load($parent);
+            $code = $parent[0]->get_course_code();
+            $courseInfo = api_get_course_info($code);
+            $courseId = $courseInfo['real_id'];
+
+            if (isset($code) && $code != '0') {
+                $main_course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+                $sql .= ' AND user_id IN (
 					 SELECT user_id FROM '.$main_course_user_table.'
 					 WHERE
 						c_id = '.$courseId.' AND
 						status = '.COURSEMANAGER.'
 					)';
-			} else {
-				$sql .= ' AND user_id = '.api_get_user_id();
-			}
-
-		}else {
-			$sql .= ' AND user_id = '.api_get_user_id();
-		}
-
-		if (!isset ($parent)) {
-			$sql.= ' AND category_id is null';
-		} else {
-			$sql.= ' AND category_id = '.intval($parent);
-		}
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return $number[0] != 0;
-	}
-
-	/**
-	 * Are there any results for this evaluation yet ?
-	 * The 'max' property should not be changed then.
-	 */
-	public function has_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'SELECT count(id) AS number
+            } else {
+                $sql .= ' AND user_id = '.api_get_user_id();
+            }
+
+        }else {
+            $sql .= ' AND user_id = '.api_get_user_id();
+        }
+
+        if (!isset ($parent)) {
+            $sql.= ' AND category_id is null';
+        } else {
+            $sql.= ' AND category_id = '.intval($parent);
+        }
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return $number[0] != 0;
+    }
+
+    /**
+     * Are there any results for this evaluation yet ?
+     * The 'max' property should not be changed then.
+     */
+    public function has_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'SELECT count(id) AS number
 				FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
-		$result = Database::query($sql);
-		$number=Database::fetch_row($result);
-
-		return ($number[0] != 0);
-	}
-
-	/**
-	 * Delete all results for this evaluation
-	 */
-	public function delete_results()
-	{
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-		$sql = 'DELETE FROM '.$tbl_grade_results.'
+        $result = Database::query($sql);
+        $number=Database::fetch_row($result);
+
+        return ($number[0] != 0);
+    }
+
+    /**
+     * Delete all results for this evaluation
+     */
+    public function delete_results()
+    {
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+        $sql = 'DELETE FROM '.$tbl_grade_results.'
 				WHERE evaluation_id = '.intval($this->id);
-		Database::query($sql);
-	}
-
-	/**
-	 * Delete this evaluation and all underlying results.
-	 */
-	public function delete_with_results()
-	{
-		$this->delete_results();
-		$this->delete();
-	}
-
-	/**
-	 * Check if the given score is possible for this evaluation
-	 */
-	public function is_valid_score($score)
-	{
-		return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
-	}
-
-	/**
-	 * Calculate the score of this evaluation
-	 * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
-	 * @param string $type (best, average, ranking)
-	 * @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)
-	{
+        Database::query($sql);
+    }
+
+    /**
+     * Delete this evaluation and all underlying results.
+     */
+    public function delete_with_results()
+    {
+        $this->delete_results();
+        $this->delete();
+    }
+
+    /**
+     * Check if the given score is possible for this evaluation
+     */
+    public function is_valid_score($score)
+    {
+        return is_numeric($score) && $score >= 0 && $score <= $this->eval_max;
+    }
+
+    /**
+     * Calculate the score of this evaluation
+     * @param int $stud_id (default: all students who have results for this eval - then the average is returned)
+     * @param string $type (best, average, ranking)
+     * @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)
+    {
         $useSession = true;
-		if (isset($stud_id) && empty($type)) {
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
-			$data = Session::read('calc_score');
+        if (isset($stud_id) && empty($type)) {
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id.'_'.$stud_id;
+            $data = Session::read('calc_score');
             $results = isset($data[$key]) ? $data[$key] : null;
 
             if ($useSession == false) {
                 $results  = null;
             }
-			if (empty($results)) {
-				$results = Result::load(null, $stud_id, $this->id);
-				Session::write('calc_score', array($key => $results));
-			}
-
-			$score = 0;
-			/** @var Result $res */
-			foreach ($results as $res) {
-				$score = $res->get_score();
-			}
-
-			return array($score, $this->get_max());
-		} else {
-
-			$count = 0;
-			$sum = 0;
-			$bestResult = 0;
-			$weight = 0;
-			$sumResult = 0;
-
-			$key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
+            if (empty($results)) {
+                $results = Result::load(null, $stud_id, $this->id);
+                Session::write('calc_score', array($key => $results));
+            }
+
+            $score = 0;
+            /** @var Result $res */
+            foreach ($results as $res) {
+                $score = $res->get_score();
+            }
+
+            return array($score, $this->get_max());
+        } else {
+
+            $count = 0;
+            $sum = 0;
+            $bestResult = 0;
+            $weight = 0;
+            $sumResult = 0;
+
+            $key = 'result_score_student_list_'.api_get_course_int_id().'_'.api_get_session_id().'_'.$this->id;
             $data = Session::read('calc_score');
             $allResults = isset($data[$key]) ? $data[$key] : null;
             if ($useSession == false) {
                 $allResults  = null;
             }
-			if (empty($allResults)) {
-				$allResults = Result::load(null, null, $this->id);
-				Session::write($key, $allResults);
-			}
-
-			$students = array();
-			/** @var Result $res */
-			foreach ($allResults as $res) {
-				$score = $res->get_score();
-				if (!empty($score) || $score == '0') {
-					$count++;
-					$sum += $score / $this->get_max();
-					$sumResult += $score;
-					if ($score > $bestResult) {
-						$bestResult = $score;
-					}
-					$weight = $this->get_max();
-				}
-				$students[$res->get_user_id()] = $score;
-			}
-
-			if (empty($count)) {
-				return null;
-			}
-
-			switch ($type) {
-				case 'best':
-					return array($bestResult, $weight);
-					break;
-				case 'average':
-					return array($sumResult/$count, $weight);
-					break;
-				case 'ranking':
+            if (empty($allResults)) {
+                $allResults = Result::load(null, null, $this->id);
+                Session::write($key, $allResults);
+            }
+
+            $students = array();
+            /** @var Result $res */
+            foreach ($allResults as $res) {
+                $score = $res->get_score();
+                if (!empty($score) || $score == '0') {
+                    $count++;
+                    $sum += $score / $this->get_max();
+                    $sumResult += $score;
+                    if ($score > $bestResult) {
+                        $bestResult = $score;
+                    }
+                    $weight = $this->get_max();
+                }
+                $students[$res->get_user_id()] = $score;
+            }
+
+            if (empty($count)) {
+                return null;
+            }
+
+            switch ($type) {
+                case 'best':
+                    return array($bestResult, $weight);
+                    break;
+                case 'average':
+                    return array($sumResult/$count, $weight);
+                    break;
+                case 'ranking':
                     $students = array();
                     /** @var Result $res */
                     foreach ($allResults as $res) {
                         $score = $res->get_score();
                         $students[$res->get_user_id()] = $score;
                     }
-					return AbstractLink::getCurrentUserRanking($stud_id, $students);
-					break;
-				default:
-					return array($sum, $count);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Generate an array of possible categories where this evaluation can be moved to.
-	 * Notice: its own parent will be included in the list: it's up to the frontend
-	 * to disable this element.
-	 * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
-	 */
-	public function get_target_categories()
-	{
-		// - course independent evaluation
-		//   -> movable to root or other course independent categories
-		// - evaluation inside a course
-		//   -> movable to root, independent categories or categories inside the course
-		$user = (api_is_platform_admin() ? null : api_get_user_id());
-		$targets = array();
-		$level = 0;
-
-		$root = array(0, get_lang('RootCat'), $level);
-		$targets[] = $root;
-
-		if (isset($this->course_code) && !empty($this->course_code)) {
-			$crscats = Category::load(null,null,$this->course_code,0);
-			foreach ($crscats as $cat) {
-				$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-				$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-			}
-		}
-
-		$indcats = Category::load(null,$user,0,0);
-		foreach ($indcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-
-		return $targets;
-	}
-
-	/**
-	 * Internal function used by get_target_categories()
-	 * @param integer $level
-	 */
-	private function add_target_subcategories($targets, $level, $catid)
-	{
-		$subcats = Category::load(null,null,null,$catid);
-		foreach ($subcats as $cat) {
-			$targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
-			$targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
-		}
-		return $targets;
-	}
-
-	/**
-	 * Move this evaluation to the given category.
-	 * If this evaluation moves from inside a course to outside,
-	 * its course code is also changed.
-	 */
-	public function move_to_cat($cat)
-	{
-		$this->set_category_id($cat->get_id());
-		if ($this->get_course_code() != $cat->get_course_code()) {
-			$this->set_course_code($cat->get_course_code());
-		}
-		$this->save();
-	}
-
-	/**
-	 * Retrieve evaluations where a student has results for
-	 * and return them as an array of Evaluation objects
-	 * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
-	 * @param int $stud_id student id
-	 */
-	public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
-	{
-		$tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
+                    return AbstractLink::getCurrentUserRanking($stud_id, $students);
+                    break;
+                default:
+                    return array($sum, $count);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Generate an array of possible categories where this evaluation can be moved to.
+     * Notice: its own parent will be included in the list: it's up to the frontend
+     * to disable this element.
+     * @return array 2-dimensional array - every element contains 3 subelements (id, name, level)
+     */
+    public function get_target_categories()
+    {
+        // - course independent evaluation
+        //   -> movable to root or other course independent categories
+        // - evaluation inside a course
+        //   -> movable to root, independent categories or categories inside the course
+        $user = (api_is_platform_admin() ? null : api_get_user_id());
+        $targets = array();
+        $level = 0;
+
+        $root = array(0, get_lang('RootCat'), $level);
+        $targets[] = $root;
+
+        if (isset($this->course_code) && !empty($this->course_code)) {
+            $crscats = Category::load(null,null,$this->course_code,0);
+            foreach ($crscats as $cat) {
+                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+                $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+            }
+        }
+
+        $indcats = Category::load(null,$user,0,0);
+        foreach ($indcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+
+        return $targets;
+    }
+
+    /**
+     * Internal function used by get_target_categories()
+     * @param integer $level
+     */
+    private function add_target_subcategories($targets, $level, $catid)
+    {
+        $subcats = Category::load(null,null,null,$catid);
+        foreach ($subcats as $cat) {
+            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
+            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
+        }
+        return $targets;
+    }
+
+    /**
+     * Move this evaluation to the given category.
+     * If this evaluation moves from inside a course to outside,
+     * its course code is also changed.
+     */
+    public function move_to_cat($cat)
+    {
+        $this->set_category_id($cat->get_id());
+        if ($this->get_course_code() != $cat->get_course_code()) {
+            $this->set_course_code($cat->get_course_code());
+        }
+        $this->save();
+    }
+
+    /**
+     * Retrieve evaluations where a student has results for
+     * and return them as an array of Evaluation objects
+     * @param int $cat_id parent category (use 'null' to retrieve them in all categories)
+     * @param int $stud_id student id
+     */
+    public static function get_evaluations_with_result_for_student($cat_id = null, $stud_id)
+    {
+        $tbl_grade_evaluations = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT * FROM '.$tbl_grade_evaluations.'
 				WHERE id IN (
 					SELECT evaluation_id FROM '.$tbl_grade_results.'
 					WHERE user_id = '.intval($stud_id).' AND score IS NOT NULL
 				)';
-		if (!api_is_allowed_to_edit()) {
-			$sql .= ' AND visible = 1';
-		}
-		if (isset($cat_id)) {
-			$sql .= ' AND category_id = '.intval($cat_id);
-		} else {
-			$sql .= ' AND category_id >= 0';
-		}
-
-		$result = Database::query($sql);
-		$alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
-
-		return $alleval;
-	}
-
-	/**
-	 * Get a list of students that do not have a result record for this evaluation
-	 */
-	public function get_not_subscribed_students($first_letter_user = '')
-	{
-		$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
-		$tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
-
-		$sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
-			." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
-			.' AND status = '.STUDENT
-			.' AND user_id NOT IN'
-			.' (SELECT user_id FROM '.$tbl_grade_results
-			.' WHERE evaluation_id = '.intval($this->id)
-			.' )'
-			.' ORDER BY lastname';
-
-		$result = Database::query($sql);
-		$users = Database::store_result($result);
-
-		return $users;
-	}
-
-	/**
-	 * Find evaluations by name
-	 * @param string $name_mask search string
-	 * @return array evaluation objects matching the search criterium
-	 * @todo can be written more efficiently using a new (but very complex) sql query
-	 */
-	public function find_evaluations($name_mask,$selectcat)
-	{
-		$rootcat = Category::load($selectcat);
-		$evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
-		$foundevals = array();
-		foreach ($evals as $eval) {
-			if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
-				$foundevals[] = $eval;
-			}
-		}
-		return $foundevals;
-	}
-
-	public function get_item_type()
-	{
-		return 'E';
-	}
-
-	public function get_icon_name()
-	{
-		return $this->has_results() ? 'evalnotempty' : 'evalempty';
-	}
-
-	/**
-	 * Locks an evaluation, only one who can unlock it is the platform administrator.
-	 * @param int locked 1 or unlocked 0
-	 *
-	 **/
-	function lock($locked)
-	{
-		$table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
-		$sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
-		Database::query($sql);
-	}
-
-	function check_lock_permissions()
-	{
-		if (api_is_platform_admin()) {
-			return true;
-		} else {
-			if ($this->is_locked()) {
-				api_not_allowed();
-			}
-		}
-	}
-
-	function delete_linked_data()
-	{
-
-	}
+        if (!api_is_allowed_to_edit()) {
+            $sql .= ' AND visible = 1';
+        }
+        if (isset($cat_id)) {
+            $sql .= ' AND category_id = '.intval($cat_id);
+        } else {
+            $sql .= ' AND category_id >= 0';
+        }
+
+        $result = Database::query($sql);
+        $alleval = Evaluation::create_evaluation_objects_from_sql_result($result);
+
+        return $alleval;
+    }
+
+    /**
+     * Get a list of students that do not have a result record for this evaluation
+     */
+    public function get_not_subscribed_students($first_letter_user = '')
+    {
+        $tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+        $tbl_grade_results = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_RESULT);
+
+        $sql = 'SELECT user_id,lastname,firstname,username FROM '.$tbl_user
+            ." WHERE lastname LIKE '".Database::escape_string($first_letter_user)."%'"
+            .' AND status = '.STUDENT
+            .' AND user_id NOT IN'
+            .' (SELECT user_id FROM '.$tbl_grade_results
+            .' WHERE evaluation_id = '.intval($this->id)
+            .' )'
+            .' ORDER BY lastname';
+
+        $result = Database::query($sql);
+        $users = Database::store_result($result);
+
+        return $users;
+    }
+
+    /**
+     * Find evaluations by name
+     * @param string $name_mask search string
+     * @return array evaluation objects matching the search criterium
+     * @todo can be written more efficiently using a new (but very complex) sql query
+     */
+    public function find_evaluations($name_mask,$selectcat)
+    {
+        $rootcat = Category::load($selectcat);
+        $evals = $rootcat[0]->get_evaluations((api_is_allowed_to_create_course() ? null : api_get_user_id()), true);
+        $foundevals = array();
+        foreach ($evals as $eval) {
+            if (!(api_strpos(api_strtolower($eval->get_name()), api_strtolower($name_mask)) === false)) {
+                $foundevals[] = $eval;
+            }
+        }
+        return $foundevals;
+    }
+
+    public function get_item_type()
+    {
+        return 'E';
+    }
+
+    public function get_icon_name()
+    {
+        return $this->has_results() ? 'evalnotempty' : 'evalempty';
+    }
+
+    /**
+     * Locks an evaluation, only one who can unlock it is the platform administrator.
+     * @param int locked 1 or unlocked 0
+     *
+     **/
+    function lock($locked)
+    {
+        $table_evaluation = Database::get_main_table(TABLE_MAIN_GRADEBOOK_EVALUATION);
+        $sql = "UPDATE $table_evaluation SET locked = '".intval($locked)."' WHERE id='".intval($this->id)."'";
+        Database::query($sql);
+    }
+
+    function check_lock_permissions()
+    {
+        if (api_is_platform_admin()) {
+            return true;
+        } else {
+            if ($this->is_locked()) {
+                api_not_allowed();
+            }
+        }
+    }
+
+    function delete_linked_data()
+    {
+
+    }
 
     public function getStudentList()
     {
         return $this->studentList;
     }
 
-	public function setStudentList($list)
-	{
-		$this->studentList = $list;
-	}
+    public function setStudentList($list)
+    {
+        $this->studentList = $list;
+    }
 }