tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-10908-Fallo-en-el-editor-de-tips' into 'develop'

Browse Source 
changes regarding encoding of tables

See merge request artica/pandorafms!5763
This commit is contained in:
Matias Didier 2023-05-03 11:01:06 +00:00
commit 5983333965
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/extras/mr/63.sql
View File

@ -1,5 +1,8 @@
START TRANSACTION; START TRANSACTION;
ALTER TABLE tpolicy_group_agents CONVERT TO CHARACTER SET UTF8MB4;
ALTER TABLE tevent_sound CONVERT TO CHARACTER SET UTF8MB4;
ALTER TABLE tsesion_filter CONVERT TO CHARACTER SET UTF8MB4;
CREATE TABLE IF NOT EXISTS `tsesion_filter` ( CREATE TABLE IF NOT EXISTS `tsesion_filter` (
`id_filter` INT NOT NULL AUTO_INCREMENT, `id_filter` INT NOT NULL AUTO_INCREMENT,
`id_name` TEXT NULL, `id_name` TEXT NULL,

4
pandora_console/include/class/TipsWindow.class.php
View File

@ -570,7 +570,7 @@ class TipsWindow
$sql = sprintf( $sql = sprintf(
'SELECT id, name AS language, title, text, url, enable 'SELECT id, name AS language, title, text, url, enable
FROM twelcome_tip t FROM twelcome_tip t
LEFT JOIN tlanguage l ON t.id_lang = l.id_language COLLATE utf8mb4_unicode_ci LEFT JOIN tlanguage l ON t.id_lang COLLATE utf8mb4_unicode_ci = CONVERT(l.id_language USING utf8mb4) COLLATE utf8mb4_unicode_ci
%s %s %s', %s %s %s',
$filter, $filter,
$order, $order,
@ -582,7 +582,7 @@ class TipsWindow
$sqlCount = sprintf( $sqlCount = sprintf(
'SELECT count(*) 'SELECT count(*)
FROM twelcome_tip t FROM twelcome_tip t
LEFT JOIN tlanguage l ON t.id_lang = l.id_language COLLATE utf8mb4_unicode_ci LEFT JOIN tlanguage l ON t.id_lang COLLATE utf8mb4_unicode_ci = CONVERT(l.id_language USING utf8mb4) COLLATE utf8mb4_unicode_ci
%s', %s',
$filter $filter
); );

6
pandora_console/pandoradb.sql
View File

@ -2610,7 +2610,7 @@ CREATE TABLE IF NOT EXISTS `tpolicy_group_agents` (
ON DELETE CASCADE ON UPDATE CASCADE, ON DELETE CASCADE ON UPDATE CASCADE,
FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`)
ON DELETE CASCADE ON UPDATE CASCADE ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
-- Table `tdashboard` -- Table `tdashboard`
@ -4237,7 +4237,7 @@ CREATE TABLE `tevent_sound` (
`name` TEXT NULL, `name` TEXT NULL,
`sound` TEXT NULL, `sound` TEXT NULL,
`active` TINYINT NOT NULL DEFAULT '1', `active` TINYINT NOT NULL DEFAULT '1',
PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8; PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
-- Table `tsesion_filter` -- Table `tsesion_filter`
@ -4251,7 +4251,7 @@ CREATE TABLE IF NOT EXISTS `tsesion_filter` (
`type` TEXT NULL, `type` TEXT NULL,
`user` TEXT NULL, `user` TEXT NULL,
PRIMARY KEY (`id_filter`) PRIMARY KEY (`id_filter`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
CREATE TABLE IF NOT EXISTS `twelcome_tip` ( CREATE TABLE IF NOT EXISTS `twelcome_tip` (