Yoshihisa Fukuhara
higef****@users*****
2006年 3月 8日 (水) 02:15:21 JST
Index: affelio/apps/diary/Diary/UploadImage.pm
diff -u affelio/apps/diary/Diary/UploadImage.pm:1.2 affelio/apps/diary/Diary/UploadImage.pm:1.3
--- affelio/apps/diary/Diary/UploadImage.pm:1.2 Fri Mar 3 11:50:36 2006
+++ affelio/apps/diary/Diary/UploadImage.pm Wed Mar 8 02:15:20 2006
@@ -96,15 +96,12 @@
mkdir $tmp_imgdir;
}
-
- my $basedir = $tmp_imgdir;
-
- my $thumbdir = $basedir."thumb/";
+ my $thumbdir = $tmp_imgdir."thumb/";
unless (-d $thumbdir) {
mkdir $thumbdir;
}
- my $distfile = $basedir.$basename;
+ my $distfile = $tmp_imgdir.$basename;
my $thumbfile = $thumbdir.$basename;
# Save file
local (*OUT);
Index: affelio/apps/diary/Diary/WriteDiary.pm
diff -u affelio/apps/diary/Diary/WriteDiary.pm:1.9 affelio/apps/diary/Diary/WriteDiary.pm:1.10
--- affelio/apps/diary/Diary/WriteDiary.pm:1.9 Wed Mar 8 00:14:41 2006
+++ affelio/apps/diary/Diary/WriteDiary.pm Wed Mar 8 02:15:21 2006
@@ -277,8 +277,17 @@
$id = $diary->getColumn("SELECT MAX(id) FROM $diary->{entry_table}") unless ($id);
my $imgdir = "$diary->{datadir}img/$id/";
+ my $thumbdir = "$diary->{datadir}img/$id/thumb/";
+ local (*DIR);
+ if (-d $thumbdir) {
+ opendir(DIR, $thumbdir);
+ while (my $file = readdir(DIR)) {
+ unlink ($thumbdir.$file) if (-f $thumbdir.$file);
+ }
+ closedir(DIR);
+ rmdir $thumbdir;
+ }
if (-d $imgdir) {
- local (*DIR);
opendir(DIR, $imgdir);
while (my $file = readdir(DIR)) {
unlink ($imgdir.$file) if (-f $imgdir.$file);