Changeset 44
- Timestamp:
- 07/27/07 16:56:55 (17 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/help/content.html
r32 r44 36 36 <p class='item'><img src='templates/celepar/images/002_logoexpmail.jpg'><sup><b> ExpressoMail</b></sup></p> 37 37 <div class='texto'> 38 O ExpressoMail é o módulo de correio do Expresso. Através dele você pode acessar, gerenciar e manipular suas mensagens. Ao entrar no módulo, é exibida a sua Caixa de Entrada, com menus principal e de pastas à sua esquerda. As principais funcionalidades do módulo serão descritas a seguir: 38 <img align="bottom" src="../expressoMail1_2/templates/default/images/menu/acroread.png"/><a style="font-size:12" title="Clique aqui!" href="../expressoMail1_2/help/CartelaExpressoMail.pdf" target="_blank">Manual completo do ExpressoMail</a><p> 39 <p>O ExpressoMail é o módulo de correio do Expresso. Através dele você pode acessar, gerenciar e manipular suas mensagens. Ao entrar no módulo, é exibida a sua Caixa de Entrada, com menus principal e de pastas à sua esquerda. As principais funcionalidades do módulo serão descritas a seguir: 39 40 <ul style='text-indent:0'> 40 41 <li>Ao abrir uma mensagem ou redigir uma nova mensagem, será aberta uma aba ao lado da Caixa de Entrada. Isto permite que várias mensagens sejam abertas ao mesmo tempo, simultaneamente à escrita de uma nova mensagem, por exemplo.</li> … … 79 80 </td><td width=50%> 80 81 <img src='templates/celepar/images/012_menuprincipal.jpg'></td></tr> 81 </table><br><br></li> 82 83 82 </table></li> 83 </div> 84 84 <!--<table width =100% border=0 class='texto' style='text-indent:0'> 85 85 <tr><td width=50%> -
trunk/instant_messenger/js/im_functions.js
r36 r44 10 10 this.array_prefe['ch_offline'] = true; 11 11 this.load_photo = false; 12 this.IM_Manutencao = false; 12 13 } 13 14 … … 18 19 IM.prototype.load_im = function() 19 20 { 21 20 22 var force = ( arguments.length ) ? true : false; 21 23 var _this = this; 22 24 Sincro.count = 0; 23 24 var handler_contacts = function(data) 25 { 26 if( (data.length) >= (_this.array_users.length) || (data.length - 1) > 0){ 27 _this.array_users.splice(0,_this.array_users.length); 28 _this.array_users = data; 29 _this.mount_list(data); 30 _this.conf_VcardUser(data[0]); 25 26 if( _this.IM_Manutencao ) 27 { 28 _this.Manutencao(); 29 30 }else{ 31 var handler_contacts = function(data) 32 { 33 if( (data.length) >= (_this.array_users.length) || (data.length - 1) > 0){ 34 _this.array_users.splice(0,_this.array_users.length); 35 _this.array_users = data; 36 _this.mount_list(data); 37 _this.conf_VcardUser(data[0]); 38 } 31 39 } 32 } 33 34 if ( force || this.getWinContactsState() )35 cIM.cExecute("$this.Ujabber.list_user",handler_contacts); 40 41 if ( force || this.getWinContactsState() ) 42 cIM.cExecute("$this.Ujabber.list_user",handler_contacts); 43 } 36 44 } 37 45 … … 317 325 { 318 326 var _this = this; 319 var handler_message = function(data) 327 328 if( _this.IM_Manutencao ) 320 329 { 321 if( data.length > 0) 330 _this.Manutencao(); 331 332 }else{ 333 var handler_message = function(data) 322 334 { 323 var TimeStamp = ""; 324 var jid = ""; 325 var nickname = ""; 326 var body_message = ""; 327 var window_message = ""; 328 329 for( var i=0; i < data.length; i++) 330 { 331 jid = data[i].from; 332 body_message = data[i].body; 333 TimeStamp = (_this.array_prefe['ch_time']) ? "[" + data[i].timestamp + "] " : " "; 335 if( data.length > 0) 336 { 337 var TimeStamp = ""; 338 var jid = ""; 339 var nickname = ""; 340 var body_message = ""; 341 var window_message = ""; 342 343 for( var i=0; i < data.length; i++) 344 { 345 jid = data[i].from; 346 body_message = data[i].body; 347 TimeStamp = (_this.array_prefe['ch_time']) ? "[" + data[i].timestamp + "] " : " "; 348 349 jid = jid.substr(0,jid.indexOf('/')); 350 body_message = decodeURI(body_message.replace(/\\\'/g, '\'')); 351 352 window_message = document.getElementById(jid + "_chatMessages"); 353 nickname = jid; 354 355 for( var j=1; j < IM.array_users.length; j++ ) 356 { 357 if( jid == IM.array_users[j].jid ){ 358 nickname = decodeURI(IM.array_users[j].VCARD_NICKNAME); 359 } 360 } 361 362 if ( window_message ) 363 { 364 window_message.innerHTML += '<strong>' + TimeStamp + nickname + '</strong> ' + IM.get_lang('speak') + ':<br/> ' + _this.emotions_icons(body_message) + '<br/><br/>'; 365 if ( windowItems[jid].state != WINDOW_STATE_REGULAR && windowItems[jid].state != WINDOW_STATE_MAXIMIZED ) 366 im_win.showWindowItem(jid); 367 } 368 else 369 { 370 im_win.open_chat(jid); 371 window_message = document.getElementById(jid + '_chatMessages'); 372 window_message.innerHTML += '<strong>' + TimeStamp + nickname + '</strong> ' + IM.get_lang('speak') + ':<br/> ' + _this.emotions_icons(body_message) + '<br/><br/>'; 373 } 374 } 334 375 335 jid = jid.substr(0,jid.indexOf('/')); 336 body_message = decodeURI(body_message.replace(/\\\'/g, '\'')); 337 338 window_message = document.getElementById(jid + "_chatMessages"); 339 nickname = jid; 340 341 for( var j=1; j < IM.array_users.length; j++ ) 342 { 343 if( jid == IM.array_users[j].jid ){ 344 nickname = decodeURI(IM.array_users[j].VCARD_NICKNAME); 345 } 346 } 347 348 if ( window_message ) 349 { 350 window_message.innerHTML += '<strong>' + TimeStamp + nickname + '</strong> ' + IM.get_lang('speak') + ':<br/> ' + _this.emotions_icons(body_message) + '<br/><br/>'; 351 if ( windowItems[jid].state != WINDOW_STATE_REGULAR && windowItems[jid].state != WINDOW_STATE_MAXIMIZED ) 352 im_win.showWindowItem(jid); 353 } 354 else 355 { 356 im_win.open_chat(jid); 357 window_message = document.getElementById(jid + '_chatMessages'); 358 window_message.innerHTML += '<strong>' + TimeStamp + nickname + '</strong> ' + IM.get_lang('speak') + ':<br/> ' + _this.emotions_icons(body_message) + '<br/><br/>'; 359 } 360 } 361 362 window_message.scrollTop = window_message.scrollHeight; 363 im_win.newMessageNotification(); 364 } 365 } 366 cIM.cExecute("$this.Ujabber.getMessages", handler_message); 376 window_message.scrollTop = window_message.scrollHeight; 377 im_win.newMessageNotification(); 378 } 379 } 380 cIM.cExecute("$this.Ujabber.getMessages", handler_message); 381 } 367 382 } 368 383 -
trunk/phpgwapi/inc/class.auth_ldap.inc.php
r32 r44 151 151 152 152 $dn = $allValues[0]['dn']; 153 if (!@ldap_modify($ds, $dn, $entry)) 153 154 /* userPasswordRFC2617 Begin's*/ 155 $c = CreateObject('phpgwapi.config','expressoAdmin1_2'); 156 $c->read_repository(); 157 $current_config = $c->config_data; 158 if ($current_config['expressoAdmin_userPasswordRFC2617'] == 'true') 159 { 160 $realm = $current_config['expressoAdmin_realm_userPasswordRFC2617']; 161 $uid = $allValues[0]['uid'][0]; 162 $password = $new_passwd; 163 $passUserRFC2617 = $realm . ': ' . md5("$uid:$realm:$password"); 164 165 if ($allValues[0]['userpasswordrfc2617'][0] != '') 166 $entry['userPasswordRFC2617'] = $passUserRFC2617; 167 else 168 { 169 $ldap_add['userPasswordRFC2617'] = $passUserRFC2617; 170 if (!@ldap_mod_add($ds, $dn, $ldap_add)) 171 { 172 return false; 173 } 174 } 175 } 176 /* userPasswordRFC2617 End's*/ 177 178 if (!@ldap_modify($ds, $dn, $entry)) 154 179 { 155 180 return false; -
trunk/phpgwapi/inc/class.sector_search_ldap.inc.php
r35 r44 218 218 $select = ''; 219 219 $display = strtoupper($info[$i]['ou'][0]); 220 $options .= "<option value='$dn'$select>$display 220 $options .= "<option value='$dn'$select>$display</option>"; 221 221 } 222 222
Note: See TracChangeset
for help on using the changeset viewer.