From a7b7ac2e036eee9059b37cfca4b09a246ff06541 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Fri, 31 Aug 2012 16:00:47 +0000
Subject: [PATCH] MXaccount ne marchait plus

---
 bureau/admin/adm_mxaccount.php |  2 +-
 bureau/class/m_mail.php        | 82 ++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/bureau/admin/adm_mxaccount.php b/bureau/admin/adm_mxaccount.php
index d010e27a..65e8f8e2 100644
--- a/bureau/admin/adm_mxaccount.php
+++ b/bureau/admin/adm_mxaccount.php
@@ -51,7 +51,7 @@ if ($newlogin) {
 	// Add an account
 	if ($mail->add_slave_account($newlogin,$newpass)) { 
 		$error=_("The requested account address has been created. It is now allowed.");
-		unset($newlogin); unset($newpass);
+		$newlogin=false;$newpass=false;
 	}
 }
 
diff --git a/bureau/class/m_mail.php b/bureau/class/m_mail.php
index 907eb698..52b2d54d 100644
--- a/bureau/class/m_mail.php
+++ b/bureau/class/m_mail.php
@@ -571,6 +571,88 @@ class m_mail {
    }
  
 
+  /* ----------------------------------------------------------------- */
+  /**
+   * Return the list of allowed slave accounts (secondary-mx)
+   * @return array
+   */
+  function enum_slave_account() {
+    global $db,$err;
+    $db->query("SELECT login,pass FROM mxaccount;");
+    $res=array();
+    while ($db->next_record()) {
+        $res[]=$db->Record;
+    }
+    if (!count($res)) return false;
+    return $res;
+  }
+
+  /* ----------------------------------------------------------------- */
+  /**
+   * Check for a slave account (secondary mx)
+   * @param string $login the login to check
+   * @param string $pass the password to check
+   * @return boolean TRUE if the password is correct, or FALSE if an error occurred.
+   */
+  function check_slave_account($login,$pass) {
+    global $db,$err;
+    $login=mysql_escape_string($login);
+    $pass=mysql_escape_string($pass);
+    $db->query("SELECT * FROM mxaccount WHERE login='$login' AND pass='$pass';");
+    if ($db->next_record()) {
+        return true;
+    }
+    return false;
+  }
+  /* ----------------------------------------------------------------- */
+  /**
+   * Add a slave account that will be allowed to access the mxdomain list
+   * @param string $login the login to add
+   * @param string $pass the password to add
+   * @return boolean TRUE if the account has been created, or FALSE if an error occurred.
+   */
+  function add_slave_account($login,$pass) {
+    global $db,$err;
+    $login=mysql_escape_string($login);
+    $pass=mysql_escape_string($pass);
+    $db->query("SELECT * FROM mxaccount WHERE login='$login'");
+    if ($db->next_record()) {
+      $err->raise("mail",16);
+      return false;
+    }
+    $db->query("INSERT INTO mxaccount (login,pass) VALUES ('$login','$pass')");
+    return true;
+  }
+
+
+  /* ----------------------------------------------------------------- */
+  /**
+   * Remove a slave account
+   * @param string $login the login to delete
+   */
+  function del_slave_account($login) {
+    global $db,$err;
+    $login=mysql_escape_string($login);
+    $db->query("DELETE FROM mxaccount WHERE login='$login'");
+    return true;
+  }
+
+  /* ----------------------------------------------------------------- */
+  /** hook function called by AlternC when a domain is created for
+   * the current user account using the SLAVE DOMAIN feature
+   * This function create a CATCHALL to the master domain
+   * @param string $dom Domain that has just been created
+   * @param string $master Master domain
+   * @access private
+   */
+  function alternc_add_slave_domain($dom,$slave) { //FIXME don't we have to change his name ?
+    global $err;
+    $err->log("mail","alternc_add_slave_domain",$dom);
+    $this->add_mail($dom,"",0,"","@".$slave);
+    return true;
+  }
+
+
 } /* Class m_mail */