diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe
old mode 100755
new mode 100644
index c7ee344..23ed35b
Binary files a/printserver/OrderSprinterPrintserver.exe and b/printserver/OrderSprinterPrintserver.exe differ
diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe
old mode 100755
new mode 100644
index c7ee344..23ed35b
Binary files a/webapp/OrderSprinterPrintserver.exe and b/webapp/OrderSprinterPrintserver.exe differ
diff --git a/webapp/bar.html b/webapp/bar.html
index 4eed33a..0da15ee 100644
--- a/webapp/bar.html
+++ b/webapp/bar.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/bill.html b/webapp/bill.html
index b01891d..06f6eb8 100644
--- a/webapp/bill.html
+++ b/webapp/bill.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/customer/menulegend.txt b/webapp/customer/menulegend.txt
index 6d825a1..84595ed 100755
--- a/webapp/customer/menulegend.txt
+++ b/webapp/customer/menulegend.txt
@@ -22,10 +22,11 @@
 #
 # Ein Produkteintrag hat folgendes Format:
 # Kurzname (ID:123); NormalPreis (Stufe A); Langname # Preis (Stufe B); Preis (Stufe C); Steuersatz
-# dabei ist der Kurzname nur in der Kellneransicht zu sehen
+# dabei ist der Kurzname nur in der Kellneransicht bei der Produktauswahl zu sehen,
+# anschließend wird stets der Langname angezeigt.
 # Nur Kurzname und Preis (A) sind erforderlich, die anderen Teile werden bei
 # Auslassung automatisch gefüllt (Preis B=C=A und Langname = Kurzname)
-# Die ID ist muss nicht angegeben werden, in dem Fall wird das Produkt als
+# Die ID muss nicht angegeben werden, in dem Fall wird das Produkt als
 # neu anzulegendes Produkt behandelt.
 # Wird ein Steuersatz angegeben, der für das Produkt vorgegeben sein soll, so
 # müssen auch die Preise A und B angegeben werden.
diff --git a/webapp/customer/speisekarte.txt b/webapp/customer/speisekarte.txt
index 650d617..0b129e4 100755
--- a/webapp/customer/speisekarte.txt
+++ b/webapp/customer/speisekarte.txt
@@ -6,7 +6,8 @@
 #
 # Ein Produkteintrag hat folgendes Format:
 # Kurzname ; NormalPreis (Stufe A); Langname # Preis (Stufe B); Preis (Stufe C)
-# dabei ist der Kurzname nur in der Kellneransicht zu sehen
+# dabei ist der Kurzname nur in der Kellneransicht bei der Produktauswahl zu sehen,
+# anschließend wird stets der Langname angezeigt.
 # Nur Kurzname und Preis (A) sind erforderlich, die anderen Teile werden bei
 # Auslassung automatisch gefüllt (Preis B=C=A und Langname = Kurzname)
 # Wird ein Steuersatz angegeben, der für das Produkt vorgegeben sein soll, so
