[vhffs-dev] [815] Merged mailing into mailinglist, Conf::use_mailing renamed to Conf:: use_mailinglist

[subversion@xxxxxxxxx]

Revision: 815
Author:   gradator
Date:     2007-08-30 01:50:17 +0000 (Thu, 30 Aug 2007)

Log Message:
-----------
Merged mailing into mailinglist, Conf::use_mailing renamed to Conf::use_mailinglist

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Conf.pm
    trunk/vhffs-api/src/Vhffs/Group.pm
    trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
    trunk/vhffs-api/src/Vhffs/Panel/Main.pm
    trunk/vhffs-api/src/Vhffs/Panel/Menu.pm
    trunk/vhffs-api/src/Vhffs/Services/MailingList.pm
    trunk/vhffs-backend/conf/vhffs.conf.dist.in
    trunk/vhffs-irc/modobot.pl
    trunk/vhffs-panel/admin/moderation.pl
    trunk/vhffs-panel/mailinglist/create.pl
    trunk/vhffs-public/group.pl
    trunk/vhffs-tests/conf/vhffs.conf
    trunk/vhffs-tools/src/vhffs-moderate


Modified: trunk/vhffs-api/src/Vhffs/Conf.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-api/src/Vhffs/Conf.pm	2007-08-30 01:50:17 UTC (rev 815)
@@ -281,10 +281,10 @@
 
 
 
-sub use_mailing
+sub use_mailinglist
 {
-	return -1 if( ! defined $Config{"global"}{"modules"}{'use_mailing'} );
-	return 1 if( $Config{"global"}{"modules"}{'use_mailing'} eq "yes");
+	return -1 if( ! defined $Config{"global"}{"modules"}{'use_mailinglist'} );
+	return 1 if( $Config{"global"}{"modules"}{'use_mailinglist'} eq "yes");
 	return 0;
 }
 

Modified: trunk/vhffs-api/src/Vhffs/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Group.pm	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-api/src/Vhffs/Group.pm	2007-08-30 01:50:17 UTC (rev 815)
@@ -235,7 +235,7 @@
 		return 0 if( $rows != 0 );
 	}
 
