diff --git a/include/class.config.php b/include/class.config.php index ab5d822fab63161344ae796386c8a13172d13b2b..e164fa8092afa723e5af770b2bb8dc42fa3e597a 100644 --- a/include/class.config.php +++ b/include/class.config.php @@ -1014,8 +1014,8 @@ class OsticketConfig extends Config { $errors['default_help_topic'] = __('Default help topic must be set to active'); } - if (!preg_match('`(?!<\\\)#`', $vars['number_format'])) - $errors['number_format'] = 'Ticket number format requires at least one hash character (#)'; + if (!preg_match('`(?!<\\\)#`', $vars['ticket_number_format'])) + $errors['ticket_number_format'] = 'Ticket number format requires at least one hash character (#)'; if(!Validator::process($f, $vars, $errors) || $errors) return false; @@ -1024,8 +1024,8 @@ class OsticketConfig extends Config { $this->update('default_storage_bk', $vars['default_storage_bk']); return $this->updateAll(array( - 'number_format'=>$vars['number_format'] ?: '######', - 'sequence_id'=>$vars['sequence_id'] ?: 0, + 'ticket_number_format'=>$vars['ticket_number_format'] ?: '######', + 'ticket_sequence_id'=>$vars['ticket_sequence_id'] ?: 0, 'default_priority_id'=>$vars['default_priority_id'], 'default_help_topic'=>$vars['default_help_topic'], 'default_ticket_status_id'=>$vars['default_ticket_status_id'], diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php index 603f43dfa3a7695772a79db0d5fe8688f9e76bd6..0aef056efa472af65087bf8126a7301bad4fc645 100644 --- a/include/staff/settings-tickets.inc.php +++ b/include/staff/settings-tickets.inc.php @@ -22,27 +22,28 @@ if(!($maxfileuploads=ini_get('max_file_uploads'))) <?php echo __('Default Ticket Number Format'); ?>: </td> <td> - <input type="text" name="number_format" value="<?php echo $config['number_format']; ?>"/> + <input type="text" name="ticket_number_format" value="<?php + echo $config['ticke_number_format']; ?>"/> <span class="faded"><?php echo __('e.g.'); ?> <span id="format-example"><?php - if ($config['sequence_id']) - $seq = Sequence::lookup($config['sequence_id']); + if ($config['ticket_sequence_id']) + $seq = Sequence::lookup($config['ticket_sequence_id']); if (!isset($seq)) $seq = new RandomSequence(); - echo $seq->current($config['number_format']); + echo $seq->current($config['ticket_number_format']); ?></span></span> <i class="help-tip icon-question-sign" href="#number_format"></i> - <div class="error"><?php echo $errors['number_format']; ?></div> + <div class="error"><?php echo $errors['ticket_number_format']; ?></div> </td> </tr> <tr><td width="220"><?php echo __('Default Ticket Number Sequence'); ?>:</td> <?php $selected = 'selected="selected"'; ?> <td> - <select name="sequence_id"> - <option value="0" <?php if ($config['sequence_id'] == 0) echo $selected; + <select name="ticket_sequence_id"> + <option value="0" <?php if ($config['ticket_sequence_id'] == 0) echo $selected; ?>>— <?php echo __('Random'); ?> —</option> <?php foreach (Sequence::objects() as $s) { ?> <option value="<?php echo $s->id; ?>" <?php - if ($config['sequence_id'] == $s->id) echo $selected; + if ($config['ticket_sequence_id'] == $s->id) echo $selected; ?>><?php echo $s->name; ?></option> <?php } ?> </select> @@ -287,12 +288,12 @@ $(function() { update_example = function() { request && request.abort(); request = $.get('ajax.php/sequence/' - + $('[name=sequence_id] :selected').val(), - {'format': $('[name=number_format]').val()}, + + $('[name=ticket_sequence_id] :selected').val(), + {'format': $('[name=ticket_number_format]').val()}, function(data) { $('#format-example').text(data); } ); }; - $('[name=sequence_id]').on('change', update_example); - $('[name=number_format]').on('keyup', update_example); + $('[name=ticket_sequence_id]').on('change', update_example); + $('[name=ticket_number_format]').on('keyup', update_example); }); </script>