From 74980fbdd75ad4a1efaf0731324c1a4c986b1d3b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 14 Apr 2023 10:39:59 +0200 Subject: [PATCH 1/6] refs #5553 Insert/Update image table before save --- debian/changelog | 2 +- package.json | 2 +- rest/image/upload.php | 63 ++++++++++++++++++++++--------------------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index 354d9990..25432462 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (23.6.9) stable; urgency=low +hedera-web (23.6.10) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index 5d777aef..b63f2d84 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "23.6.9", + "version": "23.6.10", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/rest/image/upload.php b/rest/image/upload.php index 8b998808..d3cbfef0 100644 --- a/rest/image/upload.php +++ b/rest/image/upload.php @@ -39,31 +39,31 @@ class Upload extends Vn\Web\JsonRequest { if ($_FILES['image']['error'] != 0) { switch ($_FILES['image']['error']) { - case UPLOAD_ERR_INI_SIZE: - $message = 'ErrIniSize'; - break; - case UPLOAD_ERR_FORM_SIZE: - $message = 'ErrFormSize'; - break; - case UPLOAD_ERR_PARTIAL: - $message = 'ErrPartial'; - break; - case UPLOAD_ERR_NO_FILE: - $message = 'ErrNoFile'; - break; - case UPLOAD_ERR_NO_TMP_DIR: - $message = 'ErrNoTmpDir'; - break; - case UPLOAD_ERR_CANT_WRITE: - $message = 'ErrCantWrite'; - break; - case UPLOAD_ERR_EXTENSION: - $message = 'ErrExtension'; - break; - default: - $message = 'ErrDefault'; - break; - } + case UPLOAD_ERR_INI_SIZE: + $message = 'ErrIniSize'; + break; + case UPLOAD_ERR_FORM_SIZE: + $message = 'ErrFormSize'; + break; + case UPLOAD_ERR_PARTIAL: + $message = 'ErrPartial'; + break; + case UPLOAD_ERR_NO_FILE: + $message = 'ErrNoFile'; + break; + case UPLOAD_ERR_NO_TMP_DIR: + $message = 'ErrNoTmpDir'; + break; + case UPLOAD_ERR_CANT_WRITE: + $message = 'ErrCantWrite'; + break; + case UPLOAD_ERR_EXTENSION: + $message = 'ErrExtension'; + break; + default: + $message = 'ErrDefault'; + break; + } throw new Lib\Exception(s($message)); } @@ -101,12 +101,6 @@ class Upload extends Vn\Web\JsonRequest { $symbolicSrc = "../full/$fileName"; $image = Image::create($tmpName); - Image::resizeSave($image, $fullFile, $info['maxHeight'], $info['maxWidth']); - - foreach ($info['sizes'] as $size => $i) { - $dstFile = "$collectionPath/$size/$fileName"; - Image::resizeSave($image, $dstFile, $i['height'], $i['width'], $i['crop'], $symbolicSrc); - } $query = "INSERT INTO `image` @@ -121,6 +115,13 @@ class Upload extends Vn\Web\JsonRequest { 'name' => $name ]); + Image::resizeSave($image, $fullFile, $info['maxHeight'], $info['maxWidth']); + + foreach ($info['sizes'] as $size => $i) { + $dstFile = "$collectionPath/$size/$fileName"; + Image::resizeSave($image, $dstFile, $i['height'], $i['width'], $i['crop'], $symbolicSrc); + } + imagedestroy($image); unlink($tmpName); return TRUE; From 9eba09ddf796b1220d23fb64895a3cd93c95db1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Thu, 15 Jun 2023 10:04:58 +0200 Subject: [PATCH 2/6] =?UTF-8?q?hotfix=20Ticket=20#097414=20traducci=C3=B3n?= =?UTF-8?q?=20mensajes=20de=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rest/core/query.php | 2 +- web/rest-service.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rest/core/query.php b/rest/core/query.php index 4d398e93..93f240a3 100644 --- a/rest/core/query.php +++ b/rest/core/query.php @@ -38,7 +38,7 @@ class Query extends Vn\Web\JsonRequest { if ($db->checkWarnings() &&($result = $db->query('SHOW WARNINGS'))) { $sql = 'SELECT `description`, @warn `code` - FROM `message` WHERE `code` = @warn'; + FROM `messageL10n` WHERE `code` = @warn'; while ($row = $result->fetch_object()) { if ($row->Code == 1265 diff --git a/web/rest-service.php b/web/rest-service.php index dac5ca9e..ded4fd94 100644 --- a/web/rest-service.php +++ b/web/rest-service.php @@ -54,7 +54,7 @@ class RestService extends Service { if ($e->getCode() == 1644) { $eMessage = $e->getMessage(); $tMessage = $db->getValue( - 'SELECT `description` FROM `message` WHERE `code` = #', + 'SELECT `description` FROM `messageL10n` WHERE `code` = #', [$eMessage] ); if (!$tMessage) $tMessage = $eMessage; From 2610448e79c58d5b2eceeaa9935d68b43cb0ec27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Thu, 15 Jun 2023 10:06:28 +0200 Subject: [PATCH 3/6] =?UTF-8?q?hotfix=20Ticket=20#097414=20traducci=C3=B3n?= =?UTF-8?q?=20mensajes=20de=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rest/core/query.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest/core/query.php b/rest/core/query.php index 93f240a3..4d398e93 100644 --- a/rest/core/query.php +++ b/rest/core/query.php @@ -38,7 +38,7 @@ class Query extends Vn\Web\JsonRequest { if ($db->checkWarnings() &&($result = $db->query('SHOW WARNINGS'))) { $sql = 'SELECT `description`, @warn `code` - FROM `messageL10n` WHERE `code` = @warn'; + FROM `message` WHERE `code` = @warn'; while ($row = $result->fetch_object()) { if ($row->Code == 1265 From 56395aa91bcdc8521b47cbf6ac601890216adcaf Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 15 Jun 2023 13:14:01 +0200 Subject: [PATCH 4/6] refs #5489 Account.sync(): bcryptPassword not used, removed --- rest/user/account.php | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 rest/user/account.php diff --git a/rest/user/account.php b/rest/user/account.php deleted file mode 100644 index dc39a4b1..00000000 --- a/rest/user/account.php +++ /dev/null @@ -1,40 +0,0 @@ -getValue( - 'SELECT COUNT(*) > 0 FROM account.userSync WHERE name = #', - [$userName] - ); - - if ($sync) - self::sync($db, $userName, $password); - } - - static function sync($db, $userName, $password = NULL) { - $bcryptPassword = password_hash($password, PASSWORD_BCRYPT); - - $userId = $db->getValue( - 'SELECT id FROM account.user WHERE `name` = #', - [$userName] - ); - $db->query( - 'UPDATE account.user SET - bcryptPassword = # - WHERE id = #', - [$bcryptPassword, $userId] - ); - - $hasAccount = $db->getValue( - 'SELECT COUNT(*) > 0 - FROM account.user u - JOIN account.account a ON u.id = a.id - WHERE u.name = #', - [$userName] - ); - if (!$hasAccount) - $db->query('DELETE FROM account.userSync WHERE name = #', - [$userName] - ); - } -} From fd32b3f15ab58f9d09db2abc585553358cbb478d Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Fri, 16 Jun 2023 08:28:05 +0200 Subject: [PATCH 5/6] refs #5489 Version increased --- debian/changelog | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25432462..1abe4b1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (23.6.10) stable; urgency=low +hedera-web (23.6.11) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index b63f2d84..a0e961bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "23.6.10", + "version": "23.6.11", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { From 5b84671d5714187acf980952076d608b9ea7bbb8 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 20 Jun 2023 16:08:13 +0200 Subject: [PATCH 6/6] hotfix #097414 Version increased --- debian/changelog | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1abe4b1d..b4789706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (23.6.11) stable; urgency=low +hedera-web (23.6.12) stable; urgency=low * Initial Release. diff --git a/package.json b/package.json index a0e961bb..7a29096c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "23.6.11", + "version": "23.6.12", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": {