chamilo / chamilo-lms

main/document/create_draw.php

Indentation +38 added lines, -38 removed lines

@@ -46,59 +46,59 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 $groupId = api_get_group_id();
 
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array (
+    $interbreadcrumb[] = array (
         "url" => "../group/group_space.php?".api_get_cidreq(),
         "name" => get_lang('GroupSpace')
     );
-	$noPHP_SELF = true;
-	$group = GroupManager :: get_group_properties($groupId);
-	$path = explode('/', $dir);
-	if ('/'.$path[1] != $group['directory']) {
-		api_not_allowed(true);
-	}
+    $noPHP_SELF = true;
+    $group = GroupManager :: get_group_properties($groupId);
+    $path = explode('/', $dir);
+    if ('/'.$path[1] != $group['directory']) {
+        api_not_allowed(true);
+    }
 }
 
 $interbreadcrumb[] = array(
-	"url" => "./document.php?".api_get_cidreq(),
-	"name" => get_lang('Documents')
+    "url" => "./document.php?".api_get_cidreq(),
+    "name" => get_lang('Documents')
 );
 
 if (!$is_allowed_in_course) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(
-		api_get_user_id(),
-		Security::remove_XSS($dir),
-		api_get_session_id()))
+    DocumentManager::is_my_shared_folder(
+        api_get_user_id(),
+        Security::remove_XSS($dir),
+        api_get_session_id()))
 ) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 
