-
-
- Warning
- 
-
-
-
- Attention, you are going to overwrite the data of your current installation.
- This means that if you do not have a backup you will irremissibly LOSE ALL THE STORED DATA, the configuration and everything relevant to your installation.
Are you sure of what you are going to do?
"; - echo "";
- echo "";
- echo "";
- echo "
";
- ?>
-
-
-
-
+ function ChangeDBDrop(causer) {
+ if (causer.value != 'db_exist') {
+ window.document.step2_form.drop.checked = 0;
+ window.document.step2_form.drop.disabled = 1;
+ }
+ else {
+ window.document.step2_form.drop.disabled = 0;
+ }
+ }
+ function ChangeDBAction(causer) {
+ var i = 0;
+ if (causer.value == 'oracle') {
+ window.document.step2_form.db_action.length = 1;
+ }
+ else {
+ window.document.step2_form.db_action.length = 2;
+ }
+ while (i < window.document.step2_form.db_action.length) {
+ window.document.step2_form.db_action.options[i].value = options_values[i];
+ window.document.step2_form.db_action.options[i].text = options_text[i];
+ i++;
+ }
+ window.document.step2_form.db_action.options[window.document.step2_form.db_action.length-1].selected=1;
+ ChangeDBDrop(window.document.step2_form.db_action);
+ }
+ function CheckDBhost(value){
+ if (( value != "localhost") && ( value != "127.0.0.1")) {
+ document.getElementById('tr_dbgrant').style["display"] = "block";
+ }
+ else {
+ document.getElementById('tr_dbgrant').style["display"] = "none";
+ }
+ }
+ function popupShow(){
+ document.getElementsByTagName('body')[0].style["margin"] = "0";
+ document.getElementById('install_container').style["padding-top"] = "45px";
+ document.getElementById('install_container').style["margin-top"] = "0";
+ document.getElementById('add-lightbox').style["visibility"] = "visible";
+ document.getElementById('open_popup').style["display"] = "block";
+ document.getElementById('open_popup').style["visibility"] = "visible";
+ }
+ function popupClose(){
+ document.getElementById('add-lightbox').style["visibility"] = "hidden";
+ document.getElementById('open_popup').style["display"] = "none";
+ document.getElementById('open_popup').style["visibility"] = "hidden";
+ }
+ function handleConfirmClick (event) {
+ userHasConfirmed = true;
+ var step3_form = document.getElementsByName('step2_form')[0];
+ step3_form.submit();
+ }
+ function handleStep3FormSubmit (event) {
+ var dbOverride = document.getElementById("drop").checked;
+ if (dbOverride && !userHasConfirmed) {
+ event.preventDefault();
+ popupShow();
+ return false;
+ }
+ }
+
+
+
+
+
+
+ Warning
+
+
+
+
+ Attention, you are going to overwrite the data of your current installation.
+ This means that if you do not have a backup you will irremissibly LOSE ALL THE STORED DATA, the configuration and everything relevant to your installation.
Are you sure of what you are going to do?
'; + echo "";
+ echo "";
+ echo "";
+ echo '
';
+ ?>
+
+
+
+
";
- return 1;
- }
- else {
- echo "
";
- return 0;
- }
- echo "";
+ return 1;
+ } else {
+ echo "";
+ return 0;
+ }
+
+ echo '";
- return 1;
- }
- else {
- echo "";
- return 0;
- }
- echo "";
+ return 1;
+ } else {
+ echo "";
+ return 0;
+ }
+
+ echo '";
- return 1;
- }
- else {
- echo " ";
- return 0;
- }
- echo "";
+ return 1;
+ } else {
+ echo " ";
+ return 0;
+ }
+
+ echo '";
- echo "";
- echo "";
+ echo '";
+ echo '";
- echo "";
- echo "";
- echo "";
+ echo '";
+ echo '";
+ echo '";
- return 0;
- }
- else {
- echo " ";
- return 1;
- }
- }
- elseif ($var == $value) {
- echo " ";
- return 0;
- }
- else {
- echo " ";
- return 1;
- }
- echo "";
+ return 0;
+ } else {
+ echo " ";
+ return 1;
+ }
+ } else if ($var == $value) {
+ echo " ";
+ return 0;
+ } else {
+ echo " ";
+ return 1;
+ }
+
+ echo '$query
"; - return 0; - } - $query = ""; - } - } - } - return 1; - } - else - return 0; + +function parse_mysql_dump($url) +{ + if (file_exists($url)) { + $file_content = file($url); + $query = ''; + foreach ($file_content as $sql_line) { + 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 "
$query
"; + return 0; + } + + $query = ''; + } + } + } + + return 1; + } else { + return 0; + } } -function parse_mysqli_dump($connection, $url) { - if (file_exists($url)) { - $file_content = file($url); - $query = ""; - foreach($file_content as $sql_line) { - if (trim($sql_line) != "" && strpos($sql_line, "-- ") === false) { - $query .= $sql_line; - if(preg_match("/;[\040]*\$/", $sql_line)) { - if (!$result = mysqli_query($connection, $query)) { - echo mysqli_error(); //Uncomment for debug - echo "
$query
"; - return 0; - } - $query = ""; - } - } - } - return 1; - } - else - return 0; + +function parse_mysqli_dump($connection, $url) +{ + if (file_exists($url)) { + $file_content = file($url); + $query = ''; + foreach ($file_content as $sql_line) { + if (trim($sql_line) != '' && strpos($sql_line, '-- ') === false) { + $query .= $sql_line; + if (preg_match("/;[\040]*\$/", $sql_line)) { + if (!$result = mysqli_query($connection, $query)) { + echo mysqli_error(); + // Uncomment for debug + echo "
$query
"; + return 0; + } + + $query = ''; + } + } + } + + return 1; + } else { + return 0; + } } -function random_name ($size) { - $temp = ""; - for ($a=0;$a< $size;$a++) - $temp = $temp. chr(rand(122,97)); - - return $temp; + +function random_name($size) +{ + $temp = ''; + for ($a = 0; $a < $size; $a++) { + $temp = $temp.chr(rand(122, 97)); + } + + return $temp; } -function print_logo_status ($step, $step_total) { - global $banner; - - $header = " + +function print_logo_status($step, $step_total) +{ + global $banner; + + $header = "
$banner
Install step $step of $step_total
";
- return $header;
+ return $header;
}
+
//
// This function adjusts path settings in pandora db for FreeBSD.
//
// All packages and configuration files except operating system's base files
// are installed under /usr/local in FreeBSD. So, path settings in pandora db
-// for some programs should be changed from the Linux default.
+// for some programs should be changed from the Linux default.
//
-function adjust_paths_for_freebsd($engine, $connection = false) {
+function adjust_paths_for_freebsd($engine, $connection=false)
+{
+ $adjust_sql = [
+ "update trecon_script set script = REPLACE(script,'/usr/share','/usr/local/share');",
+ "update tconfig set value = REPLACE(value,'/usr/bin','/usr/local/bin') where token='netflow_daemon' OR token='netflow_nfdump' OR token='netflow_nfexpire';",
+ "update talert_commands set command = REPLACE(command,'/usr/bin','/usr/local/bin');",
+ "update talert_commands set command = REPLACE(command,'/usr/share', '/usr/local/share');",
+ "update tplugin set execute = REPLACE(execute,'/usr/share','/usr/local/share');",
+ "update tevent_response set target = REPLACE(target,'/usr/share','/usr/local/share');",
+ "insert into tconfig (token, value) VALUES ('graphviz_bin_dir', '/usr/local/bin');",
+ ];
- $adjust_sql = array(
- "update trecon_script set script = REPLACE(script,'/usr/share','/usr/local/share');",
- "update tconfig set value = REPLACE(value,'/usr/bin','/usr/local/bin') where token='netflow_daemon' OR token='netflow_nfdump' OR token='netflow_nfexpire';",
- "update talert_commands set command = REPLACE(command,'/usr/bin','/usr/local/bin');",
- "update talert_commands set command = REPLACE(command,'/usr/share', '/usr/local/share');",
- "update tplugin set execute = REPLACE(execute,'/usr/share','/usr/local/share');",
- "update tevent_response set target = REPLACE(target,'/usr/share','/usr/local/share');",
- "insert into tconfig (token, value) VALUES ('graphviz_bin_dir', '/usr/local/bin');"
- );
+ for ($i = 0; $i < count($adjust_sql); $i++) {
+ switch ($engine) {
+ case 'mysql':
+ $result = mysql_query($adjust_sql[$i]);
+ break;
- for ($i = 0; $i < count ($adjust_sql); $i++) {
- switch ($engine) {
- case 'mysql':
- $result = mysql_query($adjust_sql[$i]);
- break;
- case 'mysqli':
- $result = mysqli_query($connection, $adjust_sql[$i]);
- break;
- case 'oracle':
- //Delete the last semicolon from current query
- $query = substr($adjust_sql[$i], 0, strlen($adjust_sql[$i]) - 1);
- $sql = oci_parse($connection, $query);
- $result = oci_execute($sql);
- break;
- case 'pgsql':
- pg_send_query($connection, $adjust_sql[$i]);
- $result = pg_get_result($connection);
- break;
- }
- if (!$result) {
- return 0;
- }
- }
+ case 'mysqli':
+ $result = mysqli_query($connection, $adjust_sql[$i]);
+ break;
- return 1;
+ case 'oracle':
+ // Delete the last semicolon from current query
+ $query = substr($adjust_sql[$i], 0, (strlen($adjust_sql[$i]) - 1));
+ $sql = oci_parse($connection, $query);
+ $result = oci_execute($sql);
+ break;
+
+ case 'pgsql':
+ pg_send_query($connection, $adjust_sql[$i]);
+ $result = pg_get_result($connection);
+ break;
+ }
+
+ if (!$result) {
+ return 0;
+ }
+ }
+
+ return 1;
}
-function install_step1() {
- global $banner;
- echo "
+function install_step1()
+{
+ global $banner;
+
+ echo "
- " . print_logo_status (1,6) . "
+ ".print_logo_status(1, 6)."
';
+
+ echo "
@@ -558,24 +588,26 @@ function install_step2() {
}
-function install_step3() {
- $options = '';
- if (extension_loaded("mysql")) {
- $options .= "";
- }
- if (extension_loaded("mysqli")) {
- $options .= "";
- }
-
- $error = false;
- if (empty($options)) {
- $error = true;
- }
-
- echo "
+function install_step3()
+{
+ $options = '';
+ if (extension_loaded('mysql')) {
+ $options .= "";
+ }
+
+ if (extension_loaded('mysqli')) {
+ $options .= "";
+ }
+
+ $error = false;
+ if (empty($options)) {
+ $error = true;
+ }
+
+ echo "
";
- echo "";
- echo "
+ if ($engine == 'oracle') {
+ $info .= 'objects ';
+ } else {
+ $info .= 'schemes ';
+ }
+
+ $info .= 'created in this step have been dropped.
+
';
+ echo $info;
+
+ switch ($engine) {
+ case 'mysql':
+ if (mysql_error() != '') {
+ echo "Welcome to Pandora FMS installation Wizard
This wizard helps you to quick install Pandora FMS console and main database in your system.
@@ -400,40 +427,43 @@ function install_step1() {For more information, please refer to documentation.
Pandora FMS Development Team
Warning: You already have a config.php file.
+ if (file_exists('include/config.php')) {
+ echo "
"; - echo "";
- $writable = check_writable ( "include", "Checking if ./include is writable");
- if (file_exists("include/config.php"))
- $writable += check_writable ( "include/config.php", "Checking if include/config.php is writable");
- echo "
";
-
- echo "
Warning: You already have a config.php file.
Configuration and database would be overwritten if you continued.
";
- }
- echo ""; - echo "
Warning: This installer will overwrite and destroy
+ }
+
+ echo '
'; + echo '';
+ $writable = check_writable('include', 'Checking if ./include is writable');
+ if (file_exists('include/config.php')) {
+ $writable += check_writable('include/config.php', 'Checking if include/config.php is writable');
+ }
+
+ echo '
';
+
+ echo "
';
+
+ echo "";
+ 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:
+
+ echo "
"; + echo '
'; - if ($writable == 0) { - echo ""; - } - else { - echo "
";
-
- echo "";
- echo "
+ if ($writable == 0) {
+ echo "';
+ } else {
+ 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.
";
- echo ""; + echo '
'; - if ($writable == 0) { - echo ""; - } - else { - echo "
ERROR:You need to setup permissions to be able to write in ./include directory
";
- }
- echo "ERROR:You need to setup permissions to be able to write in ./include directory
";
+ }
+
+ echo '
Pandora FMS is an OpenSource Software project registered at
@@ -442,33 +472,35 @@ function install_step1() {
";
}
-function install_step1_licence() {
- echo "
+
+function install_step1_licence()
+{
+ echo "
- " . print_logo_status (2,6) . "
+ ".print_logo_status(2, 6)."
";
-
- echo "
+
+ if (!file_exists('COPYING')) {
+ echo "GPL2 Licence terms agreement
Pandora FMS is an OpenSource software project licensed under the GPL2 licence. Pandora FMS includes, as well, another software also licensed under LGPL and BSD licenses. Before continue, you must accept the licence terms..
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 "
";
- }
- else {
- 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 '
';
+ } else {
+ echo "
Pandora FMS is an OpenSource Software project registered at
@@ -477,53 +509,51 @@ function install_step1_licence() {
";
}
-function install_step2() {
-
- echo "
+
+function install_step2()
+{
+ echo "
- " . print_logo_status (3,6) . "
+ ".print_logo_status(3, 6)."
";
- echo "";
- $res = 0;
- $res += check_variable(phpversion(),"5.2","PHP version >= 5.2",1);
- $res += check_extension("gd","PHP GD extension");
- $res += check_extension("ldap","PHP LDAP extension");
- $res += check_extension("snmp","PHP SNMP extension");
- $res += check_extension("session","PHP session extension");
- $res += check_extension("gettext","PHP gettext extension");
- $res += check_extension("mbstring","PHP Multibyte String");
- $res += check_extension("zip","PHP Zip");
- $res += check_extension("zlib","PHP Zlib extension");
- $res += check_extension("json","PHP json extension");
- $res += check_extension("curl","CURL (Client URL Library)");
- $res += check_extension("filter","PHP filter extension");
- $res += check_extension("calendar","PHP calendar extension");
- if (PHP_OS == "FreeBSD") {
- $res += check_exists ("/usr/local/bin/twopi","Graphviz Binary");
- }
- else if (PHP_OS == "NetBSD") {
- $res += check_exists ("/usr/pkg/bin/twopi","Graphviz Binary");
- }
- else if ( substr(PHP_OS, 0, 3) == 'WIN' ) {
- $res += check_exists ("..\\..\\..\\Graphviz\\bin\\twopi.exe", "Graphviz Binary");
- }
- else {
- $res += check_exists ("/usr/bin/twopi","Graphviz Binary");
- }
-
- echo "
';
+
+ if ($res > 0) {
+ echo "
';
+ echo "";
+ echo "
Checking software dependencies
"; - echo "";
- echo "Checking software dependencies';
+ echo '
| '; + echo ' |
You have some incomplete
dependencies. Please correct them or this installer
will not be able to finish your installation.
@@ -537,16 +567,16 @@ function install_step2() {
";
- }
- else {
- echo "";
- echo "";
- echo "
+ echo '
';
+ }
+
+ echo '
- " . print_logo_status (4,6) . "
+ ".print_logo_status(4, 6)."
";
-
- if (extension_loaded("oci8")) {
- echo "
";
- }
- echo "Environment and database setup
@@ -599,38 +631,38 @@ function install_step3() {
please be sure that you have no valuable Pandora FMS data in your Database.
For Oracle installation an existing Database with a privileged user is needed.
";
- }
- if (!$error) {
- echo " ERROR: ".mysql_error().'.
';
+ }
+
+ if ($step1 == 1) {
+ mysql_query("DROP DATABASE $dbname");
+ }
+ break;
+
+ case 'mysqli':
+ if (mysqli_error($connection) != '') {
+ echo " ERROR: ".mysqli_error($connection).'.
';
+ }
+
+ if ($step1 == 1) {
+ mysqli_query($connection, "DROP DATABASE $dbname");
+ }
+ break;
+ }
+
+ echo '
Pandora FMS is an Open Source Software project registered at
@@ -993,11 +1056,12 @@ function install_step4() {
}
-function install_step5() {
- echo "
+function install_step5()
+{
+ echo "
";
}
-?>
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index b111d4591c..328862139b 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.731
-%define release 190211
+%define release 190212
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index e74f4aedd8..5a7ff76bee 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.731
-%define release 190211
+%define release 190212
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 2417222b75..4c78d75cce 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.731-190211
+Version: 7.0NG.731-190212
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 955627aaab..1d7de600c1 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-pandora_version="7.0NG.731-190211"
+pandora_version="7.0NG.731-190212"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 5829c8b3d9..48b1c233e6 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.731";
-my $pandora_build = "190211";
+my $pandora_build = "190212";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 0b637a3e5e..cdc8b2a373 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.731";
-my $pandora_build = "190211";
+my $pandora_build = "190212";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 68bac0e6a0..11b2df4ed0 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.731
-%define release 190211
+%define release 190212
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index af6c012946..b3548ca8f7 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.731
-%define release 190211
+%define release 190212
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index b14c6574b3..189467a643 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.731"
-PI_BUILD="190211"
+PI_BUILD="190212"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 0a0c73e505..b7c3b42ea3 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.731 PS190211";
+my $version = "7.0NG.731 PS190212";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 307d2ee1d6..2d8697cfc9 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "7.0NG.731 PS190211";
+my $version = "7.0NG.731 PS190212";
# save program name for logging
my $progname = basename($0);
- " . print_logo_status (6,6) . "
+ ".print_logo_status(6, 6)."
";
- echo "
+ echo "Installation complete
For security, you now must manually delete this installer @@ -1017,11 +1081,10 @@ function install_step5() {
Pandora FMS is an OpenSource Software project registered at
SourceForge