Browse Source

Minor - format code

jmontoyaa 8 years ago
parent
commit
f5dc5c2379
2 changed files with 85 additions and 29 deletions
  1. 74 25
      main/auth/external_login/functions.inc.php
  2. 11 4
      main/auth/external_login/login.ws.php

+ 74 - 25
main/auth/external_login/functions.inc.php

@@ -16,7 +16,8 @@
  *       password
  *   or false if no data
  * */
-function external_get_user_info($login, $password) {
+function external_get_user_info($login, $password)
+{
     //Those are the mandatory fields for user creation.
     //See external_add_user function for all the fields you can have.
     $table = USERINFO_TABLE;
@@ -43,22 +44,22 @@ function external_get_user_info($login, $password) {
         default:
             $status = STUDENT;
     }
+
     // Language
     switch ($user_info['language']) {
-        case 'FR' :
+        case 'FR':
             $language = 'french';
             break;
-        case 'EN' :
+        case 'EN':
             $language = 'english';
             break;
-        default :
+        default:
             $language = 'english';
             break;
     }
     //Can Send Message ?
     $can_send_message = ($user_info['can_send_message'] == 1) ? 'yes' : 'no';
 
-
     $u = array(
         'firstname' => $user_info['firstname'],
         'lastname' => $user_info['lastname'],
@@ -93,34 +94,64 @@ function external_get_user_info($login, $password) {
   firstname, lastname, status, email, login, password
  * @return mixed   new user id - if the new user creation succeeds, false otherwise
  * */
-function external_add_user($u) {
+function external_add_user($u)
+{
     //Setting default
-    if (empty($u['password']))
+    if (empty($u['password'])) {
         $u['password'] = null;
-    if (empty($u['status']))
+    }
+    if (empty($u['status'])) {
         $u['status'] = 5;
-    if (!isset($u['official_code']))
+    }
+    if (!isset($u['official_code'])) {
         $u['official_code'] = '';
-    if (!isset($u['language']))
+    }
+    if (!isset($u['language'])) {
         $u['language'] = '';
-    if (!isset($u['phone']))
+    }
+    if (!isset($u['phone'])) {
         $u['phone'] = '';
-    if (!isset($u['picture_uri']))
+    }
+    if (!isset($u['picture_uri'])) {
         $u['picture_uri'] = '';
-    if (!isset($u['auth_source']))
+    }
+    if (!isset($u['auth_source'])) {
         $u['auth_source'] = PLATFORM_AUTH_SOURCE;
-    if (!isset($u['expiration_date']))
+    }
+    if (!isset($u['expiration_date'])) {
         $u['expiration_date'] = '';
-    if (!isset($u['active']))
+    }
+    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']))
+    }
+    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']))
+    }
+    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']);
+    $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;
 }
 
@@ -151,10 +182,30 @@ function external_add_user($u) {
  * @return boolean|null
  * @author ndiechburg <noel@cblue.be>
  * */
-function external_update_user($new_user) {
+function external_update_user($new_user)
+{
     $old_user = api_get_user_info($new_user['user_id']);
     $u = array_merge($old_user, $new_user);
-    $updated = UserManager::update_user($u['user_id'], $u['firstname'], $u['lastname'], $u['username'], null, $u['auth_source'], $u['email'], $u['status'], $u['official_code'], $u['phone'], $u['picture_uri'], $u['expiration_date'], $u['active'], $u['creator_id'], $u['hr_dept_id'], $u['extra'], $u['language'], '');
+    $updated = UserManager::update_user(
+        $u['user_id'],
+        $u['firstname'],
+        $u['lastname'],
+        $u['username'],
+        null,
+        $u['auth_source'],
+        $u['email'],
+        $u['status'],
+        $u['official_code'],
+        $u['phone'],
+        $u['picture_uri'],
+        $u['expiration_date'],
+        $u['active'],
+        $u['creator_id'],
+        $u['hr_dept_id'],
+        $u['extra'],
+        $u['language'],
+        ''
+    );
     if (isset($u['courses']) && !empty($u['courses'])) {
         $autoSubscribe = explode('|', $u['courses']);
         foreach ($autoSubscribe as $code) {
@@ -171,6 +222,4 @@ function external_update_user($new_user) {
       $table = Database::get_main_table(TABLE_MAIN_ADMIN);
       $res = Database::query("SELECT * from $table WHERE user_id = ".$u['user_id']);
       } */
-}
-
-?>
+}

+ 11 - 4
main/auth/external_login/login.ws.php

@@ -45,9 +45,10 @@ if ($isValid === 1) {
  * @param string The cleartext password, as provided in form
  * @param string The WS URL, as provided at the beginning of this script
  */
-function loginWSAuthenticate($username, $password, $wsUrl) {
+function loginWSAuthenticate($username, $password, $wsUrl)
+{
     // check params
-    if (empty($username) or empty($password) or empty($wsUrl)) {
+    if (empty($username) || empty($password) || empty($wsUrl)) {
         return false;
     }
     // Create new SOAP client instance
@@ -62,7 +63,7 @@ function loginWSAuthenticate($username, $password, $wsUrl) {
     // Complete password con PKCS7-specific padding
     $blockSize = 16;
     $padding = $blockSize - (strlen($password)%$blockSize);
-    $password .= str_repeat(chr($padding),$padding);
+    $password .= str_repeat(chr($padding), $padding);
     $cipher = new Crypt_AES(CRYPT_AES_MODE_CFB);
     $cipher->setKeyLength(128);
     $cipher->setKey($key);
@@ -83,7 +84,13 @@ function loginWSAuthenticate($username, $password, $wsUrl) {
     $passCrypted = base64_encode($cipheredPass);
     // The call to the webservice will change depending on your definition
     try {
-        $response = $client->validateUser(array('user' => $username, 'pass' => $passCrypted, 'system' => 'chamilo'));
+        $response = $client->validateUser(
+            array(
+                'user' => $username,
+                'pass' => $passCrypted,
+                'system' => 'chamilo',
+            )
+        );
     } catch (SoapFault $fault) {
         error_log('Caught something');
         if ($fault->faultstring != 'Could not connect to host') {