SRAD

[Slashdotjp-dev 1034] [562] merged from 2.5.0.192 branch

svnno****@sourc***** svnno****@sourc*****
2008年 4月 1日 (火) 12:48:35 JST

• 前の記事 [Slashdotjp-dev 1033] [561] make upstream/2.5.0.198 branch
• 次の記事 [Slashdotjp-dev 1036] [563] merged from upstream/2.5.0.198 branch
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 562
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=562
Author:   tach
Date:     2008-04-01 12:48:35 +0900 (Tue, 01 Apr 2008)

Log Message:
-----------
merged from 2.5.0.192 branch

Modified Paths:
--------------
    slashjp/trunk/Slash/Utility/Environment/Environment.pm
    slashjp/trunk/plugins/FireHose/FireHose.pm
    slashjp/trunk/plugins/Tags/tagbox.pl
    slashjp/trunk/plugins/Zoo/zoo_run_people_log.pl
    slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm
    slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm
    slashjp/trunk/tagboxes/FHPopularity2/FHPopularity2.pm
    slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm


-------------- next part --------------
Modified: slashjp/trunk/Slash/Utility/Environment/Environment.pm
===================================================================
--- slashjp/trunk/Slash/Utility/Environment/Environment.pm	2008-04-01 03:42:48 UTC (rev 561)
+++ slashjp/trunk/Slash/Utility/Environment/Environment.pm	2008-04-01 03:48:35 UTC (rev 562)
@@ -467,7 +467,6 @@
 	} else {
 		$form = $static_form;
 	}
-	map { $form->{$_} =~ s/\p{BidiControl}|\p{Unassigned}|\p{JoinControl}//g } keys(%$form);
 
 	return defined $value ? $form->{$value} : $form;
 }
@@ -1878,8 +1877,10 @@
 		sid		=> sub { $_[0] = '' unless
 					 $_[0] =~ Slash::Utility::Data::regexSid()	},
 		flags		=> sub { $_[0] =~ s|[^a-z0-9_,]||g			},
-		query		=> sub { $_[0] =~ s|[\000-\040<>\177-\377]+| |g;
+		query		=> sub { $_[0] =~ s|[\000-\040<>\177\p{BidiControl}\p{Unassigned}\p{JoinControl}]+| |g;
 			        	 $_[0] =~ s|\s+| |g;				},
+		q		=> sub { $_[0] =~ s|[\000-\040<>\177\p{BidiControl}\p{Unassigned}\p{JoinControl}]+| |g;
+			        	 $_[0] =~ s|\s+| |g;				},
 		colorblock	=> sub { $_[0] =~ s|[^\w#,]+||g				},
 # What I actually want to do for userfield is allow it to match
 # [\w.]+, or pass emailValid(), or be changed to the return value
@@ -1963,8 +1964,6 @@
 		$data = fixint($data);
 	} elsif (exists $alphas{$key}) {
 		$data =~ s|[^a-zA-Z0-9_]+||g;
-	} elsif (exists $special{$key}) {
-		$special{$key}->($data);
 	} else {
 		for my $ri (@regints) {
 			$data = fixint($data) if $ri =~ $key;
@@ -1982,6 +1981,10 @@
 			}
 		}
 	}
+	if (exists $special{$key}) {
+		$special{$key}->($data);
+	}
+	$data =~ s/\p{BidiControl}|\p{Unassigned}|\p{JoinControl}//g;
 
 	return $data;
 }

Modified: slashjp/trunk/plugins/FireHose/FireHose.pm
===================================================================
--- slashjp/trunk/plugins/FireHose/FireHose.pm	2008-04-01 03:42:48 UTC (rev 561)
+++ slashjp/trunk/plugins/FireHose/FireHose.pm	2008-04-01 03:48:35 UTC (rev 562)
@@ -188,7 +188,7 @@
 	my $popularity = defined $options->{popularity}
 		? $options->{popularity}
 		: $type eq "feed"
-			? $self->getEntryPopularityForColorLevel(6)
+			? $self->getEntryPopularityForColorLevel(7)
 			: $self->getEntryPopularityForColorLevel(7);
 	my $activity   = defined $options->{activity} ? $options->{activity} : 1;
 

