From 68ac9f42f383624cd587e3edb5456977d793a321 Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Tue, 26 Feb 2013 05:05:53 +0100
Subject: [PATCH] Fix campaign ID in subscription confirmation event, and
 prevent caching during statistics generation

---
 public_html/classes/campaign.php | 4 ++--
 public_html/modules/confirm.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public_html/classes/campaign.php b/public_html/classes/campaign.php
index 5b8192e..063f212 100644
--- a/public_html/classes/campaign.php
+++ b/public_html/classes/campaign.php
@@ -168,14 +168,14 @@ class Campaign extends CPHPDatabaseRecordClass
 			
 			/* Update past-month subscription count */ 
 			if($result = $database->CachedQuery("SELECT COUNT(*) FROM log_entries WHERE `CampaignId` = :CampaignId AND `Type` = :Type AND `Date` > DATE_SUB(NOW(), INTERVAL 1 MONTH)", 
-				array(":CampaignId" => $this->sId, ":Type" => LogEntry::SUBSCRIPTION_CONFIRMED)))
+				array(":CampaignId" => $this->sId, ":Type" => LogEntry::SUBSCRIPTION_CONFIRMED), 0))
 			{
 				$this->uPastMonthSubscriptions = $result->data[0]["COUNT(*)"];
 			}
 			
 			/* Update past-month unsubscription count */ 
 			if($result = $database->CachedQuery("SELECT COUNT(*) FROM log_entries WHERE `CampaignId` = :CampaignId AND `Type` = :Type AND `Date` > DATE_SUB(NOW(), INTERVAL 1 MONTH)", 
-				array(":CampaignId" => $this->sId, ":Type" => LogEntry::UNSUBSCRIPTION)))
+				array(":CampaignId" => $this->sId, ":Type" => LogEntry::UNSUBSCRIPTION), 0))
 			{
 				$this->uPastMonthUnsubscriptions = $result->data[0]["COUNT(*)"];
 			}
diff --git a/public_html/modules/confirm.php b/public_html/modules/confirm.php
index eef7862..037d1d1 100644
--- a/public_html/modules/confirm.php
+++ b/public_html/modules/confirm.php
@@ -24,7 +24,7 @@ try
 	$sLogEntry->uType = LogEntry::SUBSCRIPTION_CONFIRMED;
 	$sLogEntry->uIp = $_SERVER['REMOTE_ADDR'];
 	$sLogEntry->uData = json_encode(array("email" => $router->uParameters[1]));
-	$sLogEntry->uCampaignId = $sCampaign->sId;
+	$sLogEntry->uCampaignId = $sSubscription->sCampaignId;
 	$sLogEntry->uDate = time();
 	$sLogEntry->uSessionId = session_id();
 	$sLogEntry->InsertIntoDatabase();