[interchange] Disable UserTrack and TrackFile by default; add warning to traffic report
Jon Jensen <[email protected]>
| Newsgroups | gmane.comp.web.interchange.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 0494eb54d3a1e61c2b721d51d6a6de456f72b2fc Author: Jon Jensen <[email protected]> Date: Mon May 24 23:39:34 2010 -0600 Disable UserTrack and TrackFile by default; add warning to traffic report .../pages/admin/reports/traffic/ByAffiliate.html | 5 +++++ dist/lib/UI/pages/admin/trafficstats.html | 7 +++++++ dist/standard/catalog.cfg | 7 +++++-- 3 files changed, 17 insertions(+), 2 deletions(-) --- diff --git a/dist/lib/UI/pages/admin/reports/traffic/ByAffiliate.html b/dist/lib/UI/pages/admin/reports/traffic/ByAffiliate.html index 737fe5a..8e28aeb 100644 --- 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 index e8ee036..7339488 100644 --- 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 index d67eb98..22be80b 100644 --- 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