Modified: slashjp/trunk/plugins/Tags/tagbox.pl
===================================================================
--- slashjp/trunk/plugins/Tags/tagbox.pl	2008-04-01 03:42:48 UTC (rev 561)
+++ slashjp/trunk/plugins/Tags/tagbox.pl	2008-04-01 03:48:35 UTC (rev 562)
@@ -282,7 +282,8 @@
 sub insert_feederlog {
 	my($tagbox, $feeder_ar) = @_;
 	for my $feeder_hr (@$feeder_ar) {
-main::tagboxLog("addFeederInfo: tbid=$tagbox->{tbid} tagid=$feeder_hr->{tagid} affected_id=$feeder_hr->{affected_id} imp=$feeder_hr->{importance}");
+main::tagboxLog("addFeederInfo: tbid=$tagbox->{tbid} tagid=$feeder_hr->{tagid} affected_id=$feeder_hr->{affected_id} imp=$feeder_hr->{importance}")
+	if (defined($feeder_hr->{tagid}));
 		$tagboxdb->addFeederInfo($tagbox->{tbid}, $feeder_hr);
 	}
 }

Modified: slashjp/trunk/plugins/Zoo/zoo_run_people_log.pl
===================================================================
--- slashjp/trunk/plugins/Zoo/zoo_run_people_log.pl	2008-04-01 03:42:48 UTC (rev 561)
+++ slashjp/trunk/plugins/Zoo/zoo_run_people_log.pl	2008-04-01 03:48:35 UTC (rev 562)
@@ -3,7 +3,7 @@
 # $Id$
 
 use strict;
-use Slash::Constants qw( :messages :slashd :people );
+use Slash::Constants qw( :messages :slashd );
 use Slash::Display;
 
 use vars qw( %task $me );

Modified: slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm
===================================================================
--- slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm	2008-04-01 03:42:48 UTC (rev 561)
+++ slashjp/trunk/tagboxes/FHEditorPop/FHEditorPop.pm	2008-04-01 03:48:35 UTC (rev 562)
@@ -167,7 +167,7 @@
 	} elsif ($type eq 'urls') {
 		$extra_pop = $self->sqlCount('bookmarks', "url_id=$target_id_q") || 0;
 		$color_level = $self->sqlCount("firehose", "type='feed' AND url_id=$target_id")
-			? 6  # feed
+			? 7  # feed
 			: 7; # nonfeed
 	} elsif ($type eq "stories") {
 		my $story = $self->getStory($target_id);

Modified: slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm
===================================================================
--- slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm	2008-04-01 03:42:48 UTC (rev 561)
+++ slashjp/trunk/tagboxes/FHPopularity/FHPopularity.pm	2008-04-01 03:48:35 UTC (rev 562)
@@ -153,7 +153,7 @@
 	} elsif ($type eq 'urls') {
 		$extra_pop = $self->sqlCount('bookmarks', "url_id=$target_id_q") || 0;
 		$color_level = $self->sqlCount("firehose", "type='feed' AND url_id=$target_id")
-			? 6  # feed
+			? 7  # feed
 			: 7; # nonfeed
 	} elsif ($type eq "stories") {
 		my $story = $self->getStory($target_id);

Modified: slashjp/trunk/tagboxes/FHPopularity2/FHPopularity2.pm
===================================================================
--- slashjp/trunk/tagboxes/FHPopularity2/FHPopularity2.pm	2008-04-01 03:42:48 UTC (rev 561)
+++ slashjp/trunk/tagboxes/FHPopularity2/FHPopularity2.pm	2008-04-01 03:48:35 UTC (rev 562)
@@ -150,7 +150,7 @@
 	} elsif ($type eq 'urls') {
 		$extra_pop = $self->sqlCount('bookmarks', "url_id=$target_id_q") || 0;
 		$color_level = $self->sqlCount("firehose", "type='feed' AND url_id=$target_id")
-			? 6  # feed
+			? 7  # feed
 			: 7; # nonfeed
 	} elsif ($type eq "stories") {
 		my $story = $self->getStory($target_id);

Modified: slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm
===================================================================
--- slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm	2008-04-01 03:42:48 UTC (rev 561)
+++ slashjp/trunk/tagboxes/FireHoseScores/FireHoseScores.pm	2008-04-01 03:48:35 UTC (rev 562)
@@ -268,7 +268,7 @@
 		# XXX should modify next line by users' vote clout
 		$extra_pop = $self->sqlCount('bookmarks', "url_id=$target_id_q") || 0;
 		$color_level = $self->sqlCount("firehose", "type='feed' AND url_id=$target_id")
-			? 6  # feed
+			? 7  # feed
 			: 7; # nonfeed
 	} elsif ($type eq "stories") {
 		my $story = $self->getStory($target_id);

• 前の記事 [Slashdotjp-dev 1033] [561] make upstream/2.5.0.198 branch
• 次の記事 [Slashdotjp-dev 1036] [563] merged from upstream/2.5.0.198 branch
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]