Inspection of "Merge pull request #1590 from jloguercio/1.11.x" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 565c08...93d030 )

by José

created 2017-01-06 23:31 UTC

Status

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

@@ -52,224 +52,224 @@  discard block
 block discarded – undo
 * @access   public
 */
 class nusoap_client_mime extends nusoap_client {
-	/**
-	 * @var array Each array element in the return is an associative array with keys
-	 * data, filename, contenttype, cid
-	 * @access private
-	 */
-	var $requestAttachments = array();
-	/**
-	 * @var array Each array element in the return is an associative array with keys
-	 * data, filename, contenttype, cid
-	 * @access private
-	 */
-	var $responseAttachments;
-	/**
-	 * @var string
-	 * @access private
-	 */
-	var $mimeContentType;
-
-	/**
-	* adds a MIME attachment to the current request.
-	*
-	* If the $data parameter contains an empty string, this method will read
-	* the contents of the file named by the $filename parameter.
-	*
-	* If the $cid parameter is false, this method will generate the cid.
-	*
-	* @param string $data The data of the attachment
-	* @param string $filename The filename of the attachment (default is empty string)
-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
-	* @param string $cid The content-id (cid) of the attachment (default is false)
-	* @return string The content-id (cid) of the attachment
-	* @access public
-	*/
-	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
-		if (! $cid) {
-			$cid = md5(uniqid(time()));
-		}
-
-		$info['data'] = $data;
-		$info['filename'] = $filename;
-		$info['contenttype'] = $contenttype;
-		$info['cid'] = $cid;
-
-		$this->requestAttachments[] = $info;
-
-		return $cid;
-	}
-
-	/**
-	* clears the MIME attachments for the current request.
-	*
-	* @access public
-	*/
-	function clearAttachments() {
-		$this->requestAttachments = array();
-	}
-
-	/**
-	* gets the MIME attachments from the current response.
-	*
-	* Each array element in the return is an associative array with keys
-	* data, filename, contenttype, cid.  These keys correspond to the parameters
-	* for addAttachment.
-	*
-	* @return array The attachments.
-	* @access public
-	*/
-	function getAttachments() {
-		return $this->responseAttachments;
-	}
-
-	/**
-	* gets the HTTP body for the current request.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
-	function getHTTPBody($soapmsg) {
-		if (count($this->requestAttachments) > 0) {
-			$params['content_type'] = 'multipart/related; type="text/xml"';
-			$mimeMessage = new Mail_mimePart('', $params);
-			unset($params);
-
-			$params['content_type'] = 'text/xml';
-			$params['encoding']     = '8bit';
-			$params['charset']      = $this->soap_defencoding;
-			$mimeMessage->addSubpart($soapmsg, $params);
-
-			foreach ($this->requestAttachments as $att) {
-				unset($params);
-
-				$params['content_type'] = $att['contenttype'];
-				$params['encoding']     = 'base64';
-				$params['disposition']  = 'attachment';
-				$params['dfilename']    = $att['filename'];
-				$params['cid']          = $att['cid'];
-
-				if ($att['data'] == '' && $att['filename'] <> '') {
-					if ($fd = fopen($att['filename'], 'rb')) {
-						$data = fread($fd, filesize($att['filename']));
-						fclose($fd);
-					} else {
-						$data = '';
-					}
-					$mimeMessage->addSubpart($data, $params);
-				} else {
-					$mimeMessage->addSubpart($att['data'], $params);
-				}
-			}
-
-			$output = $mimeMessage->encode();
-			$mimeHeaders = $output['headers'];
-
-			foreach ($mimeHeaders as $k => $v) {
-				$this->debug("MIME header $k: $v");
-				if (strtolower($k) == 'content-type') {
-					// PHP header() seems to strip leading whitespace starting
-					// the second line, so force everything to one line
-					$this->mimeContentType = str_replace("\r\n", " ", $v);
-				}
-			}
-
-			return $output['body'];
-		}
-
-		return parent::getHTTPBody($soapmsg);
-	}
-
-	/**
-	* gets the HTTP content type for the current request.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current request.
-	* @access private
-	*/
-	function getHTTPContentType() {
-		if (count($this->requestAttachments) > 0) {
-			return $this->mimeContentType;
-		}
-		return parent::getHTTPContentType();
-	}
-
-	/**
-	* gets the HTTP content type charset for the current request.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current request.
-	* @access private
-	*/
-	function getHTTPContentTypeCharset() {
-		if (count($this->requestAttachments) > 0) {
-			return false;
-		}
-		return parent::getHTTPContentTypeCharset();
-	}
-
-	/**
-	* processes SOAP message returned from server
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed response data from server
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
+    /**
+     * @var array Each array element in the return is an associative array with keys
+     * data, filename, contenttype, cid
+     * @access private
+     */
+    var $requestAttachments = array();
+    /**
+     * @var array Each array element in the return is an associative array with keys
+     * data, filename, contenttype, cid
+     * @access private
+     */
+    var $responseAttachments;
+    /**
+     * @var string
+     * @access private
+     */
+    var $mimeContentType;
+
+    /**
+     * adds a MIME attachment to the current request.
+     *
+     * If the $data parameter contains an empty string, this method will read
+     * the contents of the file named by the $filename parameter.
+     *
+     * If the $cid parameter is false, this method will generate the cid.
+     *
+     * @param string $data The data of the attachment
+     * @param string $filename The filename of the attachment (default is empty string)
+     * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
+     * @param string $cid The content-id (cid) of the attachment (default is false)
+     * @return string The content-id (cid) of the attachment
+     * @access public
+     */
+    function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
+        if (! $cid) {
+            $cid = md5(uniqid(time()));
+        }
+
+        $info['data'] = $data;
+        $info['filename'] = $filename;
+        $info['contenttype'] = $contenttype;
+        $info['cid'] = $cid;
+
+        $this->requestAttachments[] = $info;
+
+        return $cid;
+    }
+
+    /**
+     * clears the MIME attachments for the current request.
+     *
+     * @access public
+     */
+    function clearAttachments() {
+        $this->requestAttachments = array();
+    }
+
+    /**
+     * gets the MIME attachments from the current response.
+     *
+     * Each array element in the return is an associative array with keys
+     * data, filename, contenttype, cid.  These keys correspond to the parameters
+     * for addAttachment.
+     *
+     * @return array The attachments.
+     * @access public
+     */
+    function getAttachments() {
+        return $this->responseAttachments;
+    }
+
+    /**
+     * gets the HTTP body for the current request.
+     *
+     * @param string $soapmsg The SOAP payload
+     * @return string The HTTP body, which includes the SOAP payload
+     * @access private
+     */
+    function getHTTPBody($soapmsg) {
+        if (count($this->requestAttachments) > 0) {
+            $params['content_type'] = 'multipart/related; type="text/xml"';
+            $mimeMessage = new Mail_mimePart('', $params);
+            unset($params);
+
+            $params['content_type'] = 'text/xml';
+            $params['encoding']     = '8bit';
+            $params['charset']      = $this->soap_defencoding;
+            $mimeMessage->addSubpart($soapmsg, $params);
+
+            foreach ($this->requestAttachments as $att) {
+                unset($params);
+
+                $params['content_type'] = $att['contenttype'];
+                $params['encoding']     = 'base64';
+                $params['disposition']  = 'attachment';
+                $params['dfilename']    = $att['filename'];
+                $params['cid']          = $att['cid'];
+
+                if ($att['data'] == '' && $att['filename'] <> '') {
+                    if ($fd = fopen($att['filename'], 'rb')) {
+                        $data = fread($fd, filesize($att['filename']));
+                        fclose($fd);
+                    } else {
+                        $data = '';
+                    }
+                    $mimeMessage->addSubpart($data, $params);
+                } else {
+                    $mimeMessage->addSubpart($att['data'], $params);
+                }
+            }
+
+            $output = $mimeMessage->encode();
+            $mimeHeaders = $output['headers'];
+
+            foreach ($mimeHeaders as $k => $v) {
+                $this->debug("MIME header $k: $v");
+                if (strtolower($k) == 'content-type') {
+                    // PHP header() seems to strip leading whitespace starting
+                    // the second line, so force everything to one line
+                    $this->mimeContentType = str_replace("\r\n", " ", $v);
+                }
+            }
+
+            return $output['body'];
+        }
+
+        return parent::getHTTPBody($soapmsg);
+    }
+
+    /**
+     * gets the HTTP content type for the current request.
+     *
+     * Note: getHTTPBody must be called before this.
+     *
+     * @return string the HTTP content type for the current request.
+     * @access private
+     */
+    function getHTTPContentType() {
+        if (count($this->requestAttachments) > 0) {
+            return $this->mimeContentType;
+        }
+        return parent::getHTTPContentType();
+    }
+
+    /**
+     * gets the HTTP content type charset for the current request.
+     * returns false for non-text content types.
+     *
+     * Note: getHTTPBody must be called before this.
+     *
+     * @return string the HTTP content type charset for the current request.
+     * @access private
+     */
+    function getHTTPContentTypeCharset() {
+        if (count($this->requestAttachments) > 0) {
+            return false;
+        }
+        return parent::getHTTPContentTypeCharset();
+    }
+
+    /**
+     * processes SOAP message returned from server
+     *
+     * @param	array	$headers	The HTTP headers
+     * @param	string	$data		unprocessed response data from server
+     * @return	mixed	value of the message, decoded into a PHP type
+     * @access   private
+     */
     function parseResponse($headers, $data) {
-		$this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
-		$this->responseAttachments = array();
-		if (strstr($headers['content-type'], 'multipart/related')) {
-			$this->debug('Decode multipart/related');
-			$input = '';
-			foreach ($headers as $k => $v) {
-				$input .= "$k: $v\r\n";
-			}
-			$params['input'] = $input . "\r\n" . $data;
-			$params['include_bodies'] = true;
-			$params['decode_bodies'] = true;
-			$params['decode_headers'] = true;
-
-			$structure = Mail_mimeDecode::decode($params);
-
-			foreach ($structure->parts as $part) {
-				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {
-					$this->debug('Have root part of type ' . $part->headers['content-type']);
-					$root = $part->body;
-					$return = parent::parseResponse($part->headers, $part->body);
-				} else {
-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);
-					$info['data'] = $part->body;
-					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';
-					$info['contenttype'] = $part->headers['content-type'];
-					$info['cid'] = $part->headers['content-id'];
-					$this->responseAttachments[] = $info;
-				}
-			}
-
-			if (isset($return)) {
-				$this->responseData = $root;
-				return $return;
-			}
-
-			$this->setError('No root part found in multipart/related content');
-			return '';
-		}
-		$this->debug('Not multipart/related');
-		return parent::parseResponse($headers, $data);
-	}
+        $this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
+        $this->responseAttachments = array();
+        if (strstr($headers['content-type'], 'multipart/related')) {
+            $this->debug('Decode multipart/related');
+            $input = '';
+            foreach ($headers as $k => $v) {
+                $input .= "$k: $v\r\n";
+            }
+            $params['input'] = $input . "\r\n" . $data;
+            $params['include_bodies'] = true;
+            $params['decode_bodies'] = true;
+            $params['decode_headers'] = true;
+
+            $structure = Mail_mimeDecode::decode($params);
+
+            foreach ($structure->parts as $part) {
+                if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {
+                    $this->debug('Have root part of type ' . $part->headers['content-type']);
+                    $root = $part->body;
+                    $return = parent::parseResponse($part->headers, $part->body);
+                } else {
+                    $this->debug('Have an attachment of type ' . $part->headers['content-type']);
+                    $info['data'] = $part->body;
+                    $info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';
+                    $info['contenttype'] = $part->headers['content-type'];
+                    $info['cid'] = $part->headers['content-id'];
+                    $this->responseAttachments[] = $info;
+                }
+            }
+
+            if (isset($return)) {
+                $this->responseData = $root;
+                return $return;
+            }
+
+            $this->setError('No root part found in multipart/related content');
+            return '';
+        }
+        $this->debug('Not multipart/related');
+        return parent::parseResponse($headers, $data);
+    }
 }
 
 /*
  *	For backwards compatiblity, define soapclientmime unless the PHP SOAP extension is loaded.
  */
 if (!extension_loaded('soap')) {
-	class soapclientmime extends nusoap_client_mime {
-	}
+    class soapclientmime extends nusoap_client_mime {
+    }
 }
 
 /**
@@ -282,214 +282,214 @@  discard block
 block discarded – undo
 * @access   public
 */
 class nusoap_server_mime extends nusoap_server {
-	/**
-	 * @var array Each array element in the return is an associative array with keys
-	 * data, filename, contenttype, cid
-	 * @access private
-	 */
-	var $requestAttachments = array();
-	/**
-	 * @var array Each array element in the return is an associative array with keys
-	 * data, filename, contenttype, cid
-	 * @access private
-	 */
-	var $responseAttachments;
-	/**
-	 * @var string
-	 * @access private
-	 */
-	var $mimeContentType;
-
-	/**
-	* adds a MIME attachment to the current response.
-	*
-	* If the $data parameter contains an empty string, this method will read
-	* the contents of the file named by the $filename parameter.
-	*
-	* If the $cid parameter is false, this method will generate the cid.
-	*
-	* @param string $data The data of the attachment
-	* @param string $filename The filename of the attachment (default is empty string)
-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
-	* @param string $cid The content-id (cid) of the attachment (default is false)
-	* @return string The content-id (cid) of the attachment
-	* @access public
-	*/
-	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
-		if (! $cid) {
-			$cid = md5(uniqid(time()));
-		}
-
-		$info['data'] = $data;
-		$info['filename'] = $filename;
-		$info['contenttype'] = $contenttype;
-		$info['cid'] = $cid;
-
-		$this->responseAttachments[] = $info;
-
-		return $cid;
-	}
-
-	/**
-	* clears the MIME attachments for the current response.
-	*
-	* @access public
-	*/
-	function clearAttachments() {
-		$this->responseAttachments = array();
-	}
-
-	/**
-	* gets the MIME attachments from the current request.
-	*
-	* Each array element in the return is an associative array with keys
-	* data, filename, contenttype, cid.  These keys correspond to the parameters
-	* for addAttachment.
-	*
-	* @return array The attachments.
-	* @access public
-	*/
-	function getAttachments() {
-		return $this->requestAttachments;
-	}
-
-	/**
-	* gets the HTTP body for the current response.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
-	function getHTTPBody($soapmsg) {
-		if (count($this->responseAttachments) > 0) {
-			$params['content_type'] = 'multipart/related; type="text/xml"';
-			$mimeMessage = new Mail_mimePart('', $params);
-			unset($params);
-
-			$params['content_type'] = 'text/xml';
-			$params['encoding']     = '8bit';
-			$params['charset']      = $this->soap_defencoding;
-			$mimeMessage->addSubpart($soapmsg, $params);
-
-			foreach ($this->responseAttachments as $att) {
-				unset($params);
-
-				$params['content_type'] = $att['contenttype'];
-				$params['encoding']     = 'base64';
-				$params['disposition']  = 'attachment';
-				$params['dfilename']    = $att['filename'];
-				$params['cid']          = $att['cid'];
-
-				if ($att['data'] == '' && $att['filename'] <> '') {
-					if ($fd = fopen($att['filename'], 'rb')) {
-						$data = fread($fd, filesize($att['filename']));
-						fclose($fd);
-					} else {
-						$data = '';
-					}
-					$mimeMessage->addSubpart($data, $params);
-				} else {
-					$mimeMessage->addSubpart($att['data'], $params);
-				}
-			}
-
-			$output = $mimeMessage->encode();
-			$mimeHeaders = $output['headers'];
-
-			foreach ($mimeHeaders as $k => $v) {
-				$this->debug("MIME header $k: $v");
-				if (strtolower($k) == 'content-type') {
-					// PHP header() seems to strip leading whitespace starting
-					// the second line, so force everything to one line
-					$this->mimeContentType = str_replace("\r\n", " ", $v);
-				}
-			}
-
-			return $output['body'];
-		}
-
-		return parent::getHTTPBody($soapmsg);
-	}
-
-	/**
-	* gets the HTTP content type for the current response.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current response.
-	* @access private
-	*/
-	function getHTTPContentType() {
-		if (count($this->responseAttachments) > 0) {
-			return $this->mimeContentType;
-		}
-		return parent::getHTTPContentType();
-	}
-
-	/**
-	* gets the HTTP content type charset for the current response.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current response.
-	* @access private
-	*/
-	function getHTTPContentTypeCharset() {
-		if (count($this->responseAttachments) > 0) {
-			return false;
-		}
-		return parent::getHTTPContentTypeCharset();
-	}
-
-	/**
-	* processes SOAP message received from client
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed request data from client
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
+    /**
+     * @var array Each array element in the return is an associative array with keys
+     * data, filename, contenttype, cid
+     * @access private
+     */
+    var $requestAttachments = array();
+    /**
+     * @var array Each array element in the return is an associative array with keys
+     * data, filename, contenttype, cid
+     * @access private
+     */
+    var $responseAttachments;
+    /**
+     * @var string
+     * @access private
+     */
+    var $mimeContentType;
+
+    /**
+     * adds a MIME attachment to the current response.
+     *
+     * If the $data parameter contains an empty string, this method will read
+     * the contents of the file named by the $filename parameter.
+     *
+     * If the $cid parameter is false, this method will generate the cid.
+     *
+     * @param string $data The data of the attachment
+     * @param string $filename The filename of the attachment (default is empty string)
+     * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
+     * @param string $cid The content-id (cid) of the attachment (default is false)
+     * @return string The content-id (cid) of the attachment
+     * @access public
+     */
+    function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
+        if (! $cid) {
+            $cid = md5(uniqid(time()));
+        }
+
+        $info['data'] = $data;
+        $info['filename'] = $filename;
+        $info['contenttype'] = $contenttype;
+        $info['cid'] = $cid;
+
+        $this->responseAttachments[] = $info;
+
+        return $cid;
+    }
+
+    /**
+     * clears the MIME attachments for the current response.
+     *
+     * @access public
+     */
+    function clearAttachments() {
+        $this->responseAttachments = array();
+    }
+
+    /**
+     * gets the MIME attachments from the current request.
+     *
+     * Each array element in the return is an associative array with keys
+     * data, filename, contenttype, cid.  These keys correspond to the parameters
+     * for addAttachment.
+     *
+     * @return array The attachments.
+     * @access public
+     */
+    function getAttachments() {
+        return $this->requestAttachments;
+    }
+
+    /**
+     * gets the HTTP body for the current response.
+     *
+     * @param string $soapmsg The SOAP payload
+     * @return string The HTTP body, which includes the SOAP payload
+     * @access private
+     */
+    function getHTTPBody($soapmsg) {
+        if (count($this->responseAttachments) > 0) {
+            $params['content_type'] = 'multipart/related; type="text/xml"';
+            $mimeMessage = new Mail_mimePart('', $params);
+            unset($params);
+
+            $params['content_type'] = 'text/xml';
+            $params['encoding']     = '8bit';
+            $params['charset']      = $this->soap_defencoding;
+            $mimeMessage->addSubpart($soapmsg, $params);
+
+            foreach ($this->responseAttachments as $att) {
+                unset($params);
+
+                $params['content_type'] = $att['contenttype'];
+                $params['encoding']     = 'base64';
+                $params['disposition']  = 'attachment';
+                $params['dfilename']    = $att['filename'];
+                $params['cid']          = $att['cid'];
+
+                if ($att['data'] == '' && $att['filename'] <> '') {
+                    if ($fd = fopen($att['filename'], 'rb')) {
+                        $data = fread($fd, filesize($att['filename']));
+                        fclose($fd);
+                    } else {
+                        $data = '';
+                    }
+                    $mimeMessage->addSubpart($data, $params);
+                } else {
+                    $mimeMessage->addSubpart($att['data'], $params);
+                }
+            }
+
+            $output = $mimeMessage->encode();
+            $mimeHeaders = $output['headers'];
+
+            foreach ($mimeHeaders as $k => $v) {
+                $this->debug("MIME header $k: $v");
+                if (strtolower($k) == 'content-type') {
+                    // PHP header() seems to strip leading whitespace starting
+                    // the second line, so force everything to one line
+                    $this->mimeContentType = str_replace("\r\n", " ", $v);
+                }
+            }
+
+            return $output['body'];
+        }
+
+        return parent::getHTTPBody($soapmsg);
+    }
+
+    /**
+     * gets the HTTP content type for the current response.
+     *
+     * Note: getHTTPBody must be called before this.
+     *
+     * @return string the HTTP content type for the current response.
+     * @access private
+     */
+    function getHTTPContentType() {
+        if (count($this->responseAttachments) > 0) {
+            return $this->mimeContentType;
+        }
+        return parent::getHTTPContentType();
+    }
+
+    /**
+     * gets the HTTP content type charset for the current response.
+     * returns false for non-text content types.
+     *
+     * Note: getHTTPBody must be called before this.
+     *
+     * @return string the HTTP content type charset for the current response.
+     * @access private
+     */
+    function getHTTPContentTypeCharset() {
+        if (count($this->responseAttachments) > 0) {
+            return false;
+        }
+        return parent::getHTTPContentTypeCharset();
+    }
+
+    /**
+     * processes SOAP message received from client
+     *
+     * @param	array	$headers	The HTTP headers
+     * @param	string	$data		unprocessed request data from client
+     * @return	mixed	value of the message, decoded into a PHP type
+     * @access   private
+     */
     function parseRequest($headers, $data) {
-		$this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
-		$this->requestAttachments = array();
-		if (strstr($headers['content-type'], 'multipart/related')) {
-			$this->debug('Decode multipart/related');
-			$input = '';
-			foreach ($headers as $k => $v) {
-				$input .= "$k: $v\r\n";
-			}
-			$params['input'] = $input . "\r\n" . $data;
-			$params['include_bodies'] = true;
-			$params['decode_bodies'] = true;
-			$params['decode_headers'] = true;
-
-			$structure = Mail_mimeDecode::decode($params);
-
-			foreach ($structure->parts as $part) {
-				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {
-					$this->debug('Have root part of type ' . $part->headers['content-type']);
-					$return = parent::parseRequest($part->headers, $part->body);
-				} else {
-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);
-					$info['data'] = $part->body;
-					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';
-					$info['contenttype'] = $part->headers['content-type'];
-					$info['cid'] = $part->headers['content-id'];
-					$this->requestAttachments[] = $info;
-				}
-			}
-
-			if (isset($return)) {
-				return $return;
-			}
-
-			$this->setError('No root part found in multipart/related content');
-			return;
-		}
-		$this->debug('Not multipart/related');
-		return parent::parseRequest($headers, $data);
-	}
+        $this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
+        $this->requestAttachments = array();
+        if (strstr($headers['content-type'], 'multipart/related')) {
+            $this->debug('Decode multipart/related');
+            $input = '';
+            foreach ($headers as $k => $v) {
+                $input .= "$k: $v\r\n";
+            }
+            $params['input'] = $input . "\r\n" . $data;
+            $params['include_bodies'] = true;
+            $params['decode_bodies'] = true;
+            $params['decode_headers'] = true;
+
+            $structure = Mail_mimeDecode::decode($params);
+
+            foreach ($structure->parts as $part) {
+                if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {
+                    $this->debug('Have root part of type ' . $part->headers['content-type']);
+                    $return = parent::parseRequest($part->headers, $part->body);
+                } else {
+                    $this->debug('Have an attachment of type ' . $part->headers['content-type']);
+                    $info['data'] = $part->body;
+                    $info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';
+                    $info['contenttype'] = $part->headers['content-type'];
+                    $info['cid'] = $part->headers['content-id'];
+                    $this->requestAttachments[] = $info;
+                }
+            }
+
+            if (isset($return)) {
+                return $return;
+            }
+
+            $this->setError('No root part found in multipart/related content');
+            return;
+        }
+        $this->debug('Not multipart/related');
+        return parent::parseRequest($headers, $data);
+    }
 }
 
 /*

Please login to merge, or discard this patch.

main/session/index.php 1 patch

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

@@ -282,7 +282,7 @@  discard block
 block discarded – undo
                             if ($exercise_info->start_time != '0000-00-00 00:00:00') {
                                 $allowed_time = api_strtotime($exercise_info->start_time, 'UTC');
                                 if ($now < $allowed_time) {
-                                      continue;
+                                        continue;
                                 }
                             }
                             $exercise_info->exercise = Display::url(
@@ -512,11 +512,11 @@  discard block
 block discarded – undo
 		window.location.href=ui.tab;
     });
 <?php
-     //Displays js code to use a jqgrid
-     echo Display::grid_js('courses',       '',             $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
-     echo Display::grid_js('list_default',  $url,           $columns,         $column_model,$extra_params,array(), '');
-     echo Display::grid_js('list_course',   $url_by_course, $columns,         $column_model,$extra_params_course,array(),'');
-     echo Display::grid_js('list_week',     $url_week,      $column_week,     $column_week_model, $extra_params_week,array(),'');
+        //Displays js code to use a jqgrid
+        echo Display::grid_js('courses',       '',             $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
+        echo Display::grid_js('list_default',  $url,           $columns,         $column_model,$extra_params,array(), '');
+        echo Display::grid_js('list_course',   $url_by_course, $columns,         $column_model,$extra_params_course,array(),'');
+        echo Display::grid_js('list_week',     $url_week,      $column_week,     $column_week_model, $extra_params_week,array(),'');
 
     if (!api_is_anonymous()) {
         echo Display::grid_js('exercises', '', $column_exercise, $column_exercise_model, $extra_params_exercise, $my_real_array);

Please login to merge, or discard this patch.

plugin/ims_lti/OAuthSimple.php 1 patch

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

@@ -18,24 +18,24 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * 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 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * 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 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * 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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * 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 @@  discard block
 block discarded – undo
      * 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 @@  discard block
 block discarded – undo
     }
 
     /**
-	 * 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 @@  discard block
 block discarded – undo
         {
             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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
 
     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 @@  discard block
 block discarded – undo
                 }
             // 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 @@  discard block
 block discarded – undo
                 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();
+        }
+    }
 }

Please login to merge, or discard this patch.

main/dropbox/index.php 1 patch

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

@@ -7,12 +7,12 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 
 // 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 @@  discard block
 block discarded – undo
 }
 
 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 @@  discard block
 block discarded – undo
     );
 }
 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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
     </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 @@  discard block
 block discarded – undo
                     }
                 }
 
-				$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 @@  discard block
 block discarded – undo
                     $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 @@  discard block
 block discarded – undo
             '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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
             }
         }
 
-		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 @@  discard block
 block discarded – undo
             $selectlist
         );
         echo '</div>';
-	}
+    }
 }
 
 Display::display_footer();

Please login to merge, or discard this patch.

main/dropbox/dropbox_class.inc.php 1 patch

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

@@ -76,20 +76,20 @@  discard block
 block discarded – undo
         }
     }
 
-	/**
-	 * 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 @@  discard block
 block discarded – undo
         // 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 @@  discard block
 block discarded – undo
                 $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 @@  discard block
 block discarded – undo
                 '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 @@  discard block
 block discarded – undo
                     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 @@  discard block
 block discarded – undo
             }
             $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 @@  discard block
 block discarded – undo
             $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
                 }
             }
 
-			// 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 @@  discard block
 block discarded – undo
                 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 @@  discard block
 block discarded – undo
                      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 @@  discard block
 block discarded – undo
                     $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 @@  discard block
 block discarded – undo
             ]
         );
 
-		// 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 @@  discard block
 block discarded – undo
             $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;
+    }
 }

Please login to merge, or discard this patch.

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

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

@@ -10,46 +10,46 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
                 ) 
                 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 @@  discard block
 block discarded – undo
         }
 
         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 @@  discard block
 block discarded – undo
                     '.$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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
                 }
                 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);
+        }
+    }
 }

Please login to merge, or discard this patch.

main/exercise/Hpdownload.php 1 patch

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

@@ -23,14 +23,14 @@  discard block
 block discarded – undo
 //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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 */
 
 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 @@  discard block
 block discarded – undo
 "// 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

