View GitHub Repository chamilo-lms

Schedule Inspection
Subscribe
Completed
Pull Request — 1.10.x (#1446)
by José
43:58
created
Status
Category
Toggle Patches
main/auth/shibboleth/login.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -15,7 +15,7 @@
 
 block discarded – undo
15 15 
  * @license see /license.txt
16 16 
  * @author Laurent Opprecht <[email protected]>, Nicolas Rod for the University of Geneva
17 17 
  */
18 
-include_once(dirname(__FILE__) . '/init.php');
18 
+include_once(dirname(__FILE__).'/init.php');
19 19
20 20 
 /*
21 21 
   ==============================================================================
Please login to merge, or discard this patch.
main/auth/shibboleth/test/test.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -8,7 +8,7 @@
 
 block discarded – undo
8 8 
  * @license see /license.txt
9 9 
  * @author Laurent Opprecht <[email protected]>, Nicolas Rod for the University of Geneva
10 10 
  */
11 
-include_once(dirname(__FILE__) . '/../init.php');
11 
+include_once(dirname(__FILE__).'/../init.php');
12 12
13 13 
 if (!ShibbolethTest::is_enabled())
14 14 
 {
Please login to merge, or discard this patch.
main/auth/shibboleth/test/shibboleth_test_helper.class.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch 
@@ -59,75 +59,75 @@
 
 block discarded – undo
59 59 
     public function setup_new_student()
60 60 
     {
61 61 
         $id = uniqid();
62 
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
62 
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
63 63 
         $_SERVER['Shib-EP-Affiliation'] = 'member';
64 64 
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
65 
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
66 
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . '[email protected]';
67 
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
65 
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
66 
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'[email protected]';
67 
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
68 68 
     }
69 69
70 70 
     public function setup_new_student_no_email()
71 71 
     {
72 72 
         $id = uniqid();
73 
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
73 
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
74 74 
         $_SERVER['Shib-EP-Affiliation'] = 'member';
75 75 
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
76 
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
76 
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
77 77 
         $_SERVER['Shib-InetOrgPerson-mail'] = '';
78 
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
78 
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
79 79 
     }
80 80
81 81 
     public function setup_new_student_multiple_givenname()
82 82 
     {
83 83 
         $id = uniqid();
84 
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
84 
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
85 85 
         $_SERVER['Shib-EP-Affiliation'] = 'member';
86 86 
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John;Alex;John Alex';
87 
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
88 
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . '[email protected]';
89 
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
87 
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
88 
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'[email protected]';
89 
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
90 90 
     }
91 91
92 92 
     public function setup_new_teacher()
93 93 
     {
94 94 
         $id = uniqid();
95 
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
95 
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
96 96 
         $_SERVER['Shib-EP-Affiliation'] = 'member;staff;faculty';
97 97 
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
98 
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
99 
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . '[email protected]';
100 
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
98 
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
99 
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'[email protected]';
100 
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
101 101 
     }
102 102
103 103 
     public function setup_new_staff()
104 104 
     {
105 105 
         $id = uniqid();
106 
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
106 
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
107 107 
         $_SERVER['Shib-EP-Affiliation'] = 'member;staff';
108 108 
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
109 
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
110 
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . '[email protected]';
111 
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
109 
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
110 
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'[email protected]';
111 
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
112 112 
     }
113 113
114 114 
     public function setup_new_no_affiliation()
115 115 
     {
116 116 
         $id = uniqid();
117 
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
117 
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
118 118 
         $_SERVER['Shib-EP-Affiliation'] = '';
119 119 
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
120 
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
121 
-        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.' . $id . '[email protected]';
122 
-        $_SERVER['persistent-id'] = 'idp!viewer!' . md5($id);
120 
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
121 
+        $_SERVER['Shib-InetOrgPerson-mail'] = 'john.'.$id.'[email protected]';
122 
+        $_SERVER['persistent-id'] = 'idp!viewer!'.md5($id);
123 123 
     }
124 124
125 125 
     public function setup_new_minimal_data()
126 126 
     {
127 127 
         $id = uniqid();
128 
-        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_' . $id;
128 
+        $_SERVER['Shib-SwissEP-UniqueID'] = 'usr_'.$id;
129 129 
         $_SERVER['Shib-InetOrgPerson-givenName'] = 'John';
130 
-        $_SERVER['Shib-Person-surname'] = 'Doe' . $id;
130 
+        $_SERVER['Shib-Person-surname'] = 'Doe'.$id;
131 131 
     }
132 132
133 133 
 }
134 134 
\ No newline at end of file
Please login to merge, or discard this patch.
main/auth/shibboleth/test/test_no_email.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -6,7 +6,7 @@  discard block
 
 block discarded – undo
6 6 
  * @license see /license.txt
7 7 
  * @author Laurent Opprecht <[email protected]>, Nicolas Rod for the University of Geneva
8 8 
  */
9 
-include_once(dirname(__FILE__) . '/../init.php');
9 
+include_once(dirname(__FILE__).'/../init.php');
10 10
11 11 
 if (!ShibbolethTest::is_enabled())
12 12 
 {
 
@@ -17,4 +17,4 @@  discard block
 
 block discarded – undo
17 17 
 Shibboleth::session()->logout();
18 18 
 ShibbolethTest::helper()->setup_new_student_no_email();
19 19
20 
-require_once dirname(__FILE__) . '/../login.php';
21 20 
\ No newline at end of file
21 
+require_once dirname(__FILE__).'/../login.php';
22 22 
\ No newline at end of file
Please login to merge, or discard this patch.
main/auth/shibboleth/app/shibboleth.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -78,14 +78,14 @@
 
 block discarded – undo
78 78
79 79 
     public static function sys_path()
80 80 
     {
81 
-        $path = dirname(__FILE__) . '/../';
81 
+        $path = dirname(__FILE__).'/../';
82 82 
         return $path;
83 83 
     }
84 84
85 85 
     public static function url($path = '')
86 86 
     {
87 87 
         $result = api_get_path('WEB_PATH');
88 
-        $result .= '/main/auth/shibboleth/' . $path;
88 
+        $result .= '/main/auth/shibboleth/'.$path;
89 89 
         return $result;
90 90 
     }
91 91
Please login to merge, or discard this patch.
main/auth/shibboleth/app/model/user.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -2,7 +2,7 @@
 
 block discarded – undo
2 2
3 3 
 namespace Shibboleth;
4 4
5 
-require_once dirname(__FILE__) . '/scaffold/user.class.php';
5 
+require_once dirname(__FILE__).'/scaffold/user.class.php';
6 6
7 7 
 /**
8 8 
  * A Chamilo user. Model for the User table.
Please login to merge, or discard this patch.
main/auth/shibboleth/app/model/admin.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -2,7 +2,7 @@
 
 block discarded – undo
2 2
3 3 
 namespace Shibboleth;
4 4
5 
-require_once dirname(__FILE__) . '/scaffold/admin.class.php';
5 
+require_once dirname(__FILE__).'/scaffold/admin.class.php';
6 6
7 7 
 /**
8 8 
  * A Chamilo admin. Model for the Admin table.
Please login to merge, or discard this patch.
main/auth/shibboleth/app/view/shibboleth_status_request_form.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -52,7 +52,7 @@
 
 block discarded – undo
52 52 
         $status_options = '';
53 53 
         foreach ($items as $key => $value)
54 54 
         {
55 
-            $status_options.= "<option value=\"$key\">$value</option>";
55 
+            $status_options .= "<option value=\"$key\">$value</option>";
56 56 
         }
57 57
58 58 
         return <<<EOT
Please login to merge, or discard this patch.
main/auth/shibboleth/config-dist.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -11,6 +11,6 @@
 
 block discarded – undo
11 11 
  * @license see /license.txt
12 12 
  * @author Laurent Opprecht <[email protected]>, Nicolas Rod for the University of Geneva
13 13 
  */
14 
-require_once dirname(__FILE__) . '/config/aai.class.php';
14 
+require_once dirname(__FILE__).'/config/aai.class.php';
15 15
16 16 
 Shibboleth::set_config(aai::config());
17 17 
\ No newline at end of file
Please login to merge, or discard this patch.