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

config: Split out name configuration option

* Rename config var enable_html_thread to enable_richtext
* Copy config var name_format to agent_name_format and client_name_format
  and delete it
parent 8417f568
No related branches found
No related tags found
No related merge requests found
...@@ -154,7 +154,7 @@ class OsticketConfig extends Config { ...@@ -154,7 +154,7 @@ class OsticketConfig extends Config {
var $defaults = array( var $defaults = array(
'allow_pw_reset' => true, 'allow_pw_reset' => true,
'pw_reset_window' => 30, 'pw_reset_window' => 30,
'enable_html_thread' => true, 'enable_richtext' => true,
'allow_attachments' => true, 'allow_attachments' => true,
'name_format' => 'full', # First Last 'name_format' => 'full', # First Last
'auto_claim_tickets'=> true, 'auto_claim_tickets'=> true,
...@@ -361,7 +361,7 @@ class OsticketConfig extends Config { ...@@ -361,7 +361,7 @@ class OsticketConfig extends Config {
} }
function isHtmlThreadEnabled() { function isHtmlThreadEnabled() {
return $this->get('enable_html_thread'); return $this->get('enable_richtext');
} }
function getClientTimeout() { function getClientTimeout() {
...@@ -1132,7 +1132,7 @@ class OsticketConfig extends Config { ...@@ -1132,7 +1132,7 @@ class OsticketConfig extends Config {
'show_answered_tickets'=>isset($vars['show_answered_tickets'])?0:1, 'show_answered_tickets'=>isset($vars['show_answered_tickets'])?0:1,
'show_related_tickets'=>isset($vars['show_related_tickets'])?1:0, 'show_related_tickets'=>isset($vars['show_related_tickets'])?1:0,
'hide_staff_name'=>isset($vars['hide_staff_name'])?1:0, 'hide_staff_name'=>isset($vars['hide_staff_name'])?1:0,
'enable_html_thread'=>isset($vars['enable_html_thread'])?1:0, 'enable_richtext'=>isset($vars['enable_html_thread'])?1:0,
'allow_client_updates'=>isset($vars['allow_client_updates'])?1:0, 'allow_client_updates'=>isset($vars['allow_client_updates'])?1:0,
'max_file_size'=>$vars['max_file_size'], 'max_file_size'=>$vars['max_file_size'],
)); ));
......
...@@ -62,6 +62,9 @@ WHERE `key`='transient' AND `namespace` LIKE 'sla.%'; ...@@ -62,6 +62,9 @@ WHERE `key`='transient' AND `namespace` LIKE 'sla.%';
DELETE FROM `%TABLE_PREFIX%config` DELETE FROM `%TABLE_PREFIX%config`
WHERE `key`='configuration' AND `namespace` LIKE 'list.%'; WHERE `key`='configuration' AND `namespace` LIKE 'list.%';
DELETE FROM `%TABLE_PREFIX%config`
WHERE `key`='name_format' AND `namespace` = 'core';
-- Orphan users who don't know they're orphans -- Orphan users who don't know they're orphans
UPDATE `%TABLE_PREFIX%user` A1 UPDATE `%TABLE_PREFIX%user` A1
LEFT JOIN `%TABLE_PREFIX%organization` A2 ON (A1.`org_id` = A2.`id`) LEFT JOIN `%TABLE_PREFIX%organization` A2 ON (A1.`org_id` = A2.`id`)
......
...@@ -91,6 +91,18 @@ UPDATE `%TABLE_PREFIX%list` A1 ...@@ -91,6 +91,18 @@ UPDATE `%TABLE_PREFIX%list` A1
-- Rebuild %ticket__cdata as UTF8 -- Rebuild %ticket__cdata as UTF8
DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket__cdata`; DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket__cdata`;
-- Move `enable_html_thread` to `enable_richtext`
UPDATE `%TABLE_PREFIX%config`
SET `key` = 'enable_richtext'
WHERE `namespace` = 'core' AND `key` = 'enable_html_thread';
SET @name_format = (SELECT `value` FROM `%TABLE_PREFIX%config` A1
WHERE A1.`namespace` = 'core' AND A1.`key` = 'name_format');
INSERT INTO `%TABLE_PREFIX%config`
(`namespace`, `key`, `value`) VALUES
('core', 'agent_name_format', @name_format),
('core', 'client_name_format', @name_format);
-- Finished with patch -- Finished with patch
UPDATE `%TABLE_PREFIX%config` UPDATE `%TABLE_PREFIX%config`
SET `value` = '00000000000000000000000000000000' SET `value` = '00000000000000000000000000000000'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment