[AppDB] Clean up email code
Tony Lambregts
tony.lambregts at gmail.com
Mon Feb 20 22:49:38 CST 2006
In some cases we were not sending reply text when we should and in otheres we
were including it twice + minor format cleanup
Change Log: Cleanup email code
Files Changed: admin/adminAppQueue.php
-------------- next part --------------
Index: include/application.php
===================================================================
RCS file: /home/wine/appdb/include/application.php,v
retrieving revision 1.42
diff -u -u -r1.42 application.php
--- include/application.php 29 Jan 2006 04:04:46 -0000 1.42
+++ include/application.php 21 Feb 2006 04:40:28 -0000
@@ -314,29 +314,22 @@
switch($sAction)
{
case "add":
- {
- $sSubject = "Submitted application accepted";
- $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been accepted.";
- }
+ $sSubject = "Submitted application accepted";
+ $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been accepted.";
+ $sMsg .= "Administrators Responce:\n";
break;
case "reject":
- {
- $sSubject = "Submitted application rejected";
- $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been rejected.";
- $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the application. ";
- $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. ";
- $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=applicationappId=".$this->iAppId."\n";
- $sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */
- }
+ $sSubject = "Submitted application rejected";
+ $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been rejected.";
+ $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the application. ";
+ $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. ";
+ $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=applicationappId=".$this->iAppId."\n";
+ $sMsg .= "Reason given:\n";
break;
case "delete":
- {
- $sSubject = "Submitted application deleted";
- $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been deleted.";
- $sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */
- }
+ $sSubject = "Submitted application deleted";
+ $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been deleted.";
+ $sMsg .= "Reason given:\n";
break;
$sMsg .= $_REQUEST['replyText']."\n";
@@ -362,6 +355,12 @@
$sMsg .= "This application has been submitted by ".$oSubmitter->sRealname.".";
$sMsg .= "\n";
}
+ if($_REQUEST['replyText'])
+ {
+ $sMsg .= "Appdb admin reply text:\n";
+ $sMsg .= $_REQUEST['replyText']."\n"; // append the reply text, if there is any
+ }
+
addmsg("The application was successfully added into the database.", "green");
} else
{
@@ -379,11 +378,11 @@
case "delete":
$sSubject = $this->sName." has been deleted by ".$_SESSION['current']->sRealname;
- /* if replyText is set we should report the reason the application was deleted */
+ // if replyText is set we should report the reason the application was deleted
if($_REQUEST['replyText'])
{
$sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */
+ $sMsg .= $_REQUEST['replyText']."\n"; // append the reply text, if there is any
}
addmsg("Application deleted.", "green");
@@ -392,11 +391,11 @@
$sSubject = $this->sName." has been rejected by ".$_SESSION['current']->sRealname;
$sMsg .= APPDB_ROOT."appsubmit.php?apptype=application&sub=view&appId=".$this->iAppId."\n";
- /* if replyText is set we should report the reason the application was rejected */
+ // if replyText is set we should report the reason the application was rejected
if($_REQUEST['replyText'])
{
$sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */
+ $sMsg .= $_REQUEST['replyText']."\n"; // append the reply text, if there is any
}
addmsg("Application rejected.", "green");
Index: include/version.php
===================================================================
RCS file: /home/wine/appdb/include/version.php,v
retrieving revision 1.48
diff -u -u -r1.48 version.php
--- include/version.php 20 Feb 2006 02:51:19 -0000 1.48
+++ include/version.php 21 Feb 2006 04:40:28 -0000
@@ -421,30 +421,22 @@
switch($sAction)
{
case "add":
- {
- $sSubject = "Submitted version accepted";
- $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been accepted.";
- }
+ $sSubject = "Submitted version accepted";
+ $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been accepted.";
+ $sMsg .= "Administrators Responce:\n";
break;
case "reject":
- {
- $sSubject = "Submitted version rejected";
- $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been rejected. ";
- $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the version. ";
- $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. ";
- $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=version&versionId=".$this->iVersionId."\n";
- $sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */
- }
-
+ $sSubject = "Submitted version rejected";
+ $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been rejected. ";
+ $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the version. ";
+ $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. ";
+ $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=version&versionId=".$this->iVersionId."\n";
+ $sMsg .= "Reason given:\n";
break;
case "delete":
- {
- $sSubject = "Submitted version deleted";
- $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been deleted.";
- $sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */
- }
+ $sSubject = "Submitted version deleted";
+ $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been deleted.";
+ $sMsg .= "Reason given:\n";
break;
}
$sMsg .= $_REQUEST['replyText']."\n";
@@ -470,9 +462,13 @@
$oSubmitter = new User($this->iSubmitterId);
$sMsg .= "This version has been submitted by ".$oSubmitter->sRealname.".";
$sMsg .= "\n";
+ }
+ if($_REQUEST['replyText'])
+ {
$sMsg .= "Appdb admin reply text:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */
+ $sMsg .= $_REQUEST['replyText']."\n"; // append the reply text, if there is any
}
+
addmsg("The version was successfully added into the database.", "green");
} else // Version queued.
{
@@ -490,11 +486,11 @@
case "delete":
$sSubject = "Version '".$this->sName."' of '".$oApp->sName."' has been deleted by ".$_SESSION['current']->sRealname;
- /* if replyText is set we should report the reason the application was deleted */
+ // if replyText is set we should report the reason the application was deleted
if($_REQUEST['replyText'])
{
$sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */
+ $sMsg .= $_REQUEST['replyText']."\n"; // append the reply text, if there is any
}
addmsg("Version deleted.", "green");
@@ -503,11 +499,11 @@
$sSubject = "Version '".$this->sName."' of '".$oApp->sName."' has been rejected by ".$_SESSION['current']->sRealname;
$sMsg .= APPDB_ROOT."appsubmit.php?apptype=application&sub=view&versionId=".$this->iVersionId."\n";
- /* if replyText is set we should report the reason the application was rejected */
+ // if replyText is set we should report the reason the version was rejected
if($_REQUEST['replyText'])
{
$sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */
+ $sMsg .= $_REQUEST['replyText']."\n"; // append the reply text, if there is any
}
addmsg("Version rejected.", "green");
Index: include/testResults.php
===================================================================
RCS file: /home/wine/appdb/include/testResults.php,v
retrieving revision 1.10
diff -u -u -r1.10 testResults.php
--- include/testResults.php 8 Feb 2006 01:44:11 -0000 1.10
+++ include/testResults.php 21 Feb 2006 04:40:28 -0000
@@ -237,19 +237,18 @@
$sSubject = "Submitted testing data accepted";
$sMsg = "The testing data you submitted (".$oApp->sName." ".$this->sName.") has been accepted.";
$sMsg .= APPDB_ROOT."appview.php?versionId=".$this->iVersionId."&iTestingId=".$this->iTestingId."\n";
- break;
+ $sMsg .= "Administrators Responce:\n";
+ break;
case "reject":
$sSubject = "Submitted testing data rejected";
$sMsg = "The testing data you submitted (".$oApp->sName." ".$this->sName.") has been rejected.";
$sMsg .= APPDB_ROOT."testResults.php?sub=view&iTestingId=".$this->iTestingId."\n";
$sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; // append the reply text, if there is any
- break;
+ break;
case "delete":
$sSubject = "Submitted testing data deleted";
$sMsg = "The testing data you submitted (".$oApp->sName." ".$this->sName.") has been deleted.";
$sMsg .= "Reason given:\n";
- $sMsg .= $_REQUEST['replyText']."\n"; // append the reply text, if there is any
break;
}
$sMsg .= $_REQUEST['replyText']."\n";
@@ -276,6 +275,9 @@
$oSubmitter = new User($this->iSubmitterId);
$sMsg .= "This Testing data has been submitted by ".$oSubmitter->sRealname.".";
$sMsg .= "\n";
+ }
+ if($_REQUEST['replyText'])
+ {
$sMsg .= "Appdb admin reply text:\n";
$sMsg .= $_REQUEST['replyText']."\n"; // append the reply text, if there is any
}
More information about the wine-patches
mailing list