From c44f8182184171473c0243de7c1a46cbd3e5a7b2 Mon Sep 17 00:00:00 2001
From: Chris Morgan <cmorgan@alum.wpi.edu>
Date: Thu, 15 Sep 2005 00:22:22 +0000
Subject: [PATCH] Send notification emails to admins when the cleanup cron job
 executes so there is some visibility into the maintenance tasks running on
 the appdb.  Fix a minor bug in the user class where passing in (null,null)
 for iVendorId and iAppId results in a null query string being sent to mysql
 and triggering an error

---
 cron/cleanup.php | 13 +++++++++++++
 include/user.php | 14 ++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/cron/cleanup.php b/cron/cleanup.php
index 5e7000a..c06a1f1 100644
--- a/cron/cleanup.php
+++ b/cron/cleanup.php
@@ -26,6 +26,7 @@ include(BASE."include/mail.php");
  * if(5 AND 3) then 7
  */
 
+notifyAdminsOfCleanupExecution();
 
 $hSixMonth = inactiveSince(6);
 while($oRow = mysql_fetch_object($hSixMonth))
@@ -133,4 +134,16 @@ function warnMaintainerDeleted($sEmail)
 
     mail_appdb($sEmail, $sSubject, $sMsg);
 }
+
+/* email all admins that the appdb cleanup script is executing */
+/* so we admins have some visibility into the background cleanup */
+/* events of the appdb */
+function notifyAdminsOfCleanupExecution()
+{
+    $sSubject  = "Cleanup script running\r\n";
+    $sMsg  = "Appdb cleanup cron script is executing.\r\n";
+    $sEmail = get_notify_email_address_list(null, null); /* get list admins */
+    if($sEmail)
+        mail_appdb($sEmail, $sSubject, $sMsg);
+}
 ?>
diff --git a/include/user.php b/include/user.php
index 0dd828e..85244f0 100644
--- a/include/user.php
+++ b/include/user.php
@@ -698,17 +698,19 @@ function get_notify_email_address_list($iAppId = null, $iVersionId = null)
                    FROM appMaintainers
                    WHERE appId = '".$iAppId."'";
     }
-    $hResult = query_appdb($sQuery);
-    if(mysql_num_rows($hResult) > 0)
+    if($sQuery)
     {
-        while($oRow = mysql_fetch_object($hResult))
+        $hResult = query_appdb($sQuery);
+        if(mysql_num_rows($hResult) > 0)
         {
-            $aUserId[$c] = array($oRow->userId);
-            $c++;
+            while($oRow = mysql_fetch_object($hResult))
+            {
+                $aUserId[$c] = array($oRow->userId);
+                $c++;
+            }
         }
     }
 
-
     /*
      * Retrieve administrators.
      */