chamilo / chamilo-lms

main/auth/ldap/newUser.php

Indentation +10 added lines, -10 removed lines

@@ -8,9 +8,9 @@ 
 * @package chamilo.auth.ldap
 */
 /**
- * when a user does not exist yet in dokeos,
- * but he or she does exist in the LDAP,
- * we add him to the dokeos database
+     * when a user does not exist yet in dokeos,
+     * but he or she does exist in the LDAP,
+     * we add him to the dokeos database
 */
 //require_once('../../inc/global.inc.php'); - this script should be loaded by the /index.php script anyway, so global is already loaded
 require_once('authldap.php');
@@ -21,17 +21,17 @@ 
 
 if ($ldap_login_success)
 {
-	//error_log('Found user '.$login.' on LDAP server',0);
-	/*
+    //error_log('Found user '.$login.' on LDAP server',0);
+    /*
 		In here, we know that
 		- the user does not exist in dokeos
 		- the users login and password are correct
 	*/
-	$info_array = ldap_find_user_info($login);
-	ldap_put_user_info_locally($login, $info_array);
+    $info_array = ldap_find_user_info($login);
+    ldap_put_user_info_locally($login, $info_array);
 } else {
     //error_log('Could not find '.$login.' on LDAP server',0);
-	$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;

main/auth/shibboleth/login.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-include_once(dirname(__FILE__) . '/init.php');
+include_once(dirname(__FILE__).'/init.php');
 
 /*
   ==============================================================================

main/auth/shibboleth/test/test.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-include_once(dirname(__FILE__) . '/../init.php');
+include_once(dirname(__FILE__).'/../init.php');
 
 if (!ShibbolethTest::is_enabled())
 {

main/auth/shibboleth/test/shibboleth_test_helper.class.php

Spacing +25 added lines, -25 removed lines

@@ -59,75 +59,75 @@
     public function setup_new_student()
     {
         $id = uniqid();
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
         $_SERVER['Shib-EP-Affiliation'] = 'member';
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . 'Doe@localhost.org';
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'Doe@localhost.org';
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
     }
 
     public function setup_new_student_no_email()
     {
         $id = uniqid();
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
         $_SERVER['Shib-EP-Affiliation'] = 'member';
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
         $_SERVER['Shib-InetOrgPerson-mail'] = '';
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
     }
 
     public function setup_new_student_multiple_givenname()
     {
         $id = uniqid();
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
         $_SERVER['Shib-EP-Affiliation'] = 'member';
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John;Alex;John Alex';
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . 'Doe@localhost.org';
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'Doe@localhost.org';
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
     }
 
     public function setup_new_teacher()
     {
         $id = uniqid();
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
         $_SERVER['Shib-EP-Affiliation'] = 'member;staff;faculty';
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . 'Doe@localhost.org';
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'Doe@localhost.org';
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
     }
 
     public function setup_new_staff()
     {
         $id = uniqid();
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
         $_SERVER['Shib-EP-Affiliation'] = 'member;staff';
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . 'Doe@localhost.org';
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'Doe@localhost.org';
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
     }
 
     public function setup_new_no_affiliation()
     {
         $id = uniqid();
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
         $_SERVER['Shib-EP-Affiliation'] = '';
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . 'Doe@localhost.org';
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'Doe@localhost.org';
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
     }
 
     public function setup_new_minimal_data()
     {
         $id = uniqid();
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;       
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;       
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
     }
 
 }
\ No newline at end of file

main/auth/shibboleth/test/test_no_email.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-include_once(dirname(__FILE__) . '/../init.php');
+include_once(dirname(__FILE__).'/../init.php');
 
 if (!ShibbolethTest::is_enabled())
 {
@@ -17,4 +17,4 @@ 
 Shibboleth::session()->logout();
 ShibbolethTest::helper()->setup_new_student_no_email();
 
-require_once dirname(__FILE__) . '/../login.php';
\ No newline at end of file
+require_once dirname(__FILE__).'/../login.php';
\ No newline at end of file

main/auth/shibboleth/test/shibboleth_test.class.php

Braces +1 added lines, -2 removed lines

@@ -206,8 +206,7 @@
             echo $message;
             var_dump(debug_backtrace());
             die;
-        }
-        else
+        } else
         {
             $message = "Assert successful $message <br/>";
             echo $message;

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

Spacing +1 added lines, -1 removed lines

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