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/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/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/model/scaffold/user.class.php

Indentation +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
 {
 
     /**
-    * Store for User objects. Interact with the database.
-    *
-    * @return UserStore 
-    */
+     * Store for User objects. Interact with the database.
+     *
+     * @return UserStore 
+     */
     public static function store()
     {
         static $result = false;

Doc Comments +3 added lines

@@ -33,6 +33,7 @@ 
         
     /**
      *
+     * @param ShibbolethUser $data
      * @return User 
      */
     public static function create($data = null)
@@ -133,6 +134,7 @@ 
     
     /**
      *
+     * @param string $value
      * @return User 
      */
     public function get_by_user_id($value)
@@ -169,6 +171,7 @@ 
     
     /**
      *
+     * @param string $value
      * @return bool 
      */
     public function username_exists($value)

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

Indentation +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
 {
 
     /**
-    * Store for Admin objects. Interact with the database.
-    *
-    * @return AdminStore 
-    */
+     * Store for Admin objects. Interact with the database.
+     *
+     * @return AdminStore 
+     */
     public static function store()
     {
         static $result = false;

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

Braces +2 added lines, -4 removed lines

@@ -168,12 +168,10 @@
                 if (empty($result))
                 {
                     $result = $default;
-                }
-                else if (count($result) == 1)
+                } else if (count($result) == 1)
                 {
                     $result = reset($result);
-                }
-                else
+                } else
                 {
                     $result = $result;
                 }