Changeset 65
- Timestamp:
- 09/06/07 10:39:16 (17 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r63 r65 417 417 418 418 } 419 else if($file_type == "message/rfc822" ){419 else if($file_type == "message/rfc822" || $file_type == "text/rfc822-headers"){ 420 420 421 421 include_once("class.imap_attachment.inc.php"); … … 425 425 foreach($attachments ['attachment'] as $index => $attachment){ 426 426 if(strtolower($attachment['type']) == "delivery-status" || 427 strtolower($attachment['type']) == "rfc822" || 427 strtolower($attachment['type']) == "rfc822" || 428 strtolower($attachment['type']) == "rfc822-headers" || 428 429 strtolower($attachment['type']) == "plain" 429 430 ){ -
trunk/expressoMail1_2/index.php
r60 r65 4 4 'nonavbar' => False, 5 5 'currentapp' => 'expressoMail1_2', 6 'update_version' => '1.210 1',6 'update_version' => '1.2102', 7 7 'enable_nextmatchs_class' => True 8 8 ); … … 41 41 $template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 42 42 $template->set_var("txt_loading",lang("Loading")); 43 $template->set_var("txt_clear_trash",lang("message(s) were deleted fromtrash folder."));43 $template->set_var("txt_clear_trash",lang("message(s) deleted from your trash folder.")); 44 44 $template->set_var("upload_max_filesize",ini_get('upload_max_filesize')); 45 45 $template->set_var("msg_folder",$_GET['msgball']['folder']); -
trunk/expressoMail1_2/js/common_functions.js
r53 r65 26 26 var screenHeight = document.body.clientHeight ? document.body.clientHeight : document.body.offsetHeight; 27 27 var defaultHeight = screenHeight - offset; 28 for(var i = 1; BordersArray.length > 1 && i < BordersArray.length;i++) { 29 var div_scroll = Element("div_message_scroll_"+BordersArray[i].sequence); 30 if(div_scroll) 31 div_scroll.style.height = defaultHeight - 122; 32 var div = Element("content_id_"+BordersArray[i].sequence); 33 if(div) 34 div.style.height = defaultHeight - 73; 28 if(BordersArray) { 29 for(var i = 1; BordersArray.length > 1 && i < BordersArray.length;i++) { 30 var div_scroll = Element("div_message_scroll_"+BordersArray[i].sequence); 31 if(div_scroll) 32 div_scroll.style.height = defaultHeight - 122; 33 var div = Element("content_id_"+BordersArray[i].sequence); 34 if(div) 35 div.style.height = defaultHeight - 73; 36 } 35 37 } 36 38 Element('content_folders').style.height = defaultHeight - (is_ie ? 165 : 150); -
trunk/expressoMail1_2/js/draw_api.js
r63 r65 660 660 function draw_message(info_msg, ID){ 661 661 var content = document.getElementById('content_id_' + ID); 662 var defaultWidth = document.body. clientWidth - (is_ie ? 32 : 37);662 var defaultWidth = document.body.offsetWidth - 37; 663 663 664 664 var menuHidden = Element("folderscol").style.display == 'none' ? true : false; -
trunk/expressoMail1_2/js/main.js
r63 r65 504 504 else{ 505 505 if(data == 'false') 506 write_msg(get_lang('The size of this message exceeded the limit (%1B).',Element('upload_max_filesize').value));506 write_msg(get_lang('The size of this message has exceeded the limit (%1B).',Element('upload_max_filesize').value)); 507 507 else if(data == null) 508 508 write_msg(get_lang("your session could not be verified.")); -
trunk/expressoMail1_2/setup/setup.inc.php
r60 r65 12 12 $setup_info['expressoMail1_2']['name'] = 'expressoMail1_2'; 13 13 $setup_info['expressoMail1_2']['title'] = 'ExpressoMail 1.2'; 14 $setup_info['expressoMail1_2']['version'] = '1.210 1';14 $setup_info['expressoMail1_2']['version'] = '1.2102'; 15 15 $setup_info['expressoMail1_2']['app_order'] = 2; 16 16 // $setup_info['expressoMail1_2']['tables'][] = 'phpgw_expressoMail1_2'; -
trunk/expressoMail1_2/templates/default/index.tpl
r64 r65 30 30 <div align="center"> 31 31 <input type="text" id="em_message_search" size="18" maxlength="22"/> 32 <a onMouseOut="window.status='';return true;" title="Abrir janela de Pesquisa..." onMouseOver="window.status='Abrir janela de Pesquisa...';return true;" href="javascript:void(0);" onClick="javascript:search_emails(Element('em_message_search').value)">32 <a class='' onMouseOut="window.status='';return true;" title="Abrir janela de Pesquisa..." onMouseOver="window.status='Abrir janela de Pesquisa...';return true;" href="javascript:void(0);" onClick="javascript:search_emails(Element('em_message_search').value)"> 33 33 <img valign="center" align="center" src="templates/default/images/search.gif"> 34 34 </a> 35 <a onMouseOut="window.status='';return true;" title="Pesquisar usuário..." onMouseOver="window.status='Pesquisar usuário...';return true;" href="javascript:void(0);" onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')">36 <img valign="center" align="center" src="templates/default/images/users. png">35 <a class='' onMouseOut="window.status='';return true;" title="Pesquisar usuário..." onMouseOver="window.status='Pesquisar usuário...';return true;" href="javascript:void(0);" onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')"> 36 <img valign="center" align="center" src="templates/default/images/users.jpg"> 37 37 </a> 38 38 </div> -
trunk/instant_messenger/js/im_functions.js
r64 r65 55 55 _this.vcards = true; 56 56 } 57 } 58 catch(e) 59 { 60 //alert("listen\n\n" + e + "\n\n" + e.description) 61 } 57 }catch(e){} 58 62 59 _this._listen = true; 63 60 setTimeout('IM.listen()', 3000); … … 131 128 this.atalho(); 132 129 } 133 } 134 catch (e) 135 { 136 //alert('getContacts()' + e); 137 } 130 }catch(e){} 138 131 139 132 }; … … 256 249 } 257 250 _this.Contacts_Offline(); 258 } 259 catch(e) 260 { 261 } 251 }catch(e){} 262 252 }; 263 253 … … 320 310 nickname = func.trim(nickname); 321 311 } 312 else 313 var nickname = from; 322 314 323 315 var win = document.getElementById(from + '_chatMessages'); … … 335 327 336 328 var label = document.createElement('strong'); 337 if(nickname) 338 label.appendChild(document.createTextNode(nickname)); 339 else 340 label.appendChild(document.createTextNode(from)); 329 label.appendChild(document.createTextNode(nickname)); 330 341 331 win.appendChild(label); 342 332 win.appendChild(document.createElement('br')); 343 win.innerHTML += XMLTools.transform(el, xsl);344 win.innerHTML = this.emotions_icons(win.innerHTML);333 var msg = XMLTools.transform(el, xsl); 334 win.innerHTML += this.emotions_icons(msg); 345 335 win.appendChild(document.createElement('br')); 346 336 win.appendChild(document.createElement('br')); … … 359 349 } 360 350 } 361 } 362 catch (e) 363 { 364 //alert(e.description) 365 } 351 }catch(e){} 366 352 } 367 353 … … 372 358 var envio = name_document.contentWindow.document.getElementsByTagName('body').item(0); 373 359 374 envio.innerHTML = func.trim(envio.innerHTML.replace(/^( |<br>| )*|( |<br>| )*$/g, '')); 360 var imgs = envio.getElementsByTagName('img'); 361 var cod; 362 var emotion_regexp; 363 364 for ( i = imgs.length - 1; i > -1; i--) 365 { 366 if ( (cod = imgs[i].getAttribute('emotion')) ) 367 { 368 emotion_regexp = new RegExp('<img[^>]*?emotion="' + cod_emotions[cod][1] + '"[^>]*?>', "i"); 369 envio.innerHTML = envio.innerHTML.replace(emotion_regexp, cod); 370 } 371 else 372 imgs[i].parentNode.removeChild(imgs[i]); 373 } 374 375 envio.innerHTML = func.trim(envio.innerHTML.replace(/ | +/g, ' ')); 376 envio.innerHTML = func.trim(envio.innerHTML.replace(/<br>/g, '<br/>')); 377 envio.innerHTML = func.trim(envio.innerHTML); 375 378 376 379 if ( envio.innerHTML != "" ) … … 398 401 399 402 message_element.innerHTML += '<strong>' + nickname + ' '; 400 message_element.innerHTML += ' ' + _this.get_lang('speak') + ':</strong><br />';401 message_element.innerHTML += message_text + '<br/>';403 message_element.innerHTML += ' ' + _this.get_lang('speak') + ':</strong><br />'; 404 message_element.innerHTML += this.emotions_icons(message_text) + '<br />'; 402 405 message_element.scrollTop = message_element.scrollHeight; 403 406 … … 480 483 { 481 484 im_win.windowMaximizeRestore('contacts_im'); 482 //this.load_im();483 485 } 484 486 }; … … 490 492 IM.prototype.emotions_icons = function(pEmotion) 491 493 { 492 for ( i = 1; i < cod_emotions.length; i++ ) 494 var emotion_regexp; 495 for ( i in cod_emotions ) 493 496 { 494 var image = eval('smile_' + i + '.src.substr(smile_' + i + '.src.indexOf(im_path))') 495 pEmotion = pEmotion.replace(cod_emotions[i], '<img emotion="' + pEmotion + '" src="' + image + '">'); 497 try 498 { 499 emotion_regexp = new RegExp(cod_emotions[i][1], 'gi'); 500 if ( emotion_regexp.test(pEmotion) ) 501 { 502 var image = eval('smile_' + cod_emotions[i][0] + '.src.substr(smile_' +cod_emotions[i][0] + '.src.indexOf(im_path))'); 503 emotion_regexp = new RegExp(cod_emotions[i][1], 'gi'); 504 pEmotion = pEmotion.replace(emotion_regexp, '<img emotion="' + i + '" src="' + image + '">'); 505 } 506 } 507 catch(e) 508 { 509 //alert(e.description) 510 } 496 511 } 497 498 512 return pEmotion; 499 513 } … … 574 588 575 589 }catch(e){} 576 577 578 590 }; 579 591 … … 607 619 if ( func.byId(pJid).firstChild.src != img_unavailable.src ) 608 620 this.open_chat(pJid); 609 } 610 catch(e) 611 { 612 //alert("action_button\n\n" + e) 613 } 621 }catch(e){} 614 622 }; 615 623 … … 683 691 Child[i].firstChild.insertBefore(img, Child[i].firstChild.firstChild); 684 692 } 685 }catch 693 }catch(e){} 686 694 } 687 695 … … 803 811 this.ImgStatus(pStatus); 804 812 pStatus = 'show=' + pStatus; 805 } 806 catch(e){} 807 } 813 }catch(e){} 814 } 808 815 } 809 816 XMLTools.request('$this.Ujabber.setPresence', 'POST', handler, pStatus); -
trunk/instant_messenger/js/im_var_globals.js
r64 r65 67 67 var im_busy = false; 68 68 69 var cod_emotions = new Array(); 70 cod_emotions[1] = /\:\)/gi; 71 cod_emotions[2] = /\:d/gi; 72 cod_emotions[3] = /\;\)/gi; 73 cod_emotions[4] = /\:o/gi; 74 cod_emotions[5] = /\:p/gi; 75 cod_emotions[6] = /\(h\)/gi; 76 cod_emotions[7] = /\:\@/gi; 77 cod_emotions[8] = /\:\$/gi; 78 cod_emotions[9] = /\:s/gi; 79 cod_emotions[10] = /\:\(/gi; 80 cod_emotions[11] = /\:\'\(/gi; 81 cod_emotions[12] = /\:\|/gi; 69 var cod_emotions = { 70 ":)" : [1,"\\\:\\\)"], 71 ":d" : [2,"\\\:d"], 72 ";)" : [3,"\\\;\\\)"], 73 ":o" : [4,"\\\:o"], 74 ":p" : [5,"\\\:p"], 75 "(h)" : [6,"\\\(h\\\)"], 76 ":@" : [7,"\\\:\\\@"], 77 ":$" : [8,"\\\:\\\$"], 78 ":s" : [9,"\\\:s"], 79 ":(" : [10,"\\\:\\\("], 80 ":'(" : [11,"\\\:\\\'\\\("], 81 ":|" : [12,"\\\:\\\|"] 82 };
Note: See TracChangeset
for help on using the changeset viewer.