From 9667426b1ab4c9def603a0c58b3e41e1e8841594 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 25 Oct 2012 14:39:04 +0000 Subject: [PATCH] 2012-10-25 Miguel de Dios * pandoradb_data.sql: fixed the lost fields in the table "tgrupo" when install. * install.php: fixed the installation on DBs with names as for example "name1.name2". Fixes: #3573766 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7092 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/install.php | 169 ++++++++++++++--------------- pandora_console/pandoradb_data.sql | 2 +- 2 files changed, 84 insertions(+), 87 deletions(-) diff --git a/pandora_console/install.php b/pandora_console/install.php index 02b404dd87..2686a8f91a 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2012 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -31,46 +31,71 @@ -
- +
+ +
+ + "; echo " $label "; @@ -184,11 +209,11 @@ function parse_mysql_dump($url) { $file_content = file($url); $query = ""; foreach($file_content as $sql_line) { - if(trim($sql_line) != "" && strpos($sql_line, "--") === false) { + if (trim($sql_line) != "" && strpos($sql_line, "--") === false) { $query .= $sql_line; if(preg_match("/;[\040]*\$/", $sql_line)) { if (!$result = mysql_query($query)) { - echo mysql_error(); //Uncomment for debug + echo mysql_error(); //Uncomment for debug echo "
$query
"; return 0; } @@ -208,7 +233,7 @@ function parse_postgresql_dump($connection, $url, $debug = false) { $query = ""; - foreach($file_content as $sql_line) { + foreach ($file_content as $sql_line) { $clean_line = trim($sql_line); $comment = preg_match("/^(\s|\t)*--.*$/", $clean_line); if ($comment) { @@ -258,7 +283,7 @@ function parse_oracle_dump($connection, $url, $debug = false) { $query = ""; $plsql_block = false; - foreach($file_content as $sql_line) { + foreach ($file_content as $sql_line) { $clean_line = trim($sql_line); $comment = preg_match("/^(\s|\t)*--.*$/", $clean_line); if ($comment) { @@ -273,10 +298,10 @@ function parse_oracle_dump($connection, $url, $debug = false) { if (preg_match("/^BEGIN$/", $clean_line)) { $query .= $clean_line . ' '; $plsql_block = true; - } + } else{ $query .= $clean_line; - } + } //Check query's end with a back slash and any returns in the end of line or if it's a PL/SQL block 'END;;' string if ((preg_match("/;[\040]*\$/", $clean_line) && !$plsql_block) || @@ -287,7 +312,7 @@ function parse_oracle_dump($connection, $url, $debug = false) { //Delete the last semicolon from current query $query = substr($query, 0, strlen($query) - 1); $sql = oci_parse($connection, $query); - $result = oci_execute($sql); + $result = oci_execute($sql); if ($debug) { var_dump($query); @@ -361,7 +386,6 @@ function print_logo_status ($step, $step_total) {
"; } - function install_step1() { global $banner; @@ -385,12 +409,12 @@ function install_step1() { if (file_exists("include/config.php")) $writable += check_writable ( "include/config.php", "Checking if include/config.php is writable"); echo ""; - + echo "
Warning: This installer will overwrite and destroy your existing Pandora FMS configuration and Database. Before continue, please be sure that you have no valuable Pandora FMS data in your Database.
"; - + echo "
Upgrade: If you want to upgrade from Pandora FMS 4.x to 5.0 version, please use the migration tool inside /extras directory in this setup.
"; @@ -426,7 +450,7 @@ function install_step1_licence() {

For more information, please refer to our website at http://pandorafms.org and contact us if you have any kind of question about the usage of Pandora FMS

If you dont accept the licence terms, please, close your browser and delete Pandora FMS files.

