From sugi ¡÷ users.sourceforge.jp  Tue Feb  7 04:05:18 2006
From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA)
Date: Tue,  7 Feb 2006 04:05:18 +0900
Subject: [Slashdotjp-dev 317] CVS update: slashjp/Slash/DB/MySQL
Message-ID: <20060206190518.5CB522AC01B@users.sourceforge.jp>

Index: slashjp/Slash/DB/MySQL/MySQL.pm
diff -u slashjp/Slash/DB/MySQL/MySQL.pm:1.7 slashjp/Slash/DB/MySQL/MySQL.pm:1.8
--- slashjp/Slash/DB/MySQL/MySQL.pm:1.7	Sun Jan  9 00:15:37 2005
+++ slashjp/Slash/DB/MySQL/MySQL.pm	Tue Feb  7 04:05:18 2006
@@ -1,7 +1,7 @@
 # This code is a part of Slash, and is released under the GPL.
 # Copyright 1997-2004 by Open Source Development Network. See README
 # and COPYING for more information, or see http://slashcode.com/.
-# $Id: MySQL.pm,v 1.7 2005/01/08 15:15:37 oliver Exp $
+# $Id: MySQL.pm,v 1.8 2006/02/06 19:05:18 sugi Exp $
 
 package Slash::DB::MySQL;
 use strict;
@@ -20,7 +20,7 @@
 use base 'Slash::DB::Utility';
 use Slash::Constants ':messages';
 
-($VERSION) = ' $Revision: 1.7 $ ' =~ /\$Revision:\s+([^\s]+)/;
+($VERSION) = ' $Revision: 1.8 $ ' =~ /\$Revision:\s+([^\s]+)/;
 
 # Fry: How can I live my life if I can't tell good from evil?
 
@@ -308,7 +308,7 @@
 # Perl has lost the flag somewhere
 sub sqlDo{
 	my($self, $sql) = @_;
-	$sql = decode_utf8( $sql ) unless $sql =~ /accesslog_admin|people/;
+	$sql = decode_utf8( $sql ); # unless $sql =~ /accesslog_admin|people/;
 	$self->SUPER::sqlDo( $sql );
 }
   

From sugi ¡÷ users.sourceforge.jp  Tue Feb 14 01:57:12 2006
From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA)
Date: Tue, 14 Feb 2006 01:57:12 +0900
Subject: [Slashdotjp-dev 318] CVS update: slashjp/Slash/DB/MySQL
Message-ID: <20060213165712.CC2B72AC09E@users.sourceforge.jp>

Index: slashjp/Slash/DB/MySQL/MySQL.pm
diff -u slashjp/Slash/DB/MySQL/MySQL.pm:1.8 slashjp/Slash/DB/MySQL/MySQL.pm:1.9
--- slashjp/Slash/DB/MySQL/MySQL.pm:1.8	Tue Feb  7 04:05:18 2006
+++ slashjp/Slash/DB/MySQL/MySQL.pm	Tue Feb 14 01:57:12 2006
@@ -1,7 +1,7 @@
 # This code is a part of Slash, and is released under the GPL.
 # Copyright 1997-2004 by Open Source Development Network. See README
 # and COPYING for more information, or see http://slashcode.com/.
-# $Id: MySQL.pm,v 1.8 2006/02/06 19:05:18 sugi Exp $
+# $Id: MySQL.pm,v 1.9 2006/02/13 16:57:12 sugi Exp $
 
 package Slash::DB::MySQL;
 use strict;
@@ -20,7 +20,7 @@
 use base 'Slash::DB::Utility';
 use Slash::Constants ':messages';
 
-($VERSION) = ' $Revision: 1.8 $ ' =~ /\$Revision:\s+([^\s]+)/;
+($VERSION) = ' $Revision: 1.9 $ ' =~ /\$Revision:\s+([^\s]+)/;
 
 # Fry: How can I live my life if I can't tell good from evil?
 
@@ -308,7 +308,7 @@
 # Perl has lost the flag somewhere
 sub sqlDo{
 	my($self, $sql) = @_;
-	$sql = decode_utf8( $sql ); # unless $sql =~ /accesslog_admin|people/;
+	$sql = decode_utf8( $sql ) unless $sql =~ /INSERT\s+INTO\s+accesslog_admin|UPDATE\s+users_info\s+SET\s+people\s+=/;
 	$self->SUPER::sqlDo( $sql );
 }
   

From sugi ¡÷ users.sourceforge.jp  Thu Feb 16 09:03:22 2006
From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA)
Date: Thu, 16 Feb 2006 09:03:22 +0900
Subject: [Slashdotjp-dev 319] CVS update: slashjp/plugins/Journal
Message-ID: <20060216000322.783C62AC09E@users.sourceforge.jp>

Index: slashjp/plugins/Journal/Journal.pm
diff -u slashjp/plugins/Journal/Journal.pm:1.4 slashjp/plugins/Journal/Journal.pm:1.5
--- slashjp/plugins/Journal/Journal.pm:1.4	Fri Nov 18 01:46:14 2005
+++ slashjp/plugins/Journal/Journal.pm	Thu Feb 16 09:03:22 2006
@@ -1,7 +1,7 @@
 # This code is a part of Slash, and is released under the GPL.
 # Copyright 1997-2003 by Open Source Development Network. See README
 # and COPYING for more information, or see http://slashcode.com/.
