Skip to content
Snippets Groups Projects
Commit bae22151 authored by Jared Hancock's avatar Jared Hancock
Browse files

Move email attachments to email settings

parent 405dbab2
Branches
Tags
No related merge requests found
......@@ -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,
));
}
......
......@@ -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;">
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment