Changeset 166b615 in github

Timestamp:

Jun 14, 2008 2:09:53 PM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

892ca06

Parents:

ed42ff1

Message:

• Added option to disable displaying of attached images below the message body

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (2 diffs)
• program/localization/en_US/labels.inc (modified) (1 diff)
• program/localization/pl_PL/labels.inc (modified) (1 diff)
• program/steps/mail/func.inc (modified) (1 diff)
• program/steps/settings/func.inc (modified) (1 diff)
• program/steps/settings/save_prefs.inc (modified) (1 diff)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/06/14 (alec)
+----------
+- Added option to disable displaying of attached images below the message body
 
 2008/06/13 (alec)

config/main.inc.php.dist

@@ -299 +299 @@
 $rcmail_config['enable_installer'] = false;
 
-/***** these settings can be overwritten by user's preferences *****/
-
-// show up to X items in list view
-$rcmail_config['pagesize'] = 40;
-
-// use this timezone to display date/time
-$rcmail_config['timezone'] = intval(date('O'))/100 - date('I');
-
-// is daylight saving On?
-$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;
-
-// compose html formatted messages by default
-$rcmail_config['htmleditor'] = FALSE;
-
-// show pretty dates as standard
-$rcmail_config['prettydate'] = TRUE;
-
-// save compose message every 300 seconds (5min)
-$rcmail_config['draft_autosave'] = 300;
-
-// default setting if preview pane is enabled
-$rcmail_config['preview_pane'] = FALSE;
-
-// Clear Trash on logout
-$rcmail_config['logout_purge'] = FALSE;
-
-// Compact INBOX on logout
-$rcmail_config['logout_expunge'] = FALSE;
+// Log successful logins
+$rcmail_config['log_logins'] = false;
 
 /**
@@ -346 +314 @@
 $rcmail_config['delete_always'] = false;
 
-// Log successful logins
-$rcmail_config['log_logins'] = false;
+/***** these settings can be overwritten by user's preferences *****/
+
+// show up to X items in list view
+$rcmail_config['pagesize'] = 40;
+
+// use this timezone to display date/time
+$rcmail_config['timezone'] = intval(date('O'))/100 - date('I');
+
+// is daylight saving On?
+$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;
+
+// compose html formatted messages by default
+$rcmail_config['htmleditor'] = FALSE;
+
+// show pretty dates as standard
+$rcmail_config['prettydate'] = TRUE;
+
+// save compose message every 300 seconds (5min)
+$rcmail_config['draft_autosave'] = 300;
+
+// default setting if preview pane is enabled
+$rcmail_config['preview_pane'] = FALSE;
+
+// Clear Trash on logout
+$rcmail_config['logout_purge'] = FALSE;
+
+// Compact INBOX on logout
+$rcmail_config['logout_expunge'] = FALSE;
+
+// Display attached images below the message body 
+$rcmail_config['inline_images'] = TRUE;
 
 // end of config file

program/localization/en_US/labels.inc

@@ -264 +264 @@
 $labels['readwhendeleted'] = 'Mark the message as read on delete';
 $labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
-
+$labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'Automatically save draft';
 $labels['everynminutes']  = 'every $n minutes';

program/localization/pl_PL/labels.inc

@@ -61 +61 @@
 $labels['showknownimages'] = 'Wyświetlaj obrazki od znanych nadawców';
 $labels['prettydate'] = 'Ładne daty';
+$labels['showinlineimages'] = 'Wyświetlaj załÄ
+czone obrazki pod treściÄ
+ wiadomości';
 $labels['messagesdisplaying'] = 'Wyświetlanie wiadomości';
 $labels['messagescomposition'] = 'Tworzenie wiadomości';

program/steps/mail/func.inc

@@ -746 +746 @@
   $ctype_primary = strtolower($MESSAGE->structure->ctype_primary);
   $ctype_secondary = strtolower($MESSAGE->structure->ctype_secondary);
-  
+
   // list images after mail body
-  if (get_boolean($attrib['showimages']) && $ctype_primary == 'multipart' &&
-      !empty($MESSAGE->attachments) && !strstr($message_body, '<html')) {
+  if (get_boolean($attrib['showimages']) 
+        && $CONFIG['inline_images']
+        && $ctype_primary == 'multipart'
+        && !empty($MESSAGE->attachments) 
+        && !strstr($message_body, '<html'))
+    {
     foreach ($MESSAGE->attachments as $attach_prop) {
       if (strpos($attach_prop->mimetype, 'image/') === 0) {

program/steps/settings/func.inc

@@ -201 +201 @@
     }
 
+  if (!isset($no_override['inline_images']))
+    {
+    $field_id = 'rcmfd_inline_images';
+    $input_inline_images = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));
+
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('showinlineimages')),
+                    $input_inline_images->show($config['inline_images']?1:0));
+    }
+
   $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('messagescomposition')) . "</legend>\n<table" . $attrib_str . ">\n\n";
 

program/steps/settings/save_prefs.inc

@@ -28 +28 @@
   'addrbook_show_images' => isset($_POST['_addrbook_show_images']) ? TRUE : FALSE,
   'htmleditor'   => isset($_POST['_htmleditor']) ? TRUE : FALSE,
+  'inline_images'   => isset($_POST['_inline_images']) ? TRUE : FALSE,
   'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
   'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,