Tatsuki SUGIURA
sugi****@users*****
2006年 7月 12日 (水) 21:24:23 JST
Index: slashjp/themes/slashcode/htdocs/comments.pl diff -u slashjp/themes/slashcode/htdocs/comments.pl:1.7 slashjp/themes/slashcode/htdocs/comments.pl:1.8 --- slashjp/themes/slashcode/htdocs/comments.pl:1.7 Wed Jul 12 20:42:08 2006 +++ slashjp/themes/slashcode/htdocs/comments.pl Wed Jul 12 21:24:23 2006 @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: comments.pl,v 1.7 2006/07/12 11:42:08 sugi Exp $ +# $Id: comments.pl,v 1.8 2006/07/12 12:24:23 sugi Exp $ use strict; use Slash 2.003; # require Slash 2.3.x @@ -990,6 +990,20 @@ $form->{posttype} || PLAINTEXT ); + if ($constants->{anonymous_comment_interval} && ($user->{is_anon} || $form->{postanon})) { + my $ipid = getCurrentUser('ipid'); + my $ipid_count = $slashdb->sqlSelect('count(*)', 'comments', + "sid='$form->{sid}' + AND uid=1 + AND date > SUBDATE(NOW(), INTERVAL $constants->{anonymous_comment_interval} MINUTE) + AND ipid='$ipid'"); + if ($ipid_count > 0) { + header('Comments', $discussion->{section}) or return; + editComment(@_, getError('anonymous_comment_interval')); + return 0; + } + } + unless (validateComment( \$tempComment, \$tempSubject, $error_message, 1, ($form->{posttype} == CODE Index: slashjp/themes/slashcode/htdocs/index.pl diff -u slashjp/themes/slashcode/htdocs/index.pl:1.8 slashjp/themes/slashcode/htdocs/index.pl:1.9 --- slashjp/themes/slashcode/htdocs/index.pl:1.8 Wed Jul 12 20:42:08 2006 +++ slashjp/themes/slashcode/htdocs/index.pl Wed Jul 12 21:24:23 2006 @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: index.pl,v 1.8 2006/07/12 11:42:08 sugi Exp $ +# $Id: index.pl,v 1.9 2006/07/12 12:24:23 sugi Exp $ use strict; use Slash; @@ -801,6 +801,10 @@ $return .= getData("briefarticles_end") if $dispmodelast eq "brief"; + if ($constants->{ad_enable_google_adsense_on_index}) { + $return .= slashDisplay('google_adsense', {}, { Return => 1 }); + } + unless ($constants->{index_no_prev_next_day}) { my($today, $tomorrow, $yesterday, $week_ago) = getOlderDays($form->{issue}); $return .= slashDisplay('next_prev_issue', { Index: slashjp/themes/slashcode/htdocs/topics.pl diff -u slashjp/themes/slashcode/htdocs/topics.pl:1.5 slashjp/themes/slashcode/htdocs/topics.pl:1.6 --- slashjp/themes/slashcode/htdocs/topics.pl:1.5 Wed Jul 12 20:42:08 2006 +++ slashjp/themes/slashcode/htdocs/topics.pl Wed Jul 12 21:24:23 2006 @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: topics.pl,v 1.5 2006/07/12 11:42:08 sugi Exp $ +# $Id: topics.pl,v 1.6 2006/07/12 12:24:23 sugi Exp $ use strict; use Slash; @@ -68,7 +68,7 @@ } slashDisplay('listTopics', { - title => 'Current Topic Categories', + title => getData('current_topics'), width => '90%', topic_admin => getCurrentUser('seclev') >= 500, topics => [ values %$topics ], Index: slashjp/themes/slashcode/htdocs/users.pl diff -u slashjp/themes/slashcode/htdocs/users.pl:1.9 slashjp/themes/slashcode/htdocs/users.pl:1.10 --- slashjp/themes/slashcode/htdocs/users.pl:1.9 Wed Jul 12 20:42:08 2006 +++ slashjp/themes/slashcode/htdocs/users.pl Wed Jul 12 21:24:23 2006 @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: users.pl,v 1.9 2006/07/12 11:42:08 sugi Exp $ +# $Id: users.pl,v 1.10 2006/07/12 12:24:23 sugi Exp $ use strict; use Digest::MD5 'md5_hex'; @@ -2085,9 +2085,9 @@ } my @reasons = ( ); - my $reasons = $slashdb->getReasons(); - for my $id (sort { $a <=> $b } keys %$reasons) { - push @reasons, $reasons->{$id}{name}; + my $reasons_raw = $slashdb->getReasons(); + for my $id (sort { $a <=> $b } keys %$reasons_raw) { + push @reasons, $reasons_raw->{$id}{name}; } my %reason_select; @@ -2203,7 +2203,9 @@ highlightthresh_select => $highlightthresh_select, uthreshold_select => $uthreshold_select, posttype_select => $posttype_select, + range => \@range, reasons => \@reasons, + reasons_raw => $reasons_raw, reason_select => \%reason_select, people => \@people, people_select => \%people_select,
SRAD