Changeset 1035

Timestamp:

09/07/04 23:55:37 (9 years ago)

Author:

anonymous

Message:

modification diverses dans bureau
modification du fichier de menu
ecriture du script alternc-awstats

Location:

trunk

Files:

• alternc-awstats (modified) (4 diffs)
• awstats.template.conf (modified) (2 diffs)
• bureau/admin/aws_list.php (modified) (1 diff)
• bureau/admin/menu_awstats.php (modified) (1 diff)
• bureau/class/m_aws.php (modified) (1 diff)

trunk/alternc-awstats

@@ -2 +2 @@
 . /etc/alternc/local.sh
 
-if [ -e /etc/alternc/webalizer.conf ]
-then
-    . /etc/alternc/webalizer.conf
-fi
+#if [ -e /etc/alternc/webalizer.conf ]
+#then
+#    . /etc/alternc/webalizer.conf
+#fi
 
 if [ -z "$ACCESSLOG" ] 
@@ -17 +17 @@
 fi
 
-CACHEDIR="/var/cache/alternc-webalizer"
+CACHEDIR="/var/cache/alternc-awstats"
 TMPDNS=`mktemp -p /tmp`
 TMPLOG=`mktemp -p /tmp`
@@ -30 +30 @@
 
 function dostat {
-    read LANG DOM
+    read DOM
     while [ "$DOM" ]
     do    
-      export LC_ALL="$LANG"
-      export LC_MESSAGES="$LANG"
-      export LANG
-
+      #export LC_ALL="$LANG"
+      #export LC_MESSAGES="$LANG"
+      #export LANG
+      echo "processing $DOM"
       # first run: resolve IPs in cache
-      grep -h " $DOM$" $ACCESSLOG | /usr/bin/webalizer -c $CACHEDIR/$DOM.conf -N 5 -D $TMPDNS - &>/dev/null
+      #grep -h " $DOM$" $ACCESSLOG | /usr/bin/webalizer -c $CACHEDIR/$DOM.conf -N 5 -D $TMPDNS - &>/dev/null
       # second run: process the stats
-      /usr/bin/webalizer -c $CACHEDIR/$DOM.conf -N 0 -D $TMPDNS - 2>/dev/null 
-      read LANG DOM
+      /usr/lib/cgi-bin/awstats.pl -config=$DOM 
+      read DOM
     done
 }
@@ -48 +48 @@
 rm -rf $CACHEDIR/* 
 # Fill the cache dir
-/usr/lib/alternc/webalizer.cache.php
+/usr/lib/alternc/awstats.cache.php
 
 # Launch the stat
-mysql -h"$MYSQL_HOST" -p"$MYSQL_PASS" -u"$MYSQL_USER" "$MYSQL_DATABASE" -B -e "SELECT lang,hostname FROM stats" |grep -v "^lang" | dostat
+mysql -h"$MYSQL_HOST" -p"$MYSQL_PASS" -u"$MYSQL_USER" "$MYSQL_DATABASE" -B -e "SELECT hostname FROM aws" |grep -v "^hostname" | dostat
 
 cleanup

trunk/awstats.template.conf

@@ -34 +34 @@
 # Example: "C:/WINNT/system32/LogFiles/W3SVC1/ex%YY-24%MM-24%DD-24.log"
 #
-LogFile="/tmp/awstats.log"
+LogFile="/var/log/apache/access.log"
 
 # Put here your log format (Must match your web server config. See setup
@@ -170 +170 @@
 # Default: 0
 #
-AllowAccessFromWebToAuthenticatedUsersOnly=1
+AllowAccessFromWebToAuthenticatedUsersOnly=0
 
 # This parameter give the list of all authorized authenticated users to view

trunk/bureau/admin/aws_list.php

@@ -82 +82 @@
 </table>
 </form>
-
+<?php
 }
 

trunk/bureau/admin/menu_awstats.php

@@ -30 +30 @@
 
 /* ############# STATS ############# */
-$q=$quota->getquota("stats");
+$q=$quota->getquota("aws");
 $r=$quota->getquota("dom");
 if ($q["t"]>0 && $r["u"]>0) {
 ?>
 <tr><td nowrap="nowrap">
-<a href="sta_list.php"><?php __("Web Statistics"); ?></a><br />
+<a href="aws_list.php"><?php __("Web Statistics"); ?></a><br />
 </td></tr>
 <?php    }    ?>

trunk/bureau/class/m_aws.php

@@ -464 +464 @@
     $users="";
     while ($db->next_record()) {
-        $users.=$db->("login")." ";
-    }
-    $s=str_replace("%HOSTNAME%",$hostname,$s);
-    $s=str_replace("%USERS%",$users,$s);
-    $f=fopen($this->CONFDIR."/awstats.".$db->f("hostname").".conf","wb");
+        $users.=$db->f("login")." ";
+    }
+    $s=str_replace("%%HOSTNAME%%",$hostname,$s);
+    $s=str_replace("%%USERS%%",$users,$s);
+    $f=fopen($this->CONFDIR."/awstats.".$hostname.".conf","wb");
     fputs($f,$s,strlen($s));
     fclose($f);