Merge commit 'refs/merge-requests/2' of git://gitorious.org/owncloud/owncloud

This commit is contained in:
Frank Karlitschek 2010-03-14 22:00:08 +01:00
commit 2616621ad9
2 changed files with 4 additions and 4 deletions

View File

@ -57,7 +57,7 @@ class OC_USER {
* check if the login button is pressed and logg the user in * check if the login button is pressed and logg the user in
* *
*/ */
public static function loginlisener(){ public static function loginlistener(){
global $CONFIG_ADMINLOGIN; global $CONFIG_ADMINLOGIN;
global $CONFIG_ADMINPASSWORD; global $CONFIG_ADMINPASSWORD;
if(isset($_POST['loginbutton']) and isset($_POST['password']) and isset($_POST['login'])){ if(isset($_POST['loginbutton']) and isset($_POST['password']) and isset($_POST['login'])){
@ -74,7 +74,7 @@ class OC_USER {
* check if the logout button is pressed and logout the user * check if the logout button is pressed and logout the user
* *
*/ */
public static function logoutlisener(){ public static function logoutlistener(){
if(isset($_GET['logoutbutton'])){ if(isset($_GET['logoutbutton'])){
OC_LOG::event($_SESSION['username'],2,''); OC_LOG::event($_SESSION['username'],2,'');
if(isset($_SESSION['username'])) unset($_SESSION['username']); if(isset($_SESSION['username'])) unset($_SESSION['username']);

View File

@ -32,8 +32,8 @@ if(isset($_GET['file'])) {
}else{ }else{
OC_USER::loginlisener(); OC_USER::loginlistener();
OC_USER::logoutlisener(); OC_USER::logoutlistener();
OC_UTIL::showheader(); OC_UTIL::showheader();