Browse Source

#30 Let the page actually save the setting

merge-requests/2/head
Mike Koch 7 years ago
parent
commit
e339b90efd
  1. 33
      admin/admin_settings.php
  2. 13
      admin/admin_settings_save.php
  3. 9
      js/modsForHesk-javascript.js
  4. 8
      language/en/text.php
  5. 2
      verifyemail.php

33
admin/admin_settings.php

@ -1674,7 +1674,24 @@ if ( defined('HESK_DEMO') )
<label for="s_multi_eml" class="col-sm-3 control-label"><?php echo $hesklang['meml']; ?> <a href="Javascript:void(0)" onclick="Javascript:hesk_window('<?php echo $help_folder; ?>email.html#57','400','500')"><i class="fa fa-question-circle settingsquestionmark"></i></a></label>
<div class="col-sm-9">
<div class="checkbox">
<label><input type="checkbox" name="s_multi_eml" value="1" <?php if ($hesk_settings['multi_eml']) {echo 'checked="checked"';} ?>/> <?php echo $hesklang['meml2']; ?></label>
<?php
if ($modsForHesk_settings['customer_email_verification_required'])
{
?>
<label>
<i class="fa fa-ban" style="color: red; font-size: 1.2em; margin-left: -20px; font-weight: bold"
data-toggle="popover"
title="<?php echo $hesklang['feature_disabled']; ?>"
data-content="<?php echo $hesklang['multi_eml_disabled']; ?>"></i> <?php echo $hesklang['meml2']; ?></label>
<input type="hidden" name="s_multi_eml" value="0">
<?php
} else
{
?>
<label><input type="checkbox" name="s_multi_eml" value="1" <?php if ($hesk_settings['multi_eml']) {echo 'checked="checked"';} ?>/> <?php echo $hesklang['meml2']; ?></label>
<?php
}
?>
</div>
</div>
</div>
@ -1835,6 +1852,20 @@ if ( defined('HESK_DEMO') )
</div>
</div>
</div>
<div class="form-group"><!-- TODO -->
<label for="email-verification" class="col-sm-4 col-xs-12 control-label"><?php echo $hesklang['customer_email_verification']; ?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
title="<?php echo $hesklang['customer_email_verification']; ?>"
data-content="<?php echo $hesklang['customer_email_verification_help']; ?>"></i>
</label>
<div class="col-sm-8 col-xs-12">
<div class="checkbox">
<label>
<input id="email-verification" name="email-verification" type="checkbox" <?php if ($modsForHesk_settings['customer_email_verification_required']) {echo 'checked';} ?>> <?php echo $hesklang['require_customer_validate_email']; ?>
</label>
</div>
</div>
</div>
<div class="blankSpace"></div>
<h6 style="font-weight: bold"><?php echo $hesklang['tab_4']; ?></h6>
<div class="footerWithBorder blankSpace"></div>

13
admin/admin_settings_save.php

@ -539,6 +539,14 @@ $set['rtl'] = empty($_POST['rtl']) ? 0 : 1;
$set['show-icons'] = empty($_POST['show-icons']) ? 0 : 1;
$set['maintenance-mode'] = empty($_POST['maintenance-mode']) ? 0 : 1;
$set['custom-field-setting'] = empty($_POST['custom-field-setting']) ? 0 : 1;
$set['customer-email-verification-required'] = empty($_POST['email-verification']) ? 0 : 1;
if ($set['customer-email-verification-required'])
{
//-- Don't allow multiple emails if verification is required
$set['multi_eml'] = 0;
}
$set['navbarBackgroundColor'] = hesk_input(hesk_POST('navbarBackgroundColor'));
$set['navbarBrandColor'] = hesk_input(hesk_POST('navbarBrandColor'));
$set['navbarBrandHoverColor'] = hesk_input(hesk_POST('navbarBrandHoverColor'));
@ -575,7 +583,10 @@ $modsForHesk_settings[\'show_icons\'] = '.$set['show-icons'].';
$modsForHesk_settings[\'maintenance_mode\'] = '.$set['maintenance-mode'].';
//-- Set this to 1 to enable custom field names as keys
$modsForHesk_settings[\'custom_field_setting\'] = '.$set['custom-field-setting'].';';
$modsForHesk_settings[\'custom_field_setting\'] = '.$set['custom-field-setting'].';
//-- Set this to 1 to enable email verification for new customers
$modsForHesk_settings[\'customer_email_verification_required\'] = '.$set['customer-email-verification-required'].';';
// Write the file
if ( ! file_put_contents(HESK_PATH . 'modsForHesk_settings.inc.php', $modsForHesk_file_content) )

9
js/modsForHesk-javascript.js

@ -4,12 +4,19 @@ var loadJquery = function()
//-- Activate tooltips
$('[data-toggle="tooltip"]').tooltip();
//-- Active popovers
//-- Activate popovers
$('[data-toggle="popover"]').popover({
trigger: 'hover',
container: 'body'
});
//-- Activate HTML popovers
$('[data-toggle="htmlpopover"]').popover({
trigger: 'hover',
container: 'body',
html: 'true'
});
//-- Activate jQuery's date picker
$(function() {
$('.datepicker').datepicker({

8
language/en/text.php

@ -38,6 +38,14 @@ $hesklang['email_verified'] = 'The email address <b>%s</b> has been verified. Ad
$hesklang['verify_no_records'] = 'No records were found for this activation key. Has this activation key already been used?';
$hesklang['activation_key'] = 'Activation Key';
$hesklang['no_tickets_created'] = 'No tickets created';
$hesklang['customer_email_verification'] = 'Customer Email Verifications';
$hesklang['customer_email_verification_help'] = 'Require customers to verify their email address via email. Once their
address has been verified, it does not need to be re-verified in the future. <br><br> <b>NOTE:</b> Enabling this will disable the
ability for the customer to provide multiple emails, as HESK will be unable to determine which email needs to be verified.';
$hesklang['require_customer_validate_email'] = 'Require customers to verify email';
$hesklang['multi_eml_disabled'] = 'This feature has been disabled because this help desk has been configured to require
customers to verify their email address';
$hesklang['feature_disabled'] = 'Feature Disabled';
// ADDED OR MODIFIED IN Mods For HESK 1.6.0
$hesklang['ticket_closed'] = '[#%%TRACK_ID%%] Ticket closed/resolved';

2
verifyemail.php

@ -57,7 +57,7 @@ require_once(HESK_PATH . 'inc/header.inc.php');
{
hesk_notifyStaff('new_ticket_staff', " `notify_new_unassigned` = '1' ");
}
array_push($submittedTickets, $innerResult['trackid']);
hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."stage_tickets`
WHERE `id` = ".$innerResult['id']);

Loading…
Cancel
Save