diff options
author | Bart Visscher <bartv@thisnet.nl> | 2011-10-01 01:48:20 +0400 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2011-10-01 01:48:20 +0400 |
commit | 21a88613a150c550e32d63df9a9ef8bf3d5107d0 (patch) | |
tree | 45e76fbae9349265489dbebe5aef090f45e49a85 /lib | |
parent | ddd28aae67d7e67b7e39c1fe58fe52659d1dd755 (diff) | |
parent | 5fbf378d1021da91977caa6c7df9944c353d4786 (diff) |
Merge branch 'lostpassword'
Conflicts:
core/templates/login.php
index.php
lib/util.php
Diffstat (limited to 'lib')
-rw-r--r-- | lib/util.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/util.php b/lib/util.php index 26d718da944..f21ec8208b4 100644 --- a/lib/util.php +++ b/lib/util.php @@ -258,6 +258,14 @@ class OC_Util { return $errors; } + public static function displayLoginPage($parameters = array()){ + if(isset($_COOKIE["username"])){ + $parameters["username"] = $_COOKIE["username"]; + } else { + $parameters["username"] = ''; + } + OC_Template::printGuestPage("", "login", $parameters); + } /** * Try to get the username the httpd server runs on, used in hints |