Changeset 459 for trunk/jabberit_messenger/inc

Timestamp:

09/22/08 17:02:02 (16 years ago)

Author:

niltonneto

Message:

Alterações feitas por Alexandre Correia.
Vide alterações 0.79 (Trac).
Email: alexandrecorreia@…

Location:

trunk/jabberit_messenger/inc

Files:

• Controller.class.php (modified) (1 diff)
• class.jabber.inc.php (modified) (9 diffs)
• class.ujabber.inc.php (modified) (5 diffs)
• controller.xml (modified) (3 diffs)
• jabberit_acl.inc.php (modified) (2 diffs)
• login.php (modified) (1 diff)

trunk/jabberit_messenger/inc/Controller.class.php

@@ -164 +164 @@
                 $obj = new ReflectionClass($class);
 
-                if ( $pRequest['classCostructor'] )
+                if ( $pRequest['classConstructor'] )
                 {
-                        $obj = $obj->newInstance($pRequest['classCostructor']);
-                        unset($pRequest['classCostructor']);
+                        $obj = $obj->newInstance($pRequest['classConstructor']);
+                        unset($pRequest['classConstructor']);
                 }
                 else

trunk/jabberit_messenger/inc/class.jabber.inc.php

@@ -103 +103 @@
                         $this->SendPacket("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
 
-                        sleep(2);
+                        sleep(1);
 
                         if ($this->_check_connected())
@@ -304 +304 @@
 
 
-
         function StripJID($jid = NULL)
         {
@@ -310 +309 @@
                 return ($temp[1] != "") ? $temp[1] : $jid;
         }
-
 
 
@@ -383 +381 @@
                 }
         }
-
-
 
         function SendError($to, $id = NULL, $error_number, $error_message = NULL)
@@ -399 +395 @@
         }
 
-
+        function RosterGroups()
+        {
+                $roster_request_id = "roster_" . time();
+                $incoming_array = $this->SendIq(NULL, 'get', $roster_request_id, "jabber:iq:roster");
+                $groups = array();
+
+                if (is_array($incoming_array))
+                {
+                        if ($incoming_array['iq']['@']['type'] == 'result'
+                                && $incoming_array['iq']['@']['id'] == $roster_request_id
+                                && $incoming_array['iq']['#']['query']['0']['@']['xmlns'] == "jabber:iq:roster")
+                        {
+                                $number_of_contacts = count($incoming_array['iq']['#']['query'][0]['#']['item']);
+                                $this->roster = array();
+
+                                for ($a = 0; $a < $number_of_contacts; $a++)
+                                         $groups[] = $incoming_array['iq']['#']['query'][0]['#']['item'][$a]['#']['group'][0]['#'];
+
+                                return $groups;
+                        }
+                        else
+                        {
+                                $this->AddToLog("ERROR: RosterGroups() #1");
+                                return FALSE;
+                        }
+                }
+                else
+                {
+                        $this->AddToLog("ERROR: RosterGroups() #2");
+                        return FALSE;
+                }
+
+        }
 
         function RosterUpdate()
@@ -990 +1018 @@
 
                 $this->SendPacket("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>\n");
-                sleep(2);
+                sleep(1);
                 $incoming_array = $this->_listen_incoming();
 
@@ -1018 +1046 @@
                 $this->SendPacket("<?xml version='1.0' encoding='UTF-8' ?" . ">\n");
                 $this->SendPacket("<stream:stream to='{$this->server}' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>\n");
-                sleep(2);
+                sleep(1);
 
                 if (!$this->_check_connected())
@@ -1753 +1781 @@
         }
 
-
-
         function AddPacketDetails($string, $value = NULL)
         {
@@ -1777 +1803 @@
                 eval("\$this->nodes$node = \"" . htmlspecialchars($value) . "\";");
         }
-
-
 
         function BuildPacket($array = NULL)

trunk/jabberit_messenger/inc/class.ujabber.inc.php

@@ -28 +28 @@
         }       
         
