refs #5863 Fixes: Mailer, logout & run db

debian/changelog

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

js/vn/json-connection.js

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

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;