-# $Id: Journal.pm,v 1.4 2005/11/17 16:46:14 tach Exp $
+# $Id: Journal.pm,v 1.5 2006/02/16 00:03:22 sugi Exp $
 
 package Slash::Journal;
 
@@ -15,7 +15,7 @@
 use base 'Exporter';
 use base 'Slash::DB::MySQL';
 
-($VERSION) = ' $Revision: 1.4 $ ' =~ /\$Revision:\s+([^\s]+)/;
+($VERSION) = ' $Revision: 1.5 $ ' =~ /\$Revision:\s+([^\s]+)/;
 
 # On a side note, I am not sure if I liked the way I named the methods either.
 # -Brian
@@ -239,8 +239,10 @@
 	$self->sqlConnect;
 
 	my $sql = <<EOT;
-SELECT count AS c,nickname,users_journal.uid,date,jid AS id
+SELECT count AS c,nickname,users_journal.uid,users_journal.date,jid AS id,description,journals_text.article
 FROM users_journal JOIN users USING (uid)
+JOIN journals ON jid=journals.id
+JOIN journals_text ON jid=journals_text.id
 ORDER BY date DESC
 LIMIT $limit
 EOT
@@ -248,17 +250,6 @@
 	my $losers = $self->{_dbh}->selectall_arrayref($sql);
 	return [ ] if !$losers || !@$losers;
 
-	my $id_list = join(", ", map { $_->[4] } @$losers);
-	my $loserid_hr = $self->sqlSelectAllHashref(
-		"id",
-		"id, description",
-		"journals",
-		"id IN ($id_list)");
-
-	for my $loser (@$losers) {
-		$loser->[5] = $loserid_hr->{$loser->[4]}{description};
-	}
-
 	return $losers;
 }
 
Index: slashjp/plugins/Journal/journal.pl
diff -u slashjp/plugins/Journal/journal.pl:1.9 slashjp/plugins/Journal/journal.pl:1.10
--- slashjp/plugins/Journal/journal.pl:1.9	Wed Nov  9 04:04:13 2005
+++ slashjp/plugins/Journal/journal.pl	Thu Feb 16 09:03:22 2006
@@ -2,7 +2,7 @@
 # This code is a part of Slash, and is released under the GPL.
 # Copyright 1997-2004 by Open Source Development Network. See README
 # and COPYING for more information, or see http://slashcode.com/.
-# $Id: journal.pl,v 1.9 2005/11/08 19:04:13 sugi Exp $
+# $Id: journal.pl,v 1.10 2006/02/16 00:03:22 sugi Exp $
 
 use strict;
 use Slash 2.003;	# require Slash 2.3.x
@@ -12,7 +12,7 @@
 use Slash::XML;
 use vars qw($VERSION);
 
-($VERSION) = ' $Revision: 1.9 $ ' =~ /\$Revision:\s+([^\s]+)/;
+($VERSION) = ' $Revision: 1.10 $ ' =~ /\$Revision:\s+([^\s]+)/;
 
 sub main {
 	my $journal   = getObject('Slash::Journal');
@@ -308,7 +308,8 @@
 
 		push @items, {
 			title	=> $title,
-			'link'	=> "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/"
+			link	=> "$gSkin->{absolutedir}/~" . fixparam($entry->[1]) . "/journal/",
+			description => strip_notags($entry->[6]),
 		};
 	}
 

From tach ¡÷ users.sourceforge.jp  Fri Feb 17 16:23:29 2006
From: tach ¡÷ users.sourceforge.jp (Taku YASUI)
Date: Fri, 17 Feb 2006 16:23:29 +0900
Subject: [Slashdotjp-dev 320] CVS update: slashjp/themes/slashcode/htdocs
Message-ID: <20060217072329.165E22AC096@users.sourceforge.jp>

Index: slashjp/themes/slashcode/htdocs/index.pl
diff -u slashjp/themes/slashcode/htdocs/index.pl:1.6 slashjp/themes/slashcode/htdocs/index.pl:1.7
--- slashjp/themes/slashcode/htdocs/index.pl:1.6	Mon Jun 27 16:10:15 2005
+++ slashjp/themes/slashcode/htdocs/index.pl	Fri Feb 17 16:23:28 2006
@@ -2,7 +2,7 @@
 # This code is a part of Slash, and is released under the GPL.
 # Copyright 1997-2004 by Open Source Development Network. See README
 # and COPYING for more information, or see http://slashcode.com/.
-# $Id: index.pl,v 1.6 2005/06/27 07:10:15 oliver Exp $
+# $Id: index.pl,v 1.7 2006/02/17 07:23:28 tach Exp $
 
 use strict;
 use Slash;
@@ -598,6 +598,10 @@
 		$return .= $tmpreturn;
 	}
 
+	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', {