-    if( $config->use_mailing == 1) {
+    if( $config->use_mailinglist == 1) {
         $query = 'SELECT COUNT(*) FROM vhffs_object WHERE type = ? AND owner_gid = ?';
         $request = $self->get_db_object()->prepare( $query );
         $request->execute( Vhffs::Constants::TYPE_ML, $self->get_gid );

Modified: trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Admin.pm	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-api/src/Vhffs/Panel/Admin.pm	2007-08-30 01:50:17 UTC (rev 815)
@@ -317,7 +317,7 @@
     push @$categories, get_svn_category     if($config->use_svn);
     push @$categories, get_dns_category     if($config->use_dns);
     push @$categories, get_mail_category    if($config->use_mail);
-    push @$categories, get_mailing_category if($config->use_mailing);
+    push @$categories, get_mailing_category if($config->use_mailinglist);
     push @$categories, get_repo_category    if($config->use_repository);
 
 
@@ -349,7 +349,7 @@
     push @$categories, get_svn_category     if($config->use_svn);
     push @$categories, get_dns_category     if($config->use_dns);
     push @$categories, get_mail_category    if($config->use_mail);
-    push @$categories, get_mailing_category if($config->use_mailing);
+    push @$categories, get_mailing_category if($config->use_mailinglist);
     push @$categories, get_repo_category    if($config->use_repository);
 
 

Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2007-08-30 01:50:17 UTC (rev 815)
@@ -564,7 +564,7 @@
             $services_list .= $self->create_service_index('svn', $svn);
         }
 
-        if($config->use_mailing) {
+        if($config->use_mailinglist) {
             my $ml = Vhffs::Panel::MailingList::getall_per_group( $vhffs, $gid );
             $services_list .= $self->create_service_index('mailinglist', $ml);
         }

Modified: trunk/vhffs-api/src/Vhffs/Panel/Menu.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Menu.pm	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-api/src/Vhffs/Panel/Menu.pm	2007-08-30 01:50:17 UTC (rev 815)
@@ -68,7 +68,7 @@
     push @$items, {path => 'dns', label => gettext('Domain names') } if( $config->use_dns );
     push @$items, {path => 'repository', label => gettext('Dl repos') } if( $config->use_repository );
     push @$items, {path => 'mail', label => gettext('Mail') } if( $config->use_mail );
-    push @$items, {path => 'mailinglist', label => gettext('ML') } if( $config->use_mailing );
+    push @$items, {path => 'mailinglist', label => gettext('ML') } if( $config->use_mailinglist );
     $context_tmpl->param( MENU_ITEMS => $items );
     return $context_tmpl->output();
 }
@@ -116,7 +116,7 @@
     push @$items, {path => 'admin/dns', label => gettext('Domain names') } if( $config->use_dns );
     push @$items, {path => 'admin/repository', label => gettext('Dl repos') } if( $config->use_repository );
     push @$items, {path => 'admin/mail', label => gettext('Mail') } if( $config->use_mail );
-    push @$items, {path => 'admin/mailing', label => gettext('ML') } if( $config->use_mailing );
+    push @$items, {path => 'admin/mailing', label => gettext('ML') } if( $config->use_mailinglist );
     $context_tmpl->param( MENU_ITEMS => $items );
     return $context_tmpl->output();
 

Modified: trunk/vhffs-api/src/Vhffs/Services/MailingList.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Services/MailingList.pm	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-api/src/Vhffs/Services/MailingList.pm	2007-08-30 01:50:17 UTC (rev 815)
@@ -85,7 +85,7 @@
     eval {
         # Group must be the mail domain owner or use default mail domain.
         my $sql = 'SELECT mxdomain_id FROM vhffs_mxdomain m INNER JOIN vhffs_object o ON o.object_id = m.object_id WHERE m.domain = ? AND o.owner_gid = ?';
-        die('Mail domain not found') unless($domain eq $main->get_config()->get_service("mailing")->{'default_domain'} ||
+        die('Mail domain not found') unless($domain eq $main->get_config()->get_service("mailinglist")->{'default_domain'} ||
                             $dbh->do($sql, undef, $domain, $group->get_gid) > 0);
 
         my $parent = Vhffs::Object::create($main, $user->get_uid, $group->get_gid, $description, undef, Vhffs::Constants::TYPE_ML);

Modified: trunk/vhffs-backend/conf/vhffs.conf.dist.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-backend/conf/vhffs.conf.dist.in	2007-08-30 01:50:17 UTC (rev 815)
@@ -69,7 +69,7 @@
 		use_svn		=	no
 		use_pgsql	=	no
 		use_dns		=	no
-		use_mailing	=	no
+		use_mailinglist	=	no
 		use_mailuser	=	no
 		use_mailgroup	=	no
 		use_repository	=	no
@@ -328,10 +328,9 @@
 		url_doc			=	http://help.myhoster.net/mailgroup
 	</mailgroup>
 
-	<mailing>
-		default_domain	=	lists.vhffs.org
-	</mailing>
 	<mailinglist>
+		default_domain	=	lists.vhffs.org
+
 		# URL to the documentation (optional)
 		url_doc		=	http://help.myhoster.net/ml
 	</mailinglist>

Modified: trunk/vhffs-irc/modobot.pl
===================================================================
--- trunk/vhffs-irc/modobot.pl	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-irc/modobot.pl	2007-08-30 01:50:17 UTC (rev 815)
@@ -190,7 +190,7 @@
         }
     }
 
-    if( $vhffs->get_config->use_mailing == 1 )
+    if( $vhffs->get_config->use_mailinglist == 1 )
     {
         #Treat Mailing lists to moderate
         use Vhffs::Panel::MailingList;

Modified: trunk/vhffs-panel/admin/moderation.pl
===================================================================
--- trunk/vhffs-panel/admin/moderation.pl	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-panel/admin/moderation.pl	2007-08-30 01:50:17 UTC (rev 815)
@@ -254,7 +254,7 @@
 
 
 
-	if( $vhffs->get_config->use_mailing == 1 )
+	if( $vhffs->get_config->use_mailinglist == 1 )
 	{
 		#Treat Mail domains to moderate
 		use Vhffs::Panel::MailingList;

Modified: trunk/vhffs-panel/mailinglist/create.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/create.pl	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-panel/mailinglist/create.pl	2007-08-30 01:50:17 UTC (rev 815)
@@ -57,7 +57,7 @@
 my $submitted       = $cgi->param('mailing_submit');
 
 # Get default domain for list configured in the config file
-my $list_conf       = $vhffs->get_config->get_service("mailing");
+my $list_conf       = $vhffs->get_config->get_service("mailinglist");
 my $default_domain = $list_conf->{'default_domain'};
 
 my $localpart;

Modified: trunk/vhffs-public/group.pl
===================================================================
--- trunk/vhffs-public/group.pl	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-public/group.pl	2007-08-30 01:50:17 UTC (rev 815)
@@ -197,7 +197,7 @@
 
 
 
-		if( $vhffs->get_config->use_mailing == 1 )
+		if( $vhffs->get_config->use_mailinglist == 1 )
 		{
 			use Vhffs::Services::MailingList;
 			$objs = Vhffs::Services::MailingList::getall_by_group( $vhffs , $group );

Modified: trunk/vhffs-tests/conf/vhffs.conf
===================================================================
--- trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-tests/conf/vhffs.conf	2007-08-30 01:50:17 UTC (rev 815)
@@ -55,7 +55,7 @@
 		use_svn		=	no
 		use_pgsql	=	no
 		use_dns		=	no
-		use_mailing	=	no
+		use_mailinglist	=	no
 		use_mailuser	=	no
 		use_repository	=	no
 	</modules>

Modified: trunk/vhffs-tools/src/vhffs-moderate
===================================================================
--- trunk/vhffs-tools/src/vhffs-moderate	2007-08-30 01:19:22 UTC (rev 814)
+++ trunk/vhffs-tools/src/vhffs-moderate	2007-08-30 01:50:17 UTC (rev 815)
@@ -173,7 +173,7 @@
 	print "\n";
 
 
-	if( $vhffs->get_config->use_mailing == 1 )
+	if( $vhffs->get_config->use_mailinglist == 1 )
 	{
 		use Vhffs::Panel::Mailinglist;
 		print "List to validate\n";