chamilo / chamilo-lms

main/auth/my_progress.php

Spacing +6 added lines, -6 removed lines

@@ -54,16 +54,16 @@ 
         }
         $course_info = api_get_course_info_by_id($result['c_id']);
         $course_image = '<img src="'.$course_info['course_image_large'].'">';
-        $dates .= '<li><a href="#'.$login.'">' . api_convert_and_format_date($login, DATE_FORMAT_SHORT) . '</a></li>';
+        $dates .= '<li><a href="#'.$login.'">'.api_convert_and_format_date($login, DATE_FORMAT_SHORT).'</a></li>';
         $issues .= '<li id ="'.$login.'">';
         $issues .= '<div class="img-course">'.$course_image.'</div>';
         
         $issues .= '<div class="text-course">';
-        $issues .= '<p>' . sprintf(
+        $issues .= '<p>'.sprintf(
                 get_lang('YouHaveEnteredTheCourseXInY'),
-                '" '. $courseInfo['name'] .' "',
+                '" '.$courseInfo['name'].' "',
                 api_convert_and_format_date($login, DATE_TIME_FORMAT_LONG) 
-                ) . '</p>';
+                ).'</p>';
         $issues .= '</div>'; 
         $issues .= '</li>';
         $count++;
@@ -82,8 +82,8 @@ 
     $content .= '<div class="row">';
     $content .= '<div class="col-md-12">';
     $content .= '<div id="my_timeline">';
-    $content .= '<ul id="dates">' . $dates . '</ul>';
-    $content .= '<ul id="issues">' . $issues . '</ul>';
+    $content .= '<ul id="dates">'.$dates.'</ul>';
+    $content .= '<ul id="issues">'.$issues.'</ul>';
     $content .= '<div id="grad_left"></div>';
     $content .= '<div id="grad_right"></div>';
     $content .= '<a href="#" id="prev"></a>';

main/auth/external_login/login.ws.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 $wsUrl = '';
 
 // include common authentication functions
-require_once dirname(__FILE__) . '/functions.inc.php';
+require_once dirname(__FILE__).'/functions.inc.php';
 // call the login checker (defined below)
 $isValid = loginWSAuthenticate($login, $password, $wsUrl);
 
@@ -61,8 +61,8 @@ 
     $key = '-+*%$({[]})$%*+-';
     // Complete password con PKCS7-specific padding
     $blockSize = 16;
-    $padding = $blockSize - (strlen($password)%$blockSize);
-    $password .= str_repeat(chr($padding),$padding);
+    $padding = $blockSize - (strlen($password) % $blockSize);
+    $password .= str_repeat(chr($padding), $padding);
     $cipher = new Crypt_AES(CRYPT_AES_MODE_CFB);
     $cipher->setKeyLength(128);
     $cipher->setKey($key);

main/auth/external_login/updateUser.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 
 use ChamiloSession as Session;
 
-require_once(dirname(__FILE__) . '/functions.inc.php');
+require_once(dirname(__FILE__).'/functions.inc.php');
 
 //MAIN CODE
 //$uData variable is set in local.inc.php
@@ -36,6 +36,6 @@ 
     //User cannot login
     $loginFailed = true;
     Session::erase('_uid');
-    header('Location: ' . api_get_path(WEB_PATH) . 'index.php?loginFailed=1&error=user_password_incorrect');
+    header('Location: '.api_get_path(WEB_PATH).'index.php?loginFailed=1&error=user_password_incorrect');
     exit;
 }

main/auth/external_login/newUser.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 use ChamiloSession as Session;
 
-require_once(dirname(__FILE__) . '/functions.inc.php');
+require_once(dirname(__FILE__).'/functions.inc.php');
 
 //MAIN CODE
 //$login and $password variables are setted in main/inc/local.inc.php

main/auth/external_login/ldap_import_all_users.php

Spacing +3 added lines, -3 removed lines

@@ -13,9 +13,9 @@
 }
 use \ChamiloSession as Session;
 
-require dirname(__FILE__) . '/../../inc/global.inc.php';
-require dirname(__FILE__) . '/ldap.inc.php';
-require dirname(__FILE__) . '/../../inc/conf/auth.conf.php';
+require dirname(__FILE__).'/../../inc/global.inc.php';
+require dirname(__FILE__).'/ldap.inc.php';
+require dirname(__FILE__).'/../../inc/conf/auth.conf.php';
 /**
  * Code execution
  */

main/auth/external_login/newUser.ldap.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
 
 use ChamiloSession as Session;
 
-require_once dirname(__FILE__) . '/ldap.inc.php';
-require_once dirname(__FILE__) . '/functions.inc.php';
+require_once dirname(__FILE__).'/ldap.inc.php';
+require_once dirname(__FILE__).'/functions.inc.php';
 
 $ldap_user = extldap_authenticate($login, $password);
 if ($ldap_user !== false) {

main/auth/external_login/ldap.inc.php

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/external_login/functions.inc.php

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'] = '';
-    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'] = '';
+    }
+    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/ldap/login.php

Indentation +8 added lines, -8 removed lines

@@ -28,14 +28,14 @@
 $loginLdapSucces = ldap_login($login, $password);
 
 if ($loginLdapSucces) {
-	$loginFailed = false;
-	$uidReset = true;
-	$_user['user_id'] = $uData['user_id'];
-	Session::write('_uid',$_uid);
+    $loginFailed = false;
+    $uidReset = true;
+    $_user['user_id'] = $uData['user_id'];
+    Session::write('_uid',$_uid);
     // Jand: copied from event_login in events.lib.php to enable login statistics:
-	Event::event_login($uData['user_id']);
+    Event::event_login($uData['user_id']);
 } else {
-	$loginFailed = true;
-	unset($_user['user_id']);
-	$uidReset = false;
+    $loginFailed = true;
+    unset($_user['user_id']);
+    $uidReset = false;
 }

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	$loginFailed = false;
 	$uidReset = true;
 	$_user['user_id'] = $uData['user_id'];
-	Session::write('_uid',$_uid);
+	Session::write('_uid', $_uid);
     // Jand: copied from event_login in events.lib.php to enable login statistics:
 	Event::event_login($uData['user_id']);
 } else {