From sugi ¡÷ users.sourceforge.jp Sat Sep 2 00:12:18 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Sat, 2 Sep 2006 00:12:18 +0900 Subject: [Slashdotjp-dev 602] CVS update: slashjp/Slash/Utility/Data Message-ID: <20060901151218.181DB2AC2C7@users.sourceforge.jp> Index: slashjp/Slash/Utility/Data/Data.pm diff -u slashjp/Slash/Utility/Data/Data.pm:1.16 slashjp/Slash/Utility/Data/Data.pm:1.17 --- slashjp/Slash/Utility/Data/Data.pm:1.16 Fri Jul 14 10:54:25 2006 +++ slashjp/Slash/Utility/Data/Data.pm Sat Sep 2 00:12:17 2006 @@ -1,7 +1,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: Data.pm,v 1.16 2006/07/14 01:54:25 sugi Exp $ +# $Id: Data.pm,v 1.17 2006/09/01 15:12:17 sugi Exp $ package Slash::Utility::Data; @@ -62,7 +62,7 @@ $HTML::Tagset::linkElements{slash} = ['src', 'href']; } -($VERSION) = ' $Revision: 1.16 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.17 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( addDomainTags createStoryTopicData @@ -2039,7 +2039,7 @@ sub fixparam { my($url) = @_; - $url =~ s/([^$URI::unreserved ])/$URI::Escape::escapes{$1}/og; + $url =~ s/([^$URI::unreserved !*'"()])/$URI::Escape::escapes{$1}/og; $url =~ s/ /+/g; return $url; } @@ -4260,4 +4260,4 @@ =head1 VERSION -$Id: Data.pm,v 1.16 2006/07/14 01:54:25 sugi Exp $ +$Id: Data.pm,v 1.17 2006/09/01 15:12:17 sugi Exp $ From sugi ¡÷ users.sourceforge.jp Sat Sep 2 00:32:45 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Sat, 2 Sep 2006 00:32:45 +0900 Subject: [Slashdotjp-dev 603] CVS update: slashjp/Slash/Utility/Data Message-ID: <20060901153245.D339A2AC086@users.sourceforge.jp> Index: slashjp/Slash/Utility/Data/Data.pm diff -u slashjp/Slash/Utility/Data/Data.pm:1.17 slashjp/Slash/Utility/Data/Data.pm:1.18 --- slashjp/Slash/Utility/Data/Data.pm:1.17 Sat Sep 2 00:12:17 2006 +++ slashjp/Slash/Utility/Data/Data.pm Sat Sep 2 00:32:45 2006 @@ -1,7 +1,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: Data.pm,v 1.17 2006/09/01 15:12:17 sugi Exp $ +# $Id: Data.pm,v 1.18 2006/09/01 15:32:45 sugi Exp $ package Slash::Utility::Data; @@ -62,7 +62,7 @@ $HTML::Tagset::linkElements{slash} = ['src', 'href']; } -($VERSION) = ' $Revision: 1.17 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.18 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( addDomainTags createStoryTopicData @@ -2039,7 +2039,7 @@ sub fixparam { my($url) = @_; - $url =~ s/([^$URI::unreserved !*'"()])/$URI::Escape::escapes{$1}/og; + $url =~ s/([^$URI::unreserved !*'"\(\)])/$URI::Escape::escapes{$1}/og; $url =~ s/ /+/g; return $url; } @@ -4260,4 +4260,4 @@ =head1 VERSION -$Id: Data.pm,v 1.17 2006/09/01 15:12:17 sugi Exp $ +$Id: Data.pm,v 1.18 2006/09/01 15:32:45 sugi Exp $ From sugi ¡÷ users.sourceforge.jp Sat Sep 2 00:53:39 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Sat, 2 Sep 2006 00:53:39 +0900 Subject: [Slashdotjp-dev 604] CVS update: slashjp/Slash/Utility/Data Message-ID: <20060901155339.11CB22AC086@users.sourceforge.jp> Index: slashjp/Slash/Utility/Data/Data.pm diff -u slashjp/Slash/Utility/Data/Data.pm:1.18 slashjp/Slash/Utility/Data/Data.pm:1.19 --- slashjp/Slash/Utility/Data/Data.pm:1.18 Sat Sep 2 00:32:45 2006 +++ slashjp/Slash/Utility/Data/Data.pm Sat Sep 2 00:53:38 2006 @@ -1,7 +1,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: Data.pm,v 1.18 2006/09/01 15:32:45 sugi Exp $ +# $Id: Data.pm,v 1.19 2006/09/01 15:53:38 sugi Exp $ package Slash::Utility::Data; @@ -62,7 +62,7 @@ $HTML::Tagset::linkElements{slash} = ['src', 'href']; } -($VERSION) = ' $Revision: 1.18 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.19 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( addDomainTags createStoryTopicData @@ -2039,7 +2039,7 @@ sub fixparam { my($url) = @_; - $url =~ s/([^$URI::unreserved !*'"\(\)])/$URI::Escape::escapes{$1}/og; + $url =~ s/([^$URI::unreserved ])/$URI::Escape::escapes{$1}/og; $url =~ s/ /+/g; return $url; } @@ -4260,4 +4260,4 @@ =head1 VERSION -$Id: Data.pm,v 1.18 2006/09/01 15:32:45 sugi Exp $ +$Id: Data.pm,v 1.19 2006/09/01 15:53:38 sugi Exp $ From sugi ¡÷ users.sourceforge.jp Mon Sep 4 21:17:45 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Mon, 4 Sep 2006 21:17:45 +0900 Subject: [Slashdotjp-dev 605] CVS update: slashjp/debian Message-ID: <20060904121745.5AC152AC503@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u slashjp/debian/changelog:1.1 slashjp/debian/changelog:1.2 --- slashjp/debian/changelog:1.1 Wed Aug 9 18:54:03 2006 +++ slashjp/debian/changelog Mon Sep 4 21:17:45 2006 @@ -1,3 +1,10 @@ +slash (2.5.0.119-2) unstable; urgency=low + + * change title link of discussion to article.pl instead of + ~/user/journal/nnnn. + + -- Tatsuki Sugiura Mon, 4 Sep 2006 21:15:55 +0900 + slash (2.5.0.119-1) unstable; urgency=low * catchup upstream CVS. From sugi ¡÷ users.sourceforge.jp Mon Sep 4 21:17:45 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Mon, 4 Sep 2006 21:17:45 +0900 Subject: [Slashdotjp-dev 606] CVS update: slashjp/Slash Message-ID: <20060904121745.82BD52AC508@users.sourceforge.jp> Index: slashjp/Slash/Slash.pm diff -u slashjp/Slash/Slash.pm:1.10 slashjp/Slash/Slash.pm:1.11 --- slashjp/Slash/Slash.pm:1.10 Mon Aug 28 19:00:45 2006 +++ slashjp/Slash/Slash.pm Mon Sep 4 21:17:45 2006 @@ -1,7 +1,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: Slash.pm,v 1.10 2006/08/28 10:00:45 sugi Exp $ +# $Id: Slash.pm,v 1.11 2006/09/04 12:17:45 sugi Exp $ package Slash; @@ -728,7 +728,9 @@ slashDisplay('printCommentsMain', { comments => $comments, title => $discussion->{title}, - 'link' => $discussion->{url}, + 'link' => ($slashdb->getDescriptions('discussion_kinds')->{$discussion->{dkid}} eq 'journal-story' + ? $constants->{rootdir}."/article.pl?sid=".$discussion->{sid} + : $discussion->{url}), count => $count, sid => $discussion->{id}, cid => $cid, From sugi ¡÷ users.sourceforge.jp Tue Sep 5 17:00:18 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Tue, 5 Sep 2006 17:00:18 +0900 Subject: [Slashdotjp-dev 607] CVS update: slashjp/Slash/Display Message-ID: <20060905080018.9197E2AC02B@users.sourceforge.jp> Index: slashjp/Slash/Display/Display.pm diff -u slashjp/Slash/Display/Display.pm:1.6 slashjp/Slash/Display/Display.pm:1.7 --- slashjp/Slash/Display/Display.pm:1.6 Wed Aug 30 17:54:09 2006 +++ slashjp/Slash/Display/Display.pm Tue Sep 5 17:00:18 2006 @@ -1,7 +1,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: Display.pm,v 1.6 2006/08/30 08:54:09 sugi Exp $ +# $Id: Display.pm,v 1.7 2006/09/05 08:00:18 sugi Exp $ package Slash::Display; @@ -50,7 +50,7 @@ use base 'Exporter'; use vars qw($VERSION @EXPORT @EXPORT_OK $CONTEXT %FILTERS $TEMPNAME); -($VERSION) = ' $Revision: 1.6 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.7 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw(slashDisplay slashDisplayName); @EXPORT_OK = qw(get_template); my(%objects); @@ -254,6 +254,10 @@ my $user = getCurrentUser(); my $gSkin = getCurrentSkin(); + # TODO: backported light mode. we should delete in future. + # This line for temp light mode, but maybe cause some probloems. + getCurrentForm('light') and $user->{light} = 1; + # save for later (local() seems not to work ... ?) my $origSkin = $user->{currentSkin} || $gSkin->{name}; my $origPage = $user->{currentPage}; From sugi ¡÷ users.sourceforge.jp Wed Sep 6 19:16:48 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 6 Sep 2006 19:16:48 +0900 Subject: [Slashdotjp-dev 608] CVS update: slashjp/Slash/Utility/Data Message-ID: <20060906101648.9303B2AC042@users.sourceforge.jp> Index: slashjp/Slash/Utility/Data/Data.pm diff -u slashjp/Slash/Utility/Data/Data.pm:1.19 slashjp/Slash/Utility/Data/Data.pm:1.20 --- slashjp/Slash/Utility/Data/Data.pm:1.19 Sat Sep 2 00:53:38 2006 +++ slashjp/Slash/Utility/Data/Data.pm Wed Sep 6 19:16:48 2006 @@ -1,7 +1,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: Data.pm,v 1.19 2006/09/01 15:53:38 sugi Exp $ +# $Id: Data.pm,v 1.20 2006/09/06 10:16:48 sugi Exp $ package Slash::Utility::Data; @@ -62,7 +62,7 @@ $HTML::Tagset::linkElements{slash} = ['src', 'href']; } -($VERSION) = ' $Revision: 1.19 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.20 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( addDomainTags createStoryTopicData @@ -2968,6 +2968,9 @@ $html =~ s{]*) title="([^"]+")>} {}gi if $notitle; + # truncate long URL + $html =~ s|(]+>\s*)(\w+://[^<]{70,}?)( Index: slashjp/Slash/Utility/Data/Data.pm diff -u slashjp/Slash/Utility/Data/Data.pm:1.20 slashjp/Slash/Utility/Data/Data.pm:1.21 --- slashjp/Slash/Utility/Data/Data.pm:1.20 Wed Sep 6 19:16:48 2006 +++ slashjp/Slash/Utility/Data/Data.pm Wed Sep 6 21:34:24 2006 @@ -1,7 +1,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: Data.pm,v 1.20 2006/09/06 10:16:48 sugi Exp $ +# $Id: Data.pm,v 1.21 2006/09/06 12:34:24 sugi Exp $ package Slash::Utility::Data; @@ -62,7 +62,7 @@ $HTML::Tagset::linkElements{slash} = ['src', 'href']; } -($VERSION) = ' $Revision: 1.20 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.21 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( addDomainTags createStoryTopicData @@ -1455,7 +1455,15 @@ $codestr =~ s{(.+?)}{$1}g; my $code = strip_code($codestr); my $newstr = "
$code
"; - substr($str, $pos, $len) = $newstr; + # TODO: This 1-line fix for bug of perl in Debian sarge!? + # substr($str, $pos, $len) returns wrong string. + # In just one test case, returned value have length=122. + # I tested both 5.8.4-8sarge3 and 5.8.4-8sarge4. + # 5.8.4-8sarge3 works porperly when using substr as left value! + # However, 5.8.4-8sarge4 was broken in any case. + # I stop to use 3rd argument, temporarily. + #substr($str, $pos, $len) = $newstr; + $str = substr($str, 0, $pos).$newstr.substr($str,$pos+$len); pos($str) = $pos + length($newstr); } } @@ -4263,4 +4271,4 @@ =head1 VERSION -$Id: Data.pm,v 1.20 2006/09/06 10:16:48 sugi Exp $ +$Id: Data.pm,v 1.21 2006/09/06 12:34:24 sugi Exp $ From sugi ¡÷ users.sourceforge.jp Wed Sep 6 21:47:15 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 6 Sep 2006 21:47:15 +0900 Subject: [Slashdotjp-dev 610] CVS update: slashjp/Slash/Utility/Data Message-ID: <20060906124715.8D2CC2AC06B@users.sourceforge.jp> Index: slashjp/Slash/Utility/Data/Data.pm diff -u slashjp/Slash/Utility/Data/Data.pm:1.21 slashjp/Slash/Utility/Data/Data.pm:1.22 --- slashjp/Slash/Utility/Data/Data.pm:1.21 Wed Sep 6 21:34:24 2006 +++ slashjp/Slash/Utility/Data/Data.pm Wed Sep 6 21:47:15 2006 @@ -1,7 +1,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: Data.pm,v 1.21 2006/09/06 12:34:24 sugi Exp $ +# $Id: Data.pm,v 1.22 2006/09/06 12:47:15 sugi Exp $ package Slash::Utility::Data; @@ -62,7 +62,7 @@ $HTML::Tagset::linkElements{slash} = ['src', 'href']; } -($VERSION) = ' $Revision: 1.21 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.22 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( addDomainTags createStoryTopicData @@ -1456,12 +1456,14 @@ my $code = strip_code($codestr); my $newstr = "
$code
"; # TODO: This 1-line fix for bug of perl in Debian sarge!? - # substr($str, $pos, $len) returns wrong string. - # In just one test case, returned value have length=122. - # I tested both 5.8.4-8sarge3 and 5.8.4-8sarge4. + # substr($str, $pos, $len) returns wrong string sometime. + # I tested both 5.8.4-8sarge3 and 5.8.4-8sarge4, + # In a test case, returned value have length=122. # 5.8.4-8sarge3 works porperly when using substr as left value! # However, 5.8.4-8sarge4 was broken in any case. - # I stop to use 3rd argument, temporarily. + # + # I cannot find a way to reproduce surely, just stop to + # use 3rd argument, temporarily... #substr($str, $pos, $len) = $newstr; $str = substr($str, 0, $pos).$newstr.substr($str,$pos+$len); pos($str) = $pos + length($newstr); @@ -4271,4 +4273,4 @@ =head1 VERSION -$Id: Data.pm,v 1.21 2006/09/06 12:34:24 sugi Exp $ +$Id: Data.pm,v 1.22 2006/09/06 12:47:15 sugi Exp $ From sugi ¡÷ users.sourceforge.jp Wed Sep 6 21:49:46 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 6 Sep 2006 21:49:46 +0900 Subject: [Slashdotjp-dev 611] CVS update: slashjp/debian Message-ID: <20060906124946.381DF2AC06B@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u slashjp/debian/changelog:1.2 slashjp/debian/changelog:1.3 --- slashjp/debian/changelog:1.2 Mon Sep 4 21:17:45 2006 +++ slashjp/debian/changelog Wed Sep 6 21:49:46 2006 @@ -1,3 +1,10 @@ +slash (2.5.0.119-3) unstable; urgency=low + + * fix processing to avoid perl bug? + * cut off long URL + + -- Tatsuki Sugiura Wed, 6 Sep 2006 21:48:50 +0900 + slash (2.5.0.119-2) unstable; urgency=low * change title link of discussion to article.pl instead of From sugi ¡÷ users.sourceforge.jp Thu Sep 7 14:33:50 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 7 Sep 2006 14:33:50 +0900 Subject: [Slashdotjp-dev 612] CVS update: slashjp/plugins/Search Message-ID: <20060907053350.608332AC1C9@users.sourceforge.jp> Index: slashjp/plugins/Search/Search.pm diff -u slashjp/plugins/Search/Search.pm:1.5 slashjp/plugins/Search/Search.pm:1.6 --- slashjp/plugins/Search/Search.pm:1.5 Fri Jul 14 10:54:26 2006 +++ slashjp/plugins/Search/Search.pm Thu Sep 7 14:33:50 2006 @@ -1,7 +1,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: Search.pm,v 1.5 2006/07/14 01:54:26 sugi Exp $ +# $Id: Search.pm,v 1.6 2006/09/07 05:33:50 sugi Exp $ package Slash::Search; @@ -11,7 +11,7 @@ use vars qw($VERSION); use base 'Slash::DB::Utility'; -($VERSION) = ' $Revision: 1.5 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.6 $ ' =~ /\$Revision:\s+([^\s]+)/; # FRY: And where would a giant nerd be? THE LIBRARY! @@ -43,7 +43,7 @@ my $columns; $columns .= "primaryskid, url, discussions.uid AS author_uid, discussions.title AS title, "; $columns .= "pid, subject, ts, date, comments.uid AS uid, cid, "; - $columns .= "discussions.id AS did"; + $columns .= "discussions.id AS did, dkid, discussions.sid"; $columns .= ", TRUNCATE( " . $self->_score('comments.subject', $form->{query}, $constants->{search_method}) . ", 1) AS score " @@ -92,6 +92,15 @@ $other .= " LIMIT $start, $limit" if $limit; my $search = $self->sqlSelectAllHashrefArray($columns, $tables, $where, $other ); + my $desc = $reader->getDescriptions('discussion_kinds'); + foreach my $c (@$search) { + # TODO: may fix in discussion table directly... + $desc->{$c->{dkid}} eq 'journal-story' and + $c->{url} = $constants->{rootdir}."/article.pl?sid=".$c->{sid}; + delete $c->{dkid}; + delete $c->{sid}; + } + return $search; } From sugi ¡÷ users.sourceforge.jp Thu Sep 7 14:45:45 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 7 Sep 2006 14:45:45 +0900 Subject: [Slashdotjp-dev 613] CVS update: slashjp/debian Message-ID: <20060907054545.6DCEB2AC061@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u slashjp/debian/changelog:1.3 slashjp/debian/changelog:1.4 --- slashjp/debian/changelog:1.3 Wed Sep 6 21:49:46 2006 +++ slashjp/debian/changelog Thu Sep 7 14:45:45 2006 @@ -1,7 +1,13 @@ +slash (2.5.0.119-4) unstable; urgency=low + + * change link of stories submitted by journal to article.pl in search.pl + + -- Tatsuki Sugiura Thu, 7 Sep 2006 14:44:14 +0900 + slash (2.5.0.119-3) unstable; urgency=low * fix processing to avoid perl bug? - * cut off long URL + * cut off long URL (partial, a tag only) -- Tatsuki Sugiura Wed, 6 Sep 2006 21:48:50 +0900 From sugi ¡÷ users.sourceforge.jp Thu Sep 7 18:55:06 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 7 Sep 2006 18:55:06 +0900 Subject: [Slashdotjp-dev 614] CVS update: slashjp/themes/slashcode/htdocs Message-ID: <20060907095506.DC6402AC312@users.sourceforge.jp> Index: slashjp/themes/slashcode/htdocs/article.pl diff -u slashjp/themes/slashcode/htdocs/article.pl:1.4 slashjp/themes/slashcode/htdocs/article.pl:1.5 --- slashjp/themes/slashcode/htdocs/article.pl:1.4 Wed Jul 12 20:42:08 2006 +++ slashjp/themes/slashcode/htdocs/article.pl Thu Sep 7 18:55:06 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: article.pl,v 1.4 2006/07/12 11:42:08 sugi Exp $ +# $Id: article.pl,v 1.5 2006/09/07 09:55:06 sugi Exp $ use strict; use Slash; @@ -36,7 +36,7 @@ if ($story->{primaryskid} != $cur_skid) { my $cur_skin = $reader->getSkin($cur_skid); my $story_skin = $reader->getSkin($story->{primaryskid}); - if ($story_skin && $story_skin->{rootdir} + if (0 && $story_skin && $story_skin->{rootdir} # TODO: fix in future... && $story_skin->{rootdir} ne $cur_skin->{rootdir}) { redirect("$story_skin->{rootdir}$ENV{REQUEST_URI}"); return; From sugi ¡÷ users.sourceforge.jp Thu Sep 7 18:56:18 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 7 Sep 2006 18:56:18 +0900 Subject: [Slashdotjp-dev 615] CVS update: slashjp/debian Message-ID: <20060907095618.422192AC312@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u slashjp/debian/changelog:1.4 slashjp/debian/changelog:1.5 --- slashjp/debian/changelog:1.4 Thu Sep 7 14:45:45 2006 +++ slashjp/debian/changelog Thu Sep 7 18:56:18 2006 @@ -1,3 +1,9 @@ +slash (2.5.0.119-5) unstable; urgency=low + + * make disable skin redirection forcely in article.pl + + -- Tatsuki Sugiura Thu, 7 Sep 2006 18:55:30 +0900 + slash (2.5.0.119-4) unstable; urgency=low * change link of stories submitted by journal to article.pl in search.pl From sugi ¡÷ users.sourceforge.jp Thu Sep 7 19:17:04 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 7 Sep 2006 19:17:04 +0900 Subject: [Slashdotjp-dev 616] CVS update: slashjp/themes/slashcode/htdocs Message-ID: <20060907101704.66EA62AC1CF@users.sourceforge.jp> Index: slashjp/themes/slashcode/htdocs/article.pl diff -u slashjp/themes/slashcode/htdocs/article.pl:1.5 slashjp/themes/slashcode/htdocs/article.pl:1.6 --- slashjp/themes/slashcode/htdocs/article.pl:1.5 Thu Sep 7 18:55:06 2006 +++ slashjp/themes/slashcode/htdocs/article.pl Thu Sep 7 19:17:04 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: article.pl,v 1.5 2006/09/07 09:55:06 sugi Exp $ +# $Id: article.pl,v 1.6 2006/09/07 10:17:04 sugi Exp $ use strict; use Slash; @@ -36,10 +36,14 @@ if ($story->{primaryskid} != $cur_skid) { my $cur_skin = $reader->getSkin($cur_skid); my $story_skin = $reader->getSkin($story->{primaryskid}); - if (0 && $story_skin && $story_skin->{rootdir} # TODO: fix in future... - && $story_skin->{rootdir} ne $cur_skin->{rootdir}) { - redirect("$story_skin->{rootdir}$ENV{REQUEST_URI}"); - return; + if ($story_skin && $story_skin->{rootdir} + && $story_skin->{rootdir} ne $cur_skin->{rootdir}){ + my ($cur_pathbase) = $ENV{REQUEST_URI} =~ m|/([^/]+)|; + my ($story_pathbase) = "$story_skin->{rootdir}$ENV{REQUEST_URI}" =~ m|//[^/]+/([^/]+)|; + if ($cur_pathbase ne $story_pathbase){ + redirect("$story_skin->{rootdir}$ENV{REQUEST_URI}"); + return; + } } } } From sugi ¡÷ users.sourceforge.jp Thu Sep 7 19:28:56 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 7 Sep 2006 19:28:56 +0900 Subject: [Slashdotjp-dev 617] CVS update: slashjp/themes/slashcode/htdocs Message-ID: <20060907102856.33F9C2AC1CF@users.sourceforge.jp> Index: slashjp/themes/slashcode/htdocs/article.pl diff -u slashjp/themes/slashcode/htdocs/article.pl:1.6 slashjp/themes/slashcode/htdocs/article.pl:1.7 --- slashjp/themes/slashcode/htdocs/article.pl:1.6 Thu Sep 7 19:17:04 2006 +++ slashjp/themes/slashcode/htdocs/article.pl Thu Sep 7 19:28:56 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: article.pl,v 1.6 2006/09/07 10:17:04 sugi Exp $ +# $Id: article.pl,v 1.7 2006/09/07 10:28:56 sugi Exp $ use strict; use Slash; @@ -39,9 +39,10 @@ if ($story_skin && $story_skin->{rootdir} && $story_skin->{rootdir} ne $cur_skin->{rootdir}){ my ($cur_pathbase) = $ENV{REQUEST_URI} =~ m|/([^/]+)|; - my ($story_pathbase) = "$story_skin->{rootdir}$ENV{REQUEST_URI}" =~ m|//[^/]+/([^/]+)|; + my ($story_pathbase, $article_path) = "$story_skin->{rootdir}$ENV{REQUEST_URI}" =~ m|//[^/]+/([^/]+).*?(/article\.pl.*)$|; if ($cur_pathbase ne $story_pathbase){ - redirect("$story_skin->{rootdir}$ENV{REQUEST_URI}"); + #redirect("$story_skin->{rootdir}$ENV{REQUEST_URI}"); + redirect("$story_skin->{rootdir}$article_path"); return; } } From sugi ¡÷ users.sourceforge.jp Fri Sep 8 14:46:18 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Fri, 8 Sep 2006 14:46:18 +0900 Subject: [Slashdotjp-dev 618] CVS update: slashjp/plugins/Login Message-ID: <20060908054618.134AE2AC176@users.sourceforge.jp> Index: slashjp/plugins/Login/login.pl diff -u slashjp/plugins/Login/login.pl:1.6 slashjp/plugins/Login/login.pl:1.7 --- slashjp/plugins/Login/login.pl:1.6 Wed Aug 9 18:53:30 2006 +++ slashjp/plugins/Login/login.pl Fri Sep 8 14:46:17 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: login.pl,v 1.6 2006/08/09 09:53:30 sugi Exp $ +# $Id: login.pl,v 1.7 2006/09/08 05:46:17 sugi Exp $ use strict; use Slash 2.003; @@ -13,7 +13,7 @@ use Slash::LDAPDB; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.6 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.7 $ ' =~ /\$Revision:\s+([^\s]+)/; sub main { my $slashdb = getCurrentDB(); @@ -97,7 +97,11 @@ } elsif ($constants->{ldap_enable} && (!defined($ldap) || !$ldap->bind())) { push @note, getData('ldap_conn_fail'); $error = 1; - } elsif ($constants->{ldap_enable} && $ldap->getUser($matchname) && !$ldap->authUser($matchname, $form->{peerpasswd})) { + } elsif ($constants->{ldap_enable} + && defined($form->{peerpasswd}) + && $form->{peerpasswd} ne "" + && $ldap->getUser($matchname) + && !$ldap->authUser($matchname, $form->{peerpasswd})) { push @note, getData('ldap_peer_pass_fail'); $error = 1; } elsif ($matchname ne '' && $form->{newusernick} ne '') { From sugi ¡÷ users.sourceforge.jp Fri Sep 8 14:46:18 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Fri, 8 Sep 2006 14:46:18 +0900 Subject: [Slashdotjp-dev 619] CVS update: slashjp/themes/slashcode/htdocs Message-ID: <20060908054618.365A52AC3AC@users.sourceforge.jp> Index: slashjp/themes/slashcode/htdocs/users.pl diff -u slashjp/themes/slashcode/htdocs/users.pl:1.12 slashjp/themes/slashcode/htdocs/users.pl:1.13 --- slashjp/themes/slashcode/htdocs/users.pl:1.12 Wed Aug 30 17:54:09 2006 +++ slashjp/themes/slashcode/htdocs/users.pl Fri Sep 8 14:46:18 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.12 2006/08/30 08:54:09 sugi Exp $ +# $Id: users.pl,v 1.13 2006/09/08 05:46:18 sugi Exp $ use strict; use Digest::MD5 'md5_hex'; @@ -1180,9 +1180,9 @@ } $comment->{points} += $user->{karma_bonus} - if $user->{karma_bonus} && $comment->{karma_bonus} eq 'yes'; + if defined($user->{karma_bonus}) && $comment->{karma_bonus} eq 'yes'; $comment->{points} += $user->{subscriber_bonus} - if $user->{subscriber_bonus} && $comment->{subscriber_bonus} eq 'yes'; + if defined($user->{subscriber_bonus}) && $comment->{subscriber_bonus} eq 'yes'; # fix points in case they are out of bounds $comment->{points} = $constants->{comment_minscore} if $comment->{points} < $constants->{comment_minscore}; From sugi ¡÷ users.sourceforge.jp Fri Sep 8 14:47:19 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Fri, 8 Sep 2006 14:47:19 +0900 Subject: [Slashdotjp-dev 620] CVS update: slashjp/debian Message-ID: <20060908054719.B4C7F2AC176@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u slashjp/debian/changelog:1.5 slashjp/debian/changelog:1.6 --- slashjp/debian/changelog:1.5 Thu Sep 7 18:56:18 2006 +++ slashjp/debian/changelog Fri Sep 8 14:47:19 2006 @@ -1,3 +1,9 @@ +slash (2.5.0.119-6) unstable; urgency=low + + * login.pl: fix condition for duplicate user error when create user. + + -- Tatsuki Sugiura Fri, 8 Sep 2006 14:46:33 +0900 + slash (2.5.0.119-5) unstable; urgency=low * make disable skin redirection forcely in article.pl From sugi ¡÷ users.sourceforge.jp Fri Sep 8 20:03:55 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Fri, 8 Sep 2006 20:03:55 +0900 Subject: [Slashdotjp-dev 621] CVS update: slashjp/Slash/Utility/Data Message-ID: <20060908110355.C40AA2AC0FA@users.sourceforge.jp> Index: slashjp/Slash/Utility/Data/Data.pm diff -u slashjp/Slash/Utility/Data/Data.pm:1.22 slashjp/Slash/Utility/Data/Data.pm:1.23 --- slashjp/Slash/Utility/Data/Data.pm:1.22 Wed Sep 6 21:47:15 2006 +++ slashjp/Slash/Utility/Data/Data.pm Fri Sep 8 20:03:55 2006 @@ -1,7 +1,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: Data.pm,v 1.22 2006/09/06 12:47:15 sugi Exp $ +# $Id: Data.pm,v 1.23 2006/09/08 11:03:55 sugi Exp $ package Slash::Utility::Data; @@ -62,7 +62,7 @@ $HTML::Tagset::linkElements{slash} = ['src', 'href']; } -($VERSION) = ' $Revision: 1.22 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.23 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( addDomainTags createStoryTopicData @@ -2297,6 +2297,7 @@ } else { $text = substr($text, 0, $length); } + $end and $text = join('', reverse(split(//, $text))); $text =~ s/&#?[a-zA-Z0-9]*$//; $text =~ s/<[^>]*$//; return $text; @@ -4273,4 +4274,4 @@ =head1 VERSION -$Id: Data.pm,v 1.22 2006/09/06 12:47:15 sugi Exp $ +$Id: Data.pm,v 1.23 2006/09/08 11:03:55 sugi Exp $ From sugi ¡÷ users.sourceforge.jp Mon Sep 11 14:04:44 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Mon, 11 Sep 2006 14:04:44 +0900 Subject: [Slashdotjp-dev 622] CVS update: slashjp/debian Message-ID: <20060911050445.021EA2AC1A2@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u slashjp/debian/changelog:1.6 slashjp/debian/changelog:1.7 --- slashjp/debian/changelog:1.6 Fri Sep 8 14:47:19 2006 +++ slashjp/debian/changelog Mon Sep 11 14:04:44 2006 @@ -1,6 +1,14 @@ +slash (2.5.0.119-7) unstable; urgency=low + + * fix in chopEntity() (may return reversed string...) + * stop messaging for journal-story + + -- Tatsuki Sugiura Mon, 11 Sep 2006 14:02:32 +0900 + slash (2.5.0.119-6) unstable; urgency=low * login.pl: fix condition for duplicate user error when create user. + * article.pl: make enable and strict check in skin redirection for dirskin. -- Tatsuki Sugiura Fri, 8 Sep 2006 14:46:33 +0900 From sugi ¡÷ users.sourceforge.jp Mon Sep 11 14:04:45 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Mon, 11 Sep 2006 14:04:45 +0900 Subject: [Slashdotjp-dev 623] CVS update: slashjp/themes/slashcode/htdocs Message-ID: <20060911050445.258A02AC3E1@users.sourceforge.jp> Index: slashjp/themes/slashcode/htdocs/comments.pl diff -u slashjp/themes/slashcode/htdocs/comments.pl:1.8 slashjp/themes/slashcode/htdocs/comments.pl:1.9 --- slashjp/themes/slashcode/htdocs/comments.pl:1.8 Wed Jul 12 21:24:23 2006 +++ slashjp/themes/slashcode/htdocs/comments.pl Mon Sep 11 14:04:45 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.8 2006/07/12 12:24:23 sugi Exp $ +# $Id: comments.pl,v 1.9 2006/09/11 05:04:45 sugi Exp $ use strict; use Slash 2.003; # require Slash 2.3.x @@ -1232,7 +1232,7 @@ } # reply to journal - if ($messages && $kinds->{ $discussion->{dkid} } =~ /^journal/) { + if ($messages && $kinds->{ $discussion->{dkid} } eq 'journal') { my $users = $messages->checkMessageCodes(MSG_CODE_JOURNAL_REPLY, [$discussion->{uid}]); if (_send_comment_msg($users->[0], \%users, $pts, $clean_comment)) { my $data = { From sugi ¡÷ users.sourceforge.jp Thu Sep 14 22:13:47 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 14 Sep 2006 22:13:47 +0900 Subject: [Slashdotjp-dev 624] CVS update: slashjp/plugins/Login Message-ID: <20060914131347.C9D502AC19C@users.sourceforge.jp> Index: slashjp/plugins/Login/login.pl diff -u slashjp/plugins/Login/login.pl:1.7 slashjp/plugins/Login/login.pl:1.8 --- slashjp/plugins/Login/login.pl:1.7 Fri Sep 8 14:46:17 2006 +++ slashjp/plugins/Login/login.pl Thu Sep 14 22:13:47 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: login.pl,v 1.7 2006/09/08 05:46:17 sugi Exp $ +# $Id: login.pl,v 1.8 2006/09/14 13:13:47 sugi Exp $ use strict; use Slash 2.003; @@ -13,7 +13,7 @@ use Slash::LDAPDB; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.7 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.8 $ ' =~ /\$Revision:\s+([^\s]+)/; sub main { my $slashdb = getCurrentDB(); @@ -97,6 +97,12 @@ } elsif ($constants->{ldap_enable} && (!defined($ldap) || !$ldap->bind())) { push @note, getData('ldap_conn_fail'); $error = 1; + } elsif ($constants->{ldap_enable} && $ldap->getUser($matchname) + && (!defined($form->{peerpasswd}) || $form->{peerpasswd} eq "")) { + push @note, getData('duplicate_user', { + nick => $form->{newusernick}, + }); + $error = 1; } elsif ($constants->{ldap_enable} && defined($form->{peerpasswd}) && $form->{peerpasswd} ne "" From sugi ¡÷ users.sourceforge.jp Thu Sep 14 22:15:30 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 14 Sep 2006 22:15:30 +0900 Subject: [Slashdotjp-dev 625] CVS update: slashjp/debian Message-ID: <20060914131530.555242AC19C@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u slashjp/debian/changelog:1.7 slashjp/debian/changelog:1.8 --- slashjp/debian/changelog:1.7 Mon Sep 11 14:04:44 2006 +++ slashjp/debian/changelog Thu Sep 14 22:15:30 2006 @@ -1,3 +1,9 @@ +slash (2.5.0.119-8) unstable; urgency=low + + * login.pl: fix condition for checking LDAP user when accout creation + + -- Tatsuki Sugiura Thu, 14 Sep 2006 22:14:37 +0900 + slash (2.5.0.119-7) unstable; urgency=low * fix in chopEntity() (may return reversed string...) From sugi ¡÷ users.sourceforge.jp Tue Sep 19 20:47:41 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Tue, 19 Sep 2006 20:47:41 +0900 Subject: [Slashdotjp-dev 626] CVS update: slashjp/themes/slashcode/tasks Message-ID: <20060919114741.EA01F2AC07B@users.sourceforge.jp> Index: slashjp/themes/slashcode/tasks/daily.pl diff -u slashjp/themes/slashcode/tasks/daily.pl:1.5 slashjp/themes/slashcode/tasks/daily.pl:1.6 --- slashjp/themes/slashcode/tasks/daily.pl:1.5 Wed Jul 12 20:42:09 2006 +++ slashjp/themes/slashcode/tasks/daily.pl Tue Sep 19 20:47:41 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: daily.pl,v 1.5 2006/07/12 11:42:09 sugi Exp $ +# $Id: daily.pl,v 1.6 2006/09/19 11:47:41 sugi Exp $ use strict; @@ -16,7 +16,7 @@ # GMT if you installed everything correctly. So 2:00 AM GMT is a good # sort of midnightish time for the Western Hemisphere. Adjust for # your audience and admins. -$task{$me}{timespec} = '0 2 * * *'; +$task{$me}{timespec} = '2 0 * * *'; $task{$me}{timespec_panic_2} = ''; # if major panic, dailyStuff can wait $task{$me}{fork} = SLASHD_NOWAIT; $task{$me}{code} = sub {