Please login to merge, or discard this patch.

main/webservices/cm_webservice.php 1 patch

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

@@ -82,12 +82,12 @@  discard block
 block discarded – undo
  */
 interface WSCMErrorHandler
 {
-	/**
-	 * Handle method
-	 *
-	 * @param WSError Error
-	 */
-	public function handle($error);
+    /**
+     * Handle method
+     *
+     * @param WSError Error
+     */
+    public function handle($error);
 }
 
 /**
@@ -95,57 +95,57 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
             }
         }
         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 @@  discard block
 block discarded – undo
         }
     }
 
-	/**
-	 * 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 @@  discard block
 block discarded – undo
                 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);
+    }
 }
 

Please login to merge, or discard this patch.

main/webservices/cm_webservice_user.php 1 patch

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

@@ -13,21 +13,21 @@  discard block
 block discarded – undo
 
     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 @@  discard block
 block discarded – undo
     {
         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 @@  discard block
 block discarded – undo
 
 
     /**
-    * 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);

Please login to merge, or discard this patch.

		@@ -282,7 +282,7 @@ discard block
		block discarded – undo
282	282	if ($exercise_info->start_time != '0000-00-00 00:00:00') {
283	283	$allowed_time = api_strtotime($exercise_info->start_time, 'UTC');
284	284	if ($now < $allowed_time) {
285		- continue;
	285	+ continue;
286	286	}
287	287	}
288	288	$exercise_info->exercise = Display::url(
		@@ -512,11 +512,11 @@ discard block
		block discarded – undo
512	512	window.location.href=ui.tab;
513	513	});
514	514	<?php
515		- //Displays js code to use a jqgrid
516		- echo Display::grid_js('courses', '', $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
517		- echo Display::grid_js('list_default', $url, $columns, $column_model,$extra_params,array(), '');
518		- echo Display::grid_js('list_course', $url_by_course, $columns, $column_model,$extra_params_course,array(),'');
519		- echo Display::grid_js('list_week', $url_week, $column_week, $column_week_model, $extra_params_week,array(),'');
	515	+ //Displays js code to use a jqgrid
	516	+ echo Display::grid_js('courses', '', $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
	517	+ echo Display::grid_js('list_default', $url, $columns, $column_model,$extra_params,array(), '');
	518	+ echo Display::grid_js('list_course', $url_by_course, $columns, $column_model,$extra_params_course,array(),'');
	519	+ echo Display::grid_js('list_week', $url_week, $column_week, $column_week_model, $extra_params_week,array(),'');
520	520
521	521	if (!api_is_anonymous()) {
522	522	echo Display::grid_js('exercises', '', $column_exercise, $column_exercise_model, $extra_params_exercise, $my_real_array);

		@@ -18,24 +18,24 @@ discard block
		block discarded – undo
18	18	private $_nonce_chars;
19	19
20	20	/**
21		- * Constructor
	21	+ * Constructor
22	22	*
23		- * @access public
	23	+ * @access public
24	24	* @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.
25	25	* @param shared_secret (String) The shared secret. This value is also usually provided by the site you wish to use.
26		- * @return OAuthSimple (Object)
	26	+ * @return OAuthSimple (Object)
27	27	*/
28	28	function __construct ($APIKey = "", $sharedSecret=""){
29	29
30	30	if (!empty($APIKey))
31		- {
32		- $this->_secrets['consumer_key'] = $APIKey;
33		- }
	31	+ {
	32	+ $this->_secrets['consumer_key'] = $APIKey;
	33	+ }
34	34
35	35	if (!empty($sharedSecret))
36		- {
37		- $this->_secrets['shared_secret'] = $sharedSecret;
38		- }
	36	+ {
	37	+ $this->_secrets['shared_secret'] = $sharedSecret;
	38	+ }
39	39
40	40	$this->_default_signature_method = "HMAC-SHA1";
41	41	$this->_action = "GET";
		@@ -45,11 +45,11 @@ discard block
		block discarded – undo
45	45	}
46	46
47	47	/**
48		- * Reset the parameters and URL
49		- *
50		- * @access public
51		- * @return OAuthSimple (Object)
52		- */
	48	+ * Reset the parameters and URL
	49	+ *
	50	+ * @access public
	51	+ * @return OAuthSimple (Object)
	52	+ */
