Index: includes/functions/CheckCookies.php
===================================================================
--- includes/functions/CheckCookies.php	(révision 339)
+++ includes/functions/CheckCookies.php	(copie de travail)
@@ -35,7 +35,7 @@
     includeLang('cookies');
 
     $userData = array();
-    if (isset($_SESSION['user_id'])) {
+    if (isset($_SESSION['user_id']) && $_SESSION['rememberme'] !== true) {
         $sql =<<<EOF
 SELECT * FROM {{table}}
     WHERE id={$_SESSION['user_id']}
@@ -43,17 +43,20 @@
 EOF;
         $userData = doquery($sql, 'users', true);
     } else if (isset($_COOKIE['nova-cookie'])) {
+    	
+    	$cookieDataArray = explode(';', $_COOKIE['nova-cookie']);
         $cookieData = array(
-            'id' => (isset($_COOKIE['nova-cookie']['id']) ? (int) $_COOKIE['nova-cookie']['id'] : 0),
-            'key' => (isset($_COOKIE['nova-cookie']['key']) ? (string) $_COOKIE['nova-cookie']['key'] : NULL)
+            'id' => (isset($cookieDataArray[0]) ? (int) $cookieDataArray[0] : 0),
+            'key' => (isset($cookieDataArray[1]) ? (string) $cookieDataArray[1] : NULL)
             );
 
         $sql =<<<EOF
-SELECT * FROM {{table}}
-    WHERE id={$cookieData['id']}
-      AND (@key:={$cookieData['key']})=CONCAT((@salt:=MID(@key, 0, 4)), SHA1(CONCAT(u.username, u.password, @salt))
-    LIMIT 1
+SELECT * FROM {{table}} AS u
+    WHERE id = '{$cookieData['id']}'
+      AND (@key:= '{$cookieData['key']}')= CONCAT((@salt:=MID('{$cookieData['key']}', 0, 4)), SHA1(CONCAT(u.username, u.password, @salt)))
+     LIMIT 1
 EOF;
+
         $userData = doquery($sql, 'users', true);
         $_SESSION['user_id'] = $userData['id'];
         if (empty($userData)) {
Index: login.php
===================================================================
--- login.php	(révision 339)
+++ login.php	(copie de travail)
@@ -36,6 +36,11 @@
 
 includeLang('login');
 
+if (isset($_COOKIE['nova-cookie'])) {
+	unset($_SESSION['id']);
+	header('Location: frames.php');
+}
+
 if (!empty($_POST)) {
     $userData = array(
         'username' => mysql_real_escape_string($_POST['username']),
@@ -54,7 +59,6 @@
 EOF;
 
     $login = doquery($sql, '', true);
-    var_dump($login);
 
     if($login['banaday'] <= time() & $login['banaday'] !='0' ){
         doquery("UPDATE {{table}} SET `banaday` = '0', `bana` = '0', `urlaubs_modus` ='0'  WHERE `username` = '".$login['username']."' LIMIT 1;", 'users');
@@ -64,7 +68,10 @@
     if ($login) {
         if (intval($login['login_success'])) {
             if (isset($_POST["rememberme"])) {
-                setcookie('nova-cookie', array('id' => $login['id'], 'key' => $login['login_rememberme']), time() + 2592000);
+            	$cookieData = array('id' => $login['id'], 'key' => $login['login_rememberme']);
+            	$cookieDataString = implode(';', $cookieData);
+                setcookie('nova-cookie', $cookieDataString, time() + 2592000);
+                $_SESSION['rememberme'] = true;
             }
 
             $sql =<<<EOF