Changeset 265
- Timestamp:
- 04/14/08 14:20:28 (16 years ago)
- Location:
- trunk/instant_messenger
- Files:
-
- 8 edited
-
controller.xml (modified) (1 diff)
-
inc/Jabber.abstract.php (modified) (2 diffs)
-
inc/class.Ujabber.inc.php (modified) (1 diff)
-
inc/im_sessions.inc.php (modified) (1 diff)
-
index.php (modified) (1 diff)
-
js/jabber.js (modified) (5 diffs)
-
js/templates.js (modified) (1 diff)
-
templates/default/config.tpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/instant_messenger/controller.xml
r261 r265 48 48 <item ref="Ujabber" alias="sendMessage" class="Ujabber" method="sendMessage" prefix="class." suffix=".inc.php" /> 49 49 <item ref="Ujabber" alias="subscription" class="Ujabber" method="subscription" prefix="class." suffix=".inc.php" /> 50 <item ref="Ujabber" alias="updateContact" class="Ujabber" method="updateContact" prefix="class." suffix=".inc.php" /> 50 <item ref="Ujabber" alias="updateContact" class="Ujabber" method="updateContact" prefix="class." suffix=".inc.php" /> 51 <item ref="Ujabber" alias="setStatus" class="Ujabber" method="setStatus" prefix="class." suffix=".inc.php" /> 51 52 </php> 52 53 <xml></xml> -
trunk/instant_messenger/inc/Jabber.abstract.php
r262 r265 32 32 const NOTICE = 'NOTICE'; 33 33 34 private final function _connect( $pUser = false, $pPassword = false, $pConnectionType = false )34 private final function _connect( $pUser = false, $pPassword = false, $pConnectionType = false, $pWebjabber = false ) 35 35 { 36 36 try … … 41 41 list($subject, $USER, $SERVER, $RESOURCE, $PORT) = $matches; 42 42 43 if ( !($socket = $this->open('tcp://' . $SERVER . ':' . $PORT, 1, 1)) ) 44 throw new Exception('[connect] #2 can\'t access tcp://' . $SERVER . ':' . $PORT . '. File: ' . __FILE__ . ' :: ' . __LINE__); 43 if ( !$pWebjabber || empty($pWebjabber) ) 44 $pWebjabber = $SERVER; 45 46 if ( !($socket = $this->open('tcp://' . $pWebjabber . ':' . $PORT, 1, 1)) ) 47 throw new Exception('[connect] #2 can\'t access tcp://' . $pWebjabber . ':' . $PORT . '. File: ' . __FILE__ . ' :: ' . __LINE__); 45 48 46 49 $this->_socket = $socket; -
trunk/instant_messenger/inc/class.Ujabber.inc.php
r260 r265 14 14 $this->_port = $_SESSION['phpgw_info']['instant_messenger']['port_jabber']; 15 15 $this->_resource = $_SESSION['phpgw_info']['instant_messenger']['resource_jabber']; 16 $webjabber = $_SESSION['phpgw_info']['instant_messenger']['webjabber']; 16 17 17 18 session_write_close(); 18 19 19 if ( $this->connect($this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port, $this->_pass, 'read/write' ) )20 if ( $this->connect($this->_user . '@' . $this->_server . '/' . $this->_resource . ':' . $this->_port, $this->_pass, 'read/write', $webjabber) ) 20 21 $this->connected = true; 21 22 else -
trunk/instant_messenger/inc/im_sessions.inc.php
r260 r265 13 13 $_SESSION['phpgw_info']['instant_messenger']['user_ldap_jabber'] = $GLOBALS['phpgw_info']['server']['user_ldap_jabber']; 14 14 $_SESSION['phpgw_info']['instant_messenger']['password_ldap_jabber'] = $GLOBALS['phpgw_info']['server']['password_ldap_jabber']; 15 $_SESSION['phpgw_info']['instant_messenger']['webjabber'] = $GLOBALS['phpgw_info']['server']['wejabber']; 15 16 16 17 $_SESSION['phpgw_info']['instant_messenger']['server']['db_name'] = $GLOBALS['phpgw_info']['server']['db_name']; -
trunk/instant_messenger/index.php
r261 r265 40 40 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> 41 41 <title>IM</title> 42 <!-- JavaScript -->43 44 <script type="text/javascript" src="js/connector.js"></script>45 <script type="text/javascript" src="js/xtools.js"></script>46 <script type="text/javascript" src="js/jabber.js"></script>47 <script type="text/javascript" src="js/client.js"></script>48 <script type="text/javascript" src="js/images.js"></script>49 <script type="text/javascript" src="js/dragdrop.js"></script>50 <script type="text/javascript" src="js/build_win.js"></script>51 52 <!-- JavaScript Aux -->53 <script type="text/javascript" src="js/templates.js"></script>54 <script type="text/javascript" src="js/fcommon.js"></script>55 <script type="text/javascript" src="js/menu_action.js"></script>56 <script type="text/javascript" src="js/functions.js"></script>57 <script type="text/javascript" src="js/images.js"></script>58 <script type="text/javascript" src="js/cookies_im.js"></script>59 60 <!-- CSS -->61 <link rel="stylesheet" type="text/css" href="templates/default/css/window.css">62 <link rel="stylesheet" type="text/css" href="templates/default/css/chat.css">63 <link rel="stylesheet" type="text/css" href="templates/default/css/common.css">64 65 <script type="text/javascript" src="js/load.js"></script>66 42 </head> -
trunk/instant_messenger/js/jabber.js
r262 r265 109 109 function readMessage(pMessage) 110 110 { 111 var messages_backup = ""; 111 112 if ( pMessage.getElementsByTagName('body').length > 0 ) 112 113 { … … 115 116 from = from.substr(0,from.indexOf('/')); 116 117 117 if(func.byId('iframe_' + from) != null) 118 /*if(func.byId('iframe_' + from) != null) 119 { 118 120 func.byId('iframe_' + from).parentNode.removeChild(func.byId('iframe_' + from)); 121 }*/ 119 122 120 123 var win; … … 131 134 iframe.style.margin = '0'; 132 135 iframe.style.padding = '0'; 133 136 134 137 var _messages_ = win.firstChild.firstChild.nextSibling.nextSibling; 135 138 _messages_.appendChild(iframe); … … 149 152 if ( !e.shiftKey ) 150 153 sendMessage(iframe.contentWindow.document.getElementsByTagName('body').item(0), from); 151 return false; 152 break; 154 break; 153 155 case 27 : 154 156 im_window.window_close(pId); 155 break;157 break; 156 158 default : 157 break;159 break; 158 160 } 159 161 } … … 197 199 { 198 200 im_window.load(from, '', '', '', '', true, true, true); 199 include_iframe();200 201 } 201 202 -
trunk/instant_messenger/js/templates.js
r260 r265 165 165 if ( !e.shiftKey ) 166 166 _this.jabber.doIt('sendMessage',{'message' : iframe.contentWindow.document.getElementsByTagName('body').item(0), 'from' : pJid }); 167 return false; 168 break; 167 break; 169 168 case 27 : 170 169 im_window.window_close(pId); 171 break;170 break; 172 171 default : 173 break;172 break; 174 173 } 175 174 } -
trunk/instant_messenger/templates/default/config.tpl
r260 r265 30 30 <td><input id="IM_port_jabber" name="newsettings[port_jabber]" value="{value_port_jabber}"></td> 31 31 </tr> 32 33 <tr bgcolor="{row_off}"> 34 <td colspan="2"> </td> 35 </tr> 32 36 33 37 <tr bgcolor="{row_off}"> 38 <td colspan="2"> <b>Configuração do Servidor Webjabber</b></td> 39 </tr> 40 41 <tr bgcolor="{row_on}"> 42 <td>Digite o Ip do Servidor WebJabber:</td> 43 <td><input id="IM_server_webjabber" name="newsettings[server_webjabber]" value="{value_server_webjabber}"></td> 44 </tr> 45 46 <tr bgcolor="{row_off}"> 47 <td colspan="2"> </td> 48 </tr> 49 50 <tr bgcolor="{row_off}"> 51 <td colspan="2"> <b>Configuração do Servidor Ldap</b></td> 52 </tr> 53 54 <tr bgcolor="{row_on}"> 34 55 <td>Servidor Ldap:</td> 35 56 <td><input id="IM_server_ldap_jabber" name="newsettings[server_ldap_jabber]" value="{value_server_ldap_jabber}"></td> 36 57 </tr> 37 58 38 <tr bgcolor="{row_o n}">59 <tr bgcolor="{row_off}"> 39 60 <td>Contexto:</td> 40 61 <td><input id="IM_context_ldap_jabber" name="newsettings[context_ldap_jabber]" value="{value_context_ldap_jabber}" size="30"></td> 41 62 </tr> 42 63 43 <tr bgcolor="{row_o ff}">64 <tr bgcolor="{row_on}"> 44 65 <td>Usuário Ldap:</td> 45 66 <td><input id="IM_user_ldap_jabber" name="newsettings[user_ldap_jabber]" value="{value_user_ldap_jabber}" size="30"></td> 46 67 </tr> 47 68 48 <tr bgcolor="{row_o n}">69 <tr bgcolor="{row_off}"> 49 70 <td>Password:</td> 50 71 <td><input type="password" name="newsettings[password_ldap_jabber]" value="{value_password_ldap_jabber}"></td>
Note: See TracChangeset
for help on using the changeset viewer.
