mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:owncloud/owncloud 

Conflicts:
	inc/lib_log.php
This commit is contained in:
Robin Appelman 2010-07-06 10:35:23 +02:00
parent c718716e57 11d515ef4e
commit 1bdfe395cd
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/lib_log.php
View File

@ -50,7 +50,6 @@ class OC_LOG {
public static function event($user,$type,$message){ public static function event($user,$type,$message){
global $CONFIG_DBTABLEPREFIX; global $CONFIG_DBTABLEPREFIX;
$result = OC_DB::query('INSERT INTO `' . $CONFIG_DBTABLEPREFIX . 'log` (`timestamp`,`user`,`type`,`message`) VALUES ('.time().',\''.addslashes($user).'\','.addslashes($type).',\''.addslashes($message).'\');'); $result = OC_DB::query('INSERT INTO `' . $CONFIG_DBTABLEPREFIX . 'log` (`timestamp`,`user`,`type`,`message`) VALUES ('.time().',\''.addslashes($user).'\','.addslashes($type).',\''.addslashes($message).'\');');
OC_DB::free_result($result);
} }

10
inc/lib_user.php
View File

@ -48,8 +48,16 @@ class OC_USER {
public static function loginlisener(){ public static function loginlisener(){
if(isset($_POST['loginbutton']) and isset($_POST['password']) and isset($_POST['login'])){ if(isset($_POST['loginbutton']) and isset($_POST['password']) and isset($_POST['login'])){
if(OC_USER::login($_POST['login'],$_POST['password'])){ if(OC_USER::login($_POST['login'],$_POST['password'])){
echo 1;
OC_LOG::event($_SESSION['username'],1,''); OC_LOG::event($_SESSION['username'],1,'');
return(''); echo 2;
if((isset($CONFIG_HTTPFORCESSL) and $CONFIG_HTTPFORCESSL) or isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') {
$url = "https://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
}else{
$url = "http://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
}
header("Location: $url");
die();
}else{ }else{
return('error'); return('error');
} }