[vhffs-dev] [422] Added vhffs patch against awstats 6.5

[subversion@xxxxxxxxx]

Revision: 422
Author:   gradator
Date:     2007-01-22 21:45:25 +0000 (Mon, 22 Jan 2007)

Log Message:
-----------
Added vhffs patch against awstats 6.5

Modified Paths:
--------------
    trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch

Added Paths:
-----------
    branches/vhffs_4.1/vhffs-robots/misc/awstats_6.5_vhffs.patch
    trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch


Added: branches/vhffs_4.1/vhffs-robots/misc/awstats_6.5_vhffs.patch
===================================================================
--- branches/vhffs_4.1/vhffs-robots/misc/awstats_6.5_vhffs.patch	2007-01-21 21:22:48 UTC (rev 421)
+++ branches/vhffs_4.1/vhffs-robots/misc/awstats_6.5_vhffs.patch	2007-01-22 21:45:25 UTC (rev 422)
@@ -0,0 +1,32 @@
+--- /usr/lib/cgi-bin/awstats.pl	2007-01-08 23:55:32.000000000 +0100
++++ awstats.pl	2007-01-22 22:06:59.000000000 +0100
+@@ -1131,8 +1131,18 @@
+ 	my $configdir=shift;
+ 	my @PossibleConfigDir=();
+ 
+-	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { @PossibleConfigDir=("$configdir"); }
+-	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
++       use Vhffs::Main;
++       use Vhffs::Conf;
++       use Vhffs::Functions;
++       my $vhffs = init Vhffs::Main;
++       my $vhffsconfigdir = Vhffs::Conf::get_web_config()->{"log_parsed_root"}."/".Vhffs::Functions::hash_webdir( $SiteConfig )."/awstats";
++
++       @PossibleConfigDir=("$vhffsconfigdir");
++
++#      if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
++#          @PossibleConfigDir=("$configdir");
++#      }
++#      else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }	
+ 
+ 	# Open config file
+ 	$FileConfig=$FileSuffix='';
+@@ -5878,7 +5888,7 @@
+ else { @DOWIndex = (0,1,2,3,4,5,6); }
+ 
+ # Should we link to ourselves or to a wrapper script
+-$AWScript=($WrapperScript?"$WrapperScript":"$DirCgi$PROG.$Extension");
++$AWScript=($WrapperScript?"$WrapperScript":"/$DirCgi$PROG.$Extension");
+ 
+ # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
+ if (! $HeaderHTMLSent) { &html_head; }

Modified: trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch	2007-01-21 21:22:48 UTC (rev 421)
+++ trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch	2007-01-22 21:45:25 UTC (rev 422)
@@ -32,12 +32,3 @@
  
  # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
  if (! $HeaderHTMLSent) { &html_head; }
-@@ -6094,7 +6102,7 @@
-                 $LogFormat = $fixField[0];
-                 &DefinePerlParsingFormat();
-             }
--        }
-+        }
- 
- 		# Parse line record to get all required fields
- 		if (! (@field=map(/$PerlParsingFormat/,$line))) {

Added: trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch	2007-01-21 21:22:48 UTC (rev 421)
+++ trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch	2007-01-22 21:45:25 UTC (rev 422)
@@ -0,0 +1,32 @@
+--- /usr/lib/cgi-bin/awstats.pl	2007-01-08 23:55:32.000000000 +0100
++++ awstats.pl	2007-01-22 22:06:59.000000000 +0100
+@@ -1131,8 +1131,18 @@
+ 	my $configdir=shift;
+ 	my @PossibleConfigDir=();
+ 
+-	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { @PossibleConfigDir=("$configdir"); }
+-	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
++       use Vhffs::Main;
++       use Vhffs::Conf;
++       use Vhffs::Functions;
++       my $vhffs = init Vhffs::Main;
++       my $vhffsconfigdir = Vhffs::Conf::get_web_config()->{"log_parsed_root"}."/".Vhffs::Functions::hash_webdir( $SiteConfig )."/awstats";
++
++       @PossibleConfigDir=("$vhffsconfigdir");
++
++#      if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
++#          @PossibleConfigDir=("$configdir");
++#      }
++#      else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }	
+ 
+ 	# Open config file
+ 	$FileConfig=$FileSuffix='';
+@@ -5878,7 +5888,7 @@
+ else { @DOWIndex = (0,1,2,3,4,5,6); }
+ 
+ # Should we link to ourselves or to a wrapper script
+-$AWScript=($WrapperScript?"$WrapperScript":"$DirCgi$PROG.$Extension");
++$AWScript=($WrapperScript?"$WrapperScript":"/$DirCgi$PROG.$Extension");
+ 
+ # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
+ if (! $HeaderHTMLSent) { &html_head; }