Merge lp:~alexharrington/xibo/383089 into lp:~xibo-maintainers/xibo/encke

Proposed by Alex Harrington on 2009-06-03
Status: Merged
Merged at revision: not available
Proposed branch: lp:~alexharrington/xibo/383089
Merge into: lp:~xibo-maintainers/xibo/encke
Diff against target: None lines
To merge this branch: bzr merge lp:~alexharrington/xibo/383089
Reviewer Review Type Date Requested Status
Dan Garner 2009-06-03 Approve on 2009-06-19
Review via email: mp+7014@code.launchpad.net
To post a comment you must log in.
Dan Garner (dangarner) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'server/xmds.php'
2--- server/xmds.php 2009-03-30 18:34:54 +0000
3+++ server/xmds.php 2009-06-03 11:55:05 +0000
4@@ -374,7 +374,12 @@
5 if (Config::GetSetting($db,'PHONE_HOME') == 'On') {
6 // Find out when we last PHONED_HOME :D
7 // If it's been > 28 days since last PHONE_HOME then
8- if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
9+ if (Config::GetSetting($db,'PHONE_HOME_DATE') < (time() - (60 * 60 * 24 * 28))) {
10+
11+ if ($displayInfo['isAuditing'] == 1)
12+ {
13+ Debug::LogEntry($db, "audit", "PHONE_HOME [IN]", "xmds", "RequiredFiles");
14+ }
15
16 // Retrieve number of displays
17 $SQL = "SELECT COUNT(*)
18@@ -397,9 +402,7 @@
19 if ($displayInfo['isAuditing'] == 1)
20 {
21 Debug::LogEntry($db, "audit", "PHONE_HOME_URL " . $PHONE_HOME_URL , "xmds", "RequiredFiles");
22- }
23-
24- @file_get_contents($PHONE_HOME_URL);
25+ }
26
27 // Set PHONE_HOME_TIME to NOW.
28 $SQL = "UPDATE `setting`
29@@ -410,6 +413,13 @@
30 {
31 trigger_error($db->error());
32 }
33+
34+ @file_get_contents($PHONE_HOME_URL);
35+
36+ if ($displayInfo['isAuditing'] == 1)
37+ {
38+ Debug::LogEntry($db, "audit", "PHONE_HOME [OUT]", "xmds", "RequiredFiles");
39+ }
40 //endif
41 }
42 }

Subscribers

People subscribed via source and target branches