Changeset 336
- Timestamp:
- 06/25/08 14:13:18 (16 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r334 r336 62 62 'mainscreen_showmail' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['mainscreen_showmail'] : "0", 63 63 'signature' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['signature'], 64 'use_signature' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] ,64 'use_signature' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_signature'] : "0", 65 65 'hide_folders' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['hide_folders'] : "0", 66 66 'save_in_folder' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] : "-1", -
trunk/expressoMail1_2/js/main.js
r325 r336 20 20 cExecute ("$this.imap_functions.automatic_trash_cleanness&before_date="+preferences.delete_trash_messages_after_n_days+"&cyrus_delimiter="+cyrus_delimiter, handler_automatic_trash_cleanness); 21 21 22 if(preferences.outoffice )22 if(preferences.outoffice == "1") 23 23 write_msg(get_lang("Attention, you are in out of office mode."), true); 24 24 ConstructMenuTools(); … … 512 512 body.contentWindow.document.open(); 513 513 // Insert the signature automaticaly at message body if use_signature preference is set 514 if (preferences.use_signature ){514 if (preferences.use_signature == "1"){ 515 515 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>"); 516 516 } … … 541 541 body.contentWindow.document.open(); 542 542 // Insert the signature automaticaly at message body if use_signature preference is set 543 if (preferences.use_signature ) {543 if (preferences.use_signature == "1") { 544 544 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>" + block_quoted_body + "</body></html>"); 545 545 } … … 586 586 body.contentWindow.document.open(); 587 587 // Insert the signature automaticaly at message body if use_signature preference is set 588 if (preferences.use_signature ) {588 if (preferences.use_signature == "1") { 589 589 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>"); 590 590 } … … 631 631 body.contentWindow.document.open(); 632 632 // Insert the signature automaticaly at message body if use_signature preference is set 633 if (preferences.use_signature ) {633 if (preferences.use_signature == "1") { 634 634 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>" + block_quoted_body + "</body></html>"); 635 635 } … … 679 679 body.contentWindow.document.open(); 680 680 // Insert the signature automaticaly at message body if use_signature preference is set 681 if (preferences.use_signature ) {681 if (preferences.use_signature == "1") { 682 682 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>" + make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc) + "</body></html>"); 683 683 } … … 712 712 body.contentWindow.document.open(); 713 713 // Insert the signature automaticaly at message body if use_signature preference is set 714 if (preferences.use_signature ) {714 if (preferences.use_signature == "1") { 715 715 body.contentWindow.document.write("<html><body bgcolor='#FFFFFF'>" + "<br>" + preferences.signature.replace(/\n/g, "<br>") + "</body></html>"); 716 716 }
Note: See TracChangeset
for help on using the changeset viewer.