[interchange-cvs] interchange - jon modified 2 files

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2008-04-22 05:18:56 GMT
Modified:  .        UPGRADE
Modified:  lib/Vend Dispatch.pm
Log:
Note UserTrack default change.

Clean up some whitespace.

Revision  Changes    Path
2.26                 interchange/UPGRADE


rev 2.26, prev_rev 2.25
Index: UPGRADE
===================================================================
RCS file: /var/cvs/interchange/UPGRADE,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -u -r2.25 -r2.26
--- UPGRADE	16 Feb 2008 00:05:30 -0000	2.25
+++ UPGRADE	22 Apr 2008 05:18:56 -0000	2.26
@@ -5,6 +5,10 @@
 
 Interchange is designed to be drop-in compatible in its major version.
 
+ 5.6.x -- A number of incompatible changes were made. Most of them will be
+          simple to deal with, but please consult the list below in the
+          "Known Issues" section.
+
  5.4.x -- A number of incompatible changes were made. Most of them will be
           simple to deal with, but please consult the list below in the
           "Known Issues" section.
@@ -34,7 +38,7 @@
 WARNING: BACK UP EVERYTHING BEFORE YOU START!
 
     1. Make a tar backup of your Interchange software directory, e.g.
-       
+
         tar czvf ~/ic_backup.tar.gz /usr/local/interchange 
 
     2. Unpack the new version of the software to a temporary directory,
@@ -74,6 +78,9 @@
 
 SpecialSub catalog_init has been renamed to request_init.
 
+UserTrack now defaults to "no", so if you want the X-Track HTTP response header
+to be output, add "UserTrack yes" to your catalog.cfg.
+
 KNOWN ISSUES UPGRADING FROM 5.4.x
 
 Check the "special_pages/missing.html" file, in all of your Interchange-driven
@@ -137,7 +144,7 @@
 The session per IP counters have been changed to the new "timecard" round-robin
 style counters.  You will need to delete the old counter files from the
 tmp/addr_ctr directory with a command similar to the following:
-	rm -rf catroot/tmp/addr_ctr/*
+    rm -rf catroot/tmp/addr_ctr/*
 ...be careful with the above command, if mistyped it can seriously mess up
 your filesystem.
 
@@ -145,7 +152,7 @@
 that will need to be added to your CSS file:
 
     .mv_contrast {
-	color: #FF0000;
+        color: #FF0000;
     }
 
 The name of the class can be specified using the CSS_CONTRAST Variable,
@@ -193,7 +200,7 @@
 
 * You will probably receive a message about "history-scan tag overrides global
   definition". See the section "PROBLEMS WITH USERTAGS" below.
-  
+
 * The static-page build capability is no longer supported in
   Interchange 5. You will receive warnings about "Directive StaticPath
   no longer supported at line XXX". 
@@ -233,7 +240,7 @@
 
     cd /usr/lib/interchange-5
     bin/compile_link -p 7787
-    
+
 NOTE: If you use the INET mode linking method, you have to run the
       test server on a different port. Assuming you use the standard
       7786 on your live catalog, you would add to interchange.cfg:
@@ -351,14 +358,14 @@
           include usertag/my_tag
 
        See the "problems with UserTags" section, below.
-  
+
 If you use CyberCash, you should replace these lines in catalog.cfg
-        
+
         Variable CYBER_MODE       mauthonly
         Variable CYBER_CONFIGFILE /path/to/your/merchant_conf
 
     with
-        
+
         Variable MV_PAYMENT_MODE        cybercash
         Variable MV_PAYMENT_CONFIGFILE  /path/to/your/merchant_conf
 



1.97                 interchange/lib/Vend/Dispatch.pm


rev 1.97, prev_rev 1.96
Index: Dispatch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Dispatch.pm,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -u -r1.96 -r1.97
--- Dispatch.pm	22 Apr 2008 05:09:44 -0000	1.96
+++ Dispatch.pm	22 Apr 2008 05:18:56 -0000	1.97
@@ -1,6 +1,6 @@
 # Vend::Dispatch - Handle Interchange page requests
 #
-# $Id: Dispatch.pm,v 1.96 2008-04-22 05:09:44 jon Exp $
+# $Id: Dispatch.pm,v 1.97 2008-04-22 05:18:56 jon Exp $
 #
 # Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 2002 Mike Heins <mike at perusion.net>
@@ -26,7 +26,7 @@
 package Vend::Dispatch;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.96 $, 10);
+$VERSION = substr(q$Revision: 1.97 $, 10);
 
 use POSIX qw(strftime);
 use Vend::Util;
@@ -1496,7 +1496,7 @@
 # TRACK
 	$Vend::Track = Vend::Track->new
 		if ($Vend::Cfg->{UserTrack} or $Vend::Cfg->{TrackFile})
-            and not ($Vend::admin and ! $::Variable->{MV_TRACK_ADMIN});
+			and not ($Vend::admin and ! $::Variable->{MV_TRACK_ADMIN});
 # END TRACK
 
 	if($Vend::Cfg->{DisplayErrors} and $Global::DisplayErrors) {