mike/wishlist
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

include the item's description in the insert/update/delete subscription messages

Browse source
This commit is contained in:
Ryan Walberg 2012-12-10 02:37:18 +00:00
parent 221b4c2df8
commit 6c5ce31dcd
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/includes/funcLib.php
View file

@ -92,7 +92,7 @@ function getExistingQuantity($itemid, $userid, $bought, $dbh, $opt) {
} }
} }
function processSubscriptions($publisher, $action, $dbh, $opt) { function processSubscriptions($publisher, $action, $itemdesc, $dbh, $opt) {
// join the users table as a cheap way to get the guy's name without having to pass it in. // join the users table as a cheap way to get the guy's name without having to pass it in.
$stmt = $dbh->prepare("SELECT subscriber, fullname FROM subscriptions sub INNER JOIN users u ON u.userid = sub.publisher WHERE publisher = ? AND (last_notified IS NULL OR DATE_ADD(last_notified, INTERVAL {$opt["notify_threshold_minutes"]} MINUTE) < NOW())"); $stmt = $dbh->prepare("SELECT subscriber, fullname FROM subscriptions sub INNER JOIN users u ON u.userid = sub.publisher WHERE publisher = ? AND (last_notified IS NULL OR DATE_ADD(last_notified, INTERVAL {$opt["notify_threshold_minutes"]} MINUTE) < NOW())");
$stmt->bindParam(1, $publisher, PDO::PARAM_INT); $stmt->bindParam(1, $publisher, PDO::PARAM_INT);
@ -103,13 +103,13 @@ function processSubscriptions($publisher, $action, $dbh, $opt) {
if ($msg == "") { if ($msg == "") {
// same message for each user but we need the fullname from the first row before we can assemble it. // same message for each user but we need the fullname from the first row before we can assemble it.
if ($action == "insert") { if ($action == "insert") {
$msg = $row["fullname"] . " has added an item to their list."; $msg = $row["fullname"] . " has added the item \"$itemdesc\" to their list.";
} }
else if ($action == "update") { else if ($action == "update") {
$msg = $row["fullname"] . " has updated an item on their list."; $msg = $row["fullname"] . " has updated the item \"$itemdesc\" on their list.";
} }
else if ($action == "delete") { else if ($action == "delete") {
$msg = $row["fullname"] . " has deleted an item from their list."; $msg = $row["fullname"] . " has deleted the item \"$itemdesc\" from their list.";
} }
$msg .= "\r\n\r\nYou are receiving this message because you are subscribed to their updates. You will not receive another message for their updates for the next " . $opt["notify_threshold_minutes"] . " minutes."; $msg .= "\r\n\r\nYou are receiving this message because you are subscribed to their updates. You will not receive another message for their updates for the next " . $opt["notify_threshold_minutes"] . " minutes.";
} }

11
src/item.php
View file

@ -115,19 +115,22 @@ if (!empty($_REQUEST["action"])) {
if ($action == "delete") { if ($action == "delete") {
try { try {
/* find out if this item is bought or reserved. */ /* find out if this item is bought or reserved. */
$stmt = $smarty->dbh()->prepare("SELECT a.userid, a.quantity, a.bought, i.description FROM {$opt["table_prefix"]}allocs a INNER JOIN {$opt["table_prefix"]}items i ON i.itemid = a.itemid WHERE a.itemid = ?"); $stmt = $smarty->dbh()->prepare("SELECT a.userid, a.quantity, a.bought, i.description FROM {$opt["table_prefix"]}allocs a LEFT OUTER JOIN {$opt["table_prefix"]}items i ON i.itemid = a.itemid WHERE a.itemid = ?");
$stmt->bindValue(1, (int) $_REQUEST["itemid"], PDO::PARAM_INT); $stmt->bindValue(1, (int) $_REQUEST["itemid"], PDO::PARAM_INT);
$stmt->execute(); $stmt->execute();
while ($row = $stmt->fetch()) { while ($row = $stmt->fetch()) {
$buyerid = $row["userid"]; $buyerid = $row["userid"];
$quantity = $row["quantity"]; $quantity = $row["quantity"];
$bought = $row["bought"]; $bought = $row["bought"];
$description = $row["description"]; // need this for descriptions.
if ($buyerid != null) {
sendMessage($userid, sendMessage($userid,
$buyerid, $buyerid,
$row["description"] . " that you " . (($bought == 1) ? "bought" : "reserved") . " $quantity of for {$_SESSION["fullname"]} has been deleted. Check your reservation/purchase to ensure it's still needed.", $row["description"] . " that you " . (($bought == 1) ? "bought" : "reserved") . " $quantity of for {$_SESSION["fullname"]} has been deleted. Check your reservation/purchase to ensure it's still needed.",
$smarty->dbh(), $smarty->dbh(),
$smarty->opt()); $smarty->opt());
} }
}
deleteImageForItem((int) $_REQUEST["itemid"], $smarty->dbh(), $smarty->opt()); deleteImageForItem((int) $_REQUEST["itemid"], $smarty->dbh(), $smarty->opt());
@ -138,7 +141,7 @@ if (!empty($_REQUEST["action"])) {
// TODO: are we leaking allocs records here? // TODO: are we leaking allocs records here?
stampUser($userid, $smarty->dbh(), $smarty->opt()); stampUser($userid, $smarty->dbh(), $smarty->opt());
processSubscriptions($userid, $action, $smarty->dbh(), $smarty->opt()); processSubscriptions($userid, $action, $description, $smarty->dbh(), $smarty->opt());
header("Location: " . getFullPath("index.php?message=Item+deleted.")); header("Location: " . getFullPath("index.php?message=Item+deleted."));
exit; exit;
@ -194,7 +197,7 @@ if (!empty($_REQUEST["action"])) {
$stmt->execute(); $stmt->execute();
stampUser($userid, $smarty->dbh(), $smarty->opt()); stampUser($userid, $smarty->dbh(), $smarty->opt());
processSubscriptions($userid, $action, $smarty->dbh(), $smarty->opt()); processSubscriptions($userid, $action, $description, $smarty->dbh(), $smarty->opt());
header("Location: " . getFullPath("index.php")); header("Location: " . getFullPath("index.php"));
exit; exit;
@ -232,7 +235,7 @@ if (!empty($_REQUEST["action"])) {
$stmt->execute(); $stmt->execute();
stampUser($userid, $smarty->dbh(), $smarty->opt()); stampUser($userid, $smarty->dbh(), $smarty->opt());
processSubscriptions($userid, $action, $smarty->dbh(), $smarty->opt()); processSubscriptions($userid, $action, $description, $smarty->dbh(), $smarty->opt());
header("Location: " . getFullPath("index.php")); header("Location: " . getFullPath("index.php"));
exit; exit;