[APPDB 5/5] Hardcode http: for mails
André Hentschel
nerv at dawncrow.de
Thu Nov 17 12:33:07 CST 2016
---
include/application.php | 8 ++++----
include/bugs.php | 4 ++--
include/distribution.php | 6 +++---
include/mail.php | 4 ++--
include/monitor.php | 4 ++--
include/note.php | 4 ++--
include/testData.php | 6 +++---
include/url.php | 4 ++--
include/version.php | 8 ++++----
9 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/include/application.php b/include/application.php
index 32fbf51..7a5d6c9 100644
--- a/include/application.php
+++ b/include/application.php
@@ -446,7 +446,7 @@ class Application {
$sMsg = "The application you submitted (".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname.".";
$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."objectManager.php?sClass=application_queue".
+ $sMsg .= "http:".APPDB_ROOT."objectManager.php?sClass=application_queue".
"&bIsQueue=true&bIsRejected=true&iId=".$this->iAppId."&sTitle=".
"Edit+Application\n";
$sMsg .= "Reason given:\n";
@@ -509,7 +509,7 @@ class Application {
if($this->sState == 'accepted') // Has been accepted.
{
$sSubject = $this->sName." has been added by ".$_SESSION['current']->sRealname;
- $sMsg = $this->objectMakeUrl()."\n";
+ $sMsg = "http:".$this->objectMakeUrl()."\n";
if($this->iSubmitterId)
{
$oSubmitter = new User($this->iSubmitterId);
@@ -533,12 +533,12 @@ class Application {
break;
case "edit":
$sSubject = $this->sName." has been modified by ".$_SESSION['current']->sRealname;
- $sMsg .= $this->objectMakeUrl()."\n";
+ $sMsg .= "http:".$this->objectMakeUrl()."\n";
addmsg("Application modified.", "green");
break;
case "reject":
$sSubject = $this->sName." has been rejected by ".$_SESSION['current']->sRealname;
- $sMsg .= APPDB_ROOT."objectManager.php?sClass=application_queue".
+ $sMsg .= "http:".APPDB_ROOT."objectManager.php?sClass=application_queue".
"&bIsQueue=true&bIsRejected=true&iId=".$this->iAppId."&sTitle=".
"Edit+Application\n";
diff --git a/include/bugs.php b/include/bugs.php
index 63853d7..d84d436 100644
--- a/include/bugs.php
+++ b/include/bugs.php
@@ -251,8 +251,8 @@ class Bug
$oVersion = new version($this->iVersionId);
//show the application version URL and the bug URL
- $sMsg = $oVersion->objectMakeUrl()."\n\n";
- $sMsg .= BUGZILLA_ROOT."show_bug.cgi?id=".$this->iBug_id."\n";
+ $sMsg = "http:".$oVersion->objectMakeUrl()."\n\n";
+ $sMsg .= "http:".BUGZILLA_ROOT."show_bug.cgi?id=".$this->iBug_id."\n";
if(!$bDeleted)
{
diff --git a/include/distribution.php b/include/distribution.php
index 3031d6d..90ecbba 100644
--- a/include/distribution.php
+++ b/include/distribution.php
@@ -400,7 +400,7 @@ class distribution {
{
$sSubject = "Distribution ".$this->sName." added by ".
$_SESSION['current']->sRealname;
- $sMsg = $this->objectMakeUrl()."\n";
+ $sMsg = "http:".$this->objectMakeUrl()."\n";
if($this->iSubmitterId)
{
$oSubmitter = new User($this->iSubmitterId);
@@ -420,7 +420,7 @@ class distribution {
break;
case "edit":
$sSubject = "Distribution ".$this->sName." has been modified by ".$_SESSION['current']->sRealname;
- $sMsg = $this->objectMakeUrl()."\n";
+ $sMsg = "http:".$this->objectMakeUrl()."\n";
addmsg("Distribution modified.", "green");
break;
case "delete":
@@ -438,7 +438,7 @@ class distribution {
case "reject":
$sSubject = "Distribution '".$this->sName." has been rejected by ".
$_SESSION['current']->sRealname;
- $sMsg = $this->objectMakeUrl()."\n";
+ $sMsg = "http:".$this->objectMakeUrl()."\n";
// if sReplyText is set we should report the reason the data was rejected
if($aClean['sReplyText'])
diff --git a/include/mail.php b/include/mail.php
index 90223aa..dbce394 100644
--- a/include/mail.php
+++ b/include/mail.php
@@ -20,9 +20,9 @@ function mail_appdb($sEmailList,$sSubject,$sMsg)
$sMsg = $sSubject."\n-------------------------------------------------------\n".$sMsg."\n\n";
$sMsg .= "Best regards.\n";
$sMsg .= "The AppDB team\n";
- $sMsg .= APPDB_ROOT."\n";
+ $sMsg .= "http:".APPDB_ROOT."\n";
$sMsg .= "\n\nIf you don't want to receive any other e-mail, please change your preferences:\n";
- $sMsg .= APPDB_ROOT."preferences.php\n";
+ $sMsg .= "http:".APPDB_ROOT."preferences.php\n";
/* Print the message to the screen instead of sending it, if the PRINT_EMAIL
option is set. Output in purple to distinguish it from other messages */
diff --git a/include/monitor.php b/include/monitor.php
index ab72fc3..12f4be2 100644
--- a/include/monitor.php
+++ b/include/monitor.php
@@ -237,13 +237,13 @@ class Monitor {
{
$oVersion = new version($this->iVersionId);
$sAppName = version::fullName($this->iVersionId);
- $sUrl = $oVersion->objectMakeUrl();
+ $sUrl = "http:".$oVersion->objectMakeUrl();
$sVersion = " version";
} else
{
$oApp = new application($this->iAppId);
$sAppName = Application::lookup_name($this->iAppId);
- $sUrl = $oApp->objectMakeUrl();
+ $sUrl = "http:".$oApp->objectMakeUrl();
}
switch($sAction)
diff --git a/include/note.php b/include/note.php
index 0cb24a4..bc83207 100644
--- a/include/note.php
+++ b/include/note.php
@@ -205,12 +205,12 @@ class Note {
{
$oVersion = new version($this->iVersionId);
$sAppName = version::fullName($this->iVersionId);
- $sMsg .= $oVersion->objectMakeUrl()."\n";
+ $sMsg .= "http:".$oVersion->objectMakeUrl()."\n";
} else
{
$oApp = new application($this->iAppId);
$sAppName = $oApp->sName;
- $sMsg .= $oApp->objectMakeUrl()."\n";
+ $sMsg .= "http:".$oApp->objectMakeUrl()."\n";
}
switch($sAction)
diff --git a/include/testData.php b/include/testData.php
index 005ea8a..415ef1d 100644
--- a/include/testData.php
+++ b/include/testData.php
@@ -442,14 +442,14 @@ class testData{
$sSubject = "Submitted test data accepted";
$sMsg = "The test data you submitted for '$sName' has been ".
"accepted by ".$_SESSION['current']->sRealname.".\n";
- $sMsg .= $oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n";
+ $sMsg .= "http:".$oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n";
$sMsg .= "Administrators response:\n";
break;
case "reject":
$sSubject = "Submitted test data rejected";
$sMsg = "The test data you submitted for '$sName' has ".
"been rejected by ".$_SESSION['current']->sRealname.".";
- $sMsg .= $this->objectMakeUrl()."\n";
+ $sMsg .= "http:".$this->objectMakeUrl()."\n";
$sMsg .= "Reason given:\n";
break;
}
@@ -468,7 +468,7 @@ class testData{
$oVersion = new Version($this->iVersionId);
$oApp = new Application($oVersion->iAppId);
- $sBacklink = $oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n";
+ $sBacklink = "http:".$oVersion->objectMakeUrl()."&iTestingId=".$this->iTestingId."\n";
switch($sAction)
{
diff --git a/include/url.php b/include/url.php
index 539586a..70c3fd4 100644
--- a/include/url.php
+++ b/include/url.php
@@ -230,12 +230,12 @@ class Url {
{
$oVersion = new version($this->iVersionId);
$sAppName = version::fullName($this->iVersionId);
- $sUrl = $oVersion->objectMakeUrl();
+ $sUrl = "http:".$oVersion->objectMakeUrl();
} else
{
$oApp = new application($this->iAppId);
$sAppName = $oApp->sName;
- $sUrl = $oApp->objectMakeUrl();
+ $sUrl = "http:".$oApp->objectMakeUrl();
}
if(!$bDeleted)
diff --git a/include/version.php b/include/version.php
index 1dd448e..116f3c1 100644
--- a/include/version.php
+++ b/include/version.php
@@ -461,7 +461,7 @@ class version {
$sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname.".";
$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."objectManager.php?sClass=version_queue".
+ $sMsg .= "http:".APPDB_ROOT."objectManager.php?sClass=version_queue".
"&bIsQueue=true&bIsRejected=true&iId=".$this->iVersionId."&".
"sTitle=Edit+Version\n";
break;
@@ -488,7 +488,7 @@ class version {
if($this->sState == 'accepted')
{
$sSubject = "Version ".$this->sName." of ".$oApp->sName." added by ".$_SESSION['current']->sRealname;
- $sMsg = $this->objectMakeUrl()."\n";
+ $sMsg = "http:".$this->objectMakeUrl()."\n";
if($this->iSubmitterId)
{
$oSubmitter = new User($this->iSubmitterId);
@@ -512,7 +512,7 @@ class version {
break;
case "edit":
$sSubject = "'".$oApp->sName." ".$this->sName."' has been modified by ".$_SESSION['current']->sRealname;
- $sMsg .= $this->objectMakeUrl()."\n";
+ $sMsg .= "http:".$this->objectMakeUrl()."\n";
addmsg("Version modified.", "green");
break;
case "delete":
@@ -528,7 +528,7 @@ class version {
break;
case "reject":
$sSubject = "Version '".$this->sName."' of '".$oApp->sName."' has been rejected by ".$_SESSION['current']->sRealname;
- $sMsg .= APPDB_ROOT."objectManager.php?sClass=version_queue".
+ $sMsg .= "http:".APPDB_ROOT."objectManager.php?sClass=version_queue".
"&bIsQueue=true&bIsRejected=true&iId=".$this->iVersionId."&".
"sTitle=Edit+Version\n";
--
2.7.4
More information about the wine-patches
mailing list