-        function connect()
+        private final function connect()
         {
                 if(!$this->jabber->Connect())
@@ -44 +44 @@
         }
         
-        function disconnect()
+        private final function disconnect()
         {
                 
@@ -50 +50 @@
         }
         
-        function AddNewContact($pNewUser)
+        public final function AddNewContact($pNewUser)
         {
                 $this->connect();
@@ -60 +60 @@
                 if($this->jabber->RosterAddUser($jid,$id,$name,$group))
                 {
+                        $_SESSION['phpgw_info']['jabberit_messenger']['groups_user'][] = $group;
+                        $_SESSION['phpgw_info']['jabberit_messenger']['groups_user'] = array_unique($_SESSION['phpgw_info']['jabberit_messenger']['groups_user']);
+                        
                         if($this->jabber->Subscribe($jid))
                                 return true;
@@ -70 +73 @@
                 $this->disconnect();
         }
+        
+        public final function getGroupsJabber()
+        {
+                $groups = array();
+                $return = '';
+                
+                if(!isset($_SESSION['phpgw_info']['jabberit_messenger']['groups_user']))
+                {               
+                        $this->connect();
+                        $groups = $this->jabber->RosterGroups();
+                        $this->disconnect();
+                        
+                        $groups = array_unique($groups);
+                        $_SESSION['phpgw_info']['jabberit_messenger']['groups_user'] = $groups;
+                        
+                }else
+                        $groups = $_SESSION['phpgw_info']['jabberit_messenger']['groups_user'];
+
+                natcasesort($groups);
+        
+                foreach($groups as $tmp)
+                        $return .= $tmp . ";";
+                
+                if( trim($return) != '' )
+                        $return = substr( $return, 0, strlen($return)-1 );
+        
+                return $return;
+        }
 }
-?>      
+?>

trunk/jabberit_messenger/inc/controller.xml

@@ -17 +17 @@
         <controller-sections>
                 <css></css>
-                <js path="/var/www/expresso/jabberit_messenger/js" suffix=".js" debug="true">
+                <js path="/var/www/expresso/jabberit_messenger/js" suffix=".js" debug="false">
                         <item ref="connector" js="connector" />
                         <item ref="xtools" js="xtools" />
@@ -26 +26 @@
                         <item ref="images" js="images" />
                         <item ref="show_hidden" js="show_hidden" />
+                        <item ref="editSelect" js="editSelect" />
                         <item ref="setup" js="setup" path="/var/www/expresso/jabberit_messenger/templates/celepar/"/>
                 </js>
@@ -35 +36 @@
                         <item ref="ldap_im" alias="photo_ldap" class="ldap_im" method="photo_ldap" prefix="class." suffix=".inc.php"/>
                         <item ref="ujabber" alias="AddNewContact" class="ujabber" method="AddNewContact" prefix="class." suffix=".inc.php"/>
+                        <item ref="ujabber" alias="getGroupsJabber" class="ujabber" method="getGroupsJabber" prefix="class." suffix=".inc.php"/>                        
                         <item ref="FileDefine" alias="getParams" class="FileDefine" method="getParams" prefix="class." suffix=".inc.php"/>                      
                 </php>

trunk/jabberit_messenger/inc/jabberit_acl.inc.php

@@ -57 +57 @@
                                 'show_hidden',
                                 'load',
+                                'editSelect'
                                 );
 
@@ -73 +74 @@
                 print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/celepar/css/window.css">';
                 print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/celepar/css/common.css">';
+                print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/celepar/css/selectEditStyle.css">';         
 
                 break;

trunk/jabberit_messenger/inc/login.php

@@ -17 +17 @@
     {
                 $path = $_SESSION['phpgw_info']['jabberit_messenger']['webserver_url'];
-                $SERVER_EXPRESSO = gethostbyaddr($_SERVER['SERVER_ADDR']) . $path;
-
+                $SERVER_EXPRESSO = $_SERVER['HTTP_HOST'] . $path;
+                
                 $template = new Template('templates/celepar');
                 $template->set_var("path", $path);