projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Items, Company Setup: additional check to ensure uploaded image compatibility with...
[fa-stable.git]
/
inventory
/
manage
/
items.php
diff --git
a/inventory/manage/items.php
b/inventory/manage/items.php
index e76f8b0849067c9ab58f3a24e2e84f5401de2b23..653d9e78bfad45213db18151cc2996897ac0607e 100644
(file)
--- a/
inventory/manage/items.php
+++ b/
inventory/manage/items.php
@@
-12,6
+12,7
@@
$page_security = 'SA_ITEM';
$path_to_root = "../..";
include($path_to_root . "/includes/session.inc");
$page_security = 'SA_ITEM';
$path_to_root = "../..";
include($path_to_root . "/includes/session.inc");
+include($path_to_root . "/reporting/includes/tcpdf.php");
$js = "";
if ($SysPrefs->use_popup_windows)
$js = "";
if ($SysPrefs->use_popup_windows)
@@
-87,7
+88,7
@@
if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
{
mkdir($filename);
}
{
mkdir($filename);
}
- $filename .= "/".item_img_name($stock_id).
".jpg"
;
+ $filename .= "/".item_img_name($stock_id).
(substr(trim($_FILES['pic']['name']), strrpos($_FILES['pic']['name'], '.')))
;
if ($_FILES['pic']['error'] == UPLOAD_ERR_INI_SIZE) {
display_error(_('The file size is over the maximum allowed.'));
if ($_FILES['pic']['error'] == UPLOAD_ERR_INI_SIZE) {
display_error(_('The file size is over the maximum allowed.'));
@@
-137,6
+138,11
@@
if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
if ($upload_file == 'Yes')
{
$result = move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
if ($upload_file == 'Yes')
{
$result = move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
+ if ($msg = check_image_file($filename)) {
+ display_error($msg);
+ unlink($filename);
+ $upload_file ='No';
+ }
}
$Ajax->activate('details');
/* EOF Add Image upload for New Item - by Ori */
}
$Ajax->activate('details');
/* EOF Add Image upload for New Item - by Ori */