refs #5553 Insert/Update image table before save
gitea/hedera-web/pipeline/head This commit looks good
Details
gitea/hedera-web/pipeline/head This commit looks good
Details
This commit is contained in:
parent
42f682739e
commit
74980fbdd7
|
@ -1,4 +1,4 @@
|
||||||
hedera-web (23.6.9) stable; urgency=low
|
hedera-web (23.6.10) stable; urgency=low
|
||||||
|
|
||||||
* Initial Release.
|
* Initial Release.
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "hedera-web",
|
"name": "hedera-web",
|
||||||
"version": "23.6.9",
|
"version": "23.6.10",
|
||||||
"description": "Verdnatura web page",
|
"description": "Verdnatura web page",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue