OrderSprinter 1.4.10
This commit is contained in:
parent
40ad4410bf
commit
02fb0dd797
|
@ -9,8 +9,8 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.4.9" />
|
<link rel="stylesheet" href="css/gueststyle.css?v=1.4.10" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.4.9" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.4.10" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||||
|
@ -105,7 +105,7 @@
|
||||||
<div data-role="footer" data-theme="b" id="thefooter1">
|
<div data-role="footer" data-theme="b" id="thefooter1">
|
||||||
<div class="ui-grid-a">
|
<div class="ui-grid-a">
|
||||||
<div class="ui-block-a"> OrderSprinter</div>
|
<div class="ui-block-a"> OrderSprinter</div>
|
||||||
<div class="ui-block-b grid_right" id="versioninfo">1.4.9 </div>
|
<div class="ui-block-b grid_right" id="versioninfo">1.4.10 </div>
|
||||||
</div><!-- /grid-a -->
|
</div><!-- /grid-a -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -90,10 +90,10 @@ if (isset($_POST['code'])) {
|
||||||
} else {
|
} else {
|
||||||
echo "<html>";
|
echo "<html>";
|
||||||
echo "<head><title>Installation Gastsystem</title>";
|
echo "<head><title>Installation Gastsystem</title>";
|
||||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.4.9">';
|
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.4.10">';
|
||||||
echo "</head>";
|
echo "</head>";
|
||||||
echo "<body><div class=surround>";
|
echo "<body><div class=surround>";
|
||||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.4.9</span><br><br>";
|
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.4.10</span><br><br>";
|
||||||
echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />";
|
echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />";
|
||||||
echo "<br><input type=submit value='Installation starten' class=installbtn />";
|
echo "<br><input type=submit value='Installation starten' class=installbtn />";
|
||||||
echo "</form></div></html>";
|
echo "</form></div></html>";
|
||||||
|
|
Binary file not shown.
|
@ -85,7 +85,7 @@ class Installer {
|
||||||
}
|
}
|
||||||
Database::dropTables($pdo);
|
Database::dropTables($pdo);
|
||||||
Database::createEmptyTables($pdo, $prefix);
|
Database::createEmptyTables($pdo, $prefix);
|
||||||
Database::setVersion($pdo,$prefix,"1.4.9");
|
Database::setVersion($pdo,$prefix,"1.4.10");
|
||||||
Database::setAccessPassword($pdo,$prefix,$adminpass);
|
Database::setAccessPassword($pdo,$prefix,$adminpass);
|
||||||
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
|
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
|
||||||
return array("status" => "OK","msg" => "Installation successful");
|
return array("status" => "OK","msg" => "Installation successful");
|
||||||
|
|
Binary file not shown.
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.4.10">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
@ -215,7 +215,7 @@ function handleResultOfInstallCheck(is_installed) {
|
||||||
if (is_installed == "Yes") {
|
if (is_installed == "Yes") {
|
||||||
useInstallation();
|
useInstallation();
|
||||||
} else {
|
} else {
|
||||||
setTimeout(function(){document.location.href = "install.html?v=1.4.9"},500);
|
setTimeout(function(){document.location.href = "install.html?v=1.4.10"},500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -727,7 +727,7 @@ $(document).ready(function() {
|
||||||
<tr id=updateline>
|
<tr id=updateline>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
<td align=center>
|
<td align=center>
|
||||||
<button id="updatebtn">Update -> 1.4.9</button>
|
<button id="updatebtn">Update -> 1.4.10</button>
|
||||||
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
|
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
|
||||||
</td>
|
</td>
|
||||||
<td> </td>
|
<td> </td>
|
||||||
|
|
|
@ -413,7 +413,7 @@ $zones[] = $timezone_identifiers[$i];
|
||||||
echo json_encode($zones);
|
echo json_encode($zones);
|
||||||
} else if ($command == 'update') {
|
} else if ($command == 'update') {
|
||||||
set_time_limit(60*30);
|
set_time_limit(60*30);
|
||||||
$installerVersion = "1.4.9";
|
$installerVersion = "1.4.10";
|
||||||
|
|
||||||
$admin = new InstallAdmin();
|
$admin = new InstallAdmin();
|
||||||
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
@ -1253,7 +1253,7 @@ function initRestoreFileUpload() {
|
||||||
} else {
|
} else {
|
||||||
alert("Import war erfolgreich.");
|
alert("Import war erfolgreich.");
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
document.location.href = "index.html?v=1.4.9";
|
document.location.href = "index.html?v=1.4.10";
|
||||||
},250);
|
},250);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -1791,9 +1791,9 @@ function handleUpdateCheckResult(answer) {
|
||||||
|
|
||||||
var millis=getMillis();
|
var millis=getMillis();
|
||||||
setTimeout(function(){
|
setTimeout(function(){
|
||||||
document.location.href = "install.html?v=1.4.9&mode=onlyupdate&n=" + millis;
|
document.location.href = "install.html?v=1.4.10&mode=onlyupdate&n=" + millis;
|
||||||
},250);
|
},250);
|
||||||
document.location.href = "install.html?v=1.4.9&mode=onlyupdate&n=" + millis;
|
document.location.href = "install.html?v=1.4.10&mode=onlyupdate&n=" + millis;
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleUpdateReplace(answer) {
|
function handleUpdateReplace(answer) {
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1273,7 +1273,7 @@ class Admin {
|
||||||
$view = "preferences.html";
|
$view = "preferences.html";
|
||||||
}
|
}
|
||||||
|
|
||||||
echo json_encode($view . "?v=1.4.9");
|
echo json_encode($view . "?v=1.4.10");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1484,27 +1484,27 @@ class Admin {
|
||||||
|
|
||||||
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
||||||
if ($_SESSION['modus'] == 0) {
|
if ($_SESSION['modus'] == 0) {
|
||||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.4.9"); };
|
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.4.10"); };
|
||||||
} else {
|
} else {
|
||||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.9"); };
|
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.4.10"); };
|
||||||
}
|
}
|
||||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.9"); };
|
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.4.10"); };
|
||||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.9"); };
|
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.4.10"); };
|
||||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.9"); };
|
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.4.10"); };
|
||||||
if ($_SESSION['modus'] == 0) {
|
if ($_SESSION['modus'] == 0) {
|
||||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.9"); };
|
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.4.10"); };
|
||||||
}
|
}
|
||||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.9"); };
|
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.4.10"); };
|
||||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.9"); };
|
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.4.10"); };
|
||||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.9"); };
|
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.4.10"); };
|
||||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.9"); };
|
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.4.10"); };
|
||||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.9"); };
|
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.4.10"); };
|
||||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.9"); };
|
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.4.10"); };
|
||||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.9"); };
|
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.4.10"); };
|
||||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.9"); };
|
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.4.10"); };
|
||||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.9");
|
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.4.10");
|
||||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.9");
|
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.4.10");
|
||||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.9");
|
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.4.10");
|
||||||
}
|
}
|
||||||
|
|
||||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||||
|
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
||||||
if (strlen($status) > 150) {
|
if (strlen($status) > 150) {
|
||||||
$status = substr($status, 0,149);
|
$status = substr($status, 0,149);
|
||||||
}
|
}
|
||||||
$version = "1.4.9";
|
$version = "1.4.10";
|
||||||
|
|
||||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -34,6 +34,11 @@ class LineItem {
|
||||||
$this->id = $anId;
|
$this->id = $anId;
|
||||||
$this->depth = $aDepth;
|
$this->depth = $aDepth;
|
||||||
$this->name = $aName;
|
$this->name = $aName;
|
||||||
|
if (self::syntaxIsProductType($aName)) {
|
||||||
|
$this->type = ENTRY_TYPE;
|
||||||
|
} else {
|
||||||
|
$this->type = ENTRY_PRODUCT;
|
||||||
|
}
|
||||||
// this is only of interest for categories
|
// this is only of interest for categories
|
||||||
// for products this content will be nonsens, but who cares...
|
// for products this content will be nonsens, but who cares...
|
||||||
$parts = explode ("=",$aName,3);
|
$parts = explode ("=",$aName,3);
|
||||||
|
@ -131,5 +136,19 @@ class LineItem {
|
||||||
function toString() {
|
function toString() {
|
||||||
return "T (" . $this->name . ",Depth:" . $this->depth . ",ID:" . $this->id . "): " . $this->type . " id:" . $this->id . " -> " . $this->reference;
|
return "T (" . $this->name . ",Depth:" . $this->depth . ",ID:" . $this->id . "): " . $this->type . " id:" . $this->id . " -> " . $this->reference;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static function syntaxIsProductType($textline) {
|
||||||
|
// REM* something like Speisen = KBF = 1
|
||||||
|
$pattern = '/^[.]=[KBkb]{0-2}[fFdD]{1}[ ]*=[ ]*[12]{1}/';
|
||||||
|
$pattern = '/^[^=]*[ ]*[=]{1,1}[ ]*';
|
||||||
|
$pattern .= '[kbKB]{0,2}[fFdD]{1,1}[ ]*[=]{1,1}[ ]*';
|
||||||
|
$pattern .= '[12]{1,1}';
|
||||||
|
$pattern .= '$/';
|
||||||
|
$treffer = '';
|
||||||
|
if (preg_match($pattern,$textline,$treffer)) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
?>
|
|
|
@ -169,17 +169,8 @@ class TypeAndProductFileManager {
|
||||||
* not a 'type'.
|
* not a 'type'.
|
||||||
*/
|
*/
|
||||||
private function isLeafNode($index) {
|
private function isLeafNode($index) {
|
||||||
if ($index == ($this->entries->size()-1)) {
|
|
||||||
// last entry -> it must be a leaf
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
$currentEntry = $this->entries->get($index);
|
$currentEntry = $this->entries->get($index);
|
||||||
$nextEntry = $this->entries->get($index+1);
|
if ($currentEntry->getType() == ENTRY_TYPE) {
|
||||||
$currentDepth = $currentEntry->getDepth();
|
|
||||||
$nextDepth = $nextEntry->getDepth();
|
|
||||||
|
|
||||||
if ($nextDepth > $currentDepth) {
|
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -811,6 +811,11 @@ class Version {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function upd_1409_1410($pdo, $prefix, $dbname) {
|
||||||
|
return array(true);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public static $updateOrder = array(
|
public static $updateOrder = array(
|
||||||
"1.3.0" => array("upd_1300_1301","1.3.1"),
|
"1.3.0" => array("upd_1300_1301","1.3.1"),
|
||||||
"1.3.1" => array("upd_1301_1302","1.3.2"),
|
"1.3.1" => array("upd_1301_1302","1.3.2"),
|
||||||
|
@ -848,7 +853,8 @@ class Version {
|
||||||
"1.4.5" => array("upd_1405_1406","1.4.6"),
|
"1.4.5" => array("upd_1405_1406","1.4.6"),
|
||||||
"1.4.6" => array("upd_1406_1407","1.4.7"),
|
"1.4.6" => array("upd_1406_1407","1.4.7"),
|
||||||
"1.4.7" => array("upd_1407_1408","1.4.8"),
|
"1.4.7" => array("upd_1407_1408","1.4.8"),
|
||||||
"1.4.8" => array("upd_1408_1409","1.4.9")
|
"1.4.8" => array("upd_1408_1409","1.4.9"),
|
||||||
|
"1.4.9" => array("upd_1409_1410","1.4.10")
|
||||||
);
|
);
|
||||||
|
|
||||||
// RE;* also for install process no check is required
|
// RE;* also for install process no check is required
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
|
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||||
<meta name="author" content="Stefan Pichel">
|
<meta name="author" content="Stefan Pichel">
|
||||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.4.10">
|
||||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.4.9">
|
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.4.10">
|
||||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue