[vhffs-dev] [1373] fixed bad signatures (no newline at end of mail)

[subversion@xxxxxxxxxxxxx]

Revision: 1373
Author:   gradator
Date:     2009-03-13 01:25:35 +0100 (Fri, 13 Mar 2009)

Log Message:
-----------
fixed bad signatures (no newline at end of mail)

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Functions.pm
    trunk/vhffs-api/src/Vhffs/Object.pm
    trunk/vhffs-panel/mailinglist/prefs.pl


Modified: trunk/vhffs-api/src/Vhffs/Functions.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Functions.pm	2009-03-12 22:14:00 UTC (rev 1372)
+++ trunk/vhffs-api/src/Vhffs/Functions.pm	2009-03-13 00:25:35 UTC (rev 1373)
@@ -270,6 +270,9 @@
 	my $message = shift;
 	my $precedence = shift;
 
+	chomp $message;
+	$message .= "\n";
+
 	my ( $gpgbin , $gpgconf );
 	if( defined $vhffs->get_config->get_gpg && defined $vhffs->get_config->get_gpg->{'gpg_bin'} ) {
 		$gpgbin = $vhffs->get_config->get_gpg->{'gpg_bin'};

Modified: trunk/vhffs-api/src/Vhffs/Object.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Object.pm	2009-03-12 22:14:00 UTC (rev 1372)
+++ trunk/vhffs-api/src/Vhffs/Object.pm	2009-03-13 00:25:35 UTC (rev 1373)
@@ -401,7 +401,7 @@
 	setlocale( LC_ALL , $user->get_lang );
 
 	my $mail = sprintf(
-		gettext( "Hello %s %s,\n\nYour request for a %s (%s) on %s was accepted.\nPlease wait while we are creating your object.\n\nCheers,\nThe moderator team\n\n---------\n%s\n%s" ) ,
+		gettext( "Hello %s %s,\n\nYour request for a %s (%s) on %s was accepted.\nPlease wait while we are creating your object.\n\nCheers,\nThe moderator team\n\n---------\n%s\n%s\n" ) ,
 
 		$user->get_firstname,
 		$user->get_lastname,
@@ -450,7 +450,7 @@
 	setlocale( LC_ALL , $user->get_lang );
 
 	my $mail = sprintf(
-		gettext( "Hello %s %s,\n\nYour request for a %s (%s) on %s was refused.\n\nThe reason of refusal given by moderators is:\n%s\n\nYou can change the description and submit it again for moderation on the\npanel. You can delete this object on the panel if you have made\na mistake. Don't be upset, if you don't understand why your request has\nbeen refused, just reply to this email !\n\nCheers,\nThe moderator team\n\n---------\n%s\n%s" ) ,
+		gettext( "Hello %s %s,\n\nYour request for a %s (%s) on %s was refused.\n\nThe reason of refusal given by moderators is:\n%s\n\nYou can change the description and submit it again for moderation on the\npanel. You can delete this object on the panel if you have made\na mistake. Don't be upset, if you don't understand why your request has\nbeen refused, just reply to this email !\n\nCheers,\nThe moderator team\n\n---------\n%s\n%s\n" ) ,
 
 		$user->get_firstname,
 		$user->get_lastname,
@@ -496,7 +496,7 @@
 	setlocale( LC_ALL , $user->get_lang );
 
 	my $mail = sprintf(
-		gettext( "Hello %s %s,\n\nYour %s (%s) on %s has been deleted.\n\nThis is because it have been refused a long time ago and you didn't\nsubmit an update since.\n\nFor reminder, the reason of refusal was:\n%s\n\nDon't be upset, submit it again if you forgot to update it in time.\nIf you need further information, just reply to this email !\n\nCheers,\nThe moderator team\n\n---------\n%s\n%s" ) ,
+		gettext( "Hello %s %s,\n\nYour %s (%s) on %s has been deleted.\n\nThis is because it have been refused a long time ago and you didn't\nsubmit an update since.\n\nFor reminder, the reason of refusal was:\n%s\n\nDon't be upset, submit it again if you forgot to update it in time.\nIf you need further information, just reply to this email !\n\nCheers,\nThe moderator team\n\n---------\n%s\n%s\n" ) ,
 
 		$user->get_firstname,
 		$user->get_lastname,

Modified: trunk/vhffs-panel/mailinglist/prefs.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/prefs.pl	2009-03-12 22:14:00 UTC (rev 1372)
+++ trunk/vhffs-panel/mailinglist/prefs.pl	2009-03-13 00:25:35 UTC (rev 1373)
@@ -301,7 +301,7 @@
                 $member,
        	        undef,
                 sprintf(gettext('[%s] You\'ve been added to the list %s'), $list->get_prefix, $list->get_localpart.'@'.$list->get_domain),
-       	        sprintf(gettext("Greetings,\n\nYou've been added to the list %s on platform %s.\n\nYou may get some help on listengine by sending an email to %s-request\@%s with subject help.\n\nCheers."), $list->get_localpart.'@'.$list->get_domain, $vhffs->get_config->get_host_name, $list->get_localpart, $list->get_domain),
+       	        sprintf(gettext("Greetings,\n\nYou've been added to the list %s on platform %s.\n\nYou may get some help on listengine by sending an email to %s-request\@%s with subject help.\n\nCheers.\n"), $list->get_localpart.'@'.$list->get_domain, $vhffs->get_config->get_host_name, $list->get_localpart, $list->get_domain),
                 );
         }
     }