53	53	public function reset() {
54	54	$this->_parameters = Array();
55	55	$this->path = NULL;
		@@ -59,87 +59,87 @@ discard block
		block discarded – undo
59	59	}
60	60
61	61	/**
62		- * Set the parameters either from a hash or a string
63		- *
64		- * @access public
65		- * @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)
66		- * @return OAuthSimple (Object)
67		- */
	62	+ * Set the parameters either from a hash or a string
	63	+ *
	64	+ * @access public
	65	+ * @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)
	66	+ * @return OAuthSimple (Object)
	67	+ */
68	68	public function setParameters ($parameters=Array()) {
69	69
70	70	if (is_string($parameters))
71		- {
72		- $parameters = $this->_parseParameterString($parameters);
73		- }
	71	+ {
	72	+ $parameters = $this->_parseParameterString($parameters);
	73	+ }
74	74	if (empty($this->_parameters))
75		- {
76		- $this->_parameters = $parameters;
77		- }
	75	+ {
	76	+ $this->_parameters = $parameters;
	77	+ }
78	78	else if (!empty($parameters))
79		- {
80		- $this->_parameters = array_merge($this->_parameters,$parameters);
81		- }
	79	+ {
	80	+ $this->_parameters = array_merge($this->_parameters,$parameters);
	81	+ }
82	82	if (empty($this->_parameters['oauth_nonce']))
83		- {
84		- $this->_getNonce();
85		- }
	83	+ {
	84	+ $this->_getNonce();
	85	+ }
86	86	if (empty($this->_parameters['oauth_timestamp']))
87		- {
88		- $this->_getTimeStamp();
89		- }
	87	+ {
	88	+ $this->_getTimeStamp();
	89	+ }
90	90	if (empty($this->_parameters['oauth_consumer_key']))
91		- {
92		- $this->_getApiKey();
93		- }
	91	+ {
	92	+ $this->_getApiKey();
	93	+ }
94	94	if (empty($this->_parameters['oauth_token']))
95		- {
96		- $this->_getAccessToken();
97		- }
	95	+ {
	96	+ $this->_getAccessToken();
	97	+ }
98	98	if (empty($this->_parameters['oauth_signature_method']))
99		- {
	99	+ {
100	100	$this->setSignatureMethod();
101		- }
	101	+ }
102	102	if (empty($this->_parameters['oauth_version']))
103		- {
	103	+ {
104	104	$this->_parameters['oauth_version']="1.0";
105		- }
	105	+ }
106	106
107	107	return $this;
108	108	}
109	109
110	110	/**
111		- * Convenience method for setParameters
112		- *
113		- * @access public
114		- * @see setParameters
115		- */
	111	+ * Convenience method for setParameters
	112	+ *
	113	+ * @access public
	114	+ * @see setParameters
	115	+ */
