Changeset 2115 in subversion
- Timestamp:
- Dec 4, 2008 5:21:34 AM (4 years ago)
- Location:
- trunk/roundcubemail
- Files:
-
- 43 edited
-
CHANGELOG (modified) (1 diff)
-
config/main.inc.php.dist (modified) (1 diff)
-
installer/rcube_install.php (modified) (1 diff)
-
program/localization/ar_SA/labels.inc (modified) (1 diff)
-
program/localization/az_AZ/labels.inc (modified) (1 diff)
-
program/localization/bg_BG/labels.inc (modified) (1 diff)
-
program/localization/ca_ES/labels.inc (modified) (1 diff)
-
program/localization/cs_CZ/labels.inc (modified) (1 diff)
-
program/localization/cy_GB/labels.inc (modified) (1 diff)
-
program/localization/da_DK/labels.inc (modified) (1 diff)
-
program/localization/de_CH/labels.inc (modified) (1 diff)
-
program/localization/de_DE/labels.inc (modified) (1 diff)
-
program/localization/en_GB/labels.inc (modified) (1 diff)
-
program/localization/en_US/labels.inc (modified) (2 diffs)
-
program/localization/eo/labels.inc (modified) (1 diff)
-
program/localization/es_ES/labels.inc (modified) (1 diff)
-
program/localization/et_EE/labels.inc (modified) (1 diff)
-
program/localization/eu_ES/labels.inc (modified) (1 diff)
-
program/localization/fa/labels.inc (modified) (1 diff)
-
program/localization/fi_FI/labels.inc (modified) (1 diff)
-
program/localization/fr_FR/labels.inc (modified) (1 diff)
-
program/localization/gl_ES/labels.inc (modified) (1 diff)
-
program/localization/he_IL/labels.inc (modified) (1 diff)
-
program/localization/hr_HR/labels.inc (modified) (1 diff)
-
program/localization/hu_HU/labels.inc (modified) (1 diff)
-
program/localization/id_ID/labels.inc (modified) (1 diff)
-
program/localization/it_IT/labels.inc (modified) (1 diff)
-
program/localization/ja_JP/labels.inc (modified) (1 diff)
-
program/localization/lt_LT/labels.inc (modified) (1 diff)
-
program/localization/mk_MK/labels.inc (modified) (1 diff)
-
program/localization/nl_NL/labels.inc (modified) (1 diff)
-
program/localization/nn_NO/labels.inc (modified) (1 diff)
-
program/localization/pl_PL/labels.inc (modified) (1 diff)
-
program/localization/pt_BR/labels.inc (modified) (1 diff)
-
program/localization/pt_PT/labels.inc (modified) (1 diff)
-
program/localization/ru_RU/labels.inc (modified) (1 diff)
-
program/localization/sk_SK/labels.inc (modified) (1 diff)
-
program/localization/tr_TR/labels.inc (modified) (1 diff)
-
program/localization/zh_CN/labels.inc (modified) (1 diff)
-
program/localization/zh_TW/labels.inc (modified) (1 diff)
-
program/steps/mail/show.inc (modified) (2 diffs)
-
program/steps/settings/func.inc (modified) (1 diff)
-
program/steps/settings/save_prefs.inc (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/roundcubemail/CHANGELOG
r2099 r2115 1 1 CHANGELOG RoundCube Webmail 2 2 --------------------------- 3 4 2008/12/04 (alec) 5 ---------- 6 - Added 'show_images' option, removed 'addrbook_show_images' (#1485597) 3 7 4 8 2008/11/28 (thomasb) -
trunk/roundcubemail/config/main.inc.php.dist
r2099 r2115 353 353 $rcmail_config['prefer_html'] = TRUE; 354 354 355 // display images in mail from known senders 356 $rcmail_config['addrbook_show_images'] = FALSE; 355 // display remote inline images 356 // 0 - Never, always ask 357 // 1 - Ask if sender is not in address book 358 // 2 - Always show inline images 359 $rcmail_config['show_images'] = 0; 357 360 358 361 // compose html formatted messages by default -
trunk/roundcubemail/installer/rcube_install.php
r2103 r2115 38 38 'locale_string' => 'language', 39 39 'multiple_identities' => 'identities_level', 40 'addrbook_show_images' => 'show_images', 40 41 ); 41 42 -
trunk/roundcubemail/program/localization/ar_SA/labels.inc
r2102 r2115 80 80 $labels['preferhtml'] = 'ØªÙØ¶ÙÙ ØµÙØºØ© HTML'; 81 81 $labels['htmlmessage'] = 'Ø±Ø³Ø§ÙØ© ØšÙØ³Ù HTML'; 82 $labels['showknownimages'] = 'Ø£ØžÙØ± Ø§ÙØµÙÙØ± Ù83 ٠اÙÙ84 رسÙÙ٠اÙÙ85 عرÙÙÙÙ';86 82 $labels['prettydate'] = 'ØªÙØ§Ø±ÙØ® Ù 87 83 ÙÙ -
trunk/roundcubemail/program/localization/az_AZ/labels.inc
r2102 r2115 51 51 $labels['preferhtml'] = 'HTML göstÉrmÉyi dÉstÉklÉ'; 52 52 $labels['htmlmessage'] = 'HTML Mesaj'; 53 $labels['showknownimages'] = 'TanınmıŠqrafiklÉri göstÉr';54 53 $labels['prettydate'] = 'Tarixi qısaltaraq göstÉr'; 55 54 $labels['addtoaddressbook'] = 'Ãnvan Kitabçasına ÆlavÉ Et'; -
trunk/roundcubemail/program/localization/bg_BG/labels.inc
r2045 r2115 57 57 $labels['preferhtml'] = 'ÐПказвай пÑÑвП HTML веÑÑОÑ'; 58 58 $labels['htmlmessage'] = 'HTML ÑÑПбÑеМОе'; 59 $labels['showknownimages'] = 'ÐПказвай ОзПбÑÐ°Ð¶ÐµÐœÐžÑ ÐŸÑ ÐžÐ·Ð²ÐµÑÑМО пПЎаÑелО';60 59 $labels['prettydate'] = 'ÐÑаÑкО ЎаÑО'; 61 60 $labels['addtoaddressbook'] = 'ÐПбавО в аЎÑеÑМаÑа кМОга'; -
trunk/roundcubemail/program/localization/ca_ES/labels.inc
r1600 r2115 54 54 $labels['preferhtml'] = 'Preferisc HTML'; 55 55 $labels['htmlmessage'] = 'Missatge HTML'; 56 $labels['showknownimages'] = 'Mostrar imatges dels remitents coneguts';57 56 $labels['prettydate'] = 'Dates curtes'; 58 57 $labels['addtoaddressbook'] = 'Afegir a contactes'; -
trunk/roundcubemail/program/localization/cs_CZ/labels.inc
r1889 r2115 55 55 $labels['preferhtml'] = 'UpÅednostÅovat HTML zobrazenÃ'; 56 56 $labels['htmlmessage'] = 'HTML zpráva'; 57 $labels['showknownimages'] = 'Ukazovat obrázky v mailech od neznámÜch odesilatelů';58 57 $labels['prettydate'] = 'HezÄà datum'; 59 58 $labels['addtoaddressbook'] = 'PÅidat do adresáÅe'; -
trunk/roundcubemail/program/localization/cy_GB/labels.inc
r1989 r2115 50 50 $labels['preferhtml'] = 'Dangos HTML'; 51 51 $labels['htmlmessage'] = 'Neges HTML'; 52 $labels['showknownimages'] = 'Dangos lluniau gan anfonwyr cyfarwydd';53 52 $labels['prettydate'] = 'Dyddiadau pert'; 54 53 $labels['addtoaddressbook'] = 'Ychwanegu i\'r llyfr cyfeiriadau'; -
trunk/roundcubemail/program/localization/da_DK/labels.inc
r1989 r2115 55 55 $labels['preferhtml'] = 'ForetrÊk HTML'; 56 56 $labels['htmlmessage'] = 'HTML-besked'; 57 $labels['showknownimages'] = 'Vis billeder fra kendte afsendere';58 57 $labels['prettydate'] = 'PÊn datovisning'; 59 58 $labels['addtoaddressbook'] = 'TilfÞj til adressebogen'; -
trunk/roundcubemail/program/localization/de_CH/labels.inc
r2099 r2115 54 54 $labels['preferhtml'] = 'HTML bevorzugen'; 55 55 $labels['htmlmessage'] = 'HTML Nachricht'; 56 $labels['showknownimages'] = 'Zeige Bilder von bekannten Absendern an';57 56 $labels['prettydate'] = 'Kurze Datumsanzeige'; 58 57 $labels['addtoaddressbook'] = 'Ins Adressbuch ÃŒbernehmen'; -
trunk/roundcubemail/program/localization/de_DE/labels.inc
r2099 r2115 53 53 $labels['preferhtml'] = 'HTML anzeigen'; 54 54 $labels['htmlmessage'] = 'HTML-Nachricht'; 55 $labels['showknownimages'] = 'Zeige Bilder von bekannten Absendern an';56 55 $labels['prettydate'] = 'Kurze Datumsanzeige'; 57 56 $labels['addtoaddressbook'] = 'Ins Adressbuch ÃŒbernehmen'; -
trunk/roundcubemail/program/localization/en_GB/labels.inc
r2099 r2115 53 53 $labels['preferhtml'] = 'Display HTML'; 54 54 $labels['htmlmessage'] = 'HTML Message'; 55 $labels['showknownimages'] = 'Show images from known senders';56 55 $labels['prettydate'] = 'Pretty dates'; 57 56 $labels['addtoaddressbook'] = 'Add to address book'; -
trunk/roundcubemail/program/localization/en_US/labels.inc
r2099 r2115 67 67 $labels['preferhtml'] = 'Display HTML'; 68 68 $labels['htmlmessage'] = 'HTML Message'; 69 $labels['showknownimages'] = 'Show images from known senders';70 69 $labels['prettydate'] = 'Pretty dates'; 71 70 … … 282 281 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete'; 283 282 $labels['skipdeleted'] = 'Do not show deleted messages'; 283 $labels['showremoteimages'] = 'Display remote inline images'; 284 $labels['fromknownsenders'] = 'from known senders'; 285 $labels['always'] = 'always'; 284 286 $labels['showinlineimages'] = 'Display attached images below the message'; 285 287 $labels['autosavedraft'] = 'Automatically save draft'; -
trunk/roundcubemail/program/localization/eo/labels.inc
r1588 r2115 51 51 $labels['preferhtml'] = 'Montru HTML'; 52 52 $labels['htmlmessage'] = 'HTML MesaÄo'; 53 $labels['showknownimages'] = 'Montru bildojn de konataj sendantoj';54 53 $labels['prettydate'] = 'Agrablaj Datoj'; 55 54 $labels['addtoaddressbook'] = 'Aldonu al adresaro'; -
trunk/roundcubemail/program/localization/es_ES/labels.inc
r1600 r2115 56 56 $labels['preferhtml'] = 'Prefiero HTML'; 57 57 $labels['htmlmessage'] = 'Mensaje HTML'; 58 $labels['showknownimages'] = 'Muestra imágenes de remitentes conocidos';59 58 $labels['prettydate'] = 'Fecha detallada'; 60 59 $labels['addtoaddressbook'] = 'Añadir a contactos'; -
trunk/roundcubemail/program/localization/et_EE/labels.inc
r2102 r2115 53 53 $labels['preferhtml'] = 'Eelista HTMLi'; 54 54 $labels['htmlmessage'] = 'HTML kirjad'; 55 $labels['showknownimages'] = 'NÀita tuntud saatjate kirjades pilte';56 55 $labels['prettydate'] = 'Kenad kuupÀevad'; 57 56 $labels['addtoaddressbook'] = 'Lisa aadressiraamatusse'; -
trunk/roundcubemail/program/localization/eu_ES/labels.inc
r1663 r2115 53 53 $labels['preferhtml'] = 'HTML nahiago'; 54 54 $labels['htmlmessage'] = 'HTML Mezua'; 55 $labels['showknownimages'] = 'Bidaltzaile ezagunen imajinak ikusi';56 55 $labels['prettydate'] = 'Data politak'; 57 56 $labels['addtoaddressbook'] = 'Helbide liburura gehitu'; -
trunk/roundcubemail/program/localization/fa/labels.inc
r1575 r2115 66 66 $labels['htmlmessage'] = 'HTML ÙŸÛØºØ§Ù 67 67 '; 68 $labels['showknownimages'] = 'ÙÙ69 Ø§ÛØŽ Ø¹Ú©Ø³ÙØ§ از ÙØ±Ø³ØªÙØ¯Ú¯Ø§Ù ØŽÙØ§Ø®ØªÙ ؎دÙ';70 68 $labels['prettydate'] = 'ØªØ§Ø±ÛØ®âÙØ§Û Ø²ÛØšØ§'; 71 69 $labels['addtoaddressbook'] = 'Ø§ÙØ²ÙØ¯Ù ØšÙ Ø¯ÙØªØ± ÙØŽØ§ÙÛâÙØ§'; -
trunk/roundcubemail/program/localization/fi_FI/labels.inc
r1990 r2115 54 54 $labels['preferhtml'] = 'KÀytÀ HTML:aa'; 55 55 $labels['htmlmessage'] = 'HTML-viesti'; 56 $labels['showknownimages'] = 'NÀytÀ tunnetuilta lÀhettÀjiltÀ saapuneet kuvat';57 56 $labels['prettydate'] = 'NÀtit pÀivÀykset'; 58 57 $labels['addtoaddressbook'] = 'LisÀÀ osoitekirjaan'; -
trunk/roundcubemail/program/localization/fr_FR/labels.inc
r2102 r2115 55 55 $labels['preferhtml'] = 'Afficher en HTML'; 56 56 $labels['htmlmessage'] = 'Message en HTML'; 57 $labels['showknownimages'] = 'Afficher les images des expéditeurs connus';58 57 $labels['prettydate'] = 'Affichage court des dates'; 59 58 $labels['addtoaddressbook'] = 'Ajouter au carnet d\'adresses'; -
trunk/roundcubemail/program/localization/gl_ES/labels.inc
r1989 r2115 50 50 $labels['preferhtml'] = 'Prefiro HTML'; 51 51 $labels['htmlmessage'] = 'Mensaxe HTML'; 52 $labels['showknownimages'] = 'Mostrar as imaxes nos correos de remitentes coñecidos.';53 52 $labels['prettydate'] = 'Data decorada'; 54 53 $labels['addtoaddressbook'] = 'Engadir ao caderno de enderezos'; -
trunk/roundcubemail/program/localization/he_IL/labels.inc
r2102 r2115 51 51 $labels['preferhtml'] = '×׊×ת HTML'; 52 52 $labels['htmlmessage'] = 'ת××× HTML'; 53 $labels['showknownimages'] = '×׊×ת ת××× ×ת ×××§×ך ××××¢';54 53 $labels['prettydate'] = 'ת×ך×××× ××¢×׊×××'; 55 54 $labels['addtoaddressbook'] = '×××¡×€× ××€× ×§×¡ ×ת×××ת'; -
trunk/roundcubemail/program/localization/hr_HR/labels.inc
r2102 r2115 53 53 $labels['preferhtml'] = 'HTML format u prednosti'; 54 54 $labels['htmlmessage'] = 'HTML format poruke'; 55 $labels['showknownimages'] = 'Prikaşi poruke od poznatih pošiljatelja';56 55 $labels['prettydate'] = 'Formatiran datum'; 57 56 $labels['addtoaddressbook'] = 'Dodaj u imenik'; -
trunk/roundcubemail/program/localization/hu_HU/labels.inc
r1600 r2115 54 54 $labels['preferhtml'] = 'HTML megjelenÃtés'; 55 55 $labels['htmlmessage'] = 'HTML ÃŒzenet'; 56 $labels['showknownimages'] = 'Képek megjelenÃtése ismert Feladó esetén';57 56 $labels['prettydate'] = 'Rövid dátumok'; 58 57 $labels['addtoaddressbook'] = 'Hozzáadás a cÃmjegyzékhez'; -
trunk/roundcubemail/program/localization/id_ID/labels.inc
r1770 r2115 53 53 $labels['preferhtml'] = 'Lebih suka HTML'; 54 54 $labels['htmlmessage'] = 'Pesan HTML'; 55 $labels['showknownimages'] = 'Tampilakn gambar dari pengirim yang dikenal';56 55 $labels['prettydate'] = 'Tanggal cantik'; 57 56 $labels['addtoaddressbook'] = 'Tambahkan ke buku tamu'; -
trunk/roundcubemail/program/localization/it_IT/labels.inc
r2045 r2115 54 54 $labels['preferhtml'] = 'Mostra HTML'; 55 55 $labels['htmlmessage'] = 'Messaggio HTML'; 56 $labels['showknownimages'] = 'Mostra immagini da mittenti conosciuti';57 56 $labels['prettydate'] = 'Date più leggibili'; 58 57 $labels['addtoaddressbook'] = 'Aggiungi alla rubrica'; -
trunk/roundcubemail/program/localization/ja_JP/labels.inc
r2093 r2115 61 61 $labels['preferhtml'] = 'HTMLã衚瀺'; 62 62 $labels['htmlmessage'] = 'HTMLã¡ãŒã«'; 63 $labels['showknownimages'] = 'ãç»é²æžã¿éä¿¡è64 ã®ç»åã衚瀺';65 63 $labels['prettydate'] = 'ç°¡æãªæ¥ä»è¡šç€º'; 66 64 $labels['addtoaddressbook'] = 'ã¢ãã¬ã¹åž³ã«è¿œå '; -
trunk/roundcubemail/program/localization/lt_LT/labels.inc
r1828 r2115 53 53 $labels['preferhtml'] = 'Rodyti HTML'; 54 54 $labels['htmlmessage'] = 'HTML LaiÅ¡kas'; 55 $labels['showknownimages'] = 'Rodyti ÅŸinomų siuntÄjų paveikslÄlius';56 55 $labels['prettydate'] = 'GraÅŸios datos'; 57 56 $labels['addtoaddressbook'] = 'Ä®traukti į adresų knygÄ -
trunk/roundcubemail/program/localization/mk_MK/labels.inc
r1593 r2115 52 52 $labels['preferhtml'] = 'ÐÑОкажО вП HTML'; 53 53 $labels['htmlmessage'] = 'HTML ÐПÑака'; 54 $labels['showknownimages'] = 'ÐÑОкажО гО ÑлОкОÑе ПЎ ÐœÐµÐ¿ÐŸÐ·ÐœÐ°Ñ Ð¿ÑаÑаÑ';55 54 $labels['prettydate'] = 'УбавО ЎаÑО'; 56 55 $labels['addtoaddressbook'] = 'ÐПЎаЎО вП ОЌеМОк'; -
trunk/roundcubemail/program/localization/nl_NL/labels.inc
r2062 r2115 54 54 $labels['preferhtml'] = 'Toon HTML'; 55 55 $labels['htmlmessage'] = 'HTML-Bericht'; 56 $labels['showknownimages'] = 'Toon afbeeldingen van bekende afzenders';57 56 $labels['prettydate'] = 'Gebruiksvriendelijke data'; 58 57 $labels['addtoaddressbook'] = 'Toevoegen aan adresboek'; -
trunk/roundcubemail/program/localization/nn_NO/labels.inc
r1816 r2115 54 54 $labels['preferhtml'] = 'FÞretrekk HTML'; 55 55 $labels['htmlmessage'] = 'HTML-melding'; 56 $labels['showknownimages'] = 'Vis bilete frå kjende sendarar';57 56 $labels['prettydate'] = 'Pene datoar'; 58 57 $labels['addtoaddressbook'] = 'Legg til i adressebok'; -
trunk/roundcubemail/program/localization/pl_PL/labels.inc
r2104 r2115 59 59 $labels['preferhtml'] = 'DomyÅlny HTML'; 60 60 $labels['htmlmessage'] = 'WiadomoÅÄ HTML'; 61 $labels['showknownimages'] = 'WyÅwietlaj obrazki od znanych nadawców'; 61 $labels['showremoteimages'] = 'WyÅwietlaj obrazki w wiadomoÅciach'; 62 $labels['fromknownsenders'] = 'od znanych nadawców'; 63 $labels['always'] = 'zawsze'; 62 64 $labels['prettydate'] = 'Åadne daty'; 63 65 $labels['showinlineimages'] = 'WyÅwietlaj zaÅÄ -
trunk/roundcubemail/program/localization/pt_BR/labels.inc
r1843 r2115 71 71 $labels['preferhtml'] = 'Exibir mensagens em HTML'; 72 72 $labels['htmlmessage'] = 'Mensagem HTML'; 73 $labels['showknownimages'] = 'Exibir imagens de remetentes conhecidos';74 73 $labels['prettydate'] = 'Exibir datas amigáveis'; 75 74 -
trunk/roundcubemail/program/localization/pt_PT/labels.inc
r2045 r2115 56 56 $labels['preferhtml'] = 'Prefere HTML'; 57 57 $labels['htmlmessage'] = 'Mensagem HTML'; 58 $labels['showknownimages'] = 'Mostrar imagens de remetentes conhecidos';59 58 $labels['prettydate'] = 'Formatar datas'; 60 59 $labels['addtoaddressbook'] = 'Adicionar à lista de contactos'; -
trunk/roundcubemail/program/localization/ru_RU/labels.inc
r2105 r2115 57 57 $labels['preferhtml'] = 'ÐÑеЎпПÑОÑаÑÑ HTML'; 58 58 $labels['htmlmessage'] = 'СППбÑеМОе HTML'; 59 $labels['showknownimages'] = 'ÐПказÑваÑÑ ÐžÐ·ÐŸÐ±ÑÐ°Ð¶ÐµÐœÐžÑ ÐŸÑ ÐžÐ·Ð²ÐµÑÑМÑÑ60 ПÑпÑавОÑелей';61 59 $labels['prettydate'] = 'ÐÑаÑОвÑе ЎаÑÑ'; 62 60 $labels['addtoaddressbook'] = 'ÐПбавОÑÑ Ð² кПМÑакÑÑ'; -
trunk/roundcubemail/program/localization/sk_SK/labels.inc
r2045 r2115 55 55 $labels['preferhtml'] = 'Uprednostniť HTML zobrazenie'; 56 56 $labels['htmlmessage'] = 'HTML správa'; 57 $labels['showknownimages'] = 'Zobraziť obrázky v správach od známych odosielateğov';58 57 $labels['prettydate'] = 'Krajšà dátum'; 59 58 $labels['addtoaddressbook'] = 'Pridať do adresára'; -
trunk/roundcubemail/program/localization/tr_TR/labels.inc
r2039 r2115 54 54 $labels['preferhtml'] = 'HTML görÌntÌle'; 55 55 $labels['htmlmessage'] = 'HTML Posta'; 56 $labels['showknownimages'] = 'Bilinen göndericilerden gelen resimleri göster';57 56 $labels['prettydate'] = 'Tarihi kısaltarak göster'; 58 57 $labels['addtoaddressbook'] = 'Adres Defterine Ekle'; -
trunk/roundcubemail/program/localization/zh_CN/labels.inc
r1988 r2115 57 57 $labels['preferhtml'] = '以 HTML æ ŒåŒæŸç€º'; 58 58 $labels['htmlmessage'] = 'HTML é®ä»¶'; 59 $labels['showknownimages'] = 'æŸç€ºå·²ç¥çå件人çé®ä»¶äžçåŸç';60 59 $labels['prettydate'] = 'çæ¥ææ ŒåŒ'; 61 60 $labels['addtoaddressbook'] = 'æ·»å å°é讯åœ'; -
trunk/roundcubemail/program/localization/zh_TW/labels.inc
r1886 r2115 77 77 $labels['preferhtml'] = 'äœ¿çš HTML 顯瀺'; 78 78 $labels['htmlmessage'] = 'HTML éµä»¶'; 79 $labels['showknownimages'] = 'å·²ç¥çå¯ä»¶è80 顯瀺åç';81 79 $labels['prettydate'] = 'ç°¡çæ¥æé¡¯ç€º'; 82 80 -
trunk/roundcubemail/program/steps/mail/show.inc
r2061 r2115 43 43 $mbox_name = $IMAP->get_mailbox_name(); 44 44 45 // check known senders to display images 46 if (!$MESSAGE->is_safe 47 && !empty($MESSAGE->sender['mailto']) 48 && $RCMAIL->config->get('addrbook_show_images') 49 && $MESSAGE->has_html_part()) { 50 $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']); 51 52 if ($CONTACTS->search('email', $MESSAGE->sender['mailto'], true, false)->count) { 53 $MESSAGE->set_safe(true); 45 // show images? 46 $show_images = $RCMAIL->config->get('show_images'); 47 if(!$MESSAGE->is_safe 48 && !empty($show_images) 49 && $MESSAGE->has_html_part()) 50 { 51 switch($show_images) { 52 case '1': // known senders only 53 $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']); 54 if ($CONTACTS->search('email', $MESSAGE->sender['mailto'], true, false)->count) { 55 $MESSAGE->set_safe(true); 56 } 57 break; 58 case '2': // always 59 $MESSAGE->set_safe(true); 60 break; 54 61 } 55 62 } … … 205 212 206 213 // add link to save sender in addressbook and reload message 207 if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get(' addrbook_show_images')) {214 if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) { 208 215 $msg .= ' ' . html::a(array('href' => "#alwaysload", 'onclick' => JS_OBJECT_NAME.".command('always-load')", 'style' => "white-space:nowrap"), 209 216 Q(rcube_label(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto']))))); -
trunk/roundcubemail/program/steps/settings/func.inc
r2099 r2115 211 211 } 212 212 213 // show checkbox for displaying images from people in the addressbook 214 if (!isset($no_override['addrbook_show_images'])) { 215 $field_id = 'rcmfd_addrbook_show_images'; 216 $input_addrbook_show_images = new html_checkbox(array('name' => '_addrbook_show_images', 'id' => $field_id, 217 'value' => 1, 'disabled' => $config['prefer_html']?0:1)); 218 219 $table->add('title', html::label($field_id, Q(rcube_label('showknownimages')))); 220 $table->add(null, $input_addrbook_show_images->show($config['addrbook_show_images']?1:0)); 213 if (!isset($no_override['show_images'])) { 214 $field_id = 'rcmfd_show_images'; 215 $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id)); 216 $input_show_images->add(rcube_label('never'), 0); 217 $input_show_images->add(rcube_label('fromknownsenders'), 1); 218 $input_show_images->add(rcube_label('always'), 2); 219 220 $table->add('title', html::label($field_id, Q(rcube_label('showremoteimages')))); 221 $table->add(null, $input_show_images->show($config['show_images'])); 221 222 } 222 223 -
trunk/roundcubemail/program/steps/settings/save_prefs.inc
r2099 r2115 27 27 'prettydate' => isset($_POST['_pretty_date']) ? TRUE : FALSE, 28 28 'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE, 29 'addrbook_show_images' => isset($_POST['_addrbook_show_images']) ? TRUE : FALSE,30 29 'htmleditor' => isset($_POST['_htmleditor']) ? TRUE : FALSE, 31 30 'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE, … … 38 37 'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE, 39 38 'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0, 39 'show_images' => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0, 40 40 'keep_alive' => isset($_POST['_keep_alive']) ? intval($_POST['_keep_alive'])*60 : $CONFIG['keep_alive'], 41 41 'check_all_folders' => isset($_POST['_check_all_folders']) ? TRUE : FALSE, … … 88 88 } 89 89 90 90 91 if ($USER->save_prefs($a_user_prefs)) 91 92 $OUTPUT->show_message('successfullysaved', 'confirmation'); 92 93 93 94 94 // go to next step
Note: See TracChangeset
for help on using the changeset viewer.
