Merge lp:~alexharrington/xibo/383089 into lp:xibo/1.0

[Alex Harrington]

[Dan Garner (dangarner)]

Looks OK to me

review: Approve

=== modified file 'server/xmds.php'
--- server/xmds.php	2009-03-30 18:34:54 +0000
+++ server/xmds.php	2009-06-03 11:55:05 +0000
@@ -374,7 +374,12 @@
 	if (Config::GetSetting($db,'PHONE_HOME') == 'On') {
 		// Find out when we last PHONED_HOME :D
 		// If it's been > 28 days since last PHONE_HOME then
-		if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
+		if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
+
+			if ($displayInfo['isAuditing'] == 1) 
+			{
+				Debug::LogEntry($db, "audit", "PHONE_HOME [IN]", "xmds", "RequiredFiles");	
+			}
 
 			// Retrieve number of displays
 			$SQL = "SELECT COUNT(*)
@@ -397,9 +402,7 @@
 			if ($displayInfo['isAuditing'] == 1) 
 			{
 				Debug::LogEntry($db, "audit", "PHONE_HOME_URL " . $PHONE_HOME_URL , "xmds", "RequiredFiles");	
-			}
-		
-			@file_get_contents($PHONE_HOME_URL);
+			}
 			
 			// Set PHONE_HOME_TIME to NOW.
 			$SQL = "UPDATE `setting`
@@ -410,6 +413,13 @@
 			{
 				trigger_error($db->error());
 			}
+			
+			@file_get_contents($PHONE_HOME_URL);
+
+			if ($displayInfo['isAuditing'] == 1) 
+			{
+				Debug::LogEntry($db, "audit", "PHONE_HOME [OUT]", "xmds", "RequiredFiles");	
+			}
 		//endif
 		}
 	}