chamilo / chamilo-lms

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/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.

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

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         $status_options = '';
         foreach ($items as $key => $value)
         {
-            $status_options.= "<option value=\"$key\">$value</option>";
+            $status_options .= "<option value=\"$key\">$value</option>";
         }
 
         return <<<EOT

main/auth/shibboleth/config-dist.php

Spacing +1 added lines, -1 removed lines

@@ -11,6 +11,6 @@
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
-require_once dirname(__FILE__) . '/config/aai.class.php';
+require_once dirname(__FILE__).'/config/aai.class.php';
 
 Shibboleth::set_config(aai::config());
\ No newline at end of file

main/auth/shibboleth/init.php

Spacing +6 added lines, -6 removed lines

@@ -10,14 +10,14 @@
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
 
-$__dir = dirname(__FILE__) . '/';
-$no_redirection = true;  //no redirection in global.
-include_once($__dir . '/../../inc/global.inc.php');
+$__dir = dirname(__FILE__).'/';
+$no_redirection = true; //no redirection in global.
+include_once($__dir.'/../../inc/global.inc.php');
 
-require_once $__dir . 'config.php';
+require_once $__dir.'config.php';
 
 if (api_get_setting('server_type') == 'test')
 {
-    include_once $__dir . '/test/shibboleth_test_helper.class.php';
-    include_once $__dir . '/test/shibboleth_test.class.php';
+    include_once $__dir.'/test/shibboleth_test_helper.class.php';
+    include_once $__dir.'/test/shibboleth_test.class.php';
 }

main/auth/shibboleth/script/scaffold.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
  * @author Laurent Opprecht <laurent@opprecht.info>, Nicolas Rod for the University of Geneva
  */
 $dir = dirname(__FILE__);
-include_once($dir . '/../init.php');
-include_once($dir . '/../app/lib/scaffolder/scaffolder.class.php');
+include_once($dir.'/../init.php');
+include_once($dir.'/../app/lib/scaffolder/scaffolder.class.php');
 
 if (!ShibbolethTest::is_enabled())
 {