projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Relaxed sql_mode set on database initialization to provide backward compatibility...
[fa-stable.git]
/
admin
/
attachments.php
diff --git
a/admin/attachments.php
b/admin/attachments.php
index bd567bf23684dfee55970b98789a274138135d92..e92276ed87fd2934596504ff9147e178394a4542 100644
(file)
--- a/
admin/attachments.php
+++ b/
admin/attachments.php
@@
-36,10
+36,7
@@
if ($view_id != -1)
$type = ($row['filetype']) ? $row['filetype'] : 'application/octet-stream';
header("Content-type: ".$type);
header('Content-Length: '.$row['filesize']);
$type = ($row['filetype']) ? $row['filetype'] : 'application/octet-stream';
header("Content-type: ".$type);
header('Content-Length: '.$row['filesize']);
- //if ($type == 'application/octet-stream')
- // header('Content-Disposition: attachment; filename='.$row['filename']);
- //else
- header("Content-Disposition: inline");
+ header("Content-Disposition: inline");
echo file_get_contents(company_path(). "/attachments/".$row['unique_name']);
exit();
}
echo file_get_contents(company_path(). "/attachments/".$row['unique_name']);
exit();
}
@@
-87,11
+84,11
@@
if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
elseif ($Mode == 'ADD_ITEM' && !isset($_FILES['filename']))
display_error(_("Select attachment file."));
elseif ($Mode == 'ADD_ITEM' && ($_FILES['filename']['error'] > 0)) {
elseif ($Mode == 'ADD_ITEM' && !isset($_FILES['filename']))
display_error(_("Select attachment file."));
elseif ($Mode == 'ADD_ITEM' && ($_FILES['filename']['error'] > 0)) {
- if ($_FILES['filename']['error'] == UPLOAD_ERR_INI_SIZE)
- display_error(_("The file size is over the maximum allowed."));
- else
- display_error(_("Select attachment file."));
- }
+
if ($_FILES['filename']['error'] == UPLOAD_ERR_INI_SIZE)
+
display_error(_("The file size is over the maximum allowed."));
+
else
+
display_error(_("Select attachment file."));
+
}
else {
//$content = base64_encode(file_get_contents($_FILES['filename']['tmp_name']));
$tmpname = $_FILES['filename']['tmp_name'];
else {
//$content = base64_encode(file_get_contents($_FILES['filename']['tmp_name']));
$tmpname = $_FILES['filename']['tmp_name'];
@@
-122,7
+119,7
@@
if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
unlink($dir."/".$unique_name);
}
else
unlink($dir."/".$unique_name);
}
else
- $unique_name =
uniqid(''
);
+ $unique_name =
random_id(
);
//save the file
move_uploaded_file($tmpname, $dir."/".$unique_name);
//save the file
move_uploaded_file($tmpname, $dir."/".$unique_name);
@@
-172,7
+169,7
@@
function viewing_controls()
start_row();
systypes_list_cells(_("Type:"), 'filterType', null, true);
if (list_updated('filterType'))
start_row();
systypes_list_cells(_("Type:"), 'filterType', null, true);
if (list_updated('filterType'))
- $selected_id = -1;
;
+ $selected_id = -1;
end_row();
end_table(1);
end_row();
end_table(1);