[vhffs-dev] [svn] commit: r129 - in /trunk: Relases.notes vhffs-irc/ vhffs-irc/README vhffs-irc/modobot.pl vhffs-panel/admin/moderation.pl vhffs-panel/panel.pl vhffs-tools/src/vhffs-moderate

[vhffs-dev@xxxxxxxxx]

Author: soda
Date: Fri Jan  6 16:36:27 2006
New Revision: 129

Log:
int fix
add vhffs-irc, an irc bot for vhffs

Added:
    trunk/vhffs-irc/
    trunk/vhffs-irc/README
    trunk/vhffs-irc/modobot.pl
Modified:
    trunk/Relases.notes
    trunk/vhffs-panel/admin/moderation.pl
    trunk/vhffs-panel/panel.pl
    trunk/vhffs-tools/src/vhffs-moderate

Modified: trunk/Relases.notes
==============================================================================
--- trunk/Relases.notes (original)
+++ trunk/Relases.notes Fri Jan  6 16:36:27 2006
@@ -8,5 +8,6 @@
 - add some tools : 	* vhffs-usermod to modify users from command line
 					* vhffs-groupdel to delete a group from command line
 					* vhffs-moderate to moderate objects from command line
+- Add irc bot support to moderate request on vhffs
 
 

Modified: trunk/vhffs-panel/admin/moderation.pl
==============================================================================
--- trunk/vhffs-panel/admin/moderation.pl (original)
+++ trunk/vhffs-panel/admin/moderation.pl Fri Jan  6 16:36:27 2006
@@ -132,7 +132,7 @@
 		}
 		else
 		{
-			$template->param( MODERATION_WEB => gettext("No Web Area to moderate") );
+			$template->param( MODERATION_WEB => gettext("No Web Area to validate") );
 		}
 	}
 
@@ -173,7 +173,7 @@
 		}
 		else
 		{
-			$template->param( MODERATION_DNS => gettext("No DNS to moderate") );
+			$template->param( MODERATION_DNS => gettext("No DNS to validate") );
 		}
 	}
 
@@ -217,7 +217,7 @@
 		}
 		else
 		{
-			$template->param( MODERATION_CVS => gettext("No repository to moderate") );
+			$template->param( MODERATION_CVS => gettext("No repository to validate") );
 		}
 	}
 
@@ -260,7 +260,7 @@
 		}
 		else
 		{
-			$template->param( MODERATION_MAILING => gettext("No list to moderate") );
+			$template->param( MODERATION_MAILING => gettext("No list to validate") );
 		}
 	}
 
@@ -305,7 +305,7 @@
 		}
 		else
 		{
-			$template->param( MODERATION_SVN => gettext("No repository to moderate") );
+			$template->param( MODERATION_SVN => gettext("No repository to validate") );
 		}
 	}
 
@@ -350,7 +350,7 @@
 		}
 		else
 		{
-			$template->param( MODERATION_MAIL => gettext("No Mail Area to moderate") );
+			$template->param( MODERATION_MAIL => gettext("No Mail Area to validate") );
 		}
 	}
 
@@ -393,7 +393,7 @@
 		}
 		else
 		{
-			$template->param( MODERATION_MYSQL => gettext("No database to moderate") );
+			$template->param( MODERATION_MYSQL => gettext("No database to validate") );
 		}
 	}
 
@@ -435,7 +435,7 @@
 		}
 		else
 		{
-			$template->param( MODERATION_POSTGRES => gettext("No database to moderate") );
+			$template->param( MODERATION_POSTGRES => gettext("No database to validate") );
 		}
 	}
 

Modified: trunk/vhffs-panel/panel.pl
==============================================================================
--- trunk/vhffs-panel/panel.pl (original)
+++ trunk/vhffs-panel/panel.pl Fri Jan  6 16:36:27 2006
@@ -66,7 +66,7 @@
 	$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
 	$template->param( MESSAGE => $message );
 }
-elsif( ( defined $projectname ) && ( $projectname eq "none" )  )  {
+elsif( ( defined $projectname ) && ( $projectname == "none" )  )  {
 	$template = right_first Vhffs::Panel::Main($vhffs , $session , $user);
 }
 elsif( ! ( defined $projectname ) )

Modified: trunk/vhffs-tools/src/vhffs-moderate
==============================================================================
--- trunk/vhffs-tools/src/vhffs-moderate (original)
+++ trunk/vhffs-tools/src/vhffs-moderate Fri Jan  6 16:36:27 2006
@@ -63,7 +63,6 @@
 		use Vhffs::Services::Httpd;
 		print "Webarea to validate: \n";
 		my $webs = Vhffs::Services::Httpd::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION);
-		my $web;
 	
 		if( defined $webs )
 		{
@@ -101,7 +100,6 @@
 
 	if( $vhffs->get_config->use_dns == 1 )
 	{
-		#Treat Mail domains to moderate
 		use Vhffs::Services::DNS;
 		print "DNS to validate\n";
 		my $nss = Vhffs::Services::DNS::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION );
@@ -140,7 +138,6 @@
 
 	if( $vhffs->get_config->use_cvs == 1 )
 	{
-		#Treat Mail domains to moderate
 		use Vhffs::Services::Cvs;
 		print "CVS Repository to validate\n";
 		my $repos = Vhffs::Services::Cvs::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION );
@@ -177,7 +174,6 @@
 
 	if( $vhffs->get_config->use_mailing == 1 )
 	{
-		#Treat Mail domains to moderate
 		use Vhffs::Panel::Mailinglist;
 		print "List to validate\n";
 		my $mls = Vhffs::Services::Mailing::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION );
@@ -215,7 +211,6 @@
 
 	if( $vhffs->get_config->use_svn == 1 )
 	{
-		#Treat Mail domains to moderate
 		use Vhffs::Services::Svn;
 		use Vhffs::Constants;
 		print "Subversion Repository to validate\n";
@@ -256,7 +251,6 @@
 
 	if( $vhffs->get_config->use_mail == 1 )
 	{
-		#Treat Mail domains to moderate
 		use Vhffs::Panel::Mail;
 		print "Mail Area to validate\n";
 		my $mails = Vhffs::Services::Mail::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION );
@@ -334,7 +328,6 @@
 
 	if( $vhffs->get_config->use_postgres == 1 )
 	{
-		#Treat Mail domains to moderate
 		use Vhffs::Services::Postgres;
 		print gettext("Postgres database to validate") . "\n";
 		my $dbs = Vhffs::Services::Postgres::getall( $vhffs , Vhffs::Constants::WAITING_FOR_VALIDATION );
@@ -474,7 +467,7 @@
 	}
 	elsif( $arg =~ /^refuse$/ )
 	{
-		if( moderate( $oid , 1 ) == 0 )
+		if( moderate( $oid , 0 ) == 0 )
 		{
 			print "Succesfully moderate\n";
 			exit( 0 );