chamilo / chamilo-lms

main/auth/external_login/facebook.init.php

Spacing +1 added lines, -1 removed lines

@@ -22,5 +22,5 @@
  * See facebook section of the auth.conf.php file
  */
 
-require_once dirname(__FILE__) . '/../../../app/config/auth.conf.php';
+require_once dirname(__FILE__).'/../../../app/config/auth.conf.php';
 

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

Indentation +6 added lines, -6 removed lines

@@ -1,13 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * This script executes the importation of all users in the LDAP repository
- * into Chamilo 
- * @package chamilo.auth.ldap
- */
+     * This script executes the importation of all users in the LDAP repository
+     * into Chamilo 
+     * @package chamilo.auth.ldap
+     */
 /**
- * Init
- */
+     * Init
+     */
 if (PHP_SAPI != 'cli') {
     die ('For security reasons, this script can only be launched from cron or from the command line');
 }

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/ldap/login.php

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 {

Indentation +20 added lines, -20 removed lines

@@ -7,18 +7,18 @@ 
 *	@package chamilo.auth.ldap
 */
 /**
- * An external authentification module needs to set
- * - $loginFailed
- * - $uidReset
- * - $_user['user_id']
- * - register the $_user['user_id'] in the session
- *
- * As the LDAP code shows, this is not as difficult as you might think.
- * LDAP authentification module
- * this calls the loginWithLdap function
- * from the LDAP library, and sets a few
- * variables based on the result.
- */
+     * An external authentification module needs to set
+     * - $loginFailed
+     * - $uidReset
+     * - $_user['user_id']
+     * - register the $_user['user_id'] in the session
+     *
+     * As the LDAP code shows, this is not as difficult as you might think.
+     * LDAP authentification module
+     * this calls the loginWithLdap function
+     * from the LDAP library, and sets a few
+     * variables based on the result.
+     */
 //require_once('../../inc/global.inc.php'); - this script should be loaded by the /index.php script anyway, so global is already loaded
 
 use ChamiloSession as Session;
@@ -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;
 }

main/auth/sso/sso.class.php

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function __construct()
     {
-        $this->protocol   = api_get_setting('sso_authentication_protocol');
+        $this->protocol = api_get_setting('sso_authentication_protocol');
         // There can be multiple domains, so make sure to take only the first
         // This might be later extended with a decision process
         $domains = explode(',', api_get_setting('sso_authentication_domain'));
@@ -42,7 +42,7 @@ 
         $this->auth_uri = api_get_setting('sso_authentication_auth_uri');
         $this->deauth_uri = api_get_setting('sso_authentication_unauth_uri');
         //cut the string to avoid recursive URL construction in case of failure
-        $this->referer = $this->protocol.$_SERVER['HTTP_HOST'].substr($_SERVER['REQUEST_URI'],0,strpos($_SERVER['REQUEST_URI'],'sso'));
+        $this->referer = $this->protocol.$_SERVER['HTTP_HOST'].substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'sso'));
         $this->deauth_url = $this->protocol.$this->domain.$this->deauth_uri;
         $this->master_url = $this->protocol.$this->domain.$this->auth_uri;
         $this->referrer_uri = base64_encode($_SERVER['REQUEST_URI']);
@@ -130,11 +130,11 @@ 
                 ) {
                     //error_log('user n password are ok');
                     //Check if the account is active (not locked)
-                    if ($uData['active']=='1') {
+                    if ($uData['active'] == '1') {
                         // check if the expiration date has not been reached
                         if (empty($uData['expiration_date'])
                             or $uData['expiration_date'] > date('Y-m-d H:i:s')
-                            or $uData['expiration_date']=='0000-00-00 00:00:00') {
+                            or $uData['expiration_date'] == '0000-00-00 00:00:00') {
 
                             //If Multiple URL is enabled
                             if (api_get_multiple_access_url()) {
@@ -168,11 +168,11 @@ 
                                             // the user credentials are OK, which
                                             // should be protection enough
                                             // against evil URL spoofing...
-                                            $sso_target = api_get_path(WEB_PATH) . base64_decode($sso['ruri']);
+                                            $sso_target = api_get_path(WEB_PATH).base64_decode($sso['ruri']);
                                         } else {
-                                            $sso_target = isset($sso['target']) ? $sso['target'] : api_get_path(WEB_PATH) . 'index.php';
+                                            $sso_target = isset($sso['target']) ? $sso['target'] : api_get_path(WEB_PATH).'index.php';
                                         }
-                                        header('Location: '. $sso_target);
+                                        header('Location: '.$sso_target);
                                         exit;
                                     } else {
                                         // user does not have permission for this site
@@ -286,9 +286,9 @@ 
         $userId = intval($userId);
 
         if ($asAdmin && api_is_platform_admin(true)) {
-            return api_get_path(WEB_CODE_PATH) . "admin/user_edit.php?user_id=$userId";
+            return api_get_path(WEB_CODE_PATH)."admin/user_edit.php?user_id=$userId";
         }
 
-        return api_get_path(WEB_CODE_PATH) . 'auth/profile.php';
+        return api_get_path(WEB_CODE_PATH).'auth/profile.php';
     }
 }

Doc Comments +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 
     /**
      * Validates the received active connection data with the database
-     * @return	bool	Return the loginFailed variable value to local.inc.php
+     * @return	null|false	Return the loginFailed variable value to local.inc.php
      */
     public function check_user()
     {

main/auth/sso/sso_server_test.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 
         /* 2.Get the chamilo username and password from your system or from webservices */
 
-        $account['username'] = 'jbrion525';             //username in Chamilo
+        $account['username'] = 'jbrion525'; //username in Chamilo
         $account['password'] = sha1(sha1('jbrion525')); //encrypted password with assuming that the first encrypted method is sha1 in chamilo
 
         $master_auth_uri = $my_chamilo_server.'/?q=user';
@@ -64,9 +64,9 @@ 
         );
 
         $cookie = base64_encode(serialize($sso));
-        $url = chamilo_sso_protocol() . $master_auth_uri;
-        $params = 'sso_referer='. urlencode($url) .'&sso_cookie='. urlencode($cookie);
-        $final_url = filter_xss($_GET['sso_referer']) .'?'. $params;
+        $url = chamilo_sso_protocol().$master_auth_uri;
+        $params = 'sso_referer='.urlencode($url).'&sso_cookie='.urlencode($cookie);
+        $final_url = filter_xss($_GET['sso_referer']).'?'.$params;
 
         //If your user exists redirect to chamilo and set the account in a session to check it later
         $_SESSION['my_server_user_session'] = $account;