appdb/include config.php.sample mail.php

[WineHQ]

ChangeSet ID:	31126
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2007/05/12 11:30:32

Modified files:
    include        : config.php.sample mail.php

Log message:
    Alexander Nicolaysen Sørnes 
    Use separate setting for the email sender address. This allows the appdb emails to be sent
    from a different address than the default one. Use the sender address to point email
    responses to the new noreply address.

Patch: http://cvs.winehq.org/patch.py?id=31126

Old revision  New revision  Changes     Path
 1.14          1.15          +1 -0       appdb/include/config.php.sample
 1.8           1.9           +3 -3       appdb/include/mail.php

Index: appdb/include/config.php.sample
diff -u -p appdb/include/config.php.sample:1.14 appdb/include/config.php.sample:1.15
--- appdb/include/config.php.sample:1.14	12 May 2007 16:30:32 -0000
+++ appdb/include/config.php.sample	12 May 2007 16:30:32 -0000
@@ -17,6 +17,7 @@ define("APPDB_ROOT", "http://appdb.wineh
 define("APPDB_OWNER","WineHQ"); // with what product/company is this AppDB related ?
 define("APPDB_OWNER_URL","http://www.winehq.org/"); // website of this product/company
 define("APPDB_OWNER_EMAIL","[e-mail]"); // e-mail of this product/company
+define("APPDB_SENDER_EMAIL","[e-mail]"); // The e-mail address which appears as the sender in mails sent by the AppDB
 define("BUGZILLA_ROOT","http://bugs.winehq.org/"); // path to bugzilla

// AppDB developers: Use this define to disable email from being sent from the appdb during testing
Index: appdb/include/mail.php
diff -u -p appdb/include/mail.php:1.8 appdb/include/mail.php:1.9
--- appdb/include/mail.php:1.8	12 May 2007 16:30:32 -0000
+++ appdb/include/mail.php	12 May 2007 16:30:32 -0000
@@ -9,8 +9,8 @@ function mail_appdb($sEmailList,$sSubjec
         return;

$sHeaders  = "MIME-Version: 1.0\r\n";
-    $sHeaders .= "From: AppDB <".APPDB_OWNER_EMAIL.">\r\n";
-    $sHeaders .= "Reply-to: AppDB <".APPDB_OWNER_EMAIL.">\r\n";
+    $sHeaders .= "From: AppDB <".APPDB_SENDER_EMAIL.">\r\n";
+    $sHeaders .= "Reply-to: AppDB <".APPDB_SENDER_EMAIL.">\r\n";
     $sHeaders .= "X-Priority: 3\r\n";
     $sHeaders .= "X-Mailer: ".APPDB_OWNER." mailer\r\n";
     $sMsg  = trim(ereg_replace("\r\n","\n",$sMsg));
@@ -32,7 +32,7 @@ function mail_appdb($sEmailList,$sSubjec
         return;
     }

-    $bResult = mail(str_replace(" ",",",$sEmailList), "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_OWNER_EMAIL);
+    $bResult = mail(str_replace(" ",",",$sEmailList), "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_SENDER_EMAIL);
     if($bResult)
         addmsg("Message sent to: ".$sEmailList, "green");
     else