diff options
| author | Sixto Martin <smartin@yaco.es> | 2012-11-22 23:15:34 +0400 |
|---|---|---|
| committer | Sixto Martin <smartin@yaco.es> | 2012-11-22 23:15:34 +0400 |
| commit | d5ab8f7fd6558e97b8eb99b3daf93d888e2567d1 (patch) | |
| tree | 3b791f9d991a9230d9d7bb09fdf7a30655078b44 /user_saml | |
| parent | e60a7a80eea1f725c0c1c0e01efd2742b8489411 (diff) | |
Fix typos. Prevent to load user_saml App when login is finished
Diffstat (limited to 'user_saml')
| -rw-r--r-- | user_saml/appinfo/app.php | 2 | ||||
| -rw-r--r-- | user_saml/lib/hooks.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/user_saml/appinfo/app.php b/user_saml/appinfo/app.php index dab35b2eb..f8c13a2c4 100644 --- a/user_saml/appinfo/app.php +++ b/user_saml/appinfo/app.php @@ -48,6 +48,8 @@ if (OCP\App::isEnabled('user_saml')) { header( 'Location: ' . OC::$WEBROOT . '/?' . $_SERVER["QUERY_STRING"]); exit(); } + + OC::$REQUESTEDAPP = ''; OC_Util::redirectToDefaultPage(); } diff --git a/user_saml/lib/hooks.php b/user_saml/lib/hooks.php index 9fa9d7715..a129f510f 100644 --- a/user_saml/lib/hooks.php +++ b/user_saml/lib/hooks.php @@ -43,9 +43,9 @@ class OC_USER_SAML_Hooks { if (array_key_exists($samlBackend->groupMapping, $attributes)) { $saml_groups = $attributes[$samlBackend->groupMapping]; } - else if (!empty($samlBackend->$defaultGroup)) { - $saml_groups = array($samlBackend->$defaultGroup); - OC_Log::write('saml','Using default group "'.$samlBackend->$defaultGroup.'" for the user: '.$uid, OC_Log::DEBUG); + else if (!empty($samlBackend->defaultGroup)) { + $saml_groups = array($samlBackend->defaultGroup); + OC_Log::write('saml','Using default group "'.$samlBackend->defaultGroup.'" for the user: '.$uid, OC_Log::DEBUG); } if (!OC_User::userExists($uid)) { |