[Cpan-forum-commit] rev 97 - in trunk: lib/CPAN templates

[svn at pti.co.il]

Author: gabor
Date: 2005-02-06 13:26:56 +0200 (Sun, 06 Feb 2005)
New Revision: 97

Modified:
   trunk/lib/CPAN/Forum.pm
   trunk/templates/admin.tmpl
Log:
get the size of the RSS feed from the central configuration

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2005-02-06 11:16:33 UTC (rev 96)
+++ trunk/lib/CPAN/Forum.pm	2005-02-06 11:26:56 UTC (rev 97)
@@ -16,7 +16,6 @@
 
 use CPAN::Forum::INC;
 
-my $limit_rss   = 10;
 my $cookiename  = "cpanforum";
 my $SUBJECT = qr{[\w .:~!@#\$%^&*\()+?><,'";=-]+};
 
@@ -1945,9 +1944,12 @@
 		$self->log->fatal("Could not find from field !!");
 	}
 
-	if (my ($conf) = CPAN::Forum::Configure->find_or_create({field => 'per_page'})) {
-		$conf->value($q->param('per_page'));
-		$conf->update;
+	# fields that can have only one value
+	foreach my $field (qw(rss_size per_page)) {
+		if (my ($conf) = CPAN::Forum::Configure->find_or_create({field => $field})) {
+			$conf->value($q->param($field));
+			$conf->update;
+		}
 	}
 
 	my $t = $self->load_tmpl("admin.tmpl");
@@ -1981,9 +1983,8 @@
 sub rss {
 	my $self = shift;
 	
-	my $cnt = $limit_rss;
+	my $cnt = $self->config("rss_size") || 10;
 	my @params = @{$self->param("path_parameters")};
-#	warn Dumper \@params;
 	my $it;
 	if (@params > 1 and $params[0] eq "dist") {
 		my $dist = $params[1];
@@ -1997,7 +1998,8 @@
 	my $rss = XML::RSS::SimpleGen->new( $url, "CPAN Forum", "Discussing Perl CPAN modules");
 	$rss->language( 'en' );
 
-	my $admin = CPAN::Forum::Users->retrieve(1);
+	my $admin = CPAN::Forum::Users->retrieve(1); # TODO this is a hard coded user id of the administrator !
+	# and this reveals the e-mail of the administrator. not a good idea I guess.
 	$rss->webmaster($admin->email);
 
 	my $prefix = "";
@@ -2011,7 +2013,6 @@
 	#$self->header_props(-type => 'application/xml');
 	
 	return $rss->as_string();
-	#$self->internal_error;
 }
 
 =head2 notify

Modified: trunk/templates/admin.tmpl
===================================================================
--- trunk/templates/admin.tmpl	2005-02-06 11:16:33 UTC (rev 96)
+++ trunk/templates/admin.tmpl	2005-02-06 11:26:56 UTC (rev 97)
@@ -16,6 +16,7 @@
 <table>
 <tr><td>From address:</td><td><input name="from" value="<TMPL_VAR from>" size="50"></td></tr>
 <tr><td>Page size:</td><td><input name="per_page" value="<TMPL_VAR per_page>" size="5"></td></tr>
+<tr><td>RSS size:</td><td><input name="rss_size" value="<TMPL_VAR rss_size>" size="5"></td></tr>
 </table>
 <p>
 <input type="submit" value="Update" />