From 092487fe91a6610950f9e3c54ad5de83ca48eb66 Mon Sep 17 00:00:00 2001 From: Tony Lambregts Date: Wed, 22 Feb 2006 02:20:02 +0000 Subject: [PATCH] Cleanup email code --- include/application.php | 45 +++++++++++++++++++------------------- include/testResults.php | 10 +++++---- include/version.php | 48 +++++++++++++++++++---------------------- 3 files changed, 50 insertions(+), 53 deletions(-) diff --git a/include/application.php b/include/application.php index 9059b29..7e25c48 100644 --- a/include/application.php +++ b/include/application.php @@ -314,29 +314,22 @@ class Application { 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 @@ class Application { $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 @@ class Application { 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 @@ class Application { $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"); diff --git a/include/testResults.php b/include/testResults.php index 8f850d1..943d4a5 100644 --- a/include/testResults.php +++ b/include/testResults.php @@ -237,19 +237,18 @@ class testData{ $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 @@ class testData{ $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 } diff --git a/include/version.php b/include/version.php index c089b49..8fa5cac 100644 --- a/include/version.php +++ b/include/version.php @@ -421,30 +421,22 @@ class Version { 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 @@ class Version { $oSubmitter = new User($this->iSubmitterId); $sMsg .= "This version has been submitted by ".$oSubmitter->sRealname."."; $sMsg .= "\n"; - $sMsg .= "Appdb admin reply text:\n"; - $sMsg .= $_REQUEST['replyText']."\n"; /* append the reply text, if there is any */ } + if($_REQUEST['replyText']) + { + $sMsg .= "Appdb admin reply text:\n"; + $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 @@ class Version { 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 @@ class Version { $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");