From bae221512b67f59e462a63bad3013d97b3bb3172 Mon Sep 17 00:00:00 2001 From: Jared Hancock <jared@osticket.com> Date: Mon, 27 Oct 2014 10:49:43 -0500 Subject: [PATCH] Move email attachments to email settings --- include/class.config.php | 2 +- include/staff/settings-emails.inc.php | 8 ++++++++ include/staff/settings-tickets.inc.php | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/class.config.php b/include/class.config.php index 08881a4d3..04a7cea45 100644 --- a/include/class.config.php +++ b/include/class.config.php @@ -962,7 +962,6 @@ class OsticketConfig extends Config { 'enable_html_thread'=>isset($vars['enable_html_thread'])?1:0, 'allow_client_updates'=>isset($vars['allow_client_updates'])?1:0, 'max_file_size'=>$vars['max_file_size'], - 'email_attachments'=>isset($vars['email_attachments'])?1:0, )); } @@ -996,6 +995,7 @@ class OsticketConfig extends Config { 'accept_unregistered_email'=>isset($vars['accept_unregistered_email'])?1:0, 'add_email_collabs'=>isset($vars['add_email_collabs'])?1:0, 'reply_separator'=>$vars['reply_separator'], + 'email_attachments'=>isset($vars['email_attachments'])?1:0, )); } diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php index 228791074..b10facabe 100644 --- a/include/staff/settings-emails.inc.php +++ b/include/staff/settings-emails.inc.php @@ -153,6 +153,14 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config) <i class="help-tip icon-question-sign" href="#default_mta"></i> </td> </tr> + <tr> + <td width="180"><?php echo __('Attachments');?>:</td> + <td> + <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?>> + <?php echo __('Email attachments to the user'); ?> + <i class="help-tip icon-question-sign" href="#ticket_response_files"></i> + </td> + </tr> </tbody> </table> <p style="padding-left:250px;"> diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php index 2e23da950..d64c52ed1 100644 --- a/include/staff/settings-tickets.inc.php +++ b/include/staff/settings-tickets.inc.php @@ -268,14 +268,6 @@ if(!($maxfileuploads=ini_get('max_file_uploads'))) <div class="error"><?php echo $errors['max_file_size']; ?></div> </td> </tr> - <tr> - <td width="180"><?php echo __('Ticket Response Files');?>:</td> - <td> - <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?>> - <?php echo __('Email attachments to the user'); ?> - <i class="help-tip icon-question-sign" href="#ticket_response_files"></i> - </td> - </tr> <?php if (($bks = FileStorageBackend::allRegistered()) && count($bks) > 1) { ?> <tr> -- GitLab