Changeset 305 for trunk/instant_messenger/inc/Jabberd2.abstract.php

Timestamp:

06/06/08 13:54:09 (16 years ago)

Author:

niltonneto

Message:

Correçoes

File:

• trunk/instant_messenger/inc/Jabberd2.abstract.php (modified) (6 diffs)

trunk/instant_messenger/inc/Jabberd2.abstract.php

@@ -7 +7 @@
 class Jabberd2 extends Jabber
 {
-        final function connect($pUser = false, $pPassword = false, $pConnectionType = false)
+        final function connect($pUser = false, $pPassword = false, $pConnectionType = false, $pWebjabber = false )
         {
                 try
                 {
                         if ( $pUser && $pPassword && $pConnectionType )
-                                if ( $_connect = parent::connect($pUser, $pPassword, $pConnectionType) )
+                                if ( $_connect = parent::connect($pUser, $pPassword, $pConnectionType, $pWebjabber) )
                                         return $_connect;
 
@@ -48 +48 @@
          */
 
-        final function addContacts($pContact)
-        {
-                $jid = explode("@",$pContact['email']);
-                $jid = $jid[0]."@".$this->_server;
-                $name = $pContact['name'];
-                $group = $pContact['group'];
-
-                if(trim($jid[0]) != trim($this->_user))
-                {
-                        if ( $jid )
+        final function addRoster($pRoster)
+        {
+                if ( !$this->connected )
+                        return "disconnected";
+
+                if ( trim($pRoster['uid']) )
+                {
+                        $jid = $pRoster['uid'] . "@" . $this->_server;
+
+                        $newroster  = "<item jid='" . $jid . "'";
+                        $newroster .= " name='" . $pRoster['name'] . "'";
+                        $newroster .= "><group>" . $pRoster['group'] . "</group></item>";
+
+                        if ( $this->iq('set', "addroster_" . time(), NULL, NULL, "jabber:iq:roster", $newroster) )
                         {
-                                $newcontact  = "<item jid='".$jid."'";
-                                $newcontact .= " name='" . $name . "'";
-                                $newcontact .= "><group>" . $group . "</group></item>";
+                                $this->getContacts();
+                                return true;
                         }
                 }
-                $addid = "adduser_" . time();
-                if ( !$this->connected )
-                        echo "disconnected";
-                else
-                {
-                        if ( $this->iq('set', $addid, NULL, NULL, "jabber:iq:roster", $newcontact) )
-                                $this->getContacts();
-                        echo "OK";
-                }
+                return false;
+        }
+
+        final function addContact($pContact)
+        {
+                $this->addRoster($pContact);
+                $this->subscription($pContact['uid'] . "@" . $this->_server, 'subscribe');
         }
 
@@ -89 +90 @@
                         $jid = ( trim($pJid['jid']) == "this" ) ? $this->_user . '@' . $this->_server : $pJid['jid'];
                         $vcard = (trim($pJid['jid']) == "this") ? 'vCard_user' : 'vCard';
-                        
+
                         if ( !$this->connected )
                         {
@@ -120 +121 @@
         final function removeContact($pContact)
         {
-                $delid  = 'deluser_' . time();
                 if ( !$this->isConnected() )
                         return "disconnected";
-                        
-                if ( $this->iq('set',$delid,NULL,NULL,"jabber:iq:roster","<item jid='".$pContact['jid']."' subscription='remove'/>") )
-                        if ( $this->subscription($pContact['jid'],"unsubscribed") )
-                                echo "OK";
+
+                if ( $this->iq('set', 'delroster_' . time(), NULL, NULL, 'jabber:iq:roster',"<item jid='".$pContact['jid']."' subscription='remove'/>") )
+                {
+                        $this->getContacts();
+                        return true;
+                }
+                return false;
+        }
+
+        function allowContact($pRoster)
+        {
+                $this->addRoster($pRoster);
+                $jid = $pRoster['uid'] . "@" . $this->_server;
+                $this->subscription($jid, 'subscribed');
+                $this->subscription($jid, 'subscribe');
         }
 
@@ -141 +152 @@
                         return true;
                 }
-        }
-
-        final function compression()
-        {
-                $compress = "<compress xmlns='http://jabber.org/protocol/compress'><method>zlib</method></compress>";   
-                $this->writeSocket($compress);
         }
 
@@ -166 +171 @@
         }
 
-        final function get_last_access_user($pUser)
-        {
-                $id = "last_time_user";
-                $jid = ( trim($pUser['jid']) == "this" ) ? $this->_user . '@' . $this->_server : $pUser['jid'];
-                $this->iq('get', $id, $jid, NULL, "jabber:iq:last");
-        }
-
         final function setStatus()
         {
                 $this->setPresence(array("type" => "unavailable"));
-                $this->setPresence(array("type" => "available"));       
+                $this->setPresence(array("type" => "available"));
         }