@@ -106,10 +106,10 @@ 
 Event::event_access_tool(TOOL_DOCUMENT);
 $display_dir = $dir;
 if (isset ($group)) {
-	$display_dir = explode('/', $dir);
-	unset ($display_dir[0]);
-	unset ($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset ($display_dir[0]);
+    unset ($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 // Interbreadcrumb for the current directory root path
@@ -123,9 +123,9 @@ 
 } else {
     foreach ($document_data['parents'] as $document_sub_data) {
         $interbreadcrumb[] = array(
-			'url' => $document_sub_data['document_url'],
-			'name' => $document_sub_data['title']
-		);
+            'url' => $document_sub_data['document_url'],
+            'name' => $document_sub_data['title']
+        );
     }
 }
 Display :: display_header($nameTools, 'Doc');
@@ -137,13 +137,13 @@ 
 
 if (api_browser_support('svg')) {
 
-	//automatic loading the course language
-	$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-	$langsvgedit = api_get_language_isocode();
-	$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
-	$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
-	$svg_url= api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?lang='.$langsvgedit;
-	?>
+    //automatic loading the course language
+    $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
+    $langsvgedit = api_get_language_isocode();
+    $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
+    $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
+    $svg_url= api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?lang='.$langsvgedit;
+    ?>
 	<script>
 		document.write ('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo  $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
         function resizeIframe() {
@@ -161,10 +161,10 @@ 
 
     <?php
     echo '<noscript>';
-	echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0" src="'.$svg_url.'"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
-	echo '</noscript>';
+    echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0" src="'.$svg_url.'"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
+    echo '</noscript>';
 } else {
-	Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
+    Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
 }
 
 Display :: display_footer();

main/inc/lib/icalcreator/iCalcreator.class.php

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries

main/auth/external_login/facebook-php-sdk/src/Facebook/Entities/SignedRequest.php

Indentation +255 added lines, -255 removed lines

@@ -33,99 +33,99 @@ 
 class SignedRequest
 {
 
-  /**
-   * @var string
-   */
-  public $rawSignedRequest;
-
-  /**
-   * @var array
-   */
-  public $payload;
-
-  /**
-   * Instantiate a new SignedRequest entity.
-   *
-   * @param string|null $rawSignedRequest The raw signed request.
-   * @param string|null $state random string to prevent CSRF.
-   * @param string|null $appSecret
-   */
-  public function __construct($rawSignedRequest = null, $state = null, $appSecret = null)
-  {
+    /**
+     * @var string
+     */
+    public $rawSignedRequest;
+
+    /**
+     * @var array
+     */
+    public $payload;
+
+    /**
+     * Instantiate a new SignedRequest entity.
+     *
+     * @param string|null $rawSignedRequest The raw signed request.
+     * @param string|null $state random string to prevent CSRF.
+     * @param string|null $appSecret
+     */
+    public function __construct($rawSignedRequest = null, $state = null, $appSecret = null)
+    {
     if (!$rawSignedRequest) {
-      return;
+        return;
     }
 
     $this->rawSignedRequest = $rawSignedRequest;
     $this->payload = static::parse($rawSignedRequest, $state, $appSecret);
-  }
-
-  /**
-   * Returns the raw signed request data.
-   *
-   * @return string
-   */
-  public function getRawSignedRequest()
-  {
+    }
+
+    /**
+     * Returns the raw signed request data.
+     *
+     * @return string
+     */
+    public function getRawSignedRequest()
+    {
     return $this->rawSignedRequest;
-  }
-
-  /**
-   * Returns the parsed signed request data.
-   *
-   * @return array|null
-   */
-  public function getPayload()
-  {
+    }
+
+    /**
+     * Returns the parsed signed request data.
+     *
+     * @return array|null
+     */
+    public function getPayload()
+    {
     return $this->payload;
-  }
-
-  /**
-   * Returns a property from the signed request data if available.
-   *
-   * @param string $key
-   * @param integer $default
-   *
-   * @return mixed|null
-   */
-  public function get($key, $default = null)
-  {
+    }
+
+    /**
+     * Returns a property from the signed request data if available.
+     *
+     * @param string $key
+     * @param integer $default
+     *
+     * @return mixed|null
+     */
+    public function get($key, $default = null)
+    {
     if (isset($this->payload[$key])) {
-      return $this->payload[$key];
+        return $this->payload[$key];
     }
     return $default;
-  }
-
-  /**
-   * Returns user_id from signed request data if available.
-   *
-   * @return string|null
-   */
-  public function getUserId()
-  {
+    }
+
+    /**
+     * Returns user_id from signed request data if available.
+     *
+     * @return string|null
+     */
+    public function getUserId()
+    {
     return $this->get('user_id');
-  }
-
-  /**
-   * Checks for OAuth data in the payload.
-   *
-   * @return boolean
-   */
-  public function hasOAuthData()
-  {
+    }
+
+    /**
+     * Checks for OAuth data in the payload.
+     *
+     * @return boolean
+     */
+    public function hasOAuthData()
+    {
     return isset($this->payload['oauth_token']) || isset($this->payload['code']);
-  }
-
-  /**
-   * Creates a signed request from an array of data.
-   *
-   * @param array $payload
-   * @param string|null $appSecret
-   *
-   * @return string
-   */
-  public static function make(array $payload, $appSecret = null)
-  {
+    }
+
+    /**
+     * Creates a signed request from an array of data.
+     *
+     * @param array $payload
+     * @param string|null $appSecret
+     *
+     * @return string
+     */
+    public static function make(array $payload, $appSecret = null)
+    {
     $payload['algorithm'] = 'HMAC-SHA256';
     $payload['issued_at'] = time();
     $encodedPayload = static::base64UrlEncode(json_encode($payload));
@@ -134,20 +134,20 @@ 
     $encodedSig = static::base64UrlEncode($hashedSig);
 
     return $encodedSig.'.'.$encodedPayload;
-  }
-
-  /**
-   * Validates and decodes a signed request and returns
-   * the payload as an array.
-   *
-   * @param string $signedRequest
-   * @param string|null $state
-   * @param string|null $appSecret
-   *
-   * @return array
-   */
-  public static function parse($signedRequest, $state = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Validates and decodes a signed request and returns
+     * the payload as an array.
+     *
+     * @param string $signedRequest
+     * @param string|null $state
+     * @param string|null $appSecret
+     *
+     * @return array
+     */
+    public static function parse($signedRequest, $state = null, $appSecret = null)
+    {
     list($encodedSig, $encodedPayload) = static::split($signedRequest);
 
     // Signature validation
@@ -159,228 +159,228 @@ 
     $data = static::decodePayload($encodedPayload);
     static::validateAlgorithm($data);
     if ($state) {
-      static::validateCsrf($data, $state);
+        static::validateCsrf($data, $state);
     }
 
     return $data;
-  }
-
-  /**
-   * Validates the format of a signed request.
-   *
-   * @param string $signedRequest
-   *
-   * @throws FacebookSDKException
-   */
-  public static function validateFormat($signedRequest)
-  {
+    }
+
+    /**
+     * Validates the format of a signed request.
+     *
+     * @param string $signedRequest
+     *
+     * @throws FacebookSDKException
+     */
+    public static function validateFormat($signedRequest)
+    {
     if (strpos($signedRequest, '.') !== false) {
-      return;
+        return;
     }
 
     throw new FacebookSDKException(
-      'Malformed signed request.', 606
+        'Malformed signed request.', 606
     );
-  }
-
-  /**
-   * Decodes a raw valid signed request.
-   *
-   * @param string $signedRequest
-   *
-   * @returns array
-   */
-  public static function split($signedRequest)
-  {
+    }
+
+    /**
+     * Decodes a raw valid signed request.
+     *
+     * @param string $signedRequest
+     *
+     * @returns array
+     */
+    public static function split($signedRequest)
+    {
     static::validateFormat($signedRequest);
 
     return explode('.', $signedRequest, 2);
-  }
-
-  /**
-   * Decodes the raw signature from a signed request.
-   *
-   * @param string $encodedSig
-   *
-   * @returns string
-   *
-   * @throws FacebookSDKException
-   */
-  public static function decodeSignature($encodedSig)
-  {
+    }
+
+    /**
+     * Decodes the raw signature from a signed request.
+     *
+     * @param string $encodedSig
+     *
+     * @returns string
+     *
+     * @throws FacebookSDKException
+     */
+    public static function decodeSignature($encodedSig)
+    {
     $sig = static::base64UrlDecode($encodedSig);
 
     if ($sig) {
-      return $sig;
+        return $sig;
     }
 
     throw new FacebookSDKException(
-      'Signed request has malformed encoded signature data.', 607
+        'Signed request has malformed encoded signature data.', 607
     );
-  }
-
-  /**
-   * Decodes the raw payload from a signed request.
-   *
-   * @param string $encodedPayload
-   *
-   * @returns array
-   *
-   * @throws FacebookSDKException
-   */
-  public static function decodePayload($encodedPayload)
-  {
+    }
+
+    /**
+     * Decodes the raw payload from a signed request.
+     *
+     * @param string $encodedPayload
+     *
+     * @returns array
+     *
+     * @throws FacebookSDKException
+     */
+    public static function decodePayload($encodedPayload)
+    {
     $payload = static::base64UrlDecode($encodedPayload);
 
     if ($payload) {
-      $payload = json_decode($payload, true);
+        $payload = json_decode($payload, true);
     }
 
     if (is_array($payload)) {
-      return $payload;
+        return $payload;
     }
 
     throw new FacebookSDKException(
-      'Signed request has malformed encoded payload data.', 607
+        'Signed request has malformed encoded payload data.', 607
     );
-  }
-
-  /**
-   * Validates the algorithm used in a signed request.
-   *
-   * @param array $data
-   *
-   * @throws FacebookSDKException
-   */
-  public static function validateAlgorithm(array $data)
-  {
+    }
+
+    /**
+     * Validates the algorithm used in a signed request.
+     *
+     * @param array $data
+     *
+     * @throws FacebookSDKException
+     */
+    public static function validateAlgorithm(array $data)
+    {
     if (isset($data['algorithm']) && $data['algorithm'] === 'HMAC-SHA256') {
-      return;
+        return;
     }
 
     throw new FacebookSDKException(
-      'Signed request is using the wrong algorithm.', 605
+        'Signed request is using the wrong algorithm.', 605
     );
-  }
-
-  /**
-   * Hashes the signature used in a signed request.
-   *
-   * @param string $encodedData
-   * @param string|null $appSecret
-   *
-   * @return string
-   *
-   * @throws FacebookSDKException
-   */
-  public static function hashSignature($encodedData, $appSecret = null)
-  {
+    }
+
+    /**
+     * Hashes the signature used in a signed request.
+     *
+     * @param string $encodedData
+     * @param string|null $appSecret
+     *
+     * @return string
+     *
+     * @throws FacebookSDKException
+     */
+    public static function hashSignature($encodedData, $appSecret = null)
+    {
     $hashedSig = hash_hmac(
-      'sha256', $encodedData, FacebookSession::_getTargetAppSecret($appSecret), $raw_output = true
+        'sha256', $encodedData, FacebookSession::_getTargetAppSecret($appSecret), $raw_output = true
     );
 
     if ($hashedSig) {
-      return $hashedSig;
+        return $hashedSig;
     }
 
     throw new FacebookSDKException(
-      'Unable to hash signature from encoded payload data.', 602
+        'Unable to hash signature from encoded payload data.', 602
     );
-  }
-
-  /**
-   * Validates the signature used in a signed request.
-   *
-   * @param string $hashedSig
-   * @param string $sig
-   *
-   * @throws FacebookSDKException
-   */
-  public static function validateSignature($hashedSig, $sig)
-  {
+    }
+
+    /**
+     * Validates the signature used in a signed request.
+     *
+     * @param string $hashedSig
+     * @param string $sig
+     *
+     * @throws FacebookSDKException
+     */
+    public static function validateSignature($hashedSig, $sig)
+    {
     if (mb_strlen($hashedSig) === mb_strlen($sig)) {
-      $validate = 0;
-      for ($i = 0; $i < mb_strlen($sig); $i++) {
+        $validate = 0;
+        for ($i = 0; $i < mb_strlen($sig); $i++) {
         $validate |= ord($hashedSig[$i]) ^ ord($sig[$i]);
-      }
-      if ($validate === 0) {
+        }
+        if ($validate === 0) {
         return;
-      }
+        }
     }
 
     throw new FacebookSDKException(
-      'Signed request has an invalid signature.', 602
+        'Signed request has an invalid signature.', 602
     );
-  }
-
-  /**
-   * Validates a signed request against CSRF.
-   *
-   * @param array $data
-   * @param string $state
-   *
-   * @throws FacebookSDKException
-   */
-  public static function validateCsrf(array $data, $state)
-  {
+    }
+
+    /**
+     * Validates a signed request against CSRF.
+     *
+     * @param array $data
+     * @param string $state
+     *
+     * @throws FacebookSDKException
+     */
+    public static function validateCsrf(array $data, $state)
+    {
     if (isset($data['state']) && $data['state'] === $state) {
-      return;
+        return;
     }
 
     throw new FacebookSDKException(
-      'Signed request did not pass CSRF validation.', 604
+        'Signed request did not pass CSRF validation.', 604
     );
-  }
-
-  /**
-   * Base64 decoding which replaces characters:
-   *   + instead of -
-   *   / instead of _
-   * @link http://en.wikipedia.org/wiki/Base64#URL_applications
-   *
-   * @param string $input base64 url encoded input
-   *
-   * @return string decoded string
-   */
-  public static function base64UrlDecode($input)
-  {
+    }
+
+    /**
+     * Base64 decoding which replaces characters:
+     *   + instead of -
+     *   / instead of _
+     * @link http://en.wikipedia.org/wiki/Base64#URL_applications
+     *
+     * @param string $input base64 url encoded input
+     *
+     * @return string decoded string
+     */
+    public static function base64UrlDecode($input)
+    {
     $urlDecodedBase64 = strtr($input, '-_', '+/');
     static::validateBase64($urlDecodedBase64);
     return base64_decode($urlDecodedBase64);
-  }
-
-  /**
-   * Base64 encoding which replaces characters:
-   *   + instead of -
-   *   / instead of _
-   * @link http://en.wikipedia.org/wiki/Base64#URL_applications
-   *
-   * @param string $input string to encode
-   *
-   * @return string base64 url encoded input
-   */
-  public static function base64UrlEncode($input)
-  {
+    }
+
+    /**
+     * Base64 encoding which replaces characters:
+     *   + instead of -
+     *   / instead of _
+     * @link http://en.wikipedia.org/wiki/Base64#URL_applications
+     *
+     * @param string $input string to encode
+     *
+     * @return string base64 url encoded input
+     */
+    public static function base64UrlEncode($input)
+    {
     return strtr(base64_encode($input), '+/', '-_');
-  }
-
-  /**
-   * Validates a base64 string.
-   *
-   * @param string $input base64 value to validate
-   *
-   * @throws FacebookSDKException
-   */
-  public static function validateBase64($input)
-  {
+    }
+
+    /**
+     * Validates a base64 string.
+     *
+     * @param string $input base64 value to validate
+     *
+     * @throws FacebookSDKException
+     */
+    public static function validateBase64($input)
+    {
     $pattern = '/^[a-zA-Z0-9\/\r\n+]*={0,2}$/';
     if (preg_match($pattern, $input)) {
-      return;
+        return;
     }
 
     throw new FacebookSDKException(
-      'Signed request contains malformed base64 encoding.', 608
+        'Signed request contains malformed base64 encoding.', 608
     );
-  }
+    }
 
 }

main/auth/external_login/facebook-php-sdk/src/Facebook/Entities/AccessToken.php

Indentation +246 added lines, -246 removed lines

@@ -35,120 +35,120 @@ 
 class AccessToken
 {
 
-  /**
-   * The access token.
-   *
-   * @var string
-   */
-  protected $accessToken;
-
-  /**
-   * A unique ID to identify a client.
-   *
-   * @var string
-   */
-  protected $machineId;
-
-  /**
-   * Date when token expires.
-   *
-   * @var \DateTime|null
-   */
-  protected $expiresAt;
-
-  /**
-   * Create a new access token entity.
-   *
-   * @param string $accessToken
-   * @param int $expiresAt
-   * @param string|null machineId
-   * @param string $machineId
-   */
-  public function __construct($accessToken, $expiresAt = 0, $machineId = null)
-  {
+    /**
+     * The access token.
+     *
+     * @var string
+     */
+    protected $accessToken;
+
+    /**
+     * A unique ID to identify a client.
+     *
+     * @var string
+     */
+    protected $machineId;
+
+    /**
+     * Date when token expires.
+     *
+     * @var \DateTime|null
+     */
+    protected $expiresAt;
+
+    /**
+     * Create a new access token entity.
+     *
+     * @param string $accessToken
+     * @param int $expiresAt
+     * @param string|null machineId
+     * @param string $machineId
+     */
+    public function __construct($accessToken, $expiresAt = 0, $machineId = null)
+    {
     $this->accessToken = $accessToken;
     if ($expiresAt) {
-      $this->setExpiresAtFromTimeStamp($expiresAt);
+        $this->setExpiresAtFromTimeStamp($expiresAt);
     }
     $this->machineId = $machineId;
-  }
-
-  /**
-   * Setter for expires_at.
-   *
-   * @param int $timeStamp
-   */
-  protected function setExpiresAtFromTimeStamp($timeStamp)
-  {
+    }
+
+    /**
+     * Setter for expires_at.
+     *
+     * @param int $timeStamp
+     */
+    protected function setExpiresAtFromTimeStamp($timeStamp)
+    {
     $dt = new \DateTime();
     $dt->setTimestamp($timeStamp);
     $this->expiresAt = $dt;
-  }
-
-  /**
-   * Getter for expiresAt.
-   *
-   * @return \DateTime|null
-   */
-  public function getExpiresAt()
-  {
+    }
+
+    /**
+     * Getter for expiresAt.
+     *
+     * @return \DateTime|null
+     */
+    public function getExpiresAt()
+    {
     return $this->expiresAt;
-  }
-
-  /**
-   * Getter for machineId.
-   *
-   * @return string
-   */
-  public function getMachineId()
-  {
+    }
+
+    /**
+     * Getter for machineId.
+     *
+     * @return string
+     */
+    public function getMachineId()
+    {
     return $this->machineId;
-  }
-
-  /**
-   * Determines whether or not this is a long-lived token.
-   *
-   * @return bool
-   */
-  public function isLongLived()
-  {
+    }
+
+    /**
+     * Determines whether or not this is a long-lived token.
+     *
+     * @return bool
+     */
+    public function isLongLived()
+    {
     if ($this->expiresAt) {
-      return $this->expiresAt->getTimestamp() > time() + (60 * 60 * 2);
+        return $this->expiresAt->getTimestamp() > time() + (60 * 60 * 2);
     }
     return false;
-  }
-
-  /**
-   * Checks the validity of the access token.
-   *
-   * @param string|null $appId Application ID to use
-   * @param string|null $appSecret App secret value to use
-   * @param string|null $machineId
-   *
-   * @return boolean
-   */
-  public function isValid($appId = null, $appSecret = null, $machineId = null)
-  {
+    }
+
+    /**
+     * Checks the validity of the access token.
+     *
+     * @param string|null $appId Application ID to use
+     * @param string|null $appSecret App secret value to use
+     * @param string|null $machineId
+     *
+     * @return boolean
+     */
+    public function isValid($appId = null, $appSecret = null, $machineId = null)
+    {
     $accessTokenInfo = $this->getInfo($appId, $appSecret);
     $machineId = $machineId ?: $this->machineId;
     return static::validateAccessToken($accessTokenInfo, $appId, $machineId);
-  }
-
-  /**
-   * Ensures the provided GraphSessionInfo object is valid,
-   *   throwing an exception if not.  Ensures the appId matches,
-   *   that the machineId matches if it's being used,
-   *   that the token is valid and has not expired.
-   *
-   * @param GraphSessionInfo $tokenInfo
-   * @param string|null $appId Application ID to use
-   * @param string|null $machineId
-   *
-   * @return boolean
-   */
-  public static function validateAccessToken(GraphSessionInfo $tokenInfo,
-                                             $appId = null, $machineId = null)
-  {
+    }
+
+    /**
+     * Ensures the provided GraphSessionInfo object is valid,
+     *   throwing an exception if not.  Ensures the appId matches,
+     *   that the machineId matches if it's being used,
+     *   that the token is valid and has not expired.
+     *
+     * @param GraphSessionInfo $tokenInfo
+     * @param string|null $appId Application ID to use
+     * @param string|null $machineId
+     *
+     * @return boolean
+     */
+    public static function validateAccessToken(GraphSessionInfo $tokenInfo,
+                                                $appId = null, $machineId = null)
+    {
     $targetAppId = FacebookSession::_getTargetAppId($appId);
 
     $appIdIsValid = $tokenInfo->getAppId() == $targetAppId;
@@ -157,90 +157,90 @@ 
 
     // Not all access tokens return an expiration. E.g. an app access token.
     if ($tokenInfo->getExpiresAt() instanceof \DateTime) {
-      $accessTokenIsStillAlive = $tokenInfo->getExpiresAt()->getTimestamp() >= time();
+        $accessTokenIsStillAlive = $tokenInfo->getExpiresAt()->getTimestamp() >= time();
     } else {
-      $accessTokenIsStillAlive = true;
+        $accessTokenIsStillAlive = true;
     }
 
     return $appIdIsValid && $machineIdIsValid && $accessTokenIsValid && $accessTokenIsStillAlive;
-  }
-
-  /**
-   * Get a valid access token from a code.
-   *
-   * @param string $code
-   * @param string|null $appId
-   * @param string|null $appSecret
-   * @param string|null $machineId
-   *
-   * @return AccessToken
-   */
-  public static function getAccessTokenFromCode($code, $appId = null, $appSecret = null, $machineId = null)
-  {
+    }
+
+    /**
+     * Get a valid access token from a code.
+     *
+     * @param string $code
+     * @param string|null $appId
+     * @param string|null $appSecret
+     * @param string|null $machineId
+     *
+     * @return AccessToken
+     */
+    public static function getAccessTokenFromCode($code, $appId = null, $appSecret = null, $machineId = null)
+    {
     $params = array(
-      'code' => $code,
-      'redirect_uri' => '',
+        'code' => $code,
+        'redirect_uri' => '',
     );
 
     if ($machineId) {
-      $params['machine_id'] = $machineId;
+        $params['machine_id'] = $machineId;
     }
 
     return static::requestAccessToken($params, $appId, $appSecret);
-  }
-
-  /**
-   * Get a valid code from an access token.
-   *
-   * @param AccessToken $accessToken
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return string
-   */
-  public static function getCodeFromAccessToken($accessToken, $appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Get a valid code from an access token.
+     *
+     * @param AccessToken $accessToken
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return string
+     */
+    public static function getCodeFromAccessToken($accessToken, $appId = null, $appSecret = null)
+    {
     $accessToken = (string) $accessToken;
 
     $params = array(
-      'access_token' => $accessToken,
-      'redirect_uri' => '',
+        'access_token' => $accessToken,
+        'redirect_uri' => '',
     );
 
     return static::requestCode($params, $appId, $appSecret);
-  }
-
-  /**
-   * Exchanges a short lived access token with a long lived access token.
-   *
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return AccessToken
-   */
-  public function extend($appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Exchanges a short lived access token with a long lived access token.
+     *
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return AccessToken
+     */
+    public function extend($appId = null, $appSecret = null)
+    {
     $params = array(
-      'grant_type' => 'fb_exchange_token',
-      'fb_exchange_token' => $this->accessToken,
+        'grant_type' => 'fb_exchange_token',
+        'fb_exchange_token' => $this->accessToken,
     );
 
     return static::requestAccessToken($params, $appId, $appSecret);
-  }
-
-  /**
-   * Request an access token based on a set of params.
-   *
-   * @param array $params
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return AccessToken
-   *
-   * @throws FacebookRequestException
-   */
-  public static function requestAccessToken(array $params, $appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Request an access token based on a set of params.
+     *
+     * @param array $params
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return AccessToken
+     *
+     * @throws FacebookRequestException
+     */
+    public static function requestAccessToken(array $params, $appId = null, $appSecret = null)
+    {
     $response = static::request('/oauth/access_token', $params, $appId, $appSecret);
     $data = $response->getResponse();
 
@@ -249,133 +249,133 @@ 
      * @see https://github.com/facebook/facebook-php-sdk-v4/issues/36
      */
     if (is_array($data)) {
-      if (isset($data['access_token'])) {
+        if (isset($data['access_token'])) {
         $expiresAt = isset($data['expires']) ? time() + $data['expires'] : 0;
         return new static($data['access_token'], $expiresAt);
-      }
+        }
     } elseif($data instanceof \stdClass) {
-      if (isset($data->access_token)) {
+        if (isset($data->access_token)) {
         $expiresAt = isset($data->expires_in) ? time() + $data->expires_in : 0;
         $machineId = isset($data->machine_id) ? (string) $data->machine_id : null;
         return new static((string) $data->access_token, $expiresAt, $machineId);
-      }
+        }
     }
 
     throw FacebookRequestException::create(
-      $response->getRawResponse(),
-      $data,
-      401
+        $response->getRawResponse(),
+        $data,
+        401
     );
-  }
-
-  /**
-   * Request a code from a long lived access token.
-   *
-   * @param array $params
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return string
-   *
-   * @throws FacebookRequestException
-   */
-  public static function requestCode(array $params, $appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Request a code from a long lived access token.
+     *
+     * @param array $params
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return string
+     *
+     * @throws FacebookRequestException
+     */
+    public static function requestCode(array $params, $appId = null, $appSecret = null)
+    {
     $response = static::request('/oauth/client_code', $params, $appId, $appSecret);
     $data = $response->getResponse();
 
     if (isset($data->code)) {
-      return (string) $data->code;
+        return (string) $data->code;
     }
 
     throw FacebookRequestException::create(
-      $response->getRawResponse(),
-      $data,
-      401
+        $response->getRawResponse(),
+        $data,
+        401
     );
-  }
-
-  /**
-   * Send a request to Graph with an app access token.
-   *
-   * @param string $endpoint
-   * @param array $params
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return \Facebook\FacebookResponse
-   *
-   * @throws FacebookRequestException
-   */
-  protected static function request($endpoint, array $params, $appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Send a request to Graph with an app access token.
+     *
+     * @param string $endpoint
+     * @param array $params
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return \Facebook\FacebookResponse
+     *
+     * @throws FacebookRequestException
+     */
+    protected static function request($endpoint, array $params, $appId = null, $appSecret = null)
+    {
     $targetAppId = FacebookSession::_getTargetAppId($appId);
     $targetAppSecret = FacebookSession::_getTargetAppSecret($appSecret);
 
     if (!isset($params['client_id'])) {
-      $params['client_id'] = $targetAppId;
+        $params['client_id'] = $targetAppId;
     }
     if (!isset($params['client_secret'])) {
-      $params['client_secret'] = $targetAppSecret;
+        $params['client_secret'] = $targetAppSecret;
     }
 
     // The response for this endpoint is not JSON, so it must be handled
     //   differently, not as a GraphObject.
     $request = new FacebookRequest(
-      FacebookSession::newAppSession($targetAppId, $targetAppSecret),
-      'GET',
-      $endpoint,
-      $params
+        FacebookSession::newAppSession($targetAppId, $targetAppSecret),
+        'GET',
+        $endpoint,
+        $params
     );
     return $request->execute();
-  }
-
-  /**
-   * Get more info about an access token.
-   *
-   * @param string|null $appId
-   * @param string|null $appSecret
-   *
-   * @return GraphSessionInfo
-   */
-  public function getInfo($appId = null, $appSecret = null)
-  {
+    }
+
+    /**
+     * Get more info about an access token.
+     *
+     * @param string|null $appId
+     * @param string|null $appSecret
+     *
+     * @return GraphSessionInfo
+     */
+    public function getInfo($appId = null, $appSecret = null)
+    {
     $params = array('input_token' => $this->accessToken);
 
     $request = new FacebookRequest(
-      FacebookSession::newAppSession($appId, $appSecret),
-      'GET',
-      '/debug_token',
-      $params
+        FacebookSession::newAppSession($appId, $appSecret),
+        'GET',
+        '/debug_token',
+        $params
     );
     $response = $request->execute()->getGraphObject(GraphSessionInfo::className());
 
     // Update the data on this token
     if ($response->getExpiresAt()) {
-      $this->expiresAt = $response->getExpiresAt();
+        $this->expiresAt = $response->getExpiresAt();
     }
 
     return $response;
-  }
-
-  /**
-   * Returns the access token as a string.
-   *
-   * @return string
-   */
-  public function __toString()
-  {
+    }
+
+    /**
+     * Returns the access token as a string.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
     return $this->accessToken;
-  }
-
-  /**
-   * Returns true if the access token is an app session token.
-   *
-   * @return bool
-   */
-  public function isAppSession()
-  {
+    }
+
+    /**
+     * Returns true if the access token is an app session token.
+     *
+     * @return bool
+     */
+    public function isAppSession()
+    {
     return strpos($this->accessToken, "|") !== false;
-  }
+    }
 
 }

main/document/edit_draw.php

Indentation +21 added lines, -21 removed lines

@@ -43,7 +43,7 @@ 
 //path for svg-edit save
 $_SESSION['draw_dir'] = Security::remove_XSS($dir);
 if ($_SESSION['draw_dir'] == '/') {
-	$_SESSION['draw_dir'] = '';
+    $_SESSION['draw_dir'] = '';
 }
 $_SESSION['draw_file'] = basename(Security::remove_XSS($file_path));
 $get_file = Security::remove_XSS($file_path);
@@ -59,26 +59,26 @@ 
 /* Please, do not modify this dirname formatting */
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO:clean
@@ -87,8 +87,8 @@ 
         'url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq(),
         'name' => get_lang('GroupSpace'),
     );
-	$group_document = true;
-	$noPHP_SELF = true;
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
@@ -114,10 +114,10 @@ 
 }
 
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
 
 if (!$is_allowedToEdit) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Event::event_access_tool(TOOL_DOCUMENT);
@@ -131,13 +131,13 @@ 
 echo '</div>';
 
 if (api_browser_support('svg')) {
-	//automatic loading the course language
-	$svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
-	$langsvgedit  = api_get_language_isocode();
-	$langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
-	$langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
-	$svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
-	?>
+    //automatic loading the course language
+    $svgedit_code_translation_table = array('' => 'en', 'pt' => 'pt-Pt', 'sr' => 'sr_latn');
+    $langsvgedit  = api_get_language_isocode();
+    $langsvgedit = isset($svgedit_code_translation_table[$langsvgedit]) ? $svgedit_code_translation_table[$langsvgedit] : $langsvgedit;
+    $langsvgedit = file_exists(api_get_path(LIBRARY_PATH).'javascript/svgedit/locale/lang.'.$langsvgedit.'.js') ? $langsvgedit : 'en';
+    $svg_url = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/svg-editor.php?url=../../../../../courses/'.$courseDir.$dir.$file.'&lang='.$langsvgedit;
+    ?>
 	<script>
 	document.write ('<iframe id="frame" frameborder="0" scrolling="no" src="<?php echo  $svg_url; ?>" width="100%" height="100%"><noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>');
 	function resizeIframe() {
@@ -155,9 +155,9 @@ 
 
     <?php
     echo '<noscript>';
-	echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
-	echo '</noscript>';
+    echo '<iframe style="height: 550px; width: 100%;" scrolling="no" frameborder="0\' src="'.$svg_url.'"<noframes><p>Sorry, your browser does not handle frames</p></noframes></iframe>';
+    echo '</noscript>';
 } else {
-	Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
+    Display::display_error_message(get_lang('BrowserDontSupportsSVG'));
 }
 Display::display_footer();

main/inc/lib/exercise_show_functions.lib.php

Indentation +107 added lines, -107 removed lines

@@ -17,25 +17,25 @@ 
  */
 class ExerciseShowFunctions
 {
-	/**
-	 * Shows the answer to a fill-in-the-blanks question, as HTML
+    /**
+     * Shows the answer to a fill-in-the-blanks question, as HTML
      * @param int $feedbackType
-	 * @param string    $answer
-	 * @param int $id       Exercise ID
-	 * @param int $questionId      Question ID
+     * @param string    $answer
+     * @param int $id       Exercise ID
+     * @param int $questionId      Question ID
      * @param int $resultsDisabled
      * @param string $originalStudentAnswer
      *
-	 * @return void
-	 */
-	public static function display_fill_in_blanks_answer(
-	    $feedbackType,
-	    $answer,
-	    $id,
-	    $questionId,
-	    $resultsDisabled,
-	    $originalStudentAnswer = '',
-	    $showTotalScoreAndUserChoices
+     * @return void
+     */
+    public static function display_fill_in_blanks_answer(
+        $feedbackType,
+        $answer,
+        $id,
+        $questionId,
+        $resultsDisabled,
+        $originalStudentAnswer = '',
+        $showTotalScoreAndUserChoices
     ) {
         $answerHTML = FillBlanks::getHtmlDisplayForAnswer($answer, $resultsDisabled, $showTotalScoreAndUserChoices);
         if (strpos($originalStudentAnswer, 'font color') !== false) {
@@ -64,7 +64,7 @@ 
             </tr>
         <?php
         }
-	}
+    }
 
     /**
      * Shows the answer to a calculated question, as HTML
@@ -105,20 +105,20 @@ 
         }
     }
 
-	/**
-	 * Shows the answer to a free-answer question, as HTML
-	 * @param string    Answer text
-	 * @param int       Exercise ID
-	 * @param int       Question ID
-	 * @return void
-	 */
-	public static function display_free_answer(
-	    $feedback_type,
-	    $answer,
-	    $exe_id,
-	    $questionId,
-	    $questionScore = null,
-	    $results_disabled = 0
+    /**
+     * Shows the answer to a free-answer question, as HTML
+     * @param string    Answer text
+     * @param int       Exercise ID
+     * @param int       Question ID
+     * @return void
+     */
+    public static function display_free_answer(
+        $feedback_type,
+        $answer,
+        $exe_id,
+        $questionId,
+        $questionScore = null,
+        $results_disabled = 0
     ) {
         $comments = Event::get_comments($exe_id, $questionId);
 
@@ -136,17 +136,17 @@ 
                 echo '</tr>';
             }
         }
-	}
+    }
 
     /**
-    * @param $feedback_type
-    * @param $answer
-    * @param $id
-    * @param $questionId
-    * @param null $nano
-    * @param int $results_disabled
+     * @param $feedback_type
+     * @param $answer
+     * @param $id
+     * @param $questionId
+     * @param null $nano
+     * @param int $results_disabled
      */
-	public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
+    public static function display_oral_expression_answer($feedback_type, $answer, $id, $questionId, $fileUrl = null, $results_disabled = 0)
     {
         if (isset($fileUrl)) {
             echo '
@@ -184,8 +184,8 @@ 
         }
     }
 
-	/**
-	 * Displays the answer to a hotspot question
+    /**
+     * Displays the answer to a hotspot question
      * @param int $feedback_type
      * @param int $answerId
      * @param string $answer
@@ -194,7 +194,7 @@ 
      * @param int $resultsDisabled
      * @param int $orderColor
      */
-	public static function display_hotspot_answer(
+    public static function display_hotspot_answer(
         $feedback_type,
         $answerId,
         $answer,
@@ -217,7 +217,7 @@ 
             }
         }
 
-		$hotspot_colors = array(
+        $hotspot_colors = array(
             "", // $i starts from 1 on next loop (ugly fix)
             "#4271B5",
             "#FE8E16",
@@ -234,7 +234,7 @@ 
             "#F7BDE2"
         );
 
-		?>
+        ?>
 		<table class="data_table">
 		<tr>
             <td class="text-center" width="5%">
@@ -246,10 +246,10 @@ 
 			<td class="text-left" width="10%">
 				<?php
                 if (!$hide_expected_answer) {
-    				$my_choice = $studentChoice ? get_lang('Correct') : get_lang('Fault');
-    				echo $my_choice;
+                    $my_choice = $studentChoice ? get_lang('Correct') : get_lang('Fault');
+                    echo $my_choice;
                 }
-				?>
+                ?>
 			</td>
 			<?php if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
 			<td class="text-left" width="60%">
@@ -257,29 +257,29 @@ 
                 if ($studentChoice) {
                     echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
                 }
-				?>
+                ?>
 			</td>
 			<?php } else { ?>
 				<td class="text-left" width="60%">&nbsp;</td>
 			<?php } ?>
 		</tr>
 		<?php
-	}
-
-	/**
-	 * Display the answers to a multiple choice question
-	 * @param int $feedback_type Feedback type
-	 * @param integer Answer type
-	 * @param integer Student choice
-	 * @param string  Textual answer
-	 * @param string  Comment on answer
-	 * @param string  Correct answer comment
-	 * @param integer Exercise ID
-	 * @param integer Question ID
-	 * @param boolean Whether to show the answer comment or not
-	 * @return void
-	 */
-	public static function display_unique_or_multiple_answer(
+    }
+
+    /**
+     * Display the answers to a multiple choice question
+     * @param int $feedback_type Feedback type
+     * @param integer Answer type
+     * @param integer Student choice
+     * @param string  Textual answer
+     * @param string  Comment on answer
+     * @param string  Correct answer comment
+     * @param integer Exercise ID
+     * @param integer Question ID
+     * @param boolean Whether to show the answer comment or not
+     * @return void
+     */
+    public static function display_unique_or_multiple_answer(
         $feedback_type,
         $answerType,
         $studentChoice,
@@ -307,14 +307,14 @@ 
         }
 
         $icon = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$icon .= $studentChoice?'_on':'_off';
-		$icon .= '.gif';
+        $icon .= $studentChoice?'_on':'_off';
+        $icon .= '.gif';
 
-		$iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
-		$iconAnswer .= $answerCorrect?'_on':'_off';
-		$iconAnswer .= '.gif';
+        $iconAnswer = in_array($answerType, array(UNIQUE_ANSWER, UNIQUE_ANSWER_NO_OPTION)) ? 'radio':'checkbox';
+        $iconAnswer .= $answerCorrect?'_on':'_off';
+        $iconAnswer .= '.gif';
 
-		?>
+        ?>
 		<tr>
 		<td width="5%">
 			<?php echo Display::return_icon($icon); ?>
@@ -328,39 +328,39 @@ 
 		</td>
 		<td width="40%">
 			<?php
-			echo $answer;
-			?>
+            echo $answer;
+            ?>
 		</td>
 
 		<?php if ($feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) { ?>
 		<td width="20%">
 			<?php
             if ($studentChoice) {
-				if ($answerCorrect) {
+                if ($answerCorrect) {
                     $color = 'green';
-					//echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
-				} else {
+                    //echo '<span style="font-weight: bold; color: #008000;">'.nl2br($answerComment).'</span>';
+                } else {
                     $color = 'black';
                     //echo '<span style="font-weight: bold; color: #FF0000;">'.nl2br($answerComment).'</span>';
-				}
-				if ($hide_expected_answer) {
-				    $color = '';
-				}
+                }
+                if ($hide_expected_answer) {
+                    $color = '';
+                }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
-			}
-			?>
+            }
+            ?>
 		</td>
 			<?php
-		    if ($ans==1) {
-		        $comm = Event::get_comments($id,$questionId);
-			}
-		    ?>
+            if ($ans==1) {
+                $comm = Event::get_comments($id,$questionId);
+            }
+            ?>
 		 <?php } else { ?>
 			<td>&nbsp;</td>
 		<?php } ?>
 		</tr>
 		<?php
-	}
+    }
 
     /**
      * Display the answers to a multiple choice question
@@ -413,7 +413,7 @@ 
         if (isset($new_options[$studentChoice])) {
             echo get_lang($new_options[$studentChoice]['name']);
         } else {
-        	echo '-';
+            echo '-';
         }
 
         ?>
@@ -421,7 +421,7 @@ 
         <td width="5%">
         <?php
 
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($new_options[$answerCorrect])) {
                 echo get_lang($new_options[$answerCorrect]['name']);
@@ -447,8 +447,8 @@ 
                 }
 
                 if ($hide_expected_answer) {
-				    $color = '';
-				}
+                    $color = '';
+                }
 
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
@@ -466,19 +466,19 @@ 
         <?php
     }
 
-     /**
-     * Display the answers to a multiple choice question
-     *
-     * @param integer Answer type
-     * @param integer Student choice
-     * @param string  Textual answer
-     * @param string  Comment on answer
-     * @param string  Correct answer comment
-     * @param integer Exercise ID
-     * @param integer Question ID
-     * @param boolean Whether to show the answer comment or not
-     * @return void
-     */
+        /**
+         * Display the answers to a multiple choice question
+         *
+         * @param integer Answer type
+         * @param integer Student choice
+         * @param string  Textual answer
+         * @param string  Comment on answer
+         * @param string  Correct answer comment
+         * @param integer Exercise ID
+         * @param integer Question ID
+         * @param boolean Whether to show the answer comment or not
+         * @return void
+         */
     public static function display_multiple_answer_combination_true_false(
         $feedback_type,
         $answerType,
@@ -509,7 +509,7 @@ 
         <tr>
         <td width="5%">
         <?php
-		//Your choice
+        //Your choice
         $question = new MultipleAnswerCombinationTrueFalse();
         if (isset($question->options[$studentChoice])) {
             echo $question->options[$studentChoice];
@@ -520,7 +520,7 @@ 
         </td>
         <td width="5%">
         <?php
-		//Expected choice
+        //Expected choice
         if (!$hide_expected_answer) {
             if (isset($question->options[$answerCorrect])) {
                 echo $question->options[$answerCorrect];
@@ -545,14 +545,14 @@ 
             <?php
             //@todo replace this harcoded value
             if ($studentChoice) {
-                 $color = "black";
+                    $color = "black";
                 if ($studentChoice == $answerCorrect) {
                     $color = "green";
                 }
-            	//echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
+                //echo '<span style="font-weight: bold; color: #000;">'.nl2br($answerComment).'</span>';
                 if ($hide_expected_answer) {
                     $color = '';
-				}
+                }
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
             ?>

plugin/vchamilo/lib.php

Indentation +1 added lines, -1 removed lines

@@ -582,7 +582,7 @@
             false
         );
 
-          Display::addFlash(
+            Display::addFlash(
             Display::return_message("Copying {$absolute_template_datadir}/data/archive => $archivePath")
         );
         copyDirTo(

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

Indentation +748 added lines, -748 removed lines

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

main/inc/lib/chat.lib.php

Indentation +10 added lines, -10 removed lines

@@ -39,12 +39,12 @@ 
     }
 
     /**
-    * Set user chat status
-    * @param int 0 if disconnected, 1 if connected
-    * @param integer $status
+     * Set user chat status
+     * @param int 0 if disconnected, 1 if connected
+     * @param integer $status
      *
-    * @return void
-    */
+     * @return void
+     */
     public function setUserStatus($status)
     {
         UserManager::update_extra_field_value(api_get_user_id(), 'user_chat_status', $status);
@@ -148,10 +148,10 @@ 
     }
 
     /**
-    * Returns an array of messages inside a chat session with a specific user
-    * @param int The ID of the user with whom the current user is chatting
-    * @return array Messages list
-    */
+     * Returns an array of messages inside a chat session with a specific user
+     * @param int The ID of the user with whom the current user is chatting
+     * @return array Messages list
+     */
     public function box_session($user_id)
     {
         $items = array();
@@ -299,7 +299,7 @@ 
             }
         }
          
-         return false;
+            return false;
     }
     
     public function is_chat_blocked_by_exercises()