chamilo / chamilo-lms

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;

Spacing +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
             $message = "Assert failed $message <br/>";
             echo $message;
             // Dump variable for debug
-            error_log(print_r(debug_backtrace(),1));
+            error_log(print_r(debug_backtrace(), 1));
             die;
         }
         else

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

Spacing +2 added lines, -2 removed lines

@@ -78,14 +78,14 @@
 
     public static function sys_path()
     {
-        $path = dirname(__FILE__) . '/../';
+        $path = dirname(__FILE__).'/../';
         return $path;
     }
 
     public static function url($path = '')
     {
         $result = api_get_path('WEB_PATH');
-        $result .= '/main/auth/shibboleth/' . $path;
+        $result .= '/main/auth/shibboleth/'.$path;
         return $result;
     }
 

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

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.

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.