Index: CheckCookies.php
===================================================================
--- CheckCookies.php	(.../tags/versions/2009.2/includes/functions/CheckCookies.php)	(revision 575)
+++ CheckCookies.php	(.../branches/releases/2009/includes/functions/CheckCookies.php)	(revision 587)
@@ -1,11 +1,11 @@
 <?php
 /**
- * Tis file is part of XNova:Legacies
+ * This file is part of XNova:Legacies
  *
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * @see http://www.xnova-ng.org/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2010, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -43,15 +43,17 @@
 EOF;
         $userData = doquery($sql, 'users', true);
     } else if (isset($_COOKIE['nova-cookie'])) {
+        $_COOKIE['nova-cookie'] = unserialize($_COOKIE['nova-cookie']);
         $cookieData = array(
-            'id' => (isset($_COOKIE['nova-cookie']['id']) ? (int) $_COOKIE['nova-cookie']['id'] : 0),
+            'id' => (string) (isset($_COOKIE['nova-cookie']['id']) ? (int) $_COOKIE['nova-cookie']['id'] : 0),
             'key' => (isset($_COOKIE['nova-cookie']['key']) ? (string) $_COOKIE['nova-cookie']['key'] : NULL)
             );
 
         $sql =<<<EOF
-SELECT * FROM {{table}}
+SELECT users.*
+    FROM {{table}} AS users
     WHERE id={$cookieData['id']}
-      AND (@key:={$cookieData['key']})=CONCAT((@salt:=MID(@key, 0, 4)), SHA1(CONCAT(u.username, u.password, @salt))
+      AND (@key:="{$cookieData['key']}")=CONCAT((@salt:=MID(@key, 0, 4)), SHA1(CONCAT(users.username, users.password, @salt)))
     LIMIT 1
 EOF;
         $userData = doquery($sql, 'users', true);
Index: ChekUser.php
===================================================================
--- ChekUser.php    (.../tags/versions/2009.2/includes/functions/ChekUser.php)  (revision 575)
+++ ChekUser.php    (.../branches/releases/2009/includes/functions/ChekUser.php)    (revision 587)
@@ -1,11 +1,11 @@
 <?php
 /**
- * Tis file is part of XNova:Legacies
+ * This file is part of XNova:Legacies
  *
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * @see http://www.xnova-ng.org/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2010, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
Index: login.php
===================================================================
--- login.php   (.../tags/versions/2009.2/login.php)    (revision 372)
+++ login.php   (.../branches/releases/2009/login.php)  (revision 587)
@@ -5,7 +5,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * @see http://www.xnova-ng.org/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2010, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify
@@ -56,14 +56,14 @@
     $login = doquery($sql, '', true);
 
     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');
-        doquery("DELETE FROM {{table}} WHERE `who` = '".$login['username']."'",'banned');
+        doquery("UPDATE {{table}} SET `banaday` = '0', `bana` = '0', `urlaubs_modus` ='0'  WHERE `username` = '{$login['username']}' LIMIT 1", 'users');
+        doquery("DELETE FROM {{table}} WHERE `who` = '{$login['username']}'",'banned');
     }
 
     if ($login) {
         if (intval($login['login_success'])) {
             if (isset($_POST["rememberme"])) {
-                setcookie('nova-cookie', array('id' => $login['id'], 'key' => $login['login_rememberme']), time() + 2592000);
+                setCookie('nova-cookie', serialize(array('id' => $login['id'], 'key' => $login['login_rememberme'])), time() + 2592000);
             }
 
             $sql =<<<EOF
Index: logout.php
===================================================================
--- logout.php  (.../tags/versions/2009.2/logout.php)   (revision 345)
+++ logout.php  (.../branches/releases/2009/logout.php) (revision 587)
@@ -1,11 +1,11 @@
 <?php
 /**
- * Tis file is part of XNova:Legacies
+ * This file is part of XNova:Legacies
  *
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * @see http://www.xnova-ng.org/
  *
- * Copyright (c) 2009-Present, XNova Support Team <http://www.xnova-ng.org>
+ * Copyright (c) 2009-2010, XNova Support Team <http://www.xnova-ng.org>
  * All rights reserved.
  *
  * This program is free software: you can redistribute it and/or modify