Changeset 1130

Timestamp:

07/15/09 16:38:53 (15 years ago)

Author:

alexandrecorreia

Message:

Ticket #577 - Adicionado botão "click to call" na janela de conversa, arquivos php modificados.

Location:

trunk/jabberit_messenger

Files:

• applet.jar (modified) (previous)
• inc/confLDAPInternal.php (added)
• inc/login.php (modified) (2 diffs)
• inc/webservice.php (modified) (4 diffs)
• plugins/callVoip.jar (added)
• plugins/filetransfer.jar (modified) (previous)
• plugins/xhtml.jar (modified) (previous)
• templates/default/.packer.setup.js (added)

trunk/jabberit_messenger/inc/login.php

@@ -79 +79 @@
                         }
                 }
-                
+
+                //Enable/Disable VoIP Service -> Voip Server Config
+                $voip_enabled = false;
+                $voip_groups = array(); 
+                if( $GLOBALS['phpgw_info']['server']['voip_groups'] )
+                {
+                        $emailVoip = false;
+                        foreach(explode(",",$GLOBALS['phpgw_info']['server']['voip_groups']) as $i => $voip_group)
+                        {
+                                $a_voip = explode(";",$voip_group);                     
+                                $voip_groups[] = $a_voip[1];
+                        }
+                        foreach($GLOBALS['phpgw']->accounts->membership() as $idx => $group){                   
+                                if(array_search($group['account_name'],$voip_groups) !== FALSE)
+                                {                
+                                        $voip_enabled = true;
+                                        $emailVoip = $GLOBALS['phpgw_info']['server']['voip_email_redirect'];
+                                }
+                        }
+                }
+
                 // Load Applet ( Java )
                 $javaFiles = $path . "applet.jar,";
@@ -86 +106 @@
                 // Enable Plugins Java;
                 $pluginsJava[] = "xhtml.jar";
-                $pluginsJava[] = "filetransfer.jar";            
+                $pluginsJava[] = "filetransfer.jar";
+                
+                if( $voip_enabled )
+                        $pluginsJava[] = "callVoip.jar";                
                 
                 for( $i = 0; $i < count($pluginsJava); $i++ )

trunk/jabberit_messenger/inc/webservice.php

@@ -83 +83 @@
                 $this->ldapConnect();
         }
+        
+        public final function CallVoipConnect($pVoipFrom, $pVoipTo)
+        {
+                
+                $this->ldapConnect();
+
+                if( $this->conn )
+                {
+                        $filter  = "(|(&(phpgwaccounttype=u)(uid=".$pVoipFrom."))(&(phpgwaccounttype=u)(uid=".$pVoipTo.")))";
+                        $justthese = array("telephoneNumber");
+                        $search = ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
+                        $entry = ldap_get_entries($this->conn,$search);
+
+                        $fromNumber = $entry[0]['telephonenumber'][0];
+                        $toNumber = $entry[1]['telephonenumber'][0];
+                }
+
+                if( $fromNumber && $toNumber )
+                {
+                        $fromNumber = substr($fromNumber,strlen($fromNumber) - 4, strlen($fromNumber) - 1);
+                        $toNumber       = substr($toNumber,strlen($toNumber) - 4, strlen($toNumber) - 1);
+
+                        $voipServer     = "10.15.151.106";
+                        $voipUrl        = "/telefoniaip/servicos/voip.php";
+                        $voipPort       = "80";
+        
+                        if( !$voipServer || !$voipUrl || !$voipPort )
+                                return false;
+                        
+                        $url            = "http://".$voipServer.":".$voipPort.$voipUrl."?magic=1333&acao=liga&ramal=".$fromNumber."&numero=".$toNumber;                 
+                        $sMethod        = 'GET ';
+                        $crlf           = "\r\n";
+                        $sRequest       = " HTTP/1.1" . $crlf;
+                        $sRequest       .= "Host: localhost" . $crlf;
+                        $sRequest       .= "Accept: */* " . $crlf;
+                        $sRequest       .= "Connection: Close" . $crlf . $crlf;            
+                        $sRequest       = $sMethod . $url . $sRequest;    
+                        $sockHttp       = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);            
+                        
+                        if ( !$sockHttp )
+                            return false;
+                        
+                        $resSocketConnect = socket_connect($sockHttp, $voipServer, $voipPort);
+                        
+                        if ( !$resSocketConnect )
+                            return false;
+        
+                        $resSocketWrite = socket_write($sockHttp, $sRequest, strlen($sRequest));
+        
+                        if ( !$resSocketWrite )
+                            return false;
+            
+                        $sResponse = '';    
+        
+                        while ($sRead = socket_read($sockHttp, 512))
+                        {
+                            $sResponse .= $sRead;
+                        }            
+                        
+                        socket_close($sockHttp);            
+                        
+                        $pos = strpos($sResponse, $crlf . $crlf);
+                        
+                        return substr($sResponse, $pos + 2 * strlen($crlf));
+                }
+                
+                return "ERRO";                                                                  
+        }
+        
         
         public final function getNameOrganization($pJid, $pCharset)
@@ -231 +300 @@
 }
 
+// Utilizando o serviço Asteriks;
+if(trim($_REQUEST['javaVoipFrom']) != "" && trim($_REQUEST['javaVoipTo']) != "" )
+{
+        $obj = new webService();
+        $voipFrom = $_REQUEST['javaVoipFrom'];
+        $voipTo = $_REQUEST['javaVoipTo'];
+        printf("%s",$obj->CallVoipConnect($voipFrom, $voipTo));
+}
+
+// Fotos pelo applet; 
 if(trim($_REQUEST['javaPhoto']) != "" )
 {
@@ -271 +350 @@
 }
 
+// Jid pelo applet;
 if(trim($_POST['jid']) != "")
 {
@@ -280 +360 @@
 }
 
+// Fotos pelo php;
 if(trim($_REQUEST['phpPhoto']) != "")
 {