From 9c17625c77c3424bf8bc66824a45e5aab00f71be Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 26 Nov 2021 18:11:34 +0100 Subject: [PATCH] ncm2 --- pandora_console/extras/mr/51.sql | 10 ++++++++++ .../pandoradb_migrate_6.0_to_7.0.mysql.sql | 19 ++++++++++++++++--- pandora_console/include/functions_html.php | 4 ++++ .../include/javascript/pandora_ui.js | 6 +++++- pandora_console/pandoradb.sql | 13 +++++++++++++ pandora_console/pandoradb_data.sql | 5 +++-- 6 files changed, 51 insertions(+), 6 deletions(-) diff --git a/pandora_console/extras/mr/51.sql b/pandora_console/extras/mr/51.sql index cf8e0968e1..cbef776a11 100644 --- a/pandora_console/extras/mr/51.sql +++ b/pandora_console/extras/mr/51.sql @@ -17,6 +17,16 @@ CREATE TABLE IF NOT EXISTS `tncm_snippet` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `tncm_firmware` ( + `id` SERIAL, + `name` text, + `shortname` text, + `vendor` bigint(20) unsigned, + `models` text, + `path` text, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `talert_calendar` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(100) NOT NULL default '', diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 64a29e66a4..378a47158f 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -4221,6 +4221,19 @@ CREATE TABLE IF NOT EXISTS `tncm_snippet` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +-- ---------------------------------------------------------------------- +-- Table `tncm_firmware` +-- ---------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tncm_firmware` ( + `id` SERIAL, + `name` varchar(255), + `shortname` varchar(255) unique, + `vendor` bigint(20) unsigned, + `models` text, + `path` text, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + INSERT INTO `tncm_vendor` VALUES (1,'Cisco'), (2, 'D-Link Systems, Inc.'), @@ -4246,9 +4259,9 @@ INSERT INTO `tncm_script` VALUES (2,1,'enable expect:Password:\s* _enablepass_ term length 0 capture:show running-config exit '), (3,2,'enable expect:Password:\s* _enablepass_ term length 0 config terminal _applyconfigbackup_ exit '), (4,3,'enable expect:Password:\s* _enablepass_ term length 0 capture:show version | i IOS Software exit '), - (5,5,'enable expect:Password:\s* _enablepass_ term length 0 config term end end exit '); - -INSERT INTO `tncm_template_scripts`(`id_template`, `id_script`) VALUES (1,1),(1,2),(1,3),(1,4),(1,5); + (5,5,'enable expect:Password:\s* _enablepass_ term length 0 config term end end exit '), + (6,4,'copy tftp flash expect:\]\? _TFTP_SERVER_IP_ expect:\]\? _SOURCE_FILE_NAME_ expect:\]\? _DESTINATION_FILE_NAME_ show flash reload expect:confirm y config terminal boot system _DESTINATION_FILE_NAME_'); +INSERT INTO `tncm_template_scripts`(`id_template`, `id_script`) VALUES (1,1),(1,2),(1,3),(1,4),(1,5),(1,6); -- ---------------------------------------------------------------------- -- Table `talert_calendar` diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 78b81d05b2..c836173c36 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -4046,6 +4046,10 @@ function html_print_input_file($name, $return=false, $options=false) if (isset($options['required'])) { $output .= ' required'; } + + if (isset($options['onchange'])) { + $output .= ' onchange="'.$options['onchange'].'"'; + } } $output .= ' />'; diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js index fcd2ee4ac9..32350bec92 100644 --- a/pandora_console/include/javascript/pandora_ui.js +++ b/pandora_console/include/javascript/pandora_ui.js @@ -568,7 +568,10 @@ function generalShowMsg(data, idMsg) { failed = failed || data.error; } - if (failed) text = data.error; + if (failed) { + title = "Error"; + text = data.error; + } if (idMsg == null) { idMsg = uniqId(); @@ -595,6 +598,7 @@ function generalShowMsg(data, idMsg) { class: "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next", text: "OK", + id: "general_message_ok", click: function(e) { if (!failed) { $(".ui-dialog-content").dialog("close"); diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 6f85ebf325..83a8b388a6 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -4170,3 +4170,16 @@ CREATE TABLE IF NOT EXISTS `tncm_snippet` ( `content` TEXT, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------------------------------------------------- +-- Table `tncm_firmware` +-- ---------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `tncm_firmware` ( + `id` SERIAL, + `name` text, + `shortname` text, + `vendor` bigint(20) unsigned, + `models` text, + `path` text, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 106fcad61f..1396336650 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -2774,8 +2774,9 @@ INSERT INTO `tncm_script` VALUES (2,1,'enable expect:Password:\s* _enablepass_ term length 0 capture:show running-config exit '), (3,2,'enable expect:Password:\s* _enablepass_ term length 0 config terminal _applyconfigbackup_ exit '), (4,3,'enable expect:Password:\s* _enablepass_ term length 0 capture:show version | i IOS Software exit '), - (5,5,'enable expect:Password:\s* _enablepass_ term length 0 config term end end exit '); + (5,5,'enable expect:Password:\s* _enablepass_ term length 0 config term end end exit '), + (6,4,'copy tftp flash expect:\]\? _TFTP_SERVER_IP_ expect:\]\? _SOURCE_FILE_NAME_ expect:\]\? _DESTINATION_FILE_NAME_ show flash reload expect:confirm y config terminal boot system _DESTINATION_FILE_NAME_'); -INSERT INTO `tncm_template_scripts`(`id_template`, `id_script`) VALUES (1,1),(1,2),(1,3),(1,4),(1,5); +INSERT INTO `tncm_template_scripts`(`id_template`, `id_script`) VALUES (1,1),(1,2),(1,3),(1,4),(1,5),(1,6); INSERT INTO `talert_calendar` VALUES (1, 'Default', 0, 'Default calendar');