Lot de mini-bugfixes

DEBIAN_COMPLIANCE

@@ -11,16 +11,14 @@ launching :
 in a debian server could help finding the right way to do it (eg: bind9 ) ;) 
 
 Questions:
-  - are we all OK to delete /var/alternc/sessions/ and use standart session ?
-    -> we must if alternc can work with memcached sessions
   - there is /var/alternc/cgi-bin/ . Should we forget it and use /usr/lib/cgi-bin/ ? If we must have
     a specific directory, /var/lib/cgi-bin-alternc ?
   - what do we do about /var/alternc/exec.usr/ ?
-  - is /var/alternc/mla still used ? What do we do about it ?
-  - 
 
 - we don't need our own php session folder don't we ? (or maybe for alternc-panel writable only ?) 
   W: alternc: non-standard-dir-perm var/alternc/sessions/ 1733 != 0755
+  => /var/alternc/tmp => not easy to decide, cf #1458
+  => we must check if alternc can work with memcached sessions (or force disks sessions)
 
 - some binaries / scripts don't have a man page
 
@@ -38,7 +36,6 @@ Easy to fix NOW :
 E: alternc: dir-or-file-in-var-run var/run/alternc/
 W: alternc: binary-without-manpage usr/bin/alternc_get_path
 W: alternc: binary-without-manpage usr/bin/alternc_reload
-W: alternc: command-with-path-in-maintainer-script config:205 /usr/bin/awk
 W: alternc: maintainer-script-ignores-errors prerm
 E: alternc-upnp: php-script-but-no-phpX-cli-dep usr/lib/alternc/update_upnp.sh
 W: alternc-upnp: executable-not-elf-or-script usr/lib/alternc/install.d/upnp-install
@@ -54,6 +51,8 @@ Should be fixed, need more test:
 - the html data are in /var/alternc/html/[a-z0-9] => move them to /var/www/alternc/[a-z0-9]
 - the mail data are in /var/alternc/mail/[a-z0-9] => move them to /var/mail/alternc/[a-z0-9]
 - the bind zones, apache vhosts and other dynamic data are in /var/alternc/(bind|apache-vhost)/ => move them to /var/lib/alternc/(samename)
+- /var/alternc/db => not used anymore, drop
+- /var/alternc/mla => not used anymore, drop
 
 ********************************************************************************
 FIXED:
@@ -95,3 +94,6 @@ W: alternc: malformed-question-in-templates alternc/use_local_mysql
 W: alternc: malformed-question-in-templates alternc/use_remote_mysql
 W: alternc: malformed-question-in-templates alternc/remote_mysql_error
 W: alternc: malformed-question-in-templates alternc/use_private_ip
+
+W: alternc: command-with-path-in-maintainer-script config:205 /usr/bin/awk
+

awstats/awstats.cache.php

@@ -1,7 +1,7 @@
 #!/usr/bin/php -q 
 <?php
 
-include("/var/alternc/bureau/class/config_nochk.php");
+include("/usr/share/alternc/panel/class/config_nochk.php");
 
 $db->query("SELECT id,hostname FROM aws;");
 while ($db->next_record()) {
@@ -11,4 +11,4 @@ foreach ($d as $r) {
  $aws->_createconf($r[0],1);
 }
 
-?>
+?>

debian/alternc.config

@@ -205,7 +205,7 @@ while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 13 ]; do
       db_fset alternc/acluninstalled "seen" "false" || true
       exit 2
     fi
-    quota_activation=$(quotaon -pa 2>/dev/null |grep '^group.*on$' | /usr/bin/awk '$4 ~ /^\'$MOUNT_POINT'$/ {print $4}') 
+    quota_activation=$(quotaon -pa 2>/dev/null |grep '^group.*on$' | awk '$4 ~ /^\'$MOUNT_POINT'$/ {print $4}') 
     
     if [ -z "$quota_activation" -o "$quota_activation"  != "$MOUNT_POINT" ]; then
         db_get alternc/quotauninstalled

debian/alternc.dirs

@@ -17,9 +17,7 @@ usr/sbin
 usr/share/alternc/install
 usr/share/locale/fr/LC_MESSAGES
 var/alternc/cgi-bin
-var/alternc/db
 var/alternc/exec.usr
-var/alternc/mla
 var/alternc/sessions
 var/alternc/tmp
 var/backups/alternc

install/dopo.sh

@@ -41,7 +41,7 @@ dolangs() {
 }
 
 # Apply the function to each language
-find /var/alternc/bureau/locales -maxdepth 1 -mindepth 1 -type d -name "*_*" | dolangs
+find /usr/share/alternc/panel/locales -maxdepth 1 -mindepth 1 -type d -name "*_*" | dolangs
 
 # Relance les apache pour qu'ils vident leur cache GetText
 if [ -x /usr/sbin/apache2 ]; then

install/newone.php

@@ -36,9 +36,9 @@ if(!function_exists('mysql_connect'))  {
 }
 
 // Ne vérifie pas ma session :)
-if(!chdir("/var/alternc/bureau"))
+if(!chdir("/usr/share/alternc/panel"))
   exit(1);
-require("/var/alternc/bureau/class/config_nochk.php");
+require("/usr/share/alternc/panel/class/config_nochk.php");
 
 // On passe super-admin
 $admin->enabled=1;

src/du.pl

@@ -3,6 +3,10 @@
 $ENV{PATH} = "/usr/bin:/bin"; 
 $ENV{CDPATH} = "";
 
+printf "FIXME: do not work with Debian Compliance";
+exit(1);
+
+
 $A=$ARGV[0];
 sub untaint {
  my @list = @_;

tools/alternc_get_path

@@ -1,5 +1,7 @@
 #! /bin/bash
 
+source /usr/lib/alternc/functions.sh
+
 path="$1"
 
 if [ -z "$path" ] ; then
@@ -8,12 +10,12 @@ if [ -z "$path" ] ; then
   echo ""
   echo "Missing parameters"
   echo "Usage: $0 <directory>"
-  echo "Example: $0 /var/alternc/html/a/admin/mydir/"
+  echo "Example: $0 $ALTERNC_HTML/admin/mydir/"
   exit 0
 fi
 
-account=`echo "$path" | sed 's#/var/alternc/html/./##' | cut -d '/' -f 1`
-relpath=`echo "$path" | sed 's#/var/alternc/html/./[^/]*##'`
+account=`echo "$path" | sed "s#$ALTERNC_HTML/./##" | cut -d '/' -f 1`
+relpath=`echo "$path" | sed "s#$ALTERNC_HTML/./[^/]*##"`
 
 request="SELECT
   m.login AS user,

tools/top_ftp_users

@@ -29,6 +29,10 @@
 #
 echo "This script does not work with this ALternC version."
 exit 1
+
+
+
+
 PATH=""
 PROG_NAME=top_ftp_users
 PROG_VERSION=0.1.0