diff --git a/pandora_console/extras/mr/54.sql b/pandora_console/extras/mr/54.sql new file mode 100644 index 0000000000..93975eab57 --- /dev/null +++ b/pandora_console/extras/mr/54.sql @@ -0,0 +1,5 @@ +START TRANSACTION; + +INSERT INTO `tconfig` (`token`, `value`) VALUES ('lts_name', 'Akira'); + +COMMIT; \ No newline at end of file diff --git a/pandora_console/extras/mr/55.sql b/pandora_console/extras/mr/55.sql deleted file mode 100644 index d9693047c1..0000000000 --- a/pandora_console/extras/mr/55.sql +++ /dev/null @@ -1,5 +0,0 @@ -START TRANSACTION; - -ALTER TABLE `tdashboard` MODIFY `name` TEXT NOT NULL DEFAULT ''; - -COMMIT; \ No newline at end of file diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php index 888a71d5be..2236c38294 100644 --- a/pandora_console/general/footer.php +++ b/pandora_console/general/footer.php @@ -31,6 +31,10 @@ if (!$config['MR']) { $config['MR'] = 0; } +if (isset($config['lts_name']) === false) { + $config['lts_name'] = ''; +} + echo ''; require_once $config['homedir'].'/include/functions_update_manager.php'; @@ -46,7 +50,7 @@ if ($current_package === null) { echo __( '%s %s - %s - MR %s', get_product_name(), - $pandora_version, + $pandora_version.' '.$config['lts_name'], $build_package_version, $config['MR'] ).'
'.__('Page generated on %s', date('Y-m-d H:i:s')).'
'; diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 49f5edb991..29ec6e572b 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -2578,7 +2578,7 @@ CREATE TABLE IF NOT EXISTS `tpolicy_group_agents` ( -- --------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tdashboard` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `name` TEXT NOT NULL DEFAULT '', + `name` VARCHAR(60) NOT NULL DEFAULT '', `id_user` VARCHAR(60) NOT NULL DEFAULT '', `id_group` INT NOT NULL DEFAULT 0, `active` TINYINT NOT NULL DEFAULT 0, diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 865d06cfba..a9961bcc00 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -109,10 +109,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_report_front_logo', 'images/pandora_logo_white.jpg'), ('custom_report_front_header', ''), ('custom_report_front_footer', ''), -('MR', 53), +('MR', 54), ('identification_reminder', 1), ('identification_reminder_timestamp', 0), -('current_package', 761), +('current_package', 762), ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.00097656250000":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'), ('custom_docs_logo', 'default_docs.png'), ('custom_support_logo', 'default_support.png'), @@ -142,7 +142,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('sample_agent', '0'), ('gotty', '/usr/bin/gotty'), ('custom_module_units', '{"bytes":"bytes","entries":"entries","files":"files","hits":"hits","sessions":"sessions","users":"users","ºC":"ºC","ºF":"ºF"}'), -('server_unique_identifier', replace(uuid(),'-','')); +('server_unique_identifier', replace(uuid(),'-','')), +('lts_name', 'Akira'); UNLOCK TABLES; --