[Fusionforge-commits] r7818 - in branches/Branch_4_8/gforge: common/include common/mail www/account

Julien HEYMAN jheyman at libremir.placard.fr.eu.org
Thu Jun 11 16:50:04 CEST 2009


Author: jheyman
Date: 2009-06-11 16:50:03 +0200 (Thu, 11 Jun 2009)
New Revision: 7818

Modified:
   branches/Branch_4_8/gforge/common/include/Group.class.php
   branches/Branch_4_8/gforge/common/mail/MailingList.class.php
   branches/Branch_4_8/gforge/www/account/change_email.php
   branches/Branch_4_8/gforge/www/account/lostpw.php
Log:
Fixed bug in body email

Modified: branches/Branch_4_8/gforge/common/include/Group.class.php
===================================================================
--- branches/Branch_4_8/gforge/common/include/Group.class.php	2009-06-11 14:46:24 UTC (rev 7817)
+++ branches/Branch_4_8/gforge/common/include/Group.class.php	2009-06-11 14:50:03 UTC (rev 7818)
@@ -2191,7 +2191,7 @@
 			$admin =& user_get_object($row_admins['user_id']);
 			setup_gettext_for_user ($admin) ;
 
-			$message=stripcslashes(sprintf(_('Your project registration for %4$s has been approved.
+			$message=sprintf(_('Your project registration for %4$s has been approved.
 
 Project Full Name:  %1$s
 Project Unix Name:  %2$s
@@ -2225,7 +2225,7 @@
 						       $this->getPublicName(), 
 						       $this->getUnixName(), 
 						       util_make_url ('/project/admin/?group_id='.$this->getID()),
-						       $GLOBALS['sys_name']));
+						       $GLOBALS['sys_name']);
 	
 			util_send_message($row_admins['email'], sprintf(_('%1$s Project Approved'), $GLOBALS['sys_name']), $message);
 
@@ -2263,18 +2263,18 @@
 			$admin =& user_get_object($row_admins['user_id']);
 			setup_gettext_for_user ($admin) ;
 
-			$response=stripcslashes(sprintf(_('Your project registration for %3$s has been denied.
+			$response=sprintf(_('Your project registration for %3$s has been denied.
 
 Project Full Name:  %1$s
 Project Unix Name:  %2$s
 
 Reasons for negative decision:
 
-'), $this->getPublicName(), $this->getUnixName(), $GLOBALS['sys_name']));
+'), $this->getPublicName(), $this->getUnixName(), $GLOBALS['sys_name']);
 
 			// Check to see if they want to send a custom rejection response
 			if ($response_id == 0) {
-				$response .= stripcslashes($message);
+				$response .= $message;
 			} else {
 				$response .= db_result (
 					db_query_params('SELECT response_text FROM canned_responses WHERE response_id=$1', array ($response_id)),
@@ -2329,7 +2329,7 @@
 			$admin =& user_get_object(db_result($res,$i,'user_id'));
 			setup_gettext_for_user ($admin) ;
 			
-			$message=stripcslashes(sprintf(_('New %1$s Project Submitted
+			$message=sprintf(_('New %1$s Project Submitted
 
 Project Full Name:  %2$s
 Submitted Description: %3$s
@@ -2342,7 +2342,7 @@
 						       util_unconvert_htmlspecialchars($this->getRegistrationPurpose()),
 						       util_make_url ('/admin/approve-pending.php'),
 						       $submitter->getRealName(), 
-						       $submitter->getUnixName()));
+						       $submitter->getUnixName());
 			util_send_message($admin_email, sprintf(_('New %1$s Project Submitted'), $GLOBALS['sys_name']), $message);
 			setup_gettext_from_context();
 		}
@@ -2351,12 +2351,12 @@
 		$email = $submitter->getEmail() ;
 		setup_gettext_for_user ($submitter) ;
 				
-		$message=stripcslashes(sprintf(_('New %1$s Project Submitted
+		$message=sprintf(_('New %1$s Project Submitted
 
 Project Full Name:  %2$s
 Submitted Description: %3$s
 
-The %1$s admin team will now examine your project submission.  You will be notified of their decision.'), $GLOBALS['sys_name'], $this->getPublicName(), util_unconvert_htmlspecialchars($this->getRegistrationPurpose()), $GLOBALS['sys_default_domain']));
+The %1$s admin team will now examine your project submission.  You will be notified of their decision.'), $GLOBALS['sys_name'], $this->getPublicName(), util_unconvert_htmlspecialchars($this->getRegistrationPurpose()), $GLOBALS['sys_default_domain']);
 				
 		util_send_message($email, sprintf(_('New %1$s Project Submitted'), $GLOBALS['sys_name']), $message);
 		setup_gettext_from_context();

Modified: branches/Branch_4_8/gforge/common/mail/MailingList.class.php
===================================================================
--- branches/Branch_4_8/gforge/common/mail/MailingList.class.php	2009-06-11 14:46:24 UTC (rev 7817)
+++ branches/Branch_4_8/gforge/common/mail/MailingList.class.php	2009-06-11 14:50:03 UTC (rev 7818)
@@ -176,7 +176,7 @@
 			$this->setInvalidEmailError();
 			return false;
 		} else {
-			$mailBody = stripcslashes(sprintf(_('A mailing list will be created on %1$s in 6-24 hours 
+			$mailBody = sprintf(_('A mailing list will be created on %1$s in 6-24 hours 
 and you are the list administrator.
 
 This list is: %3$s@%2$s .
@@ -193,7 +193,7 @@
 Thank you for registering your project with %1$s.
 
 -- the %1$s staff
-'), $GLOBALS['sys_name'], $GLOBALS['sys_lists_host'], $realListName, $this->getExternalInfoUrl(), $this->getExternalAdminUrl(), $listPassword));
+'), $GLOBALS['sys_name'], $GLOBALS['sys_lists_host'], $realListName, $this->getExternalInfoUrl(), $this->getExternalAdminUrl(), $listPassword);
 			$mailSubject = sprintf(_('%1$s New Mailing List'), $GLOBALS['sys_name']);
 			
 			util_send_message($userEmail, $mailSubject, $mailBody, 'admin@'.$GLOBALS['sys_default_domain']);

Modified: branches/Branch_4_8/gforge/www/account/change_email.php
===================================================================
--- branches/Branch_4_8/gforge/www/account/change_email.php	2009-06-11 14:46:24 UTC (rev 7817)
+++ branches/Branch_4_8/gforge/www/account/change_email.php	2009-06-11 14:50:03 UTC (rev 7818)
@@ -58,14 +58,14 @@
 		);
 	}
 
-	$message = stripcslashes(sprintf(_('You have requested a change of email address on %1$s.
+	$message = sprintf(_('You have requested a change of email address on %1$s.
 Please visit the following URL to complete the email change:
 
 %2$s
 
  -- the %1$s staff'), 
 					 $GLOBALS['sys_name'],
-					 util_make_url ('/account/change_email-complete.php?ch=_'.$confirm_hash)));
+					 util_make_url ('/account/change_email-complete.php?ch=_'.$confirm_hash));
 
 	util_send_message($newemail,sprintf(_('%1$s Verification'), $GLOBALS['sys_name']),$message);
 

Modified: branches/Branch_4_8/gforge/www/account/lostpw.php
===================================================================
--- branches/Branch_4_8/gforge/www/account/lostpw.php	2009-06-11 14:46:24 UTC (rev 7817)
+++ branches/Branch_4_8/gforge/www/account/lostpw.php	2009-06-11 14:50:03 UTC (rev 7818)
@@ -54,7 +54,7 @@
 		exit_error('Error',$u->getErrorMessage());
 	} else {
 
-		$message = stripcslashes(sprintf(_('Someone (presumably you) on the %1$s site requested a
+		$message = sprintf(_('Someone (presumably you) on the %1$s site requested a
 password change through email verification. If this was not you,
 ignore this message and nothing will happen.
 
@@ -64,7 +64,7 @@
 <%2$s>
 
  -- the %1$s staff
-'), $GLOBALS['sys_name'], util_make_url ("/account/lostlogin.php?ch=_".$confirm_hash)));
+'), $GLOBALS['sys_name'], util_make_url ("/account/lostlogin.php?ch=_".$confirm_hash));
 
 		util_send_message($u->getEmail(),sprintf(_('%1$s Verification'), $GLOBALS['sys_name']),$message);
 




More information about the Fusionforge-commits mailing list