@@ -6,7 +6,7 @@ discard block |
||
| 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 |
||
| 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 |
@@ -206,8 +206,7 @@ |
||
| 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; |
@@ -205,7 +205,7 @@ |
||
| 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 |
@@ -78,14 +78,14 @@ |
||
| 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 | |
@@ -2,7 +2,7 @@ |
||
| 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. |
@@ -2,7 +2,7 @@ |
||
| 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. |
@@ -17,10 +17,10 @@ |
||
| 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; |
@@ -33,6 +33,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 169 | 171 | |
| 170 | 172 | /** |
| 171 | 173 | * |
| 174 | + * @param string $value |
|
| 172 | 175 | * @return bool |
| 173 | 176 | */ |
| 174 | 177 | public function username_exists($value) |
@@ -17,10 +17,10 @@ |
||
| 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; |
@@ -168,12 +168,10 @@ |
||
| 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 | } |
@@ -52,7 +52,7 @@ |
||
| 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 |