diff --git a/actions/admin/settings/190.ticket.php b/actions/admin/settings/190.ticket.php index f76b0002..c489bad1 100644 --- a/actions/admin/settings/190.ticket.php +++ b/actions/admin/settings/190.ticket.php @@ -125,6 +125,16 @@ return array( 'type' => 'hidden', 'default' => '', ), + 'ticket_default_priority' => array( + 'label' => $lng['serversettings']['ticket']['default_priority'], + 'settinggroup' => 'ticket', + 'varname' => 'default_priority', + 'type' => 'option', + 'default' => 2, + 'option_mode' => 'one', + 'option_options' => array(1 => $lng['ticket']['unf_high'], 2 => $lng['ticket']['unf_normal'], 3 => $lng['ticket']['unf_low']), + 'save_method' => 'storeSettingField', + ), ), ), ) diff --git a/admin_tickets.php b/admin_tickets.php index 0e9d0438..18e7ad6d 100644 --- a/admin_tickets.php +++ b/admin_tickets.php @@ -237,9 +237,9 @@ if($page == 'tickets' } } - $priorities = makeoption($lng['ticket']['unf_high'], '1'); - $priorities.= makeoption($lng['ticket']['unf_normal'], '2'); - $priorities.= makeoption($lng['ticket']['unf_low'], '3'); + $priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']); + $priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']); + $priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']); eval("echo \"" . getTemplate("ticket/tickets_new") . "\";"); } } diff --git a/customer_tickets.php b/customer_tickets.php index e2209708..47d0b7a6 100644 --- a/customer_tickets.php +++ b/customer_tickets.php @@ -226,9 +226,9 @@ elseif($page == 'tickets') $categories = makeoption($lng['ticket']['no_cat'], '0'); } - $priorities = makeoption($lng['ticket']['unf_high'], '1'); - $priorities.= makeoption($lng['ticket']['unf_normal'], '2'); - $priorities.= makeoption($lng['ticket']['unf_low'], '3'); + $priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']); + $priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']); + $priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']); $ticketsopen = 0; $opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '` WHERE `customerid` = "' . $userinfo['customerid'] . '" diff --git a/install/froxlor.sql b/install/froxlor.sql index 7c580d31..0e133c94 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -451,7 +451,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.6-svn3'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.6-svn4'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); @@ -565,6 +565,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (134, 'defaultwebsrverrhandler', 'err403', ''); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (135, 'defaultwebsrverrhandler', 'err404', ''); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (136, 'defaultwebsrverrhandler', 'err500', ''); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (137, 'ticket', 'default_priority', '2'); # -------------------------------------------------------- diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 6b937200..66d8eceb 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -582,4 +582,17 @@ if(isFroxlorVersion('0.9.6-svn2')) updateToVersion('0.9.6-svn3'); } +if(isFroxlorVersion('0.9.6-svn3')) +{ + showUpdateStep("Updating from 0.9.6-svn3 to 0.9.6-svn4", false); + + $update_deftic_priority = isset($_POST['update_deftic_priority']) ? intval($_POST['update_deftic_priority']) : 2; + + showUpdateStep("Setting default support-ticket priority"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('ticket', 'default_priority', '".(int)$update_deftic_priority."');"); + lastStepStatus(0); + + updateToVersion('0.9.6-svn4'); +} + ?> diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index e6af2bc9..df700639 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -62,4 +62,16 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) } $return .= 'Path/URL for error 404: 

'; } + + if(versionInUpdate($current_version, '0.9.6-svn4')) + { + $has_preconfig = true; + $return .= 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.

'; + $return .= 'Which should be the default ticket-priority?: '; + $return .= '

'; + } } diff --git a/lib/tables.inc.php b/lib/tables.inc.php index bb253bb1..60ef838b 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -68,7 +68,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.6-svn3'; +$version = '0.9.6-svn4'; $dbversion = '2'; $branding = ''; diff --git a/lng/english.lng.php b/lng/english.lng.php index 25580b31..7fc33e38 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1377,4 +1377,7 @@ $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'File/URL for error 4 $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'File/URL for error 500'; $lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +// ADDED IN FROXLOR 0.9.6-svn4 +$lng['serversettings']['ticket']['default_priority'] = 'Default support-ticket priority'; + ?> diff --git a/lng/german.lng.php b/lng/german.lng.php index c3e976ca..ec891882 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1373,4 +1373,7 @@ $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Datei/URL für F $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Datei/URL für Fehler 500'; $lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +// ADDED IN FROXLOR 0.9.6-svn4 +$lng['serversettings']['ticket']['default_priority'] = 'Voreingestellte Support-Ticket Priorität'; + ?>