tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-08-25 Miguel de Dios <miguel.dedios@artica.es> 

* extensions/update_manager.php: check if the field "update_server_path" in
	the table is the last path for Pandora v4 and update.
	
	* extensions/update_manager/main.php: rewrite the text to message for show
	only Pandora FMS instead the Pandora FMS vX.
	
	*extensions/update_manager/sql/update_manager.sql,
	extensions/update_manager/sql/update_manager.postgreSQL.sql,
	extensions/update_manager/sql/update_manager.oracle.sql: update the
	"update_server_path" to Pandora v4.

	Fixes: #3394754



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4827 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-08-25 18:52:35 +00:00
parent 901c843cb7
commit 559d24908d
6 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/ChangeLog
View File

@ -1,6 +1,21 @@
2011-08-25 Miguel de Dios <miguel.dedios@artica.es> 2011-08-25 Miguel de Dios <miguel.dedios@artica.es>
* ggodmode/modules/manage_network_templates.php, * extensions/update_manager.php: check if the field "update_server_path" in
the table is the last path for Pandora v4 and update.
* extensions/update_manager/main.php: rewrite the text to message for show
only Pandora FMS instead the Pandora FMS vX.
*extensions/update_manager/sql/update_manager.sql,
extensions/update_manager/sql/update_manager.postgreSQL.sql,
extensions/update_manager/sql/update_manager.oracle.sql: update the
"update_server_path" to Pandora v4.
Fixes: #3394754
2011-08-25 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_templates.php,
godmode/modules/manage_network_components.php, godmode/modules/manage_network_components.php,
godmode/modules/manage_nc_groups.php: added checkboxes in the elements in godmode/modules/manage_nc_groups.php: added checkboxes in the elements in
the list and main checkbox to select all checkboxes, for to multiple delete. the list and main checkbox to select all checkboxes, for to multiple delete.

15
pandora_console/extensions/update_manager.php
View File

