Permalink
Browse files

- Added 'show_images' option, removed 'addrbook_show_images' (#1485597)

  • Loading branch information...
alecpl committed Dec 4, 2008
1 parent f94629e commit 2a41355776b1c1bc82255b5712267b0368b51d10
Showing with 44 additions and 59 deletions.
  1. +4 −0 CHANGELOG
  2. +5 −2 config/main.inc.php.dist
  3. +1 −0 installer/rcube_install.php
  4. +0 −1 program/localization/ar_SA/labels.inc
  5. +0 −1 program/localization/az_AZ/labels.inc
  6. +0 −1 program/localization/bg_BG/labels.inc
  7. +0 −1 program/localization/ca_ES/labels.inc
  8. +0 −1 program/localization/cs_CZ/labels.inc
  9. +0 −1 program/localization/cy_GB/labels.inc
  10. +0 −1 program/localization/da_DK/labels.inc
  11. +0 −1 program/localization/de_CH/labels.inc
  12. +0 −1 program/localization/de_DE/labels.inc
  13. +0 −1 program/localization/en_GB/labels.inc
  14. +3 −1 program/localization/en_US/labels.inc
  15. +0 −1 program/localization/eo/labels.inc
  16. +0 −1 program/localization/es_ES/labels.inc
  17. +0 −1 program/localization/et_EE/labels.inc
  18. +0 −1 program/localization/eu_ES/labels.inc
  19. +0 −1 program/localization/fa/labels.inc
  20. +0 −1 program/localization/fi_FI/labels.inc
  21. +0 −1 program/localization/fr_FR/labels.inc
  22. +0 −1 program/localization/gl_ES/labels.inc
  23. +0 −1 program/localization/he_IL/labels.inc
  24. +0 −1 program/localization/hr_HR/labels.inc
  25. +0 −1 program/localization/hu_HU/labels.inc
  26. +0 −1 program/localization/id_ID/labels.inc
  27. +0 −1 program/localization/it_IT/labels.inc
  28. +0 −1 program/localization/ja_JP/labels.inc
  29. +0 −1 program/localization/lt_LT/labels.inc
  30. +0 −1 program/localization/mk_MK/labels.inc
  31. +0 −1 program/localization/nl_NL/labels.inc
  32. +0 −1 program/localization/nn_NO/labels.inc
  33. +3 −1 program/localization/pl_PL/labels.inc
  34. +0 −1 program/localization/pt_BR/labels.inc
  35. +0 −1 program/localization/pt_PT/labels.inc
  36. +0 −1 program/localization/ru_RU/labels.inc
  37. +0 −1 program/localization/sk_SK/labels.inc
  38. +0 −1 program/localization/tr_TR/labels.inc
  39. +0 −1 program/localization/zh_CN/labels.inc
  40. +0 −1 program/localization/zh_TW/labels.inc
  41. +17 −10 program/steps/mail/show.inc
  42. +9 −8 program/steps/settings/func.inc
  43. +2 −2 program/steps/settings/save_prefs.inc
View
@@ -1,6 +1,10 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/12/04 (alec)
+----------
+- Added 'show_images' option, removed 'addrbook_show_images' (#1485597)
+
2008/11/28 (thomasb)
----------
- Option to check for new mails in all folders (#1484374)
View
@@ -352,8 +352,11 @@ $rcmail_config['dst_active'] = (bool)date('I');
// prefer displaying HTML messages
$rcmail_config['prefer_html'] = TRUE;
-// display images in mail from known senders
-$rcmail_config['addrbook_show_images'] = FALSE;
+// display remote inline images
+// 0 - Never, always ask
+// 1 - Ask if sender is not in address book
+// 2 - Always show inline images
+$rcmail_config['show_images'] = 0;
// compose html formatted messages by default
$rcmail_config['htmleditor'] = FALSE;
@@ -37,6 +37,7 @@ class rcube_install
'skin_path' => 'skin',
'locale_string' => 'language',
'multiple_identities' => 'identities_level',
+ 'addrbook_show_images' => 'show_images',
);
// these config options are optional or can be set to null
@@ -52,7 +52,6 @@ $labels['filename'] = 'اسم الملف';
$labels['filesize'] = 'حجم الملف';
$labels['preferhtml'] = 'تفضيل صيغة HTML';
$labels['htmlmessage'] = 'رسالة بنسق HTML';
-$labels['showknownimages'] = 'أظهر الصّور من المرسلين المعروفين';
$labels['prettydate'] = 'تواريخ منمقة';
$labels['addtoaddressbook'] = 'إضافة إلى دفتر العناوين';
$labels['sun'] = 'أح';
@@ -50,7 +50,6 @@ $labels['filename'] = 'Fayl Adı';
$labels['filesize'] = 'Fayl Ölçüsü';
$labels['preferhtml'] = 'HTML göstərməyi dəstəklə';
$labels['htmlmessage'] = 'HTML Mesaj';
-$labels['showknownimages'] = 'Tanınmış qrafikləri göstər';
$labels['prettydate'] = 'Tarixi qısaltaraq göstər';
$labels['addtoaddressbook'] = 'Ünvan Kitabçasına Əlavə Et';
$labels['sun'] = 'B';
@@ -53,7 +53,6 @@ $labels['filename'] = 'Име на файла';
$labels['filesize'] = 'Размер на файла';
$labels['preferhtml'] = 'Показвай първо HTML версия';
$labels['htmlmessage'] = 'HTML съобщение';
-$labels['showknownimages'] = 'Показвай изображения от известни податели';
$labels['prettydate'] = 'Кратки дати';
$labels['addtoaddressbook'] = 'Добави в адресната книга';
$labels['sun'] = 'Нед';
@@ -53,7 +53,6 @@ $labels['filename'] = 'Nom del fitxer';
$labels['filesize'] = 'Grandària de fitxer';
$labels['preferhtml'] = 'Preferisc HTML';
$labels['htmlmessage'] = 'Missatge HTML';
-$labels['showknownimages'] = 'Mostrar imatges dels remitents coneguts';
$labels['prettydate'] = 'Dates curtes';
$labels['addtoaddressbook'] = 'Afegir a contactes';
$labels['sun'] = 'DG';
@@ -54,7 +54,6 @@ $labels['filename'] = 'Jméno přílohy';
$labels['filesize'] = 'Velikost přílohy';
$labels['preferhtml'] = 'Upřednostňovat HTML zobrazení';
$labels['htmlmessage'] = 'HTML zpráva';
-$labels['showknownimages'] = 'Ukazovat obrázky v mailech od neznámých odesilatelů';
$labels['prettydate'] = 'Hezčí datum';
$labels['addtoaddressbook'] = 'Přidat do adresáře';
$labels['sun'] = 'Ne';
@@ -49,7 +49,6 @@ $labels['filename'] = 'Enw ffeil';
$labels['filesize'] = 'Maint ffeil';
$labels['preferhtml'] = 'Dangos HTML';
$labels['htmlmessage'] = 'Neges HTML';
-$labels['showknownimages'] = 'Dangos lluniau gan anfonwyr cyfarwydd';
$labels['prettydate'] = 'Dyddiadau pert';
$labels['addtoaddressbook'] = 'Ychwanegu i\'r llyfr cyfeiriadau';
$labels['sun'] = 'Sul';
@@ -54,7 +54,6 @@ $labels['filename'] = 'Filnavn';
$labels['filesize'] = 'Filstørrelse';
$labels['preferhtml'] = 'Foretræk HTML';
$labels['htmlmessage'] = 'HTML-besked';
-$labels['showknownimages'] = 'Vis billeder fra kendte afsendere';
$labels['prettydate'] = 'Pæn datovisning';
$labels['addtoaddressbook'] = 'Tilføj til adressebogen';
$labels['sun'] = 'Søn';
@@ -53,7 +53,6 @@ $labels['filename'] = 'Dateiname';
$labels['filesize'] = 'Dateigrösse';
$labels['preferhtml'] = 'HTML bevorzugen';
$labels['htmlmessage'] = 'HTML Nachricht';
-$labels['showknownimages'] = 'Zeige Bilder von bekannten Absendern an';
$labels['prettydate'] = 'Kurze Datumsanzeige';
$labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
$labels['sun'] = 'So';
@@ -52,7 +52,6 @@ $labels['filename'] = 'Dateiname';
$labels['filesize'] = 'Dateigröße';
$labels['preferhtml'] = 'HTML anzeigen';
$labels['htmlmessage'] = 'HTML-Nachricht';
-$labels['showknownimages'] = 'Zeige Bilder von bekannten Absendern an';
$labels['prettydate'] = 'Kurze Datumsanzeige';
$labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
$labels['sun'] = 'So';
@@ -52,7 +52,6 @@ $labels['filename'] = 'File name';
$labels['filesize'] = 'File size';
$labels['preferhtml'] = 'Display HTML';
$labels['htmlmessage'] = 'HTML Message';
-$labels['showknownimages'] = 'Show images from known senders';
$labels['prettydate'] = 'Pretty dates';
$labels['addtoaddressbook'] = 'Add to address book';
$labels['sun'] = 'Sun';
@@ -66,7 +66,6 @@ $labels['filesize'] = 'File size';
$labels['preferhtml'] = 'Display HTML';
$labels['htmlmessage'] = 'HTML Message';
-$labels['showknownimages'] = 'Show images from known senders';
$labels['prettydate'] = 'Pretty dates';
$labels['addtoaddressbook'] = 'Add to address book';
@@ -281,6 +280,9 @@ $labels['ignore'] = 'ignore';
$labels['readwhendeleted'] = 'Mark the message as read on delete';
$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
$labels['showinlineimages'] = 'Display attached images below the message';
$labels['autosavedraft'] = 'Automatically save draft';
$labels['everynminutes'] = 'every $n minutes';
@@ -50,7 +50,6 @@ $labels['filename'] = 'Dosiernomo';
$labels['filesize'] = 'Dosiergrando';
$labels['preferhtml'] = 'Montru HTML';
$labels['htmlmessage'] = 'HTML Mesaĝo';
-$labels['showknownimages'] = 'Montru bildojn de konataj sendantoj';
$labels['prettydate'] = 'Agrablaj Datoj';
$labels['addtoaddressbook'] = 'Aldonu al adresaro';
$labels['sun'] = 'Dim';
@@ -55,7 +55,6 @@ $labels['filename'] = 'Nombre del archivo';
$labels['filesize'] = 'Tamaño del archivo';
$labels['preferhtml'] = 'Prefiero HTML';
$labels['htmlmessage'] = 'Mensaje HTML';
-$labels['showknownimages'] = 'Muestra imágenes de remitentes conocidos';
$labels['prettydate'] = 'Fecha detallada';
$labels['addtoaddressbook'] = 'Añadir a contactos';
$labels['sun'] = 'Dom';
@@ -52,7 +52,6 @@ $labels['filename'] = 'Faili nimi';
$labels['filesize'] = 'Faili suurus';
$labels['preferhtml'] = 'Eelista HTMLi';
$labels['htmlmessage'] = 'HTML kirjad';
-$labels['showknownimages'] = 'Näita tuntud saatjate kirjades pilte';
$labels['prettydate'] = 'Kenad kuupäevad';
$labels['addtoaddressbook'] = 'Lisa aadressiraamatusse';
$labels['sun'] = 'P';
@@ -52,7 +52,6 @@ $labels['filename'] = 'Fitxategi Izena';
$labels['filesize'] = 'Fitxategi Tamaina';
$labels['preferhtml'] = 'HTML nahiago';
$labels['htmlmessage'] = 'HTML Mezua';
-$labels['showknownimages'] = 'Bidaltzaile ezagunen imajinak ikusi';
$labels['prettydate'] = 'Data politak';
$labels['addtoaddressbook'] = 'Helbide liburura gehitu';
$labels['sun'] = 'Iga';
@@ -52,7 +52,6 @@ $labels['filename'] = 'نام پرونده';
$labels['filesize'] = 'اندازه‌ی پرونده';
$labels['preferhtml'] = 'HTML نمایش';
$labels['htmlmessage'] = 'HTML پیغام';
-$labels['showknownimages'] = 'نمایش عکسها از فرستندگان شناخته شده';
$labels['prettydate'] = 'تاریخ‌های زیبا';
$labels['addtoaddressbook'] = 'افزودن به دفتر نشانی‌ها';
$labels['sun'] = 'یکشنبه';
@@ -53,7 +53,6 @@ $labels['filename'] = 'Tiedoston nimi';
$labels['filesize'] = 'Tiedoston koko';
$labels['preferhtml'] = 'Käytä HTML:aa';
$labels['htmlmessage'] = 'HTML-viesti';
-$labels['showknownimages'] = 'Näytä tunnetuilta lähettäjiltä saapuneet kuvat';
$labels['prettydate'] = 'Nätit päiväykset';
$labels['addtoaddressbook'] = 'Lisää osoitekirjaan';
$labels['sun'] = 'Su';
@@ -54,7 +54,6 @@ $labels['filename'] = 'Nom du fichier';
$labels['filesize'] = 'Taille du fichier';
$labels['preferhtml'] = 'Afficher en HTML';
$labels['htmlmessage'] = 'Message en HTML';
-$labels['showknownimages'] = 'Afficher les images des expéditeurs connus';
$labels['prettydate'] = 'Affichage court des dates';
$labels['addtoaddressbook'] = 'Ajouter au carnet d\'adresses';
$labels['sun'] = 'Dim';
@@ -49,7 +49,6 @@ $labels['filename'] = 'Nome de ficheiro';
$labels['filesize'] = 'Tamaño de ficheiro';
$labels['preferhtml'] = 'Prefiro HTML';
$labels['htmlmessage'] = 'Mensaxe HTML';
-$labels['showknownimages'] = 'Mostrar as imaxes nos correos de remitentes coñecidos.';
$labels['prettydate'] = 'Data decorada';
$labels['addtoaddressbook'] = 'Engadir ao caderno de enderezos';
$labels['sun'] = 'Dom';
@@ -50,7 +50,6 @@ $labels['filename'] = 'שם קובץ';
$labels['filesize'] = 'גודל קובץ';
$labels['preferhtml'] = 'הצגת HTML';
$labels['htmlmessage'] = 'תוכן HTML';
-$labels['showknownimages'] = 'הצגת תמונות ממקור ידוע';
$labels['prettydate'] = 'תאריכים מעוצבים';
$labels['addtoaddressbook'] = 'הוספה לפנקס כתובות';
$labels['sun'] = 'יום א';
@@ -52,7 +52,6 @@ $labels['filename'] = 'Ime datoteke';
$labels['filesize'] = 'Veličina datoteke';
$labels['preferhtml'] = 'HTML format u prednosti';
$labels['htmlmessage'] = 'HTML format poruke';
-$labels['showknownimages'] = 'Prikaži poruke od poznatih pošiljatelja';
$labels['prettydate'] = 'Formatiran datum';
$labels['addtoaddressbook'] = 'Dodaj u imenik';
$labels['sun'] = 'Ned';
@@ -53,7 +53,6 @@ $labels['filename'] = 'File neve';
$labels['filesize'] = 'File mérete';
$labels['preferhtml'] = 'HTML megjelenítés';
$labels['htmlmessage'] = 'HTML üzenet';
-$labels['showknownimages'] = 'Képek megjelenítése ismert Feladó esetén';
$labels['prettydate'] = 'Rövid dátumok';
$labels['addtoaddressbook'] = 'Hozzáadás a címjegyzékhez';
$labels['sun'] = 'Vas';
@@ -52,7 +52,6 @@ $labels['filename'] = 'Nama berkas';
$labels['filesize'] = 'Ukuran berkas';
$labels['preferhtml'] = 'Lebih suka HTML';
$labels['htmlmessage'] = 'Pesan HTML';
-$labels['showknownimages'] = 'Tampilakn gambar dari pengirim yang dikenal';
$labels['prettydate'] = 'Tanggal cantik';
$labels['addtoaddressbook'] = 'Tambahkan ke buku tamu';
$labels['sun'] = 'Min';
@@ -53,7 +53,6 @@ $labels['filename'] = 'Nome file';
$labels['filesize'] = 'Dimensione file';
$labels['preferhtml'] = 'Mostra HTML';
$labels['htmlmessage'] = 'Messaggio HTML';
-$labels['showknownimages'] = 'Mostra immagini da mittenti conosciuti';
$labels['prettydate'] = 'Date più leggibili';
$labels['addtoaddressbook'] = 'Aggiungi alla rubrica';
$labels['sun'] = 'Dom';
@@ -53,7 +53,6 @@ $labels['filename'] = 'ファイル名';
$labels['filesize'] = 'ファイルサイズ';
$labels['preferhtml'] = 'HTMLを表示';
$labels['htmlmessage'] = 'HTMLメール';
-$labels['showknownimages'] = ' 登録済み送信者の画像を表示';
$labels['prettydate'] = '簡易な日付表示';
$labels['addtoaddressbook'] = 'アドレス帳に追加';
$labels['sun'] = '';
@@ -52,7 +52,6 @@ $labels['filename'] = 'Bylos vardas';
$labels['filesize'] = 'Bylos dydis';
$labels['preferhtml'] = 'Rodyti HTML';
$labels['htmlmessage'] = 'HTML Laiškas';
-$labels['showknownimages'] = 'Rodyti žinomų siuntėjų paveikslėlius';
$labels['prettydate'] = 'Gražios datos';
$labels['addtoaddressbook'] = 'Įtraukti į adresų knygą';
$labels['sun'] = 'Sek';
@@ -51,7 +51,6 @@ $labels['filename'] = 'Име на датотеката';
$labels['filesize'] = 'Големина на датотеката';
$labels['preferhtml'] = 'Прикажи во HTML';
$labels['htmlmessage'] = 'HTML Порака';
-$labels['showknownimages'] = 'Прикажи ги сликите од непознат праќач';
$labels['prettydate'] = 'Убави дати';
$labels['addtoaddressbook'] = 'Додади во именик';
$labels['sun'] = 'Нед';
@@ -53,7 +53,6 @@ $labels['filename'] = 'Bestandsnaam';
$labels['filesize'] = 'Bestandsgrootte';
$labels['preferhtml'] = 'Toon HTML';
$labels['htmlmessage'] = 'HTML-Bericht';
-$labels['showknownimages'] = 'Toon afbeeldingen van bekende afzenders';
$labels['prettydate'] = 'Gebruiksvriendelijke data';
$labels['addtoaddressbook'] = 'Toevoegen aan adresboek';
$labels['sun'] = 'Zo';
@@ -53,7 +53,6 @@ $labels['filename'] = 'Filnamn';
$labels['filesize'] = 'Filstorleik';
$labels['preferhtml'] = 'Føretrekk HTML';
$labels['htmlmessage'] = 'HTML-melding';
-$labels['showknownimages'] = 'Vis bilete frå kjende sendarar';
$labels['prettydate'] = 'Pene datoar';
$labels['addtoaddressbook'] = 'Legg til i adressebok';
$labels['sun'] = 'Sun';
@@ -57,7 +57,9 @@ $labels['filename'] = 'Nazwa pliku';
$labels['filesize'] = 'Rozmiar pliku';
$labels['preferhtml'] = 'Domyślny HTML';
$labels['htmlmessage'] = 'Wiadomość HTML';
-$labels['showknownimages'] = 'Wyświetlaj obrazki od znanych nadawców';
+$labels['showremoteimages'] = 'Wyświetlaj obrazki w wiadomościach';
+$labels['fromknownsenders'] = 'od znanych nadawców';
+$labels['always'] = 'zawsze';
$labels['prettydate'] = 'Ładne daty';
$labels['showinlineimages'] = 'Wyświetlaj załączone obrazki pod treścią wiadomości';
$labels['messagesdisplaying'] = 'Wyświetlanie wiadomości';
@@ -70,7 +70,6 @@ $labels['filesize'] = 'Tamanho';
$labels['preferhtml'] = 'Exibir mensagens em HTML';
$labels['htmlmessage'] = 'Mensagem HTML';
-$labels['showknownimages'] = 'Exibir imagens de remetentes conhecidos';
$labels['prettydate'] = 'Exibir datas amigáveis';
$labels['addtoaddressbook'] = 'Incluir no catálogo de endereços';
@@ -55,7 +55,6 @@ $labels['filename'] = 'Ficheiro';
$labels['filesize'] = 'Tamanho';
$labels['preferhtml'] = 'Prefere HTML';
$labels['htmlmessage'] = 'Mensagem HTML';
-$labels['showknownimages'] = 'Mostrar imagens de remetentes conhecidos';
$labels['prettydate'] = 'Formatar datas';
$labels['addtoaddressbook'] = 'Adicionar à lista de contactos';
$labels['sun'] = 'Dom';
@@ -54,7 +54,6 @@ $labels['filename'] = 'Имя файла';
$labels['filesize'] = 'Размер файла';
$labels['preferhtml'] = 'Предпочитать HTML';
$labels['htmlmessage'] = 'Сообщение HTML';
-$labels['showknownimages'] = 'Показывать изображения от известных отправителей';
$labels['prettydate'] = 'Красивые даты';
$labels['addtoaddressbook'] = 'Добавить в контакты';
$labels['sun'] = 'Вс';
@@ -54,7 +54,6 @@ $labels['filename'] = 'Meno súboru';
$labels['filesize'] = 'Veľkosť súboru';
$labels['preferhtml'] = 'Uprednostniť HTML zobrazenie';
$labels['htmlmessage'] = 'HTML správa';
-$labels['showknownimages'] = 'Zobraziť obrázky v správach od známych odosielateľov';
$labels['prettydate'] = 'Krajší dátum';
$labels['addtoaddressbook'] = 'Pridať do adresára';
$labels['sun'] = 'Ne';
@@ -53,7 +53,6 @@ $labels['filename'] = 'Dosya Adı';
$labels['filesize'] = 'Dosya Boyutu';
$labels['preferhtml'] = 'HTML görüntüle';
$labels['htmlmessage'] = 'HTML Posta';
-$labels['showknownimages'] = 'Bilinen göndericilerden gelen resimleri göster';
$labels['prettydate'] = 'Tarihi kısaltarak göster';
$labels['addtoaddressbook'] = 'Adres Defterine Ekle';
$labels['sun'] = 'Paz';
@@ -53,7 +53,6 @@ $labels['filename'] = '文件名';
$labels['filesize'] = '文件大小';
$labels['preferhtml'] = '以 HTML 格式显示';
$labels['htmlmessage'] = 'HTML 邮件';
-$labels['showknownimages'] = '显示已知的发件人的邮件中的图片';
$labels['prettydate'] = '短日期格式';
$labels['addtoaddressbook'] = '添加到通讯录';
$labels['sun'] = '';
@@ -68,7 +68,6 @@ $labels['filesize'] = '檔案大小';
$labels['preferhtml'] = '使用 HTML 顯示';
$labels['htmlmessage'] = 'HTML 郵件';
-$labels['showknownimages'] = '已知的寄件者顯示圖片';
$labels['prettydate'] = '簡短日期顯示';
$labels['addtoaddressbook'] = '新增至通訊錄';
@@ -42,15 +42,22 @@ if ($_GET['_uid']) {
$mbox_name = $IMAP->get_mailbox_name();
- // check known senders to display images
- if (!$MESSAGE->is_safe
- && !empty($MESSAGE->sender['mailto'])
- && $RCMAIL->config->get('addrbook_show_images')
- && $MESSAGE->has_html_part()) {
- $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
-
- if ($CONTACTS->search('email', $MESSAGE->sender['mailto'], true, false)->count) {
- $MESSAGE->set_safe(true);
+ // show images?
+ $show_images = $RCMAIL->config->get('show_images');
+ if(!$MESSAGE->is_safe
+ && !empty($show_images)
+ && $MESSAGE->has_html_part())
+ {
+ switch($show_images) {
+ case '1': // known senders only
+ $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
+ if ($CONTACTS->search('email', $MESSAGE->sender['mailto'], true, false)->count) {
+ $MESSAGE->set_safe(true);
+ }
+ break;
+ case '2': // always
+ $MESSAGE->set_safe(true);
+ break;
}
}
@@ -204,7 +211,7 @@ function rcmail_remote_objects_msg($attrib)
$msg .= html::a(array('href' => "#loadimages", 'onclick' => JS_OBJECT_NAME.".command('load-images')"), Q(rcube_label('showimages')));
// add link to save sender in addressbook and reload message
- if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('addrbook_show_images')) {
+ if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) {
$msg .= ' ' . html::a(array('href' => "#alwaysload", 'onclick' => JS_OBJECT_NAME.".command('always-load')", 'style' => "white-space:nowrap"),
Q(rcube_label(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
}
Oops, something went wrong.

0 comments on commit 2a41355

Please sign in to comment.