Changeset 2570

Timestamp:

10/04/09 17:38:04 (4 years ago)

Author:

benjamin

Message:

mode batard pour l'instant, mais cela semble marcher ...

Location:

alternc-jabber/bureau/class

Files:

• XMPPHP/XMPP.php (modified) (1 diff)
• m_jabber.php (modified) (8 diffs)

alternc-jabber/bureau/class/XMPPHP/XMPP.php

@@ -236 +236 @@
 
         }
+        /**
+         * Send XMPP Query
+         *
+         * @param string $to
+         * @param string $body
+         * @param string $type
+         * @param string $subject
+         */
+        public function query($to, $queryns, $payload = null) {
+                $to       = htmlspecialchars($to);
+                $command        = htmlspecialchars($command);
+                $id = $this->getID();
+                $this->addIdHandler($id, 'query_iq_handler');
+                $out = "<iq type=\"set\" to=\"$to\" id=\"$id\">";
+                $out.= "<query xmlns=\"$queryns\">";
+                $out.= $payload;
+                $out.= "</query></iq>";
+                $this->send($out);
+        }
 
 

alternc-jabber/bureau/class/m_jabber.php

@@ -52 +52 @@
   var $domains;
 
+  /** Configuration variables are 
+   * server port login domain pass (for the jabber server driven mode)             
+   */
+  var $conf;
+
+  /** Share handle for the connection to the jabber server
+   */
+  var $conn;
 
   /* ----------------------------------------------------------------- */
@@ -58 +66 @@
    */
   function m_jabber() {
+    // We read the configuration file
+    $config_file = @fopen('/etc/alternc/jabber.conf', 'r');
+    if ($config_file) {
+      while (FALSE !== ($line = fgets($config_file))) {
+        if (preg_match('/^([A-Za-z0-9_]*) *= *"?(.*?)"?$/', trim($line), $regs)) {
+          $this->conf[$regs[1]] = $regs[2];
+        }
+      }
+      fclose($config_file);
+    }
   }
 
@@ -139 +157 @@
       // FIXME
     }
+    if ($mode==JABBER_MODE_NO && $oldmode!=JABBER_MODE_NO) { 
+      // Deleting a vhost
+      $this->_deletevhost($dom);
+    }
+    if ($mode!=JABBER_MODE_NO && $oldmode==JABBER_MODE_NO) { 
+      // Creating a vhost
+      $this->_createvhost($dom);
+    }
     $db->query("UPDATE jabber_dom SET mode='$mode' WHERE dom='$dom' AND user='$cuid';");
     return true;
@@ -360 +386 @@
       return false;
     }
-    echo "A:$account:D:$domain:$cuid:";
     $db->query("SELECT id FROM jabber_account WHERE account='$account' AND domain='$domain' AND user='$cuid';");
     if (!$db->next_record()) {
@@ -399 +424 @@
 
   function _createaccount($account,$domain,$pass) {
-    echo "<pre>\n";
-    require_once("/var/alternc/bureau/class/XMPPHP/XMPP.php");
-    $conn = new XMPPHP_XMPP('elga.lautre.net', 5222, 'root', 'poipoi', 'xmpphp', 'elga.lautre.net', $printlog=true, $loglevel=XMPPHP_Log::LEVEL_VERBOSE);
-    $conn->connect();
-    $conn->processUntil('session_start');
-    //    $conn->message('benjamin@mailfr.com', 'This is a test message!');
-    $conn->command('vhost-man@elga.lautre.net', 'VHOSTS_UPDATE', '<x xmlns="jabber:x:data" type="submit" ><field type="text-single" var="VHost" ><value>root.lautre.net</value></field><field type="list-single" var="Enabled" ><value>true</value></field></x>');
-    $payloads = $conn->processUntil(array('command_result'),3);
+    require_once(dirname(__FILE__)."/XMPPHP/XMPP.php");
+    $this->conn = new XMPPHP_XMPP($this->conf['server'], $this->conf['port'], $this->conf['login'], $this->conf['passwod'], 'xmpphp', $this->conf['domain'], $printlog=false, $loglevel=XMPPHP_Log::LEVEL_INFO);
+    $this->conn->connect();
+    $this->conn->processUntil('session_start');
+    //    $this->conn->message('benjamin@mailfr.com', 'This is a test message!');
+    $this->conn->command($this->conf['server'], 'http://jabber.org/protocol/admin#add-user', '<x xmlns="jabber:x:data" type="submit" ><field type="hidden" var="FORM_TYPE" >   <value>http://jabber.org/protocol/admin</value></field><field type="jid-single" var="accountjid" ><value>".$account."@".$domain."</value></field><field type="text-private" var="password" ><value>".$pass."</value></field><field type="text-private" var="password-verify" ><value>".$pass."</value></field><field type="text-single" var="email" ><value>".$account."@".$domain."</value></field></x>');
+    $payloads = $this->conn->processUntil(array('command_result'),5);
     if (is_array($payloads)) {
       foreach($payloads as $event) {
@@ -412 +436 @@
         switch($event[0]) {
         case 'command_result':
-          echo "<pre><b>PAYLOAD:</b>\n";
-          print_r($event[1]);
           if ($event[1]->attrs['status']=="completed") {
+            $this->conn->disconnect();
             return true; 
           }
-          echo "\n</pre>\n";
           break;
         }
       }
-    } else {
-      echo "No Payload...";
-    }
-    $conn->disconnect();
-    echo "</pre>\n";
+    }
+    $this->conn->disconnect();
+    return false;
+  }
+
+
+  function _deleteaccount($account,$domain) {
+    // Delete a user account. For now there is no way other than in the DB ...
+    $db->query("SELECT uid FROM system_tigase.tig_users WHERE user_id='".$account."@".$domain."';");
+    if ($db->next_record()) {
+      $uid=$db->Record["uid"];
+      $db->query("SELECT pval FROM tig_pairs WHERE uid='$uid' AND pkey='password';");
+      if ($db->next_record()) {
+        $pass=$db->Record["pval"];
+
+        require_once(dirname(__FILE__)."/XMPPHP/XMPP.php");
+        $this->conn = new XMPPHP_XMPP($this->conf['server'], $this->conf['port'], $account, $pass, 'xmpphp', $domain, $printlog=false, $loglevel=XMPPHP_Log::LEVEL_INFO);
+        $this->conn->connect();
+        $this->conn->processUntil('session_start',5); // FIXME : check the result ?
+        $this->conn->query($domain, 'jabber:iq:register', '<remove/>');
+        $this->conn->disconnect();
+        return true; 
+
+      } else {
+        return false;
+      }
+    } else {
+      return false;
+    }
     return true;
   }
 