@ -33,9 +33,22 @@ function update_settings_database_connection () {
function pandora_update_manager_install () { function pandora_update_manager_install () {
global $config; global $config;
if (isset ($config['update_manager_installed'])) if (isset ($config['update_manager_installed'])) {
$update_server_path = db_get_value('value', 'tupdate_settings', '`key`', 'update_server_path');
if ($update_server_path != '/pandoraupdate4/server.php') {
$result = db_process_sql_update('tupdate_settings',
array('value' => '/pandoraupdate4/server.php'),
array('key' => 'update_server_path'));
if ($result === false) {
db_pandora_audit("ERROR update extension", "Error in the update the extension 'update manager' when update the 'update_server_path' field.");
}
}
/* Already installed */ /* Already installed */
return; return;
}
load_update_manager_lib (); load_update_manager_lib ();

4
pandora_console/extensions/update_manager/main.php
View File

@ -29,9 +29,9 @@ if ($settings->customer_key == FREE_USER) {
echo '<div class="notify" style="width: 80%; text-align:left;" >'; echo '<div class="notify" style="width: 80%; text-align:left;" >';
echo html_print_image("images/information.png", true) . '&nbsp;'; echo html_print_image("images/information.png", true) . '&nbsp;';
/* Translators: Do not translade Update Manager, it's the name of the program */ /* Translators: Do not translade Update Manager, it's the name of the program */
echo __('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS 3.0. It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.'); echo __('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.');
echo '<p />'; echo '<p />';
echo __('Update Manager is one of the most advanced features of Pandora FMS 3.0 Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.'); echo __('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.');
echo '<p />'; echo '<p />';
echo __('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, just delete extension or remove remote server address from Update Manager plugin setup.'); echo __('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, just delete extension or remove remote server address from Update Manager plugin setup.');
echo '</div>'; echo '</div>';

2
pandora_console/extensions/update_manager/sql/update_manager.oracle.sql
View File

@ -4,7 +4,7 @@ CREATE TABLE tupdate_settings ( key VARCHAR2(255) default '' PRIMARY KEY, value
/INSERT INTO tupdate_settings VALUES ('keygen_path', '/usr/share/pandora/util/keygen') /INSERT INTO tupdate_settings VALUES ('keygen_path', '/usr/share/pandora/util/keygen')
/INSERT INTO tupdate_settings VALUES ('update_server_host', 'www.artica.es') /INSERT INTO tupdate_settings VALUES ('update_server_host', 'www.artica.es')
/INSERT INTO tupdate_settings VALUES ('update_server_port', '80') /INSERT INTO tupdate_settings VALUES ('update_server_port', '80')
/INSERT INTO tupdate_settings VALUES ('update_server_path', '/pandoraupdate321/server.php') /INSERT INTO tupdate_settings VALUES ('update_server_path', '/pandoraupdate4/server.php')
/INSERT INTO tupdate_settings VALUES ('updating_binary_path', 'Path where the updated binary files will be stored') /INSERT INTO tupdate_settings VALUES ('updating_binary_path', 'Path where the updated binary files will be stored')
/INSERT INTO tupdate_settings VALUES ('updating_code_path', 'Path where the updated code is stored') /INSERT INTO tupdate_settings VALUES ('updating_code_path', 'Path where the updated code is stored')
/INSERT INTO tupdate_settings VALUES ('dbname', '') /INSERT INTO tupdate_settings VALUES ('dbname', '')

2
pandora_console/extensions/update_manager/sql/update_manager.postgreSQL.sql
View File

@ -1,5 +1,5 @@
CREATE TABLE "tupdate_settings" ( "key" varchar(255) default '' PRIMARY KEY, "value" varchar(255) default ''); CREATE TABLE "tupdate_settings" ( "key" varchar(255) default '' PRIMARY KEY, "value" varchar(255) default '');
INSERT INTO "tupdate_settings" VALUES ('current_update', '0'), ('customer_key', 'PANDORA-FREE'), ('keygen_path', '/usr/share/pandora/util/keygen'), ('update_server_host', 'www.artica.es'), ('update_server_port', '80'), ('update_server_path', '/pandoraupdate321/server.php'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', ''); INSERT INTO "tupdate_settings" VALUES ('current_update', '0'), ('customer_key', 'PANDORA-FREE'), ('keygen_path', '/usr/share/pandora/util/keygen'), ('update_server_host', 'www.artica.es'), ('update_server_port', '80'), ('update_server_path', '/pandoraupdate4/server.php'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', '');
CREATE TABLE "tupdate_package"( "id" SERIAL NOT NULL PRIMARY KEY, "timestamp" TIMESTAMP without time zone default NULL, "description" varchar(255) default ''); CREATE TABLE "tupdate_package"( "id" SERIAL NOT NULL PRIMARY KEY, "timestamp" TIMESTAMP without time zone default NULL, "description" varchar(255) default '');
CREATE TYPE type_tupdate_type AS ENUM ('code', 'db_data', 'db_schema', 'binary'); CREATE TYPE type_tupdate_type AS ENUM ('code', 'db_data', 'db_schema', 'binary');
CREATE TABLE "tupdate" ( "id" SERIAL NOT NULL PRIMARY KEY, "type" type_tupdate_type, "id_update_package" INTEGER default 0 REFERENCES "tupdate_package"("id") ON UPDATE CASCADE ON DELETE CASCADE, "filename" varchar(250) default '', "checksum" varchar(250) default '', "previous_checksum" varchar(250) default '', "svn_version" INTEGER default 0, "data" TEXT default '', "data_rollback" TEXT default '', "description" TEXT default '', "db_table_name" varchar(140) default '', "db_field_name" varchar(140) default '', "db_field_value" varchar(1024) default ''); CREATE TABLE "tupdate" ( "id" SERIAL NOT NULL PRIMARY KEY, "type" type_tupdate_type, "id_update_package" INTEGER default 0 REFERENCES "tupdate_package"("id") ON UPDATE CASCADE ON DELETE CASCADE, "filename" varchar(250) default '', "checksum" varchar(250) default '', "previous_checksum" varchar(250) default '', "svn_version" INTEGER default 0, "data" TEXT default '', "data_rollback" TEXT default '', "description" TEXT default '', "db_table_name" varchar(140) default '', "db_field_name" varchar(140) default '', "db_field_value" varchar(1024) default '');

2
pandora_console/extensions/update_manager/sql/update_manager.sql
View File

@ -1,5 +1,5 @@
CREATE TABLE `tupdate_settings` ( `key` varchar(255) default '', `value` varchar(255) default '', PRIMARY KEY (`key`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tupdate_settings` ( `key` varchar(255) default '', `value` varchar(255) default '', PRIMARY KEY (`key`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO `tupdate_settings` VALUES ('current_update', '0'), ('customer_key', 'PANDORA-FREE'), ('keygen_path', '/usr/share/pandora/util/keygen'), ('update_server_host', 'www.artica.es'), ('update_server_port', '80'), ('update_server_path', '/pandoraupdate321/server.php'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', ''); INSERT INTO `tupdate_settings` VALUES ('current_update', '0'), ('customer_key', 'PANDORA-FREE'), ('keygen_path', '/usr/share/pandora/util/keygen'), ('update_server_host', 'www.artica.es'), ('update_server_port', '80'), ('update_server_path', '/pandoraupdate4/server.php'), ('updating_binary_path', 'Path where the updated binary files will be stored'), ('updating_code_path', 'Path where the updated code is stored'), ('dbname', ''), ('dbhost', ''), ('dbpass', ''), ('dbuser', ''), ('proxy', ''), ('proxy_port', ''), ('proxy_user', ''), ('proxy_pass', '');
CREATE TABLE `tupdate_package` ( id int(11) unsigned NOT NULL auto_increment, timestamp datetime NOT NULL, description varchar(255) default '', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tupdate_package` ( id int(11) unsigned NOT NULL auto_increment, timestamp datetime NOT NULL, description varchar(255) default '', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `tupdate` ( id int(11) unsigned NOT NULL auto_increment, type enum('code', 'db_data', 'db_schema', 'binary'), id_update_package int(11) unsigned NOT NULL default 0, filename varchar(250) default '', checksum varchar(250) default '', previous_checksum varchar(250) default '', svn_version int(4) unsigned NOT NULL default 0, data LONGTEXT default '', data_rollback LONGTEXT default '', description TEXT default '', db_table_name varchar(140) default '', db_field_name varchar(140) default '', db_field_value varchar(1024) default '', PRIMARY KEY (`id`), FOREIGN KEY (`id_update_package`) REFERENCES tupdate_package(`id`) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tupdate` ( id int(11) unsigned NOT NULL auto_increment, type enum('code', 'db_data', 'db_schema', 'binary'), id_update_package int(11) unsigned NOT NULL default 0, filename varchar(250) default '', checksum varchar(250) default '', previous_checksum varchar(250) default '', svn_version int(4) unsigned NOT NULL default 0, data LONGTEXT default '', data_rollback LONGTEXT default '', description TEXT default '', db_table_name varchar(140) default '', db_field_name varchar(140) default '', db_field_value varchar(1024) default '', PRIMARY KEY (`id`), FOREIGN KEY (`id_update_package`) REFERENCES tupdate_package(`id`) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `tupdate_journal` ( id int(11) unsigned NOT NULL auto_increment, id_update int(11) unsigned NOT NULL default 0, PRIMARY KEY (`id`), FOREIGN KEY (`id_update`) REFERENCES tupdate(`id`) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `tupdate_journal` ( id int(11) unsigned NOT NULL auto_increment, id_update int(11) unsigned NOT NULL default 0, PRIMARY KEY (`id`), FOREIGN KEY (`id_update`) REFERENCES tupdate(`id`) ON UPDATE CASCADE ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8;