diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
| commit | 5788d36c8d1e9869d8a645293805e3b0265ea238 (patch) | |
| tree | 80045c0eb1687652f956b3bdaccb1c765893d2e1 /lib/app.php | |
| parent | 84f3c8b6cc1060203d807ee65545478ce34f93c4 (diff) | |
| parent | 35bd7a400d30fb27703d4fa02b107f9629845b7d (diff) | |
| download | nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.tar.gz nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.zip | |
Merge branch 'master' into fixing-1354-master
Conflicts:
settings/admin.php
settings/templates/admin.php
Diffstat (limited to 'lib/app.php')
| -rw-r--r-- | lib/app.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/app.php b/lib/app.php index fa3e14ce4d2..3a4e21e8cd1 100644 --- a/lib/app.php +++ b/lib/app.php @@ -36,6 +36,7 @@ class OC_App{ static private $appTypes = array(); static private $loadedApps = array(); static private $checkedApps = array(); + static private $altLogin = array(); /** * @brief loads all apps @@ -568,6 +569,14 @@ class OC_App{ self::$personalForms[]= $app.'/'.$page.'.php'; } + public static function registerLogIn($entry) { + self::$altLogin[] = $entry; + } + + public static function getAlternativeLogIns() { + return self::$altLogin; + } + /** * @brief: get a list of all apps in the apps folder * @return array or app names (string IDs) |