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

[svn at pti.co.il]

Author: gabor
Date: 2005-03-22 14:59:23 +0200 (Tue, 22 Mar 2005)
New Revision: 129

Modified:
   trunk/lib/CPAN/Forum.pm
   trunk/templates/groups.tmpl
   trunk/templates/posts.tmpl
   trunk/templates/register.tmpl
   trunk/templates/threads.tmpl
Log:
extend username lengthe to 25, make the log_level configurable from the outside

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2005-03-22 12:42:04 UTC (rev 128)
+++ trunk/lib/CPAN/Forum.pm	2005-03-22 12:59:23 UTC (rev 129)
@@ -522,6 +522,15 @@
 	
 	my $log = $self->param("ROOT") . "/db/messages.log";
 	$STATUS_FILE = $self->param("ROOT") . "/db/status";
+	my $log_level = 'critical'; 
+	if (open my $fh, $self->param("ROOT") . "/db/log_level") {
+		chomp (my $str = <$fh>);
+		if (Log::Dispatch->level_is_valid($str)) {
+			$log_level = $str;
+		} else {
+			warn "Invalid log level '$str'\n";
+		}
+	}
 
 	$self->log_config(
 		LOG_DISPATCH_MODULES => [
@@ -529,7 +538,7 @@
 			module            => 'Log::Dispatch::File',
 			name              => 'messages',
 			filename          => $log,
-			min_level         => 'debug',
+			min_level         => $log_level,
 			mode              => 'append',
 			close_after_write => 1,
 		},
@@ -951,7 +960,7 @@
 	}
 	
 	# TODO arbitrary nickname constraint, allow other nicknames ?
-	if ($q->param('nickname') !~ /^[a-z0-9]{1,10}$/) {
+	if ($q->param('nickname') !~ /^[a-z0-9]{1,25}$/) {
 		return $self->register({"bad_nickname" => 1});
 	}
 

Modified: trunk/templates/groups.tmpl
===================================================================
--- trunk/templates/groups.tmpl	2005-03-22 12:42:04 UTC (rev 128)
+++ trunk/templates/groups.tmpl	2005-03-22 12:59:23 UTC (rev 129)
@@ -2,8 +2,8 @@
 <p id="pageTitle"><b><TMPL_VAR group></b></p>
 <link href="/rss/dist/<TMPL_VAR group>" rel="alternate" type="application/rss+xml" title ="CPAN::Forum <TMPL_VAR group> rss" />
 <TMPL_INCLUDE NAME="navigation.tmpl">
+<TMPL_INCLUDE NAME="search_form.tmpl">
 <TMPL_INCLUDE NAME="links.tmpl">
-<TMPL_INCLUDE NAME="search_form.tmpl">
 
 <p>
 This section of the site is for discussing the <b><TMPL_VAR group></b> CPAN distribution.

Modified: trunk/templates/posts.tmpl
===================================================================
--- trunk/templates/posts.tmpl	2005-03-22 12:42:04 UTC (rev 128)
+++ trunk/templates/posts.tmpl	2005-03-22 12:59:23 UTC (rev 129)
@@ -2,10 +2,10 @@
 <p id="pageTitle"><TMPL_VAR group> - <TMPL_VAR subject></p>
 
 <TMPL_INCLUDE NAME="navigation.tmpl">
+<TMPL_INCLUDE NAME="search_form.tmpl">
 <TMPL_IF group>
 <TMPL_INCLUDE NAME="links.tmpl">
 </TMPL_IF>
-<TMPL_INCLUDE NAME="search_form.tmpl">
 
 <TMPL_IF post>
 	<p>

Modified: trunk/templates/register.tmpl
===================================================================
--- trunk/templates/register.tmpl	2005-03-22 12:42:04 UTC (rev 128)
+++ trunk/templates/register.tmpl	2005-03-22 12:59:23 UTC (rev 129)
@@ -9,14 +9,14 @@
 <TMPL_ELSE>
 
 <div class="error">
-<TMPL_IF bad_nickname>Nickname must be lower case alphanumeric between 1-10 characters.<br /></TMPL_IF>
+<TMPL_IF bad_nickname>Nickname must be lower case alphanumeric between 1-25 characters.<br /></TMPL_IF>
 <TMPL_IF bad_email>Email must be a valid address writen in lower case letters<br /></TMPL_IF>
 <TMPL_IF no_register_data>Need both nickname and password<br /></TMPL_IF>
 <TMPL_IF nickname_exists>Nickname or e-mail already in use<br /></TMPL_IF>
 </div>
 
 In order to post on this site first you'll have to register with a valid e-mail address.<br />
-Username currently should be between 1-10 characters.
+Username currently should be between 1-25 characters.
 <form method="post" action="/">
 <p>
 <input type="hidden" name="rm" value="register_process" />

Modified: trunk/templates/threads.tmpl
===================================================================
--- trunk/templates/threads.tmpl	2005-03-22 12:42:04 UTC (rev 128)
+++ trunk/templates/threads.tmpl	2005-03-22 12:59:23 UTC (rev 129)
@@ -2,6 +2,7 @@
 <p id="pageTitle">Thread</p>
 
 <TMPL_INCLUDE NAME="navigation.tmpl">
+<TMPL_INCLUDE NAME="search_form.tmpl">
 <TMPL_INCLUDE NAME="links.tmpl">
 
 <table class="threads">