[vhffs-dev] [518] Type is shown in acceptation mails.

[subversion@xxxxxxxxx]

Revision: 518
Author:   beuss
Date:     2007-03-20 21:57:41 +0000 (Tue, 20 Mar 2007)

Log Message:
-----------
Type is shown in acceptation mails.

Modified Paths:
--------------
    branches/vhffs_4.1/vhffs-api/src/Vhffs/Services/Mysql.pm
    branches/vhffs_4.1/vhffs-irc/modobot.pl
    branches/vhffs_4.1/vhffs-panel/admin/moderation_submit.pl


Modified: branches/vhffs_4.1/vhffs-api/src/Vhffs/Services/Mysql.pm
===================================================================
--- branches/vhffs_4.1/vhffs-api/src/Vhffs/Services/Mysql.pm	2007-03-20 18:51:30 UTC (rev 517)
+++ branches/vhffs_4.1/vhffs-api/src/Vhffs/Services/Mysql.pm	2007-03-20 21:57:41 UTC (rev 518)
@@ -277,7 +277,7 @@
 
 sub _new {
     my ($class, $main, $mysql_id, $owner_gid, $dbname, $dbuser, $dbpass, $oid, $owner_uid, $date_creation, $state, $description) = @_;
-    my $self = $class->SUPER::_new($main, $oid, $owner_uid, $date_creation, $description, $state, Vhffs:Constants::TYPE_MYSQL);
+    my $self = $class->SUPER::_new($main, $oid, $owner_uid, $date_creation, $description, $state, Vhffs::Constants::TYPE_MYSQL);
     return undef unless(defined $self);
 
     $self->{mysql_id} = $mysql_id;

Modified: branches/vhffs_4.1/vhffs-irc/modobot.pl
===================================================================
--- branches/vhffs_4.1/vhffs-irc/modobot.pl	2007-03-20 18:51:30 UTC (rev 517)
+++ branches/vhffs_4.1/vhffs-irc/modobot.pl	2007-03-20 21:57:41 UTC (rev 518)
@@ -390,12 +390,18 @@
             if( defined $userbis )
             {
                 my $mail;
-                $mail  = gettext("Your request on VHFFS was accepted\n");
-                $mail .= gettext("Please wait while we are creating your object\n");
-                $mail .= gettext("Cheers,")."\n";
-                $mail .= gettext("The Moderator and Admin team");
+                $mail = gettext('Your request for a ');
+                $mail .= Vhffs::Functions::type_string_from_type_id($object->get_type);
+                $mail .= (' on ');
+                $mail .= $vhffs->get_config->get_host_name;
+                $mail .= gettext(" was accepted\nPlease wait while we are creating your object\n");
+                $mail .= gettext("Cheers,\nThe Moderator and Admin team\n");
+                $mail .= "-----\n";
+                $mail .= $vhffs->get_config->get_host_name()."\n";
+                $mail .= $vhffs->get_config->get_panel_url();
 
-                my $subject = gettext("Your request on VHFFS platform");
+
+                my $subject = sprintf(gettext("Your request on %s"), $vhffs->get_config->get_host_name());
                 Vhffs::Functions::send_mail( $vhffs->get_config->get_moderator_mail , $userbis->get_mail , $subject , $mail );
 
                 if( $vhffs->get_config->use_notation == 1 )

Modified: branches/vhffs_4.1/vhffs-panel/admin/moderation_submit.pl
===================================================================
--- branches/vhffs_4.1/vhffs-panel/admin/moderation_submit.pl	2007-03-20 18:51:30 UTC (rev 517)
+++ branches/vhffs_4.1/vhffs-panel/admin/moderation_submit.pl	2007-03-20 21:57:41 UTC (rev 518)
@@ -98,10 +98,15 @@
 			if( defined $userbis )
 			{
 			    my $mail;
-			    $mail  = gettext("Your request on VHFFS was accepted\n");
-			    $mail .= gettext("Please wait while we are creating your object\n");
-			    $mail .= gettext("Cheers,")."\n";
-			    $mail .= gettext("The Moderator and Admin team");
+                $mail = gettext('Your request for a ');
+                $mail .= Vhffs::Functions::type_string_from_type_id($object->get_type);
+                $mail .= (' on ');
+                $mail .= $vhffs->get_config->get_host_name;
+                $mail .= gettext(" was accepted\nPlease wait while we are creating your object\n");
+                $mail .= gettext("Cheers,\nThe Moderator and Admin team\n");
+                $mail .= "-----\n";
+                $mail .= $vhffs->get_config->get_host_name()."\n";
+                $mail .= $vhffs->get_config->get_panel_url();
 
 			    my $subject = gettext("Your request on VHFFS platform");
 			    Vhffs::Functions::send_mail( $vhffs->get_config->get_moderator_mail , $userbis->get_mail , $subject , $mail );