projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor refactor and better safeguards on term discounts, #15068
[freeside.git]
/
httemplate
/
edit
/
process
/
cust_main_attach.cgi
diff --git
a/httemplate/edit/process/cust_main_attach.cgi
b/httemplate/edit/process/cust_main_attach.cgi
index
98f4d09
..
09c18ad
100644
(file)
--- a/
httemplate/edit/process/cust_main_attach.cgi
+++ b/
httemplate/edit/process/cust_main_attach.cgi
@@
-24,9
+24,11
@@
$cgi->param('attachnum') =~ /^(\d*)$/
or die "Illegal attachnum: ". $cgi->param('attachnum');
my $attachnum = $1;
or die "Illegal attachnum: ". $cgi->param('attachnum');
my $attachnum = $1;
+my $filename = $cgi->param('file');
+# strip directory names; thanks, IE7
+$filename =~ s!.*[\/\\]!!;
+
my $curuser = $FS::CurrentUser::CurrentUser;
my $curuser = $FS::CurrentUser::CurrentUser;
-my $otaker = $curuser->name;
-$otaker = $curuser->username if ($otaker eq "User, Legacy");
my $delete = $cgi->param('delete');
my $undelete = $cgi->param('undelete');
my $delete = $cgi->param('delete');
my $undelete = $cgi->param('undelete');
@@
-36,7
+38,7
@@
my $new = new FS::cust_attachment ( {
attachnum => $attachnum,
custnum => $custnum,
_date => time,
attachnum => $attachnum,
custnum => $custnum,
_date => time,
-
otaker => $otaker
,
+
usernum => $curuser->usernum
,
disabled => '',
});
my $old;
disabled => '',
});
my $old;
@@
-51,8
+53,9
@@
if($attachnum) {
else {
map { $new->$_($old->$_) }
('_date', 'otaker', 'body', 'disabled');
else {
map { $new->$_($old->$_) }
('_date', 'otaker', 'body', 'disabled');
- $new->filename($
cgi->param('filename')
|| $old->filename);
+ $new->filename($
filename
|| $old->filename);
$new->mime_type($cgi->param('mime_type') || $old->mime_type);
$new->mime_type($cgi->param('mime_type') || $old->mime_type);
+ $new->title($cgi->param('title'));
if($delete and not $old->disabled) {
$new->disabled(time);
}
if($delete and not $old->disabled) {
$new->disabled(time);
}
@@
-63,10
+66,11
@@
if($attachnum) {
}
else { # This is a new attachment, so require a file.
}
else { # This is a new attachment, so require a file.
- my $filename = $cgi->param('file');
if($filename) {
$new->filename($filename);
if($filename) {
$new->filename($filename);
- $new->mime_type($cgi->uploadInfo($filename)->{'Content-Type'});
+ # use the original filename here, not the stripped form
+ $new->mime_type($cgi->uploadInfo($cgi->param('file'))->{'Content-Type'});
+ $new->title($cgi->param('title'));
local $/;
my $fh = $cgi->upload('file');
local $/;
my $fh = $cgi->upload('file');