diff options
| author | Florian Reinhard <florian.reinhard@googlemail.com> | 2012-05-24 00:55:37 +0400 |
|---|---|---|
| committer | Florian Reinhard <florian.reinhard@googlemail.com> | 2012-05-24 00:55:37 +0400 |
| commit | 8199cf579663f7af741b8659addfbfd06db7e693 (patch) | |
| tree | 8a1d6bf9e0bfa5abc99bd863c5455709f3ce93c7 /django_auth | |
| parent | 07d7f438ca1da5d8488618bb26c57287360abc32 (diff) | |
Make django_auth work with owncloud 4.0
Diffstat (limited to 'django_auth')
| -rw-r--r-- | django_auth/appinfo/app.php | 7 | ||||
| -rw-r--r-- | django_auth/lib/group.php | 2 | ||||
| -rw-r--r-- | django_auth/lib/user.php | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/django_auth/appinfo/app.php b/django_auth/appinfo/app.php index 187ec0a0d..e4da3fb72 100644 --- a/django_auth/appinfo/app.php +++ b/django_auth/appinfo/app.php @@ -29,9 +29,6 @@ define('OC_GROUP_BACKEND_DJANGO_SUPERUSER_IS_ADMIN', true); OC_APP::registerAdmin('django_auth','settings'); -OC_User::registerBackend('Django'); OC_User::useBackend( 'Django' ); - -OC_Group::registerBackend('Django'); -OC_Group::setBackend( 'Django' ); -?>
\ No newline at end of file +OC_Group::useBackend( new OC_GROUP_DJANGO() ); +?> diff --git a/django_auth/lib/group.php b/django_auth/lib/group.php index 8d0fd448f..c5e1f884b 100644 --- a/django_auth/lib/group.php +++ b/django_auth/lib/group.php @@ -28,7 +28,7 @@ * Authentification backend to authenticate agains a django webapplication using * django.contrib.auth. */ -class OC_Group_Django extends OC_Group_Backend { +class OC_GROUP_DJANGO extends OC_Group_Backend { static $staff_is_admin; static $superuser_is_admin; diff --git a/django_auth/lib/user.php b/django_auth/lib/user.php index 6d977be25..c676cc4d4 100644 --- a/django_auth/lib/user.php +++ b/django_auth/lib/user.php @@ -30,7 +30,7 @@ require_once('phpsec.crypt.php'); * Authentification backend to authenticate agains a django webapplication using * django.contrib.auth. */ -class OC_User_Django extends OC_User_Backend { +class OC_USER_DJANGO extends OC_User_Backend { /** * @brief Create a new user * @param $uid The username of the user to create |