Merge pull request #4970 from JediKev/issue/image-attachment-view

issue: Image Attachment View

include/class.file.php

@@ -240,7 +240,10 @@ class AttachmentFile extends VerySimpleModel {
     }
 
     function download($disposition=false, $expires=false) {
-        $disposition = ($disposition && strcasecmp($disposition, 'inline') == 0
+        $thisstaff = StaffAuthenticationBackend::getUser();
+        $inline = ($thisstaff ? ($thisstaff->getImageAttachmentView() === 'inline') : false);
+        $disposition = ((($disposition && strcasecmp($disposition, 'inline') == 0)
+              || $inline)
               && strpos($this->getType(), 'image/') !== false)
             ? 'inline' : 'attachment';
         $bk = $this->open();

include/class.staff.php

@@ -88,6 +88,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable {
                         'default_from_name' => '',
                         'datetime_format'   => '',
                         'thread_view_order' => '',
+                        'img_att_view' => 'download',
                         ));
             $this->_config = $_config->getInfo();
         }
@@ -328,6 +329,10 @@ implements AuthenticatedUser, EmailContact, TemplateVariable {
         return $this->default_paper_size;
     }
 
+    function getImageAttachmentView() {
+        return $this->img_att_view;
+    }
+
     function forcePasswdChange() {
         return $this->change_passwd;
     }
@@ -691,6 +696,7 @@ implements AuthenticatedUser, EmailContact, TemplateVariable {
                     'datetime_format' => $vars['datetime_format'],
                     'default_from_name' => $vars['default_from_name'],
                     'thread_view_order' => $vars['thread_view_order'],
+                    'img_att_view' => ($vars['img_att_view'] == 'inline') ? 'inline' : 'download',
                     )
                 );
         $this->_config = $_config->getInfo();

include/staff/profile.inc.php

@@ -283,6 +283,23 @@ if ($avatar->isChangeable()) { ?>
                 <div class="error"><?php echo $errors['default_paper_size']; ?></div>
             </td>
         </tr>
+        <tr>
+            <td><?php echo __('Image Attachment View'); ?>:
+                <div class="faded"><?php echo __('Open image attachments in new tab or directly download. (CTRL + Right Click)');?></div>
+            </td>
+            <td>
+                <select name="img_att_view">
+                  <?php
+                  $options=array('download'=>__('Download'),'inline'=>__('Inline'));
+                  foreach($options as $key=>$opt) {
+                      echo sprintf('<option value="%s" %s>%s</option>',
+                                $key,($staff->img_att_view==$key)?'selected="selected"':'',$opt);
+                  }
+                  ?>
+                </select>
+                <div class="error"><?php echo $errors['img_att_view']; ?></div>
+            </td>
+        </tr>
       </tbody>
       <tbody>
         <tr class="header">