appdb/admin adminMaintainerQueue.php

[WineHQ]

ChangeSet ID:	30841
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	wineowner at winehq.org	2006/12/30 00:15:33

Modified files:
	admin          : adminMaintainerQueue.php 

Log message:
	Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
	If the admin has not modified the field for a personalized response to a
	maintainer application, do not include it in the e-mail sent to the user.

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

Old revision  New revision  Changes     Path
 1.34          1.35          +8 -2       appdb/admin/adminMaintainerQueue.php

Index: appdb/admin/adminMaintainerQueue.php
diff -u -p appdb/admin/adminMaintainerQueue.php:1.34 appdb/admin/adminMaintainerQueue.php:1.35
--- appdb/admin/adminMaintainerQueue.php:1.34	30 Dec 2006  6:15:33 -0000
+++ appdb/admin/adminMaintainerQueue.php	30 Dec 2006  6:15:33 -0000
@@ -11,6 +11,9 @@ require_once(BASE."include/maintainer.ph
 require_once(BASE."include/application.php");
 require_once(BASE."include/mail.php");
 
+/* The initial help text displayed in the admin's response field */
+$sReplyTextHelp = "Enter a personalized reason for accepting or rejecting the user's maintainer request here";
+
 $aClean = array(); //array of filtered user input
 
 $aClean['sSub'] = makeSafe( $_REQUEST['sSub'] );
@@ -19,10 +22,13 @@ $aClean['sAdd'] = makeSafe( $_REQUEST['s
 $aClean['sReject'] = makeSafe( $_REQUEST['sReject'] );
 $aClean['sReplyText'] = makeSafe( $_REQUEST['sReplyText'] );
 
+/* If the admin's response text has not been modified, it should not be included in the e-mail sent to the rejected/accepted maintainer */
+if($aClean['sReplyText'] == $sReplyTextHelp)
+    $aClean['sReplyText'] = "";
+
 if(!$_SESSION['current']->hasPriv("admin"))
     util_show_error_page_and_exit("Insufficient privileges.");
 
-
 if ($aClean['sSub'])
 {
     if ($aClean['iMaintainerId'])
@@ -61,7 +67,7 @@ if ($aClean['sSub'])
 
         //email response
         echo '<tr valign=top><td class=color0><b>Email reply</b></td>',"\n";
-        echo "<td><textarea name='sReplyText' rows=10 cols=35>Enter a personalized reason for acceptance or rejection of the users maintainer request here</textarea></td></tr>\n";
+        echo "<td><textarea name='sReplyText' rows=10 cols=35>$sReplyTextHelp</textarea></td></tr>\n";
 
         /* Add button */
         echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n";