Author: glen Date: Thu Nov 4 13:14:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- one more set for verifyregemailbodyx
---- Files affected:
packages/phorum:
translate-macros.patch (1.6 -> 1.7)
---- Diffs:
================================================================
Index: packages/phorum/translate-macros.patch
diff -u packages/phorum/translate-macros.patch:1.6
packages/phorum/translate-macros.patch:1.7
--- packages/phorum/translate-macros.patch:1.6 Thu Nov 4 14:12:25 2010
+++ packages/phorum/translate-macros.patch Thu Nov 4 14:14:46 2010
@@ -156,3 +156,25 @@
phorum_email_user(array( 0 => $user['email'] ), $maildata);
$okmsg = $PHORUM["DATA"]["LANG"]["LostPassSent"];
+--- phorum-5.2.15a/htdocs/register.php~ 2010-11-04 15:00:10.000000000
+0200
++++ phorum-5.2.15a/htdocs/register.php 2010-11-04 15:12:06.565756512 +0200
+@@ -250,9 +250,18 @@
+ if (preg_match("!aol\.com$!i", $userdata["email"])) {
+ $verify_url = "<a
href=\"$verify_url\">$verify_url</a>";
+ }
++
++ $replace = array(
++ "%phorum_title%" => $PHORUM['title'],
++ "%login_url%" => phorum_get_url(PHORUM_LOGIN_URL),
++ );
++
+ $maildata = array();
+ $maildata["mailsubject"] =
$PHORUM["DATA"]["LANG"]["VerifyRegEmailSubject"];
+- $maildata["mailmessage"] =
wordwrap($PHORUM["DATA"]["LANG"]["VerifyRegEmailBody1"],
72)."\n\n$verify_url\n\n".wordwrap($PHORUM["DATA"]["LANG"]["VerifyRegEmailBody2"],
72);
++ $maildata["mailmessage"] =
++ wordwrap(str_replace(array_keys($replace),
array_values($replace), $PHORUM["DATA"]["LANG"]["VerifyRegEmailBody1"]),72).
++ "\n\n$verify_url\n\n".
++ wordwrap(str_replace(array_keys($replace),
array_values($replace), $PHORUM["DATA"]["LANG"]["VerifyRegEmailBody2"]),72);
+ phorum_email_user(array($userdata["email"]), $maildata);
+ }
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/translate-macros.patch?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
