wbuezas
/
hedera-web-mindshore
forked from verdnatura/hedera-web
0
1
Fork 0
Code Pull Requests Activity

Merge branch 'master' into test

This commit is contained in:
Juan Ferrer 2023-06-20 17:18:54 +02:00
parent bbeb70eb6b 2905a6ab57
commit 572d4b7b83
5 changed files with 35 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

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

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "hedera-web", "name": "hedera-web",
"version": "23.6.13", "version": "23.6.14",
"description": "Verdnatura web page", "description": "Verdnatura web page",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {

63
rest/image/upload.php
View File

@ -39,31 +39,31 @@ class Upload extends Vn\Web\JsonRequest {
if ($_FILES['image']['error'] != 0) { if ($_FILES['image']['error'] != 0) {
switch ($_FILES['image']['error']) { switch ($_FILES['image']['error']) {
case UPLOAD_ERR_INI_SIZE: case UPLOAD_ERR_INI_SIZE:
$message = 'ErrIniSize'; $message = 'ErrIniSize';
break; break;
case UPLOAD_ERR_FORM_SIZE: case UPLOAD_ERR_FORM_SIZE:
$message = 'ErrFormSize'; $message = 'ErrFormSize';
break; break;
case UPLOAD_ERR_PARTIAL: case UPLOAD_ERR_PARTIAL:
$message = 'ErrPartial'; $message = 'ErrPartial';
break; break;
case UPLOAD_ERR_NO_FILE: case UPLOAD_ERR_NO_FILE:
$message = 'ErrNoFile'; $message = 'ErrNoFile';
break; break;
case UPLOAD_ERR_NO_TMP_DIR: case UPLOAD_ERR_NO_TMP_DIR:
$message = 'ErrNoTmpDir'; $message = 'ErrNoTmpDir';
break; break;
case UPLOAD_ERR_CANT_WRITE: case UPLOAD_ERR_CANT_WRITE:
$message = 'ErrCantWrite'; $message = 'ErrCantWrite';
break; break;
case UPLOAD_ERR_EXTENSION: case UPLOAD_ERR_EXTENSION:
$message = 'ErrExtension'; $message = 'ErrExtension';
break; break;
default: default:
$message = 'ErrDefault'; $message = 'ErrDefault';
break; break;
} }
throw new Lib\Exception(s($message)); throw new Lib\Exception(s($message));
} }
@ -101,12 +101,6 @@ class Upload extends Vn\Web\JsonRequest {
$symbolicSrc = "../full/$fileName"; $symbolicSrc = "../full/$fileName";
$image = Image::create($tmpName); $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 = $query =
"INSERT INTO `image` "INSERT INTO `image`
@ -121,6 +115,13 @@ class Upload extends Vn\Web\JsonRequest {
'name' => $name '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); imagedestroy($image);
unlink($tmpName); unlink($tmpName);
return TRUE; return TRUE;

40
rest/user/account.php
View File

@ -1,40 +0,0 @@
<?php
class Account {
static function trySync($db, $userName, $password = NULL) {
$sync = $db->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]
);
}
}

2
web/rest-service.php
View File

@ -54,7 +54,7 @@ class RestService extends Service {
if ($e->getCode() == 1644) { if ($e->getCode() == 1644) {
$eMessage = $e->getMessage(); $eMessage = $e->getMessage();
$tMessage = $db->getValue( $tMessage = $db->getValue(
'SELECT `description` FROM `message` WHERE `code` = #', 'SELECT `description` FROM `messageL10n` WHERE `code` = #',
[$eMessage] [$eMessage]
); );
if (!$tMessage) $tMessage = $eMessage; if (!$tMessage) $tMessage = $eMessage;