@@ -2,14 +2,11 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2018 by schokokeks.org Hosting, namely

+Written by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

-To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

-

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

-http://creativecommons.org/publicdomain/zero/1.0/

+This code is published under a 0BSD license.

 Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

 */

@@ -18,8 +18,8 @@ require_once('session/checkuser.php');

 function user_customer_match($cust, $user)

 {

-    $args = array(":cid" => $cust,

-                ":user" => $user);

+    $args = [":cid" => $cust,

+                ":user" => $user, ];

     $result = db_query("SELECT uid FROM system.useraccounts WHERE kunde=:cid AND username=:user AND kundenaccount=1", $args);

     if ($result->rowCount() > 0) {

         return true;

@@ -29,7 +29,7 @@ function user_customer_match($cust, $user)

 function find_username($input)

 {

-    $args = array(":user" => $input);

+    $args = [":user" => $input];

     $result = db_query("SELECT username FROM system.useraccounts WHERE username=:user AND kundenaccount=1", $args);

     if ($result->rowCount() > 0) {

         $line = $result->fetch();

@@ -41,8 +41,8 @@ function find_username($input)

 function customer_has_email($customerno, $email)

 {

-    $args = array(":cid" => $customerno,

-                ":email" => $email);

+    $args = [":cid" => $customerno,

+                ":email" => $email, ];

     $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=:cid AND (email=:email OR email_extern=:email OR email_rechnung=:email)", $args);

     return ($result->rowCount() > 0);

 }

@@ -51,8 +51,8 @@ function customer_has_email($customerno, $email)

 function validate_token($customerno, $token)

 {

     expire_tokens();

-    $args = array(":cid" => $customerno,

-                ":token" => $token);

+    $args = [":cid" => $customerno,

+                ":token" => $token, ];

     $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=:cid AND token=:token", $args);

     return ($result->rowCount() > 0);

 }

@@ -61,7 +61,7 @@ function validate_token($customerno, $token)

 function get_uid_for_token($token)

 {

     expire_tokens();

-    $result = db_query("SELECT uid FROM system.usertoken WHERE token=?", array($token));

+    $result = db_query("SELECT uid FROM system.usertoken WHERE token=?", [$token]);

     if ($result->rowCount() == 0) {

         return null;

     }

@@ -71,7 +71,7 @@ function get_uid_for_token($token)

 function get_username_for_uid($uid)

 {

-    $result = db_query("SELECT username FROM system.useraccounts WHERE uid=?", array($uid));

+    $result = db_query("SELECT username FROM system.useraccounts WHERE uid=?", [$uid]);

     if ($result->rowCount() != 1) {

         system_failure("Unexpected number of users with this uid (!= 1)!");

     }

@@ -82,8 +82,8 @@ function get_username_for_uid($uid)

 function validate_uid_token($uid, $token)

 {

     expire_tokens();

-    $args = array(":uid" => $uid,

-                ":token" => $token);

+    $args = [":uid" => $uid,

+                ":token" => $token, ];

     $result = db_query("SELECT NULL FROM system.usertoken WHERE uid=:uid AND token=:token", $args);

     return ($result->rowCount() > 0);

 }

@@ -98,27 +98,27 @@ function expire_tokens()

 function invalidate_customer_token($customerno)

 {

-    db_query("UPDATE kundendaten.kunden SET token=NULL, token_create=NULL WHERE id=?", array($customerno));

+    db_query("UPDATE kundendaten.kunden SET token=NULL, token_create=NULL WHERE id=?", [$customerno]);

 }

 function invalidate_systemuser_token($uid)

 {

-    db_query("DELETE FROM system.usertoken WHERE uid=?", array($uid));

+    db_query("DELETE FROM system.usertoken WHERE uid=?", [$uid]);

 }

 function create_token($username)

 {

     expire_tokens();

-    $result = db_query("SELECT uid FROM system.useraccounts WHERE username=?", array($username));

+    $result = db_query("SELECT uid FROM system.useraccounts WHERE username=?", [$username]);

     $uid = (int) $result->fetch()['uid'];

-    $result = db_query("SELECT created FROM system.usertoken WHERE uid=?", array($uid));

+    $result = db_query("SELECT created FROM system.usertoken WHERE uid=?", [$uid]);

     if ($result->rowCount() > 0) {

         system_failure("Für Ihr Benutzerkonto ist bereits eine Passwort-Erinnerung versendet worden. Bitte wenden Sie sich an den Support wenn Sie diese nicht erhalten haben.");

     }

-    $args = array(":uid" => $uid,

-                ":token" => random_string(16));

+    $args = [":uid" => $uid,

+                ":token" => random_string(16), ];

     db_query("INSERT INTO system.usertoken VALUES (:uid, NOW(), NOW() + INTERVAL 1 DAY, :token)", $args);

     return true;

 }

@@ -126,7 +126,7 @@ function create_token($username)

 function emailaddress_for_user($username)

 {

-    $result = db_query("SELECT k.email FROM kundendaten.kunden AS k INNER JOIN system.useraccounts AS u ON (u.kunde=k.id) WHERE u.username=?", array($username));

+    $result = db_query("SELECT k.email FROM kundendaten.kunden AS k INNER JOIN system.useraccounts AS u ON (u.kunde=k.id) WHERE u.username=?", [$username]);

     $data = $result->fetch();

     return $data['email'];

 }

@@ -135,7 +135,7 @@ function emailaddress_for_user($username)

 function get_customer_token($customerno)

 {

     expire_tokens();

-    $result = db_query("SELECT token FROM kundendaten.kunden WHERE id=? AND token IS NOT NULL", array($customerno));

+    $result = db_query("SELECT token FROM kundendaten.kunden WHERE id=? AND token IS NOT NULL", [$customerno]);

     if ($result->rowCount() < 1) {

         system_failure("Kann das Token nicht auslesen!");

     }

@@ -145,7 +145,7 @@ function get_customer_token($customerno)

 function get_user_token($username)

 {

-    $result = db_query("SELECT token FROM system.usertoken AS t INNER JOIN system.useraccounts AS u USING (uid) WHERE username=?", array($username));

+    $result = db_query("SELECT token FROM system.usertoken AS t INNER JOIN system.useraccounts AS u USING (uid) WHERE username=?", [$username]);

     $tmp = $result->fetch();

     return $tmp['token'];

 }

@@ -100,23 +100,23 @@ function invalidate_customer_token($customerno)

 {

     db_query("UPDATE kundendaten.kunden SET token=NULL, token_create=NULL WHERE id=?", array($customerno));

 }

- 

+

 function invalidate_systemuser_token($uid)

 {

     db_query("DELETE FROM system.usertoken WHERE uid=?", array($uid));

 }

- 

+

 function create_token($username)

 {

     expire_tokens();

     $result = db_query("SELECT uid FROM system.useraccounts WHERE username=?", array($username));

     $uid = (int) $result->fetch()['uid'];

-  

+

     $result = db_query("SELECT created FROM system.usertoken WHERE uid=?", array($uid));

     if ($result->rowCount() > 0) {

         system_failure("Für Ihr Benutzerkonto ist bereits eine Passwort-Erinnerung versendet worden. Bitte wenden Sie sich an den Support wenn Sie diese nicht erhalten haben.");

     }

-  

+

     $args = array(":uid" => $uid,

                 ":token" => random_string(16));

     db_query("INSERT INTO system.usertoken VALUES (:uid, NOW(), NOW() + INTERVAL 1 DAY, :token)", $args);

@@ -8,7 +8,7 @@ Written 2008-2018 by schokokeks.org Hosting, namely

 To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see

 http://creativecommons.org/publicdomain/zero/1.0/

 Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

@@ -18,135 +18,134 @@ require_once('session/checkuser.php');

 function user_customer_match($cust, $user)

 {

-  $args = array(":cid" => $cust,

+    $args = array(":cid" => $cust,

                 ":user" => $user);

-  $result = db_query("SELECT uid FROM system.useraccounts WHERE kunde=:cid AND username=:user AND kundenaccount=1", $args);

-  if ($result->rowCount() > 0)

-    return true;

-  return false;

+    $result = db_query("SELECT uid FROM system.useraccounts WHERE kunde=:cid AND username=:user AND kundenaccount=1", $args);

+    if ($result->rowCount() > 0) {

+        return true;

+    }

+    return false;

 }

-function find_username($input) 

+function find_username($input)

 {

-  $args = array(":user" => $input);

-  $result = db_query("SELECT username FROM system.useraccounts WHERE username=:user AND kundenaccount=1", $args);

-  if ($result->rowCount() > 0)

-  {

-    $line = $result->fetch();

-    return $line['username'];

-  } else {

-    return false;

-  }

+    $args = array(":user" => $input);

+    $result = db_query("SELECT username FROM system.useraccounts WHERE username=:user AND kundenaccount=1", $args);

+    if ($result->rowCount() > 0) {

+        $line = $result->fetch();

+        return $line['username'];

+    } else {

+        return false;

+    }

 }

 function customer_has_email($customerno, $email)

 {

-  $args = array(":cid" => $customerno,

+    $args = array(":cid" => $customerno,

                 ":email" => $email);

-  $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=:cid AND (email=:email OR email_extern=:email OR email_rechnung=:email)", $args);

-  return ($result->rowCount() > 0);

+    $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=:cid AND (email=:email OR email_extern=:email OR email_rechnung=:email)", $args);

+    return ($result->rowCount() > 0);

 }

 function validate_token($customerno, $token)

 {

-  expire_tokens();

-  $args = array(":cid" => $customerno,

+    expire_tokens();

+    $args = array(":cid" => $customerno,

                 ":token" => $token);

-  $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=:cid AND token=:token", $args);

-  return ($result->rowCount() > 0);

+    $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=:cid AND token=:token", $args);

+    return ($result->rowCount() > 0);

 }

-function get_uid_for_token($token) 

+function get_uid_for_token($token)

 {

-  expire_tokens();

-  $result = db_query("SELECT uid FROM system.usertoken WHERE token=?", array($token));

-  if ($result->rowCount() == 0) {

-    return NULL;

-  }

-  $data = $result->fetch();

-  return $data['uid'];  

+    expire_tokens();

+    $result = db_query("SELECT uid FROM system.usertoken WHERE token=?", array($token));

+    if ($result->rowCount() == 0) {

+        return null;

+    }

+    $data = $result->fetch();

+    return $data['uid'];

 }

-function get_username_for_uid($uid) 

+function get_username_for_uid($uid)

 {

-  $result = db_query("SELECT username FROM system.useraccounts WHERE uid=?", array($uid));

-  if ($result->rowCount() != 1) {

-    system_failure("Unexpected number of users with this uid (!= 1)!");

-  }

-  $item = $result->fetch();

-  return $item['username'];

+    $result = db_query("SELECT username FROM system.useraccounts WHERE uid=?", array($uid));

+    if ($result->rowCount() != 1) {

+        system_failure("Unexpected number of users with this uid (!= 1)!");

+    }

+    $item = $result->fetch();

+    return $item['username'];

 }

 function validate_uid_token($uid, $token)

 {

-  expire_tokens();

-  $args = array(":uid" => $uid,

+    expire_tokens();

+    $args = array(":uid" => $uid,

                 ":token" => $token);

-  $result = db_query("SELECT NULL FROM system.usertoken WHERE uid=:uid AND token=:token", $args);

-  return ($result->rowCount() > 0);

+    $result = db_query("SELECT NULL FROM system.usertoken WHERE uid=:uid AND token=:token", $args);

+    return ($result->rowCount() > 0);

 }

 function expire_tokens()

 {

-  $expire = "1 DAY";

-  db_query("UPDATE kundendaten.kunden SET token=NULL, token_create=NULL WHERE token_create < NOW() - INTERVAL {$expire};");

-  db_query("DELETE FROM system.usertoken WHERE expire < NOW();");

+    $expire = "1 DAY";

+    db_query("UPDATE kundendaten.kunden SET token=NULL, token_create=NULL WHERE token_create < NOW() - INTERVAL {$expire};");

+    db_query("DELETE FROM system.usertoken WHERE expire < NOW();");

 }

 function invalidate_customer_token($customerno)

 {

-  db_query("UPDATE kundendaten.kunden SET token=NULL, token_create=NULL WHERE id=?", array($customerno));

+    db_query("UPDATE kundendaten.kunden SET token=NULL, token_create=NULL WHERE id=?", array($customerno));

 }

 function invalidate_systemuser_token($uid)

 {

-  db_query("DELETE FROM system.usertoken WHERE uid=?", array($uid));

+    db_query("DELETE FROM system.usertoken WHERE uid=?", array($uid));

 }

 function create_token($username)

 {

-  expire_tokens();

-  $result = db_query("SELECT uid FROM system.useraccounts WHERE username=?", array($username));

-  $uid = (int) $result->fetch()['uid'];

+    expire_tokens();

+    $result = db_query("SELECT uid FROM system.useraccounts WHERE username=?", array($username));

+    $uid = (int) $result->fetch()['uid'];

-  $result = db_query("SELECT created FROM system.usertoken WHERE uid=?", array($uid));

-  if ($result->rowCount() > 0) {

-    system_failure("Für Ihr Benutzerkonto ist bereits eine Passwort-Erinnerung versendet worden. Bitte wenden Sie sich an den Support wenn Sie diese nicht erhalten haben.");

-  }

+    $result = db_query("SELECT created FROM system.usertoken WHERE uid=?", array($uid));

+    if ($result->rowCount() > 0) {

+        system_failure("Für Ihr Benutzerkonto ist bereits eine Passwort-Erinnerung versendet worden. Bitte wenden Sie sich an den Support wenn Sie diese nicht erhalten haben.");

+    }

-  $args = array(":uid" => $uid,

+    $args = array(":uid" => $uid,

                 ":token" => random_string(16));

-  db_query("INSERT INTO system.usertoken VALUES (:uid, NOW(), NOW() + INTERVAL 1 DAY, :token)", $args);

-  return true;

+    db_query("INSERT INTO system.usertoken VALUES (:uid, NOW(), NOW() + INTERVAL 1 DAY, :token)", $args);

+    return true;

 }

 function emailaddress_for_user($username)

 {

-  $result = db_query("SELECT k.email FROM kundendaten.kunden AS k INNER JOIN system.useraccounts AS u ON (u.kunde=k.id) WHERE u.username=?", array($username));

-  $data = $result->fetch();

-  return $data['email'];

+    $result = db_query("SELECT k.email FROM kundendaten.kunden AS k INNER JOIN system.useraccounts AS u ON (u.kunde=k.id) WHERE u.username=?", array($username));

+    $data = $result->fetch();

+    return $data['email'];

 }

 function get_customer_token($customerno)

 {

-  expire_tokens();

-  $result = db_query("SELECT token FROM kundendaten.kunden WHERE id=? AND token IS NOT NULL", array($customerno));

-  if ($result->rowCount() < 1)

-    system_failure("Kann das Token nicht auslesen!");

-  return $result->fetch(PDO::FETCH_OBJ)->token;

+    expire_tokens();

+    $result = db_query("SELECT token FROM kundendaten.kunden WHERE id=? AND token IS NOT NULL", array($customerno));

+    if ($result->rowCount() < 1) {

+        system_failure("Kann das Token nicht auslesen!");

+    }

+    return $result->fetch(PDO::FETCH_OBJ)->token;

 }

-function get_user_token($username) 

+function get_user_token($username)

 {

-  $result = db_query("SELECT token FROM system.usertoken AS t INNER JOIN system.useraccounts AS u USING (uid) WHERE username=?", array($username));

-  $tmp = $result->fetch();

-  return $tmp['token'];

+    $result = db_query("SELECT token FROM system.usertoken AS t INNER JOIN system.useraccounts AS u USING (uid) WHERE username=?", array($username));

+    $tmp = $result->fetch();

+    return $tmp['token'];

 }

-

-?>

@@ -2,7 +2,7 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2014 by schokokeks.org Hosting, namely

+Written 2008-2018 by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -26,7 +26,18 @@ function user_customer_match($cust, $user)

   return false;

 }

-

+function find_username($input) 

+{

+  $args = array(":user" => $input);

+  $result = db_query("SELECT username FROM system.useraccounts WHERE username=:user AND kundenaccount=1", $args);

+  if ($result->rowCount() > 0)

+  {

+    $line = $result->fetch();

+    return $line['username'];

+  } else {

+    return false;

+  }

+}

 function customer_has_email($customerno, $email)

 {

@@ -108,7 +119,7 @@ function create_token($username)

   $args = array(":uid" => $uid,

                 ":token" => random_string(16));

-  db_query("INSERT INTO system.usertoken VALUES (:uid} NOW(), NOW() + INTERVAL 1 DAY, :token)", $args);

+  db_query("INSERT INTO system.usertoken VALUES (:uid, NOW(), NOW() + INTERVAL 1 DAY, :token)", $args);

   return true;

 }

@@ -2,7 +2,7 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2013 by schokokeks.org Hosting, namely

+Written 2008-2014 by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -18,9 +18,9 @@ require_once('session/checkuser.php');

 function user_customer_match($cust, $user)

 {

-  $customerno = (int) $cust;

-  $username = db_escape_string($user);

-  $result = db_query("SELECT uid FROM system.useraccounts WHERE kunde={$customerno} AND username='{$username}' AND kundenaccount=1;");

+  $args = array(":cid" => $cust,

+                ":user" => $user);

+  $result = db_query("SELECT uid FROM system.useraccounts WHERE kunde=:cid AND username=:user AND kundenaccount=1", $args);

   if ($result->rowCount() > 0)

     return true;

   return false;

@@ -30,9 +30,9 @@ function user_customer_match($cust, $user)

 function customer_has_email($customerno, $email)

 {

-  $customerno = (int) $customerno;

-  $email = db_escape_string($email);

-  $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=".$customerno." AND (email='{$email}' OR email_extern='{$email}' OR email_rechnung='{$email}');");

+  $args = array(":cid" => $customerno,

+                ":email" => $email);

+  $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=:cid AND (email=:email OR email_extern=:email OR email_rechnung=:email)", $args);

   return ($result->rowCount() > 0);

 }

@@ -40,9 +40,9 @@ function customer_has_email($customerno, $email)

 function validate_token($customerno, $token)

 {

   expire_tokens();

-  $customerno = (int) $customerno;

-  $token = db_escape_string($token);

-  $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id={$customerno} AND token='{$token}';");

+  $args = array(":cid" => $customerno,

+                ":token" => $token);

+  $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=:cid AND token=:token", $args);

   return ($result->rowCount() > 0);

 }

@@ -50,8 +50,7 @@ function validate_token($customerno, $token)

 function get_uid_for_token($token) 

 {

   expire_tokens();

-  $token = db_escape_string($token);

-  $result = db_query("SELECT uid FROM system.usertoken WHERE token='{$token}';");

+  $result = db_query("SELECT uid FROM system.usertoken WHERE token=?", array($token));

   if ($result->rowCount() == 0) {

     return NULL;

   }

@@ -61,8 +60,7 @@ function get_uid_for_token($token)

 function get_username_for_uid($uid) 

 {

-  $uid = (int) $uid;

-  $result = db_query("SELECT username FROM system.useraccounts WHERE uid={$uid}");

+  $result = db_query("SELECT username FROM system.useraccounts WHERE uid=?", array($uid));

   if ($result->rowCount() != 1) {

     system_failure("Unexpected number of users with this uid (!= 1)!");

   }

@@ -73,9 +71,9 @@ function get_username_for_uid($uid)

 function validate_uid_token($uid, $token)

 {

   expire_tokens();

-  $uid = (int) $uid;

-  $token = db_escape_string($token);

-  $result = db_query("SELECT NULL FROM system.usertoken WHERE uid={$uid} AND token='{$token}';");

+  $args = array(":uid" => $uid,

+                ":token" => $token);

+  $result = db_query("SELECT NULL FROM system.usertoken WHERE uid=:uid AND token=:token", $args);

   return ($result->rowCount() > 0);

 }

@@ -89,38 +87,35 @@ function expire_tokens()

 function invalidate_customer_token($customerno)

 {

-  $customerno = (int) $customerno;

-  db_query("UPDATE kundendaten.kunden SET token=NULL, token_create=NULL WHERE id={$customerno} LIMIT 1;");

+  db_query("UPDATE kundendaten.kunden SET token=NULL, token_create=NULL WHERE id=?", array($customerno));

 }

 function invalidate_systemuser_token($uid)

 {

-  $uid = (int) $uid;

-  db_query("DELETE FROM system.usertoken WHERE uid={$uid} LIMIT 1;");

+  db_query("DELETE FROM system.usertoken WHERE uid=?", array($uid));

 }

 function create_token($username)

 {

-  $username = db_escape_string($username);

   expire_tokens();

-  $result = db_query("SELECT uid FROM system.useraccounts WHERE username='{$username}'");

+  $result = db_query("SELECT uid FROM system.useraccounts WHERE username=?", array($username));

   $uid = (int) $result->fetch()['uid'];

-  $result = db_query("SELECT created FROM system.usertoken WHERE uid={$uid}");

+  $result = db_query("SELECT created FROM system.usertoken WHERE uid=?", array($uid));

   if ($result->rowCount() > 0) {

     system_failure("Für Ihr Benutzerkonto ist bereits eine Passwort-Erinnerung versendet worden. Bitte wenden Sie sich an den Support wenn Sie diese nicht erhalten haben.");

   }

-  $token = random_string(16);

-  db_query("INSERT INTO system.usertoken VALUES ({$uid}, NOW(), NOW() + INTERVAL 1 DAY, '{$token}')");

+  $args = array(":uid" => $uid,

+                ":token" => random_string(16));

+  db_query("INSERT INTO system.usertoken VALUES (:uid} NOW(), NOW() + INTERVAL 1 DAY, :token)", $args);

   return true;

 }

 function emailaddress_for_user($username)

 {

-  $username = db_escape_string($username);

-  $result = db_query("SELECT k.email FROM kundendaten.kunden AS k INNER JOIN system.useraccounts AS u ON (u.kunde=k.id) WHERE u.username='{$username}'");

+  $result = db_query("SELECT k.email FROM kundendaten.kunden AS k INNER JOIN system.useraccounts AS u ON (u.kunde=k.id) WHERE u.username=?", array($username));

   $data = $result->fetch();

   return $data['email'];

 }

@@ -128,9 +123,8 @@ function emailaddress_for_user($username)

 function get_customer_token($customerno)

 {

-  $customerno = (int) $customerno;

   expire_tokens();

-  $result = db_query("SELECT token FROM kundendaten.kunden WHERE id={$customerno} AND token IS NOT NULL;");

+  $result = db_query("SELECT token FROM kundendaten.kunden WHERE id=? AND token IS NOT NULL", array($customerno));

   if ($result->rowCount() < 1)

     system_failure("Kann das Token nicht auslesen!");

   return $result->fetch(PDO::FETCH_OBJ)->token;

@@ -139,8 +133,7 @@ function get_customer_token($customerno)

 function get_user_token($username) 

 {

-  $username = db_escape_string($username);

-  $result = db_query("SELECT token FROM system.usertoken AS t INNER JOIN system.useraccounts AS u USING (uid) WHERE username='{$username}'");

+  $result = db_query("SELECT token FROM system.usertoken AS t INNER JOIN system.useraccounts AS u USING (uid) WHERE username=?", array($username));

   $tmp = $result->fetch();

   return $tmp['token'];

 }

@@ -14,15 +14,14 @@ http://creativecommons.org/publicdomain/zero/1.0/

 Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

 */

-require_once('inc/db_connect.php');

 require_once('session/checkuser.php');

 function user_customer_match($cust, $user)

 {

   $customerno = (int) $cust;

-  $username = mysql_real_escape_string($user);

+  $username = db_escape_string($user);

   $result = db_query("SELECT uid FROM system.useraccounts WHERE kunde={$customerno} AND username='{$username}' AND kundenaccount=1;");

-  if (mysql_num_rows($result) > 0)

+  if ($result->rowCount() > 0)

     return true;

   return false;

 }

@@ -32,9 +31,9 @@ function user_customer_match($cust, $user)

 function customer_has_email($customerno, $email)

 {

   $customerno = (int) $customerno;

-  $email = mysql_real_escape_string($email);

+  $email = db_escape_string($email);

   $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=".$customerno." AND (email='{$email}' OR email_extern='{$email}' OR email_rechnung='{$email}');");

-  return (mysql_num_rows($result) > 0);

+  return ($result->rowCount() > 0);

 }

@@ -42,21 +41,21 @@ function validate_token($customerno, $token)

 {

   expire_tokens();

   $customerno = (int) $customerno;

-  $token = mysql_real_escape_string($token);

+  $token = db_escape_string($token);

   $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id={$customerno} AND token='{$token}';");

-  return (mysql_num_rows($result) > 0);

+  return ($result->rowCount() > 0);

 }

 function get_uid_for_token($token) 

 {

   expire_tokens();

-  $token = mysql_real_escape_string($token);

+  $token = db_escape_string($token);

   $result = db_query("SELECT uid FROM system.usertoken WHERE token='{$token}';");

-  if (mysql_num_rows($result) == 0) {

+  if ($result->rowCount() == 0) {

     return NULL;

   }

-  $data = mysql_fetch_assoc($result);

+  $data = $result->fetch();

   return $data['uid'];  

 }

@@ -64,10 +63,10 @@ function get_username_for_uid($uid)

 {

   $uid = (int) $uid;

   $result = db_query("SELECT username FROM system.useraccounts WHERE uid={$uid}");

-  if (mysql_num_rows($result) != 1) {

+  if ($result->rowCount() != 1) {

     system_failure("Unexpected number of users with this uid (!= 1)!");

   }

-  $item = mysql_fetch_assoc($result);

+  $item = $result->fetch();

   return $item['username'];

 }

@@ -75,9 +74,9 @@ function validate_uid_token($uid, $token)

 {

   expire_tokens();

   $uid = (int) $uid;

-  $token = mysql_real_escape_string($token);

+  $token = db_escape_string($token);

   $result = db_query("SELECT NULL FROM system.usertoken WHERE uid={$uid} AND token='{$token}';");

-  return (mysql_num_rows($result) > 0);

+  return ($result->rowCount() > 0);

 }

@@ -102,13 +101,13 @@ function invalidate_systemuser_token($uid)

 function create_token($username)

 {

-  $username = mysql_real_escape_string($username);

+  $username = db_escape_string($username);

   expire_tokens();

   $result = db_query("SELECT uid FROM system.useraccounts WHERE username='{$username}'");

-  $uid = (int) mysql_fetch_assoc($result)['uid'];

+  $uid = (int) $result->fetch()['uid'];

   $result = db_query("SELECT created FROM system.usertoken WHERE uid={$uid}");

-  if (mysql_num_rows($result) > 0) {

+  if ($result->rowCount() > 0) {

     system_failure("Für Ihr Benutzerkonto ist bereits eine Passwort-Erinnerung versendet worden. Bitte wenden Sie sich an den Support wenn Sie diese nicht erhalten haben.");

   }

@@ -120,9 +119,9 @@ function create_token($username)

 function emailaddress_for_user($username)

 {

-  $username = mysql_real_escape_string($username);

+  $username = db_escape_string($username);

   $result = db_query("SELECT k.email FROM kundendaten.kunden AS k INNER JOIN system.useraccounts AS u ON (u.kunde=k.id) WHERE u.username='{$username}'");

-  $data = mysql_fetch_assoc($result);

+  $data = $result->fetch();

   return $data['email'];

 }

@@ -132,17 +131,17 @@ function get_customer_token($customerno)

   $customerno = (int) $customerno;

   expire_tokens();

   $result = db_query("SELECT token FROM kundendaten.kunden WHERE id={$customerno} AND token IS NOT NULL;");

-  if (mysql_num_rows($result) < 1)

+  if ($result->rowCount() < 1)

     system_failure("Kann das Token nicht auslesen!");

-  return mysql_fetch_object($result)->token;

+  return $result->fetch(PDO::FETCH_OBJ)->token;

 }

 function get_user_token($username) 

 {

-  $username = mysql_real_escape_string($username);

+  $username = db_escape_string($username);

   $result = db_query("SELECT token FROM system.usertoken AS t INNER JOIN system.useraccounts AS u USING (uid) WHERE username='{$username}'");

-  $tmp = mysql_fetch_assoc($result);

+  $tmp = $result->fetch();

   return $tmp['token'];

 }

@@ -17,6 +17,18 @@ Nevertheless, in case you use a significant part of this code, we ask (but not r

 require_once('inc/db_connect.php');

 require_once('session/checkuser.php');

+function user_customer_match($cust, $user)

+{

+  $customerno = (int) $cust;

+  $username = mysql_real_escape_string($user);

+  $result = db_query("SELECT uid FROM system.useraccounts WHERE kunde={$customerno} AND username='{$username}' AND kundenaccount=1;");

+  if (mysql_num_rows($result) > 0)

+    return true;

+  return false;

+}

+

+

+

 function customer_has_email($customerno, $email)

 {

   $customerno = (int) $customerno;

@@ -88,23 +100,33 @@ function invalidate_systemuser_token($uid)

   db_query("DELETE FROM system.usertoken WHERE uid={$uid} LIMIT 1;");

 }

-function create_token($customerno)

+function create_token($username)

 {

-  $customerno = (int) $customerno;

+  $username = mysql_real_escape_string($username);

   expire_tokens();

-  $result = db_query("SELECT token_create FROM kundendaten.kunden WHERE id={$customerno} AND token_create IS NOT NULL;");

-  if (mysql_num_rows($result) > 0)

-  {

-    $res = mysql_fetch_object($result)->token_create;

-    input_error("Sie haben diese Funktion kürzlich erst benutzt, an Ihre E-Mail-Adresse wurde bereits am {$res} eine Nachricht verschickt. Sie können diese Funktion erst nach Ablauf von 24 Stunden erneut benutzen.");

-    return false;

+  $result = db_query("SELECT uid FROM system.useraccounts WHERE username='{$username}'");

+  $uid = (int) mysql_fetch_assoc($result)['uid'];

+  

+  $result = db_query("SELECT created FROM system.usertoken WHERE uid={$uid}");

+  if (mysql_num_rows($result) > 0) {

+    system_failure("Für Ihr Benutzerkonto ist bereits eine Passwort-Erinnerung versendet worden. Bitte wenden Sie sich an den Support wenn Sie diese nicht erhalten haben.");

   }

-  $token = random_string(10);

-  db_query("UPDATE kundendaten.kunden SET token='{$token}', token_create=now() WHERE id={$customerno} LIMIT 1;");

+  

+  $token = random_string(16);

+  db_query("INSERT INTO system.usertoken VALUES ({$uid}, NOW(), NOW() + INTERVAL 1 DAY, '{$token}')");

   return true;

 }

+function emailaddress_for_user($username)

+{

+  $username = mysql_real_escape_string($username);

+  $result = db_query("SELECT k.email FROM kundendaten.kunden AS k INNER JOIN system.useraccounts AS u ON (u.kunde=k.id) WHERE u.username='{$username}'");

+  $data = mysql_fetch_assoc($result);

+  return $data['email'];

+}

+

+

 function get_customer_token($customerno)

 {

   $customerno = (int) $customerno;

@@ -116,4 +138,12 @@ function get_customer_token($customerno)

 }

+function get_user_token($username) 

+{

+  $username = mysql_real_escape_string($username);

+  $result = db_query("SELECT token FROM system.usertoken AS t INNER JOIN system.useraccounts AS u USING (uid) WHERE username='{$username}'");

+  $tmp = mysql_fetch_assoc($result);

+  return $tmp['token'];

+}

+

 ?>

@@ -48,6 +48,17 @@ function get_uid_for_token($token)

   return $data['uid'];  

 }

+function get_username_for_uid($uid) 

+{

+  $uid = (int) $uid;

+  $result = db_query("SELECT username FROM system.useraccounts WHERE uid={$uid}");

+  if (mysql_num_rows($result) != 1) {

+    system_failure("Unexpected number of users with this uid (!= 1)!");

+  }

+  $item = mysql_fetch_assoc($result);

+  return $item['username'];

+}

+

 function validate_uid_token($uid, $token)

 {

   expire_tokens();

@@ -36,6 +36,18 @@ function validate_token($customerno, $token)

 }

+function get_uid_for_token($token) 

+{

+  expire_tokens();

+  $token = mysql_real_escape_string($token);

+  $result = db_query("SELECT uid FROM system.usertoken WHERE token='{$token}';");

+  if (mysql_num_rows($result) == 0) {

+    return NULL;

+  }

+  $data = mysql_fetch_assoc($result);

+  return $data['uid'];  

+}

+

 function validate_uid_token($uid, $token)

 {

   expire_tokens();

@@ -2,7 +2,7 @@

 /*

 This file belongs to the Webinterface of schokokeks.org Hosting

-Written 2008-2012 by schokokeks.org Hosting, namely

+Written 2008-2013 by schokokeks.org Hosting, namely

   Bernd Wurst <bernd@schokokeks.org>

   Hanno Böck <hanno@schokokeks.org>

@@ -1,4 +1,18 @@

 <?php

+/*

+This file belongs to the Webinterface of schokokeks.org Hosting

+

+Written 2008-2012 by schokokeks.org Hosting, namely

+  Bernd Wurst <bernd@schokokeks.org>

+  Hanno Böck <hanno@schokokeks.org>

+

+To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

+

+You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

+http://creativecommons.org/publicdomain/zero/1.0/

+

+Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

+*/

 require_once('inc/db_connect.php');

 require_once('session/checkuser.php');

@@ -7,7 +7,7 @@ function customer_has_email($customerno, $email)

 {

   $customerno = (int) $customerno;

   $email = mysql_real_escape_string($email);

-  $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=".$customerno." AND (email='".$email."' OR email_extern='{$email}' OR email_rechnung='{$email'}');");

+  $result = db_query("SELECT NULL FROM kundendaten.kunden WHERE id=".$customerno." AND (email='{$email}' OR email_extern='{$email}' OR email_rechnung='{$email}');");

   return (mysql_num_rows($result) > 0);

 }