From sugi ¡÷ users.sourceforge.jp Wed Oct 4 17:15:30 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 4 Oct 2006 17:15:30 +0900 Subject: [Slashdotjp-dev 627] CVS update: slashjp/Slash/DB/MySQL Message-ID: <20061004081530.D72F12AC18E@users.sourceforge.jp> Index: slashjp/Slash/DB/MySQL/MySQL.pm diff -u slashjp/Slash/DB/MySQL/MySQL.pm:1.13 slashjp/Slash/DB/MySQL/MySQL.pm:1.14 --- slashjp/Slash/DB/MySQL/MySQL.pm:1.13 Wed Aug 30 17:54:09 2006 +++ slashjp/Slash/DB/MySQL/MySQL.pm Wed Oct 4 17:15:30 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: MySQL.pm,v 1.13 2006/08/30 08:54:09 sugi Exp $ +# $Id: MySQL.pm,v 1.14 2006/10/04 08:15:30 sugi Exp $ package Slash::DB::MySQL; use strict; @@ -21,7 +21,7 @@ use Encode; use Slash::LDAPDB; -($VERSION) = ' $Revision: 1.13 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.14 $ ' =~ /\$Revision:\s+([^\s]+)/; # Fry: How can I live my life if I can't tell good from evil? @@ -303,7 +303,6 @@ my($self) = @_; $self->SUPER::sqlConnect(); $self->{_dbh}->{mysql_enable_utf8} = 1; - $self->{_dbh}->do( "SET NAMES utf8"); } ######################################################## From sugi ¡÷ users.sourceforge.jp Wed Oct 4 17:15:31 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 4 Oct 2006 17:15:31 +0900 Subject: [Slashdotjp-dev 628] CVS update: slashjp/plugins/Stats Message-ID: <20061004081531.0A5F62AC195@users.sourceforge.jp> Index: slashjp/plugins/Stats/adminmail.pl diff -u slashjp/plugins/Stats/adminmail.pl:1.4 slashjp/plugins/Stats/adminmail.pl:1.5 --- slashjp/plugins/Stats/adminmail.pl:1.4 Wed Jul 12 20:41:58 2006 +++ slashjp/plugins/Stats/adminmail.pl Wed Oct 4 17:15:30 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: adminmail.pl,v 1.4 2006/07/12 11:41:58 sugi Exp $ +# $Id: adminmail.pl,v 1.5 2006/10/04 08:15:30 sugi Exp $ use strict; use Slash::Constants qw( :messages :slashd ); @@ -14,7 +14,7 @@ # GMT if you installed everything correctly. So 6:07 AM GMT is a good # sort of midnightish time for the Western Hemisphere. Adjust for # your audience and admins. -$task{$me}{timespec} = '50 4 * * *'; +$task{$me}{timespec} = '50 18 * * *'; $task{$me}{timespec_panic_2} = ''; # if major panic, dailyStuff can wait $task{$me}{resource_locks} = { log_slave => 1 }; $task{$me}{fork} = SLASHD_NOWAIT; From sugi ¡÷ users.sourceforge.jp Wed Oct 4 17:24:37 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 4 Oct 2006 17:24:37 +0900 Subject: [Slashdotjp-dev 629] CVS update: slashjp/debian Message-ID: <20061004082437.1EBC62AC1F6@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u slashjp/debian/changelog:1.8 slashjp/debian/changelog:1.9 --- slashjp/debian/changelog:1.8 Thu Sep 14 22:15:30 2006 +++ slashjp/debian/changelog Wed Oct 4 17:24:36 2006 @@ -1,3 +1,12 @@ +slash (2.5.0.119-9) unstable; urgency=low + + * remove 'SET NAMES utf8' from MySQL.pm. + So need to mysql_read_default_file in dbix-password.conf + and default-character-set in my.cnf + * change schedule of adminmail.pl to 4:50 AM (JST) + + -- Tatsuki Sugiura Wed, 4 Oct 2006 17:23:16 +0900 + slash (2.5.0.119-8) unstable; urgency=low * login.pl: fix condition for checking LDAP user when accout creation From sugi ¡÷ users.sourceforge.jp Tue Oct 24 17:54:01 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Tue, 24 Oct 2006 17:54:01 +0900 Subject: [Slashdotjp-dev 630] CVS update: slashjp/Slash/Utility/Data Message-ID: <20061024085401.654F82AC03D@users.sourceforge.jp> Index: slashjp/Slash/Utility/Data/Data.pm diff -u slashjp/Slash/Utility/Data/Data.pm:1.23 slashjp/Slash/Utility/Data/Data.pm:1.24 --- slashjp/Slash/Utility/Data/Data.pm:1.23 Fri Sep 8 20:03:55 2006 +++ slashjp/Slash/Utility/Data/Data.pm Tue Oct 24 17:54:01 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.23 2006/09/08 11:03:55 sugi Exp $ +# $Id: Data.pm,v 1.24 2006/10/24 08:54:01 sugi Exp $ package Slash::Utility::Data; @@ -62,7 +62,7 @@ $HTML::Tagset::linkElements{slash} = ['src', 'href']; } -($VERSION) = ' $Revision: 1.23 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.24 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( addDomainTags createStoryTopicData @@ -2233,7 +2233,7 @@ my $token = ':::INSERT__23__HERE:::'; # no # is OK, unless ... $url =~ s/#/$token/g; - if ($url =~ m|^https?://|i || $url =~ m|^/|) { + if ($url =~ m|^https?://|i || $url =~ m|^/| || $url =~ m|^$token|) { # HTTP, in which case the first # is OK $url =~ s/$token/#/; } @@ -4274,4 +4274,4 @@ =head1 VERSION -$Id: Data.pm,v 1.23 2006/09/08 11:03:55 sugi Exp $ +$Id: Data.pm,v 1.24 2006/10/24 08:54:01 sugi Exp $ From sugi ¡÷ users.sourceforge.jp Tue Oct 24 17:54:01 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Tue, 24 Oct 2006 17:54:01 +0900 Subject: [Slashdotjp-dev 631] CVS update: slashjp/plugins/Admin Message-ID: <20061024085401.880022AC04A@users.sourceforge.jp> Index: slashjp/plugins/Admin/Admin.pm diff -u slashjp/plugins/Admin/Admin.pm:1.4 slashjp/plugins/Admin/Admin.pm:1.5 --- slashjp/plugins/Admin/Admin.pm:1.4 Fri Jul 14 10:54:25 2006 +++ slashjp/plugins/Admin/Admin.pm Tue Oct 24 17:54:01 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: Admin.pm,v 1.4 2006/07/14 01:54:25 sugi Exp $ +# $Id: Admin.pm,v 1.5 2006/10/24 08:54:01 sugi Exp $ package Slash::Admin; @@ -16,7 +16,7 @@ use base 'Slash::DB::Utility'; 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 @@ -168,7 +168,7 @@ # label; otherwise just use the A content. while ($story_content =~ m|(.*?)|sgi) { my($a_attr, $label) = ($1, $2); - next unless $a_attr =~ /\bhref\s*=\s*["']/si; + next unless $a_attr =~ /\bhref\s*=\s*["'](?!#)/si; if ($a_attr =~ m/(\btitle\s*=\s*(["'])(.*?)\2)/si) { $label = $3; $a_attr =~ s/\Q$1\E//; From sugi ¡÷ users.sourceforge.jp Tue Oct 24 20:20:34 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Tue, 24 Oct 2006 20:20:34 +0900 Subject: [Slashdotjp-dev 632] CVS update: slashjp/Slash/DB/MySQL Message-ID: <20061024112034.DF0C32AC06B@users.sourceforge.jp> Index: slashjp/Slash/DB/MySQL/MySQL.pm diff -u slashjp/Slash/DB/MySQL/MySQL.pm:1.14 slashjp/Slash/DB/MySQL/MySQL.pm:1.15 --- slashjp/Slash/DB/MySQL/MySQL.pm:1.14 Wed Oct 4 17:15:30 2006 +++ slashjp/Slash/DB/MySQL/MySQL.pm Tue Oct 24 20:20:34 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: MySQL.pm,v 1.14 2006/10/04 08:15:30 sugi Exp $ +# $Id: MySQL.pm,v 1.15 2006/10/24 11:20:34 sugi Exp $ package Slash::DB::MySQL; use strict; @@ -21,7 +21,7 @@ use Encode; use Slash::LDAPDB; -($VERSION) = ' $Revision: 1.14 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.15 $ ' =~ /\$Revision:\s+([^\s]+)/; # Fry: How can I live my life if I can't tell good from evil? @@ -10972,8 +10972,6 @@ $page ||= 'misc'; } unless ($skin) { - # TODO: backported light mode. we should delete in future. - $skin = "light" if $user->{light}; $skin ||= getCurrentSkin('name'); $skin ||= 'default'; } From sugi ¡÷ users.sourceforge.jp Tue Oct 24 20:20:35 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Tue, 24 Oct 2006 20:20:35 +0900 Subject: [Slashdotjp-dev 633] CVS update: slashjp/Slash/Display Message-ID: <20061024112035.14CA92AC0C1@users.sourceforge.jp> Index: slashjp/Slash/Display/Display.pm diff -u slashjp/Slash/Display/Display.pm:1.7 slashjp/Slash/Display/Display.pm:1.8 --- slashjp/Slash/Display/Display.pm:1.7 Tue Sep 5 17:00:18 2006 +++ slashjp/Slash/Display/Display.pm Tue Oct 24 20:20:34 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.7 2006/09/05 08:00:18 sugi Exp $ +# $Id: Display.pm,v 1.8 2006/10/24 11:20:34 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.7 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.8 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw(slashDisplay slashDisplayName); @EXPORT_OK = qw(get_template); my(%objects); @@ -254,10 +254,6 @@ 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}; @@ -269,9 +265,6 @@ if ($opt->{Skin} && $opt->{Skin} eq 'NONE') { $user->{currentSkin} = 'default'; - } elsif ($user->{light}) { - # TODO: backported light mode. we should delete in future. - $user->{currentSkin} = 'light'; } elsif ($opt->{Skin}) { $user->{currentSkin} = $opt->{Skin}; } From sugi ¡÷ users.sourceforge.jp Tue Oct 24 20:20:35 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Tue, 24 Oct 2006 20:20:35 +0900 Subject: [Slashdotjp-dev 634] CVS update: slashjp/themes/slashcode/htdocs Message-ID: <20061024112035.3D82F2AC06B@users.sourceforge.jp> Index: slashjp/themes/slashcode/htdocs/users.pl diff -u slashjp/themes/slashcode/htdocs/users.pl:1.13 slashjp/themes/slashcode/htdocs/users.pl:1.14 --- slashjp/themes/slashcode/htdocs/users.pl:1.13 Fri Sep 8 14:46:18 2006 +++ slashjp/themes/slashcode/htdocs/users.pl Tue Oct 24 20:20:35 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.13 2006/09/08 05:46:18 sugi Exp $ +# $Id: users.pl,v 1.14 2006/10/24 11:20:35 sugi Exp $ use strict; use Digest::MD5 'md5_hex'; @@ -2024,7 +2024,6 @@ my $lb_check = $user_edit->{lowbandwidth} ? $constants->{markup_checked_attribute} : ''; my $sd_check = $user_edit->{simpledesign} ? $constants->{markup_checked_attribute} : ''; - my $l_check = $user_edit->{light} ? $constants->{markup_checked_attribute} : ''; # TODO: backported light mode. should be deleted in future. my $i_check = $user_edit->{noicons} ? $constants->{markup_checked_attribute} : ''; my $w_check = $user_edit->{willing} ? $constants->{markup_checked_attribute} : ''; @@ -2035,7 +2034,6 @@ admin_block => $admin_block, user_edit => $user_edit, tzformat_select => $tzformat_select, - l_check => $l_check, # TODO: backported light mode. should be deleted in future. i_check => $i_check, w_check => $w_check, lb_check => $lb_check, @@ -2933,7 +2931,6 @@ noboxes => ($form->{useslashboxes} ? 0 : 1), lowbandwidth => ($form->{lowbandwidth} ? 1 : 0), simpledesign => ($form->{simpledesign} ? 1 : 0), - light => ($form->{light} ? 1 : 0), # TODO: backported light mode. should be deleted in future. noicons => ($form->{noicons} ? 1 : 0), willing => ($form->{willing} ? 1 : 0), }; From sugi ¡÷ users.sourceforge.jp Tue Oct 24 23:08:15 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Tue, 24 Oct 2006 23:08:15 +0900 Subject: [Slashdotjp-dev 635] CVS update: slashjp/plugins/Journal Message-ID: <20061024140815.C120D2AC0C7@users.sourceforge.jp> Index: slashjp/plugins/Journal/journal.pl diff -u slashjp/plugins/Journal/journal.pl:1.16 slashjp/plugins/Journal/journal.pl:1.17 --- slashjp/plugins/Journal/journal.pl:1.16 Fri Aug 4 19:14:33 2006 +++ slashjp/plugins/Journal/journal.pl Tue Oct 24 23:08:15 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: journal.pl,v 1.16 2006/08/04 10:14:33 sugi Exp $ +# $Id: journal.pl,v 1.17 2006/10/24 14:08:15 sugi Exp $ use strict; use Slash 2.003; # require Slash 2.3.x @@ -13,7 +13,7 @@ use Slash::XML; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.16 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.17 $ ' =~ /\$Revision:\s+([^\s]+)/; sub main { my $journal = getObject('Slash::Journal'); @@ -351,6 +351,7 @@ unless ($articles && @$articles) { print getData('noviewfriends'); + print getData('journalfoot'); return; } From sugi ¡÷ users.sourceforge.jp Mon Oct 30 17:30:10 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Mon, 30 Oct 2006 17:30:10 +0900 Subject: [Slashdotjp-dev 636] CVS update: slashjp/debian Message-ID: <20061030083010.869482AC135@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u slashjp/debian/changelog:1.9 slashjp/debian/changelog:1.10 --- slashjp/debian/changelog:1.9 Wed Oct 4 17:24:36 2006 +++ slashjp/debian/changelog Mon Oct 30 17:30:10 2006 @@ -1,3 +1,9 @@ +slash (2.5.0.119-10) unstable; urgency=low + + * remove obsolete light mode code + + -- Tatsuki Sugiura Mon, 30 Oct 2006 17:29:37 +0900 + slash (2.5.0.119-9) unstable; urgency=low * remove 'SET NAMES utf8' from MySQL.pm. From sugi ¡÷ users.sourceforge.jp Mon Oct 30 20:57:36 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Mon, 30 Oct 2006 20:57:36 +0900 Subject: [Slashdotjp-dev 637] CVS update: slashjp/Slash/Utility/Environment Message-ID: <20061030115736.443762AC191@users.sourceforge.jp> Index: slashjp/Slash/Utility/Environment/Environment.pm diff -u slashjp/Slash/Utility/Environment/Environment.pm:1.15 slashjp/Slash/Utility/Environment/Environment.pm:1.16 --- slashjp/Slash/Utility/Environment/Environment.pm:1.15 Mon Aug 28 19:00:45 2006 +++ slashjp/Slash/Utility/Environment/Environment.pm Mon Oct 30 20:57:36 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: Environment.pm,v 1.15 2006/08/28 10:00:45 sugi Exp $ +# $Id: Environment.pm,v 1.16 2006/10/30 11:57:36 sugi Exp $ package Slash::Utility::Environment; @@ -35,7 +35,7 @@ use base 'Exporter'; use vars qw($VERSION @EXPORT); -($VERSION) = ' $Revision: 1.15 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.16 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( dbAvailable @@ -1858,6 +1858,9 @@ next; } elsif (/^op_(.+)$/){ $form{'op'} = $1; + } elsif ($_ eq 'light') { + $form{simpledesign} = $form{light}; + $form{lowbandwidth} = $form{light}; } } } @@ -3410,4 +3413,4 @@ =head1 VERSION -$Id: Environment.pm,v 1.15 2006/08/28 10:00:45 sugi Exp $ +$Id: Environment.pm,v 1.16 2006/10/30 11:57:36 sugi Exp $