"; - + if (!file_exists("COPYING")) { echo "
Licence file 'COPYING' is not present in your distribution. This means you have some 'partial' Pandora FMS distribution. We cannot continue without accepting the licence file."; echo "
"; @@ -453,7 +477,7 @@ function install_step1_licence() { } function install_step2() { - + echo "
@@ -489,7 +513,7 @@ function install_step2() { echo ""; echo "
"; print_logo_status (3,6); - + echo "
"; if ($res > 0) { echo " @@ -531,7 +555,7 @@ function install_step3() { if (empty($options)) { $error = true; } - + echo "
@@ -545,7 +569,7 @@ function install_step3() { You need a privileged user to create database schema, this is usually root user. Information about root user will not be used or stored anymore.

-

+

You can also deploy the scheme into an existing Database. In this case you need a privileged Database user and password of that instance.

@@ -558,7 +582,7 @@ function install_step3() { please be sure that you have no valuable Pandora FMS data in your Database.

"; - + if (extension_loaded("oci8")) { echo "
For Oracle installation an existing Database with a privileged user is needed.
"; } @@ -693,12 +717,12 @@ function install_step4() { // Drop database if needed and don't want to install over an existing DB if ($dbdrop == 1) { - mysql_query ("DROP DATABASE IF EXISTS $dbname"); + mysql_query ("DROP DATABASE IF EXISTS `$dbname`"); } // Create schema if ($dbaction == 'db_new' || $dbdrop == 1) { - $step1 = mysql_query ("CREATE DATABASE $dbname"); + $step1 = mysql_query ("CREATE DATABASE `$dbname`"); check_generic ($step1, "Creating database '$dbname'"); } else { @@ -718,14 +742,14 @@ function install_step4() { $host = 'localhost'; if ($dbhost != 'localhost') $host = $_SERVER['SERVER_ADDR']; - $step5 = mysql_query ("GRANT ALL PRIVILEGES ON $dbname.* to pandora@$host - IDENTIFIED BY '".$random_password."'"); + $step5 = mysql_query ("GRANT ALL PRIVILEGES ON `$dbname`.* to pandora@$host + IDENTIFIED BY '".$random_password."'"); mysql_query ("FLUSH PRIVILEGES"); check_generic ($step5, "Established privileges for user pandora. A new random password has been generated: $random_password
Please write it down, you will need to setup your Pandora FMS server, editing the /etc/pandora/pandora_server.conf file
"); $step6 = is_writable("include"); check_generic ($step6, "Write permissions to save config file in './include'"); - + $cfgin = fopen ("include/config.inc.php","r"); $cfgout = fopen ($pandora_config,"w"); $config_contents = fread ($cfgin, filesize("include/config.inc.php")); @@ -777,14 +801,14 @@ function install_step4() { check_generic(0, "Connection with Database"); } else { - check_generic(1, "Connection with Database"); + check_generic(1, "Connection with Database"); // Drop all objects if needed if ($dbdrop == 1) { oracle_drop_all_objects($connection); } - $step1 = parse_oracle_dump($connection, "pandoradb.oracle.sql"); + $step1 = parse_oracle_dump($connection, "pandoradb.oracle.sql"); check_generic($step1, "Creating schema"); @@ -1120,31 +1144,4 @@ function install_step5() {
"; } - - -// --------------- -// Main page code -// --------------- - -if (! isset($_GET["step"])) { - install_step1(); -} -else { - $step = $_GET["step"]; - switch ($step) { - case 11: install_step1_licence(); - break; - case 2: install_step2(); - break; - case 3: install_step3(); - break; - case 4: install_step4(); - break; - case 5: install_step5(); - break; - } -} - -?> - - \ No newline at end of file +?> \ No newline at end of file diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 0e055dd695..bbee05ceee 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -132,7 +132,7 @@ UNLOCK TABLES; -- LOCK TABLES `tgrupo` WRITE; -INSERT INTO `tgrupo` VALUES +INSERT INTO `tgrupo` (`id_grupo`, `nombre`, `icon`, `parent`, `propagate`, `disabled`, `custom_id`, `id_skin`, `other`) VALUES (2,'Servers','server_database',0,0,0,'',1,''), (4,'Firewalls','firewall',0,0,0,'',1,''), (8,'Databases','database_gear',0,0,0,'',1,''),