diff --git a/webapp/feedback.html b/webapp/feedback.html
index ec9f0c7..264e228 100644
--- a/webapp/feedback.html
+++ b/webapp/feedback.html
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/index.html b/webapp/index.html
index 297e722..0df0466 100644
--- a/webapp/index.html
+++ b/webapp/index.html
@@ -7,8 +7,8 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
- <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.6">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.7">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/install.html b/webapp/install.html
index d266165..88ce49c 100644
--- a/webapp/install.html
+++ b/webapp/install.html
@@ -679,7 +679,7 @@ $(document).ready(function() {
     <tr id=updateline>
     	<td>&nbsp;</td>
     	<td align=center>
-      	<button id="updatebtn">Update -> 1.1.6</button>
+      	<button id="updatebtn">Update -> 1.1.7</button>
       	</td>
       	<td>&nbsp;</td>
     </tr>
diff --git a/webapp/install/installer.php b/webapp/install/installer.php
index be1e79c..6a3d902 100644
--- a/webapp/install/installer.php
+++ b/webapp/install/installer.php
@@ -95,103 +95,6 @@ $ret = array("extensions_status" => $extensions_status, "missing_extensions" =>
 echo json_encode($ret);
 }
 
-function updateUserTable1013_1014() {
-$pdo = $this->pdo;
-try {
-$prkey = file_get_contents("../php/privkey.pem");
-$cert = file_get_contents("../php/cert.pem");
-
-if ((strlen($prkey) < 10) || (strlen($cert) < 10)) {
-echo json_encode('Fehler: Vorversion falsch oder Inhalt des php-Verzeichnisses ungueltig!');
-} else {
-$sql = "ALTER TABLE `%work%` MODIFY signature VARBINARY(4000)";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute();
-
-$sql = "INSERT INTO `%work%` (`id` , `item`,`value`,`signature`) VALUES ( NULL,?,?,?)";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute(array("privkey","privkey",$prkey));
-
-$sql = "INSERT INTO `%work%` (`id` , `item`,`value`,`signature`) VALUES ( NULL,?,?,?)";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute(array("cert","cert",$cert));
-
-$this->updateVersion($pdo, '1.0.14');
-
-unlink("../php/privkey.pem");
-unlink("../php/cert.pem");
-}			
-return true;
-} catch (PDOException $e) {
-return false;
-}
-}
-
-function updateUserTable1014_1015() {
-$pdo = $this->pdo;
-try {
-$add_favorite_col_sql = "ALTER TABLE %products% ADD favorite INT(1) NULL AFTER category";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($add_favorite_col_sql));
-$stmt->execute();
-$sql = "UPDATE %products% SET favorite=?";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute(array('0'));
-
-$add_favorite_col_sql = "ALTER TABLE %histprod% ADD favorite INT(1) NULL AFTER available";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($add_favorite_col_sql));
-$stmt->execute();
-$sql = "UPDATE %histprod% SET favorite=?";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute(array('0'));
-
-$this->updateVersion($pdo, '1.0.15');
-return true;
-} catch (PDOException $e) {
-return false;
-}
-}
-
-function updateUserTable1015_1016() {
-$pdo = $this->pdo;
-try {
-$this->updateVersion($pdo, '1.0.16');
-return true;
-} catch (PDOException $e) {
-return false;
-}
-}
-
-function updateUserTable1016_1017() {
-$pdo = $this->pdo;
-try {
-$sql = "ALTER TABLE %user% ADD right_rating INT(1) NULL AFTER right_reservation";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute();
-$sql = "UPDATE %user% SET right_rating=?";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute(array('0'));
-$sql = "ALTER TABLE %user% MODIFY right_rating INT(1) NOT NULL DEFAULT '0'";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute();
-
-$sql = "ALTER TABLE %histuser% ADD right_rating INT(1) NULL AFTER right_reservation";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute();
-$sql = "UPDATE %histuser% SET right_rating=?";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute(array('0'));
-$sql = "ALTER TABLE %histuser% MODIFY right_rating INT(1) NOT NULL DEFAULT '0'";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute();
-$this->basedb->createRatingsTable($pdo);
-
-$this->updateVersion($pdo, '1.0.17');
-return true;
-} catch (PDOException $e) {
-return false;
-}
-}
-
 function updateVersion($pdo,$version) {
 $setVersion = "update %config% set setting=? where name='version'";
 $stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($setVersion));
@@ -220,33 +123,14 @@ $stmt_insert_hist = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($s
 $stmt_insert_hist->execute(array($currentTime, '6', $newRefIdForHist));
 }
 
