Changeset 287 for trunk/instant_messenger/inc

Timestamp:

05/26/08 11:45:16 (16 years ago)

Author:

niltonneto

Message:

Verificar Wiki/Trac? do módulo.

Location:

trunk/instant_messenger/inc

Files:

• Controller.class.php (added)
• Jabber.abstract.php (modified) (1 diff)
• Jabberd2.abstract.php (modified) (7 diffs)
• Socket.abstract.php (modified) (1 diff)
• class.Jabber.inc.php (added)
• class.Ujabber.inc.php (modified) (6 diffs)
• class.db_im.inc.php (modified) (1 diff)
• class.ldap_im.inc.php (modified) (1 diff)
• controller.xml (added)
• im_acl.inc.php (modified) (1 diff)
• im_sessions.inc.php (modified) (2 diffs)
• load_lang.php (modified) (1 diff)
• teste.php (added)

trunk/instant_messenger/inc/Jabber.abstract.php

@@ -79 +79 @@
         }
 
-        protected function connect($pUser = false, $pPassword = false, $pConnectionType = false)
+        protected function connect($pUser = false, $pPassword = false, $pConnectionType = false, $pWebjabber = false )
         { 
                 try
                 {
-                        $_connect = $this->_connect($pUser, $pPassword, $pConnectionType);
+                        $_connect = $this->_connect($pUser, $pPassword, $pConnectionType, $pWebjabber );
 
                         if ( !$_connect )

trunk/instant_messenger/inc/Jabberd2.abstract.php

@@ -69 +69 @@
                 else
                 {
-                        if ( $this->writeSocket($this->iq('set', $addid, NULL, NULL, "jabber:iq:roster", $newcontact)) )
+                        if ( $this->iq('set', $addid, NULL, NULL, "jabber:iq:roster", $newcontact) )
                                 $this->getContacts();
-                                echo "OK";
+                        echo "OK";
                 }
         }
@@ -96 +96 @@
                         else
                         {
-                                $this->writeSocket($this->iq('get', $vcard, $jid, NULL, "vcard-temp", "<vCard xmlns='vcard-temp'/>"));
+                                $this->iq('get', $vcard, $jid, NULL, "vcard-temp", "<vCard xmlns='vcard-temp'/>");
                         }
                 }
@@ -113 +113 @@
                 else
                 {
-                        $this->writeSocket($this->iq('set', $id, NULL, NULL, "vcard-temp", "<vCard xmlns='vcard-temp'>".$NewVcard['vcard']."</vCard>"));
+                        $this->iq('set', $id, NULL, NULL, "vcard-temp", "<vCard xmlns='vcard-temp'>".$NewVcard['vcard']."</vCard>");
                         echo "OK";
                 }
@@ -124 +124 @@
                         return "disconnected";
                         
-                if ( $this->writeSocket($this->iq('set',$delid,NULL,NULL,"jabber:iq:roster","<item jid='".$pContact['jid']."' subscription='remove'/>")) )
+                if ( $this->iq('set',$delid,NULL,NULL,"jabber:iq:roster","<item jid='".$pContact['jid']."' subscription='remove'/>") )
                         if ( $this->subscription($pContact['jid'],"unsubscribed") )
                                 echo "OK";
@@ -141 +141 @@
                         return true;
                 }
+        }
+
+        final function compression()
+        {
+                $compress = "<compress xmlns='http://jabber.org/protocol/compress'><method>zlib</method></compress>";   
+                $this->writeSocket($compress);
         }
 
@@ -164 +170 @@
                 $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"));
+                $this->iq('get', $id, $jid, NULL, "jabber:iq:last");
         }
 