-  function _deleteaccount($account,$domain) {
+
+  function _updateaccount($account,$domain,$pass) {
+    // Change a user's password. For now there is no way other than in the DB ...
+    $db->query("SELECT uid FROM system_tigase.tig_users WHERE user_id='".$account."@".$domain."';");
+    if ($db->next_record()) {
+      $uid=$db->Record["uid"];
+      $db->query("UPDATE tig_pairs SET pval='$pass' WHERE uid='$uid' AND pkey='password';");
+      return true;
+    } else {
+      return false;
+    }
     return true;
   }
-  function _updateaccount($account,$domain,$pass) {
+
+
+
+  function _createvhost($domain) {
+    require_once(dirname(__FILE__)."/XMPPHP/XMPP.php");
+    $this->conn = new XMPPHP_XMPP($this->conf['server'], $this->conf['port'], $this->conf['login'], $this->conf['passwod'], 'xmpphp', $this->conf['domain'], $printlog=false, $loglevel=XMPPHP_Log::LEVEL_INFO);
+    $this->conn->connect();
+    $this->conn->processUntil('session_start');
+    $this->conn->command('vhost-man@'.$this->conf['server'], 'VHOSTS_UPDATE', '<x xmlns="jabber:x:data" type="submit" ><field type="text-single" var="VHost" ><value>".$domain."</value></field><field type="list-single" var="Enabled" ><value>true</value></field></x>');
+    $payloads = $this->conn->processUntil(array('command_result'),5);
+    if (is_array($payloads)) {
+      foreach($payloads as $event) {
+        $pl = $event[1];
+        switch($event[0]) {
+        case 'command_result':
+          if ($event[1]->attrs['status']=="completed") {
+            $this->conn->disconnect();
+            return true; 
+          }
+          break;
+        }
+      }
+    }
+    $this->conn->disconnect();
+    return false;
+  }
+
+
+  function _deletevhost($domain) {
+    require_once(dirname(__FILE__)."/XMPPHP/XMPP.php");
+    $this->conn = new XMPPHP_XMPP($this->conf['server'], $this->conf['port'], $this->conf['login'], $this->conf['passwod'], 'xmpphp', $this->conf['domain'], $printlog=false, $loglevel=XMPPHP_Log::LEVEL_INFO);
+    $this->conn->connect();
+    $this->conn->processUntil('session_start');
+    //    $this->conn->message('benjamin@mailfr.com', 'This is a test message!');
+    $this->conn->command('vhost-man@'.$this->conf['server'], 'VHOSTS_REMOVE', '<x xmlns="jabber:x:data" type="submit" ><field type="text-single" var="VHost" ><value>".$domain."</value></field></x>');
+    $payloads = $this->conn->processUntil(array('command_result'),5);
+    if (is_array($payloads)) {
+      foreach($payloads as $event) {
+        $pl = $event[1];
+        switch($event[0]) {
+        case 'command_result':
+          if ($event[1]->attrs['status']=="completed") {
+            $this->conn->disconnect();
+            return true; 
+          }
+          break;
+        }
+      }
+    }
+    $this->conn->disconnect();
+    return false;
+  }
+
+
+  /* ----------------------------------------------------------------- */
+  /** This function is magically called by the m_mail class when an email
+   * is created. It may be an email or an alias or both.
+   * The parameters are the same as in mail->add_mail
+   * @access private
+   */
+  function alternc_add_mail($dom,$mail,$pop,$pass,$alias) {
+    global $err,$db,$cuid;
+    $err->error=0;
+    $err->log("jabber","alternc_add_mail",$mail."@".$dom);
+
+    return true;
+  }
+
+
+  /* ----------------------------------------------------------------- */
+  /** This function is magically called by the m_mail class when an email
+   * is deleted. It may be an email or an alias or both.
+   * The parameters are the same as in mail->del_mail
+   * @access private
+   */
+  function alternc_del_mail($mail) {
+    global $err,$db,$cuid;
+    $err->error=0;
+    $err->log("jabber","alternc_del_mail",$mail);
     return true;
   }
@@ -448 +582 @@
     $err->error=0;
     $err->log("jabber","alternc_del_mx_domain",$dom);
-
-    return true;
-
     /* Effacement de tous les mails de ce domaine : */
     $a=$this->enum_doms_jabber($dom);
@@ -464 +595 @@
     /* Effacement du domaine himself */
     $db->query("DELETE FROM jabber_domain WHERE domain='$dom';");     
+    $this->_deletevhost($dom);
     return true;
   }
+