Index: snuploader/upload.cgi =================================================================== --- snuploader/upload.cgi (revision 353186b91ae8246238f2188b6bd50fb37e00a23e) +++ snuploader/upload.cgi (revision 25b41dcbde13fad8d78e5810c258aed610ece5a0) @@ -169,4 +169,5 @@ if($upflag || $valueflag){ unlink("$set{'src_dir'}$random.temporary"); &error(108);} + $in{'postname'} = $FORM{'postname'}; $in{'org_pass'} = $in{'pass'} = $FORM{'pass'}; $in{'dlkey'} = $FORM{'dlkey'}; @@ -214,5 +215,5 @@ } - my @form = ($in{'comment'},$in{'orgname'},$in{'type'},$in{'dlkey'}); + my @form = ($in{'postname'},$in{'comment'},$in{'orgname'},$in{'type'},$in{'dlkey'}); foreach my $value (@form) { if (length($value) > 128) { $value = substr($value,0,128).'...'; } @@ -226,5 +227,5 @@ $value =~ s/\0//g; } - ($in{'comment'},$in{'orgname'},$in{'type'},$in{'dlkey'}) = @form; + ($in{'postname'},$in{'comment'},$in{'orgname'},$in{'type'},$in{'dlkey'}) = @form; } @@ -323,5 +324,5 @@ my @new; $new[0] = "$no<>$in{'addr'}<>$in{'time'}<>1\n"; - my $addlog = "$no<>$in{'ext'}<>$in{'date'}<>$in{'comment'}<>$in{'type'}<>$orgname<>$in{'addr'}<>$in{'host'}<>$in{'pass'},$userid<>$set{'file_pre'}<>$note<>1\n"; + my $addlog = "$no<>$in{'postname'}<>$in{'ext'}<>$in{'date'}<>$in{'comment'}<>$in{'type'}<>$orgname<>$in{'addr'}<>$in{'host'}<>$in{'pass'},$userid<>$set{'file_pre'}<>$note<>1\n"; $new[1] = $addlog; @@ -331,5 +332,5 @@ foreach my $value (@log){ - my ($no,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$filepre,$note,$dummy) = split(/<>/,$value); + my ($no,$postname,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$filepre,$note,$dummy) = split(/<>/,$value); if(!$dummy){ $filepre = $set{'file_pre'};} $no = sprintf("%04d",$no); @@ -380,5 +381,5 @@ if($log == 1){ $log++; $init++;} my $lastpage = int(($log - 2)/$set{'pagelog'}) + 1; - $postval = ' obj.postkey.value = unescape(p[1]);' if($set{'post_flag'}); + $postval = ' obj.postkey.value = unescape(p[2]);' if($set{'post_flag'}); my $header =<<"EOM"; $set{'html_head'} @@ -386,8 +387,8 @@ Sn Uploader\n\n"; - my $info_title = "\n"; + my $info_title = "
NAME
\n"; if($set{'disp_comment'}){ $info_title .= ""; } if($set{'disp_size'}){ $info_title .= ""; } if($set{'disp_date'}){ $info_title .= ""; } if($set{'disp_mime'}){ $info_title .= ""; } if($set{'disp_orgname'}){ $info_title .= ""; } @@ -446,5 +447,5 @@ my $buff; my $no = 1; my $time = time; my $subheader; foreach my $value (@log){ - my ($no,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$dummy) = split(/<>/,$value); + my ($no,$postname,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$dummy) = split(/<>/,$value); if(!$dummy){ next; } $buff .= makeitem($value); @@ -513,5 +514,5 @@ my $findflag = 0; foreach my $value (@log){ - my ($no,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$filepre,$note,$dummy) = split(/<>/,$value); + my ($no,$postname,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$filepre,$note,$dummy) = split(/<>/,$value); $delnote = $note; my $delflag = 0; @@ -583,5 +584,5 @@ setCookie(); function setCookie() { - var key1,key2; + var key0,key1,key2; var tmp = "path=/; expires=Tue, 31-Dec-2030 23:59:59; "; EOM @@ -590,7 +591,7 @@ my @ck = split(/<>/,$ck{'SN_DEL'}); if(!$ck[0] && $in{'org_pass'}){ $buff .= qq|\tdocument.cookie = "SN_DEL="+escape('$in{'org_pass'}')+"<>;"+ tmp;\n|;} - $cookiename = 'SN_UPLOAD'; $buff .= "\tkey1 = escape('$in{'org_pass'}'); key2 = escape('$in{'postkey'}');\n";} - else{ $cookiename = 'SN_DEL'; $buff .= "\tkey1 = escape('$in{'delpass'}'); key2 = '';\n"; } - $buff .= qq|\tdocument.cookie = "$cookiename="+key1+"<>"+key2+"; "+ tmp;\n}\n//-->\n\n|; + $cookiename = 'SN_UPLOAD'; $buff .= "\tkey0 = escape('$in{'postname'}'); key1 = escape('$in{'org_pass'}'); key2 = escape('$in{'postkey'}');\n";} + else{ $cookiename = 'SN_DEL'; $buff .= "\tkey0 = ''; key1 = escape('$in{'delpass'}'); key2 = '';\n"; } + $buff .= qq|\tdocument.cookie = "$cookiename="+key0+"<>"+key1+"<>"+key2+"; "+ tmp;\n}\n//-->\n\n|; } $buff .=<<"EOM"; @@ -621,5 +622,5 @@ $buff .= leaddisp(0,1,1).'
NAMEFILECOMMENTSIZEDATEMIMEORIG
Upload Info
'; - $buff .= qq|
\n

\n|."\n\n"; + $buff .= qq|
DELNAMECOMMENTSIZEADDRHOSTDATENOTEMIMEORIG
\n

\n|."\n\n"; shift(@log); foreach (@log){ $buff .= makeitem($_,'admin'); } @@ -730,5 +731,5 @@ sub makeitem{ my ($src,$mode) = @_; my ($buff,$check,$target); - my ($no,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$filepre,$note,$dummy) = split(/<>/,$src); + my ($no,$postname,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$filepre,$note,$dummy) = split(/<>/,$src); if(!$dummy){ $filepre = $set{'file_pre'}; } my $orgno = $no; @@ -750,12 +751,12 @@ if($addr eq $host){ undef $host; } if($in{'checkmode'} eq 'allcheck'){$check = ' checked';} - $buff = "\n"; + $buff = "\n"; }else{ my($d_com,$d_date,$d_size,$d_mime,$d_org); if($set{'disp_comment'}){ $d_com = ""; } if($set{'disp_size'}){ $d_size = ""; } if($set{'disp_date'}){ $d_date= ""; } if($set{'disp_mime'}){ $d_mime = ""; } if($set{'disp_orgname'}){ $d_org = ""; } - if(-e "$set{'src_dir'}$filepre$no.$ext.html"){$buff = "$d_com$d_size$d_date$d_mime$d_org\n";} - elsif($dlpath){$buff = "$d_com$d_size$d_date$d_mime$d_org\n";} - else{ $buff = "$d_com$d_size$d_date$d_mime$d_org\n";} + if(-e "$set{'src_dir'}$filepre$no.$ext.html"){$buff = "$d_com$d_size$d_date$d_mime$d_org\n";} + elsif($dlpath){$buff = "$d_com$d_size$d_date$d_mime$d_org\n";} + else{ $buff = "$d_com$d_size$d_date$d_mime$d_org\n";} } return $buff; @@ -993,5 +994,5 @@ foreach my $value (@log){ - my ($no,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$filepre,$note,$dummy) = split(/<>/,$value); + my ($no,$postname,$ext,$date,$comment,$mime,$orgname,$addr,$host,$pass,$filepre,$note,$dummy) = split(/<>/,$value); my @note = split(/,/,$note); if(int($dlno) == $no){
DELNAMEFILECOMMENTSIZEADDRHOSTDATENOTEMIMEORIG
$filepre$no.$ext$comment$size$addr$host$date$note$mime$orgname
$postname$filepre$no.$ext$comment$size$addr$host$date$note$mime$orgname
$comment$size$date$mime$orgname
$filepre$no.$ext
$filepre$no.$ext
$filepre$no.$ext
$postname$filepre$no.$ext
$postname$filepre$no.$ext
$postname$filepre$no.$ext