chamilo / chamilo-lms

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

Doc Comments +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
   /**
    * Returns the raw signed request data.
    *
-   * @return string|null
+   * @return string
    */
   public function getRawSignedRequest()
   {
@@ -84,7 +84,7 @@ 
    * Returns a property from the signed request data if available.
    *
    * @param string $key
-   * @param mixed|null $default
+   * @param integer $default
    *
    * @return mixed|null
    */

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|null
-   */
-  public function getRawSignedRequest()
-  {
+    }
+
+    /**
+     * Returns the raw signed request data.
+     *
+     * @return string|null
+     */
+    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 mixed|null $default
-   *
-   * @return mixed|null
-   */
-  public function get($key, $default = null)
-  {
+    }
+
+    /**
+     * Returns a property from the signed request data if available.
+     *
+     * @param string $key
+     * @param mixed|null $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/functions.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
  *      - language
  *      - courses : string of all courses code separated by '|'
  *      - admin : boolean
- * @return boolean
+ * @return boolean|null
  * @author ndiechburg <noel@cblue.be>
  * */
 function external_update_user($new_user) {

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     //Those are the mandatory fields for user creation.
     //See external_add_user function for all the fields you can have.
     $table = USERINFO_TABLE;
-    $sql = "SELECT * from $table where username='" . Database::escape_string($login) . "'";
+    $sql = "SELECT * from $table where username='".Database::escape_string($login)."'";
     $result = Database::query($sql);
 
     if (Database::num_rows($result) == 0) { //false password

Braces +37 added lines, -24 removed lines

@@ -95,30 +95,43 @@
  * */
 function external_add_user($u) {
     //Setting default
-    if (empty($u['password']))
-        $u['password'] = null;
-    if (empty($u['status']))
-        $u['status'] = 5;
-    if (!isset($u['official_code']))
-        $u['official_code'] = '';
-    if (!isset($u['language']))
-        $u['language'] = '';
-    if (!isset($u['phone']))
-        $u['phone'] = '';
-    if (!isset($u['picture_uri']))
-        $u['picture_uri'] = '';
-    if (!isset($u['auth_source']))
-        $u['auth_source'] = PLATFORM_AUTH_SOURCE;
-    if (!isset($u['expiration_date']))
-        $u['expiration_date'] = '0000-00-00 00:00:00';
-    if (!isset($u['active']))
-        $u['active'] = 1;
-    if (!isset($u['hr_dept_id']))
-        $u['hr_dept_id'] = 0; //id of responsible HR
-    if (!isset($u['extra']))
-        $u['extra'] = null;
-    if (!isset($u['encrypt_method']))
-        $u['encrypt_method'] = '';
+    if (empty($u['password'])) {
+            $u['password'] = null;
+    }
+    if (empty($u['status'])) {
+            $u['status'] = 5;
+    }
+    if (!isset($u['official_code'])) {
+            $u['official_code'] = '';
+    }
+    if (!isset($u['language'])) {
+            $u['language'] = '';
+    }
+    if (!isset($u['phone'])) {
+            $u['phone'] = '';
+    }
+    if (!isset($u['picture_uri'])) {
+            $u['picture_uri'] = '';
+    }
+    if (!isset($u['auth_source'])) {
+            $u['auth_source'] = PLATFORM_AUTH_SOURCE;
+    }
+    if (!isset($u['expiration_date'])) {
+            $u['expiration_date'] = '0000-00-00 00:00:00';
+    }
+    if (!isset($u['active'])) {
+            $u['active'] = 1;
+    }
+    if (!isset($u['hr_dept_id'])) {
+            $u['hr_dept_id'] = 0;
+    }
+    //id of responsible HR
+    if (!isset($u['extra'])) {
+            $u['extra'] = null;
+    }
+    if (!isset($u['encrypt_method'])) {
+            $u['encrypt_method'] = '';
+    }
 
     $chamilo_uid = UserManager::create_user($u['firstname'], $u['lastname'], $u['status'], $u['email'], $u['username'], $u['password'], $u['official_code'], $u['language'], $u['phone'], $u['picture_uri'], $u['auth_source'], $u['expiration_date'], $u['active'], $u['hr_dept_id'], $u['extra'], $u['encrypt_method']);
     return $chamilo_uid;

main/auth/external_login/ldap.inc.php

Doc Comments +3 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 /**
  * Establishes a connection to the LDAP server and sets the protocol version
  *
- * @return resource ldap link identifier or false
+ * @return boolean ldap link identifier or false
  * @author ndiechburg <noel@cblue.be>
  * */
 function extldap_connect()
@@ -77,6 +77,7 @@ 
 /**
  * Authenticate user on external ldap server and return user ldap entry if that succeeds
  *
+ * @param string $password
  * @return mixed false if user cannot authenticate on ldap, user ldap entry if tha succeeds
  * @author ndiechburg <noel@cblue.be>
  * Modified by hubert.borderiou@grenet.fr
@@ -237,7 +238,7 @@ 
 
 /**
  * Imports all LDAP users into Chamilo
- * @return bool false on error, true otherwise
+ * @return false|null false on error, true otherwise
  */
 function extldap_import_all_users()
 {

Spacing +1 added lines, -1 removed lines

@@ -303,7 +303,7 @@
 
     // TODO the password, if encrypted at the source, will be encrypted twice, which makes it useless. Try to fix that.
     $passwordKey = isset($extldap_user_correspondance['password']) ? $extldap_user_correspondance['password'] : 'userPassword';
-    $password        = $data[$passwordKey][0];
+    $password = $data[$passwordKey][0];
 
     // To ease management, we add the step-year (etape-annee) code
     //$official_code = $etape."-".$annee;

main/auth/key/key_auth.class.php

Doc Comments +4 added lines

@@ -65,6 +65,7 @@ 
      * If empty it disables authentication.
      *
      * !! 10 chars max !!
+     * @param string $_
      */
     public static function enable_services($_)
     {
@@ -254,6 +255,9 @@ 
         return Request::get('cidReq', 0);
     }
 
+    /**
+     * @return integer
+     */
     public function get_group_id()
     {
         return Request::get('gidReq', 0);

main/auth/ldap/authldap.php

Doc Comments +3 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
 require 'ldap_var.inc.php';
 /**
  *    Check login and password with LDAP
- *    @return true when login & password both OK, false otherwise
+ *    @return boolean when login & password both OK, false otherwise
  *    @author Roan Embrechts (based on code from Universit� Jean Monet)
  */
 
@@ -305,7 +305,7 @@ 
 } // end of check
 /**
  * Set the protocol version with version from config file (enables LDAP version 3)
- * @param    resource    The LDAP connexion resource, passed by reference.
+ * @param    resource    resource LDAP connexion resource, passed by reference.
  * @return    void
  */
 function ldap_set_version(&$resource) {
@@ -323,6 +323,7 @@ 
  * Handle bind (whether authenticated or not)
  * @param    resource    The LDAP handler to which we are connecting (by reference)
  * @param    resource    The LDAP bind handler we will be modifying
+ * @param boolean $ldap_bind
  * @return    boolean        Status of the bind assignment. True for success, false for failure.
  */
 function ldap_handle_bind(&$ldap_handler,&$ldap_bind) {

Spacing +92 added lines, -92 removed lines

@@ -78,16 +78,16 @@ 
     // res=-1 -> the user does not exist in the ldap database
     // res=1 -> invalid password (user does exist)
 
-    if ($res==1) { //WRONG PASSWORD
+    if ($res == 1) { //WRONG PASSWORD
         //$errorMessage = "LDAP User or password incorrect, try again.<br />";
         if (isset($log)) unset($log); if (isset($uid)) unset($uid);
         $loginLdapSucces = false;
     }
-    if ($res==-1) { //WRONG USERNAME
+    if ($res == -1) { //WRONG USERNAME
         //$errorMessage =  "LDAP User or password incorrect, try again.<br />";
         $login_ldap_success = false;
     }
-    if ($res==0) { //LOGIN & PASSWORD OK - SUCCES
+    if ($res == 0) { //LOGIN & PASSWORD OK - SUCCES
         //$errorMessage = "Successful login w/ LDAP.<br>";
         $login_ldap_success = true;
     }
@@ -103,30 +103,30 @@ 
  *    @author Stefan De Wannemacker
  *    @author Roan Embrechts
  */
-function ldap_find_user_info ($login) {
+function ldap_find_user_info($login) {
     //error_log('Entering ldap_find_user_info('.$login.')',0);
     global $ldap_host, $ldap_port, $ldap_basedn, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     // basic sequence with LDAP is connect, bind, search,
     // interpret search result, close connection
 
     //echo "Connecting ...";
-    $ldap_connect = ldap_connect( $ldap_host, $ldap_port);
+    $ldap_connect = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ldap_connect);
     if ($ldap_connect) {
         //echo " Connect to LDAP server successful ";
         //echo "Binding ...";
         $ldap_bind = false;
-        $ldap_bind_res = ldap_handle_bind($ldap_connect,$ldap_bind);
+        $ldap_bind_res = ldap_handle_bind($ldap_connect, $ldap_bind);
         if ($ldap_bind_res) {
             //echo " LDAP bind successful... ";
             //echo " Searching for uid... ";
             // Search surname entry
             //OLD: $sr=ldap_search($ldapconnect,"dc=rug, dc=ac, dc=be", "uid=$login");
             //echo "<p> ldapDc = '$LDAPbasedn' </p>";
-            if(!empty($ldap_search_dn)) {
-                $sr=ldap_search($ldap_connect, $ldap_search_dn, "uid=$login");
+            if (!empty($ldap_search_dn)) {
+                $sr = ldap_search($ldap_connect, $ldap_search_dn, "uid=$login");
             } else {
-                $sr=ldap_search($ldap_connect, $ldap_basedn, "uid=$login");
+                $sr = ldap_search($ldap_connect, $ldap_basedn, "uid=$login");
             }
             //echo " Search result is ".$sr;
             //echo " Number of entries returned is ".ldap_count_entries($ldapconnect,$sr);
@@ -177,25 +177,25 @@ 
     $password1  = $ldap_pass_placeholder;
     $official_code = '';
 
-    define ("STUDENT",5);
-    define ("COURSEMANAGER",1);
+    define("STUDENT", 5);
+    define("COURSEMANAGER", 1);
 
     $tutor_field = api_get_setting('ldap_filled_tutor_field');
     $tutor_value = api_get_setting('ldap_filled_tutor_field_value');
-    if(empty($tutor_field)) {
+    if (empty($tutor_field)) {
         $status = STUDENT;
     } else {
-        if(empty($tutor_value)) {
+        if (empty($tutor_value)) {
             //in this case, we are assuming that the admin didn't give a criteria
             // so that if the field is not empty, it is a tutor
-            if(!empty($info_array[$tutor_field])) {
+            if (!empty($info_array[$tutor_field])) {
                 $status = COURSEMANAGER;
             } else {
                 $status = STUDENT;
             }
         } else {
             //the tutor_value is filled, so we need to check the contents of the LDAP field
-            if (is_array($info_array[$tutor_field]) && in_array($tutor_value,$info_array[$tutor_field])) {
+            if (is_array($info_array[$tutor_field]) && in_array($tutor_value, $info_array[$tutor_field])) {
                 $status = COURSEMANAGER;
             } else {
                 $status = STUDENT;
@@ -212,7 +212,7 @@ 
     if (empty($language)) { $language = 'english'; }
     $_userId = UserManager::create_user($prenom, $nom, $status,
                      $email, $uname, $password, $official_code,
-                     $language,'', '', 'ldap');
+                     $language, '', '', 'ldap');
 
     //echo "new user added to Chamilo, id = $_userId";
 
@@ -246,58 +246,58 @@ 
  * @param string password given by user
  * @return int 0 if authentication succeeded, 1 if password was incorrect, -1 if it didn't belong to LDAP
  */
-function ldap_authentication_check ($uname, $passwd) {
+function ldap_authentication_check($uname, $passwd) {
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
-    global $ldap_host, $ldap_port, $ldap_basedn, $ldap_host2, $ldap_port2,$ldap_rdn,$ldap_pass;
+    global $ldap_host, $ldap_port, $ldap_basedn, $ldap_host2, $ldap_port2, $ldap_rdn, $ldap_pass;
     //error_log('Entering ldap_authentication_check('.$uname.','.$passwd.')',0);
     // Establish anonymous connection with LDAP server
     // Etablissement de la connexion anonyme avec le serveur LDAP
-    $ds=ldap_connect($ldap_host,$ldap_port);
+    $ds = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ds);
 
     $test_bind = false;
-    $test_bind_res = ldap_handle_bind($ds,$test_bind);
+    $test_bind_res = ldap_handle_bind($ds, $test_bind);
     //if problem, use the replica
-    if ($test_bind_res===false) {
-        $ds=ldap_connect($ldap_host2,$ldap_port2);
+    if ($test_bind_res === false) {
+        $ds = ldap_connect($ldap_host2, $ldap_port2);
         ldap_set_version($ds);
     } else {
         //error_log('Connected to server '.$ldap_host);
     }
-    if ($ds!==false) {
+    if ($ds !== false) {
         //Creation of filter containing values input by the user
         // Here it might be necessary to use $filter="(samaccountName=$uname)"; - see http://support.chamilo.org/issues/4675
-        $filter="(uid=$uname)";
+        $filter = "(uid=$uname)";
         // Open anonymous LDAP connection
-        $result=false;
-        $ldap_bind_res = ldap_handle_bind($ds,$result);
+        $result = false;
+        $ldap_bind_res = ldap_handle_bind($ds, $result);
 	// Executing the search with the $filter parametr
         //error_log('Searching for '.$filter.' on LDAP server',0);
-        $sr=ldap_search($ds,$ldap_basedn,$filter);
+        $sr = ldap_search($ds, $ldap_basedn, $filter);
         $info = ldap_get_entries($ds, $sr);
-        $dn=($info[0]["dn"]);
+        $dn = ($info[0]["dn"]);
         // debug !!    echo"<br> dn = $dn<br> pass = $passwd<br>";
         // closing 1st connection
         ldap_close($ds);
     }
 
     // test the Distinguish Name from the 1st connection
-    if ($dn=="") {
-        return (-1);        // doesn't belong to the addressbook
+    if ($dn == "") {
+        return (-1); // doesn't belong to the addressbook
     }
     //bug ldap.. if password empty, return 1!
-    if ($passwd=="") {
+    if ($passwd == "") {
         return(1);
     }
     // Opening 2nd LDAP connection : Connection user for password check
-    $ds=ldap_connect($ldap_host,$ldap_port);
+    $ds = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ds);
     if (!$test_bind) {
-        $ds=ldap_connect($ldap_host2,$ldap_port2);
+        $ds = ldap_connect($ldap_host2, $ldap_port2);
         ldap_set_version($ds);
     }
     // return in case of wrong password connection error
-    if (@ldap_bind( $ds, $dn , $passwd) === false) {
+    if (@ldap_bind($ds, $dn, $passwd) === false) {
         return (1); // invalid password
     } else {// connection successfull
         return (0);
@@ -311,7 +311,7 @@ 
 function ldap_set_version(&$resource) {
     //error_log('Entering ldap_set_version(&$resource)',0);
     global $ldap_version;
-    if ($ldap_version>2) {
+    if ($ldap_version > 2) {
         if (ldap_set_option($resource, LDAP_OPT_PROTOCOL_VERSION, 3)) {
             //ok - don't do anything
         } else {
@@ -325,14 +325,14 @@ 
  * @param    resource    The LDAP bind handler we will be modifying
  * @return    boolean        Status of the bind assignment. True for success, false for failure.
  */
-function ldap_handle_bind(&$ldap_handler,&$ldap_bind) {
+function ldap_handle_bind(&$ldap_handler, &$ldap_bind) {
     //error_log('Entering ldap_handle_bind(&$ldap_handler,&$ldap_bind)',0);
-    global $ldap_rdn,$ldap_pass, $extldap_config;
+    global $ldap_rdn, $ldap_pass, $extldap_config;
     $ldap_rdn = $extldap_config['admin_dn'];
     $ldap_pass = $extldap_config['admin_password'];
     if (!empty($ldap_rdn) and !empty($ldap_pass)) {
         //error_log('Trying authenticated login :'.$ldap_rdn.'/'.$ldap_pass,0);
-        $ldap_bind = ldap_bind($ldap_handler,$ldap_rdn,$ldap_pass);
+        $ldap_bind = ldap_bind($ldap_handler, $ldap_rdn, $ldap_pass);
         if (!$ldap_bind) {
             //error_log('Authenticated login failed',0);
             //try in anonymous mode, you never know...
@@ -358,40 +358,40 @@ 
 
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn, $extldap_user_correspondance;
 
-    $keyword_firstname = isset($_GET['keyword_firstname']) ? trim(Database::escape_string($_GET['keyword_firstname'])): '';
+    $keyword_firstname = isset($_GET['keyword_firstname']) ? trim(Database::escape_string($_GET['keyword_firstname'])) : '';
     $keyword_lastname = isset($_GET['keyword_lastname']) ? trim(Database::escape_string($_GET['keyword_lastname'])) : '';
     $keyword_username = isset($_GET['keyword_username']) ? trim(Database::escape_string($_GET['keyword_username'])) : '';
     $keyword_type = isset($_GET['keyword_type']) ? Database::escape_string($_GET['keyword_type']) : '';
 
-    $ldap_query=array();
+    $ldap_query = array();
 
     if ($keyword_username != "") {
         $ldap_query[] = str_replace('%username%', $keyword_username, $ldap_search_dn);
     } else {
-        if ($keyword_lastname!=""){
-            $ldap_query[]="(".$extldap_user_correspondance['lastname']."=".$keyword_lastname."*)";
+        if ($keyword_lastname != "") {
+            $ldap_query[] = "(".$extldap_user_correspondance['lastname']."=".$keyword_lastname."*)";
         }
-        if ($keyword_firstname!="") {
-            $ldap_query[]="(".$extldap_user_correspondance['firstname']."=".$keyword_firstname."*)";
+        if ($keyword_firstname != "") {
+            $ldap_query[] = "(".$extldap_user_correspondance['firstname']."=".$keyword_firstname."*)";
         }
     }
-    if ($keyword_type !="" && $keyword_type !="all") {
-        $ldap_query[]="(employeeType=".$keyword_type.")";
+    if ($keyword_type != "" && $keyword_type != "all") {
+        $ldap_query[] = "(employeeType=".$keyword_type.")";
     }
 
-    if (count($ldap_query)>1){
-        $str_query.="(& ";
-        foreach ($ldap_query as $query){
-            $str_query.=" $query";
+    if (count($ldap_query) > 1) {
+        $str_query .= "(& ";
+        foreach ($ldap_query as $query) {
+            $str_query .= " $query";
         }
-        $str_query.=" )";
+        $str_query .= " )";
     } else {
-        $str_query= count($ldap_query) > 0 ? $ldap_query[0] : null;
+        $str_query = count($ldap_query) > 0 ? $ldap_query[0] : null;
     }
 
     $ds = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ds);
-    if ($ds && count($ldap_query)>0) {
+    if ($ds && count($ldap_query) > 0) {
         $r = false;
         $res = ldap_handle_bind($ds, $r);
         //$sr = ldap_search($ds, "ou=test-ou,$ldap_basedn", $str_query);
@@ -401,7 +401,7 @@ 
         return $info;
 
     } else {
-        if (count($ldap_query)!=0)
+        if (count($ldap_query) != 0)
             Display :: display_error_message(get_lang('LDAPConnectionError'));
         return array();
     }
@@ -414,7 +414,7 @@ 
  */
 function ldap_get_number_of_users() {
     $info = ldap_get_users();
-    if (count($info)>0) {
+    if (count($info) > 0) {
         return $info['count'];
     } else {
         return 0;
@@ -434,9 +434,9 @@ 
     $is_western_name_order = api_is_western_name_order();
     if (isset($_GET['submit'])) {
         $info = ldap_get_users();
-        if ($info['count']>0) {
-            for ($key = 0; $key < $info["count"]; $key ++) {
-                $user=array();
+        if ($info['count'] > 0) {
+            for ($key = 0; $key < $info["count"]; $key++) {
+                $user = array();
                 // Get uid from dn
                 //YW: this might be a variation between LDAP 2 and LDAP 3, but in LDAP 3, the uid is in
                 //the corresponding index of the array
@@ -470,9 +470,9 @@ 
  * @return string Some HTML-code with modify-buttons
  * @author    Mustapha Alouani
  */
-function modify_filter($user_id,$url_params, $row) {
-    $query_string="id[]=".$row[0];
-    if (!empty($_GET['id_session'])){
+function modify_filter($user_id, $url_params, $row) {
+    $query_string = "id[]=".$row[0];
+    if (!empty($_GET['id_session'])) {
         $query_string .= '&amp;id_session='.Security::remove_XSS($_GET['id_session']);
     }
     //$url_params_id="id=".$row[0];
@@ -497,7 +497,7 @@ 
     $firstname = api_convert_encoding($data['cn'][0], api_get_system_encoding(), 'UTF-8');
     $email = $data['mail'][0];
     // Get uid from dn
-    $dn_array=ldap_explode_dn($data['dn'],1);
+    $dn_array = ldap_explode_dn($data['dn'], 1);
     $username = $dn_array[0]; // uid is first key
     $outab[] = $data['edupersonprimaryaffiliation'][0]; // Here, "student"
     //$val = ldap_get_values_len($ds, $entry, "userPassword");
@@ -505,29 +505,29 @@ 
     //$password = $val[0];
     // TODO the password, if encrypted at the source, will be encrypted twice, which makes it useless. Try to fix that.
     $password = $data['userPassword'][0];
-    $structure=$data['edupersonprimaryorgunitdn'][0];
-    $array_structure=explode(",", $structure);
-    $array_val=explode("=", $array_structure[0]);
-    $etape=$array_val[1];
-    $array_val=explode("=", $array_structure[1]);
-    $annee=$array_val[1];
+    $structure = $data['edupersonprimaryorgunitdn'][0];
+    $array_structure = explode(",", $structure);
+    $array_val = explode("=", $array_structure[0]);
+    $etape = $array_val[1];
+    $array_val = explode("=", $array_structure[1]);
+    $annee = $array_val[1];
     // To ease management, we add the step-year (etape-annee) code
-    $official_code=$etape."-".$annee;
-    $auth_source='ldap';
+    $official_code = $etape."-".$annee;
+    $auth_source = 'ldap';
     // No expiration date for students (recover from LDAP's shadow expiry)
-    $expiration_date='0000-00-00 00:00:00';
-    $active=1;
-    if(empty($status)){$status = 5;}
-    if(empty($phone)){$phone = '';}
-    if(empty($picture_uri)){$picture_uri = '';}
+    $expiration_date = '0000-00-00 00:00:00';
+    $active = 1;
+    if (empty($status)) {$status = 5; }
+    if (empty($phone)) {$phone = ''; }
+    if (empty($picture_uri)) {$picture_uri = ''; }
     // Adding user
     $user_id = 0;
     if (UserManager::is_username_available($username)) {
-        $user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
+        $user_id = UserManager::create_user($firstname, $lastname, $status, $email, $username, $password, $official_code, api_get_setting('platformLanguage'), $phone, $picture_uri, $auth_source, $expiration_date, $active);
     } else {
         if ($update_if_exists) {
             $user = api_get_user_info($username);
-            $user_id=$user['user_id'];
+            $user_id = $user['user_id'];
             UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
         }
     }
@@ -544,21 +544,21 @@ 
 
     // Database Table Definitions
     $tbl_session                        = Database::get_main_table(TABLE_MAIN_SESSION);
-    $tbl_session_rel_class                = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
+    $tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
     $tbl_session_rel_course                = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
     $tbl_session_rel_course_rel_user    = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
     $tbl_course                            = Database::get_main_table(TABLE_MAIN_COURSE);
     $tbl_user                            = Database::get_main_table(TABLE_MAIN_USER);
     $tbl_session_rel_user                = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-    $tbl_class                            = Database::get_main_table(TABLE_MAIN_CLASS);
-    $tbl_class_user                        = Database::get_main_table(TABLE_MAIN_CLASS_USER);
+    $tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
+    $tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
 
     $id_session = (int) $id_session;
     // Once users are imported in the users base, we can assign them to the session
-    $result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id ='$id_session'");
-    $CourseList=array();
-    while ($row=Database::fetch_array($result)) {
-        $CourseList[]=$row['c_id'];
+    $result = Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id ='$id_session'");
+    $CourseList = array();
+    while ($row = Database::fetch_array($result)) {
+        $CourseList[] = $row['c_id'];
     }
     foreach ($CourseList as $enreg_course) {
         foreach ($UserList as $enreg_user) {
@@ -569,21 +569,21 @@ 
               "('$id_session','$enreg_course','$enreg_user')");
         }
         $sql = "SELECT COUNT(user_id) as nbUsers ".
-               " FROM $tbl_session_rel_course_rel_user " .
+               " FROM $tbl_session_rel_course_rel_user ".
                " WHERE session_id='$id_session' ".
                " AND c_id='$enreg_course'";
         $rs = Database::query($sql);
         list($nbr_users) = Database::fetch_array($rs);
         Database::query("UPDATE $tbl_session_rel_course  ".
-               " SET nbr_users=$nbr_users " .
+               " SET nbr_users=$nbr_users ".
                " WHERE session_id='$id_session' ".
                " AND c_id='$enreg_course'");
     }
     foreach ($UserList as $enreg_user) {
         $enreg_user = (int) $enreg_user;
         Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
-               " (session_id, user_id, registered_at) " .
-               " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
+               " (session_id, user_id, registered_at) ".
+               " VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')");
     }
     // We update the number of users in the session
     $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
@@ -598,13 +598,13 @@ 
 function syncro_users() {
     global $ldap_basedn, $ldap_host, $ldap_port, $ldap_rdn, $ldap_pass, $ldap_search_dn;
     echo "Connecting ...";
-    $ldap_connect = ldap_connect( $ldap_host, $ldap_port);
+    $ldap_connect = ldap_connect($ldap_host, $ldap_port);
     ldap_set_version($ldap_connect);
     if ($ldap_connect) {
         //echo " Connect to LDAP server successful ";
         //echo "Binding ...";
         $ldap_bind = false;
-        $ldap_bind_res = ldap_handle_bind($ldap_connect,$ldap_bind);
+        $ldap_bind_res = ldap_handle_bind($ldap_connect, $ldap_bind);
         if ($ldap_bind_res) {
             //echo " LDAP bind successful... ";
             //echo " Searching for uid... ";
@@ -612,7 +612,7 @@ 
             //OLD: $sr=ldap_search($ldapconnect,"dc=rug, dc=ac, dc=be", "uid=$login");
             //echo "<p> ldapDc = '$LDAPbasedn' </p>";
             $all_user_query = "uid=*";
-            if(!empty($ldap_search_dn)) {
+            if (!empty($ldap_search_dn)) {
                 $sr = ldap_search($ldap_connect, $ldap_search_dn, $all_user_query);
             } else {
                 $sr = ldap_search($ldap_connect, $ldap_basedn, $all_user_query);
@@ -620,7 +620,7 @@ 
             //echo " Number of entries returned is ".ldap_count_entries($ldapconnect,$sr);
             //echo " Getting entries ...";
             $info = ldap_get_entries($ldap_connect, $sr);
-            for ($key = 0; $key < $info['count']; $key ++) {
+            for ($key = 0; $key < $info['count']; $key++) {
                 $user_id = ldap_add_user_by_array($info[$key], false);
                 if ($user_id) {
                     echo "User #$user_id created ";

Braces +9 added lines, -3 removed lines

@@ -80,7 +80,12 @@ 
 
     if ($res==1) { //WRONG PASSWORD
         //$errorMessage = "LDAP User or password incorrect, try again.<br />";
-        if (isset($log)) unset($log); if (isset($uid)) unset($uid);
+        if (isset($log)) {
+            unset($log);
+        }
+        if (isset($uid)) {
+            unset($uid);
+        }
         $loginLdapSucces = false;
     }
     if ($res==-1) { //WRONG USERNAME
@@ -401,8 +406,9 @@ 
         return $info;
 
     } else {
-        if (count($ldap_query)!=0)
-            Display :: display_error_message(get_lang('LDAPConnectionError'));
+        if (count($ldap_query)!=0) {
+                    Display :: display_error_message(get_lang('LDAPConnectionError'));
+        }
         return array();
     }
 }

Indentation +20 added lines, -21 removed lines

@@ -46,10 +46,9 @@ 
     - Universite Jean Monet (J Dubois / Michel Courbon)
     - Michel Panckoucke for reporting and fixing a bug
     - Patrick Cool: fixing security hole
-
-    *    @author Roan Embrechts
-    *    @version 3.0
-    *    @package chamilo.auth.ldap
+ *    @author Roan Embrechts
+ *    @version 3.0
+ *    @package chamilo.auth.ldap
  * Note:
  * If you are using a firewall, you might need to check port 389 is open in
  * order for Chamilo to communicate with the LDAP server.
@@ -211,8 +210,8 @@ 
     $language = api_get_setting('platformLanguage');
     if (empty($language)) { $language = 'english'; }
     $_userId = UserManager::create_user($prenom, $nom, $status,
-                     $email, $uname, $password, $official_code,
-                     $language,'', '', 'ldap');
+                        $email, $uname, $password, $official_code,
+                        $language,'', '', 'ldap');
 
     //echo "new user added to Chamilo, id = $_userId";
 
@@ -271,7 +270,7 @@ 
         // Open anonymous LDAP connection
         $result=false;
         $ldap_bind_res = ldap_handle_bind($ds,$result);
-	// Executing the search with the $filter parametr
+    // Executing the search with the $filter parametr
         //error_log('Searching for '.$filter.' on LDAP server',0);
         $sr=ldap_search($ds,$ldap_basedn,$filter);
         $info = ldap_get_entries($ds, $sr);
@@ -564,35 +563,35 @@ 
         foreach ($UserList as $enreg_user) {
             $enreg_user = (int) $enreg_user;
             Database::query("INSERT IGNORE ".
-              " INTO $tbl_session_rel_course_rel_user ".
-              "(session_id,c_id,user_id) VALUES ".
-              "('$id_session','$enreg_course','$enreg_user')");
+                " INTO $tbl_session_rel_course_rel_user ".
+                "(session_id,c_id,user_id) VALUES ".
+                "('$id_session','$enreg_course','$enreg_user')");
         }
         $sql = "SELECT COUNT(user_id) as nbUsers ".
-               " FROM $tbl_session_rel_course_rel_user " .
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'";
+                " FROM $tbl_session_rel_course_rel_user " .
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'";
         $rs = Database::query($sql);
         list($nbr_users) = Database::fetch_array($rs);
         Database::query("UPDATE $tbl_session_rel_course  ".
-               " SET nbr_users=$nbr_users " .
-               " WHERE session_id='$id_session' ".
-               " AND c_id='$enreg_course'");
+                " SET nbr_users=$nbr_users " .
+                " WHERE session_id='$id_session' ".
+                " AND c_id='$enreg_course'");
     }
     foreach ($UserList as $enreg_user) {
         $enreg_user = (int) $enreg_user;
         Database::query("INSERT IGNORE INTO $tbl_session_rel_user ".
-               " (session_id, user_id, registered_at) " .
-               " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
+                " (session_id, user_id, registered_at) " .
+                " VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')");
     }
     // We update the number of users in the session
     $sql = "SELECT COUNT(user_id) as nbUsers FROM $tbl_session_rel_user ".
-           " WHERE session_id='$id_session' ".
-           " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
+            " WHERE session_id='$id_session' ".
+            " AND relation_type<>".SESSION_RELATION_TYPE_RRHH." ";
     $rs = Database::query($sql);
     list($nbr_users) = Database::fetch_array($rs);
     Database::query("UPDATE $tbl_session SET nbr_users=$nbr_users ".
-           " WHERE id='$id_session'");
+            " WHERE id='$id_session'");
 }
 
 function syncro_users() {

main/auth/openid/login.php

Doc Comments +1 added lines

@@ -337,6 +337,7 @@
 
 /**
  * Make a HTTP request - This function has been copied straight over from Drupal 6 code (drupal_http_request)
+ * @param string $data
  */
 function openid_http_request($url, $headers = array(), $method = 'GET', $data = NULL, $retry = 3) {
     $result = new stdClass();

Spacing +15 added lines, -15 removed lines

@@ -13,7 +13,7 @@ 
 /**
  * Initialisation
  */
-require_once api_get_path(CONFIGURATION_PATH) . 'auth.conf.php';
+require_once api_get_path(CONFIGURATION_PATH).'auth.conf.php';
 
 require_once 'openid.lib.php';
 require_once 'xrds.lib.php';
@@ -68,7 +68,7 @@ 
     // Now that there is an association created, move on
     // to request authentication from the IdP
     $identity = (!empty($services[0]['delegate'])) ? $services[0]['delegate'] : $claimed_id;
-    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0 . '/server', $services[0]['types'])) {
+    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0.'/server', $services[0]['types'])) {
         $identity = 'http://openid.net/identifier_select/2.0';
     }
     $authn_request = openid_authentication_request($claimed_id, $identity, $return_to, $assoc_handle, $services[0]['version']);
@@ -126,7 +126,7 @@ 
 
     $xrds_url = $claimed_id;
     if (_openid_is_xri($claimed_id)) {
-        $xrds_url = 'http://xri.net/' . $claimed_id;
+        $xrds_url = 'http://xri.net/'.$claimed_id;
     }
     $url = @parse_url($xrds_url);
     if ($url['scheme'] == 'http' || $url['scheme'] == 'https') {
@@ -191,7 +191,7 @@ 
     //@todo Remove Old Associations:
     $openid_association = Database::get_main_table(TABLE_MAIN_OPENID_ASSOCIATION);
     $sql = "DELETE FROM $openid_association
-            WHERE created + expires_in < '" . api_get_utc_datetime() . "'";
+            WHERE created + expires_in < '".api_get_utc_datetime()."'";
     Database::query($sql);
 
     // Check to see if we have an association for this IdP already
@@ -347,17 +347,17 @@ 
     switch ($uri['scheme']) {
         case 'http':
             $port = isset($uri['port']) ? $uri['port'] : 80;
-            $host = $uri['host'] . ($port != 80 ? ':' . $port : '');
+            $host = $uri['host'].($port != 80 ? ':'.$port : '');
             $fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
             break;
         case 'https':
             // Note: Only works for PHP 4.3 compiled with OpenSSL.
             $port = isset($uri['port']) ? $uri['port'] : 443;
-            $host = $uri['host'] . ($port != 443 ? ':' . $port : '');
-            $fp = @fsockopen('ssl://' . $uri['host'], $port, $errno, $errstr, 20);
+            $host = $uri['host'].($port != 443 ? ':'.$port : '');
+            $fp = @fsockopen('ssl://'.$uri['host'], $port, $errno, $errstr, 20);
             break;
         default:
-            $result->error = 'invalid schema ' . $uri['scheme'];
+            $result->error = 'invalid schema '.$uri['scheme'];
             return $result;
     }
 
@@ -373,7 +373,7 @@ 
     // Construct the path to act on.
     $path = isset($uri['path']) ? $uri['path'] : '/';
     if (isset($uri['query'])) {
-        $path .= '?' . $uri['query'];
+        $path .= '?'.$uri['query'];
     }
 
     // Create HTTP request.
@@ -383,23 +383,23 @@ 
         // host that do not take into account the port number.
         'Host' => "Host: $host",
         'User-Agent' => 'User-Agent: Chamilo (+http://www.chamilo.org/)',
-        'Content-Length' => 'Content-Length: ' . strlen($data)
+        'Content-Length' => 'Content-Length: '.strlen($data)
     );
 
     // If the server url has a user then attempt to use basic authentication
     if (isset($uri['user'])) {
-        $defaults['Authorization'] = 'Authorization: Basic ' . base64_encode($uri['user'] . (!empty($uri['pass']) ? ":" . $uri['pass'] : ''));
+        $defaults['Authorization'] = 'Authorization: Basic '.base64_encode($uri['user'].(!empty($uri['pass']) ? ":".$uri['pass'] : ''));
     }
 
     foreach ($headers as $header => $value) {
-        $defaults[$header] = $header . ': ' . $value;
+        $defaults[$header] = $header.': '.$value;
     }
 
-    $request = $method . ' ' . $path . " HTTP/1.0\r\n";
+    $request = $method.' '.$path." HTTP/1.0\r\n";
     $request .= implode("\r\n", $defaults);
     $request .= "\r\n\r\n";
     if ($data) {
-        $request .= $data . "\r\n";
+        $request .= $data."\r\n";
     }
     $result->request = $request;
 
@@ -425,7 +425,7 @@ 
         if (isset($result->headers[$header]) && $header == 'Set-Cookie') {
             // RFC 2109: the Set-Cookie response header comprises the token Set-
             // Cookie:, followed by a comma-separated list of one or more cookies.
-            $result->headers[$header] .= ',' . trim($value);
+            $result->headers[$header] .= ','.trim($value);
         } else {
             $result->headers[$header] = trim($value);
         }

main/auth/openid/openid.lib.php

Doc Comments +16 added lines

@@ -121,6 +121,7 @@ 
 
 /**
  * Encode a message from _openid_create_message for HTTP Post
+ * @param null|string $message
  */
 function _openid_encode_message($message) {
     $encoded_message = '';
@@ -173,6 +174,7 @@ 
 
 /**
  * Pull the href attribute out of an html link element.
+ * @param string $rel
  */
 function _openid_link_href($rel, $html) {
     $rel = preg_quote($rel);
@@ -186,6 +188,7 @@ 
 
 /**
  * Pull the http-equiv attribute out of an html meta element
+ * @param string $equiv
  */
 function _openid_meta_httpequiv($equiv, $html) {
     preg_match('|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>|iU', $html, $matches);
@@ -221,6 +224,10 @@ 
     return base64_encode($signature);
 }
 
+/**
+ * @param string $key
+ * @param null|string $text
+ */
 function _openid_hmac($key, $text) {
     if (strlen($key) > OPENID_SHA1_BLOCKSIZE) {
         $key = _openid_sha1($key, true);
@@ -256,6 +263,9 @@ 
     return base64_encode(_openid_dh_long_to_binary($str));
 }
 
+/**
+ * @param string $str
+ */
 function _openid_dh_binary_to_long($str) {
     $bytes = array_merge(unpack('C*', $str));
 
@@ -297,6 +307,9 @@ 
     return $string;
 }
 
+/**
+ * @param string $secret
+ */
 function _openid_dh_xorsecret($shared, $secret) {
     $dh_shared_str = _openid_dh_long_to_binary($shared);
     $sha1_dh_shared = _openid_sha1($dh_shared_str);
@@ -308,6 +321,9 @@ 
     return $xsecret;
 }
 
+/**
+ * @param string $stop
+ */
 function _openid_dh_rand($stop) {
     static $duplicate_cache = array();
 

Spacing +23 added lines, -23 removed lines

@@ -9,10 +9,10 @@ 
  * Code
  */
 // Diffie-Hellman Key Exchange Default Value.
-define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801' .
-        '966915404479707795314057629378541917580651227423698188993727816152646631' .
-        '438561595825688188889951272158842675419950341258706556549803580104870537' .
-        '681476726513255747040765857479291291572334510643245094715007229621094194' .
+define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801'.
+        '966915404479707795314057629378541917580651227423698188993727816152646631'.
+        '438561595825688188889951272158842675419950341258706556549803580104870537'.
+        '681476726513255747040765857479291291572334510643245094715007229621094194'.
         '349783925984760375594985848253359305585439638443');
 
 // Constants for Diffie-Hellman key exchange computations.
@@ -32,10 +32,10 @@ 
 function openid_redirect_http($url, $message) {
     $query = array();
     foreach ($message as $key => $val) {
-        $query[] = $key . '=' . urlencode($val);
+        $query[] = $key.'='.urlencode($val);
     }
     $sep = (strpos($url, '?') === FALSE) ? '?' : '&';
-    header('Location: ' . $url . $sep . implode('&', $query), TRUE, 302);
+    header('Location: '.$url.$sep.implode('&', $query), TRUE, 302);
     //exit;
 }
 
@@ -44,12 +44,12 @@ 
  * This function should be deprecated for 1.8.6.2 needs documentation
  */
 function openid_redirect($url, $message) {
-    $output = '<html><head><title>' . get_lang('OpenIDRedirect') . "</title></head>\n<body>";
-    $output .= '<form method="post" action="' . $url . '" id="openid-redirect-form">';
+    $output = '<html><head><title>'.get_lang('OpenIDRedirect')."</title></head>\n<body>";
+    $output .= '<form method="post" action="'.$url.'" id="openid-redirect-form">';
     foreach ($message as $key => $value) {
-        $output .='<input type="hidden" name="' . $key . '" value="' . $value . '">';
+        $output .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
     }
-    $output .= '<noscript><input type="submit" name="submit" value="' . get_lang('Send') . '"/></noscript>';
+    $output .= '<noscript><input type="submit" name="submit" value="'.get_lang('Send').'"/></noscript>';
     $output .= '</form>';
     $output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
     $output .= "</body></html>";
@@ -94,7 +94,7 @@ 
     $normalized_url = $url;
 
     if (stristr($url, '://') === FALSE) {
-        $normalized_url = 'http://' . $url;
+        $normalized_url = 'http://'.$url;
     }
 
     if (substr_count($normalized_url, '/') < 3) {
@@ -133,7 +133,7 @@ 
             if ($encoded_message != '') {
                 $encoded_message .= '&';
             }
-            $encoded_message .= rawurlencode(trim($parts[0])) . '=' . rawurlencode(trim($parts[1]));
+            $encoded_message .= rawurlencode(trim($parts[0])).'='.rawurlencode(trim($parts[1]));
         }
     }
 
@@ -164,10 +164,10 @@ 
  */
 function _openid_nonce() {
     // YYYY-MM-DDThh:mm:ssTZD UTC, plus some optional extra unique chars
-    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z') .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
-            chr(mt_rand(0, 25) + 65) .
+    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z').
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
+            chr(mt_rand(0, 25) + 65).
             chr(mt_rand(0, 25) + 65);
 }
 
@@ -176,7 +176,7 @@ 
  */
 function _openid_link_href($rel, $html) {
     $rel = preg_quote($rel);
-    preg_match('|<link\s+rel=["\'](.*)' . $rel . '(.*)["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<link\s+rel=["\'](.*)'.$rel.'(.*)["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[3])) {
         preg_match('|href=["\']([^"]+)["\']|iU', $matches[0], $href);
         return trim($href[1]);
@@ -188,7 +188,7 @@ 
  * Pull the http-equiv attribute out of an html meta element
  */
 function _openid_meta_httpequiv($equiv, $html) {
-    preg_match('|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>|iU', $html, $matches);
+    preg_match('|<meta\s+http-equiv=["\']'.$equiv.'["\'](.*)/?>|iU', $html, $matches);
     if (isset($matches[1])) {
         preg_match('|content=["\']([^"]+)["\']|iU', $matches[1], $content);
         return $content[1];
@@ -209,8 +209,8 @@ 
     $sign_data = array();
 
     foreach ($keys_to_sign as $key) {
-        if (isset($message_array['openid.' . $key])) {
-            $sign_data[$key] = $message_array['openid.' . $key];
+        if (isset($message_array['openid.'.$key])) {
+            $sign_data[$key] = $message_array['openid.'.$key];
         }
     }
 
@@ -229,8 +229,8 @@ 
     $key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
     $ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
     $opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
-    $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
-    $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
+    $hash1 = _openid_sha1(($key ^ $ipad).$text, true);
+    $hmac = _openid_sha1(($key ^ $opad).$hash1, true);
 
     return $hmac;
 }
@@ -337,7 +337,7 @@ 
     }
 
     do {
-        $bytes = "\x00" . _openid_get_bytes($nbytes);
+        $bytes = "\x00"._openid_get_bytes($nbytes);
         $n = _openid_dh_binary_to_long($bytes);
         // Keep looping if this value is in the low duplicated range.
     } while (bccomp($n, $duplicate) < 0);

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
  */
 function _openid_is_xri($identifier) {
     $firstchar = substr($identifier, 0, 1);
-    if ($firstchar == "@" || $firstchar == "=")
-        return TRUE;
+    if ($firstchar == "@" || $firstchar == "=") {
+            return TRUE;
+    }
 
     if (stristr($identifier, 'xri://') !== FALSE) {
         return TRUE;

main/auth/shibboleth/app/model/shibboleth_store.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
     /**
      *
-     * @return ShibbolethData 
+     * @return ShibbolethStore 
      */
     public static function instance()
     {

Braces +2 added lines, -4 removed lines

@@ -168,12 +168,10 @@
                 if (empty($result))
                 {
                     $result = $default;
-                }
-                else if (count($result) == 1)
+                } else if (count($result) == 1)
                 {
                     $result = reset($result);
-                }
-                else
+                } else
                 {
                     $result = $result;
                 }

main/auth/shibboleth/app/model/user.class.php

Doc Comments +3 added lines

@@ -56,6 +56,9 @@
         return $this->get(array('shibb_unique_id' => $id));
     }
     
+    /**
+     * @param string $id
+     */
     public function shibboleth_id_exists($id)
     {
         return $this->exist(array('shibb_unique_id' => $id));

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace Shibboleth;
 
-require_once dirname(__FILE__) . '/scaffold/user.class.php';
+require_once dirname(__FILE__).'/scaffold/user.class.php';
 
 /**
  * A Chamilo user. Model for the User table.