116	116	public function setQueryString ($parameters)
117	117	{
118	118	return $this->setParameters($parameters);
119	119	}
120	120
121	121	/**
122		- * Set the target URL (does not include the parameters)
123		- *
	122	+ * Set the target URL (does not include the parameters)
	123	+ *
124	124	* @param path (String) the fully qualified URI (excluding query arguments) (e.g "http://example.org/foo")
125		- * @return OAuthSimple (Object)
	125	+ * @return OAuthSimple (Object)
126	126	*/
127	127	public function setURL ($path)
128		- {
	128	+ {
129	129	if (empty($path))
130		- {
	130	+ {
131	131	throw new OAuthSimpleException('No path specified for OAuthSimple.setURL');
132		- }
	132	+ }
133	133	$this->_path=$path;
134	134
135	135	return $this;
136	136	}
137	137
138	138	/**
139		- * Convenience method for setURL
	139	+ * Convenience method for setURL
140	140	*
141	141	* @param path (String)
142		- * @see setURL
	142	+ * @see setURL
143	143	*/
144	144	public function setPath ($path)
145	145	{
		@@ -147,39 +147,39 @@ discard block
		block discarded – undo
147	147	}
148	148
149	149	/**
150		- * Set the "action" for the url, (e.g. GET,POST, DELETE, etc.)
	150	+ * Set the "action" for the url, (e.g. GET,POST, DELETE, etc.)
151	151	*
152	152	* @param action (String) HTTP Action word.
153		- * @return OAuthSimple (Object)
	153	+ * @return OAuthSimple (Object)
154	154	*/
155	155	public function setAction ($action)
156	156	{
157	157	if (empty($action))
158		- {
159		- $action = 'GET';
160		- }
	158	+ {
	159	+ $action = 'GET';
	160	+ }
161	161	$action = strtoupper($action);
162	162	if (preg_match('/[^A-Z]/',$action))
163		- {
	163	+ {
164	164	throw new OAuthSimpleException('Invalid action specified for OAuthSimple.setAction');
165		- }
	165	+ }
166	166	$this->_action = $action;
167	167
168	168	return $this;
169	169	}
170	170
171	171	/**
172		- * Set the signatures (as well as validate the ones you have)
	172	+ * Set the signatures (as well as validate the ones you have)
173	173	*
174	174	* @param signatures (object) object/hash of the token/signature pairs {api_key:, shared_secret:, oauth_token: oauth_secret:}
175		- * @return OAuthSimple (Object)
	175	+ * @return OAuthSimple (Object)
176	176	*/
177	177	public function signatures ($signatures)
178	178	{
179	179	if (!empty($signatures) && !is_array($signatures))
180		- {
	180	+ {
181	181	throw new OAuthSimpleException('Must pass dictionary array to OAuthSimple.signatures');
182		- }
	182	+ }
183	183	if (!empty($signatures))
184	184	{
185	185	if (empty($this->_secrets))
		@@ -189,33 +189,33 @@ discard block
		block discarded – undo
189	189	$this->_secrets=array_merge($this->_secrets,$signatures);
190	190	}
191	191	if (isset($this->_secrets['api_key']))
192		- {
	192	+ {
193	193	$this->_secrets['consumer_key'] = $this->_secrets['api_key'];
194		- }
	194	+ }
195	195	if (isset($this->_secrets['access_token']))
196		- {
	196	+ {
197	197	$this->_secrets['oauth_token'] = $this->_secrets['access_token'];
198		- }
	198	+ }
199	199	if (isset($this->_secrets['access_secret']))
200		- {
	200	+ {
201	201	$this->_secrets['shared_secret'] = $this->_secrets['access_secret'];
202	202	}
203	203	if (isset($this->_secrets['oauth_token_secret']))
204		- {
	204	+ {
205	205	$this->_secrets['oauth_secret'] = $this->_secrets['oauth_token_secret'];
206		- }
	206	+ }
207	207	if (empty($this->_secrets['consumer_key']))
208		- {
	208	+ {
209	209	throw new OAuthSimpleException('Missing required consumer_key in OAuthSimple.signatures');
210	210	}
211	211	if (empty($this->_secrets['shared_secret']))
212		- {
	212	+ {
213	213	throw new OAuthSimpleException('Missing requires shared_secret in OAuthSimple.signatures');
214		- }
	214	+ }
215	215	if (!empty($this->_secrets['oauth_token']) && empty($this->_secrets['oauth_secret']))
216		- {
	216	+ {
217	217	throw new OAuthSimpleException('Missing oauth_secret for supplied oauth_token in OAuthSimple.signatures');
218		- }
	218	+ }
219	219
220	220	return $this;
221	221	}
		@@ -226,30 +226,30 @@ discard block
		block discarded – undo
226	226	}
227	227
228	228	/**
229		- * Set the signature method (currently only Plaintext or SHA-MAC1)
	229	+ * Set the signature method (currently only Plaintext or SHA-MAC1)
230	230	*
231	231	* @param method (String) Method of signing the transaction (only PLAINTEXT and SHA-MAC1 allowed for now)
232		- * @return OAuthSimple (Object)
233		- */
	232	+ * @return OAuthSimple (Object)
	233	+ */
234	234	public function setSignatureMethod ($method="")
235		- {
	235	+ {
236	236	if (empty($method))
237		- {
	237	+ {
238	238	$method = $this->_default_signature_method;
239		- }
	239	+ }
240	240	$method = strtoupper($method);
241	241	switch($method)
242	242	{
243	243	case 'PLAINTEXT':
244	244	case 'HMAC-SHA1':
245	245	$this->_parameters['oauth_signature_method']=$method;
246		- break;
	246	+ break;
247	247	default:
248	248	throw new OAuthSimpleException ("Unknown signing method $method specified for OAuthSimple.setSignatureMethod");
249		- break;
	249	+ break;
250	250	}
251	251
252		- return $this;
	252	+ return $this;
253	253	}
254	254
255	255	/** sign the request
		@@ -258,30 +258,30 @@ discard block
		block discarded – undo
258	258	* other helper functions.
259	259	*
260	260	* @param args (Array) hash of arguments for the call {action, path, parameters (array), method, signatures (array)} all arguments are optional.
261		- * @return (Array) signed values
	261	+ * @return (Array) signed values
262	262	*/
263	263	public function sign($args=array())
264	264	{
265	265	if (!empty($args['action']))
266		- {
	266	+ {
267	267	$this->setAction($args['action']);
268		- }
	268	+ }
269	269	if (!empty($args['path']))
270		- {
	270	+ {
271	271	$this->setPath($args['path']);
272	272	}
273	273	if (!empty($args['method']))
274		- {
	274	+ {
275	275	$this->setSignatureMethod($args['method']);
276		- }
	276	+ }
277	277	if (!empty($args['signatures']))
278		- {
	278	+ {
279	279	$this->signatures($args['signatures']);
280		- }
	280	+ }
281	281	if (empty($args['parameters']))
282		- {
	282	+ {
283	283	$args['parameters']=array();
284		- }
	284	+ }
285	285	$this->setParameters($args['parameters']);
286	286	$normParams = $this->_normalizedParameters();
287	287
		@@ -295,29 +295,29 @@ discard block
		block discarded – undo
295	295	}
296	296
297	297	/**
298		- * Return a formatted "header" string
	298	+ * Return a formatted "header" string
299	299	*
300	300	* NOTE: This doesn't set the "Authorization: " prefix, which is required.
301	301	* It's not set because various set header functions prefer different
302	302	* ways to do that.
303	303	*
304	304	* @param args (Array)
305		- * @return $result (String)
306		- */
	305	+ * @return $result (String)
	306	+ */
307	307	public function getHeaderString ($args=array())
308	308	{
309	309	if (empty($this->_parameters['oauth_signature']))
310		- {
	310	+ {
311	311	$this->sign($args);
312		- }
	312	+ }
313	313	$result = 'OAuth ';
314	314
315	315	foreach ($this->_parameters as $pName => $pValue)
316	316	{
317	317	if (strpos($pName,'oauth_') !== 0)
318		- {
	318	+ {
319	319	continue;
320		- }
	320	+ }
321	321	if (is_array($pValue))
322	322	{
323	323	foreach ($pValue as $val)
		@@ -342,19 +342,19 @@ discard block
		block discarded – undo
342	342	{
343	343	list ($key,$token) = explode('=',$element);
344	344	if ($token)
345		- {
	345	+ {
346	346	$token = urldecode($token);
347		- }
	347	+ }
348	348	if (!empty($result[$key]))
349	349	{
350	350	if (!is_array($result[$key]))
351		- {
	351	+ {
352	352	$result[$key] = array($result[$key],$token);
353		- }
	353	+ }
354	354	else
355		- {
	355	+ {
356	356	array_push($result[$key],$token);
357		- }
	357	+ }
358	358	}
359	359	else
360	360	$result[$key]=$token;
		@@ -366,14 +366,14 @@ discard block
		block discarded – undo
366	366	private static function _oauthEscape($string)
367	367	{
368	368	if ($string === 0) { return 0; }
369		- if ($string == '0') { return '0'; }
	369	+ if ($string == '0') { return '0'; }
370	370	if (strlen($string) == 0) { return ''; }
371	371	if (is_array($string)) {
372	372	throw new OAuthSimpleException('Array passed to _oauthEscape');
373		- }
	373	+ }
374	374	$string = urlencode($string);
375	375
376		- //FIX: urlencode of ~ and '+'
	376	+ //FIX: urlencode of ~ and '+'
377	377	$string = str_replace(
378	378	Array('%7E','+' ), // Replace these
379	379	Array('~', '%20'), // with these
		@@ -410,13 +410,13 @@ discard block
		block discarded – undo
410	410	private function _getAccessToken()
411	411	{
412	412	if (!isset($this->_secrets['oauth_secret']))
413		- {
	413	+ {
414	414	return '';
415		- }
	415	+ }
416	416	if (!isset($this->_secrets['oauth_token']))
417		- {
	417	+ {
418	418	throw new OAuthSimpleException('No access token (oauth_token) set for OAuthSimple.');
419		- }
	419	+ }
420	420	$this->_parameters['oauth_token'] = $this->_secrets['oauth_token'];
421	421
422	422	return $this->_parameters['oauth_token'];
		@@ -429,8 +429,8 @@ discard block
		block discarded – undo
429	429
430	430	private function _normalizedParameters()
431	431	{
432		- $normalized_keys = array();
433		- $return_array = array();
	432	+ $normalized_keys = array();
	433	+ $return_array = array();
434	434
435	435	foreach ( $this->_parameters as $paramName=>$paramValue) {
436	436	if (preg_match('/w+_secret/', $paramName) OR
		@@ -439,59 +439,59 @@ discard block
		block discarded – undo
439	439	}
440	440	// Read parameters from a file. Hope you're practicing safe PHP.
441	441	//if (strpos($paramValue, '@') !== 0 && !file_exists(substr($paramValue, 1)))
442		- //{
443		- if (is_array($paramValue))
444		- {
445		- $normalized_keys[self::_oauthEscape($paramName)] = array();
446		- foreach($paramValue as $item)
447		- {
448		- array_push($normalized_keys[self::_oauthEscape($paramName)], self::_oauthEscape($item));
449		- }
450		- }
451		- else
452		- {
453		- $normalized_keys[self::_oauthEscape($paramName)] = self::_oauthEscape($paramValue);
454		- }
455		- //}
456		- }
457		-
458		- ksort($normalized_keys);
459		-
460		- foreach($normalized_keys as $key=>$val)
461		- {
462		- if (is_array($val))
463		- {
464		- sort($val);
465		- foreach($val as $element)
466		- {
467		- array_push($return_array, $key . "=" . $element);
468		- }
469		- }
470		- else
471		- {
472		- array_push($return_array, $key .'='. $val);
473		- }
	442	+ //{
	443	+ if (is_array($paramValue))
	444	+ {
	445	+ $normalized_keys[self::_oauthEscape($paramName)] = array();
	446	+ foreach($paramValue as $item)
	447	+ {
	448	+ array_push($normalized_keys[self::_oauthEscape($paramName)], self::_oauthEscape($item));
	449	+ }
	450	+ }
	451	+ else
	452	+ {
	453	+ $normalized_keys[self::_oauthEscape($paramName)] = self::_oauthEscape($paramValue);
	454	+ }
	455	+ //}
	456	+ }
	457	+
	458	+ ksort($normalized_keys);
	459	+
	460	+ foreach($normalized_keys as $key=>$val)
	461	+ {
	462	+ if (is_array($val))
	463	+ {
	464	+ sort($val);
	465	+ foreach($val as $element)
	466	+ {
	467	+ array_push($return_array, $key . "=" . $element);
	468	+ }
	469	+ }
	470	+ else
	471	+ {
	472	+ array_push($return_array, $key .'='. $val);
	473	+ }
474	474
475	475	}
476	476	$presig = join("&", $return_array);
477	477	$sig = $this->_generateSignature($presig);
478	478	$this->_parameters['oauth_signature']=$sig;
479	479	array_push($return_array, "oauth_signature=$sig");
480		- return join("&", $return_array);
	480	+ return join("&", $return_array);
481	481	}
482	482
483	483
484	484	private function _generateSignature ($parameters="")
485	485	{
486	486	$secretKey = '';
487		- if(isset($this->_secrets['shared_secret']))
488		- {
489		- $secretKey = self::_oauthEscape($this->_secrets['shared_secret']);
490		- }
491		-
492		- $secretKey .= '&';
493		- if(isset($this->_secrets['oauth_secret']))
494		- {
	487	+ if(isset($this->_secrets['shared_secret']))
	488	+ {
	489	+ $secretKey = self::_oauthEscape($this->_secrets['shared_secret']);
	490	+ }
	491	+
	492	+ $secretKey .= '&';
	493	+ if(isset($this->_secrets['oauth_secret']))
	494	+ {
495	495	$secretKey .= self::_oauthEscape($this->_secrets['oauth_secret']);
496	496	}
497	497	if(!empty($parameters)){
		@@ -507,33 +507,33 @@ discard block
		block discarded – undo
507	507	return base64_encode(hash_hmac('sha1',$this->sbs,$secretKey,TRUE));
508	508	default:
509	509	throw new OAuthSimpleException('Unknown signature method for OAuthSimple');
510		- break;
	510	+ break;
511	511	}
512	512	}
513	513	}
514	514
515	515	class OAuthSimpleException extends Exception {
516	516
517		- public function __construct($err, $isDebug = FALSE)
518		- {
519		- self::log_error($err);
520		- if ($isDebug)
521		- {
522		- self::display_error($err, TRUE);
523		- }
524		- }
525		-
526		- public static function log_error($err)
527		- {
528		- error_log($err, 0);
529		- }
530		-
531		- public static function display_error($err, $kill = FALSE)
532		- {
533		- print_r($err);
534		- if ($kill === FALSE)
535		- {
536		- die();
537		- }
538		- }
	517	+ public function __construct($err, $isDebug = FALSE)
	518	+ {
	519	+ self::log_error($err);
	520	+ if ($isDebug)
	521	+ {
	522	+ self::display_error($err, TRUE);
	523	+ }
	524	+ }
	525	+
	526	+ public static function log_error($err)
	527	+ {
	528	+ error_log($err, 0);
	529	+ }
	530	+
	531	+ public static function display_error($err, $kill = FALSE)
	532	+ {
	533	+ print_r($err);
	534	+ if ($kill === FALSE)
	535	+ {
	536	+ die();
	537	+ }
	538	+ }
539	539	}

		@@ -10,46 +10,46 @@ discard block
		block discarded – undo
10	10	*/
11	11	class ForumThreadLink extends AbstractLink
12	12	{
13		- private $forum_thread_table = null;
14		- private $itemprop_table = null;
15		-
16		- /**
17		- * Constructor
18		- */
19		- public function __construct()
20		- {
21		- parent::__construct();
22		- $this->set_type(LINK_FORUM_THREAD);
23		- }
24		-
25		- /**
26		- * @return string
27		- */
28		- public function get_type_name()
29		- {
30		- return get_lang('ForumThreads');
31		- }
32		-
33		- /**
34		- * @return bool
35		- */
36		- public function is_allowed_to_change_name()
37		- {
38		- return false;
39		- }
40		-
41		- /**
42		- * Generate an array of exercises that a teacher hasn't created a link for.
43		- * @return array 2-dimensional array - every element contains 2 subelements (id, name)
44		- */
45		- public function get_not_created_links()
46		- {
47		- if (empty($this->course_code)) {
48		- die('Error in get_not_created_links() : course code not set');
49		- }
50		-
51		- $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
52		- $sql = 'SELECT thread_id,thread_title,thread_title_qualify
	13	+ private $forum_thread_table = null;
	14	+ private $itemprop_table = null;
	15	+
	16	+ /**
	17	+ * Constructor
	18	+ */
	19	+ public function __construct()
	20	+ {
	21	+ parent::__construct();
	22	+ $this->set_type(LINK_FORUM_THREAD);
	23	+ }
	24	+
	25	+ /**
	26	+ * @return string
	27	+ */
	28	+ public function get_type_name()
	29	+ {
	30	+ return get_lang('ForumThreads');
	31	+ }
	32	+
	33	+ /**
	34	+ * @return bool
	35	+ */
	36	+ public function is_allowed_to_change_name()
	37	+ {
	38	+ return false;
	39	+ }
	40	+
	41	+ /**
	42	+ * Generate an array of exercises that a teacher hasn't created a link for.
	43	+ * @return array 2-dimensional array - every element contains 2 subelements (id, name)
	44	+ */
	45	+ public function get_not_created_links()
	46	+ {
	47	+ if (empty($this->course_code)) {
	48	+ die('Error in get_not_created_links() : course code not set');
	49	+ }
	50	+
	51	+ $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
	52	+ $sql = 'SELECT thread_id,thread_title,thread_title_qualify
53	53	FROM '.$this->get_forum_thread_table().'
54	54	forum_thread WHERE thread_id NOT IN
55	55	(
		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	)
61	61	AND forum_thread.session_id='.api_get_session_id();
62	62
63		- $result = Database::query($sql);
	63	+ $result = Database::query($sql);
64	64
65	65	$cats = array();
66	66	while ($data = Database::fetch_array($result)) {
		@@ -75,29 +75,29 @@ discard block
		block discarded – undo
75	75	}
76	76
77	77	return $cats;
78		- }
79		-
80		- /**
81		- * Generate an array of all exercises available.
82		- * @return array 2-dimensional array - every element contains 2 subelements (id, name)
83		- */
84		- public function get_all_links()
85		- {
86		- if (empty($this->course_code)) {
87		- die('Error in get_not_created_links() : course code not set');
88		- }
89		-
90		- $tbl_grade_links = Database :: get_course_table(TABLE_FORUM_THREAD);
91		- $tbl_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
92		- $session_id = api_get_session_id();
93		-
94		- if ($session_id) {
95		- $session_condition = 'tl.session_id='.api_get_session_id();
96		- } else {
97		- $session_condition = '(tl.session_id = 0 OR tl.session_id IS NULL)';
98		- }
99		-
100		- $sql = 'SELECT tl.thread_id, tl.thread_title, tl.thread_title_qualify
	78	+ }
	79	+
	80	+ /**
	81	+ * Generate an array of all exercises available.
	82	+ * @return array 2-dimensional array - every element contains 2 subelements (id, name)
	83	+ */
	84	+ public function get_all_links()
	85	+ {
	86	+ if (empty($this->course_code)) {
	87	+ die('Error in get_not_created_links() : course code not set');
	88	+ }
	89	+
	90	+ $tbl_grade_links = Database :: get_course_table(TABLE_FORUM_THREAD);
	91	+ $tbl_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
	92	+ $session_id = api_get_session_id();
	93	+
	94	+ if ($session_id) {
	95	+ $session_condition = 'tl.session_id='.api_get_session_id();
	96	+ } else {
	97	+ $session_condition = '(tl.session_id = 0 OR tl.session_id IS NULL)';
	98	+ }
	99	+
	100	+ $sql = 'SELECT tl.thread_id, tl.thread_title, tl.thread_title_qualify
101	101	FROM '.$tbl_grade_links.' tl INNER JOIN '.$tbl_item_property.' ip
102	102	ON (tl.thread_id = ip.ref AND tl.c_id = ip.c_id)
103	103	WHERE
		@@ -108,23 +108,23 @@ discard block
		block discarded – undo
108	108	'.$session_condition.'
109	109	';
110	110
111		- $result = Database::query($sql);
112		- while ($data = Database::fetch_array($result)) {
113		- if ( isset($data['thread_title_qualify']) && $data['thread_title_qualify'] != "") {
114		- $cats[] = array($data['thread_id'], $data['thread_title_qualify']);
115		- } else {
116		- $cats[] = array($data['thread_id'], $data['thread_title']);
117		- }
118		- }
119		- $my_cats = isset($cats) ? $cats : null;
	111	+ $result = Database::query($sql);
	112	+ while ($data = Database::fetch_array($result)) {
	113	+ if ( isset($data['thread_title_qualify']) && $data['thread_title_qualify'] != "") {
	114	+ $cats[] = array($data['thread_id'], $data['thread_title_qualify']);
	115	+ } else {
	116	+ $cats[] = array($data['thread_id'], $data['thread_title']);
	117	+ }
	118	+ }
	119	+ $my_cats = isset($cats) ? $cats : null;
120	120
121		- return $my_cats;
122		- }
	121	+ return $my_cats;
	122	+ }
123	123
124	124	/**
125		- * Has anyone done this exercise yet ?
126		- * @return boolean
127		- */
	125	+ * Has anyone done this exercise yet ?
	126	+ * @return boolean
	127	+ */
128	128	public function has_results()
129	129	{
130	130	$table = Database :: get_course_table(TABLE_FORUM_POST);
		@@ -138,50 +138,50 @@ discard block
		block discarded – undo
138	138	$number = Database::fetch_row($result);
139	139
140	140	return $number[0] != 0;
141		- }
	141	+ }
142	142
143		- /**
144		- * @param int $stud_id
	143	+ /**
	144	+ * @param int $stud_id
145	145	* @param string $type
146	146	*
147		- * @return array\|null
148		- */
149		- public function calc_score($stud_id = null, $type = null)
150		- {
	147	+ * @return array\|null
	148	+ */
	149	+ public function calc_score($stud_id = null, $type = null)
	150	+ {
151	151	require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php';
152	152	$threadInfo = get_thread_information('', $this->get_ref_id());
153	153
154		- $thread_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
	154	+ $thread_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
155	155
156	156	$sessionId = $this->get_session_id();
157	157	$sessionCondition = api_get_session_condition($sessionId, true, false, 'session_id');
158	158
159		- $sql = 'SELECT thread_qualify_max
	159	+ $sql = 'SELECT thread_qualify_max
160	160	FROM '.Database :: get_course_table(TABLE_FORUM_THREAD)."
161	161	WHERE
162	162	c_id = ".$this->course_id." AND
163	163	thread_id = '".$this->get_ref_id()."'
164	164	$sessionCondition
165	165	";
166		- $query = Database::query($sql);
167		- $assignment = Database::fetch_array($query);
	166	+ $query = Database::query($sql);
	167	+ $assignment = Database::fetch_array($query);
168	168
169		- $sql = "SELECT * FROM $thread_qualify
	169	+ $sql = "SELECT * FROM $thread_qualify
170	170	WHERE
171	171	c_id = ".$this->course_id." AND
172	172	thread_id = ".$this->get_ref_id()."
173	173	$sessionCondition
174	174	";
175		- if (isset($stud_id)) {
176		- $sql .= ' AND user_id = '.intval($stud_id);
177		- }
	175	+ if (isset($stud_id)) {
	176	+ $sql .= ' AND user_id = '.intval($stud_id);
	177	+ }
178	178
179		- // order by id, that way the student's first attempt is accessed first
180		- $sql .= ' ORDER BY qualify_time DESC';
181		- $scores = Database::query($sql);
	179	+ // order by id, that way the student's first attempt is accessed first
	180	+ $sql .= ' ORDER BY qualify_time DESC';
	181	+ $scores = Database::query($sql);
182	182
183		- // for 1 student
184		- if (isset($stud_id)) {
	183	+ // for 1 student
	184	+ if (isset($stud_id)) {
185	185	if ($threadInfo['thread_peer_qualify'] == 0) {
186	186	// Classic way of calculate score
187	187	if ($data = Database::fetch_array($scores)) {
		@@ -209,175 +209,175 @@ discard block
		block discarded – undo
209	209	}
210	210	return [$score/$counter, $assignment['thread_qualify_max']];
211	211	}
212		- } else {
213		- // All students -> get average
214		- $students = array(); // user list, needed to make sure we only
215		- // take first attempts into account
216		- $counter = 0;
217		- $sum = 0;
218		- $bestResult = 0;
219		- $weight = 0;
220		- $sumResult = 0;
221		-
222		- while ($data = Database::fetch_array($scores)) {
223		- if (!(array_key_exists($data['user_id'], $students))) {
224		- if ($assignment['thread_qualify_max'] != 0) {
225		- $students[$data['user_id']] = $data['qualify'];
226		- $counter++;
227		- $sum += $data['qualify'] / $assignment['thread_qualify_max'];
228		- $sumResult += $data['qualify'];
229		- if ($data['qualify'] > $bestResult) {
230		- $bestResult = $data['qualify'];
231		- }
232		- $weight = $assignment['thread_qualify_max'];
233		- }
234		- }
235		- }
236		-
237		- if ($counter == 0) {
238		- return null;
239		- } else {
240		- switch ($type) {
241		- case 'best':
242		- return array($bestResult, $weight);
243		- break;
244		- case 'average':
245		- return array($sumResult/$counter, $weight);
246		- break;
247		- case 'ranking':
248		- return AbstractLink::getCurrentUserRanking($stud_id, $students);
249		- break;
250		- default:
251		- return array($sum, $counter);
252		- break;
253		- }
254		- }
255		- }
256		- }
257		-
258		- /**
259		- * Lazy load function to get the database table of the student publications
260		- */
261		- private function get_forum_thread_table()
262		- {
263		- return $this->forum_thread_table = Database :: get_course_table(TABLE_FORUM_THREAD);
264		- }
265		-
266		- public function needs_name_and_description()
267		- {
268		- return false;
269		- }
270		-
271		- public function needs_max()
272		- {
273		- return false;
274		- }
275		-
276		- public function needs_results()
277		- {
278		- return false;
279		- }
	212	+ } else {
	213	+ // All students -> get average
	214	+ $students = array(); // user list, needed to make sure we only
	215	+ // take first attempts into account
	216	+ $counter = 0;
	217	+ $sum = 0;
	218	+ $bestResult = 0;
	219	+ $weight = 0;
	220	+ $sumResult = 0;
	221	+
	222	+ while ($data = Database::fetch_array($scores)) {
	223	+ if (!(array_key_exists($data['user_id'], $students))) {
	224	+ if ($assignment['thread_qualify_max'] != 0) {
	225	+ $students[$data['user_id']] = $data['qualify'];
	226	+ $counter++;
	227	+ $sum += $data['qualify'] / $assignment['thread_qualify_max'];
	228	+ $sumResult += $data['qualify'];
	229	+ if ($data['qualify'] > $bestResult) {
	230	+ $bestResult = $data['qualify'];
	231	+ }
	232	+ $weight = $assignment['thread_qualify_max'];
	233	+ }
	234	+ }
	235	+ }
	236	+
	237	+ if ($counter == 0) {
	238	+ return null;
	239	+ } else {
	240	+ switch ($type) {
	241	+ case 'best':
	242	+ return array($bestResult, $weight);
	243	+ break;
	244	+ case 'average':
	245	+ return array($sumResult/$counter, $weight);
	246	+ break;
	247	+ case 'ranking':
	248	+ return AbstractLink::getCurrentUserRanking($stud_id, $students);
	249	+ break;
	250	+ default:
	251	+ return array($sum, $counter);
	252	+ break;
	253	+ }
	254	+ }
	255	+ }
	256	+ }
	257	+
	258	+ /**
	259	+ * Lazy load function to get the database table of the student publications
	260	+ */
	261	+ private function get_forum_thread_table()
	262	+ {
	263	+ return $this->forum_thread_table = Database :: get_course_table(TABLE_FORUM_THREAD);
	264	+ }
	265	+
	266	+ public function needs_name_and_description()
	267	+ {
	268	+ return false;
	269	+ }
	270	+
	271	+ public function needs_max()
	272	+ {
	273	+ return false;
	274	+ }
	275	+
	276	+ public function needs_results()
	277	+ {
	278	+ return false;
	279	+ }
280	280
281	281	/**
282	282	* @return string
283	283	*/
284		- public function get_name()
285		- {
286		- $this->get_exercise_data();
287		- $thread_title=isset($this->exercise_data['thread_title']) ? $this->exercise_data['thread_title'] : '';
288		- $thread_title_qualify=isset($this->exercise_data['thread_title_qualify']) ? $this->exercise_data['thread_title_qualify'] : '';
289		- if ( isset($thread_title_qualify) && $thread_title_qualify!="") {
290		- return $this->exercise_data['thread_title_qualify'];
291		- } else {
292		- return $thread_title;
293		- }
294		- }
	284	+ public function get_name()
	285	+ {
	286	+ $this->get_exercise_data();
	287	+ $thread_title=isset($this->exercise_data['thread_title']) ? $this->exercise_data['thread_title'] : '';
	288	+ $thread_title_qualify=isset($this->exercise_data['thread_title_qualify']) ? $this->exercise_data['thread_title_qualify'] : '';
	289	+ if ( isset($thread_title_qualify) && $thread_title_qualify!="") {
	290	+ return $this->exercise_data['thread_title_qualify'];
	291	+ } else {
	292	+ return $thread_title;
	293	+ }
	294	+ }
295	295
296	296	/**
297	297	* @return string
298	298	*/
299		- public function get_description()
300		- {
301		- return '';//$this->exercise_data['description'];
302		- }
303		-
304		- /**
305		- * Check if this still links to an exercise
306		- */
307		- public function is_valid_link()
308		- {
309		- $sql = 'SELECT count(id) from '.$this->get_forum_thread_table().'
	299	+ public function get_description()
	300	+ {
	301	+ return '';//$this->exercise_data['description'];
	302	+ }
	303	+
	304	+ /**
	305	+ * Check if this still links to an exercise
	306	+ */
	307	+ public function is_valid_link()
	308	+ {
	309	+ $sql = 'SELECT count(id) from '.$this->get_forum_thread_table().'
310	310	WHERE c_id = '.$this->course_id.' AND thread_id = '.$this->get_ref_id().' AND session_id='.api_get_session_id().'';
311		- $result = Database::query($sql);
312		- $number = Database::fetch_row($result);
313		- return ($number[0] != 0);
314		- }
315		-
316		- public function get_test_id()
317		- {
318		- return 'DEBUG:ID';
319		- }
320		-
321		- public function get_link()
322		- {
323		- $sessionId = api_get_session_id();
324		- //it was extracts the forum id
325		- $sql = 'SELECT * FROM '.$this->get_forum_thread_table()."
	311	+ $result = Database::query($sql);
	312	+ $number = Database::fetch_row($result);
	313	+ return ($number[0] != 0);
	314	+ }
	315	+
	316	+ public function get_test_id()
	317	+ {
	318	+ return 'DEBUG:ID';
	319	+ }
	320	+
	321	+ public function get_link()
	322	+ {
	323	+ $sessionId = api_get_session_id();
	324	+ //it was extracts the forum id
	325	+ $sql = 'SELECT * FROM '.$this->get_forum_thread_table()."
326	326	WHERE c_id = '.$this->course_id.' AND thread_id = '".$this->get_ref_id()."' AND session_id = ".$sessionId."";
327		- $result = Database::query($sql);
328		- $row = Database::fetch_array($result,'ASSOC');
329		- $forum_id=$row['forum_id'];
330		-
331		- $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;
332		- return $url;
333		- }
334		-
335		- private function get_exercise_data()
336		- {
337		- $session_id = api_get_session_id();
338		- if ($session_id) {
339		- $session_condition = 'session_id='.api_get_session_id();
340		- } else {
341		- $session_condition = '(session_id = 0 OR session_id IS NULL)';
342		- }
343		-
344		- if (!isset($this->exercise_data)) {
345		- $sql = 'SELECT * FROM '.$this->get_forum_thread_table().'
	327	+ $result = Database::query($sql);
	328	+ $row = Database::fetch_array($result,'ASSOC');
	329	+ $forum_id=$row['forum_id'];
	330	+
	331	+ $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;
	332	+ return $url;
	333	+ }
	334	+
	335	+ private function get_exercise_data()
	336	+ {
	337	+ $session_id = api_get_session_id();
	338	+ if ($session_id) {
	339	+ $session_condition = 'session_id='.api_get_session_id();
	340	+ } else {
	341	+ $session_condition = '(session_id = 0 OR session_id IS NULL)';
	342	+ }
	343	+
	344	+ if (!isset($this->exercise_data)) {
	345	+ $sql = 'SELECT * FROM '.$this->get_forum_thread_table().'
346	346	WHERE c_id = '.$this->course_id.' AND thread_id = '.$this->get_ref_id().' AND '.$session_condition;
347		- $query = Database::query($sql);
348		- $this->exercise_data = Database::fetch_array($query);
349		- }
350		- return $this->exercise_data;
351		- }
352		-
353		- public function get_icon_name()
354		- {
355		- return 'forum';
356		- }
357		-
358		- function save_linked_data()
359		- {
360		- $weight = (float)$this->get_weight();
361		- $ref_id = $this->get_ref_id();
362		-
363		- if (!empty($ref_id)) {
364		- $sql = 'UPDATE '.$this->get_forum_thread_table().' SET thread_weight='.$weight.'
	347	+ $query = Database::query($sql);
	348	+ $this->exercise_data = Database::fetch_array($query);
	349	+ }
	350	+ return $this->exercise_data;
	351	+ }
	352	+
	353	+ public function get_icon_name()
	354	+ {
	355	+ return 'forum';
	356	+ }
	357	+
	358	+ function save_linked_data()
	359	+ {
	360	+ $weight = (float)$this->get_weight();
	361	+ $ref_id = $this->get_ref_id();
	362	+
	363	+ if (!empty($ref_id)) {
	364	+ $sql = 'UPDATE '.$this->get_forum_thread_table().' SET thread_weight='.$weight.'
365	365	WHERE c_id = '.$this->course_id.' AND thread_id= '.$ref_id;
366		- Database::query($sql);
367		- }
368		- }
369		-
370		- function delete_linked_data()
371		- {
372		- $ref_id = $this->get_ref_id();
373		- if (!empty($ref_id)) {
374		- //Cleans forum
375		- $sql = 'UPDATE '.$this->get_forum_thread_table().' SET
	366	+ Database::query($sql);
	367	+ }
	368	+ }
	369	+
	370	+ function delete_linked_data()
	371	+ {
	372	+ $ref_id = $this->get_ref_id();
	373	+ if (!empty($ref_id)) {
	374	+ //Cleans forum
	375	+ $sql = 'UPDATE '.$this->get_forum_thread_table().' SET
376	376	thread_qualify_max = 0,
377	377	thread_weight = 0,
378	378	thread_title_qualify = ""
379	379	WHERE c_id = '.$this->course_id.' AND thread_id= '.$ref_id;
380		- Database::query($sql);
381		- }
382		- }
	380	+ Database::query($sql);
	381	+ }
	382	+ }
383	383	}

		@@ -23,14 +23,14 @@ discard block
		block discarded – undo
23	23	//Event::event_download($doc_url);
24	24	if (isset($_course['path'])) {
25	25	$course_path = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
26		- $full_file_name = $course_path.Security::remove_XSS($doc_url);
	26	+ $full_file_name = $course_path.Security::remove_XSS($doc_url);
27	27	} else {
28	28	$course_path = api_get_path(SYS_COURSE_PATH).$cid.'/document';
29		- $full_file_name = $course_path.Security::remove_XSS($doc_url);
	29	+ $full_file_name = $course_path.Security::remove_XSS($doc_url);
30	30	}
31	31
32	32	if(!is_file($full_file_name)) {
33		- exit;
	33	+ exit;
34	34	}
35	35
36	36	if (!Security::check_abs_path($full_file_name, $course_path.'/')) {
		@@ -41,16 +41,16 @@ discard block
		block discarded – undo
41	41	$extension=strtolower($extension[sizeof($extension)-1]);
42	42
43	43	switch($extension) {
44		- case 'gz': $content_type='application/x-gzip'; break;
45		- case 'zip': $content_type='application/zip'; break;
46		- case 'pdf': $content_type='application/pdf'; break;
47		- case 'png': $content_type='image/png'; break;
48		- case 'gif': $content_type='image/gif'; break;
49		- case 'jpg': $content_type='image/jpeg'; break;
50		- case 'txt': $content_type='text/plain'; break;
51		- case 'htm': $content_type='text/html'; break;
52		- case 'html': $content_type='text/html'; break;
53		- default: $content_type='application/octet-stream'; break;
	44	+ case 'gz': $content_type='application/x-gzip'; break;
	45	+ case 'zip': $content_type='application/zip'; break;
	46	+ case 'pdf': $content_type='application/pdf'; break;
	47	+ case 'png': $content_type='image/png'; break;
	48	+ case 'gif': $content_type='image/gif'; break;
	49	+ case 'jpg': $content_type='image/jpeg'; break;
	50	+ case 'txt': $content_type='text/plain'; break;
	51	+ case 'htm': $content_type='text/html'; break;
	52	+ case 'html': $content_type='text/html'; break;
	53	+ default: $content_type='application/octet-stream'; break;
54	54	}
55	55
56	56	header('Content-disposition: filename='.$filename);
		@@ -68,30 +68,30 @@ discard block
		block discarded – undo
68	68	*/
69	69
70	70	if ($content_type == 'text/html') {
71		- $directory_name = dirname($full_file_name);
	71	+ $directory_name = dirname($full_file_name);
72	72
73		- $dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
	73	+ $dir=str_replace(array('\\',$_configuration['root_sys']."courses/".$_course['path'].'/document'),array('/',''),$directory_name);
74	74
75		- if($dir[strlen($dir)-1] != '/') {
76		- $dir.='/';
77		- }
	75	+ if($dir[strlen($dir)-1] != '/') {
	76	+ $dir.='/';
	77	+ }
78	78
79	79
80		- //Parse whole file at one
81		- $fp = fopen($full_file_name, "r");
82		- $file_content = fread ($fp, filesize ($full_file_name));
83		- fclose($fp);
	80	+ //Parse whole file at one
	81	+ $fp = fopen($full_file_name, "r");
	82	+ $file_content = fread ($fp, filesize ($full_file_name));
	83	+ fclose($fp);
84	84	$exercisePath = api_get_self();
85		- $exfile = explode('/',$exercisePath);
86		- $exfile = $exfile[sizeof($exfile)-1];
87		- $exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile));
88		- $exercisePath = $exercisePath;
	85	+ $exfile = explode('/',$exercisePath);
	86	+ $exfile = $exfile[sizeof($exfile)-1];
	87	+ $exercisePath = substr($exercisePath,0,strpos($exercisePath,$exfile));
	88	+ $exercisePath = $exercisePath;
89	89
90		- $content = $file_content;
91		- $mit = "function Finish(){";
	90	+ $content = $file_content;
	91	+ $mit = "function Finish(){";
92	92
93		- $js_content = "var SaveScoreVariable = 0; // This variable included by Dokeos System\n".
94		- "function mySaveScore() // This function included by Dokeos System\n".
	93	+ $js_content = "var SaveScoreVariable = 0; // This variable included by Dokeos System\n".
	94	+ "function mySaveScore() // This function included by Dokeos System\n".
95	95	"{\n".
96	96	" if (SaveScoreVariable==0)\n".
97	97	" {\n".
		@@ -109,23 +109,23 @@ discard block
		block discarded – undo
109	109	"// Must be included \n".
110	110	"function Finish(){\n".
111	111	" mySaveScore();";
112		- $newcontent = str_replace($mit,$js_content,$content);
	112	+ $newcontent = str_replace($mit,$js_content,$content);
113	113
114		- $prehref="javascript:void(0);";
115		- $posthref = api_get_path(WEB_CODE_PATH) . "main/exercise/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
116		- $newcontent = str_replace($prehref,$posthref,$newcontent);
	114	+ $prehref="javascript:void(0);";
	115	+ $posthref = api_get_path(WEB_CODE_PATH) . "main/exercise/Hpdownload.php?doc_url=".$doc_url."&cid=".$cid."&uid=".$uid;
	116	+ $newcontent = str_replace($prehref,$posthref,$newcontent);
117	117
118	118
119		- $prehref="class=\"GridNum\" onclick=";
120		- $posthref="class=\"GridNum\" onMouseover=";
121		- $newcontent = str_replace($prehref,$posthref,$newcontent);
	119	+ $prehref="class=\"GridNum\" onclick=";
	120	+ $posthref="class=\"GridNum\" onMouseover=";
	121	+ $newcontent = str_replace($prehref,$posthref,$newcontent);
122	122
123	123
124		- header('Content-length: '.strlen($newcontent));
125		- // Dipsp.
126		- echo $newcontent;
	124	+ header('Content-length: '.strlen($newcontent));
	125	+ // Dipsp.
	126	+ echo $newcontent;
127	127
128		- exit();
	128	+ exit();
129	129	}
130	130
131	131	//normal case, all non-html files

		@@ -82,12 +82,12 @@ discard block
		block discarded – undo
82	82	*/
83	83	interface WSCMErrorHandler
84	84	{
85		- /**
86		- * Handle method
87		- *
88		- * @param WSError Error
89		- */
90		- public function handle($error);
	85	+ /**
	86	+ * Handle method
	87	+ *
	88	+ * @param WSError Error
	89	+ */
	90	+ public function handle($error);
91	91	}
92	92
93	93	/**
		@@ -95,57 +95,57 @@ discard block
		block discarded – undo
95	95	*/
96	96	class WSCM
97	97	{
98		- /**
99		- * Chamilo configuration
100		- *
101		- * @var array
102		- */
103		- protected $_configuration;
	98	+ /**
	99	+ * Chamilo configuration
	100	+ *
	101	+ * @var array
	102	+ */
	103	+ protected $_configuration;
104	104
105		- /**
106		- * Constructor
107		- */
108		- public function __construct()
	105	+ /**
	106	+ * Constructor
	107	+ */
	108	+ public function __construct()
109	109	{
110		- $this->_configuration = $GLOBALS['_configuration'];
111		- }
	110	+ $this->_configuration = $GLOBALS['_configuration'];
	111	+ }
112	112
113		- /**
114		- * Verifies the API key
115		- *
116		- * @param string Secret key
117		- * @return mixed WSError in case of failure, null in case of success
118		- */
119		- protected function verifyKey($secret_key)
	113	+ /**
	114	+ * Verifies the API key
	115	+ *
	116	+ * @param string Secret key
	117	+ * @return mixed WSError in case of failure, null in case of success
	118	+ */
	119	+ protected function verifyKey($secret_key)
120	120	{
121		- $ip = trim($_SERVER['REMOTE_ADDR']);
122		- // if we are behind a reverse proxy, assume it will send the
123		- // HTTP_X_FORWARDED_FOR header and use this IP instead
124		- if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
125		- list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
126		- $ip = trim($ip1);
127		- }
128		- $security_key = $ip.$this->_configuration['security_key'];
	121	+ $ip = trim($_SERVER['REMOTE_ADDR']);
	122	+ // if we are behind a reverse proxy, assume it will send the
	123	+ // HTTP_X_FORWARDED_FOR header and use this IP instead
	124	+ if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
	125	+ list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
	126	+ $ip = trim($ip1);
	127	+ }
	128	+ $security_key = $ip.$this->_configuration['security_key'];
129	129
130		- if(!api_is_valid_secret_key($secret_key, $security_key)) {
131		- return new WSCMError(1, "API key is invalid");
132		- } else {
133		- return null;
134		- }
135		- }
	130	+ if(!api_is_valid_secret_key($secret_key, $security_key)) {
	131	+ return new WSCMError(1, "API key is invalid");
	132	+ } else {
	133	+ return null;
	134	+ }
	135	+ }
136	136
137		- /**
138		- * Verifies if the user is valid
139		- *
140		- * @param <String> $username of the user in chamilo
141		- * @param <String> $pass of the same user (in MD5 of SHA)
142		- *
143		- * return "valid" if username e password are correct! Else, return a message error
144		- */
145		- public function verifyUserPass($username, $pass)
	137	+ /**
	138	+ * Verifies if the user is valid
	139	+ *
	140	+ * @param <String> $username of the user in chamilo
	141	+ * @param <String> $pass of the same user (in MD5 of SHA)
	142	+ *
	143	+ * return "valid" if username e password are correct! Else, return a message error
	144	+ */
	145	+ public function verifyUserPass($username, $pass)
146	146	{
147		- $login = $username;
148		- $password = $pass;
	147	+ $login = $username;
	148	+ $password = $pass;
149	149
150	150	$userRepo = UserManager::getRepository();
151	151	/** @var User $uData */
		@@ -178,17 +178,17 @@ discard block
		block discarded – undo
178	178	}
179	179	}
180	180	return get_lang('InvalidId');
181		- }
	181	+ }
182	182
183		- /**
184		- * Gets the real user id based on the user id field name and value.
185		- * Note that if the user id field name is "chamilo_user_id", it will use the user id
186		- * in the system database
187		- *
188		- * @param string User id field name
189		- * @param string User id value
190		- * @return mixed System user id if the user was found, WSError otherwise
191		- */
	183	+ /**
	184	+ * Gets the real user id based on the user id field name and value.
	185	+ * Note that if the user id field name is "chamilo_user_id", it will use the user id
	186	+ * in the system database
	187	+ *
	188	+ * @param string User id field name
	189	+ * @param string User id value
	190	+ * @return mixed System user id if the user was found, WSError otherwise
	191	+ */
192	192	protected function getUserId($user_id_field_name, $user_id_value)
193	193	{
194	194	if ($user_id_field_name == "chamilo_user_id") {
		@@ -210,16 +210,16 @@ discard block
		block discarded – undo
210	210	}
211	211	}
212	212
213		- /**
214		- * Gets the real course id based on the course id field name and value.
215		- * Note that if the course id field name is "chamilo_course_id", it will use the course id
216		- * in the system database
217		- *
218		- * @param string Course id field name
219		- * @param string Course id value
220		- * @return mixed System course id if the course was found, WSError otherwise
221		- */
222		- protected function getCourseId($course_id_field_name, $course_id_value)
	213	+ /**
	214	+ * Gets the real course id based on the course id field name and value.
	215	+ * Note that if the course id field name is "chamilo_course_id", it will use the course id
	216	+ * in the system database
	217	+ *
	218	+ * @param string Course id field name
	219	+ * @param string Course id value
	220	+ * @return mixed System course id if the course was found, WSError otherwise
	221	+ */
	222	+ protected function getCourseId($course_id_field_name, $course_id_value)
223	223	{
224	224	if ($course_id_field_name == "chamilo_course_id") {
225	225	if (CourseManager::get_course_code_from_course_id($course_id_value) != null) {
		@@ -238,78 +238,78 @@ discard block
		block discarded – undo
238	238	return $courseId;
239	239	}
240	240	}
241		- }
	241	+ }
242	242
243		- /**
244		- * Gets the real session id based on the session id field name and value.
245		- * Note that if the session id field name is "chamilo_session_id", it will use the session id
246		- * in the system database
247		- *
248		- * @param string Session id field name
249		- * @param string Session id value
250		- * @return mixed System session id if the session was found, WSError otherwise
251		- */
252		- protected function getSessionId($session_id_field_name, $session_id_value)
253		- {
254		- if ($session_id_field_name == "chamilo_session_id") {
255		- $session = SessionManager::fetch((int)$session_id_value);
256		- if(!empty($session)) {
257		- return intval($session_id_value);
258		- } else {
259		- return new WSCMError(300, "Session not found");
260		- }
261		- } else {
262		- $session_id = SessionManager::getSessionIdFromOriginalId(
263		- $session_id_value,
264		- $session_id_field_name
265		- );
266		- if($session_id == 0) {
267		- return new WSCMError(300, "Session not found");
268		- } else {
269		- return $session_id;
270		- }
271		- }
272		- }
	243	+ /**
	244	+ * Gets the real session id based on the session id field name and value.
	245	+ * Note that if the session id field name is "chamilo_session_id", it will use the session id
	246	+ * in the system database
	247	+ *
	248	+ * @param string Session id field name
	249	+ * @param string Session id value
	250	+ * @return mixed System session id if the session was found, WSError otherwise
	251	+ */
	252	+ protected function getSessionId($session_id_field_name, $session_id_value)
	253	+ {
	254	+ if ($session_id_field_name == "chamilo_session_id") {
	255	+ $session = SessionManager::fetch((int)$session_id_value);
	256	+ if(!empty($session)) {
	257	+ return intval($session_id_value);
	258	+ } else {
	259	+ return new WSCMError(300, "Session not found");
	260	+ }
	261	+ } else {
	262	+ $session_id = SessionManager::getSessionIdFromOriginalId(
	263	+ $session_id_value,
	264	+ $session_id_field_name
	265	+ );
	266	+ if($session_id == 0) {
	267	+ return new WSCMError(300, "Session not found");
	268	+ } else {
	269	+ return $session_id;
	270	+ }
	271	+ }
	272	+ }
273	273
274		- /**
275		- * Handles an error by calling the WSError error handler
276		- *
277		- * @param WSError Error
278		- */
279		- protected function handleError($error)
280		- {
281		- $handler = WSCMError::getErrorHandler();
282		- $handler->handle($error);
283		- }
	274	+ /**
	275	+ * Handles an error by calling the WSError error handler
	276	+ *
	277	+ * @param WSError Error
	278	+ */
	279	+ protected function handleError($error)
	280	+ {
	281	+ $handler = WSCMError::getErrorHandler();
	282	+ $handler->handle($error);
	283	+ }
284	284
285		- /**
286		- * Gets a successful result
287		- *
288		- * @return array Array with a code of 0 and a message 'Operation was successful'
289		- */
290		- protected function getSuccessfulResult()
291		- {
292		- return array('code' => 0, 'message' => 'Operation was successful');
293		- }
	285	+ /**
	286	+ * Gets a successful result
	287	+ *
	288	+ * @return array Array with a code of 0 and a message 'Operation was successful'
	289	+ */
	290	+ protected function getSuccessfulResult()
	291	+ {
	292	+ return array('code' => 0, 'message' => 'Operation was successful');
	293	+ }
294	294
295		- /**
296		- * Test function. Returns the string success
297		- *
298		- * @return string Success
299		- */
300		- public function test()
301		- {
302		- return "success";
303		- }
	295	+ /**
	296	+ * Test function. Returns the string success
	297	+ *
	298	+ * @return string Success
	299	+ */
	300	+ public function test()
	301	+ {
	302	+ return "success";
	303	+ }
304	304
305		- /**
306		- * Strictly reverts PHP's nl2br() effects (whether it was used in XHTML mode or not)
307		- * @param <type> $string
308		- * @return <type> $string
309		- */
310		- public function nl2br_revert($string)
	305	+ /**
	306	+ * Strictly reverts PHP's nl2br() effects (whether it was used in XHTML mode or not)
	307	+ * @param <type> $string
	308	+ * @return <type> $string
	309	+ */
	310	+ public function nl2br_revert($string)
311	311	{
312		- return preg_replace('`<br(?: /)?>([\\n\\r])`', '$1', $string);
313		- }
	312	+ return preg_replace('`<br(?: /)?>([\\n\\r])`', '$1', $string);
	313	+ }
