Disable UserTrack and TrackFile by default; add warning to traffic re…

…port
pajamian · May 25, 2010 · 0494eb5 · 0494eb5
1 parent f8edabe
commit 0494eb5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/dist/lib/UI/pages/admin/reports/traffic/ByAffiliate.html b/dist/lib/UI/pages/admin/reports/traffic/ByAffiliate.html
@@ -16,6 +16,11 @@
 
 @_UI_STD_HEAD_@
 
+[if config TrackFile]
 [traffic-report]
+[else]
+<p><em>This report cannot be run until the TrackFile directive is configured in catalog.cfg.</em></p>
+[/else]
+[/if]
 
 @_UI_STD_FOOTER_@
diff --git a/dist/lib/UI/pages/admin/trafficstats.html b/dist/lib/UI/pages/admin/trafficstats.html
@@ -11,6 +11,8 @@
 [set help_name]stats.traffic[/set]
 @_UI_STD_HEAD_@
 
+[if config TrackFile]
+
 <table border=0 __UI_T_PROPERTIES__ width="60%">
 <tr class=rborder height=1><td colspan=2></td></tr>
 <tr>
@@ -102,4 +104,9 @@
 </tr>
 </table>
 
+[else]
+<p><em>This report cannot be run until the TrackFile directive is configured in catalog.cfg.</em></p>
+[/else]
+[/if]
+
 @_UI_STD_FOOTER_@
diff --git a/dist/standard/catalog.cfg b/dist/standard/catalog.cfg
@@ -41,12 +41,12 @@ ParseVariables  Yes
 ifdef LOGDIR
 ErrorFile       __LOGDIR__/error.log
 AsciiTrack      __LOGDIR__/tracking.asc
-TrackFile       __LOGDIR__/usertrack
+#TrackFile       __LOGDIR__/usertrack
 endif
 
 ifndef LOGDIR
 AsciiTrack      logs/tracking.asc
-TrackFile       logs/usertrack
+#TrackFile       logs/usertrack
 endif
 
 ifdef CACHEDIR
@@ -182,6 +182,9 @@ SpecialPage  receipt      ../etc/receipt
 ReadPermission  group
 WritePermission group
 
+# Don't send X-Track HTTP response header
+UserTrack no
+
 # If a specific user session accesses this catalog more than this many
 # times with no pauses of 30 seconds or more, the LockoutCommand (if set)
 # is executed. Set this to 0 if you're getting links to 127.0.0.1