[vhffs-dev] [418] Well, show me the way to the next stupid strip slash.

[subversion@xxxxxxxxx]

Revision: 418
Author:   gradator
Date:     2007-01-21 09:32:50 +0000 (Sun, 21 Jan 2007)

Log Message:
-----------
Well, show me the way to the next stupid strip slash. Oh don't ask why. Oh don't ask why. For if we don't find the next stupid strip slash. I tell you we must die. I tell you we must die.

Modified Paths:
--------------
    trunk/vhffs-robots/misc/awstats.sample

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

Removed Paths:
-------------
    trunk/vhffs-robots/misc/awstat_6.4_vhffs.patch


Deleted: trunk/vhffs-robots/misc/awstat_6.4_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstat_6.4_vhffs.patch	2007-01-21 08:20:03 UTC (rev 417)
+++ trunk/vhffs-robots/misc/awstat_6.4_vhffs.patch	2007-01-21 09:32:50 UTC (rev 418)
@@ -1,25 +0,0 @@
---- /usr/lib/cgi-bin/awstats.pl	2006-05-26 09:38:54.000000000 +0200
-+++ awstats.pl	2007-01-21 09:17:49.000000000 +0100
-@@ -1091,10 +1091,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='';

Modified: trunk/vhffs-robots/misc/awstats.sample
===================================================================
--- trunk/vhffs-robots/misc/awstats.sample	2007-01-21 08:20:03 UTC (rev 417)
+++ trunk/vhffs-robots/misc/awstats.sample	2007-01-21 09:32:50 UTC (rev 418)
@@ -59,7 +59,7 @@
 # Example: "/awstats"
 # Default: "/cgi-bin"   (means awstats.pl is in "/yourwwwroot/cgi-bin")
 #
-DirCgi="/cgi-bin"
+DirCgi="/"
 
 
 # Relative or absolute web URL of your awstats icon directory.

Copied: trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch (from rev 417, trunk/vhffs-robots/misc/awstat_6.4_vhffs.patch)
===================================================================
--- trunk/vhffs-robots/misc/awstat_6.4_vhffs.patch	2007-01-21 08:20:03 UTC (rev 417)
+++ trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch	2007-01-21 09:32:50 UTC (rev 418)
@@ -0,0 +1,43 @@
+--- /usr/lib/cgi-bin/awstats.pl	2006-05-26 09:38:54.000000000 +0200
++++ awstats.pl	2007-01-21 10:24:18.000000000 +0100
+@@ -1091,10 +1091,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='';
+@@ -5740,7 +5748,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; }
+@@ -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_htaccess_example
===================================================================
--- trunk/vhffs-robots/misc/awstats_htaccess_example	2007-01-21 08:20:03 UTC (rev 417)
+++ trunk/vhffs-robots/misc/awstats_htaccess_example	2007-01-21 09:32:50 UTC (rev 418)
@@ -0,0 +1,4 @@
+RewriteEngine on
+RewriteRule ^([a-zA-Z0-9\.\-]+)/$ /awstats.pl?config=$1
+RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/$ /awstats.pl?config=$1&year=$2
+RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/([0-9]{2})/$ /awstats.pl?config=$1&year=$2&month=$3