Yoshihisa Fukuhara
higef****@users*****
2005年 8月 25日 (木) 13:02:24 JST
Index: affelio/apps/album/Album.pm
diff -u affelio/apps/album/Album.pm:1.17 affelio/apps/album/Album.pm:1.18
--- affelio/apps/album/Album.pm:1.17 Thu Aug 25 00:31:44 2005
+++ affelio/apps/album/Album.pm Thu Aug 25 13:02:24 2005
@@ -21,7 +21,6 @@
use Jcode;
use HTML::Template;
use Config::Tiny;
-#use File::Basename;
use Album::L10N;
##############################################
@@ -387,6 +386,8 @@
sub validate {
my ($self, $str) = @_;
+ $str =~ s/[\t\a]//g;
+ $str =~ s/&/&/g;
$str =~ s/'/"/g;
$str =~ s/"/"/g;
$str =~ s/</</g;
Index: affelio/apps/album/album.cgi
diff -u affelio/apps/album/album.cgi:1.2 affelio/apps/album/album.cgi:1.3
--- affelio/apps/album/album.cgi:1.2 Thu Aug 25 11:16:38 2005
+++ affelio/apps/album/album.cgi Thu Aug 25 13:02:24 2005
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#use strict;
+use strict;
use lib("../../extlib");
use lib("../../lib");
use HTML::Template;
@@ -92,8 +92,8 @@
my @image_files;
my @image_row;
my @image_filelist=$album->getAllImage($id);
- $i=0;
- $max=$#image_filelist;
+ my $i=0;
+ my $max=$#image_filelist;
foreach(@image_filelist){
if ($_->{pkey} eq $pkey){
if ($i>0){
@@ -303,7 +303,11 @@
if ($#image_filelist>=0){
$tmpl->param(HAS_IMAGE => 1);
for (my $i=0; $i<($#image_filelist+1)%$col_num; $i++){
- push @image_filelist, "";
+ push @image_filelist,
+ {
+ image => "",
+ pkey => "",
+ }
}
for (my $i=0; $i<($#image_filelist+1)/$col_num; $i++){
Index: affelio/apps/album/index.cgi
diff -u affelio/apps/album/index.cgi:1.1 affelio/apps/album/index.cgi:1.2
--- affelio/apps/album/index.cgi:1.1 Thu Aug 25 00:31:44 2005
+++ affelio/apps/album/index.cgi Thu Aug 25 13:02:24 2005
@@ -21,9 +21,7 @@
use HTML::Template;
use CGI;
use Cwd;
-#use File::Basename;
use AffelioApp;
-#
use Album;
Index: affelio/apps/album/owner.cgi
diff -u affelio/apps/album/owner.cgi:1.1 affelio/apps/album/owner.cgi:1.2
--- affelio/apps/album/owner.cgi:1.1 Thu Aug 25 00:31:44 2005
+++ affelio/apps/album/owner.cgi Thu Aug 25 13:02:24 2005
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#use strict;
+use strict;
use lib("../../extlib");
use lib("../../lib");
use HTML::Template;
@@ -137,7 +137,11 @@
if ($#image_filelist>=0){
$tmpl->param(HAS_IMAGE => 1);
for (my $i=0; $i<($#image_filelist+1)%$col_num; $i++){
- push @image_filelist, "";
+ push @image_filelist,
+ {
+ image => "",
+ pkey => "",
+ }
}
for (my $i=0; $i<($#image_filelist+1)/$col_num; $i++){
@@ -167,7 +171,7 @@
push @comments_param,
{
UNAME => $_->{user},
- COMMENT_TIME => "$mona??$mdaya?\$hour:$min",
+ COMMENT_TIME => "$mon/$mday/$hour:$min",
COMMENT => $_->{comment},
PKEY=> $_->{pkey}
};