Changeset 275 for trunk/instant_messenger/inc

Timestamp:

04/30/08 17:15:14 (16 years ago)

Author:

niltonneto

Message:

 

Location:

trunk/instant_messenger/inc

Files:

• Jabberd2.abstract.php (modified) (1 diff)
• class.Ujabber.inc.php (modified) (4 diffs)
• class.ldap_im.inc.php (modified) (6 diffs)

trunk/instant_messenger/inc/Jabberd2.abstract.php

@@ -160 +160 @@
         }
 
+        final function get_last_access_user($pUser)
+        {
+                $id = "last_time_user";
+                $jid = ( trim($pUser['jid']) == "this" ) ? $this->_user . '@' . $this->_server : $pUser['jid'];
+                $this->writeSocket($this->iq('get', $id, $jid, NULL, "jabber:iq:last"));
+        }
+
         final function setStatus()
         {

trunk/instant_messenger/inc/class.Ujabber.inc.php

@@ -5 +5 @@
 class Ujabber extends Jabberd2
 {
+        private $set_presence;
+        
         public final function __construct()
         {       
@@ -35 +37 @@
                 return $this->connected;
         }
-        
+
         public final function listen()
         {
                 if ( !$this->isConnected() )
                         return "disconnected";
+
+                $this->get_last_access_user(array("jid" => "this"));    
 
                 if ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') )
@@ -57 +61 @@
                         while ( ( connection_aborted() === 0 ) && time() - $init < 50 )
                         {
+                                
                                 # read from server and write in the client
                                 $xml = $this->readSocket();
@@ -69 +74 @@
         }
 
-        public final function SendMessage($pSendMessage)
-        {
+    public final function SendMessage($pSendMessage)
+    {
                 if ( !$this->isConnected() )
                         return "disconnected";

trunk/instant_messenger/inc/class.ldap_im.inc.php

@@ -2 +2 @@
 class ldap_im
 {
-        private $ldap_host;
-        private $ldap_context;
-        private $conn;
-        private $user;
-        private $jid;
-        private $password;
+        var $ldap_host;
+        var $ldap_context;
+        var $conn;
+        var $user;
+        var $jid;
+        var $password;
         
         function __construct()
@@ -17 +17 @@
                 $this->password                 = $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber'];
                 $this->jid                              = $_SESSION['phpgw_info']['instant_messenger']['user'];
-                $this->connect_ldap(false);
+                $this->connect_ldap(true);
                 session_write_close();
         }
-        
+                
+        function valor()
+        {
+
+                if ($this->conn) 
+                {
+                        $filter="ou=*";         
+                        $justthese = array("ou");
+                        $search = ldap_list($this->conn,$this->ldap_context, $filter, $justthese);
+                        return ldap_get_entries($this->conn, $search);
+                        
+                        $entry = ldap_get_entries($this->conn, $search);
+                }
+                
+        }       
+                
         function __destruct()
         {
@@ -39 +54 @@
         function get_photo_ldap($pUser,$getPhoto)
         {
-                $user = ( $pUser == "im_avatar" ) ? $this->jid : $pUser ;
+                $user = ( $pUser == "im__avatar" ) ? $this->jid : $pUser ;
                 
                 if ($this->conn) 
@@ -79 +94 @@
         function photo_ldap($user)
         {
-                $uid = ( $user['uid'] == "im_avatar" ) ? $this->jid : $user['uid'] ;
+                $uid = ( $user['uid'] == "im__avatar" ) ? $this->jid : $user['uid'] ;
                 return $this->get_photo_ldap($uid,false);
         }
@@ -150 +165 @@
         function list_organizations_ldap()
         {
-                $result_org = "<organizations><ou></ou>";
+                $result_org = "<organizations>";
 
                 if ($this->conn) 
@@ -161 +176 @@
                 
                 foreach($entry as $tmp)
-                        if($tmp['ou'][0] != "")
+                        if(trim($tmp['ou'][0]) != "")
                                 $result_org .= "<ou>" . $tmp['ou'][0] . "</ou>";  
 
                 $result_org .= "</organizations>";
-                
+
                 return $result_org;
         }