- fix notifications

- improves notifications
This commit is contained in:
Jonathan Ernst
2005-02-02 00:14:01 +00:00
committed by WineHQ
parent 0519a85604
commit 7ce5895681
7 changed files with 38 additions and 54 deletions

View File

@@ -57,41 +57,28 @@ if(isset($_REQUEST['body']))
if ($result)
{
if (is_numeric($_REQUEST['originator']))
$sEmail = $oOriginator->sEmail;
$sFullAppName = "Comment added to ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$sMsg = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'].".\n";
$sMsg .= "\n";
$sMsg .= $_SESSION['current']->sRealname." added comment to ".$sFullAppName."\n";
$sMsg .= "\n";
$sMsg .= "Subject: ".$_REQUEST['subject']."\n";
$sMsg .= $_REQUEST['body']."\n";
$oOriginator = new User($_REQUEST['originator']);
if ($oOriginator->wantsEmail())
{
$oOriginator = new User($_REQUEST['originator']);
if ($oOriginator->getPref("send_email")=="yes")
{
$sEmail = $oOriginator->sEmail;
$sFullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$sMsg = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'].".\n";
$sMsg .= "\r\n";
$sMsg .= $_SESSION['current']->realname." added comment to ".$sFullAppName."\r\n";
$sMsg .= "\r\n";
$sMsg .= "Subject: ".$subject."\r\n";
$sMsg .= "\r\n";
$sMsg .= $_REQUEST['body']."\r\n";
mail_appdb($sEmail, $sFullAppName ,$sMsg);
addmsg("Comment message sent to original poster", "green");
}
mail_appdb($sEmail, $sFullAppName ,$sMsg);
addmsg("Comment message sent to original poster", "green");
}
$sEmail = get_notify_email_address_list($_REQUEST['appId'], $_REQUEST['versionId']);
if($sEmail)
{
$sFullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$sMsg = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId'].".\r\n";
$sMsg .= "\r\n";
$sMsg .= $_SESSION['current']->realname." added comment to ".$fullAppName."\r\n";
$sMsg .= "\r\n";
$sMsg .= "Subject: ".$subject."\r\n";
$sMsg .= "\r\n";
$mssMsg .= $_REQUEST['body']."\r\n";
mail_appdb($sEmail, $sFullAppName ,$sMsg);
}
addmsg("New Comment Posted", "green");
addmsg("New comment posted.", "green");
}
redirect(apidb_fullurl("appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']));
}
@@ -125,7 +112,7 @@ else
echo '<table width="100%" border=0 cellpadding=0 cellspacing=1>',"\n";
echo "<tr class=\"color0\"><td align=right><b>From:</b>&nbsp;</td>\n";
echo " <td>&nbsp;".$_SESSION['current']->realname."</td></tr>\n";
echo " <td>&nbsp;".$_SESSION['current']->sRealname."</td></tr>\n";
echo "<tr class=\"color0\"><td align=right><b>Subject:</b>&nbsp;</td>\n";
echo " <td>&nbsp;<input type=\"text\" size=\"35\" name=\"subject\" value=\"".$_REQUEST['subject']."\" /> </td></tr>\n";
echo "<tr class=\"color1\"><td colspan=2><textarea name=\"body\" cols=\"70\" rows=\"15\" wrap=\"virtual\">".$_REQUEST['body']."</textarea></td></tr>\n";

View File

@@ -47,7 +47,7 @@ if($_REQUEST['sub'] == "Submit")
$sFullAppName .= " Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$sMsg = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\r\n";
$sMsg .= "\r\n";
$sMsg .= $_SESSION['current']->realname." added note to ".$sFullAppName."\r\n";
$sMsg .= $_SESSION['current']->sRealname." added note to ".$sFullAppName."\r\n";
$sMsg .= "\r\n";
$sMsg .= "title: ".$_REQUEST['noteTitle']."\r\n";
$sMsg .= "\r\n";

View File

@@ -186,7 +186,7 @@ if(isset($_REQUEST['submit']))
$sFullAppName = "Application: ".lookupAppName($_REQUEST['appId']);
$sMsg = APPDB_ROOT."appview.php?appId=".$_REQUEST['appId']."\r\n";
$sMsg .= "\r\n";
$sMsg .= $_SESSION['current']->realname." changed ".$sFullAppName." \r\n";
$sMsg .= $_SESSION['current']->sRealname." changed ".$sFullAppName." \r\n";
$sMsg .= "\r\n";
$sMsg .= $sWhatChanged."\r\n";
$sMsg .= "\r\n";

View File

@@ -46,7 +46,7 @@ if(isset($_REQUEST['sub']))
if($sEmail)
{
$sMsg .= $_SESSION['current']->realname." deleted note from ".$sFullAppName."\r\n";
$sMsg .= $_SESSION['current']->sRealname." deleted note from ".$sFullAppName."\r\n";
$sMsg .= "\r\n";
$sMsg .= "title: ".$sOldNoteTitle."\r\n";
$sMsg .= "\r\n";
@@ -67,7 +67,7 @@ if(isset($_REQUEST['sub']))
if($sEmail)
{
$sMsg .= $_SESSION['current']->realname." changed note for ".$sFullAppName."\r\n";
$sMsg .= $_SESSION['current']->sRealname." changed note for ".$sFullAppName."\r\n";
$sMsg .= "From --------------------------\r\n";
$sMsg .= "title: ".$sOldNoteTitle."\r\n";
$sMsg .= "\r\n";

View File

@@ -5,13 +5,10 @@
function forum_lookup_user($iUserId)
{
$mailto = '';
if ($iUserId > 0)
{
$sQuery = "SELECT email,realname FROM user_list WHERE userId = '".$iUserId."' LIMIT 1";
$hResult = query_appdb($sQuery);
$oUsr = mysql_fetch_object($hResult);
$sMailto = '<a href="mailto:' . $oUsr->email . '">' . $oUsr->realname . '</a>';
$oUser = new User($iUserId);
$sMailto = '<a href="mailto:' . $oUser->sEmail . '">' . $oUser->sRealname . '</a>';
}
else
{

View File

@@ -6,13 +6,13 @@ function mail_appdb($sEmailList,$sSubject,$sMsg)
$sHeaders .= "Reply-to: AppDB <".APPDB_OWNER_EMAIL.">\r\n";
$sHeaders .= "X-Priority: 3\r\n";
$sHeaders .= "X-Mailer: ".APPDB_OWNER." mailer\r\n";
$sMsg = $sSubject."\r\n---------------------------------------------\r\n".$sMsg;
$sMsg .= "Best regards.\r\n";
$sMsg .= "The AppDB team\r\n";
$sMsg .= APPDB_OWNER_URL."\r\n";
$sMsg .= "\r\n\r\nIf you don't want to receive any other e-mail, please change your preferences:\r\n";
$sMsg .= APPDB_ROOT."preferences.php\r\n";
$sMsg = trim(ereg_replace("\r\n","\n",$sMsg));
$sMsg = $sSubject."\n-------------------------------------------------------\n".$sMsg."\n\n";
$sMsg .= "Best regards.\n";
$sMsg .= "The AppDB team\n";
$sMsg .= APPDB_OWNER_URL."\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";
$bResult = mail(str_replace(" ",",",$sEmailList), "[AppDB] ".$sSubject, $sMsg, $sHeaders, "-f".APPDB_OWNER_EMAIL);
if($bResult)

View File

@@ -31,10 +31,10 @@ if($_REQUEST['cmd'])
$sEmail = get_notify_email_address_list($_REQUEST['appId'], $_REQUEST['versionId']);
if($sEmail)
{
$sFullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$ms = APPDB_ROOT."screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\r\n";
$ms .= "\r\n";
$ms .= $_SESSION['current']->realname." added screenshot ".$_REQUEST['screenshot_desc']." to ".$sFullAppName."\r\n";
$sFullAppName = "Screenshot added to ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$sMsg = APPDB_ROOT."screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
$sMsg .= "\n";
$sMsg .= $_SESSION['current']->sRealname." added screenshot ".$_REQUEST['screenshot_desc']." to ".$sFullAppName."\n";
mail_appdb($sEmail, $sFullAppName ,$sMsg);
}
@@ -50,10 +50,10 @@ if($_REQUEST['cmd'])
$sEmail = get_notify_email_address_list($_REQUEST['appId'], $_REQUEST['versionId']);
if($sEmail)
{
$sFullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$sFullAppName = "Screenshot queued for ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$sMsg = APPDB_ROOT."admin/adminAppDataQueue.php?queueId=".mysql_insert_id()."\n";
$sMsg .= "\r\n";
$sMsg .= ($_SESSION['current']->realname ? $_SESSION['current']->realname : "an anonymous user")." submitted a screenshot ".$_REQUEST['screenshot_desc']." for ".$sFullAppName."\n";
$sMsg .= "\n";
$sMsg .= ($_SESSION['current']->sRealname ? $_SESSION['current']->sRealname : "an anonymous user")." submitted a screenshot ".$_REQUEST['screenshot_desc']." for ".$sFullAppName."\n";
mail_appdb($sEmail, $sFullAppName ,$sMsg);
}
@@ -74,10 +74,10 @@ if($_REQUEST['cmd'])
$sEmail = get_notify_email_address_list($_REQUEST['appId'], $_REQUEST['versionId']);
if($sEmail)
{
$sFullAppName = "Application: ".lookupAppName($_REQUEST['appId'])." Version: ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$sFullAppName = "Screenshot deleted from ".lookupAppName($_REQUEST['appId'])." ".lookupVersionName($_REQUEST['appId'], $_REQUEST['versionId']);
$sMsg = APPDB_ROOT."screenshots.php?appId=".$_REQUEST['appId']."&versionId=".$_REQUEST['versionId']."\n";
$sMsg .= "\n";
$sMsg .= ($_SESSION['current']->realname ? $_SESSION['current']->realname : "Anonymous")." deleted screenshot from ".$sFullAppName."\r\n";
$sMsg .= ($_SESSION['current']->sRealname ? $_SESSION['current']->sRealname : "Anonymous")." deleted screenshot from ".$sFullAppName."\r\n";
mail_appdb($sEmail, $sFullAppName ,$sMsg);
}