-function updateUserTable1018_1019() {
+
+function updateUserTable1022_1023($prefix,$version) {
 $pdo = $this->pdo;
 try {
-$sql = "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL,?,?)";
-$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
-$stmt->execute(array('remoteaccesscode',null));
-
-$this->updateVersion($pdo, '1.0.19');
-return true;
-} catch (PDOException $e) {
+if ($version != "1.0.22") {
 return false;
 }
-}
 
-function updateUserTable1019_1020() {
-$pdo = $this->pdo;
-try {	
-$this->updateVersion($pdo, '1.0.20');
-return true;
-} catch (PDOException $e) {
-return false;
-}
-}
-
-function updateUserTable1022_1023($prefix) {
-$pdo = $this->pdo;
-try {
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 $adminCl->changeOneConfigDbItem($pdo,"timezone","Europe/Berlin","%config%",true);
@@ -257,9 +141,14 @@ return false;
 }
 }
 
-function updateUserTable1023_1024($prefix) {
+function updateUserTable1023_1024($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.0.23") {
+$ret = $this->updateUserTable1022_1023($prefix,$version);
+if (!$ret) { return false; }
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -299,13 +188,24 @@ return false;
 }
 }
 
-function updateUserTable1024_1025($prefix) {
-return $this->setVersion($prefix, '1.0.25');
+function updateUserTable1024_1025($prefix,$version) {
+$ret = true;
+if ($version != "1.0.24") {
+$ret = $this->updateUserTable1023_1024($prefix,$version);
+if (!$ret) { return false; }
+}
+$ret &= $this->setVersion($prefix, '1.0.25');
+return $ret;
 }
 
-function updateUserTable1025_1026($prefix) {
+function updateUserTable1025_1026($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.0.25") {
+$ret = $this->updateUserTable1024_1025($prefix,$version);
+if (!$ret) { return false; }
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -320,13 +220,24 @@ return false;
 }
 }
 
-function updateUserTable1026_1027($prefix) {
-return $this->setVersion($prefix, '1.0.27');
+function updateUserTable1026_1027($prefix,$version) {
+$ret = true;
+if ($version != "1.0.26") {
+$ret = $this->updateUserTable1025_1026($prefix,$version);
+if (!$ret) { return false; }
+}
+$ret &= $this->setVersion($prefix, '1.0.27');
+return $ret;
 }
 
-function updateUserTable1027_1028($prefix) {
+function updateUserTable1027_1028($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.0.27") {
+$ret = $this->updateUserTable1026_1027($prefix,$version);
+if (!$ret) { return false; }
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -341,45 +252,118 @@ return false;
 }
 }
 
-function updateUserTable1028_1029($prefix) {
-return $this->setVersion($prefix, '1.0.29');
+function updateUserTable1028_1029($prefix,$version) {
+$ret = true;
+if ($version != "1.0.28") {
+$ret = $this->updateUserTable1027_1028($prefix,$version);
+if (!$ret) { return false; }
+}
+$ret &= $this->setVersion($prefix, '1.0.29');
+return $ret;
 }
 
-function updateUserTable1029_1030($prefix) {
-return $this->setVersion($prefix, '1.0.30');
+function updateUserTable1029_1030($prefix,$version) {
+$ret = true;
+if ($version != "1.0.29") {
+$ret = $this->updateUserTable1028_1029($prefix,$version);
+if (!$ret) { return false; }
+}
+$ret &= $this->setVersion($prefix, '1.0.30');
+return $ret;
 }
 
-function updateUserTable1030_1031($prefix) {
-return $this->setVersion($prefix, '1.0.31');
+function updateUserTable1030_1031($prefix,$version) {
+$ret = true;
+if ($version != "1.0.30") {
+$ret = $this->updateUserTable1029_1030($prefix,$version);
+if (!$ret) { return false; }
+}
+$ret &= $this->setVersion($prefix, '1.0.31');
+return $ret;
 }
 
-function updateUserTable1031_1032($prefix) {
-return $this->setVersion($prefix, '1.0.32');
+function updateUserTable1031_1032($prefix,$version) {
+$ret = true;
+if ($version != "1.0.31") {
+$ret = $this->updateUserTable1030_1031($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.0.32');
+return $ret;
 }
 
-function updateUserTable1032_1033($prefix) {
-return $this->setVersion($prefix, '1.0.33');
+function updateUserTable1032_1033($prefix,$version) {
+$ret = true;
+if ($version != "1.0.32") {
+$ret = $this->updateUserTable1031_1032($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.0.33');
+return $ret;
 }
 
-function updateUserTable1033_1034($prefix) {
-return $this->setVersion($prefix, '1.0.34');
+function updateUserTable1033_1034($prefix,$version) {
+$ret = true;
+if ($version != "1.0.33") {
+$ret = $this->updateUserTable1032_1033($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.0.34');
+return $ret;
 }
 
-function updateUserTable1034_1035($prefix) {
-return $this->setVersion($prefix, '1.0.35');
+function updateUserTable1034_1035($prefix,$version) {
+$ret = true;
+if ($version != "1.0.34") {
+$ret = $this->updateUserTable1033_1034($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.0.35');
+return $ret;
 }
 
-function updateUserTable1035_1036($prefix) {
-return $this->setVersion($prefix, '1.0.36');
+function updateUserTable1035_1036($prefix,$version) {
+$ret = true;
+if ($version != "1.0.35") {
+$ret = $this->updateUserTable1034_1035($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.0.36');
+return $ret;
 }
 
-function updateUserTable1036_1037($prefix) {
-return $this->setVersion($prefix, '1.0.37');
+function updateUserTable1036_1037($prefix,$version) {
+$ret = true;
+if ($version != "1.0.36") {
+$ret = $this->updateUserTable1035_1036($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.0.37');
+return $ret;
 }
 
-function updateUserTable1037_1038($prefix) {
+function updateUserTable1037_1038($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.0.37") {
+$ret = $this->updateUserTable1036_1037($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -431,13 +415,28 @@ return false;
 }
 }
 
-function updateUserTable1038_1039($prefix) {
-return $this->setVersion($prefix, '1.0.39');
+function updateUserTable1038_1039($prefix,$version) {
+$ret = true;
+if ($version != "1.0.38") {
+$ret = $this->updateUserTable1037_1038($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.0.39');
+return $ret;
 }
 
-function updateUserTable1039_1040($prefix) {
+function updateUserTable1039_1040($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.0.39") {
+$ret = $this->updateUserTable1038_1039($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -456,9 +455,16 @@ return false;
 }
 }
 
-function updateUserTable1040_1041($prefix) {
+function updateUserTable1040_1041($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.0.40") {
+$ret = $this->updateUserTable1039_1040($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -480,9 +486,16 @@ return false;
 }
 }
 
-function updateUserTable1041_1042($prefix) {
+function updateUserTable1041_1042($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.0.41") {
+$ret = $this->updateUserTable1040_1041($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 $this->updateVersion($pdo, '1.0.42');
@@ -492,9 +505,16 @@ return false;
 }
 }
 
-function updateUserTable1042_1043($prefix) {
+function updateUserTable1042_1043($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.0.42") {
+$ret = $this->updateUserTable1041_1042($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -528,13 +548,28 @@ return false;
 }
 }
 
-function updateUserTable1043_1100($prefix) {
-return $this->setVersion($prefix, '1.1.0');
+function updateUserTable1043_1100($prefix,$version) {
+$ret = true;
+if ($version != "1.0.43") {
+$ret = $this->updateUserTable1042_1043($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.1.0');
+return $ret;
 }
 
-function updateUserTable1100_1101($prefix) {
+function updateUserTable1100_1101($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.1.0") {
+$ret = $this->updateUserTable1043_1100($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -561,9 +596,16 @@ return false;
 }
 }
 
-function updateUserTable1101_1102($prefix) {
+function updateUserTable1101_1102($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.1.1") {
+$ret = $this->updateUserTable1100_1101($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -589,17 +631,40 @@ return false;
 }
 }
 
-function updateUserTable1102_1103($prefix) {
-return $this->setVersion($prefix, '1.1.3');
+function updateUserTable1102_1103($prefix,$version) {
+$ret = true;
+if ($version != "1.1.2") {
+$ret = $this->updateUserTable1101_1102($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.1.3');
+return $ret;
 }
 
-function updateUserTable1103_1104($prefix) {
-return $this->setVersion($prefix, '1.1.4');
+function updateUserTable1103_1104($prefix,$version) {
+$ret = true;
+if ($version != "1.1.3") {
+$ret = $this->updateUserTable1102_1103($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.1.4');
+return $ret;
 }
 
-function updateUserTable1104_1105($prefix) {
+function updateUserTable1104_1105($prefix,$version) {
 $pdo = $this->pdo;
 try {
+if ($version != "1.1.4") {
+$ret = $this->updateUserTable1103_1104($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+
 $adminCl = new Admin();
 DbUtils::overrulePrefix($prefix);
 
@@ -617,8 +682,28 @@ return true;
 return false;
 }
 }
-function updateUserTable1105_1106($prefix) {
-return $this->setVersion($prefix, '1.1.6');
+function updateUserTable1105_1106($prefix,$version) {
+$ret = true;
+if ($version != "1.1.5") {
+$ret = $this->updateUserTable1104_1105($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.1.6');
+return $ret;
+}
+
+function updateUserTable1106_1107($prefix,$version) {
+$ret = true;
+if ($version != "1.1.6") {
+$ret = $this->updateUserTable1105_1106($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.1.7');
+return $ret;
 }
 
 function setVersion($prefix,$theVersion) {
@@ -692,7 +777,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'billlanguage', $billlanguage)");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'currency', '$currency')");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'receiptfontsize', '12')");
-$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.6')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.7')");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'paymentconfig', '0')");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'remoteaccesscode', null)");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'decpoint', '$decpoint')");
@@ -1060,641 +1145,20 @@ echo json_encode("Version nicht bestimmbar");
 return;
 }
 
-$ret = true;
-if ($version == "1.0.13") {
-$ret &= $admin->updateUserTable1013_1014();
-$ret &= $admin->updateUserTable1014_1015();
-$ret &= $admin->updateUserTable1015_1016();
-$ret &= $admin->updateUserTable1016_1017();
-$ret &= $admin->updateUserTable1017_1018();
-$ret &= $admin->updateUserTable1019_1020();
-$ret &= $admin->updateUserTable1022_1023($_POST['prefix']);
-$ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
-$ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if ($version == "1.0.14") {
-$ret &= $admin->updateUserTable1014_1015();
-$ret &= $admin->updateUserTable1015_1016();
-$ret &= $admin->updateUserTable1016_1017();
-$ret &= $admin->updateUserTable1017_1018();
-$ret &= $admin->updateUserTable1019_1020();
-$ret &= $admin->updateUserTable1022_1023($_POST['prefix']);
-$ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
-$ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if ($version == "1.0.15") {
-$ret &= $admin->updateUserTable1015_1016();
-$ret &= $admin->updateUserTable1016_1017();
-$ret &= $admin->updateUserTable1017_1018();
-$ret &= $admin->updateUserTable1019_1020();
-$ret &= $admin->updateUserTable1022_1023($_POST['prefix']);
-$ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
-$ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if ($version == "1.0.16") {
-$ret &= $admin->updateUserTable1016_1017();
-$ret &= $admin->updateUserTable1017_1018();
-$ret &= $admin->updateUserTable1019_1020();
-$ret &= $admin->updateUserTable1022_1023($_POST['prefix']);
-$ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
-$ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.17") || ($version == "1.0.18")) {
-$ret &= $admin->updateUserTable1018_1019();
-$ret &= $admin->updateUserTable1019_1020();
-$ret &= $admin->updateUserTable1022_1023($_POST['prefix']);
-$ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
-$ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if ($version == "1.0.19") {
-$ret &= $admin->updateUserTable1019_1020();
-$ret &= $admin->updateUserTable1022_1023($_POST['prefix']);
-$ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
-$ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.20") || ($version == "1.0.21")) {
-// nothing to do... :) (but maybe user has pressed though)
-} else if (($version == "1.0.22")) {
-$ret &= $admin->updateUserTable1022_1023($_POST['prefix']);
-$ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
-$ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.23")) {
-$ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
-$ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.24")) {
-$ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.25")) {
-$ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.26")) {
-$ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.27")) {
-$ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.28")) {
-$ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.29")) {
-$ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.30")) {
-$ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.31")) {
-$ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.32")) {
-$ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.33")) {
-$ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.34")) {
-$ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.35")) {
-$ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.36")) {
-$ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.37")) {
-$ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.38")) {
-$ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.39")) {
-$ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.40")) {
-$ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.41")) {
-$ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.42")) {
-$ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.0.43")) {
-$ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.1.0")) {
-$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.1.1")) {
-$ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.1.2")) {
-$ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.1.3")) {
-$ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.1.4")) {
-$ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else if (($version == "1.1.5")) {
-$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
-} else {
+
+$supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27","1.0.28","1.0.29",
+"1.0.30","1.0.31","1.0.32","1.0.33","1.0.34","1.0.35","1.0.36","1.0.37","1.0.38","1.0.39",
+"1.0.40",
+"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6"
+);
+
+if (!in_array($version, $supportedVersions)) {
 echo json_encode("Quellversion nicht unterstützt");
 return;
 }
 
+$ret = $admin->updateUserTable1106_1107($_POST['prefix'], $version);
+
 if(session_id() == '') {
 session_start();
 }
diff --git a/webapp/kitchen.html b/webapp/kitchen.html
index 87679d1..cf2151b 100644
--- a/webapp/kitchen.html
+++ b/webapp/kitchen.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/manager.html b/webapp/manager.html
index 98464c1..9d167b2 100644
--- a/webapp/manager.html
+++ b/webapp/manager.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/paydesk.html b/webapp/paydesk.html
index bcdff22..c34dc81 100644
--- a/webapp/paydesk.html
+++ b/webapp/paydesk.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/php/admin.php b/webapp/php/admin.php
index f1c9d0b..8211a11 100644
--- a/webapp/php/admin.php
+++ b/webapp/php/admin.php
@@ -509,6 +509,11 @@ class Admin {
 			if ($view != "logout.php") {
 				$userid = $_SESSION['userid'];
 				
+				$questPos = strpos($view,'?');
+				if ($questPos != false) {
+					$view = substr($view,0,$questPos);
+				}
+				
 				$sql = "UPDATE %user% SET lastmodule=? WHERE id=? AND active='1'";
 				$pdo = $this->dbutils->openDbAndReturnPdo();
 				
@@ -842,7 +847,7 @@ class Admin {
 					);
 			
 			$valid = false;
-			if ($view == 'preferences.html') {
+			if (($view == 'preferences.html') || ($view == 'feedback.html')) {
 				// always ok
 				$valid = true;
 			} else if ($view == 'manager.html') {
@@ -1074,19 +1079,19 @@ class Admin {
 			$right_rating = $_SESSION['right_rating'];
 			
 			if (!self::isOnlyRatingUser($rights, $right_rating, true)) {		
-				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.6"); };
-				if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.6"); };
-				if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.6"); };
-				if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.6"); };
+				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.7"); };
+				if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.7"); };
+				if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.7"); };
+				if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.7"); };
 				if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); };
-				if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.6"); };
-				if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.6"); };
-				if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.6");	};
-				if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.6"); };
-				if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.6"); };
-				if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.6"); };
-				$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.6");
-				$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.6");
+				if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.7"); };
+				if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.7"); };
+				if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.7");	};
+				if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.7"); };
+				if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.7"); };
+				if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.7"); };
+				$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.7");
+				$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.7");
 			}
 			
 			$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@@ -1095,7 +1100,7 @@ class Admin {
 			$waiterMessage = $this->getMessage(null, "waitermessage");
 		}
 		// CAUTION: change version also in config.txt!!!
-		$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.6", 
+		$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.7", 
 				"user" => $currentUser, 
 				"menu" => $mainMenu, 
 				"waitermessage" => $waiterMessage,
@@ -1271,7 +1276,7 @@ class Admin {
 		$content = file_get_contents($_FILES['logofile']['tmp_name']);
 
 		if ($_FILES['logofile']['error'] != UPLOAD_ERR_OK               //checks for errors
-				&& is_uploaded_file($_FILES['userfile']['tmp_name'])) { //checks that file is uploaded
+				&& is_uploaded_file($_FILES['logofile']['tmp_name'])) { //checks that file is uploaded
 			header("Location: ../infopage.html?e=manager.html=Kann_Datei_nicht_laden.");
 			exit();
 		}
diff --git a/webapp/preferences.html b/webapp/preferences.html
index 9a8890b..83735a2 100644
--- a/webapp/preferences.html
+++ b/webapp/preferences.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/products.html b/webapp/products.html
index 25a4407..faaaa9e 100644
--- a/webapp/products.html
+++ b/webapp/products.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/rating.html b/webapp/rating.html
index fde3bae..c31e1c9 100644
--- a/webapp/rating.html
+++ b/webapp/rating.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/reports.html b/webapp/reports.html
index 8d43bb6..b000a63 100644
--- a/webapp/reports.html
+++ b/webapp/reports.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/reservation.html b/webapp/reservation.html
index 6e95cba..ce40f72 100644
--- a/webapp/reservation.html
+++ b/webapp/reservation.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html
index a18e501..b1b82fb 100644
--- a/webapp/supplydesk.html
+++ b/webapp/supplydesk.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/waiter.html b/webapp/waiter.html
index 9cfc50d..32af0d9 100644
--- a/webapp/waiter.html
+++ b/webapp/waiter.html
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.7">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
@@ -1566,30 +1566,30 @@ function fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToF
 		          var isCooking = prodOfTable[this.id]["isCooking"];
 		          
 		          if ((isPaid == "1") && (isReady=="1")) {
-		        	  	var dialogText = "Produkt wurde schon zubereitet und bezahlt";
+		        	  	var dialogText = "Entfernen?";
 		        	  	var this_elem = this;
-						areYouSure("Entfernen?", dialogText, "Ja", function() {
+						areYouSure("Produkt wurde schon zubereitet und bezahlt", dialogText, "Ja", function() {
 							removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
 					        fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
 			      		});
 		          } else if (isReady=="1") {
-		        	  var dialogText = "Produkt wurde schon zubereitet.";
+		        	  var dialogText = "Entfernen?";
 		        	  var this_elem = this;
-		        	  areYouSure("Entfernen?", dialogText, "Ja", function() {
+		        	  areYouSure("Produkt wurde schon zubereitet.", dialogText, "Ja", function() {
 		        		  removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
 				          fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
 			      		});
 		          } else if (isPaid == "1") {
-		        	  var dialogText = "Produkt wurde schon bezahlt.";
+		        	  var dialogText = "Entfernen?";
 		        	  var this_elem = this;
-		        	  areYouSure("Entfernen?", dialogText, "Ja", function() {
+		        	  areYouSure("Produkt wurde schon bezahlt.", dialogText, "Ja", function() {
 		        		  removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
 				          fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
 			      		});
 		          } else if (isCooking == "1") {
-		        	  var dialogText = "Produkt wird soeben zubereitet.";
+		        	  var dialogText = "Entfernen?";
 		        	  var this_elem = this;
-		        	  areYouSure("Entfernen?", dialogText, "Ja", function() {
+		        	  areYouSure("Produkt wird soeben zubereitet.", dialogText, "Ja", function() {
 		        		  removeProductFromQueue(prodOfTable[this_elem.id]["queueid"],isPaid,isCooking,isReady);
 				          fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
 			      		});