Merge branch 'master' into test

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (23.30.2) stable; urgency=low
+hedera-web (23.30.5) stable; urgency=low
 
   * Initial Release.
 

debian/links

@@ -1,3 +1,3 @@
 usr/share/hedera-web/hedera-web.php  usr/bin/hedera-web.php
 etc/hedera-web/apache.conf           etc/apache2/conf-available/hedera-web.conf
-etc/hedera-web/php.ini               etc/php/7.0/apache2/conf.d/99-hedera-web.ini
+etc/hedera-web/php.ini               etc/php/8.2/apache2/conf.d/99-hedera-web.ini

js/vn/json-connection.js

@@ -85,8 +85,8 @@ module.exports = new Class({
 			const config = {
 				headers: {'Authorization': token}
 			};
+			await this.send('user/logout', null, config);
 			await this.post('Accounts/logout', null, config);
-			await this.send('user/logout');
 		}
 	},
 
@@ -140,15 +140,16 @@ module.exports = new Class({
 	/*
 	 * Called when REST response is received.
 	 */
-	async sendWithUrl(method, url, params) {
-		return this.request({
+	async sendWithUrl(method, url, params, config) {
+		config = Object.assign({}, config, {
 			method,
 			url,
-			data: Vn.Url.makeUri(params),
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded'
-			}
+			data: Vn.Url.makeUri(params)
 		});
+		config.headers = Object.assign({}, config.headers, {
+			'Content-Type': 'application/x-www-form-urlencoded'
+		});
+		return this.request(config);
 	},
 
 	async get(url, config) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "23.30.2",
+  "version": "23.30.5",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {
@@ -42,7 +42,7 @@
   "scripts": {
     "front": "webpack serve --open",
     "back": "cd ../salix && gulp backOnly",
-    "db": "cd ../vn-database && myvc run",
+    "db": "cd ../vn-database && myt run",
     "build": "rm -rf build/ ; webpack",
     "clean": "rm -rf build/"
   }

rest/core/query.php

@@ -1,6 +1,7 @@
 <?php
 
 use Vn\Lib;
+use Vn\Lib\Locale;
 use Vn\Web\Security;
 use Vn\Lib\Type;
 
@@ -37,12 +38,16 @@ class Query extends Vn\Web\JsonRequest {
 
 		if ($db->checkWarnings()
 		&& ($result = $db->query('SHOW WARNINGS'))) {
-			$sql = 'SELECT `description`, @warn `code` 
-				FROM `message` WHERE `code` = @warn';
+			$sql =
+				'SELECT IFNULL(i.`description`, m.`description`) `description`, @warn `code`
+					FROM `message` m
+						LEFT JOIN `messageI18n` i
+							ON i.`code` = m.`code` AND i.lang = #
+					WHERE m.`code` = @warn';
 
 			while ($row = $result->fetch_object()) {
 				if ($row->Code == 1265
-				&&($warning = $db->getObject($sql)))
+				&& ($warning = $db->getObject($sql, [Locale::get()])))
 					trigger_error("{$warning->code}: {$warning->description}", E_USER_WARNING);
 				else
 					trigger_error("{$row->Code}: {$row->Message}", E_USER_WARNING);

web/mailer.php

@@ -5,6 +5,7 @@ namespace Vn\Web;
 require_once 'libphp-phpmailer/autoload.php';
 
 use Vn\Lib\UserException;
+use PHPMailer\PHPMailer\PHPMailer;
 
 class Mailer {
 	private $conf;
@@ -19,7 +20,7 @@ class Mailer {
 	function createObject($mailTo, $body, $subject) {
 		$conf = $this->conf;
 
-		$mail = new \PHPMailer();
+		$mail = new PHPMailer();
 		$mail->isSMTP();
 		$mail->Host = $conf->host;
 

web/rest-service.php

@@ -54,8 +54,12 @@ class RestService extends Service {
 			if ($e->getCode() == 1644) {
 				$eMessage = $e->getMessage();
 				$tMessage = $db->getValue(
-					'SELECT `description` FROM `messageL10n` WHERE `code` = #',
-					[$eMessage]
+					'SELECT IFNULL(i.`description`, m.`description`) `description`
+						FROM `message` m
+							LEFT JOIN `messageI18n` i
+								ON i.`code` = m.`code` AND i.lang = #
+						WHERE m.`code` = #',
+					[Locale::get(), $eMessage]
 				);
 				if (!$tMessage) $tMessage = $eMessage;
 				throw new Lib\UserException($tMessage, $eMessage);