Backup
Juan Ferrer Toribio
|
|
@ -23,11 +23,10 @@
|
|||
<h1><t>Addresses</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/add.svg"
|
||||
<htk-bar-button
|
||||
icon="add"
|
||||
tip="_AddAddress"
|
||||
on-click="onAddAddressClick"
|
||||
showText="true"/>
|
||||
on-click="onAddAddressClick"/>
|
||||
</div>
|
||||
<div id="form" class="address-list">
|
||||
<div class="box">
|
||||
|
|
|
|||
|
|
@ -28,16 +28,14 @@
|
|||
<h1><t>AddEditAddress</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/ok.svg"
|
||||
<htk-bar-button
|
||||
icon="ok"
|
||||
tip="_Accept"
|
||||
on-click="onAcceptClick"
|
||||
showText="true"/>
|
||||
<htk-button
|
||||
image="image/dark/close.svg"
|
||||
on-click="onAcceptClick"/>
|
||||
<htk-bar-button
|
||||
icon="close"
|
||||
tip="_Return"
|
||||
on-click="onReturnClick"
|
||||
showText="true"/>
|
||||
on-click="onReturnClick"/>
|
||||
</div>
|
||||
<div id="form" class="address">
|
||||
<div class="box">
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ Vn.Conf = new Class
|
|||
var batch = new Sql.Batch ();
|
||||
batch.addValue ('password', newPassword);
|
||||
|
||||
var query = 'UPDATE user_view SET password = MD5(#password) '
|
||||
var query = 'UPDATE user_view SET password = SHA2(#password, 256) '
|
||||
+'WHERE id = account.user_get_id () LIMIT 1';
|
||||
|
||||
this.conn.execQuery (query, this.onPasswordUpdate.bind (this), batch);
|
||||
|
|
|
|||
|
|
@ -24,11 +24,10 @@
|
|||
<h1><t>Configuration</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/place.svg"
|
||||
<htk-bar-button
|
||||
icon="place"
|
||||
tip="_Addresses"
|
||||
on-click="onAddressesClick"
|
||||
showText="true"/>
|
||||
on-click="onAddressesClick"/>
|
||||
</div>
|
||||
<div id="form" class="conf">
|
||||
<div class="box">
|
||||
|
|
|
|||
|
|
@ -3,11 +3,10 @@
|
|||
<h1><t>Connections</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/refresh.svg"
|
||||
<htk-bar-button
|
||||
icon="refresh"
|
||||
tip="_Refresh"
|
||||
on-click="onRefreshClick"
|
||||
showText="true"/>
|
||||
on-click="onRefreshClick"/>
|
||||
<div class="connections-sum">
|
||||
<htk-text>
|
||||
<db-calc-sum
|
||||
|
|
@ -41,13 +40,13 @@
|
|||
form="iter"
|
||||
column="id"
|
||||
tip="_Supplant user"
|
||||
image="image/incognito.svg"
|
||||
icon="incognito"
|
||||
on-click="onChangeUserClick"/>
|
||||
<htk-button
|
||||
form="iter"
|
||||
column="id"
|
||||
tip="_Access log"
|
||||
image="image/gnome.svg"
|
||||
icon="gnome"
|
||||
on-click="onAccessLogClick"/>
|
||||
<p class="important">
|
||||
<htk-text form="iter" column="Cliente"/>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,12 @@
|
|||
<div id="title">
|
||||
<h1><t>Item list</t></h1>
|
||||
</div>
|
||||
<div id="actions" class="action-bar">
|
||||
<htk-bar-button
|
||||
icon="print"
|
||||
tip="_Preview"
|
||||
on-click="onPreviewClick"/>
|
||||
</div>
|
||||
<div id="form" class="items">
|
||||
<div class="box">
|
||||
<div class="form">
|
||||
|
|
@ -38,11 +44,6 @@
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="footer">
|
||||
<button class="thin" on-click="onPreviewClick">
|
||||
<t>Preview</t>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</vn>
|
||||
|
|
|
|||
|
|
@ -3,16 +3,14 @@
|
|||
<h1><t>Queries</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/ok.svg"
|
||||
<htk-bar-button
|
||||
icon="ok"
|
||||
tip="_Execute"
|
||||
on-click="_onExecuteClick"
|
||||
showText="true"/>
|
||||
<htk-button
|
||||
image="image/dark/delete.svg"
|
||||
on-click="_onExecuteClick"/>
|
||||
<htk-bar-button
|
||||
icon="delete"
|
||||
tip="_Clean"
|
||||
on-click="_onCleanClick"
|
||||
showText="true"/>
|
||||
on-click="_onCleanClick"/>
|
||||
</div>
|
||||
<div id="form" class="queries">
|
||||
<div class="box form">
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ Vn.Shelves = new Class
|
|||
'max-amount': this.$('max-amount').value,
|
||||
'show-packing': this.$('show-packing').value,
|
||||
'stack': this.$('stack').value,
|
||||
'use-ids': this.$('use-ids').value,
|
||||
});
|
||||
this.gui.openReport ('shelves-report', batch);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,16 +28,3 @@
|
|||
margin: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* Footer */
|
||||
|
||||
.shelves .footer
|
||||
{
|
||||
text-align: center;
|
||||
margin-top: 1.5em;
|
||||
}
|
||||
.shelves .footer > button
|
||||
{
|
||||
margin: 0 .2em;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,12 @@
|
|||
<div id="title">
|
||||
<h1><t>Shelves</t></h1>
|
||||
</div>
|
||||
<div id="actions" class="action-bar">
|
||||
<htk-bar-button
|
||||
icon="print"
|
||||
tip="_Preview"
|
||||
on-click="onPreviewClick"/>
|
||||
</div>
|
||||
<div id="form" class="shelves">
|
||||
<div class="box">
|
||||
<div class="form">
|
||||
|
|
@ -96,11 +102,10 @@
|
|||
<label><t>Stack different items</t></label>
|
||||
<htk-check id="stack"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="footer">
|
||||
<button class="thin" on-click="onPreviewClick">
|
||||
<t>Preview</t>
|
||||
</button>
|
||||
<div class="form-group">
|
||||
<label><t>Use ids instead of names</t></label>
|
||||
<htk-check id="use-ids"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,16 +3,14 @@
|
|||
<h1><t>Visits</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/refresh.svg"
|
||||
<htk-bar-button
|
||||
icon="refresh"
|
||||
tip="_Refresh"
|
||||
on-click="onRefreshClick"
|
||||
showText="true"/>
|
||||
<htk-button
|
||||
image="image/dark/user-info.svg"
|
||||
on-click="onRefreshClick"/>
|
||||
<htk-bar-button
|
||||
icon="user-info"
|
||||
tip="_Connections"
|
||||
on-click="onSessionsClick"
|
||||
showText="true"/>
|
||||
on-click="onSessionsClick"/>
|
||||
</div>
|
||||
<div id="form" class="visits">
|
||||
<div class="box">
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</db-model>
|
||||
<htk-column-button
|
||||
column="agency_id"
|
||||
image="image/show.svg"
|
||||
icon="show"
|
||||
tip="_ShowByProvince"
|
||||
on-clicked="onShowClick"/>
|
||||
<htk-column-text title="_Agency" column="Agencia"/>
|
||||
|
|
|
|||
|
|
@ -3,12 +3,11 @@
|
|||
<h1><t>Home</t></h1>
|
||||
</div>
|
||||
<div id="actions" class="catalog-actions">
|
||||
<htk-button
|
||||
<htk-bar-button
|
||||
class="start-order"
|
||||
image="image/dark/new-order.svg"
|
||||
icon="new-order"
|
||||
tip="_Start order"
|
||||
on-click="onStartOrderClick"
|
||||
showText="true"/>
|
||||
on-click="onStartOrderClick"/>
|
||||
</div>
|
||||
<div id="form" class="home">
|
||||
<div class="column mansonry" id="news-column">
|
||||
|
|
|
|||
|
|
@ -3,21 +3,18 @@
|
|||
<h1><t>ShoppingBasket</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/ok.svg"
|
||||
<htk-bar-button
|
||||
icon="ok"
|
||||
tip="_Checkout"
|
||||
on-click="onCheckoutClick"
|
||||
show-text="true"/>
|
||||
<htk-button
|
||||
image="image/dark/view-dual.svg"
|
||||
on-click="onCheckoutClick"/>
|
||||
<htk-bar-button
|
||||
icon="view-dual"
|
||||
tip="_Catalog"
|
||||
on-click="onCatalogClick"
|
||||
show-text="true"/>
|
||||
<htk-button
|
||||
image="image/dark/preferences.svg"
|
||||
on-click="onCatalogClick"/>
|
||||
<htk-bar-button
|
||||
icon="preferences"
|
||||
tip="_ConfigureOrder"
|
||||
on-click="onConfigureClick"
|
||||
show-text="true"/>
|
||||
on-click="onConfigureClick"/>
|
||||
</div>
|
||||
<div id="form" class="basket">
|
||||
<div class="box">
|
||||
|
|
@ -47,7 +44,7 @@
|
|||
column="ticket_id"
|
||||
class="delete"
|
||||
tip="_Remove"
|
||||
image="image/delete.svg"
|
||||
icon="delete"
|
||||
on-click="onDeleteClick"/>
|
||||
<htk-image
|
||||
form="iter"
|
||||
|
|
|
|||
|
|
@ -126,19 +126,16 @@
|
|||
</div>
|
||||
<div id="actions" class="catalog-actions">
|
||||
<button class="menu" on-click="onShowMenuClick">
|
||||
<img src="image/dark/menu.svg" alt="_Menu"/>
|
||||
<img src="image/icon/dark/menu.svg" alt="_Menu"/>
|
||||
</button>
|
||||
<htk-button
|
||||
id="a"
|
||||
image="image/dark/basket.svg"
|
||||
<htk-bar-button
|
||||
icon="basket"
|
||||
tip="_ShoppingBasket"
|
||||
on-click="onBasketClick"
|
||||
showText="true"/>
|
||||
<htk-button
|
||||
on-click="onBasketClick"/>
|
||||
<htk-bar-button
|
||||
id="view-button"
|
||||
tip="_Switch view"
|
||||
on-click="onSwitchViewClick"
|
||||
showText="true"/>
|
||||
on-click="onSwitchViewClick"/>
|
||||
<htk-search-entry
|
||||
param="search"/>
|
||||
</div>
|
||||
|
|
@ -162,7 +159,7 @@
|
|||
form="item"
|
||||
column="id"
|
||||
tip="_AddToBasket"
|
||||
image="image/add.svg"
|
||||
icon="add"
|
||||
on-click="onAddItemClick"
|
||||
class="add-button"/>
|
||||
<h2>
|
||||
|
|
|
|||
|
|
@ -64,11 +64,10 @@
|
|||
<h1><t>ConfigureOrder</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/close.svg"
|
||||
<htk-bar-button
|
||||
icon="close"
|
||||
tip="_Cancel"
|
||||
on-click="onCancelClick"
|
||||
showText="true"/>
|
||||
on-click="onCancelClick"/>
|
||||
</div>
|
||||
<div id="form" class="checkout">
|
||||
<div class="box">
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
<h1><t>LastOrders</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/basket.svg"
|
||||
<htk-bar-button
|
||||
icon="basket"
|
||||
tip="_ShoppingBasket"
|
||||
on-click="onBasketClick"/>
|
||||
<htk-button
|
||||
<htk-bar-button
|
||||
id="pay-button"
|
||||
image="image/dark/pay.svg"
|
||||
icon="pay"
|
||||
tip="_MakePayment"
|
||||
on-click="onPayButtonClick"/>
|
||||
<div class="balance">
|
||||
|
|
|
|||
|
|
@ -25,11 +25,10 @@
|
|||
<h1><t>OrderDetail</t></h1>
|
||||
</div>
|
||||
<div id="actions" class="action-bar">
|
||||
<htk-button
|
||||
image="image/dark/print.svg"
|
||||
<htk-bar-button
|
||||
icon="print"
|
||||
tip="_Print delivery note"
|
||||
on-click="onPrintClick"
|
||||
show-text="true"/>
|
||||
on-click="onPrintClick"/>
|
||||
</div>
|
||||
<div id="form" class="ticket">
|
||||
<div class="box">
|
||||
|
|
|
|||
|
|
@ -25,16 +25,14 @@
|
|||
<h1><t>AddEditNew</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/ok.svg"
|
||||
<htk-bar-button
|
||||
icon="ok"
|
||||
tip="_Accept"
|
||||
on-click="onAcceptClick"
|
||||
showText="true"/>
|
||||
<htk-button
|
||||
image="image/dark/close.svg"
|
||||
on-click="onAcceptClick"/>
|
||||
<htk-bar-button
|
||||
icon="close"
|
||||
tip="_Return"
|
||||
on-click="onReturnClick"
|
||||
showText="true"/>
|
||||
on-click="onReturnClick"/>
|
||||
</div>
|
||||
<div id="form" class="new">
|
||||
<div class="box">
|
||||
|
|
|
|||
|
|
@ -3,11 +3,10 @@
|
|||
<h1><t>NewsManagement</t></h1>
|
||||
</div>
|
||||
<div id="actions">
|
||||
<htk-button
|
||||
image="image/dark/add.svg"
|
||||
<htk-bar-button
|
||||
icon="add"
|
||||
tip="_AddNew"
|
||||
on-click="onAddClick"
|
||||
showText="true"/>
|
||||
on-click="onAddClick"/>
|
||||
</div>
|
||||
<div id="form" class="news">
|
||||
<div class="box">
|
||||
|
|
@ -26,13 +25,13 @@
|
|||
form="iter"
|
||||
column="id"
|
||||
tip="_EditNew"
|
||||
image="image/edit.svg"
|
||||
icon="edit"
|
||||
on-click="onEditClick"/>
|
||||
<htk-button
|
||||
form="iter"
|
||||
column="id"
|
||||
tip="_Remove"
|
||||
image="image/delete.svg"
|
||||
icon="delete"
|
||||
on-click="onDeleteClick"/>
|
||||
<htk-image
|
||||
form="iter"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<svg
|
||||
xmlns:ns="&ns_sfw;"
|
||||
xmlns:ns="&#38;#38;#38;#38;ns_sfw;"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
|
|
@ -14,9 +14,9 @@
|
|||
id="Capa_1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
width="280.7037"
|
||||
height="82.280701"
|
||||
viewBox="0 0 280.7037 82.280701"
|
||||
width="279"
|
||||
height="80.577003"
|
||||
viewBox="0 0 279 80.577004"
|
||||
enable-background="new 0 0 315 91"
|
||||
xml:space="preserve"
|
||||
inkscape:version="0.91 r13725"
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
id="defs71" /><sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
borderopacity="0"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
|
|
@ -39,12 +39,14 @@
|
|||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
inkscape:zoom="3.9555556"
|
||||
inkscape:cx="140.58781"
|
||||
inkscape:cy="40.77085"
|
||||
inkscape:cx="70.89371"
|
||||
inkscape:cy="17.671808"
|
||||
inkscape:window-x="1920"
|
||||
inkscape:window-y="27"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="Capa_1" /><metadata
|
||||
inkscape:current-layer="Capa_1"
|
||||
showborder="false"
|
||||
inkscape:showpageshadow="false" /><metadata
|
||||
id="metadata3"><ns:sfw><ns:slices /><ns:sliceSourceBounds
|
||||
height="92.88"
|
||||
width="291.36"
|
||||
|
|
@ -56,56 +58,44 @@
|
|||
style="fill:#3e3d3d"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path13"
|
||||
d="m 279.85185,76.20385 c 0,2.874 -2.351,5.225 -5.225,5.225 l -268.551,0 c -2.873,0 -5.22400003,-2.351 -5.22400003,-5.225 l 0,-70.128 c 0,-2.873 2.35100003,-5.22400003 5.22400003,-5.22400003 l 268.551,0 c 2.874,0 5.225,2.35100003 5.225,5.22400003 l 0,70.128 z" /><path
|
||||
style="fill:none;stroke:#ffffff;stroke-width:1.70369995;stroke-miterlimit:10"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path15"
|
||||
d="m 279.85185,76.20385 c 0,2.874 -2.351,5.225 -5.225,5.225 l -268.551,0 c -2.873,0 -5.22400003,-2.351 -5.22400003,-5.225 l 0,-70.128 c 0,-2.873 2.35100003,-5.22400003 5.22400003,-5.22400003 l 268.551,0 c 2.874,0 5.225,2.35100003 5.225,5.22400003 l 0,70.128 z"
|
||||
stroke-miterlimit="10" /><path
|
||||
d="m 38.97185,53.91685 -10.226,-29.708 8.08,0 4.182,15.251 0.303,1.229 c 0.544,1.868 0.911,3.371 1.169,4.62 0.146,-0.596 0.347,-1.3 0.56,-2.165 0.214,-0.797 0.521,-1.879 0.891,-3.178 l 4.385,-15.757 8.021,0 -10.262,29.708 -7.103,0 z"
|
||||
d="m 279,75.352 c 0,2.874 -2.351,5.225 -5.225,5.225 l -268.551,0 C 2.351,80.577 0,78.226 0,75.352 L 0,5.224 C 0,2.351 2.351,0 5.224,0 L 273.775,0 C 276.649,0 279,2.351 279,5.224 l 0,70.128 z" /><path
|
||||
d="m 38.12,53.065 -10.226,-29.708 8.08,0 4.182,15.251 0.303,1.229 c 0.544,1.868 0.911,3.371 1.169,4.62 0.146,-0.596 0.347,-1.3 0.56,-2.165 0.214,-0.797 0.521,-1.879 0.891,-3.178 l 4.385,-15.757 8.021,0 -10.262,29.708 -7.103,0 z"
|
||||
id="path41"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><path
|
||||
d="m 246.74185,53.91685 -7.322,0 c 0.029,-0.359 0.068,-0.751 0.13,-1.163 l 0.095,-1.152 c -1.248,1.042 -2.559,1.737 -3.862,2.304 -1.211,0.431 -2.587,0.648 -3.912,0.645 -2.143,0 -3.605,-0.572 -4.486,-1.736 -0.922,-1.161 -1.13,-2.66 -0.552,-4.681 0.521,-1.806 1.43,-3.252 2.627,-4.412 1.339,-1.152 2.985,-1.914 5.084,-2.385 1.145,-0.216 2.575,-0.505 4.315,-0.79 2.578,-0.412 3.963,-1.012 4.165,-1.744 l 0.203,-0.568 c 0.128,-0.603 0.067,-1.107 -0.323,-1.447 -0.432,-0.297 -1.041,-0.471 -1.97,-0.471 -1.096,0 -1.96,0.183 -2.607,0.614 -0.786,0.437 -1.313,1.013 -1.668,1.872 l -6.645,0 c 1.127,-2.486 2.606,-4.326 4.62,-5.551 2.042,-1.228 4.621,-1.818 7.808,-1.818 1.97,0 3.468,0.241 4.694,0.729 1.224,0.431 2.064,1.156 2.518,2.125 0.339,0.669 0.543,1.484 0.468,2.449 -0.069,0.921 -0.402,2.479 -0.996,4.543 l -2.323,8.303 c -0.273,1.011 -0.338,1.743 -0.314,2.313 0,0.572 0.148,0.977 0.461,1.157 l -0.208,0.864 z m -5.028,-10.341 c -0.687,0.339 -1.7,0.674 -3.18,0.972 -0.714,0.129 -1.288,0.231 -1.597,0.333 -0.948,0.259 -1.699,0.581 -2.102,0.919 -0.489,0.377 -0.794,0.885 -1.005,1.475 -0.191,0.858 -0.09,1.441 0.211,1.961 0.331,0.429 0.898,0.646 1.739,0.646 1.179,0 2.313,-0.3 3.271,-1.021 1.021,-0.727 1.652,-1.593 1.924,-2.774 l 0.739,-2.511 z"
|
||||
d="m 245.89,53.065 -7.322,0 c 0.029,-0.359 0.068,-0.751 0.13,-1.163 l 0.095,-1.152 c -1.248,1.042 -2.559,1.737 -3.862,2.304 -1.211,0.431 -2.587,0.648 -3.912,0.645 -2.143,0 -3.605,-0.572 -4.486,-1.736 -0.922,-1.161 -1.13,-2.66 -0.552,-4.681 0.521,-1.806 1.43,-3.252 2.627,-4.412 1.339,-1.152 2.985,-1.914 5.084,-2.385 1.145,-0.216 2.575,-0.505 4.315,-0.79 2.578,-0.412 3.963,-1.012 4.165,-1.744 l 0.203,-0.568 c 0.128,-0.603 0.067,-1.107 -0.323,-1.447 -0.432,-0.297 -1.041,-0.471 -1.97,-0.471 -1.096,0 -1.96,0.183 -2.607,0.614 -0.786,0.437 -1.313,1.013 -1.668,1.872 l -6.645,0 c 1.127,-2.486 2.606,-4.326 4.62,-5.551 2.042,-1.228 4.621,-1.818 7.808,-1.818 1.97,0 3.468,0.241 4.694,0.729 1.224,0.431 2.064,1.156 2.518,2.125 0.339,0.669 0.543,1.484 0.468,2.449 -0.069,0.921 -0.402,2.479 -0.996,4.543 l -2.323,8.303 c -0.273,1.011 -0.338,1.743 -0.314,2.313 0,0.572 0.148,0.977 0.461,1.157 l -0.208,0.864 z m -5.028,-10.341 c -0.687,0.339 -1.7,0.674 -3.18,0.972 -0.714,0.129 -1.288,0.231 -1.597,0.333 -0.948,0.259 -1.699,0.581 -2.102,0.919 -0.489,0.377 -0.794,0.885 -1.005,1.475 -0.191,0.858 -0.09,1.441 0.211,1.961 0.331,0.429 0.898,0.646 1.739,0.646 1.179,0 2.313,-0.3 3.271,-1.021 1.021,-0.727 1.652,-1.593 1.924,-2.774 l 0.739,-2.511 z"
|
||||
id="path43"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:evenodd;fill:#a9d42d;fill-rule:evenodd" /><path
|
||||
d="m 210.45585,53.91685 6.166,-21.935 6.877,0 -1.034,3.801 c 1.173,-1.461 2.378,-2.601 3.789,-3.278 1.293,-0.673 2.893,-1.065 4.624,-1.073 l -2.033,7.09 c -0.276,-0.015 -0.58,-0.064 -0.857,-0.09 -0.301,-0.029 -0.575,-0.041 -0.886,-0.041 -1.094,0 -2.003,0.171 -2.879,0.519 -0.781,0.332 -1.441,0.822 -2.072,1.492 -0.442,0.467 -0.824,1.152 -1.107,2.003 -0.384,0.844 -0.873,2.192 -1.414,4.119 l -2.049,7.393 -7.125,0 z"
|
||||
d="m 209.604,53.065 6.166,-21.935 6.877,0 -1.034,3.801 c 1.173,-1.461 2.378,-2.601 3.789,-3.278 1.293,-0.673 2.893,-1.065 4.624,-1.073 l -2.033,7.09 c -0.276,-0.015 -0.58,-0.064 -0.857,-0.09 -0.301,-0.029 -0.575,-0.041 -0.886,-0.041 -1.094,0 -2.003,0.171 -2.879,0.519 -0.781,0.332 -1.441,0.822 -2.072,1.492 -0.442,0.467 -0.824,1.152 -1.107,2.003 -0.384,0.844 -0.873,2.192 -1.414,4.119 l -2.049,7.393 -7.125,0 z"
|
||||
id="path45"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:evenodd;fill:#a9d42d;fill-rule:evenodd" /><path
|
||||
d="m 213.09585,31.98285 -6.163,21.935 -6.994,0 0.873,-3.06 c -1.181,1.248 -2.438,2.154 -3.723,2.735 -1.199,0.573 -2.556,0.857 -3.945,0.857 -2.455,0 -4.078,-0.639 -4.948,-1.915 -0.885,-1.226 -0.976,-3.044 -0.299,-5.543 l 4.235,-15.01 7.223,0 -3.465,12.243 c -0.55,1.812 -0.594,3.041 -0.344,3.712 0.235,0.722 0.925,1.061 2.067,1.061 1.165,0 2.261,-0.447 3.025,-1.253 0.772,-0.804 1.477,-2.174 1.977,-4.043 l 3.326,-11.72 7.155,0 z"
|
||||
d="m 212.244,31.131 -6.163,21.935 -6.994,0 0.873,-3.06 c -1.181,1.248 -2.438,2.154 -3.723,2.735 -1.199,0.573 -2.556,0.857 -3.945,0.857 -2.455,0 -4.078,-0.639 -4.948,-1.915 -0.885,-1.226 -0.976,-3.044 -0.299,-5.543 l 4.235,-15.01 7.223,0 -3.465,12.243 c -0.55,1.812 -0.594,3.041 -0.344,3.712 0.235,0.722 0.925,1.061 2.067,1.061 1.165,0 2.261,-0.447 3.025,-1.253 0.772,-0.804 1.477,-2.174 1.977,-4.043 l 3.326,-11.72 7.155,0 z"
|
||||
id="path47"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:evenodd;fill:#a9d42d;fill-rule:evenodd" /><path
|
||||
d="m 175.45585,36.31585 1.238,-4.333 2.95,0 1.734,-6.179 7.156,0 -1.734,6.179 3.637,0 -1.195,4.333 -3.681,0 -2.671,9.478 c -0.338,1.474 -0.463,2.389 -0.235,2.923 0.235,0.436 0.903,0.647 1.965,0.647 l 0.568,-0.019 0.291,-0.043 -1.211,4.615 c -0.805,0.147 -1.613,0.289 -2.293,0.303 -0.819,0.109 -1.458,0.174 -2.173,0.169 -2.431,0 -4.006,-0.62 -4.575,-1.856 -0.574,-1.223 -0.307,-3.816 0.771,-7.753 l 2.406,-8.464 -2.948,0 z"
|
||||
d="m 174.604,35.464 1.238,-4.333 2.95,0 1.734,-6.179 7.156,0 -1.734,6.179 3.637,0 -1.195,4.333 -3.681,0 -2.671,9.478 c -0.338,1.474 -0.463,2.389 -0.235,2.923 0.235,0.436 0.903,0.647 1.965,0.647 l 0.568,-0.019 0.291,-0.043 -1.211,4.615 c -0.805,0.147 -1.613,0.289 -2.293,0.303 -0.819,0.109 -1.458,0.174 -2.173,0.169 -2.431,0 -4.006,-0.62 -4.575,-1.856 -0.574,-1.223 -0.307,-3.816 0.771,-7.753 l 2.406,-8.464 -2.948,0 z"
|
||||
id="path49"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:evenodd;fill:#a9d42d;fill-rule:evenodd" /><path
|
||||
d="m 170.54585,53.91685 -7.316,0 c 0.013,-0.359 0.049,-0.751 0.118,-1.163 l 0.164,-1.152 c -1.291,1.042 -2.595,1.737 -3.82,2.304 -1.318,0.427 -2.574,0.645 -3.98,0.645 -2.063,0 -3.601,-0.572 -4.528,-1.736 -0.92,-1.161 -1.045,-2.66 -0.505,-4.681 0.476,-1.806 1.38,-3.254 2.709,-4.412 1.204,-1.152 2.909,-1.913 4.959,-2.385 1.133,-0.216 2.58,-0.505 4.31,-0.79 2.591,-0.412 4.046,-1.012 4.285,-1.744 l 0.088,-0.568 c 0.247,-0.603 0.106,-1.107 -0.322,-1.447 -0.299,-0.297 -0.998,-0.471 -1.979,-0.471 -0.955,0 -1.825,0.183 -2.609,0.614 -0.648,0.437 -1.2,1.013 -1.593,1.872 l -6.576,0 c 0.983,-2.486 2.564,-4.326 4.619,-5.55 2.046,-1.229 4.618,-1.819 7.729,-1.819 1.903,0 3.544,0.243 4.736,0.729 1.156,0.431 2.019,1.156 2.534,2.125 0.347,0.669 0.419,1.484 0.353,2.449 -0.006,0.921 -0.287,2.479 -0.87,4.543 l -2.323,8.303 c -0.277,1.011 -0.456,1.743 -0.429,2.313 0.024,0.572 0.151,0.977 0.449,1.157 l -0.203,0.864 z m -5.003,-10.341 c -0.586,0.339 -1.735,0.673 -3.184,0.972 -0.671,0.129 -1.202,0.231 -1.614,0.333 -0.965,0.259 -1.574,0.581 -2.118,0.919 -0.407,0.377 -0.75,0.885 -0.894,1.475 -0.28,0.858 -0.188,1.441 0.183,1.956 0.383,0.434 0.958,0.65 1.722,0.65 1.252,0 2.327,-0.3 3.298,-1.021 0.936,-0.727 1.612,-1.593 1.947,-2.774 l 0.66,-2.51 z"
|
||||
d="m 169.694,53.065 -7.316,0 c 0.013,-0.359 0.049,-0.751 0.118,-1.163 l 0.164,-1.152 c -1.291,1.042 -2.595,1.737 -3.82,2.304 -1.318,0.427 -2.574,0.645 -3.98,0.645 -2.063,0 -3.601,-0.572 -4.528,-1.736 -0.92,-1.161 -1.045,-2.66 -0.505,-4.681 0.476,-1.806 1.38,-3.254 2.709,-4.412 1.204,-1.152 2.909,-1.913 4.959,-2.385 1.133,-0.216 2.58,-0.505 4.31,-0.79 2.591,-0.412 4.046,-1.012 4.285,-1.744 l 0.088,-0.568 c 0.247,-0.603 0.106,-1.107 -0.322,-1.447 -0.299,-0.297 -0.998,-0.471 -1.979,-0.471 -0.955,0 -1.825,0.183 -2.609,0.614 -0.648,0.437 -1.2,1.013 -1.593,1.872 l -6.576,0 c 0.983,-2.486 2.564,-4.326 4.619,-5.55 2.046,-1.229 4.618,-1.819 7.729,-1.819 1.903,0 3.544,0.243 4.736,0.729 1.156,0.431 2.019,1.156 2.534,2.125 0.347,0.669 0.419,1.484 0.353,2.449 -0.006,0.921 -0.287,2.479 -0.87,4.543 l -2.323,8.303 c -0.277,1.011 -0.456,1.743 -0.429,2.313 0.024,0.572 0.151,0.977 0.449,1.157 l -0.203,0.864 z m -5.003,-10.341 c -0.586,0.339 -1.735,0.673 -3.184,0.972 -0.671,0.129 -1.202,0.231 -1.614,0.333 -0.965,0.259 -1.574,0.581 -2.118,0.919 -0.407,0.377 -0.75,0.885 -0.894,1.475 -0.28,0.858 -0.188,1.441 0.183,1.956 0.383,0.434 0.958,0.65 1.722,0.65 1.252,0 2.327,-0.3 3.298,-1.021 0.936,-0.727 1.612,-1.593 1.947,-2.774 l 0.66,-2.51 z"
|
||||
id="path51"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:evenodd;fill:#a9d42d;fill-rule:evenodd" /><path
|
||||
d="m 123.20885,24.20885 -8.328,29.708 -7.168,0 0.806,-2.891 c -1.152,1.155 -2.318,2.024 -3.524,2.599 -1.242,0.581 -2.543,0.872 -3.961,0.872 -2.733,0 -4.651,-1.074 -5.782,-3.188 -1.087,-2.065 -1.183,-4.854 -0.208,-8.311 0.944,-3.456 2.619,-6.229 4.938,-8.413 2.313,-2.179 4.783,-3.292 7.493,-3.292 1.432,0 2.631,0.29 3.59,0.868 0.937,0.579 1.642,1.446 2.067,2.604 l 2.91,-10.556 7.167,0 z m -22.175,18.504 c -0.532,1.943 -0.607,3.464 -0.166,4.532 0.445,0.979 1.365,1.481 2.741,1.481 1.358,0 2.552,-0.489 3.531,-1.46 0.984,-1.09 1.782,-2.565 2.331,-4.554 0.499,-1.866 0.525,-3.28 0.065,-4.284 -0.436,-1.009 -1.329,-1.5 -2.712,-1.5 -1.262,0 -2.424,0.511 -3.476,1.558 -1.052,1.042 -1.779,2.437 -2.314,4.227"
|
||||
d="m 122.357,23.357 -8.328,29.708 -7.168,0 0.806,-2.891 c -1.152,1.155 -2.318,2.024 -3.524,2.599 -1.242,0.581 -2.543,0.872 -3.961,0.872 -2.733,0 -4.651,-1.074 -5.782,-3.188 -1.087,-2.065 -1.183,-4.854 -0.208,-8.311 0.944,-3.456 2.619,-6.229 4.938,-8.413 2.313,-2.179 4.783,-3.292 7.493,-3.292 1.432,0 2.631,0.29 3.59,0.868 0.937,0.579 1.642,1.446 2.067,2.604 l 2.91,-10.556 7.167,0 z m -22.175,18.504 c -0.532,1.943 -0.607,3.464 -0.166,4.532 0.445,0.979 1.365,1.481 2.741,1.481 1.358,0 2.552,-0.489 3.531,-1.46 0.984,-1.09 1.782,-2.565 2.331,-4.554 0.499,-1.866 0.525,-3.28 0.065,-4.284 -0.436,-1.009 -1.329,-1.5 -2.712,-1.5 -1.262,0 -2.424,0.511 -3.476,1.558 -1.052,1.042 -1.779,2.437 -2.314,4.227"
|
||||
id="path53"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><path
|
||||
d="m 74.26585,53.91685 6.114,-21.935 6.888,0 -1.041,3.801 c 1.192,-1.461 2.442,-2.601 3.788,-3.278 1.303,-0.679 5.873,-1.065 7.651,-1.073 l -2.013,7.09 c -0.289,-0.015 -0.577,-0.064 -0.862,-0.09 -0.3,-0.029 -0.586,-0.041 -0.868,-0.041 -1.109,0 -5.057,0.171 -5.869,0.516 -0.792,0.334 -1.501,0.823 -2.141,1.494 -0.384,0.467 -0.795,1.152 -1.112,2.003 -0.385,0.844 -0.833,2.192 -1.349,4.119 l -2.072,7.393 -7.114,0 z"
|
||||
d="m 73.414,53.065 6.114,-21.935 6.888,0 -1.041,3.801 c 1.192,-1.461 2.442,-2.601 3.788,-3.278 1.303,-0.679 5.873,-1.065 7.651,-1.073 l -2.013,7.09 c -0.289,-0.015 -0.577,-0.064 -0.862,-0.09 -0.3,-0.029 -0.586,-0.041 -0.868,-0.041 -1.109,0 -5.057,0.171 -5.869,0.516 -0.792,0.334 -1.501,0.823 -2.141,1.494 -0.384,0.467 -0.795,1.152 -1.112,2.003 -0.385,0.844 -0.833,2.192 -1.349,4.119 l -2.072,7.393 -7.114,0 z"
|
||||
id="path55"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><path
|
||||
d="m 66.74385,46.97585 6.905,0 c -1.322,2.398 -3.138,4.312 -5.368,5.573 -2.254,1.368 -4.776,1.95 -7.595,1.95 -3.366,0 -5.792,-0.979 -7.182,-3.053 -1.368,-2.077 -1.596,-4.854 -0.606,-8.447 1.02,-3.609 2.843,-6.497 5.415,-8.598 2.574,-2.1 5.539,-3.171 8.913,-3.171 3.482,0 5.905,1.071 7.325,3.246 1.364,2.146 1.529,5.085 0.446,8.892 l -0.205,0.787 -0.178,0.475 -14.808,0 c -0.429,1.548 -0.429,2.702 0,3.504 0.438,0.865 1.308,1.23 2.599,1.23 0.965,0 1.789,-0.168 2.525,-0.615 0.738,-0.323 1.354,-0.933 1.814,-1.773 m -6.012,-6.393 8.186,-0.027 c 0.355,-1.388 0.293,-2.473 -0.205,-3.283 -0.53,-0.775 -1.392,-1.196 -2.637,-1.194 -1.188,-0.001 -2.225,0.419 -3.146,1.167 -0.948,0.804 -1.675,1.894 -2.198,3.337"
|
||||
d="m 65.892,46.124 6.905,0 c -1.322,2.398 -3.138,4.312 -5.368,5.573 -2.254,1.368 -4.776,1.95 -7.595,1.95 -3.366,0 -5.792,-0.979 -7.182,-3.053 -1.368,-2.077 -1.596,-4.854 -0.606,-8.447 1.02,-3.609 2.843,-6.497 5.415,-8.598 2.574,-2.1 5.539,-3.171 8.913,-3.171 3.482,0 5.905,1.071 7.325,3.246 1.364,2.146 1.529,5.085 0.446,8.892 l -0.205,0.787 -0.178,0.475 -14.808,0 c -0.429,1.548 -0.429,2.702 0,3.504 0.438,0.865 1.308,1.23 2.599,1.23 0.965,0 1.789,-0.168 2.525,-0.615 0.738,-0.323 1.354,-0.933 1.814,-1.773 m -6.012,-6.393 8.186,-0.027 c 0.355,-1.388 0.293,-2.473 -0.205,-3.283 -0.53,-0.775 -1.392,-1.196 -2.637,-1.194 -1.188,-10e-4 -2.225,0.419 -3.146,1.167 -0.948,0.804 -1.675,1.894 -2.198,3.337"
|
||||
id="path57"
|
||||
inkscape:connector-curvature="0"
|
||||
style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" /><path
|
||||
d="m 139.21185,54.20585 -6.27,-18.261 -6.328,18.261 -7.092,0 9.373,-29.695 8.013,0 4.334,15.277 0.365,1.227 c 0.503,1.844 0.876,3.37 1.145,4.582 l 0.522,-2.128 c 0.244,-0.798 0.548,-1.897 0.925,-3.216 l 4.355,-15.741 8.021,0 -10.267,29.695 -7.096,0 z"
|
||||
d="m 138.36,53.354 -6.27,-18.261 -6.328,18.261 -7.092,0 9.373,-29.695 8.013,0 4.334,15.277 0.365,1.227 c 0.503,1.844 0.876,3.37 1.145,4.582 l 0.522,-2.128 c 0.244,-0.798 0.548,-1.897 0.925,-3.216 l 4.355,-15.741 8.021,0 -10.267,29.695 -7.096,0 z"
|
||||
id="path59"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#a9d42d" /><g
|
||||
id="g65"
|
||||
transform="translate(-15.64815,-3.99015)"><path
|
||||
stroke-miterlimit="10"
|
||||
d="m 295.5,80.194 c 0,2.874 -2.351,5.225 -5.225,5.225 l -268.551,0 c -2.873,0 -5.224,-2.351 -5.224,-5.225 l 0,-70.128 c 0,-2.873 2.351,-5.224 5.224,-5.224 l 268.551,0 c 2.874,0 5.225,2.351 5.225,5.224 l 0,70.128 z"
|
||||
id="path67"
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:none;stroke:#ffffff;stroke-width:1.70369995;stroke-miterlimit:10" /></g></svg>
|
||||
style="fill:#a9d42d" /></svg>
|
||||
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 9.3 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 5.9 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 5.8 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 141 B After Width: | Height: | Size: 141 B |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
|
|
@ -24,7 +24,7 @@
|
|||
right: 0;
|
||||
z-index: 1;
|
||||
overflow: hidden;
|
||||
box-shadow: 0 0.1em 0.1em rgba(1, 1, 1, 0.3);
|
||||
box-shadow: 0 .1em .1em rgba(1, 1, 1, 0.3);
|
||||
height: 3.9em;
|
||||
color: white;
|
||||
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
top: 0;
|
||||
background-color: white;
|
||||
z-index: 20;
|
||||
box-shadow: 0 0.2em 0.2em rgba(1, 1, 1, 0.4);
|
||||
box-shadow: 0 .2em .2em rgba(1, 1, 1, 0.4);
|
||||
width: 15em;
|
||||
}
|
||||
.vn-gui .menu-overflow
|
||||
|
|
@ -254,7 +254,7 @@
|
|||
border: none;
|
||||
border-radius: 1px;
|
||||
background-color: white;
|
||||
box-shadow: 0 0.2em 0.2em #CCC;
|
||||
box-shadow: 0 .2em .2em #CCC;
|
||||
z-index: 50;
|
||||
list-style-type: none;
|
||||
padding-left: 0;
|
||||
|
|
@ -359,7 +359,7 @@
|
|||
{
|
||||
top: 0;
|
||||
left: -15em;
|
||||
box-shadow: 0 0.2em 0.2em #333;
|
||||
box-shadow: 0 .2em .2em #333;
|
||||
|
||||
transition: transform 200ms ease-out;
|
||||
-webkit-transition: transform 200ms ease-out;
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ body
|
|||
margin: 0 auto;
|
||||
max-width: 40em;
|
||||
height: 100%;
|
||||
background-color: #9CBC28;
|
||||
box-shadow: 0 .3em .3em rgba(1, 1, 1, 0.4);
|
||||
background-color: white;
|
||||
box-shadow: 0 0 .3em 0 rgba(1, 1, 1, 0.4);
|
||||
}
|
||||
|
||||
/* Login */
|
||||
|
|
@ -95,6 +95,7 @@ body
|
|||
{
|
||||
display: block;
|
||||
width: 100%;
|
||||
/* box-shadow: 0 0 .3em 0 rgba(1, 1, 1, 0.4);*/
|
||||
}
|
||||
.vn-login .version-code
|
||||
{
|
||||
|
|
@ -158,35 +159,41 @@ body
|
|||
.vn-login button
|
||||
{
|
||||
margin: 0 auto;
|
||||
background-color: #333;
|
||||
border: 1px solid #222;
|
||||
background-color: #9CBC28;
|
||||
border: 1px solid #8A1;
|
||||
height: 2.4em;
|
||||
width: 100%;
|
||||
color: white;
|
||||
color: #240;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.vn-login input[type=submit]:hover,
|
||||
.vn-login input[type=button]:hover,
|
||||
.vn-login button:hover
|
||||
{
|
||||
background-color: #222;
|
||||
background-color: #8A1;
|
||||
}
|
||||
hr
|
||||
{
|
||||
border: solid 1px white;
|
||||
border: solid 1px #333;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: block;
|
||||
}
|
||||
.vn-login .enter
|
||||
{
|
||||
position: relative;
|
||||
}
|
||||
.vn-login .wrapper
|
||||
{
|
||||
width: 0;
|
||||
overflow: visible;
|
||||
position: relative;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
}
|
||||
.vn-login .htk-spinner
|
||||
{
|
||||
margin: .45em 1em;
|
||||
margin: .3em 1em;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ Vn.Login = new Class
|
|||
this.link ({_conn: x}, {'loading-changed': this._onConnLoadChange});
|
||||
/* x.execQuery (
|
||||
'SELECT title, link, icon FROM social ORDER BY priority',
|
||||
this.onSocialQueryDone.bind (this));
|
||||
this._onSocialQueryDone.bind (this));
|
||||
*/ }
|
||||
,get: function ()
|
||||
{
|
||||
|
|
@ -97,8 +97,26 @@ Vn.Login = new Class
|
|||
else
|
||||
this._focusUserInput ();
|
||||
}
|
||||
|
||||
,onPasswordLost: function ()
|
||||
{
|
||||
if (!this.$('user').value)
|
||||
{
|
||||
Htk.Toast.showError (_('Please write your user name'));
|
||||
return;
|
||||
}
|
||||
|
||||
var request = new Vn.JsonRequest ('core/recover-password');
|
||||
request.send (null, this._onPasswordRecovered.bind (this));
|
||||
}
|
||||
|
||||
,_onPasswordRecovered: function (request, json, error)
|
||||
{
|
||||
if (json)
|
||||
Htk.Toast.showMessage (_('It sent an email with your new password'));
|
||||
}
|
||||
|
||||
,onSocialQueryDone: function (resultSet)
|
||||
,_onSocialQueryDone: function (resultSet)
|
||||
{
|
||||
var res = resultSet.fetchResult ();
|
||||
var social = this.$('social');
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@
|
|||
<input type="checkbox" id="remember" name="remember"/>
|
||||
<label for="remember"><t>Do not sign out</t></label>
|
||||
</div>
|
||||
<div>
|
||||
<div class="enter">
|
||||
<input id="submit" type="submit" value="_Enter"/>
|
||||
<div class="wrapper">
|
||||
<htk-spinner id="spinner"/>
|
||||
</div>
|
||||
<p>
|
||||
<a href="?srv=json:core/recover-password">
|
||||
<a href="#" on-click="onPasswordLost">
|
||||
<t>Password forgotten? Push here</t>
|
||||
</a>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
Htk.BarButton = new Class
|
||||
({
|
||||
Extends: Htk.Button
|
||||
,Tag: 'htk-bar-button'
|
||||
,Properties:
|
||||
{
|
||||
icon:
|
||||
{
|
||||
type: String
|
||||
,set: function (x)
|
||||
{
|
||||
this.img.src = 'image/icon/dark/'+ x +'.svg';
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
,_showText: true
|
||||
});
|
||||
|
|
@ -12,6 +12,15 @@ Htk.Button = new Class
|
|||
this.img.src = x;
|
||||
}
|
||||
|
||||
},
|
||||
icon:
|
||||
{
|
||||
type: String
|
||||
,set: function (x)
|
||||
{
|
||||
this.img.src = 'image/icon/light/'+ x +'.svg';
|
||||
}
|
||||
|
||||
},
|
||||
tip:
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ Vn.includeLib ('htk',
|
|||
,'field/date-chooser'
|
||||
,'field/image'
|
||||
,'field/button'
|
||||
,'field/bar-button'
|
||||
,'field/table'
|
||||
,'field/search-entry'
|
||||
,'column'
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<meta name="viewport" content="user-scalable=no"/>
|
||||
<link href="http://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" type="text/css"/>
|
||||
<link rel="stylesheet" type="text/css" href="pages/tpv/style.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="<?=__DIR__?>/style.css"/>
|
||||
<title>Verdnatura</title>
|
||||
</head>
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<meta name="viewport" content="user-scalable=no"/>
|
||||
<link href="http://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" type="text/css"/>
|
||||
<link rel="stylesheet" type="text/css" href="pages/update-browser/style.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="<?=__DIR__?>/style.css"/>
|
||||
<title>Verdnatura</title>
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<a href="http://www.mozilla.org/es-ES/firefox/new/" target="_blank">
|
||||
<img src="image/update-browser.png" alt="<?=s('UpdateYourBrowser')?>"></img>
|
||||
<img src="<?=__DIR__?>/update-browser.png" alt="<?=s('UpdateYourBrowser')?>"></img>
|
||||
</a>
|
||||
</div>
|
||||
<div id="continue">
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||
<meta name="viewport" content="user-scalable=no"/>
|
||||
<link href="//fonts.googleapis.com/css?family=Roboto" rel="stylesheet" type="text/css"/>
|
||||
<link rel="stylesheet" type="text/css" href="pages/version-menu/style.css?version=2"/>
|
||||
<link rel="stylesheet" type="text/css" href="<?=__DIR__?>/style.css?version"/>
|
||||
<title>Verdnatura</title>
|
||||
</head>
|
||||
<body>
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
<div>
|
||||
<a href="https://test-www.verdnatura.es/">
|
||||
<div>
|
||||
<img src="pages/version-menu/new-web.svg" alt=""></img>
|
||||
<img src="<?=__DIR__?>/new-web.svg" alt=""></img>
|
||||
<p>
|
||||
<?=s('New website')?>
|
||||
</p>
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
<div>
|
||||
<a href="?skipVersion=true">
|
||||
<div>
|
||||
<img src="pages/version-menu/old-web.svg" alt=""></img>
|
||||
<img src="<?=__DIR__?>/old-web.svg" alt=""></img>
|
||||
<p>
|
||||
<?=s('Old website')?>
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -13,12 +13,13 @@ Vn.ShelvesReport = new Class
|
|||
this.maxAmount = batch.getValue ('max-amount');
|
||||
this.showPacking = batch.getValue ('show-packing');
|
||||
this.stack = batch.getValue ('stack');
|
||||
this.useIds = batch.getValue ('use-ids');
|
||||
|
||||
var query =
|
||||
'SELECT id, name, width, height, depth, max_height, tray_height, '+
|
||||
'first_tray_elevation, tray_density, vspacing, hspacing '+
|
||||
'FROM shelf WHERE id = #shelf; '+
|
||||
'CALL item_organizer (#wh, #date, #family, #filter)';
|
||||
'CALL itemAllocator (#wh, #date, #family, #filter, #use-ids)';
|
||||
|
||||
this.conn.execQuery (query, this.onQueryExec.bind (this), this.batch);
|
||||
}
|
||||
|
|
@ -30,6 +31,8 @@ Vn.ShelvesReport = new Class
|
|||
var res = resultSet.fetchResult ();
|
||||
res.next ();
|
||||
|
||||
// Calculates the scale
|
||||
|
||||
var maxWidth = 170;
|
||||
var maxHeight = 200;
|
||||
|
||||
|
|
@ -37,6 +40,8 @@ Vn.ShelvesReport = new Class
|
|||
|
||||
if (res.get ('max_height') * scale > maxHeight)
|
||||
scale = maxHeight / res.get ('max_height');
|
||||
|
||||
// Gets the shelf dimensions
|
||||
|
||||
var shelf = this.shelf =
|
||||
{
|
||||
|
|
@ -50,6 +55,8 @@ Vn.ShelvesReport = new Class
|
|||
,vspacing: res.get ('vspacing') * scale
|
||||
,hspacing: res.get ('hspacing') * scale
|
||||
};
|
||||
|
||||
// Gets the items
|
||||
|
||||
var items = this.items = [];
|
||||
var remainings = this.remainings = [];
|
||||
|
|
@ -186,7 +193,7 @@ Vn.ShelvesReport = new Class
|
|||
|
||||
var subtitle = this.doc.createElement ('h2');
|
||||
subtitle.className = 'subtitle';
|
||||
subtitle.appendChild (this.doc.createTextNode (item.id.toLocaleString ()));
|
||||
subtitle.appendChild (this.doc.createTextNode (this.getName (item)));
|
||||
sheet.appendChild (subtitle);
|
||||
|
||||
this.drawShelfEnding ();
|
||||
|
|
@ -221,10 +228,18 @@ Vn.ShelvesReport = new Class
|
|||
,drawShelfEnding: function ()
|
||||
{
|
||||
if (this.lastSubtitle)
|
||||
this.lastSubtitle.appendChild (
|
||||
this.doc.createTextNode (' - '+ this.lastItem.id.toLocaleString ()));
|
||||
this.lastSubtitle.appendChild (this.doc.createTextNode (
|
||||
' - '+ this.getName (this.lastItem)));
|
||||
}
|
||||
|
||||
,getName: function (item)
|
||||
{
|
||||
if (this.useIds)
|
||||
return item.id.toLocaleString ();
|
||||
else
|
||||
return item.name.charAt (0).toUpperCase ();
|
||||
}
|
||||
|
||||
,mm: function (size)
|
||||
{
|
||||
return size.toFixed (2) +'mm';
|
||||
|
|
@ -263,11 +278,16 @@ Vn.ShelvesReport = new Class
|
|||
|
||||
if (fontSize > item.boxHeight - 1)
|
||||
fontSize = item.boxHeight - 1;
|
||||
|
||||
if (this.useIds)
|
||||
var labelText = item.id.toLocaleString ();
|
||||
else
|
||||
var labelText = item.name;
|
||||
|
||||
var boxLabel = this.doc.createElement ('div');
|
||||
boxLabel.className = 'box-label';
|
||||
boxLabel.style.fontSize = this.mm (fontSize);
|
||||
boxLabel.appendChild (this.doc.createTextNode (item.id.toLocaleString ()));
|
||||
boxLabel.appendChild (this.doc.createTextNode (labelText));
|
||||
box.appendChild (boxLabel);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ class Login extends Vn\Web\JsonRequest
|
|||
|
||||
$user = $this->escape ($_SESSION['user']);
|
||||
$pass = $this->escape ($_SESSION['password']);
|
||||
ssh2_exec ($ssh, "samba-tool user add \"$user\" \"$pass\"");
|
||||
ssh2_exec ($ssh, "samba-tool user create \"$user\" \"$pass\"");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -40,9 +40,9 @@ class Query extends Vn\Web\JsonRequest
|
|||
{
|
||||
if ($row['Code'] == 1265
|
||||
&& ($warning = $db->getRow ($sql)))
|
||||
trigger_error ("${warning['code']}: ${warning['description']}", E_USER_WARNING);
|
||||
trigger_error ("{$warning['code']}: {$warning['description']}", E_USER_WARNING);
|
||||
else
|
||||
trigger_error ("${row['Code']}: ${row['Message']}", E_USER_WARNING);
|
||||
trigger_error ("{$row['Code']}: {$row['Message']}", E_USER_WARNING);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ class RecoverPassword extends Vn\Web\JsonRequest
|
|||
return TRUE;
|
||||
|
||||
$db->query (
|
||||
'UPDATE account.user SET password = # WHERE name = #',
|
||||
'UPDATE account.user SET password = MD5(#) WHERE name = #',
|
||||
[$randomPass, $_REQUEST['user']]);
|
||||
|
||||
return TRUE;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ class Contact extends Vn\Web\JsonRequest
|
|||
,'phone'
|
||||
,'email'
|
||||
,'message'
|
||||
,'captcha'
|
||||
];
|
||||
|
||||
function run ()
|
||||
|
|
@ -22,7 +23,7 @@ class Contact extends Vn\Web\JsonRequest
|
|||
$lastCaptcha = $_SESSION['captcha'];
|
||||
unset ($_SESSION['captcha']);
|
||||
|
||||
if (empty ($_REQUEST['captcha']) || $_REQUEST['captcha'] !== $lastCaptcha)
|
||||
if ($_REQUEST['captcha'] !== $lastCaptcha)
|
||||
throw new Lib\UserException (s('Wrong captcha'), 'wrongCaptcha');
|
||||
|
||||
// Sends the mail
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ class Mail extends Vn\Lib\Method
|
|||
$status = 'OK';
|
||||
|
||||
try {
|
||||
if (!preg_match ('/^[\w\._%-]+@[\w\.-]+\.[A-Za-z]{2,4}$/', $row['to']))
|
||||
throw new Exception ('Destination mail has invalid sintax');
|
||||
//if (!preg_match ('/^[\w\._%-]+@[\w\.-]+\.[A-Za-z]{2,4}$/', $row['to']))
|
||||
// throw new Exception ('Destination mail has invalid sintax');
|
||||
|
||||
$mail = new PHPMailer ();
|
||||
$mail->isSMTP ();
|
||||
|
|
@ -66,7 +66,7 @@ class Mail extends Vn\Lib\Method
|
|||
|
||||
if (!empty ($row['path']))
|
||||
{
|
||||
$attachment = '/mnt/storage/pdfs/'. $row['path'];
|
||||
$attachment = '/mnt/cluster/pdfs/'. $row['path'];
|
||||
|
||||
if (file_exists ($attachment))
|
||||
$mail->AddAttachment ($attachment, '');
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace Vn\Web;
|
||||
|
||||
require_once ('vn/lib/app.php');
|
||||
require_once (__DIR__.'/jwt.php');
|
||||
|
||||
/**
|
||||
* Main class for web applications.
|
||||
|
|
@ -58,7 +59,7 @@ class App extends \Vn\Lib\App
|
|||
{
|
||||
$hostSplit = explode ('.', $_SERVER['SERVER_NAME']);
|
||||
$configDir = _CONFIG_DIR .'/'. $this->name;
|
||||
$hostFile = $configDir .'/config.'. $hostSplit[0] .'.php';
|
||||
$hostFile = "$configDir/config/{$hostSplit[0]}.php";
|
||||
}
|
||||
|
||||
if (isset ($hostFile) && file_exists ($hostFile))
|
||||
|
|
@ -84,8 +85,6 @@ class App extends \Vn\Lib\App
|
|||
|
||||
$user = NULL;
|
||||
$password = NULL;
|
||||
$rememberUser = TRUE;
|
||||
$rememberPass = FALSE;
|
||||
$credentialsChanged = TRUE;
|
||||
$wasLoged = isset ($_SESSION['user']);
|
||||
|
||||
|
|
@ -99,16 +98,18 @@ class App extends \Vn\Lib\App
|
|||
{
|
||||
$user = $row['guest_user'];
|
||||
$password = base64_decode ($row['guest_pass']);
|
||||
$rememberUser = FALSE;
|
||||
}
|
||||
}
|
||||
elseif (isset ($_POST['user']) && isset ($_POST['password']))
|
||||
{
|
||||
$user = $_POST['user'];
|
||||
$password = $_POST['password'];
|
||||
|
||||
if (isset ($_POST['remember']) && $_POST['remember'])
|
||||
$rememberPass = TRUE;
|
||||
}
|
||||
elseif (isset ($_POST['token']) || isset ($_GET['token']))
|
||||
{
|
||||
$key = $sysDb->getValue ('SELECT jwt_key FROM config');
|
||||
$jwtPayload = Jwt::decode ($_REQUEST['token'], $key);
|
||||
$user = $jwtPayload['user'];
|
||||
}
|
||||
elseif (isset ($_SESSION['user']))
|
||||
{
|
||||
|
|
@ -116,12 +117,6 @@ class App extends \Vn\Lib\App
|
|||
$password = $_SESSION['password'];
|
||||
$credentialsChanged = FALSE;
|
||||
}
|
||||
elseif (isset ($_COOKIE['vn_user']) && isset ($_COOKIE['vn_pass']))
|
||||
{
|
||||
$user = $_COOKIE['vn_user'];
|
||||
$password = base64_decode ($_COOKIE['vn_pass']);
|
||||
$rememberPass = TRUE;
|
||||
}
|
||||
|
||||
if (!isset ($user))
|
||||
throw new SessionExpiredException ();
|
||||
|
|
@ -130,18 +125,14 @@ class App extends \Vn\Lib\App
|
|||
|
||||
try {
|
||||
$db = $this->createConnection ($user, $password);
|
||||
$db->query ('CALL user_session_start (#)', [session_id ()]);
|
||||
$db->query ('CALL userStartSession (#)', [session_id ()]);
|
||||
$this->conn = $db;
|
||||
|
||||
if ($rememberUser)
|
||||
{
|
||||
$cookieLife = time () + 7 * 86400; // 7 Days
|
||||
setcookie ('vn_user', $user, $cookieLife);
|
||||
|
||||
if ($rememberPass)
|
||||
setcookie ('vn_pass',
|
||||
base64_encode ($password), $cookieLife);
|
||||
}
|
||||
|
||||
$jwtToken = Jwt::encode ([
|
||||
'userName' => $user,
|
||||
'timestamp' => time ()
|
||||
'exp' => NULL
|
||||
]);
|
||||
|
||||
$_SESSION['user'] = $user;
|
||||
$_SESSION['password'] = $password;
|
||||
|
|
@ -162,7 +153,7 @@ class App extends \Vn\Lib\App
|
|||
{
|
||||
$sysConn = $this->getSysConn ();
|
||||
$_SESSION['visitUser'] = $sysConn->getValue (
|
||||
'CALL visit_user_new (#, #, #)',
|
||||
'CALL visitUserNew (#, #, #)',
|
||||
[
|
||||
$_SESSION['access']
|
||||
,nullIf ($_SESSION, 'visitUser')
|
||||
|
|
@ -184,17 +175,13 @@ class App extends \Vn\Lib\App
|
|||
{
|
||||
$_SESSION['visitUser'] = nullIf ($_SESSION, 'visitUnknown');
|
||||
|
||||
setcookie ('vn_pass', '', -1);
|
||||
unset ($_COOKIE['vn_pass']);
|
||||
setcookie ('vnPass', '', -1);
|
||||
unset ($_SESSION['user']);
|
||||
unset ($_SESSION['password']);
|
||||
|
||||
if ($this->conn)
|
||||
{
|
||||
$this->conn->query (
|
||||
'DELETE FROM user_session_view
|
||||
WHERE connection_id = CONNECTION_ID()'
|
||||
);
|
||||
$this->conn->query ('DELETE FROM user_session_view');
|
||||
$this->conn->close ();
|
||||
$this->conn = NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
<?php
|
||||
|
||||
namespace Vn\Web;
|
||||
|
||||
class DbSessionHandler implements SessionHandlerInterface
|
||||
{
|
||||
private $db;
|
||||
|
||||
function __construct ($db)
|
||||
{
|
||||
$this->db = $db;
|
||||
}
|
||||
|
||||
function close ()
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
function destroy ($sessionId)
|
||||
{
|
||||
$db->query ('DELETE FROM userSession WHERE id = #', [$sessionId]);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
function gc ($maxLifeTime)
|
||||
{
|
||||
$db->query ('DELETE FROM userSession
|
||||
WHERE creationDate < TIMESTAMPADD(SECOND, -#, NOW())',
|
||||
[$maxLifeTime]
|
||||
);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
function open ($savePath, $name)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
function read ($sessionId)
|
||||
{
|
||||
$db->query ('DO GET_LOCK(#, 30)', [$sessionId]);
|
||||
$sessionData = $db->getValue (
|
||||
'SELECT data FROM userSession WHERE id = #', [$sessionId]);
|
||||
return isset ($sessionData) ? $sessionData : '';
|
||||
}
|
||||
|
||||
function write ($sessionId, $sessionData)
|
||||
{
|
||||
$db->query ('REPLACE INTO userSession SET id = #, data = #',
|
||||
[$sessionId, $sessionData]);
|
||||
$db->query ('DO RELEASE_LOCK(#)', [$sessionId]);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -18,7 +18,7 @@ class HtmlService extends Service
|
|||
if (!$this->isHttps ()
|
||||
&& $db->getValue ('SELECT https FROM config'))
|
||||
{
|
||||
header ("Location: https://${_SERVER['SERVER_NAME']}${_SERVER['REQUEST_URI']}");
|
||||
header ("Location: https://{$_SERVER['SERVER_NAME']}{$_SERVER['REQUEST_URI']}");
|
||||
exit (0);
|
||||
}
|
||||
|
||||
|
|
|
|||