314	314	}
315	315

		@@ -13,21 +13,21 @@ discard block
		block discarded – undo
13	13
14	14	public function find_id_user($username, $password, $name)
15	15	{
16		- if ($this->verifyUserPass($username, $password) == "valid") {
	16	+ if ($this->verifyUserPass($username, $password) == "valid") {
17	17	$listResult = "#";
18	18
19	19	$listArrayResult = Array();
20	20	$listArray = Array();
21	21
22	22	$list = $this->get_user_list_like_start(array('firstname'=>$name), array('firstname'));
23		- foreach ($list as $userData) {
24		- $listArray[] = $userData['user_id'];
25		- }
	23	+ foreach ($list as $userData) {
	24	+ $listArray[] = $userData['user_id'];
	25	+ }
26	26
27	27	$list = $this->get_user_list_like_start(array('lastname'=>$name), array('firstname'));
28		- foreach ($list as $userData) {
29		- $listArray[] = $userData['user_id'];
30		- }
	28	+ foreach ($list as $userData) {
	29	+ $listArray[] = $userData['user_id'];
	30	+ }
31	31
32	32	$list = $this->get_user_list_like_start(array('email'=>$name), array('firstname'));
33	33	foreach ($list as $userData) {
		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	{
90	90	global $charset;
91	91	if ($this->verifyUserPass($username, $password) == "valid") {
92		- $user_id = UserManager::get_user_id_from_username($username);
	92	+ $user_id = UserManager::get_user_id_from_username($username);
93	93	$message_title = get_lang('Invitation');
94	94	$count_is_true = SocialManager::send_invitation_friend($user_id,$userfriend_id, $message_title, $content_message);
95	95
		@@ -129,14 +129,14 @@ discard block
		block discarded – undo
129	129
130	130
131	131	/**
132		- * Get a list of users of which the given conditions match with a LIKE '%cond%'
133		- * @param array $conditions a list of condition (exemple : status=>STUDENT)
134		- * @param array $order_by a list of fields on which sort
135		- * @return array An array with all users of the platform.
136		- * @todo optional course code parameter, optional sorting parameters...
	132	+ * Get a list of users of which the given conditions match with a LIKE '%cond%'
	133	+ * @param array $conditions a list of condition (exemple : status=>STUDENT)
	134	+ * @param array $order_by a list of fields on which sort
	135	+ * @return array An array with all users of the platform.
	136	+ * @todo optional course code parameter, optional sorting parameters...
137	137	*@todo Use the UserManager class
138	138	* @todo security filter order by
139		- */
	139	+ */
140	140	private static function get_user_list_like_start($conditions = array(), $order_by = array())
141	141	{
142	142	$user_table = Database :: get_main_table(TABLE_MAIN_USER);

chamilo / chamilo-lms

Push — master ( 565c08...93d030 )

Status

Category

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

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

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

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

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

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

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

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

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