Completed
Push — 1.11.x ( d9e2c7...327a9e )
by José
48:31 queued 23:34
created
main/auth/shibboleth/test/shibboleth_test.class.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -206,8 +206,7 @@
 block discarded – undo
206 206
             echo $message;
207 207
             var_dump(debug_backtrace());
208 208
             die;
209
-        }
210
-        else
209
+        } else
211 210
         {
212 211
             $message = "Assert successful $message <br/>";
213 212
             echo $message;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -205,7 +205,7 @@
 block discarded – undo
205 205
             $message = "Assert failed $message <br/>";
206 206
             echo $message;
207 207
             // Dump variable for debug
208
-            error_log(print_r(debug_backtrace(),1));
208
+            error_log(print_r(debug_backtrace(), 1));
209 209
             die;
210 210
         }
211 211
         else
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/model/scaffold/user.class.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@
 block discarded – undo
17 17
 {
18 18
 
19 19
     /**
20
-    * Store for User objects. Interact with the database.
21
-    *
22
-    * @return UserStore 
23
-    */
20
+     * Store for User objects. Interact with the database.
21
+     *
22
+     * @return UserStore 
23
+     */
24 24
     public static function store()
25 25
     {
26 26
         static $result = false;
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -33,6 +33,7 @@  discard block
 block discarded – undo
33 33
         
34 34
     /**
35 35
      *
36
+     * @param ShibbolethUser $data
36 37
      * @return User 
37 38
      */
38 39
     public static function create($data = null)
@@ -133,6 +134,7 @@  discard block
 block discarded – undo
133 134
     
134 135
     /**
135 136
      *
137
+     * @param string $value
136 138
      * @return User 
137 139
      */
138 140
     public function get_by_user_id($value)
@@ -169,6 +171,7 @@  discard block
 block discarded – undo
169 171
     
170 172
     /**
171 173
      *
174
+     * @param string $value
172 175
      * @return bool 
173 176
      */
174 177
     public function username_exists($value)
Please login to merge, or discard this patch.
main/auth/shibboleth/app/model/scaffold/admin.class.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@
 block discarded – undo
17 17
 {
18 18
 
19 19
     /**
20
-    * Store for Admin objects. Interact with the database.
21
-    *
22
-    * @return AdminStore 
23
-    */
20
+     * Store for Admin objects. Interact with the database.
21
+     *
22
+     * @return AdminStore 
23
+     */
24 24
     public static function store()
25 25
     {
26 26
         static $result = false;
Please login to merge, or discard this patch.
main/auth/shibboleth/app/model/shibboleth_store.class.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -168,12 +168,10 @@
 block discarded – undo
168 168
                 if (empty($result))
169 169
                 {
170 170
                     $result = $default;
171
-                }
172
-                else if (count($result) == 1)
171
+                } else if (count($result) == 1)
173 172
                 {
174 173
                     $result = reset($result);
175
-                }
176
-                else
174
+                } else
177 175
                 {
178 176
                     $result = $result;
179 177
                 }
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/app/controller/shibboleth_controller.class.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -56,8 +56,7 @@  discard block
 block discarded – undo
56 56
             if ($email = $form->get_email())
57 57
             {
58 58
                 $user->email = $email;
59
-            }
60
-            else
59
+            } else
61 60
             {
62 61
                 $content = $form->display();
63 62
                 Shibboleth::display()->page($content);
@@ -71,8 +70,7 @@  discard block
 block discarded – undo
71 70
         if ($is_new_user && $user->status_request)
72 71
         {
73 72
             Shibboleth::redirect('/main/auth/shibboleth/app/view/request.php');
74
-        }
75
-        else
73
+        } else
76 74
         {
77 75
             Shibboleth::redirect();
78 76
         }
@@ -141,8 +139,7 @@  discard block
 block discarded – undo
141 139
             {
142 140
                 $request_submitted = get_lang('RequestSubmitted');
143 141
                 Shibboleth::display()->message_page($request_submitted);
144
-            }
145
-            else
142
+            } else
146 143
             {
147 144
                 $request_failed = get_lang('RequestFailed');
148 145
                 Shibboleth::display()->error_page($request_failed);
Please login to merge, or discard this patch.