@@ -191 +197 @@
                 else
                 {
-                        $this->writeSocket($this->iq('set', $upid, NULL, NULL, "jabber:iq:roster", $updatecontact));
+                        $this->iq('set', $upid, NULL, NULL, "jabber:iq:roster", $updatecontact);
                         $this->getContacts();
                         echo "OK";

trunk/instant_messenger/inc/Socket.abstract.php

@@ -52 +52 @@
                 set_magic_quotes_runtime(0);
                 $return = @fread($pSocket, $pLength);
+
                 set_magic_quotes_runtime(get_magic_quotes_gpc());
-
 
                 if ( $php_errormsg )

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

@@ -7 +7 @@
         private $set_presence;
         
-        public final function __construct()
+        public final function __construct($pConnectionType = 'write')
         {       
                 session_start();
-
                 $this->_user     = $_SESSION['phpgw_info']['instant_messenger']['user'];
                 $this->_pass     = $_SESSION['phpgw_info']['instant_messenger']['passwd'];
@@ -17 +16 @@
                 $this->_resource = $_SESSION['phpgw_info']['instant_messenger']['resource_jabber'];
                 $webjabber       = $_SESSION['phpgw_info']['instant_messenger']['webjabber'];
-
                 session_write_close();
 
-                if ( $this->connect($this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port, $this->_pass, 'read/write', $webjabber) )
+                if ( $this->connect($this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port, $this->_pass, $pConnectionType, $webjabber) )
                         $this->connected = true;
                 else
@@ -61 +59 @@
                         while ( ( connection_aborted() === 0 ) && time() - $init < 50 )
                         {
-                                
+                                if( isset($xml) )       
+                                        unset($xml);
+                        
                                 # read from server and write in the client
                                 $xml = $this->readSocket();
-                                //var_dump($xml);
                                 $xml = ( strlen($xml) ) ? $xml : ' ';
+                                //$xml = ( strlen($xml) ) ? $xml : '_##_';
                                 printf("%s", $xml);
                                 ob_flush();
@@ -74 +74 @@
         }
 
-    public final function SendMessage($pSendMessage)
-    {
+        public final function SendMessage($pSendMessage)
+        {
                 if ( !$this->isConnected() )
                         return "disconnected";
@@ -85 +85 @@
                 $pSendMessage['body'] = preg_replace($patterns, $replace, $pSendMessage['body']);
 
-                $_emotions  = '/<img emotion="(\S+)?"[^>]+>/';
+                $_emotions  = '/<img[^>]*emotion="(\S+)?"[^>]*>/'; 
                 $_emotions = preg_match_all($_emotions, $pSendMessage['body'], $emotions);
 
@@ -134 +134 @@
 
                         //retirar a linha abaixo para voltar ao padrão conforme acima
-                        $xml .= "<body>" . $content['body'] . "</body>";
+                        $xml .= "<body><![CDATA[" . htmlentities($content['body']) . "]]></body>";
                         $xml .= $payload;
                         $xml .= "</message>";

trunk/instant_messenger/inc/class.db_im.inc.php

@@ -19 +19 @@
         function db_im()
         {
-                
                 session_start();                
                 $this->db_name = $_SESSION['phpgw_info']['instant_messenger']['server']['db_name'];

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

@@ -13 +13 @@
                 session_start();
                 $this->ldap_host                = $_SESSION['phpgw_info']['instant_messenger']['server_ldap_jabber'];
-                $this->ldap_context     = $_SESSION['phpgw_info']['instant_messenger']['context_ldap_jabber'];
+                $this->ldap_context             = $_SESSION['phpgw_info']['instant_messenger']['context_ldap_jabber'];
                 $this->user                     = $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber'];
                 $this->password                 = $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber'];
-                $this->jid                              = $_SESSION['phpgw_info']['instant_messenger']['user'];
+                $this->jid                      = $_SESSION['phpgw_info']['instant_messenger']['user'];
                 $this->connect_ldap(true);
                 session_write_close();

trunk/instant_messenger/inc/im_acl.inc.php

@@ -1 +1 @@
 <?php
 
-$size_of_ACL = sizeof($GLOBALS['phpgw_info']['user']['acl']);
+$size_of_acl = sizeof($GLOBALS['phpgw_info']['user']['acl']);
 
-for ( $i = 0; $i < sizeof($GLOBALS['phpgw_info']['user']['acl']); $i++ )
+# percorre a ACL até o fim ou até encontrar a entrada para o módulo de mensagem instantânea
+for ( $i = 0; $i < $size_of_acl && $GLOBALS['phpgw_info']['user']['acl'][$i]['appname'] != 'instant_messenger'; $i++ );
+
+# verifica se foi encontrada a permissão para o módulo de mensagem instantânea
+if ( $GLOBALS['phpgw_info']['user']['acl'][$i]['appname'] == 'instant_messenger' )
 {
-      if ( $GLOBALS['phpgw_info']['user']['acl'][$i]['appname'] == 'instant_messenger')
-      {
-                        $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
-                        $webserver_url = ( !empty($webserver_url) ) ? $webserver_url : '/';
-                        
-                        if ( strrpos($webserver_url, '/') === false || strrpos($webserver_url, '/') != (strlen($webserver_url)-1) )
-                                $webserver_url .= '/';
-                        
-                        $webserver_url = $webserver_url . 'instant_messenger/';
-                        
-                        session_start();
-                        require_once PHPGW_SERVER_ROOT . '/instant_messenger/inc/im_sessions.inc.php';
-                        require_once PHPGW_SERVER_ROOT . '/instant_messenger/inc/load_lang.php';
-                        $_user     = $_SESSION['phpgw_info']['instant_messenger']['user'];
-                        $_pass     = $_SESSION['phpgw_info']['instant_messenger']['passwd'];
-                        $_server   = $_SESSION['phpgw_info']['instant_messenger']['name_jabber'];
-                        $_port     = $_SESSION['phpgw_info']['instant_messenger']['port_jabber'];
-                        $_resource = $_SESSION['phpgw_info']['instant_messenger']['resource_jabber'];
-                        session_write_close();
-                        
-                        $js = array(
-                                'connector',
-                                'xtools',
-                                'jabber',
-                                'client',
-                                'images',
-                                'dragdrop',
-                                'build_win',
-                                'templates',
-                                'fcommon',
-                                'menu_action',
-                                'functions',
-                                'images',
-                                'cookies_im',
-                                'load',
-                        );
-                        
-                        print '<script type="text/javascript">var path_im = "'.$webserver_url.'";</script>';
-                        
-                        foreach ( $js as $key => $val )
-                                print '<script src="' . $webserver_url . 'controller.php?act=j.' . $val . '"></script>';
-                        
-                        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/window.css">';
-                        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/chat.css">';
-                        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/common.css">';
-                        
-                        print '<script type="text/javascript">setTimeout("client()",2000);</script>';
-      }
+        $webserver_url_im = $GLOBALS['phpgw_info']['server']['webserver_url'];
+        $webserver_url_im = ( !empty($webserver_url_im) ) ? $webserver_url_im : '/';
+
+        if ( strrpos($webserver_url_im, '/') === false || strrpos($webserver_url_im, '/') != (strlen($webserver_url_im) - 1) )
+                $webserver_url_im .= '/';
+
+        $webserver_url_im = $webserver_url_im . 'instant_messenger/';
+
+        require_once PHPGW_SERVER_ROOT . '/instant_messenger/inc/im_sessions.inc.php';
+        require_once PHPGW_SERVER_ROOT . '/instant_messenger/inc/load_lang.php';
+
+        $js = array(
+                'connector',
+                'jabber',
+                'xtools',
+                'client',
+                'images',
+                'dragdrop',
+                'build_win',
+                'templates',
+                'fcommon',
+                'menu_action',
+                'functions',
+                'images',
+                'cookies_im',
+                'load',
+        );
+
+        print '<script type="text/javascript">var path_im = "'.$webserver_url_im.'";</script>';
+
+
+        require_once dirname(__FILE__) . '/Controller.class.php';
+
+        $controller = new Controller;
+        $script = '';
+        foreach ( $js as $key => $val )
+        {
+                $val = array('act' => 'j.' . $val);
+                $script .= $controller->exec($val);
+        }
+
+        printf("<script type=\"text/javascript\">%s</script>", $script);
+
+        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url_im . 'templates/default/css/window.css">';
+        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url_im . 'templates/default/css/chat.css">';
+        print '<link rel="stylesheet" type="text/css" href="' . $webserver_url_im . 'templates/default/css/common.css">';
+
+        # trecho de código javascript utilizado para
+        # controle de possí­vel erro no load do script
+        # feito acima e está sendo inserido via PHP
+        # pois é um complemento do procedimento acima
+        $init_client  = '<script type="text/javascript">';
+        $init_client .= '       function im_init(pTimes)';
+        $init_client .= '       {';
+        $init_client .= '               if ( !pTimes )';
+        $init_client .= '                       pTimes = 0;';
+        $init_client .= '               if ( pTimes == 5 )';
+        $init_client .= '                       return false;';
+        $init_client .= '               if ( window.client )';
+        $init_client .= '                       client();';
+        $init_client .= '               else';
+        $init_client .= '                       setTimeout("im_init("+(++pTimes)+")", (pTimes + 1) * 2000);';
+        $init_client .= '       }';
+        $init_client .= '       im_init();';
+        $init_client .= '</script>';
+        printf("%s", $init_client);
 }
 ?>

trunk/instant_messenger/inc/im_sessions.inc.php

@@ -1 +1 @@
 <?php
-
+        
                 $_SESSION['phpgw_info']['instant_messenger']['user']             = $GLOBALS['phpgw_info']['user']['account_lid'];
-                $_SESSION['phpgw_info']['instant_messenger']['user_id']                  = $GLOBALS['phpgw_info']['user']['account_id'];                
+                $_SESSION['phpgw_info']['instant_messenger']['user_id']          = $GLOBALS['phpgw_info']['user']['account_id'];                
                 $_SESSION['phpgw_info']['instant_messenger']['passwd']           = $GLOBALS['phpgw_info']['user']['passwd'];
                 $_SESSION['phpgw_info']['instant_messenger']['name_jabber']      = $GLOBALS['phpgw_info']['server']['name_jabber'];
                 $_SESSION['phpgw_info']['instant_messenger']['port_jabber']      = $GLOBALS['phpgw_info']['server']['port_jabber'];
                 $_SESSION['phpgw_info']['instant_messenger']['resource_jabber']  = $GLOBALS['phpgw_info']['server']['resource_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['tls_jabber']       = $GLOBALS['phpgw_info']['server']['tls_jabber'];
                 
-                $_SESSION['phpgw_info']['instant_messenger']['server_ldap_jabber']   = $GLOBALS['phpgw_info']['server']['server_ldap_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['context_ldap_jabber']  = $GLOBALS['phpgw_info']['server']['context_ldap_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber']     = $GLOBALS['phpgw_info']['server']['user_ldap_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber'] = $GLOBALS['phpgw_info']['server']['password_ldap_jabber'];
-                $_SESSION['phpgw_info']['instant_messenger']['webjabber']                        = $GLOBALS['phpgw_info']['server']['wejabber'];                
+                $_SESSION['phpgw_info']['instant_messenger']['server_ldap_jabber']      = $GLOBALS['phpgw_info']['server']['server_ldap_jabber'];
+                $_SESSION['phpgw_info']['instant_messenger']['context_ldap_jabber']     = $GLOBALS['phpgw_info']['server']['context_ldap_jabber'];
+                $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber']        = $GLOBALS['phpgw_info']['server']['user_ldap_jabber'];
+                $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber']    = $GLOBALS['phpgw_info']['server']['password_ldap_jabber'];
+                $_SESSION['phpgw_info']['instant_messenger']['webjabber']               = $GLOBALS['phpgw_info']['server']['webjabber'];                
                 
                 $_SESSION['phpgw_info']['instant_messenger']['server']['db_name'] = $GLOBALS['phpgw_info']['server']['db_name'];
@@ -21 +20 @@
                 $_SESSION['phpgw_info']['instant_messenger']['server']['db_pass'] = $GLOBALS['phpgw_info']['server']['db_pass'];
                 $_SESSION['phpgw_info']['instant_messenger']['server']['db_type'] = $GLOBALS['phpgw_info']['server']['db_type'];
-
+                
 ?>

trunk/instant_messenger/inc/load_lang.php

@@ -1 +1 @@
 <?
-if ( !isset($_SESSION['phpgw_info']['instant_messenger']['lang']) || !is_array($_SESSION['phpgw_info']['instant_messenger']['lang']) )
-   if ( file_exists(($fn = dirname(__FILE__) . '/../setup/phpgw_pt-br.lang')) )
-      if ( ($fp = fopen($fn,'r')) )
-      {
-         while ($data = fgets($fp,16000))
-         {
-            list($message_id, $app_name, $null, $content) = explode("\t",substr($data,0,-1));
-            $_SESSION['phpgw_info']['instant_messenger']['lang'][$message_id] = $content;
-         }
-         fclose($fp);
-      }
+
+if ( file_exists(($fn = dirname(__FILE__) . '/../setup/phpgw_pt-br.lang')) )
+        if ( ($fp = fopen($fn,'r')) )
+        {
+                while ($data = fgets($fp,16000))
+                {
+                        list($message_id, $app_name, $null, $content) = explode("\t",substr($data,0,-1));
+                        $LANG_IM[$message_id] = $content;
+                }
+                fclose($fp);
+        }
 
 $script  = '<script>';
 $script .= 'var lang_im = [];';
 
-foreach ( $_SESSION['phpgw_info']['instant_messenger']['lang'] as $key => $value )
+foreach ( $LANG_IM as $key => $value )
    $script .= "lang_im['" . strtolower(addslashes($key)) . "'] = '" . addslashes($value) . "';";
-
-   #$_key = str_replace("'","\'",strtolower($key));
-   #$_val = str_replace("'","\'",$value);
 
 $script .= '</script>';
 
 echo $script;
+
+unset($LANG_IM);
 ?>