Backup

conf/apache.conf

@@ -1,6 +1,7 @@
-# Alias /hedera-web /usr/share/hedera-web/
+# Alias /hedera-web /usr/share/hedera-web/web/
+# Alias /vn-image-data /var/cache/hedera-web/image/
 
-<Directory /usr/share/hedera-web/>
+<Directory /usr/share/hedera-web/web/>
 
 	Options -Indexes -FollowSymLinks
 	AllowOverride None
@@ -20,3 +21,14 @@
 
 </Directory>
 
+<Directory /var/cache/hedera-web/image/>
+
+	Options Indexes FollowSymLinks MultiViews
+	AllowOverride FileInfo Options
+
+	Order Allow,Deny
+	Allow From All
+	Require all granted
+	
+</Directory>
+

conf/config.php

@@ -19,11 +19,11 @@ return [
  * Database parameters.
  **/
 'db' => [
-	 'host'   => 'db.verdnatura.es'
+	 'host'   => 'localhost'
 	,'port'   => 3306
 	,'schema' => 'hedera-web'
 	,'user'   => 'hedera-web'
-	,'pass'   => 'base64pass'
+	,'pass'   => ''
 ]
 
 ];

configure.php

@@ -1,9 +1,6 @@
 <?php
 
-namespace Vn\Hedera;
+require_once (__DIR__.'/../php-vn-lib/configure.php');
-
-require_once (__DIR__.'/../php-vn-web/configure.php');
-require_once (__DIR__.'/../vn-image/configure.php');
 
 set_include_path
 (
@@ -14,5 +11,6 @@ set_include_path
 const _DEVELOPER_MODE = TRUE;
 const _CONFIG_DIR = '/home/juan/.config';
 const _LOG_DIR = '/tmp';
+const _DATA_DIR = '/tmp';
 
 ?>

debian/install

@@ -1,4 +1,17 @@
-debian/conf/*               etc/hedera-web
+conf/*                      etc/hedera-web
 vn                          usr/share/php
 doc/*                       usr/share/doc/hedera-web
-web/*                       usr/share/hedera-web
+forms                       usr/share/hedera-web/web
+image                       usr/share/hedera-web/web
+js                          usr/share/hedera-web/web
+locale                      usr/share/hedera-web/web
+pages                       usr/share/hedera-web/web
+reports                     usr/share/hedera-web/web
+rest                        usr/share/hedera-web/web
+rest-json                   usr/share/hedera-web/web
+index.php                   usr/share/hedera-web/web
+rest.php                    usr/share/hedera-web/web
+rest-json.php               usr/share/hedera-web/web
+hedera.php                  usr/share/hedera-web/bin
+tasks                       usr/share/hedera-web/bin
+

forms/cms/contact/contact.js

@@ -0,0 +1,44 @@
+
+Vn.Contact = new Class
+({
+	Extends: Vn.Form
+
+	,activate: function ()
+	{
+		var self = this;
+		var form = this.$('contact-form').onsubmit = function ()
+			{ self.onSubmit (); return false; };
+
+		this.refreshCaptcha ();
+	}
+	
+	,refreshCaptcha: function ()
+	{
+		var url = 'rest.php?method=captcha';
+		this.$('captcha-img').src = url +'&stamp='+ new Date ().getTime ();
+	}
+	
+	,onSubmit: function ()
+	{
+		var request = new Vn.JsonRequest ();
+		request.sendForm (this.$('contact-form'),
+			this.onResponse.bind (this));
+	}
+	
+	,onResponse: function (request, json, error)
+	{
+		var form = this.$('contact-form');
+
+		if (json)
+		{
+			form.reset ();
+			Htk.Toast.showMessage (_('DataSentSuccess'));
+		}
+		else
+			Htk.Toast.showError (_('ErrorSendingData'));
+
+		form['captcha'].value = '';
+		this.refreshCaptcha ();
+	}
+});
+

forms/cms/contact/style.css

@@ -46,10 +46,10 @@
 .captcha img
 {
 	vertical-align: middle;
+	margin-left: 1em;
 }
 .captcha input
 {
-	margin-left: 1em;
 	max-width: 8em;
 }
 

forms/cms/contact/ui.xml

@@ -11,7 +11,10 @@
 			<p>
 				<t>OrCallUs</t>
 			</p>
-			<form action="forms/cms/contact/send-data.php" method="post" id="contact-form">
+			<form
+				id="contact-form"
+				method="post"
+				action="rest.php?method=contact">
 				<div class="form-group">
 					<label><t>Name</t></label>
 					<input type="text" name="name"/>

forms/cms/home/ui.xml

@@ -16,7 +16,6 @@
 			<db-model property="model">
 				<custom>
 					SELECT title, date_time, text, image, id FROM news
-						WHERE tag != 'course'
 						ORDER BY priority, date_time DESC
 				</custom>
 			</db-model>

forms/ecomerce/basket/basket.js

@@ -18,6 +18,11 @@ Vn.Basket = new Class
 			this.loadUi ();
 	}
 	
+	,activate: function ()
+	{	
+		this.$('items').setInfo ('i', 'basket_item', 'hedera');
+	}
+
 	,onConfigureClick: function ()
 	{
 		Htk.Toast.showWarning (_('RememberReconfiguringImpact'));

forms/ecomerce/invoices/invoices.js

@@ -3,14 +3,12 @@ Vn.Invoices = new Class
 ({
 	Extends: Vn.Form
 	
-	,activate: function () {}
-
 	,onDownloadClick: function  (column, invoiceId)
 	{
 		if (!invoiceId)
 			return;
 			
-		var url = '//www.verdnatura.es/hedera-web/forms/ecomerce/invoices/download.php?invoice='+ invoiceId;
+		var url = 'rest.php?method=invoice&invoice='+ invoiceId;
 		window.open (url, '_blank');
 	}
 });