Index: /bureau/class/m_quota.php
===================================================================
--- /bureau/class/m_quota.php	(revision 45)
+++ /bureau/class/m_quota.php	(revision 94)
@@ -1,5 +1,5 @@
 <?php
 /*
- $Id: m_quota.php,v 1.2 2003/04/17 21:39:56 benjamin Exp $
+ $Id: m_quota.php,v 1.3 2003/06/09 20:01:40 root Exp $
  ----------------------------------------------------------------------
  AlternC - Web Hosting System
@@ -158,15 +158,16 @@
 
   /*****************************************************************************/
-  function dec($ressource) {
+  function dec($ressource,$uid=0) {
     global $db,$err;
     $err->log("quota","dec",$ressource);
+    if (!$uid) $uid=$this->uid;
     // 1. on vérifie que ce quota existe pour le membre, sinon, on le crée avec 2 valeurs à 0.
-    $db->query("SELECT * FROM quotas WHERE uid=".$this->uid." AND name='$ressource'");
+    $db->query("SELECT * FROM quotas WHERE uid='$uid' AND name='$ressource'");
     if ($db->num_rows()) {
       // Existe : on update
-      $db->query("UPDATE quotas SET used=used-1 WHERE uid=".$this->uid." AND name='$ressource';");
+      $db->query("UPDATE quotas SET used=used-1 WHERE uid='$uid' AND name='$ressource';");
     } else {
       // N'Existe pas, on crée.
-      $db->query("INSERT INTO quotas (uid,name,used,total) VALUES (".$this->uid.",'$ressource',-1,0);");
+      $db->query("INSERT INTO quotas (uid,name,used,total) VALUES ('$uid','$ressource',-1,0);");
     }
   }
Index: /bureau/class/m_mysql.php
===================================================================
--- /bureau/class/m_mysql.php	(revision 93)
+++ /bureau/class/m_mysql.php	(revision 94)
@@ -1,5 +1,5 @@
 <?php
 /*
- $Id: m_mysql.php,v 1.7 2003/06/09 19:53:35 root Exp $
+ $Id: m_mysql.php,v 1.8 2003/06/09 20:01:40 root Exp $
  ----------------------------------------------------------------------
  AlternC - Web Hosting System
@@ -62,8 +62,9 @@
    *  retourne false si l'utilisateur n'a aucune base de données
    */
-  function get_dblist() {
+  function get_dblist($uid=0) {
     global $db,$err,$bro;
+    if (!$uid) $uid=$this->uid;
     $err->log("mysql","get_dblist");
-    $db->query("SELECT pass,db, bck_mode, bck_dir FROM db WHERE uid=".$this->uid.";");
+    $db->query("SELECT pass,db, bck_mode, bck_dir FROM db WHERE uid='$uid';");
     if (!$db->num_rows()) {
       return false;
@@ -156,6 +157,14 @@
    *  an error occured, such as db does not exist.
    */
-  function del_db($dbn) {
+  function del_db($dbn,$uid=0) {
     global $db,$err,$quota,$mem;
+    if ($uid) {
+      $db->query("SELECT login FROM membres WHERE uid='$uid';");
+      $db->next_record();
+      $login=$db->f("login");
+    } else {
+      $uid=$this->uid;
+      $login=$mem->user["login"];
+    }
     $err->log("mysql","del_db",$dbn);
     if (!ereg("^[0-9a-z]*$",$dbn)) {
@@ -163,5 +172,5 @@
       return false;
     }
-    $dbname=$mem->user["login"].($dbn?"_":"").$dbn;
+    $dbname=$login.($dbn?"_":"").$dbn;
     $db->query("SELECT * FROM db WHERE db='$dbname';");
     if (!$db->num_rows()) {
@@ -170,12 +179,12 @@
     }
     // Ok, database exists and dbname is compliant. Let's proceed
-    $db->query("DELETE FROM db WHERE uid='".$this->uid."' AND db='$dbname';");
+    $db->query("DELETE FROM db WHERE uid='$uid' AND db='$dbname';");
     $db->query("DELETE FROM mysql.db WHERE db='$dbname';");
     $db->query("DROP DATABASE $dbname;");
-    $quota->dec("mysql");
-    $db->query("SELECT COUNT(*) AS cnt FROM db WHERE uid='".$this->uid."';");
+    $quota->dec("mysql",$uid);
+    $db->query("SELECT COUNT(*) AS cnt FROM db WHERE uid='$uid';");
     $db->next_record();
     if ($db->f("cnt")==0) {
-      $db->query("DELETE FROM mysql.user WHERE User='".$mem->user["login"]."';");
+      $db->query("DELETE FROM mysql.user WHERE User='$login';");
     }
     $db->query("FLUSH PRIVILEGES;");
@@ -298,25 +307,13 @@
   }
 
-
-  /* TODO / TO BE IMPLEMENTED : */
-
-  function alternc_add_member($id) {
-    global $db,$err;
-    $err->log("mysql","add_member");
-    $db->query("SELECT login FROM membres WHERE uid=$id;");
-    $db->next_record();
-    $login=$db->f("login");
-    $db->query("INSERT INTO db (uid,login,pass,enabled) VALUES ($id,'$login','',0);");
-    return true;
-  }
-
   function alternc_del_member($id) {
     global $db,$err;
     $err->log("mysql","del_member");
-    $db->query("SELECT login FROM membres WHERE uid=$id;");
-    $db->next_record();
-    $login=$db->f("login");
-    $this->delete_mysql($id);
-    $db->query("DELETE FROM db WHERE login='$login';");
+    $c=$this->get_dblist($id);
+    if (is_array($c)) {
+      for($i=0;$i<count($c);$i++) {
+	$this->del_db($c[$i]["name"],$id);
+      }
+    }
     return true;
   }
