".mysql_error()."
\n"; - $intStatus = 1; - } - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - // Connect to database server - if ($intMode == 1 ) { - $resDBSLink = @pg_connect("host=".$_SESSION['install']['dbserver']." port=".$_SESSION['install']['dbport']." user=".$_SESSION['install']['dbuser']." password=".$_SESSION['install']['dbpass']); - } else { - $resDBSLink = @pg_connect("host=".$_SESSION['install']['dbserver']." port=".$_SESSION['install']['dbport']." user=".$_SESSION['install']['admuser']." password=".$_SESSION['install']['admpass']); - } - if (!$resDBSLink) { - $strErrorMessage .= translate('Error while connecting to database:')."
".pg_last_error()."
\n"; - $intStatus = 1; - } - } else { - $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; - $strStatusMessage = "".translate("failed").""; - return(1); - } + $intStatus = 0; + $this->myDBClass->dbconnect(); + if ($this->myDBClass->error == true) { + $strErrorMessage .= str_replace("::","
",$this->myDBClass->strErrorMessage); + $intStatus = 1; + } if ($intStatus == 0) { - $strStatusMessage = "".translate("passed").""; + $strStatusMessage = "".$this->translate("passed").""; return(0); } else { - $strStatusMessage = "".translate("failed").""; + $strStatusMessage = "".$this->translate("failed").""; return(1); } } @@ -131,35 +351,19 @@ class naginstall { // /////////////////////////////////////////////////////////////////////////////////////////// function openDatabase(&$strStatusMessage,&$strErrorMessage,$intMode=0) { - if ($_SESSION['install']['dbtype'] == "mysql") { - $intStatus = 0; - // Connect to database - $resDBId = @mysql_select_db($_SESSION['install']['dbname']); - if (!$resDBId) { - $strErrorMessage .= translate('Error while connecting to database:')."
".mysql_error()."
\n"; - $intStatus = 1; - } - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - // Connect to database - if ($intMode == 1 ) { - $resDBSLink = @pg_connect("host=".$_SESSION['install']['dbserver']." port=".$_SESSION['install']['dbport']." dbname=".$_SESSION['install']['dbname']." user=".$_SESSION['install']['dbuser']." password=".$_SESSION['install']['dbpass']); - } else { - $resDBSLink = @pg_connect("host=".$_SESSION['install']['dbserver']." port=".$_SESSION['install']['dbport']." dbname=".$_SESSION['install']['dbname']." user=".$_SESSION['install']['admuser']." password=".$_SESSION['install']['admpass']); - } - if (!$resDBSLink) { - $strErrorMessage .= translate('Error while connecting to database:')."
".pg_last_error()."
\n"; - $intStatus = 1; - } - } else { - $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; - $strStatusMessage = "".translate("failed").""; - return(1); - } + $intStatus = 0; + // Connect to database + $booDB = $this->myDBClass->dbselect(); + if (!$booDB) { + $strErrorMessage .= $this->translate('Error while connecting to database:')."
"; + $strErrorMessage .= str_replace("::","
",$this->myDBClass->strErrorMessage)."\n"; + $intStatus = 1; + } if ($intStatus == 0) { - $strStatusMessage = "".translate("passed").""; + $strStatusMessage = "".$this->translate("passed").""; return(0); } else { - $strStatusMessage = "".translate("failed").""; + $strStatusMessage = "".$this->translate("failed").""; return(1); } } @@ -176,31 +380,24 @@ class naginstall { /////////////////////////////////////////////////////////////////////////////////////////// function checkDBVersion(&$strStatusMessage,&$strErrorMessage,&$setVersion) { // Read version string from DB - if ($_SESSION['install']['dbtype'] == "mysql") { - $setVersion = @mysql_result(@mysql_query("SHOW VARIABLES LIKE 'version'"),0,1); - $strDBError = mysql_error(); + if (($_SESSION['install']['dbtype'] == "mysql") || ($_SESSION['install']['dbtype'] == "mysqli")) { + $this->myDBClass->getSingleDataset("SHOW VARIABLES LIKE 'version'",$arrDataset); + $setVersion = $arrDataset['Value']; + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); $intVersion = version_compare($setVersion,"4.1.0"); - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $setVersion = @pg_fetch_result(@pg_query("SHOW VARIABLES LIKE 'version'"),0,1); - $strDBError = pg_last_error(); - $intVersion = version_compare($setVersion,"4.1.0"); - } else { - $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; - $strStatusMessage = "".translate("failed").""; - return(1); } if ($strDBError == "") { // Is the currrent version supported? if ($intVersion >=0) { - $strStatusMessage = "".translate("supported").""; + $strStatusMessage = "".$this->translate("supported").""; return(0); } else { - $strStatusMessage = "".translate("not supported").""; + $strStatusMessage = "".$this->translate("not supported").""; return(1); } } else { $strErrorMessage .= $strDBError."
\n"; - $strStatusMessage = "".translate("failed").""; + $strStatusMessage = "".$this->translate("failed").""; $setVersion = "unknown"; return(1); } @@ -218,18 +415,9 @@ class naginstall { // /////////////////////////////////////////////////////////////////////////////////////////// function checkQLVersion(&$strStatusMessage,&$strErrorMessage,&$arrUpdate,&$setVersion) { - // Read version string from DB - if ($_SESSION['install']['dbtype'] == "mysql") { - $setVersion = @mysql_result(@mysql_query("SELECT `value` FROM `tbl_settings` WHERE `category`='db' AND `name`='version'"),0,0); - $strDBError = mysql_error(); - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $setVersion = @pg_fetch_result(@pg_query("SELECT `value` FROM `tbl_settings` WHERE `category`='db' AND `name`='version'"),0,0); - $strDBError = pg_last_error(); - } else { - $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; - $strStatusMessage = "".translate("failed").""; - return(1); - } + $strSQL = "SELECT `value` FROM `tbl_settings` WHERE `category`='db' AND `name`='version'"; + $setVersion = $this->myDBClass->getFieldData($strSQL); + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); // Process result if (($strDBError == "") && ($setVersion != "")) { // NagiosQL version supported? @@ -256,28 +444,30 @@ class naginstall { break; case '3.1.1': $arrUpdate[] = "sql/update_311_320.sql"; break; - case '3.2.0': $intVersionError = 2; + case '3.2.0': $intVersionError = 2; + break; + case '3.3.0': $intVersionError = 2; break; default: $intVersionError = 1; break; } if ($intVersionError == 0) { - $strStatusMessage = "".translate("supported")." (".$setVersion.")"; + $strStatusMessage = "".$this->translate("supported")." (".$setVersion.")"; return(0); } else if ($intVersionError == 2) { - $strErrorMessage .= translate("Your NagiosQL installation is up to date - no further actions are needed!")."
\n"; - $strStatusMessage = "".translate("up-to-date")." (".$setVersion.")"; + $strErrorMessage .= $this->translate("Your NagiosQL installation is up to date - no further actions are needed!")."
\n"; + $strStatusMessage = "".$this->translate("up-to-date")." (".$setVersion.")"; return(1); } else { - $strErrorMessage .= translate("Updates to NagiosQL 3.2 and above are only supported from NagiosQL 3.0.0 and above!")."
\n"; - $strStatusMessage = "".translate("failed")." (".$setVersion.")"; + $strErrorMessage .= $this->translate("Updates to NagiosQL 3.2 and above are only supported from NagiosQL 3.0.0 and above!")."
\n"; + $strStatusMessage = "".$this->translate("failed")." (".$setVersion.")"; return(1); } } else { - $strErrorMessage .= translate("Error while selecting settings table.")."
\n"; + $strErrorMessage .= $this->translate("Error while selecting settings table.")."
\n"; $strErrorMessage .= $strDBError."
\n"; - $strErrorMessage .= translate("Updates to NagiosQL 3.2 and above are only supported from NagiosQL 3.0.0 and above!")."
\n"; - $strStatusMessage = "".translate("failed").""; + $strErrorMessage .= $this->translate("Updates to NagiosQL 3.2 and above are only supported from NagiosQL 3.0.0 and above!")."
\n"; + $strStatusMessage = "".$this->translate("failed").""; return(1); } } @@ -292,24 +482,14 @@ class naginstall { // /////////////////////////////////////////////////////////////////////////////////////////// function dropDB(&$strStatusMessage,&$strErrorMessage) { - // Drop database - if ($_SESSION['install']['dbtype'] == "mysql") { - $booReturn = @mysql_query("DROP DATABASE `".$_SESSION['install']['dbname']."`"); - $strDBError = mysql_error(); - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $setVersion = @pg_query("DROP DATABASE `".$_SESSION['install']['dbname']."`"); - $strDBError = pg_last_error(); - } else { - $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; - $strStatusMessage = "".translate("failed").""; - return(1); - } + $booReturn = $this->myDBClass->insertData("DROP DATABASE ".$_SESSION['install']['dbname']); + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); if ($booReturn) { - $strStatusMessage = "".translate("done")." (".$_SESSION['install']['dbname'].")"; + $strStatusMessage = "".$this->translate("done")." (".$_SESSION['install']['dbname'].")"; return(0); } else { $strErrorMessage .= $strDBError."
\n"; - $strStatusMessage = "".translate("failed")." (".$_SESSION['install']['dbname'].")"; + $strStatusMessage = "".$this->translate("failed")." (".$_SESSION['install']['dbname'].")"; return(1); } } @@ -325,26 +505,24 @@ class naginstall { /////////////////////////////////////////////////////////////////////////////////////////// function createDB(&$strStatusMessage,&$strErrorMessage) { // Create database - if ($_SESSION['install']['dbtype'] == "mysql") { - $booReturn = @mysql_query("CREATE DATABASE `".$_SESSION['install']['dbname']."` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci"); - $strDBError = mysql_error(); - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $setVersion = @pg_query("CREATE DATABASE `".$_SESSION['install']['dbname']."` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci"); - $strDBError = pg_last_error(); + if (($_SESSION['install']['dbtype'] == "mysql") || ($_SESSION['install']['dbtype'] == "mysqli")) { + $strSQL = "CREATE DATABASE ".$_SESSION['install']['dbname']." DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci"; } else { - $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; - $strStatusMessage = "".translate("failed").""; - return(1); + $strErrorMessage .= $this->translate("Unsupported database type.")."
\n"; + $strStatusMessage = "".$this->translate("failed")." (".$_SESSION['install']['dbname'].")"; + return(1); } + $booReturn = $this->myDBClass->insertData($strSQL); + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); if ($booReturn) { - $strStatusMessage = "".translate("done")." (".$_SESSION['install']['dbname'].")"; + $strStatusMessage = "".$this->translate("done")." (".$_SESSION['install']['dbname'].")"; return(0); } else { $strErrorMessage .= $strDBError."
\n"; - $strStatusMessage = "".translate("failed")." (".$_SESSION['install']['dbname'].")"; + $strStatusMessage = "".$this->translate("failed")." (".$_SESSION['install']['dbname'].")"; return(1); } - } + } /////////////////////////////////////////////////////////////////////////////////////////// // Function: Grant user to database /////////////////////////////////////////////////////////////////////////////////////////// @@ -357,76 +535,51 @@ class naginstall { /////////////////////////////////////////////////////////////////////////////////////////// function grantDBUser(&$strStatusMessage,&$strErrorMessage) { // Grant user - if ($_SESSION['install']['dbtype'] == "mysql") { + if (($_SESSION['install']['dbtype'] == "mysql") || ($_SESSION['install']['dbtype'] == "mysqli")) { // does the user exist? - $intUserError = 0; - $resQuery = @mysql_query("FLUSH PRIVILEGES"); - $resQuery1 = @mysql_query("SELECT * FROM `mysql`.`user` WHERE `Host`='".$_SESSION['install']['localsrv']."' AND `User`='".$_SESSION['install']['dbuser']."'"); - if ($resQuery1 && (mysql_num_rows($resQuery1) == 0)) { - $resQuery2 = @mysql_query("CREATE USER '".$_SESSION['install']['dbuser']."'@'".$_SESSION['install']['localsrv']."' IDENTIFIED BY '".$_SESSION['install']['dbpass']."'"); - if (!$resQuery2) { + $intUserError = 0; + $booReturn = $this->myDBClass->insertData("FLUSH PRIVILEGES"); + $strSQL = "SELECT * FROM `mysql`.`user` + WHERE `Host`='".$_SESSION['install']['localsrv']."' AND `User`='".$_SESSION['install']['dbuser']."'"; + $intCount = $this->myDBClass->countRows($strSQL); + if ($intCount == 0) { + $strSQL = "CREATE USER '".$_SESSION['install']['dbuser']."'@'".$_SESSION['install']['localsrv']."' IDENTIFIED BY '".$_SESSION['install']['dbpass']."'"; + $booReturn = $this->myDBClass->insertData($strSQL ); + if ($booReturn == false) { $intUserError = 1; - $strDBError = mysql_error(); + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); } - } else if (mysql_error() == ""){ - $intUserError = 2; + } else if ($this->myDBClass->strErrorMessage == "") { + $intUserError = 2; } else { $intUserError = 1; - $strDBError = mysql_error(); + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); } if ($intUserError != 1) { - $resQuery = @mysql_query("FLUSH PRIVILEGES"); - $resQuery = @mysql_query("GRANT SELECT, INSERT, UPDATE, DELETE, LOCK TABLES ON `".$_SESSION['install']['dbname']."`.* TO '".$_SESSION['install']['dbuser']."'@'".$_SESSION['install']['localsrv']."'"); - if (!$resQuery) { + $booReturn = $this->myDBClass->insertData("FLUSH PRIVILEGES"); + $strSQL = "GRANT SELECT, INSERT, UPDATE, DELETE, LOCK TABLES ON `".$_SESSION['install']['dbname']."`.* + TO '".$_SESSION['install']['dbuser']."'@'".$_SESSION['install']['localsrv']."'"; + $booReturn = $this->myDBClass->insertData($strSQL); + if ($booReturn == false) { $intUserError = 1; - $strDBError = mysql_error(); + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); } - $resQuery = @mysql_query("FLUSH PRIVILEGES"); + $booReturn = $this->myDBClass->insertData("FLUSH PRIVILEGES"); } - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - // does the user exist? - $intUserError = 0; - $resQuery = @pg_query("FLUSH PRIVILEGES"); - $resQuery1 = @pg_query("SELECT * FROM `mysql`.`user WHERE `Host`='".$_SESSION['install']['localsrv']."' AND `User`='".$_SESSION['install']['dbuser']."'"); - if ($resQuery1 && (pg_num_rows($resQuery) != 0)) { - $resQuery2 = @pg_query("CREATE USER '".$_SESSION['install']['dbuser']."'@'".$_SESSION['install']['localsrv']."' IDENTIFIED BY '".$_SESSION['install']['dbpass']."'"); - if (!$resQuery2) { - $intUserError = 1; - $strDBError = pg_last_error(); - } - } else if (mysql_error() == ""){ - $intUserError = 2; - } else { - $intUserError = 1; - $strDBError = pg_last_error(); - } - if ($intUserError != 1) { - $resQuery = @pg_query("FLUSH PRIVILEGES"); - $resQuery = @pg_query("GRANT SELECT, INSERT, UPDATE, DELETE, LOCK TABLES ON `".$_SESSION['install']['dbname']."`.* TO '".$_SESSION['install']['dbuser']."'@'".$_SESSION['install']['localsrv']."'"); - if (!$resQuery) { - $intUserError = 1; - $strDBError = pg_last_error(); - } - $resQuery = @pg_query("FLUSH PRIVILEGES"); - } - } else { - $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; - $strStatusMessage = "".translate("failed").""; - return(1); } if ($intUserError != 1) { if ($intUserError == 2) { - $strStatusMessage = "".translate("done")." (".translate("Only added rights to existing user").": ".$_SESSION['install']['dbuser'].")"; + $strStatusMessage = "".$this->translate("done")." (".$this->translate("Only added rights to existing user").": ".$_SESSION['install']['dbuser'].")"; } else { - $strStatusMessage = "".translate("done").""; + $strStatusMessage = "".$this->translate("done").""; } return(0); } else { $strErrorMessage .= $strDBError."
\n"; - $strStatusMessage = "".translate("failed").""; + $strStatusMessage = "".$this->translate("failed").""; return(1); } - } + } /////////////////////////////////////////////////////////////////////////////////////////// // Function: Update NagiosQL database /////////////////////////////////////////////////////////////////////////////////////////// @@ -450,23 +603,19 @@ class naginstall { $strSqlCommand = ""; $intSQLError = 0; $intLineCount = 0; - if ($_SESSION['install']['dbtype'] == "mysql") $booReturn = @mysql_query("SET NAMES `utf8`"); - if ($_SESSION['install']['dbtype'] == "pgsql") $booReturn = @pg_query("SET NAMES `utf8`"); while (!feof($filSqlNew)) { $strLine = fgets($filSqlNew); $strLine = trim($strLine); if ($intSQLError == 1) continue; // skip if an error was found $intLineCount++; - if ($strLine == "") continue; // skip empty lines + if ($strLine == "") continue; // skip empty lines if (substr($strLine,0,2) == "--") continue; // skip comment lines $strSqlCommand .= $strLine; if (substr($strSqlCommand,-1) == ";") { - if ($_SESSION['install']['dbtype'] == "mysql") $booReturn = @mysql_query($strSqlCommand); - if ($_SESSION['install']['dbtype'] == "pgsql") $booReturn = @pg_query($strSqlCommand); - if (!$booReturn) { + $booReturn = $this->myDBClass->insertData($strSqlCommand); + if ($booReturn == false) { $intSQLError = 1; - if ($_SESSION['install']['dbtype'] == "mysql") $strErrorMessage .= mysql_error()."
\n"; - if ($_SESSION['install']['dbtype'] == "pgsql") $strErrorMessage .= pg_last_error()."
\n"; + $strErrorMessage .= str_replace("::","
",$this->myDBClass->strErrorMessage); $intError = 1; } $strSqlCommand = ""; @@ -475,30 +624,30 @@ class naginstall { if ($intSQLError == 0) { $intUpdateOk++; } else { - $strStatusMessage = "".translate("failed")." (Line: ".$intLineCount." in file: ".$elem.")"; + $strStatusMessage = "".$this->translate("failed")." (Line: ".$intLineCount." in file: ".$elem.")"; $intUpdateError++; } } else { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("SQL file is not readable or empty")." (".$elem.")
\n"; + $strStatusMessage = "".$this->translate("failed").""; + $strErrorMessage .= $this->translate("SQL file is not readable or empty")." (".$elem.")
\n"; $intUpdateError++; } } else { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("SQL file is not readable or empty")." (".$elem.")
\n"; + $strStatusMessage = "".$this->translate("failed").""; + $strErrorMessage .= $this->translate("SQL file is not readable or empty")." (".$elem.")
\n"; $intUpdateError++; } } } if ($intUpdateError == 0) { - $strStatusMessage = "".translate("done").""; + $strStatusMessage = "".$this->translate("done").""; return(0); } else { return(1); } } else { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("No SQL update files available")."
\n"; + $strStatusMessage = "".$this->translate("failed").""; + $strErrorMessage .= $this->translate("No SQL update files available")."
\n"; return(1); } } @@ -514,28 +663,21 @@ class naginstall { /////////////////////////////////////////////////////////////////////////////////////////// function createNQLAdmin(&$strStatusMessage,&$strErrorMessage) { // Create admin user - $strSQL = "SELECT `id` FROM `tbl_language` WHERE `locale`='".$_SESSION['install']['locale']."'"; - $intLang = @mysql_result(@mysql_query($strSQL),0,0)+0; + $strSQL = "SELECT `id` FROM `tbl_language` WHERE `locale`='".$_SESSION['install']['locale']."'"; + $intLang = $this->myDBClass->getFieldData($strSQL)+0; if ($intLang == 0) $intLang = 1; - $strSQL = "INSERT INTO `tbl_user` (`id`, `username`, `alias`, `password`, `admin_enable`, `wsauth`, `active`, `nodelete`, `language`, `domain`, `last_login`, `last_modified`) - VALUES (1, '".$_SESSION['install']['qluser']."', 'Administrator', md5('".$_SESSION['install']['qlpass']."'), '1', '0', '1', '1', '".$intLang."', '1', '', NOW());"; - if ($_SESSION['install']['dbtype'] == "mysql") { - $booReturn = @mysql_query($strSQL); - $strDBError = mysql_error(); - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $setVersion = @pg_query($strSQL); - $strDBError = pg_last_error(); - } else { - $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; - $strStatusMessage = "".translate("failed").""; - return(1); - } + $strSQL = "INSERT INTO `tbl_user` (`id`, `username`, `alias`, `password`, `admin_enable`, `wsauth`, `active`, + `nodelete`, `language`, `domain`, `last_login`, `last_modified`) + VALUES (1, '".$_SESSION['install']['qluser']."', 'Administrator', md5('".$_SESSION['install']['qlpass']."'), + '1', '0', '1', '1', '".$intLang."', '1', '', NOW());"; + $booReturn = $this->myDBClass->insertData($strSQL); + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); if ($booReturn) { - $strStatusMessage = "".translate("done").""; + $strStatusMessage = "".$this->translate("done").""; return(0); } else { $strErrorMessage .= $strDBError."
\n"; - $strStatusMessage = "".translate("failed").""; + $strStatusMessage = "".$this->translate("failed").""; return(1); } } @@ -553,43 +695,31 @@ class naginstall { // Checking initial settings $arrInitial[] = array('category'=>'db','name'=>'version','value'=>$_SESSION['install']['version']); $arrInitial[] = array('category'=>'db','name'=>'type','value'=>$_SESSION['install']['dbtype']); - foreach ($_SESSION['init_settings'] AS $key=>$elem) { + foreach ($_SESSION['init_settings'] AS $key => $elem) { if ($key == 'db') continue; // do not store db values to database foreach ($elem AS $key2=>$elem2) { $arrInitial[] = array('category'=>$key,'name'=>$key2,'value'=>$elem2); } } foreach ($arrInitial AS $elem) { - $strSQL1 = "SELECT `value` FROM `tbl_settings` WHERE `category`='".$elem['category']."' AND `name`='".$elem['name']."'"; - $strSQL2 = "INSERT INTO `tbl_settings` (`category`, `name`, `value`) VALUES ('".$elem['category']."', '".$elem['name']."', '".$elem['value']."')"; - if ($_SESSION['install']['dbtype'] == "mysql") { - $resQuery1 = @mysql_query($strSQL1); - if ($resQuery1 && (mysql_num_rows($resQuery1) == 0)) { - $resQuery2 = @mysql_query($strSQL2); - if (!$resQuery2) { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("Inserting initial data to settings database has failed:")."
".mysql_error()."
\n"; - return(1); - } - } else if (!$resQuery1) { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("Inserting initial data to settings database has failed:")." ".mysql_error()."
\n"; + $strSQL1 = "SELECT `value` FROM `tbl_settings` WHERE `category`='".$elem['category']."' + AND `name`='".$elem['name']."'"; + $strSQL2 = "INSERT INTO `tbl_settings` (`category`, `name`, `value`) + VALUES ('".$elem['category']."', '".$elem['name']."', '".$elem['value']."')"; + $intCount = $this->myDBClass->countRows($strSQL1); + if ($intCount == 0) { + $booReturn = $this->myDBClass->insertData($strSQL2); + if ($booReturn == false) { + $strStatusMessage = "".$this->translate("failed").""; + $strErrorMessage .= $this->translate("Inserting initial data to settings database has failed:")."1
"; + $strErrorMessage .= str_replace("::","
",$this->myDBClass->strErrorMessage); return(1); - } - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $resQuery1 = @pg_query($strSQL1); - if ($resQuery1 && (pg_num_rows($resQuery1) == 0)) { - $resQuery2 = @pg_query($strSQL2); - if (!$resQuery2) { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("Inserting initial data to settings database has failed:")."
".pg_last_error()."
\n"; - return(1); - } - } else if (!$resQuery1) { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("Inserting initial data to settings database has failed:")." ".pg_last_error()."
\n"; - return(1); - } + } + } else if ($this->myDBClass->strErrorMessage != "") { + $strStatusMessage = "".$this->translate("failed").""; + $strErrorMessage .= $this->translate("Inserting initial data to settings database has failed:")."2
"; + $strErrorMessage .= str_replace("::","
",$this->myDBClass->strErrorMessage); + return(1); } } // Update some values @@ -599,30 +729,23 @@ class naginstall { } else { $arrSettings[] = array('category'=>'path','name'=>'protocol','value'=>'http'); } - $strBaseURL = str_replace("install/install.php","",$_SERVER["PHP_SELF"]); - $arrSettings[] = array('category'=>'path','name'=>'base_url','value'=>$strBaseURL); - $strBasePath = substr(realpath('.'),0,-7); - $arrSettings[] = array('category'=>'path','name'=>'base_path','value'=>$strBasePath); + //$strBaseURL = str_replace("install/install.php","",$_SERVER["PHP_SELF"]); + //$arrSettings[] = array('category'=>'path','name'=>'base_url','value'=>$strBaseURL); + //$strBasePath = substr(realpath('.'),0,-7); + //$arrSettings[] = array('category'=>'path','name'=>'base_path','value'=>$strBasePath); $arrSettings[] = array('category'=>'data','name'=>'locale','value'=>$_SESSION['install']['locale']); foreach ($arrSettings AS $elem) { - $strSQL = "UPDATE `tbl_settings` SET `value`='".$elem['value']."' WHERE `category` = '".$elem['category']."' AND `name` = '".$elem['name']."'"; - if ($_SESSION['install']['dbtype'] == "mysql") { - $resQuery = @mysql_query($strSQL); - if (mysql_error() != '') { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("Inserting initial data to settings database has failed:")." ".mysql_error()."
\n"; - return(1); - } - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $resQuery = @pg_query($strSQL); - if (pg_last_error() != '') { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("Inserting initial data to settings database has failed:")." ".pg_last_error()."
\n"; - return(1); - } + $strSQL = "UPDATE `tbl_settings` SET `value`='".$elem['value']."' + WHERE `category` = '".$elem['category']."' AND `name` = '".$elem['name']."'"; + $booReturn = $this->myDBClass->insertData($strSQL); + if ($booReturn == false) { + $strStatusMessage = "".$this->translate("failed").""; + $strErrorMessage .= $this->translate("Inserting initial data to settings database has failed:"); + $strErrorMessage .= str_replace("::","
",$this->myDBClass->strErrorMessage); + return(1); } } - $strStatusMessage = "".translate("done").""; + $strStatusMessage = "".$this->translate("done").""; return(0); } /////////////////////////////////////////////////////////////////////////////////////////// @@ -672,11 +795,11 @@ class naginstall { fwrite($filSettings,"base_url = ".$strBaseURL."\n"); fwrite($filSettings,"base_path = ".$strBasePath."\n"); fclose($filSettings); - $strStatusMessage = "".translate("done").""; + $strStatusMessage = "".$this->translate("done").""; return(0); } else { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("Connot open/write to config/settings.php")."
\n"; + $strStatusMessage = "".$this->translate("failed").""; + $strErrorMessage .= $this->translate("Connot open/write to config/settings.php")."
\n"; return(1); } } @@ -694,32 +817,23 @@ class naginstall { // Update configuration target database $strNagiosQLpath = str_replace("//","/",$_SESSION['install']['qlpath']."/"); $strNagiosPath = str_replace("//","/",$_SESSION['install']['nagpath']."/"); - $strSQL = "UPDATE `tbl_configtarget` SET - `basedir`='".$strNagiosQLpath."', - `hostconfig`='".$strNagiosQLpath."hosts/', - `serviceconfig`='".$strNagiosQLpath."services/', - `backupdir`='".$strNagiosQLpath."backup/', - `hostbackup`='".$strNagiosQLpath."backup/hosts/', - `servicebackup`='".$strNagiosQLpath."backup/services/', - `nagiosbasedir`='".$strNagiosPath."', - `importdir`='".$strNagiosPath."objects/', - `conffile`='".$strNagiosPath."nagios.cfg', - `last_modified`=NOW() - WHERE `target`='localhost'"; - if ($_SESSION['install']['dbtype'] == "mysql") { - $resQuery1 = @mysql_query($strSQL); - if (!$resQuery1) { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("Inserting path data to database has failed:")." ".mysql_error()."
\n"; - return(1); - } - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $resQuery1 = @pg_query($strSQL); - if (!$resQuery1) { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("Inserting path data to database has failed:")." ".pg_last_error()."
\n"; - return(1); - } + $strSQL = "UPDATE `tbl_configtarget` SET + `basedir`='".$strNagiosQLpath."', + `hostconfig`='".$strNagiosQLpath."hosts/', + `serviceconfig`='".$strNagiosQLpath."services/', + `backupdir`='".$strNagiosQLpath."backup/', + `hostbackup`='".$strNagiosQLpath."backup/hosts/', + `servicebackup`='".$strNagiosQLpath."backup/services/', + `nagiosbasedir`='".$strNagiosPath."', + `importdir`='".$strNagiosPath."objects/', + `conffile`='".$strNagiosPath."nagios.cfg', + `last_modified`=NOW() + WHERE `target`='localhost'"; + $booReturn = $this->myDBClass->insertData($strSQL); + if ($booReturn == false) { + $strStatusMessage = "".$this->translate("failed").""; + $strErrorMessage .= $this->translate("Inserting path data to database has failed:")." ".str_replace("::","
",$this->myDBClass->strErrorMessage)."\n"; + return(1); } // Create real paths if ($_SESSION['install']['createpath'] == 1) { @@ -729,23 +843,17 @@ class naginstall { if (!file_exists($strNagiosQLpath."backup")) mkdir($strNagiosQLpath."backup",0755); if (!file_exists($strNagiosQLpath."backup/hosts")) mkdir($strNagiosQLpath."backup/hosts",0755); if (!file_exists($strNagiosQLpath."backup/services")) mkdir($strNagiosQLpath."backup/services",0755); - $strStatusMessage = "".translate("done")." (".translate("Check the permissions of the created paths!").")"; + $strStatusMessage = "".$this->translate("done")." (".$this->translate("Check the permissions of the created paths!").")"; return(0); } else { - $strStatusMessage = "".translate("failed").""; - $strErrorMessage .= translate("NagiosQL config path is not writeable - only database values updated")."
\n"; + $strStatusMessage = "".$this->translate("failed").""; + $strErrorMessage .= $this->translate("NagiosQL config path is not writeable - only database values updated")."
\n"; return(1); } } - $strStatusMessage = "".translate("done").""; + $strStatusMessage = "".$this->translate("done").""; return(0); } - - - - - - /////////////////////////////////////////////////////////////////////////////////////////// // Function: Converting NagiosQL database to utf-8 /////////////////////////////////////////////////////////////////////////////////////////// @@ -757,24 +865,18 @@ class naginstall { // /////////////////////////////////////////////////////////////////////////////////////////// function convQLDB(&$strStatusMessage,&$strErrorMessage) { - // Read version string from DB - if ($_SESSION['install']['dbtype'] == "mysql") { - $resQuery = @mysql_query("ALTER DATABASE `".$_SESSION['install']['dbname']."` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"); - $strDBError = mysql_error(); - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $resQuery = @pg_query("ALTER DATABASE `".$_SESSION['install']['dbname']."` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"); - $strDBError = pg_last_error(); - } else { - $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; - $strStatusMessage = "".translate("failed").""; - return(1); + $strDBError = ""; + if ($_SESSION['install']['dbtype'] == "mysqli") { + $strSQL = "ALTER DATABASE `".$_SESSION['install']['dbname']."` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci"; + $booReturn = $this->myDBClass->insertData($strSQL); + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); } if ($strDBError == "") { - $strStatusMessage = "".translate("done").""; + $strStatusMessage = "".$this->translate("done").""; return(0); } else { - $strErrorMessage .= translate("Database errors while converting to utf-8:")."
".$strDBError."
\n"; - $strStatusMessage = "".translate("failed").""; + $strErrorMessage .= $this->translate("Database errors while converting to utf-8:")."
".$strDBError."
\n"; + $strStatusMessage = "".$this->translate("failed").""; return(1); } } @@ -790,24 +892,18 @@ class naginstall { /////////////////////////////////////////////////////////////////////////////////////////// function convQLDBTables(&$strStatusMessage,&$strErrorMessage) { // Read version string from DB - if ($_SESSION['install']['dbtype'] == "mysql") { - $resQuery = @mysql_query("SHOW TABLES FROM `".$_SESSION['install']['dbname']); - $strDBError = mysql_error(); - if ($resQuery && ($strDBError == "")) { - while ($elem = mysql_fetch_row($resQuery)) { - if ($strDBError != "") continue; - $resQueryTable = @mysql_query("ALTER TABLE `".$elem[0]."` DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"); - $strDBError .= mysql_error(); - } - } - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $resQuery = @pg_query("SHOW TABLES FROM `".$_SESSION['install']['dbname']); - $strDBError = pg_last_error(); - if ($resQuery && ($strDBError == "")) { - while ($elem = pg_fetch_row($resQuery)) { - if ($strDBError != "") continue; - $resQueryTable = @pg_query("ALTER TABLE `".$elem[0]."` DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"); - $strDBError .= pg_last_error(); + if ($_SESSION['install']['dbtype'] == "mysqli") { + $strSQL = "SHOW TABLES FROM `".$_SESSION['install']['dbname']."`"; + $booReturn = $this->myDBClass->getDataArray($strSQL,$arrDataset,$intDataCount); + if ($intDataCount != 0) { + foreach ($arrDataset AS $elem) { + if ($intError == 1) continue; + $strSQL = "ALTER TABLE `".$elem[0]."` DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci"; + $booReturn = $this->myDBClass->insertData($strSQL); + if ($booReturn == false) { + $intError = 1; + $strDBError = str_replace("::","
",$this->myDBClass->strErrorMessage); + } } } } else { @@ -836,67 +932,35 @@ class naginstall { /////////////////////////////////////////////////////////////////////////////////////////// function convQLDBFields(&$strStatusMessage,&$strErrorMessage) { // Read version string from DB - if ($_SESSION['install']['dbtype'] == "mysql") { - $resQuery = @mysql_query("SHOW TABLES FROM `".$_SESSION['install']['dbname']); - $strDBError = mysql_error(); - if ($resQuery && ($strDBError == "")) { - while ($elem = mysql_fetch_row($resQuery)) { - if ($strDBError != "") continue; - $resQueryTable = @mysql_query("SHOW FULL FIELDS FROM `".$elem[0]."` WHERE (`Type` LIKE '%varchar%' OR `Type` LIKE '%enum%' - OR `Type` LIKE '%text%') AND Collation <> 'utf8_unicode_ci'"); - $strDBError = mysql_error(); - if ($resQueryTable && ($strDBError == "")) { - while ($elem2 = mysql_fetch_row($resQueryTable)) { - if ($strDBError != "") continue; - if (($elem2[5] === NULL) && ($elem2[3] == 'YES')){ - $strDefault = "DEFAULT NULL"; - } else if ($elem2[5] != '') { - $strDefault = "DEFAULT '".$elem2[5]."'"; - } else { - $strDefault = ""; - } - if ($elem2[3] == 'YES') { $strNull = 'NULL'; } else { $strNull = 'NOT NULL'; } - $strSQL = "ALTER TABLE `".$elem[0]."` CHANGE `".$elem2[0]."` `".$elem2[0]."` ".$elem2[1]." CHARACTER SET 'utf8' - COLLATE 'utf8_unicode_ci' $strNull $strDefault"; - $resQueryField = @mysql_query($strSQL); - $strMySQLError = mysql_error(); - if ($strMySQLError != "") { - if (substr_count($strMySQLError,"Specified key was too long") == 0) { - $strDBError .= "Table:".$elem[0]." - Field: ".$elem2[0]." ".mysql_error(); - } - } + $strSQL1 = "SHOW TABLES FROM `".$_SESSION['install']['dbname']."`"; + $booReturn = $this->myDBClass->getDataArray($strSQL1,$arrDataset1,$intDataCount1); + if ($intDataCount1 != 0) { + foreach ($arrDataset1 AS $elem1) { + if ($intError == 1) continue; + $strSQL2 = "SHOW FULL FIELDS FROM `".$elem1[0]."` WHERE (`Type` LIKE '%varchar%' OR `Type` LIKE '%enum%' + OR `Type` LIKE '%text%') AND Collation <> 'utf8_unicode_ci'"; + $booReturn = $this->myDBClass->getDataArray($strSQL2,$arrDataset2,$intDataCount2); + if ($intDataCount2 != 0) { + foreach ($arrDataset2 AS $elem2) { + if ($intError2 == 1) continue; + if (($elem2[5] === NULL) && ($elem2[3] == 'YES')){ + $strDefault = "DEFAULT NULL"; + } else if ($elem2[5] != '') { + $strDefault = "DEFAULT '".$elem2[5]."'"; + } else { + $strDefault = ""; + } + if ($elem2[3] == 'YES') { $strNull = 'NULL'; } else { $strNull = 'NOT NULL'; } + $strSQL3 = "ALTER TABLE `".$elem[0]."` CHANGE `".$elem2[0]."` `".$elem2[0]."` ".$elem2[1]." + CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' $strNull $strDefault"; + $booReturn = $this->myDBClass->insertData($strSQL3); + if ($booReturn == false) { + $intError2 = 1; + $strDBError = "Table:".$elem[0]." - Field: ".$elem2[0]." ".$this->myDBClass->strErrorMessage; } } } } - } else if ($_SESSION['install']['dbtype'] == "pgsql") { - $resQuery = @pg_query("SHOW TABLES FROM `".$_SESSION['install']['dbname']); - $strDBError = pg_last_error(); - if ($resQuery && ($strDBError == "")) { - while ($elem = pg_fetch_row($resQuery)) { - if ($strDBError != "") continue; - $resQueryTable = @pg_query("SHOW FULL FIELDS FROM `".$elem[0]."` WHERE `Type` LIKE '%varchar%' AND Collation <> 'utf8_unicode_ci'"); - $strDBError = pg_last_error(); - if ($resQueryTable && ($strDBError == "")) { - while ($elem2 = pg_fetch_row($resQueryTable)) { - if (($elem2[5] === NULL) && ($elem2[3] == 'YES')){ - $strDefault = "DEFAULT NULL"; - } else if ($elem2[5] != '') { - $strDefault = "DEFAULT '".$elem2[5]."'"; - } else { - $strDefault = ""; - } - if ($elem2[3] == 'YES') { $strNull = 'NULL'; } else { $strNull = 'NOT NULL'; } - $strSQL = "ALTER TABLE `".$elem[0]."` CHANGE `".$elem2[0]."` `".$elem2[0]."` ".$elem2[1]." CHARACTER SET 'utf8' - COLLATE 'utf8_unicode_ci' $strNull $strDefault"; - if ($strDBError != "") continue; - $resQueryField = @pg_query($strSQL); - $strDBError .= pg_last_error(); - } - } - $strDBError .= pg_last_error(); - } - } } else { $strErrorMessage .= translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; $strStatusMessage = "".translate("failed").""; diff --git a/install/functions/prepend_install.php b/install/functions/prepend_install.php old mode 100755 new mode 100644 index ab0d37e..21b4cca --- a/install/functions/prepend_install.php +++ b/install/functions/prepend_install.php @@ -4,15 +4,15 @@ // NagiosQL /////////////////////////////////////////////////////////////////////////////// // -// (c) 2005-2012 by Martin Willisegger +// (c) 2005-2017 by Martin Willisegger // // Project : NagiosQL // Component : Installer preprocessing script // Website : http://www.nagiosql.org -// Date : $LastChangedDate: 2012-01-04 15:40:03 +0100 (Mi, 04. Jan 2012) $ +// Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ // Author : $LastChangedBy: martin $ -// Version : 3.2.0 -// Revision : $LastChangedRevision: 1154 $ +// Version : 3.3.0 +// Revision : $LastChangedRevision: 2 $ // /////////////////////////////////////////////////////////////////////////////// error_reporting(E_ALL); @@ -24,7 +24,7 @@ $strInfoMessage = ""; // All information messages (green) // // Start PHP session // ================= -session_start('nagiosql_install'); +session_start([ 'name' => 'nagiosql_install']); // // Include external function/class files // ===================================== diff --git a/install/images/input.png b/install/images/input.png old mode 100755 new mode 100644 diff --git a/install/index.php b/install/index.php index 87a2caa..b1a5df0 100644 --- a/install/index.php +++ b/install/index.php @@ -5,15 +5,15 @@ // /////////////////////////////////////////////////////////////////////////////// // -// (c) 2005-2012 by Martin Willisegger +// (c) 2005-2017 by Martin Willisegger // // Project : NagiosQL // Component : Installer main script // Website : http://www.nagiosql.org -// Date : $LastChangedDate: 2012-02-28 18:14:54 +0100 (Tue, 28 Feb 2012) $ +// Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ // Author : $LastChangedBy: martin $ -// Version : 3.2.0 -// Revision : $LastChangedRevision: 1261 $ +// Version : 3.3.0 +// Revision : $LastChangedRevision: 2 $ // /////////////////////////////////////////////////////////////////////////////// // @@ -25,18 +25,18 @@ $preLocale = "../config/locale"; $filConfig = "../config/settings.php"; $preDBType = "mysql"; $strLangOpt = ""; -$intError = 0; +$strVersion = "3.3.0"; $intUpdate = 0; +$intError = 0; // // Include preprocessing file // ========================== require("functions/prepend_install.php"); -require("../functions/translator.php"); // // Restart session // =============== session_destroy(); -session_start('nagiosql_install'); +session_start([ 'name' => 'nagiosql_install']); // // POST parameters // =============== @@ -60,11 +60,11 @@ if (extension_loaded('gettext')) { bindtextdomain($chkLocale, $preLocale); bind_textdomain_codeset($chkLocale, $preEncode); textdomain($chkLocale); - $arrTemplate['NAGIOS_FAQ'] = translate("Online Documentation"); + $arrTemplate['NAGIOS_FAQ'] = $myInstClass->translate("Online Documentation"); // Language selection field - $arrTemplate['LANGUAGE'] = translate("Language"); - foreach(getLanguageData() AS $key => $elem) { - $strLangOpt .= "\n"; + $arrTemplate['LANGUAGE'] = $myInstClass->translate("Language"); + foreach($myInstClass->getLangData() AS $key => $elem) { + $strLangOpt .= "\n"; if ($key != $chkLocale) { $strLangOpt = str_replace(" {sel}","",$strLangOpt); } else { $strLangOpt = str_replace(" {sel}"," selected",$strLangOpt); } } $arrTemplate['LANG_OPTION'] = $strLangOpt; @@ -76,7 +76,6 @@ if (extension_loaded('gettext')) { // Checking current installation // ============================= // Does the settings file exist? -$_SESSION['install']['dbtype'] = $preDBType; if (file_exists($filConfig) && is_readable($filConfig)) { $preSettings = parse_ini_file($filConfig,true); // Are there any connection data? @@ -89,49 +88,70 @@ if (file_exists($filConfig) && is_readable($filConfig)) { $preDBType = "pgsql"; $_SESSION['install']['dbtype'] = $preDBType; } - if ($preDBType == "mysql") { - if (extension_loaded('mysql')) { + // Select database + $intDBFallback = 0; + if (isset($preSettings['db']['type'])) { + if ($preSettings['db']['type'] == "mysqli") { + if (extension_loaded('mysqli')) { + // Include mysqli class + include("../functions/mysqli_class.php"); + // Initialize mysqli class + $myDBClass = new mysqlidb; + } else { + $intDBFallback = 1; + } + $_SESSION['install']['dbtype'] = 'mysqli'; + } else { + $intDBFallback = 1; + } + } else { + if (extension_loaded('mysqli')) { // Include mysql class - include("../functions/mysql_class.php"); + include("../functions/mysqli_class.php"); // Initialize mysql class $myDBClass = new mysqldb; - if ($myDBClass->error == true) { - $strErrorMessage .= translate("Database connection failed. Upgrade not available!")."
"; - $strErrorMessage .= translate('Error while connecting to database:')."
".$myDBClass->strErrorMessage."
"; - } else { - $strSQL = "SELECT `category`,`name`,`value` FROM `tbl_settings`"; - $booReturn = $myDBClass->getDataArray($strSQL,$arrDataLines,$intDataCount); - if ($booReturn == false) { - $strErrorMessage .= translate("Settings table not available or wrong. Upgrade not available!")."
"; - $strErrorMessage .= translate('Error while selecting data from database:')."
".$myDBClass->strDBError."
"; - } else if ($intDataCount != 0) { - foreach ($arrDataLines AS $elem) { - $preSettings[$elem['category']][$elem['name']] = $elem['value']; - } - $intUpdate = 1; - } - } - $_SESSION['install']['dbtype'] = $preDBType; } else { - $strErrorMessage .= translate("Installation cannot continue, please make sure you have the mysql extension loaded!"); - $intError = 1; + $intDBFallback = 1; } - } else if ($preDBType == "pgsql") { - if (extension_loaded('pgsql')) { - $strErrorMessage .= translate("Installation cannot continue, postgres is not yet available in beta!"); - $intError = 1; - } else { - $strErrorMessage .= translate("Installation cannot continue, please make sure you have the pgsql extension loaded!"); - $intError = 1; - } + $_SESSION['install']['dbtype'] = 'mysqli'; + $preSettings['db']['type'] = 'mysqli'; + } + // Set DB parameters + $myDBClass->arrParams['server'] = $preSettings['db']['server']; + $myDBClass->arrParams['port'] = $preSettings['db']['port']; + $myDBClass->arrParams['username'] = $preSettings['db']['username']; + $myDBClass->arrParams['password'] = $preSettings['db']['password']; + $myDBClass->arrParams['database'] = $preSettings['db']['database']; + $myDBClass->getdatabase(); + // DB failure + if ($intDBFallback == 1) { + $_SESSION['install']['dbtype'] = 'mysqli'; + $preSettings['db']['type'] = 'mysqli'; + $intUpdate = 0; } else { - $strErrorMessage .= translate("Database type in settings file is wrong (config/settings.php). Upgrade not available!"); + if ($myDBClass->error == true) { + $strErrorMessage .= $myInstClass->translate("Database connection failed. Upgrade not available!")."
"; + $strErrorMessage .= str_replace("::","
",$myDBClass->strErrorMessage)."
"; + } else { + $strSQL = "SELECT category,name,value FROM tbl_settings"; + $booReturn = $myDBClass->getDataArray($strSQL,$arrDataLines,$intDataCount); + if ($booReturn == false) { + $strErrorMessage .= $myInstClass->translate("Settings table not available or wrong. Upgrade not available!")."
"; + $strErrorMessage .= str_replace("::","
",$myDBClass->strErrorMessage)."
"; + + } else if ($intDataCount != 0) { + foreach ($arrDataLines AS $elem) { + $preSettings[$elem['category']][$elem['name']] = $elem['value']; + } + $intUpdate = 1; + } + } } } else { - $strErrorMessage .= translate("Database values in settings file are missing (config/settings.php). Upgrade not available!"); + $strErrorMessage .= $myInstClass->translate("Database values in settings file are missing (config/settings.php). Upgrade not available!"); } } else { - $strErrorMessage .= translate("Settings file not found or not readable (config/settings.php). Upgrade not available!"); + $strErrorMessage .= $myInstClass->translate("Settings file not found or not readable (config/settings.php). Upgrade not available!"); } // // Initial settings (new installation) @@ -141,40 +161,38 @@ if (file_exists($filInit) && is_readable($filInit)) { $preInit = parse_ini_file($filInit,true); $_SESSION['init_settings'] = $preInit; } else { - $strErrorMessage .= translate("Default values file is not available or not readable (install/functions/initial_settings.php). Installation possible, but without predefined data!"); + $strErrorMessage .= $myInstClass->translate("Default values file is not available or not readable (install/functions/initial_settings.php). Installation possible, but without predefined data!"); } // // Build content // ============= -$arrTemplate['PAGETITLE'] = "[NagiosQL] Installation Wizard"; -$arrTemplate['MAIN_TITLE'] = translate("Welcome to the NagiosQL Installation Wizard"); -$arrTemplate['TEXT_PART_1'] = translate("This wizard will help you to install and configure NagiosQL."); -$arrTemplate['TEXT_PART_2'] = translate("For questions please visit"); -$arrTemplate['TEXT_PART_3'] = translate("First let's check your local environment and find out if everything NagiosQL needs is available."); -$arrTemplate['TEXT_PART_4'] = translate("The basic requirements are:"); -$arrTemplate['TEXT_PART_5'] = translate("PHP 5.2.0 or greater including:"); -$arrTemplate['TEXT_PHP_REQ_1'] = translate("PHP Module:")." Session"; -$arrTemplate['TEXT_PHP_REQ_2'] = translate("PHP Module:")." gettext"; -$arrTemplate['TEXT_PHP_REQ_3'] = translate("PHP Module:")." filter"; -//$arrTemplate['TEXT_PHP_REQ_4'] = translate("PHP Module:")." XML"; -//$arrTemplate['TEXT_PHP_REQ_5'] = translate("PHP Module:")." SimpleXML"; -$arrTemplate['TEXT_PHP_REQ_6'] = translate("PHP Module:")." MySQL"; -//$arrTemplate['TEXT_PHP_REQ_7'] = translate("PHP Module:")." PgSQL ".translate("(optional)"); -$arrTemplate['TEXT_PHP_REQ_8'] = translate("PHP Module:")." FTP ".translate("(optional)"); -$arrTemplate['TEXT_PHP_REQ_9'] = translate("PHP Module:")." curl ".translate("(optional)"); -$arrTemplate['TEXT_PHP_REQ_10'] = translate("PECL Extension:")." SSH ".translate("(optional)"); -$arrTemplate['TEXT_PART_6'] = translate("php.ini options").":"; -$arrTemplate['TEXT_INI_REQ_1'] = translate("file_uploads on (for upload features)"); -$arrTemplate['TEXT_INI_REQ_2'] = translate("session.auto_start needs to be off"); -$arrTemplate['TEXT_PART_7'] = translate("A MySQL database server"); -$arrTemplate['TEXT_PART_8'] = translate("Nagios 2.x/3.x"); +$arrTemplate['PAGETITLE'] = "[NagiosQL] ".$myInstClass->translate("Installation wizard"); +$arrTemplate['MAIN_TITLE'] = $myInstClass->translate("Welcome to the NagiosQL installation wizard"); +$arrTemplate['TEXT_PART_1'] = $myInstClass->translate("This wizard will help you to install and configure NagiosQL."); +$arrTemplate['TEXT_PART_2'] = $myInstClass->translate("For questions please visit").": "; +$arrTemplate['TEXT_PART_3'] = $myInstClass->translate("First let's check your local environment and find out if everything NagiosQL needs is available."); +$arrTemplate['TEXT_PART_4'] = $myInstClass->translate("The basic requirements are:"); +$arrTemplate['TEXT_PART_5'] = $myInstClass->translate("PHP 5.2.0 or greater including:"); +$arrTemplate['TEXT_PHP_REQ_1'] = $myInstClass->translate("PHP database module:")." ". + $myInstClass->translate("supported types are")." mysqli"; +$arrTemplate['TEXT_PHP_REQ_2'] = $myInstClass->translate("PHP module:")." session"; +$arrTemplate['TEXT_PHP_REQ_3'] = $myInstClass->translate("PHP module:")." gettext"; +$arrTemplate['TEXT_PHP_REQ_6'] = $myInstClass->translate("PHP module:")." filter"; +$arrTemplate['TEXT_PHP_REQ_8'] = $myInstClass->translate("PHP module:")." FTP ".$myInstClass->translate("(optional)"); +$arrTemplate['TEXT_PHP_REQ_10'] = $myInstClass->translate("PECL extension:")." SSH ".$myInstClass->translate("(optional)"); +$arrTemplate['TEXT_PART_6'] = $myInstClass->translate("php.ini options").":"; +$arrTemplate['TEXT_INI_REQ_1'] = $myInstClass->translate("file_uploads on (for upload features)"); +$arrTemplate['TEXT_INI_REQ_2'] = $myInstClass->translate("session.auto_start needs to be off"); +$arrTemplate['TEXT_PART_7'] = $myInstClass->translate("A database server"); +$arrTemplate['TEXT_PART_8'] = $myInstClass->translate("Nagios 2.x/3.x/4.x"); +$arrTemplate['TEXT_PART_9'] = $myInstClass->translate("NagiosQL version")." ".$strVersion; $arrTemplate['LOCALE'] = $chkLocale; -$arrTemplate['ONLINE_DOC'] = translate("Online Documentation"); +$arrTemplate['ONLINE_DOC'] = $myInstClass->translate("Online documentation"); // // New installation or upgrade // =========================== -$arrTemplate['NEW_INSTALLATION'] = translate("START INSTALLATION"); -$arrTemplate['UPDATE'] = translate("START UPDATE"); +$arrTemplate['NEW_INSTALLATION'] = $myInstClass->translate("START INSTALLATION"); +$arrTemplate['UPDATE'] = $myInstClass->translate("START UPDATE"); $arrTemplate['DISABLE_NEW'] = ""; $arrTemplate['UPDATE_ERROR'] = "".$strErrorMessage.""; if ($intUpdate == 1) { diff --git a/install/install.php b/install/install.php index 1826aa9..2ba93fe 100644 --- a/install/install.php +++ b/install/install.php @@ -5,39 +5,39 @@ // /////////////////////////////////////////////////////////////////////////////// // -// (c) 2005-2012 by Martin Willisegger +// (c) 2005-2017 by Martin Willisegger // // Project : NagiosQL // Component : Installer script - check page // Website : http://www.nagiosql.org -// Date : $LastChangedDate: 2012-02-21 14:10:41 +0100 (Tue, 21 Feb 2012) $ +// Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ // Author : $LastChangedBy: martin $ -// Version : 3.2.0 -// Revision : $LastChangedRevision: 1229 $ +// Version : 3.3.0 +// Revision : $LastChangedRevision: 2 $ // /////////////////////////////////////////////////////////////////////////////// // -// Actual database files -// ===================== -$preSqlNewInstall = "sql/nagiosQL_v32_db_mysql.sql"; -$preSqlUpdateLast = "sql/update_31x_320.sql"; -$preNagiosQL_ver = "3.2.0"; -// // Define common variables // ======================= $preContent = "templates/install.tpl.htm"; $preEncode = 'utf-8'; $preLocale = "../config/locale"; -$intError = 0; $chkModus = "none"; // // Include preprocessing file // ========================== require("functions/prepend_install.php"); -require("../functions/translator.php"); +// +// Actual database files +// ===================== +$preSqlNewInstall = "sql/nagiosQL_v32_db_mysql.sql"; +$preSqlUpdateLast = "sql/update_31x_320.sql"; +$preNagiosQL_ver = "3.3.0"; // // Process initial value // ===================== +if (!isset($_SESSION['init_settings'])) header("Location: index.php"); +$strInitDBtype = isset($_SESSION['SETS']['db']['type']) ? $_SESSION['SETS']['db']['type'] : $_SESSION['init_settings']['db']['type']; $strInitDBserver = isset($_SESSION['SETS']['db']['server']) ? $_SESSION['SETS']['db']['server'] : $_SESSION['init_settings']['db']['server']; $strInitDBname = isset($_SESSION['SETS']['db']['database']) ? $_SESSION['SETS']['db']['database'] : $_SESSION['init_settings']['db']['database']; $strInitDBuser = isset($_SESSION['SETS']['db']['username']) ? $_SESSION['SETS']['db']['username'] : $_SESSION['init_settings']['db']['username']; @@ -48,6 +48,7 @@ $strInitDBport = isset($_SESSION['SETS']['db']['port']) ? $_SESSION['SETS']['d // ======================= if (!isset($_SESSION['install']['jscript'])) $_SESSION['install']['jscript'] = "no"; if (!isset($_SESSION['install']['locale'])) $_SESSION['install']['locale'] = "en_GB"; +if (!isset($_SESSION['install']['dbtype'])) $_SESSION['install']['dbtype'] = $strInitDBtype; if (!isset($_SESSION['install']['dbserver'])) $_SESSION['install']['dbserver'] = $strInitDBserver; if (!isset($_SESSION['install']['localsrv'])) $_SESSION['install']['localsrv'] = ""; if (!isset($_SESSION['install']['dbname'])) $_SESSION['install']['dbname'] = $strInitDBname; @@ -68,12 +69,13 @@ if (!isset($_SESSION['install']['nagpath'])) $_SESSION['install']['nagpath'] // POST parameters // =============== $arrStep = array(1,2,3); -$chkStep = isset($_POST['hidStep']) ? $_POST['hidStep'] : "1"; +$chkStep = (isset($_POST['hidStep']) && in_array($_POST['hidStep'],$arrStep)) ? $_POST['hidStep']+0 : "1"; if (isset($_GET['step']) && in_array($_GET['step'],$arrStep)) $chkStep = $_GET['step']+0; if (!in_array($chkStep,$arrStep)) $arrStep = 1; // Session values $_SESSION['install']['locale'] = isset($_POST['hidLocale']) ? $_POST['hidLocale'] : $_SESSION['install']['locale']; $_SESSION['install']['jscript'] = isset($_POST['hidJScript']) ? $_POST['hidJScript'] : $_SESSION['install']['jscript']; +$_SESSION['install']['dbtype'] = isset($_POST['selDBtype']) ? $_POST['selDBtype'] : $_SESSION['install']['dbtype']; $_SESSION['install']['dbserver'] = isset($_POST['tfDBserver']) ? $_POST['tfDBserver'] : $_SESSION['install']['dbserver']; $_SESSION['install']['localsrv'] = isset($_POST['tfLocalSrv']) ? $_POST['tfLocalSrv'] : $_SESSION['install']['localsrv']; $_SESSION['install']['dbname'] = isset($_POST['tfDBname']) ? $_POST['tfDBname'] : $_SESSION['install']['dbname']; @@ -84,20 +86,19 @@ $_SESSION['install']['admpass'] = isset($_POST['tfDBprivPass']) ? $_POST['tfDBp $_SESSION['install']['qluser'] = isset($_POST['tfQLuser']) ? $_POST['tfQLuser'] : $_SESSION['install']['qluser']; $_SESSION['install']['qlpass'] = isset($_POST['tfQLpass']) ? $_POST['tfQLpass'] : $_SESSION['install']['qlpass']; $_SESSION['install']['dbport'] = isset($_POST['tfDBport']) ? $_POST['tfDBport']+0 : $_SESSION['install']['dbport']; -$_SESSION['install']['dbdrop'] = isset($_POST['chbDrop']) ? $_POST['chbDrop']+0 : $_SESSION['install']['dbdrop']; -$_SESSION['install']['sample'] = isset($_POST['chbSample']) ? $_POST['chbSample']+0 : $_SESSION['install']['sample']; -$_SESSION['install']['createpath'] = isset($_POST['chbPath']) ? $_POST['chbPath']+0 : $_SESSION['install']['createpath']; +$_SESSION['install']['dbdrop'] = isset($_POST['chbDrop']) ? $_POST['chbDrop']+0 : 0; +$_SESSION['install']['sample'] = isset($_POST['chbSample']) ? $_POST['chbSample']+0 : 0; +$_SESSION['install']['createpath'] = isset($_POST['chbPath']) ? $_POST['chbPath']+0 : 0; $_SESSION['install']['qlpath'] = isset($_POST['tfQLpath']) ? $_POST['tfQLpath'] : $_SESSION['install']['qlpath']; $_SESSION['install']['nagpath'] = isset($_POST['tfNagiosPath']) ? $_POST['tfNagiosPath'] : $_SESSION['install']['nagpath']; +$preSqlNewInstall = str_replace("DBTYPE",$_SESSION['install']['dbtype'],$preSqlNewInstall); +$preSqlNewInstall = str_replace("mysqli","mysql",$preSqlNewInstall); + if (isset($_POST['butNewInstall'])) $chkModus = "Installation"; if (isset($_POST['butUpgrade'])) $chkModus = "Update"; if (!isset($_SESSION['install']['mode'])) $_SESSION['install']['mode'] = $chkModus; -// -// Store data to session parameters -// ================================ - // // Language settings // ================= @@ -121,7 +122,7 @@ ob_end_clean(); // Build content // ============= $arrTemplate['PAGETITLE'] = "[NagiosQL] Installation Wizard"; -$arrTemplate['MAIN_TITLE'] = translate("Welcome to the NagiosQL Installation Wizard"); +$arrTemplate['MAIN_TITLE'] = $myInstClass->translate("Welcome to the NagiosQL Installation Wizard"); $arrTemplate['CONTENT'] = $strContent; // // Write content diff --git a/install/sql/import_nagios_sample.sql b/install/sql/import_nagios_sample.sql index e5b8c8f..6a5a8ef 100644 --- a/install/sql/import_nagios_sample.sql +++ b/install/sql/import_nagios_sample.sql @@ -8,11 +8,11 @@ -- Project : NagiosQL -- Component : Import samples build from Nagios 3.0.5 configuration samples -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-02-24 10:22:28 +0100 (Fri, 24 Feb 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ --- Version : 3.2.0 --- Revision : $LastChangedRevision: 1248 $ --- SVN-ID : $Id: import_nagios_sample.sql 1248 2012-02-24 09:22:28Z martin $ +-- Version : 3.3.0 +-- Revision : $LastChangedRevision: 2 $ +-- SVN-ID : $Id: import_nagios_sample.sql 2 2017-06-22 07:29:35Z martin $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/nagiosQL_v32_db_mysql.sql b/install/sql/nagiosQL_v32_db_mysql.sql index 3c280d5..7bfa13d 100644 --- a/install/sql/nagiosQL_v32_db_mysql.sql +++ b/install/sql/nagiosQL_v32_db_mysql.sql @@ -8,11 +8,11 @@ -- Project : NagiosQL -- Component : Complete NagiosQL Database -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-03-01 12:24:44 +0100 (Thu, 01 Mar 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ --- Version : 3.2.0 --- Revision : $LastChangedRevision: 1268 $ --- SVN-ID : $Id: nagiosQL_v32_db_mysql.sql 1268 2012-03-01 11:24:44Z martin $ +-- Version : 3.3.0 +-- Revision : $LastChangedRevision: 2 $ +-- SVN-ID : $Id: nagiosQL_v32_db_mysql.sql 2 2017-06-22 07:29:35Z martin $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/update_300_301.sql b/install/sql/update_300_301.sql index 3d8f371..c54e39a 100644 --- a/install/sql/update_300_301.sql +++ b/install/sql/update_300_301.sql @@ -10,11 +10,11 @@ -- Project : NagiosQL -- Component : Update from NagiosQL 3.0.0 to NagiosQL 3.0.1 -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-02-23 07:49:34 +0100 (Thu, 23 Feb 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ -- Version : 3.0.2 --- Revision : $LastChangedRevision: 1237 $ --- SVN-ID : $Id: update_300_301.sql 1237 2012-02-23 06:49:34Z martin $ +-- Revision : $LastChangedRevision: 2 $ +-- SVN-ID : $Id: update_300_301.sql 2 2017-06-22 07:29:35Z martin $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/update_300_310.sql b/install/sql/update_300_310.sql index b840ce2..0dcefa8 100644 --- a/install/sql/update_300_310.sql +++ b/install/sql/update_300_310.sql @@ -8,10 +8,10 @@ -- Project : NagiosQL -- Component : Update from NagiosQL 3.0.4 to NagiosQL 3.1.0 -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-02-27 07:58:18 +0100 (Mon, 27 Feb 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ -- Version : 3.1.1 --- Revision : $LastChangedRevision: 1255 $ +-- Revision : $LastChangedRevision: 2 $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/update_301_302.sql b/install/sql/update_301_302.sql index fe0a639..8c66323 100644 --- a/install/sql/update_301_302.sql +++ b/install/sql/update_301_302.sql @@ -10,11 +10,11 @@ -- Project : NagiosQL -- Component : Update from NagiosQL 3.0.1 to NagiosQL 3.0.2 -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-02-23 07:49:34 +0100 (Thu, 23 Feb 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ -- Version : 3.0.2 --- Revision : $LastChangedRevision: 1237 $ --- SVN-ID : $Id: update_301_302.sql 1237 2012-02-23 06:49:34Z martin $ +-- Revision : $LastChangedRevision: 2 $ +-- SVN-ID : $Id: update_301_302.sql 2 2017-06-22 07:29:35Z martin $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/update_302_303.sql b/install/sql/update_302_303.sql index 3d28e9d..83a4800 100644 --- a/install/sql/update_302_303.sql +++ b/install/sql/update_302_303.sql @@ -10,11 +10,11 @@ -- Project : NagiosQL -- Component : Update from NagiosQL 3.0.2 to NagiosQL 3.0.3 -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-02-23 07:49:34 +0100 (Thu, 23 Feb 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ -- Version : 3.0.3 --- Revision : $LastChangedRevision: 1237 $ --- SVN-ID : $Id: update_302_303.sql 1237 2012-02-23 06:49:34Z martin $ +-- Revision : $LastChangedRevision: 2 $ +-- SVN-ID : $Id: update_302_303.sql 2 2017-06-22 07:29:35Z martin $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/update_303_304.sql b/install/sql/update_303_304.sql index f6e9a79..57a2444 100644 --- a/install/sql/update_303_304.sql +++ b/install/sql/update_303_304.sql @@ -8,11 +8,11 @@ -- Project : NagiosQL -- Component : Update from NagiosQL 3.0.3 to NagiosQL 3.0.4 -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2011-03-13 14:00:26 +0100 (Sun, 13 Mar 2011) $ --- Author : $LastChangedBy: rouven $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ +-- Author : $LastChangedBy: martin $ -- Version : 3.1.1 --- Revision : $LastChangedRevision: 1058 $ --- SVN-ID : $Id: update_303_304.sql 1058 2011-03-13 13:00:26Z rouven $ +-- Revision : $LastChangedRevision: 2 $ +-- SVN-ID : $Id: update_303_304.sql 2 2017-06-22 07:29:35Z martin $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/update_304_310.sql b/install/sql/update_304_310.sql index 72c3c35..e6c0995 100644 --- a/install/sql/update_304_310.sql +++ b/install/sql/update_304_310.sql @@ -8,10 +8,10 @@ -- Project : NagiosQL -- Component : Update from NagiosQL 3.0.4 to NagiosQL 3.1.0 -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-02-27 07:58:18 +0100 (Mon, 27 Feb 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ -- Version : 3.1.1 --- Revision : $LastChangedRevision: 1255 $ +-- Revision : $LastChangedRevision: 2 $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/update_310_311.sql b/install/sql/update_310_311.sql index 4410358..9971acd 100644 --- a/install/sql/update_310_311.sql +++ b/install/sql/update_310_311.sql @@ -8,10 +8,10 @@ -- Project : NagiosQL -- Component : Update from NagiosQL 3.1.0 to NagiosQL 3.1.1 -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-02-23 07:49:34 +0100 (Thu, 23 Feb 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ -- Version : 3.1.1 --- Revision : $LastChangedRevision: 1237 $ +-- Revision : $LastChangedRevision: 2 $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/update_310_320.sql b/install/sql/update_310_320.sql index 4837267..57116a3 100644 --- a/install/sql/update_310_320.sql +++ b/install/sql/update_310_320.sql @@ -8,10 +8,10 @@ -- Project : NagiosQL -- Component : Update from NagiosQL 3.1.x to NagiosQL 3.2.0 -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-03-12 22:41:04 +0100 (Mon, 12 Mar 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ -- Version : 3.2.0 --- Revision : $LastChangedRevision: 1291 $ +-- Revision : $LastChangedRevision: 2 $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/sql/update_311_320.sql b/install/sql/update_311_320.sql index c57f38c..4881ead 100644 --- a/install/sql/update_311_320.sql +++ b/install/sql/update_311_320.sql @@ -8,10 +8,10 @@ -- Project : NagiosQL -- Component : Update from NagiosQL 3.1.x to NagiosQL 3.2.0 -- Website : www.nagiosql.org --- Date : $LastChangedDate: 2012-03-12 22:41:04 +0100 (Mon, 12 Mar 2012) $ +-- Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ -- Author : $LastChangedBy: martin $ -- Version : 3.2.0 --- Revision : $LastChangedRevision: 1291 $ +-- Revision : $LastChangedRevision: 2 $ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- diff --git a/install/step1.php b/install/step1.php index 73ed438..3ea77f8 100644 --- a/install/step1.php +++ b/install/step1.php @@ -5,15 +5,15 @@ // /////////////////////////////////////////////////////////////////////////////// // -// (c) 2005-2012 by Martin Willisegger +// (c) 2005-2017 by Martin Willisegger // // Project : NagiosQL // Component : Installer script - step 1 // Website : http://www.nagiosql.org -// Date : $LastChangedDate: 2012-02-25 17:48:16 +0100 (Sat, 25 Feb 2012) $ +// Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ // Author : $LastChangedBy: martin $ -// Version : 3.2.0 -// Revision : $LastChangedRevision: 1252 $ +// Version : 3.3.0 +// Revision : $LastChangedRevision: 2 $ // /////////////////////////////////////////////////////////////////////////////// // @@ -38,15 +38,17 @@ $arrRequiredExt = array ( $arrOptionalExt = array ( 'FTP' => 'ftp', 'SSH2' => 'ssh2' -); -//$arrSupportedDBs = array ( -// 'MySQL' => 'mysql', -// 'Postgres' => 'pgsql' -//); -$arrSupportedDBs = array ( - 'MySQL' => 'mysql' ); - +/* +$arrSupportedDBs = array ( + 'MySQL' => 'mysql', + 'MySQLi' => 'mysqli', + 'Postgres' => 'pgsql' +); +*/ +$arrSupportedDBs = array ( + 'MySQLi' => 'mysqli' +); $arrIniCheck = array ( 'file_uploads' => 1, 'session.auto_start' => 0, @@ -69,7 +71,7 @@ $arrSourceURLs = array( 'XML' => 'http://www.php.net/manual/en/book.xml.php', 'SimpleXML' => 'http://www.php.net/manual/en/book.simplexml.php', 'FTP' => 'http://www.php.net/manual/en/book.ftp.php', - 'MySQL' => 'http://php.net/manual/de/book.mysql.php', + 'MySQL' => 'http://php.net/manual/de/book.mysqli.php', 'PEAR' => 'http://pear.php.net', 'date.timezone' => 'http://www.php.net/manual/en/datetime.configuration.php#ini.date.timezone', 'SSH2' => 'http://pecl.php.net/package/ssh2' @@ -77,20 +79,20 @@ $arrSourceURLs = array( // // Build content // ============= -$arrTemplate['STEP1_BOX'] = translate('Requirements'); -$arrTemplate['STEP2_BOX'] = translate($_SESSION['install']['mode']); -$arrTemplate['STEP3_BOX'] = translate('Finish'); -$arrTemplate['STEP1_TITLE'] = "NagiosQL ".translate($_SESSION['install']['mode']).": ".translate("Checking requirements"); -$arrTemplate['STEP1_SUBTITLE1'] = translate("Checking Client"); -$arrTemplate['STEP1_SUBTITLE2'] = translate("Checking PHP version"); -$arrTemplate['STEP1_SUBTITLE3'] = translate("Checking PHP extensions"); -$arrTemplate['STEP1_SUBTITLE4'] = translate("Checking available database interfaces"); -$arrTemplate['STEP1_SUBTITLE5'] = translate("Checking php.ini/.htaccess settings"); -$arrTemplate['STEP1_SUBTITLE6'] = translate("Checking System Permission"); -$arrTemplate['STEP1_TEXT3_1'] = translate("The following modules/extensions are required to run NagiosQL"); -$arrTemplate['STEP1_TEXT3_2'] = translate("The next couple of extensions are optional but recommended"); -$arrTemplate['STEP1_TEXT4_1'] = translate("Check which of the supported extensions are installed. At least one of them is required."); -$arrTemplate['STEP1_TEXT5_1'] = translate("The following settings are required to run NagiosQL"); +$arrTemplate['STEP1_BOX'] = $myInstClass->translate('Requirements'); +$arrTemplate['STEP2_BOX'] = $myInstClass->translate($_SESSION['install']['mode']); +$arrTemplate['STEP3_BOX'] = $myInstClass->translate('Finish'); +$arrTemplate['STEP1_TITLE'] = "NagiosQL ".$myInstClass->translate($_SESSION['install']['mode']).": ".$myInstClass->translate("Checking requirements"); +$arrTemplate['STEP1_SUBTITLE1'] = $myInstClass->translate("Checking Client"); +$arrTemplate['STEP1_SUBTITLE2'] = $myInstClass->translate("Checking PHP version"); +$arrTemplate['STEP1_SUBTITLE3'] = $myInstClass->translate("Checking PHP extensions"); +$arrTemplate['STEP1_SUBTITLE4'] = $myInstClass->translate("Checking available database interfaces"); +$arrTemplate['STEP1_SUBTITLE5'] = $myInstClass->translate("Checking php.ini/.htaccess settings"); +$arrTemplate['STEP1_SUBTITLE6'] = $myInstClass->translate("Checking System Permission"); +$arrTemplate['STEP1_TEXT3_1'] = $myInstClass->translate("The following modules/extensions are required to run NagiosQL"); +$arrTemplate['STEP1_TEXT3_2'] = $myInstClass->translate("The next couple of extensions are optional but recommended"); +$arrTemplate['STEP1_TEXT4_1'] = $myInstClass->translate("Check which of the supported extensions are installed. At least one of them is required."); +$arrTemplate['STEP1_TEXT5_1'] = $myInstClass->translate("The following settings are required to run NagiosQL"); // // Conditional checks // ======================= @@ -104,19 +106,21 @@ $strHTMLPart7 = "
![\"online](\"images/onlinehelp.png\" "\\"")
translate("ENABLED");
+ $arrTemplate['CHECK_1_INFO'] = "";
} else {
- $arrTemplate['CHECK_1_PIC'] = "invalid"; $arrTemplate['CHECK_1_CLASS'] = "green"; $arrTemplate['CHECK_1_VALUE'] = translate("NOT ENABLED");
+ $arrTemplate['CHECK_1_PIC'] = "invalid"; $arrTemplate['CHECK_1_CLASS'] = "green"; $arrTemplate['CHECK_1_VALUE'] = $myInstClass->translate("NOT ENABLED");
+ $arrTemplate['CHECK_1_INFO'] = "(".$myInstClass->translate("After enabling Javascript, the page must be updated twice so that the status changes").")";
}
// PHP version check
define('MIN_PHP_VERSION', '5.2.0');
-$arrTemplate['CHECK_2_TEXT'] = translate("Version");
+$arrTemplate['CHECK_2_TEXT'] = $myInstClass->translate("Version");
if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) {
- $arrTemplate['CHECK_2_PIC'] = "valid"; $arrTemplate['CHECK_2_CLASS'] = "green"; $arrTemplate['CHECK_2_VALUE'] = translate("OK");
- $arrTemplate['CHECK_2_INFO'] = "(PHP ". PHP_VERSION ." ".translate("detected").")";
+ $arrTemplate['CHECK_2_PIC'] = "valid"; $arrTemplate['CHECK_2_CLASS'] = "green"; $arrTemplate['CHECK_2_VALUE'] = $myInstClass->translate("OK");
+ $arrTemplate['CHECK_2_INFO'] = "(PHP ". PHP_VERSION ." ".$myInstClass->translate("detected").")";
} else {
- $arrTemplate['CHECK_2_PIC'] = "invalid"; $arrTemplate['CHECK_2_CLASS'] = "green"; $arrTemplate['CHECK_2_VALUE'] = "PHP ". PHP_VERSION ." ".translate("detected");
- $arrTemplate['CHECK_2_INFO'] = "(PHP ". MIN_PHP_VERSION ." ".translate("or greater is required").")";
+ $arrTemplate['CHECK_2_PIC'] = "invalid"; $arrTemplate['CHECK_2_CLASS'] = "green"; $arrTemplate['CHECK_2_VALUE'] = "PHP ". PHP_VERSION ." ".$myInstClass->translate("detected");
+ $arrTemplate['CHECK_2_INFO'] = "(PHP ". MIN_PHP_VERSION ." ".$myInstClass->translate("or greater is required").")";
$intError = 1;
}
// PHP modules / extensions
@@ -125,11 +129,11 @@ $strPrefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
$strHTML = "";
foreach ($arrRequiredExt as $key => $elem) {
if (extension_loaded($elem)) {
- $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.translate("OK")."\n";
+ $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.$myInstClass->translate("OK")."\n";
} else {
$strPath = $strExtPath."/".$strPrefix.$elem.".".PHP_SHLIB_SUFFIX;
- $strMsg = @is_readable($strPath) ? translate("Could be loaded. Please add in php.ini") : "".$strHTMLPart7."";
- $strHTML .= $strHTMLPart2.$key.$strHTMLPart5.translate("NOT AVAILABLE")." (".$strMsg.")\n";
+ $strMsg = @is_readable($strPath) ? $myInstClass->translate("Could be loaded. Please add in php.ini") : "".$strHTMLPart7."";
+ $strHTML .= $strHTMLPart2.$key.$strHTMLPart5.$myInstClass->translate("NOT AVAILABLE")." (".$strMsg.")\n";
$intError = 1;
}
$strHTML .= "\n"; @@ -138,11 +142,11 @@ $arrTemplate['CHECK_3_CONTENT_1'] = $strHTML; $strHTML = ""; foreach ($arrOptionalExt as $key => $elem) { if (extension_loaded($elem)) { - $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.translate("OK")."\n"; + $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.$myInstClass->translate("OK")."\n"; } else { $strPath = $strExtPath."/".$strPrefix.$elem.".".PHP_SHLIB_SUFFIX; - $strMsg = @is_readable($strPath) ? translate("Could be loaded. Please add in php.ini") : "".$strHTMLPart7.""; - $strHTML .= $strHTMLPart3.$key.$strHTMLPart6.translate("NOT AVAILABLE")." (".$strMsg.")\n"; + $strMsg = @is_readable($strPath) ? $myInstClass->translate("Could be loaded. Please add in php.ini") : "".$strHTMLPart7.""; + $strHTML .= $strHTMLPart3.$key.$strHTMLPart6.$myInstClass->translate("NOT AVAILABLE")." (".$strMsg.")\n"; //$intError = 1; } $strHTML .= "
\n"; @@ -151,16 +155,22 @@ $arrTemplate['CHECK_3_CONTENT_2'] = $strHTML; // PHP database interfaces $strHTML = ""; $intTemp = 0; +$_SESSION['install']['dbtype_available'] = array(); foreach ($arrSupportedDBs as $key => $elem) { if (extension_loaded($elem)) { $strNewInstallOnly = ""; - if (($_SESSION['install']['dbtype'] != $elem) && ($_SESSION['install']['mode'] == "Update")) $strNewInstallOnly = " (".translate("New installation only - updates are only supported using the same database interface!").")"; - $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.translate("OK")." $strNewInstallOnly\n"; + if (isset($_SESSION['install']['dbtype']) && ($_SESSION['install']['mode'] == "Update")) { + if (($_SESSION['install']['dbtype'] != $elem) && (substr($_SESSION['install']['dbtype'],0,5) != substr($elem,0,5))) { + $strNewInstallOnly = " (".$myInstClass->translate("New installation only - updates are only supported using the same database interface!").")"; + } + } + $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.$myInstClass->translate("OK")." $strNewInstallOnly\n"; + if ($strNewInstallOnly == "") $_SESSION['install']['dbtype_available'][] = $elem; $intTemp++; } else { $strPath = $strExtPath."/".$strPrefix.$elem.".".PHP_SHLIB_SUFFIX; - $strMsg = @is_readable($strPath) ? translate("Could be loaded. Please add in php.ini") : "".$strHTMLPart7.""; - $strHTML .= $strHTMLPart2.$key.$strHTMLPart5.translate("NOT AVAILABLE")." (".$strMsg.")\n"; + $strMsg = @is_readable($strPath) ? $myInstClass->translate("Could be loaded. Please add in php.ini") : "".$strHTMLPart7.""; + $strHTML .= $strHTMLPart2.$key.$strHTMLPart5.$myInstClass->translate("NOT AVAILABLE")." (".$strMsg.")\n"; } $strHTML .= "
\n"; } @@ -172,16 +182,16 @@ foreach ($arrIniCheck as $key => $elem) { $strStatus = ini_get($key); if ($elem === '-NOTEMPTY-') { if (empty($strStatus)) { - $strHTML .= $strHTMLPart2.$key.$strHTMLPart5.translate("NOT AVAILABLE")." (".translate("cannot be empty and needs to be set").")\n"; + $strHTML .= $strHTMLPart2.$key.$strHTMLPart5.$myInstClass->translate("NOT AVAILABLE")." (".$myInstClass->translate("cannot be empty and needs to be set").")\n"; $intError = 1; } else { - $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.translate("OK")."\n"; + $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.$myInstClass->translate("OK")."\n"; } } else { if ($strStatus == $elem) { - $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.translate("OK")."\n"; + $strHTML .= $strHTMLPart1.$key.$strHTMLPart4.$myInstClass->translate("OK")."\n"; } else { - $strHTML .= $strHTMLPart2.$key.$strHTMLPart5.$status." (".translate("should be")." ".$elem.")\n"; + $strHTML .= $strHTMLPart2.$key.$strHTMLPart5.$status." (".$myInstClass->translate("should be")." ".$elem.")\n"; $intError = 1; } } @@ -191,77 +201,79 @@ $arrTemplate['CHECK_5_CONTENT_1'] = $strHTML; // File access checks $strConfigFile = "../config/settings.php"; if (file_exists($strConfigFile) && is_readable($strConfigFile)) { - $arrTemplate['CHECK_6_CONTENT_1'] = $strHTMLPart1.translate("Read test on settings file (config/settings.php)").$strHTMLPart4.translate("OK")."
\n"; + $arrTemplate['CHECK_6_CONTENT_1'] = $strHTMLPart1.$myInstClass->translate("Read test on settings file (config/settings.php)").$strHTMLPart4.$myInstClass->translate("OK")."
\n"; } else if (file_exists($strConfigFile)&& !is_readable($strConfigFile)) { - $arrTemplate['CHECK_6_CONTENT_1'] = $strHTMLPart2.translate("Read test on settings file (config/settings.php)").$strHTMLPart5.translate("failed")."
\n"; + $arrTemplate['CHECK_6_CONTENT_1'] = $strHTMLPart2.$myInstClass->translate("Read test on settings file (config/settings.php)").$strHTMLPart5.$myInstClass->translate("failed")."
\n"; } elseif (!file_exists($strConfigFile)) { - $arrTemplate['CHECK_6_CONTENT_1'] = $strHTMLPart3.translate("Settings file does not exists (config/settings.php)").$strHTMLPart6.translate("will be created")."
\n"; + $arrTemplate['CHECK_6_CONTENT_1'] = $strHTMLPart3.$myInstClass->translate("Settings file does not exists (config/settings.php)").$strHTMLPart6.$myInstClass->translate("will be created")."
\n"; } if(file_exists($strConfigFile) && is_writable($strConfigFile)) { - $arrTemplate['CHECK_6_CONTENT_2'] = $strHTMLPart1.translate("Write test on settings file (config/settings.php)").$strHTMLPart4.translate("OK")."
\n"; + $arrTemplate['CHECK_6_CONTENT_2'] = $strHTMLPart1.$myInstClass->translate("Write test on settings file (config/settings.php)").$strHTMLPart4.$myInstClass->translate("OK")."
\n"; } else if (is_writable("../config") && !file_exists($strConfigFile)) { - $arrTemplate['CHECK_6_CONTENT_2'] = $strHTMLPart1.translate("Write test on settings directory (config/)").$strHTMLPart4.translate("OK")."
\n"; + $arrTemplate['CHECK_6_CONTENT_2'] = $strHTMLPart1.$myInstClass->translate("Write test on settings directory (config/)").$strHTMLPart4.$myInstClass->translate("OK")."
\n"; } else if (file_exists($strConfigFile) && !is_writable($strConfigFile)) { - $arrTemplate['CHECK_6_CONTENT_2'] = $strHTMLPart2.translate("Write test on settings file (config/settings.php)").$strHTMLPart5.translate("failed")."
\n"; + $arrTemplate['CHECK_6_CONTENT_2'] = $strHTMLPart2.$myInstClass->translate("Write test on settings file (config/settings.php)").$strHTMLPart5.$myInstClass->translate("failed")."
\n"; $intError = 1; } else { - $arrTemplate['CHECK_6_CONTENT_2'] = $strHTMLPart2.translate("Write test on settings directory (config/)").$strHTMLPart5.translate("failed")."
\n"; + $arrTemplate['CHECK_6_CONTENT_2'] = $strHTMLPart2.$myInstClass->translate("Write test on settings directory (config/)").$strHTMLPart5.$myInstClass->translate("failed")."
\n"; $intError = 1; } $strClassFile = "../functions/nag_class.php"; if(file_exists($strClassFile) && is_readable($strClassFile)) { - $arrTemplate['CHECK_6_CONTENT_3'] = $strHTMLPart1.translate("Read test on a class file (functions/nag_class.php)").$strHTMLPart4.translate("OK")."
\n"; + $arrTemplate['CHECK_6_CONTENT_3'] = $strHTMLPart1.$myInstClass->translate("Read test on a class file (functions/nag_class.php)").$strHTMLPart4.$myInstClass->translate("OK")."
\n"; } else { - $arrTemplate['CHECK_6_CONTENT_3'] = $strHTMLPart2.translate("Read test on a class file (functions/nag_class.php)").$strHTMLPart5.translate("failed")."
\n"; + $arrTemplate['CHECK_6_CONTENT_3'] = $strHTMLPart2.$myInstClass->translate("Read test on a class file (functions/nag_class.php)").$strHTMLPart5.$myInstClass->translate("failed")."
\n"; $intError = 1; } $strFile = "../admin.php"; if(file_exists($strFile) && is_readable($strFile)) { - $arrTemplate['CHECK_6_CONTENT_4'] = $strHTMLPart1.translate("Read test on startsite file (admin.php)").$strHTMLPart4.translate("OK")."
\n"; + $arrTemplate['CHECK_6_CONTENT_4'] = $strHTMLPart1.$myInstClass->translate("Read test on startsite file (admin.php)").$strHTMLPart4.$myInstClass->translate("OK")."
\n"; } else { - $arrTemplate['CHECK_6_CONTENT_4'] = $strHTMLPart2.translate("Read test on startsite file (admin.php)").$strHTMLPart5.translate("failed")."
\n"; + $arrTemplate['CHECK_6_CONTENT_4'] = $strHTMLPart2.$myInstClass->translate("Read test on startsite file (admin.php)").$strHTMLPart5.$myInstClass->translate("failed")."
\n"; $intError = 1; } $strFile = "../templates/index.tpl.htm"; if(file_exists($strFile) && is_readable($strFile)) { - $arrTemplate['CHECK_6_CONTENT_5'] = $strHTMLPart1.translate("Read test on a template file (templates/index.tpl.htm)").$strHTMLPart4.translate("OK")."
\n"; + $arrTemplate['CHECK_6_CONTENT_5'] = $strHTMLPart1.$myInstClass->translate("Read test on a template file (templates/index.tpl.htm)").$strHTMLPart4.$myInstClass->translate("OK")."
\n"; } else { - $arrTemplate['CHECK_6_CONTENT_5'] = $strHTMLPart2.translate("Read test on a template file (templates/index.tpl.htm)").$strHTMLPart5.translate("failed")."
\n"; + $arrTemplate['CHECK_6_CONTENT_5'] = $strHTMLPart2.$myInstClass->translate("Read test on a template file (templates/index.tpl.htm)").$strHTMLPart5.$myInstClass->translate("failed")."
\n"; $intError = 1; } $strFile = "../templates/admin/admin_master.tpl.htm"; if(file_exists($strFile) && is_readable($strFile)) { - $arrTemplate['CHECK_6_CONTENT_6'] = $strHTMLPart1.translate("Read test on a admin template file (templates/admin/admin_master.tpl.htm)").$strHTMLPart4.translate("OK")."
\n"; + $arrTemplate['CHECK_6_CONTENT_6'] = $strHTMLPart1.$myInstClass->translate("Read test on a admin template file (templates/admin/admin_master.tpl.htm)").$strHTMLPart4.$myInstClass->translate("OK")."
\n"; } else { - $arrTemplate['CHECK_6_CONTENT_6'] = $strHTMLPart2.translate("Read test on a admin template file (templates/admin/admin_master.tpl.htm)").$strHTMLPart5.translate("failed")."
\n"; + $arrTemplate['CHECK_6_CONTENT_6'] = $strHTMLPart2.$myInstClass->translate("Read test on a admin template file (templates/admin/admin_master.tpl.htm)").$strHTMLPart5.$myInstClass->translate("failed")."
\n"; $intError = 1; } $strFile = "../templates/files/contacts.tpl.dat"; if(file_exists($strFile) && is_readable($strFile)) { - $arrTemplate['CHECK_6_CONTENT_7'] = $strHTMLPart1.translate("Read test on a file template (templates/files/contacts.tpl.dat)").$strHTMLPart4.translate("OK")."
\n"; + $arrTemplate['CHECK_6_CONTENT_7'] = $strHTMLPart1.$myInstClass->translate("Read test on a file template (templates/files/contacts.tpl.dat)").$strHTMLPart4.$myInstClass->translate("OK")."
\n"; } else { - $arrTemplate['CHECK_6_CONTENT_7'] = $strHTMLPart2.translate("Read test on a file template (templates/files/contacts.tpl.dat)").$strHTMLPart5.translate("failed")."
\n"; + $arrTemplate['CHECK_6_CONTENT_7'] = $strHTMLPart2.$myInstClass->translate("Read test on a file template (templates/files/contacts.tpl.dat)").$strHTMLPart5.$myInstClass->translate("failed")."
\n"; $intError = 1; } $strFile = "../images/pixel.gif"; if(file_exists($strFile) && is_readable($strFile)) { - $arrTemplate['CHECK_6_CONTENT_8'] = $strHTMLPart1.translate("Read test on a image file (images/pixel.gif)").$strHTMLPart4.translate("OK")."
\n"; + $arrTemplate['CHECK_6_CONTENT_8'] = $strHTMLPart1.$myInstClass->translate("Read test on a image file (images/pixel.gif)").$strHTMLPart4.$myInstClass->translate("OK")."
\n"; } else { - $arrTemplate['CHECK_6_CONTENT_9'] = $strHTMLPart2.translate("Read test on a image file (images/pixel.gif)").$strHTMLPart5.translate("failed")."
\n"; + $arrTemplate['CHECK_6_CONTENT_9'] = $strHTMLPart2.$myInstClass->translate("Read test on a image file (images/pixel.gif)").$strHTMLPart5.$myInstClass->translate("failed")."
\n"; $intError = 1; } if ($intError != 0) { - $arrTemplate['MESSAGE'] = "".translate("There are some errors - please check your system settings and read the requirements of NagiosQL!")."
\n"; - $arrTemplate['MESSAGE'] .= translate("Read the INSTALLATION file from NagiosQL to find out, how to fix them.") ."
\n"; - $arrTemplate['MESSAGE'] .= translate("After that - refresh this page to proceed") ."...
\n"; + $arrTemplate['MESSAGE'] = "".$myInstClass->translate("There are some errors - please check your system settings and read the requirements of NagiosQL!")."
\n"; + $arrTemplate['MESSAGE'] .= $myInstClass->translate("Read the INSTALLATION file in the NagiosQL doc directory or the installation PDF file on our"); + $arrTemplate['MESSAGE'] .= " "; + $arrTemplate['MESSAGE'] .= $myInstClass->translate("online documentation")."
".$myInstClass->translate("site to find out, how to fix them.") ."
\n"; + $arrTemplate['MESSAGE'] .= $myInstClass->translate("After that - refresh this page to proceed") ."...
\n"; $arrTemplate['DIV_ID'] = "install-center"; $arrTemplate['FORM_CONTENT'] = "
"; - $arrTemplate['FORM_CONTENT'] .= translate("Refresh")."\n"; + $arrTemplate['FORM_CONTENT'] .= $myInstClass->translate("Refresh")."\n"; } else { - $arrTemplate['MESSAGE'] = "".translate("Environment test sucessfully passed")."
\n"; + $arrTemplate['MESSAGE'] = "".$myInstClass->translate("Environment test sucessfully passed")."
\n"; $arrTemplate['DIV_ID'] = "install-next"; $arrTemplate['FORM_CONTENT'] = "\n"; - $arrTemplate['FORM_CONTENT'] .= "
".translate("Next")."\n"; + $arrTemplate['FORM_CONTENT'] .= "
".$myInstClass->translate("Next")."\n"; } // // Write content diff --git a/install/step2.php b/install/step2.php index 8fe576c..5a6a120 100644 --- a/install/step2.php +++ b/install/step2.php @@ -5,15 +5,15 @@ // /////////////////////////////////////////////////////////////////////////////// // -// (c) 2005-2012 by Martin Willisegger +// (c) 2005-2017 by Martin Willisegger // // Project : NagiosQL // Component : Installer script - step 2 // Website : http://www.nagiosql.org -// Date : $LastChangedDate: 2012-02-23 11:44:55 +0100 (Thu, 23 Feb 2012) $ +// Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ // Author : $LastChangedBy: martin $ -// Version : 3.2.0 -// Revision : $LastChangedRevision: 1239 $ +// Version : 3.3.0 +// Revision : $LastChangedRevision: 2 $ // /////////////////////////////////////////////////////////////////////////////// // @@ -30,56 +30,66 @@ $intError = 0; // // Build content // ============= -$arrTemplate['PASSWD_MESSAGE'] = translate('The NagiosQL first passwords are not equal!'); -$arrTemplate['FIELDS_MESSAGE'] = translate('Please fill in all fields marked with an *'); -$arrTemplate['STEP1_BOX'] = translate('Requirements'); -$arrTemplate['STEP2_BOX'] = translate($_SESSION['install']['mode']); -$arrTemplate['STEP3_BOX'] = translate('Finish'); -$arrTemplate['STEP2_TITLE'] = "NagiosQL ".translate($_SESSION['install']['mode']).": ".translate("Setup"); -$arrTemplate['STEP2_TEXT1_1'] = translate("Please complete the form below. Mandatory fields marked *"); -$arrTemplate['STEP2_TEXT2_1'] = translate("Database Configuration"); -$arrTemplate['STEP2_TEXT2_2'] = translate("Database Type"); -$arrTemplate['STEP2_VALUE2_2'] = htmlspecialchars($_SESSION['install']['dbtype'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT2_3'] = translate("Database Server"); +$arrTemplate['PASSWD_MESSAGE'] = $myInstClass->translate('The NagiosQL first passwords are not equal!'); +$arrTemplate['FIELDS_MESSAGE'] = $myInstClass->translate('Please fill in all fields marked with an *'); +$arrTemplate['STEP1_BOX'] = $myInstClass->translate('Requirements'); +$arrTemplate['STEP2_BOX'] = $myInstClass->translate($_SESSION['install']['mode']); +$arrTemplate['STEP3_BOX'] = $myInstClass->translate('Finish'); +$arrTemplate['STEP2_TITLE'] = "NagiosQL ".$myInstClass->translate($_SESSION['install']['mode']).": ".$myInstClass->translate("Setup"); +$arrTemplate['STEP2_TEXT1_1'] = $myInstClass->translate("Please complete the form below. Mandatory fields marked *"); +$arrTemplate['STEP2_TEXT2_1'] = $myInstClass->translate("Database Configuration"); +$arrTemplate['STEP2_TEXT2_2'] = $myInstClass->translate("Database Type"); +if (is_array($_SESSION['install']['dbtype_available']) && (count($_SESSION['install']['dbtype_available']) != 0)) { + $strDBType = ""; + foreach ($_SESSION['install']['dbtype_available'] AS $elem) { + $strSelected = ""; + if (isset($_SESSION['install']['dbtype']) && ($_SESSION['install']['dbtype'] == $elem)) $strSelected = "selected=\"selected\""; + $strDBType .= "\n"; + } +} else { + $strDBType .= "\n"; +} +$arrTemplate['STEP2_VALUE2_2'] = $strDBType; +$arrTemplate['STEP2_TEXT2_3'] = $myInstClass->translate("Database Server"); $arrTemplate['STEP2_VALUE2_3'] = htmlspecialchars($_SESSION['install']['dbserver'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT2_4'] = translate("Local hostname or IP address"); +$arrTemplate['STEP2_TEXT2_4'] = $myInstClass->translate("Local hostname or IP address"); if (htmlspecialchars($_SESSION['install']['dbserver'], ENT_QUOTES, 'utf-8') == "localhost") { $arrTemplate['STEP2_VALUE2_4'] = htmlspecialchars($_SESSION['install']['dbserver'], ENT_QUOTES, 'utf-8'); }else { $arrTemplate['STEP2_VALUE2_4'] = $_SERVER['SERVER_ADDR']; } -$arrTemplate['STEP2_TEXT2_5'] = translate("Database Server Port"); +$arrTemplate['STEP2_TEXT2_5'] = $myInstClass->translate("Database Server Port"); $arrTemplate['STEP2_VALUE2_5'] = htmlspecialchars($_SESSION['install']['dbport'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT2_6'] = translate("Database name"); +$arrTemplate['STEP2_TEXT2_6'] = $myInstClass->translate("Database name"); $arrTemplate['STEP2_VALUE2_6'] = htmlspecialchars($_SESSION['install']['dbname'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT2_7'] = translate("NagiosQL DB User"); +$arrTemplate['STEP2_TEXT2_7'] = $myInstClass->translate("NagiosQL DB User"); $arrTemplate['STEP2_VALUE2_7'] = htmlspecialchars($_SESSION['install']['dbuser'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT2_8'] = translate("NagiosQL DB Password"); +$arrTemplate['STEP2_TEXT2_8'] = $myInstClass->translate("NagiosQL DB Password"); $arrTemplate['STEP2_VALUE2_8'] = htmlspecialchars($_SESSION['install']['dbpass'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT2_9'] = translate("Administrative Database User"); +$arrTemplate['STEP2_TEXT2_9'] = $myInstClass->translate("Administrative Database User"); $arrTemplate['STEP2_VALUE2_9'] = htmlspecialchars($_SESSION['install']['admuser'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT2_10'] = translate("Administrative Database Password"); -$arrTemplate['STEP2_TEXT2_11'] = translate("Drop database if already exists?"); +$arrTemplate['STEP2_TEXT2_10'] = $myInstClass->translate("Administrative Database Password"); +$arrTemplate['STEP2_TEXT2_11'] = $myInstClass->translate("Drop database if already exists?"); if ($_SESSION['install']['dbdrop'] == 1) {$arrTemplate['STEP2_VALUE2_11'] = "checked";} else {$arrTemplate['STEP2_VALUE2_11'] = "";} -$arrTemplate['STEP2_TEXT3_1'] = translate("NagiosQL User Setup"); -$arrTemplate['STEP2_TEXT3_2'] = translate("Initial NagiosQL User"); +$arrTemplate['STEP2_TEXT3_1'] = $myInstClass->translate("NagiosQL User Setup"); +$arrTemplate['STEP2_TEXT3_2'] = $myInstClass->translate("Initial NagiosQL User"); $arrTemplate['STEP2_VALUE3_2'] = htmlspecialchars($_SESSION['install']['qluser'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT3_3'] = translate("Initial NagiosQL Password"); +$arrTemplate['STEP2_TEXT3_3'] = $myInstClass->translate("Initial NagiosQL Password"); $arrTemplate['STEP2_VALUE3_3'] = htmlspecialchars($_SESSION['install']['qlpass'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT3_4'] = translate("Please repeat the password"); -$arrTemplate['STEP2_TEXT4_1'] = translate("Nagios Configuration"); -$arrTemplate['STEP2_TEXT4_2'] = translate("Import Nagios sample config?"); +$arrTemplate['STEP2_TEXT3_4'] = $myInstClass->translate("Please repeat the password"); +$arrTemplate['STEP2_TEXT4_1'] = $myInstClass->translate("Nagios Configuration"); +$arrTemplate['STEP2_TEXT4_2'] = $myInstClass->translate("Import Nagios sample config?"); if ($_SESSION['install']['sample'] == 1) {$arrTemplate['STEP2_VALUE4_2'] = "checked";} else {$arrTemplate['STEP2_VALUE4_2'] = "";} -$arrTemplate['STEP2_FORM_1'] = translate("Next"); -$arrTemplate['STEP2_TEXT5_1'] = translate("NagiosQL path values"); -$arrTemplate['STEP2_TEXT5_2'] = translate("Create NagiosQL config paths?"); +$arrTemplate['STEP2_FORM_1'] = $myInstClass->translate("Next"); +$arrTemplate['STEP2_TEXT5_1'] = $myInstClass->translate("NagiosQL path values"); +$arrTemplate['STEP2_TEXT5_2'] = $myInstClass->translate("Create NagiosQL config paths?"); if ($_SESSION['install']['createpath'] == 1) {$arrTemplate['STEP2_VALUE5_2'] = "checked";} else {$arrTemplate['STEP2_VALUE5_2'] = "";} -$arrTemplate['STEP2_TEXT5_3'] = translate("NagiosQL config path"); +$arrTemplate['STEP2_TEXT5_3'] = $myInstClass->translate("NagiosQL config path"); $arrTemplate['STEP2_VALUE5_3'] = htmlspecialchars($_SESSION['install']['qlpath'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT5_4'] = translate("Nagios config path"); +$arrTemplate['STEP2_TEXT5_4'] = $myInstClass->translate("Nagios config path"); $arrTemplate['STEP2_VALUE5_4'] = htmlspecialchars($_SESSION['install']['nagpath'], ENT_QUOTES, 'utf-8'); -$arrTemplate['STEP2_TEXT5_5'] = translate("Both path values were stored in your configuration target settings for localhost."); -$arrTemplate['STEP2_TEXT5_6'] = translate("If you select the create path option, be sure that the NagiosQL base path exist and the webserver demon has write access to it. So the installer will create the required subdirectories in your localhost's filesystem (hosts, services, backup etc.)"); +$arrTemplate['STEP2_TEXT5_5'] = $myInstClass->translate("Both path values were stored in your configuration target settings for localhost."); +$arrTemplate['STEP2_TEXT5_6'] = $myInstClass->translate("If you select the create path option, be sure that the NagiosQL base path exist and the webserver demon has write access to it. So the installer will create the required subdirectories in your localhost's filesystem (hosts, services, backup etc.)"); $arrTemplate['INSTALL_FIELDS'] = ""; // @@ -91,7 +101,7 @@ $arrTemplate['STEP2_TEXT1_2'] = ""; // Conditional checks // ======================= if ($_SESSION['install']['mode'] == "Update") { - $arrTemplate['STEP2_TEXT1_2'] = "
".translate("Please backup your database before proceeding!")."
\n"; + $arrTemplate['STEP2_TEXT1_2'] = "".$myInstClass->translate("Please backup your database before proceeding!")."
\n"; $arrTemplate['INST_VISIBLE'] = "hidefield"; } else { $arrTemplate['INSTALL_FIELDS'] = ",tfDBprivUser,tfDBprivPass,tfQLuser,tfQLpass"; diff --git a/install/step3.php b/install/step3.php index b331381..cf8ecdc 100644 --- a/install/step3.php +++ b/install/step3.php @@ -5,15 +5,15 @@ // /////////////////////////////////////////////////////////////////////////////// // -// (c) 2005-2012 by Martin Willisegger +// (c) 2005-2017 by Martin Willisegger // // Project : NagiosQL // Component : Installer script - step 2 // Website : http://www.nagiosql.org -// Date : $LastChangedDate: 2012-02-23 11:44:55 +0100 (Thu, 23 Feb 2012) $ +// Date : $LastChangedDate: 2017-06-22 09:29:35 +0200 (Thu, 22 Jun 2017) $ // Author : $LastChangedBy: martin $ -// Version : 3.2.0 -// Revision : $LastChangedRevision: 1239 $ +// Version : 3.3.0 +// Revision : $LastChangedRevision: 2 $ // /////////////////////////////////////////////////////////////////////////////// // @@ -34,27 +34,28 @@ if(function_exists("date_default_timezone_set") and function_exists("date_defaul // // Build content // ============= -$arrTemplate['STEP1_BOX'] = translate('Requirements'); -$arrTemplate['STEP2_BOX'] = translate($_SESSION['install']['mode']); -$arrTemplate['STEP3_BOX'] = translate('Finish'); -$arrTemplate['STEP3_TITLE'] = "NagiosQL ".translate($_SESSION['install']['mode']).": ".translate("Finishing Setup"); +$arrTemplate['STEP1_BOX'] = $myInstClass->translate('Requirements'); +$arrTemplate['STEP2_BOX'] = $myInstClass->translate($_SESSION['install']['mode']); +$arrTemplate['STEP3_BOX'] = $myInstClass->translate('Finish'); +$arrTemplate['STEP3_TITLE'] = "NagiosQL ".$myInstClass->translate($_SESSION['install']['mode']).": ".$myInstClass->translate("Finishing Setup"); $arrTemplate['INST_VISIBLE'] = "showfield"; -$arrTemplate['STEP4_SUB_TITLE'] = translate("Deploy NagiosQL settings"); -$arrTemplate['STEP3_TEXT_01'] = translate("Database server connection (privileged user)"); -$arrTemplate['STEP3_TEXT_03'] = translate("Database server version"); -$arrTemplate['STEP3_TEXT_05'] = translate("Database server support"); -$arrTemplate['STEP3_TEXT_07'] = translate("Delete existing NagiosQL database"); -$arrTemplate['STEP3_TEXT_09'] = translate("Creating new database"); -$arrTemplate['STEP3_TEXT_11'] = translate("Create NagiosQL database user"); -$arrTemplate['STEP3_TEXT_13'] = translate("Installing NagiosQL database tables"); -$arrTemplate['STEP3_TEXT_15'] = translate("Set initial NagiosQL Administrator"); -$arrTemplate['STEP3_TEXT_17'] = translate("Database server connection (NagiosQL user)"); -$arrTemplate['STEP4_TEXT_01'] = translate("Writing global settings to database"); -$arrTemplate['STEP4_TEXT_03'] = translate("Writing database configuration to settings.php"); -$arrTemplate['STEP4_TEXT_05'] = translate("Import Nagios sample data"); -$arrTemplate['STEP4_TEXT_07'] = translate("Create and/or store NagiosQL path settings"); +$arrTemplate['STEP4_SUB_TITLE'] = $myInstClass->translate("Deploy NagiosQL settings"); +$arrTemplate['STEP3_TEXT_01'] = $myInstClass->translate("Database server connection (privileged user)"); +$arrTemplate['STEP3_TEXT_03'] = $myInstClass->translate("Database server version"); +$arrTemplate['STEP3_TEXT_05'] = $myInstClass->translate("Database server support"); +$arrTemplate['STEP3_TEXT_07'] = $myInstClass->translate("Delete existing NagiosQL database"); +$arrTemplate['STEP3_TEXT_09'] = $myInstClass->translate("Creating new database"); +$arrTemplate['STEP3_TEXT_11'] = $myInstClass->translate("Installing NagiosQL database tables"); +$arrTemplate['STEP3_TEXT_13'] = $myInstClass->translate("Create NagiosQL database user"); +$arrTemplate['STEP3_TEXT_15'] = $myInstClass->translate("Set initial NagiosQL Administrator"); +$arrTemplate['STEP3_TEXT_17'] = $myInstClass->translate("Database server connection (NagiosQL user)"); +$arrTemplate['STEP4_TEXT_01'] = $myInstClass->translate("Writing global settings to database"); +$arrTemplate['STEP4_TEXT_03'] = $myInstClass->translate("Writing database configuration to settings.php"); +$arrTemplate['STEP4_TEXT_05'] = $myInstClass->translate("Import Nagios sample data"); +$arrTemplate['STEP4_TEXT_07'] = $myInstClass->translate("Create and/or store NagiosQL path settings"); $arrTemplate['STEP4_VISIBLE'] = "hidefield"; +$arrTemplate['STEP3_TEXT_02_SHOW'] = "hidefield"; $arrTemplate['STEP3_TEXT_03_SHOW'] = "hidefield"; $arrTemplate['STEP3_TEXT_05_SHOW'] = "hidefield"; $arrTemplate['STEP3_TEXT_07_SHOW'] = "hidefield"; @@ -67,83 +68,144 @@ $arrTemplate['STEP4_TEXT_03_SHOW'] = "hidefield"; $arrTemplate['STEP4_TEXT_05_SHOW'] = "hidefield"; $arrTemplate['STEP4_TEXT_07_SHOW'] = "hidefield"; // +// Check any data before installation +// ================================== +$intInstError = 0; +// // Doing installation/upgrade // ========================== if ($_SESSION['install']['mode'] == "Update") { - $arrTemplate['STEP3_SUB_TITLE'] = translate("Updating existing NagiosQL database"); - if ($_SESSION['install']['dbtype'] == "mysql") { - // Check database connection - if ($intError == 0) $intError = $myInstClass->openAdmDBSrv($arrTemplate['STEP3_TEXT_02'],$strErrorMessage); - if ($intError == 0) $intError = $myInstClass->openDatabase($arrTemplate['STEP3_TEXT_02'],$strErrorMessage); - // Check NagiosQL version - if ($intError == 0) { - $arrTemplate['STEP3_TEXT_03'] = translate("Installed NagiosQL version"); - $arrTemplate['STEP3_TEXT_03_SHOW'] = "showfield"; - $intError = $myInstClass->checkQLVersion($arrTemplate['STEP3_TEXT_04'],$strErrorMessage,$arrUpdate,$setQLVersion); - } - // Upgrade NagiosQL DB - if ($intError == 0) { - $arrTemplate['STEP3_TEXT_05'] = translate("Upgrading from version")." ".$setQLVersion." ".translate("to")." ".$preNagiosQL_ver; - $arrTemplate['STEP3_TEXT_05_SHOW'] = "showfield"; - $intError = $myInstClass->updateQLDB($arrTemplate['STEP3_TEXT_06'],$strErrorMessage,$arrUpdate); - } + $arrTemplate['STEP3_SUB_TITLE'] = $myInstClass->translate("Updating existing NagiosQL database"); + // + // Include database class + // ====================== + if ($_SESSION['install']['dbtype'] == "mysqli") { + // Include and initialize mysqli class + include("../functions/mysqli_class.php"); + $myDBClass = new mysqlidb; + } else if ($_SESSION['install']['dbtype'] == "pgsql") { + // Include and initialize pgsql class + include("../functions/pgsql_class.php"); + $myDBClass = new pgsqldb; + } else { + $strErrorMessage .= $myInstClass->translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")\n"; + $strStatusMessage = "".$myInstClass->translate("failed").""; + $intError = 1; + } + // Set DB parameters + $myDBClass->arrParams['server'] = $_SESSION['install']['dbserver']; + $myDBClass->arrParams['port'] = $_SESSION['install']['dbport']; + $myDBClass->arrParams['username'] = $_SESSION['install']['admuser']; + $myDBClass->arrParams['password'] = $_SESSION['install']['admpass']; + $myDBClass->arrParams['database'] = $_SESSION['install']['dbname']; + // Include classes + if ($intError == 0) $myInstClass->myDBClass =& $myDBClass; + // Check database connection + if ($intError == 0) $intError = $myInstClass->openAdmDBSrv($arrTemplate['STEP3_TEXT_02'],$strErrorMessage); + if ($intError == 0) $intError = $myInstClass->openDatabase($arrTemplate['STEP3_TEXT_02'],$strErrorMessage); + $arrTemplate['STEP3_TEXT_02_SHOW'] = "showfield"; + // Check NagiosQL version + if ($intError == 0) { + $arrTemplate['STEP3_TEXT_03'] = $myInstClass->translate("Installed NagiosQL version"); + $arrTemplate['STEP3_TEXT_03_SHOW'] = "showfield"; + $intError = $myInstClass->checkQLVersion($arrTemplate['STEP3_TEXT_04'],$strErrorMessage,$arrUpdate,$setQLVersion); + } + // Upgrade NagiosQL DB + if ($intError == 0) { + $arrTemplate['STEP3_TEXT_05'] = $myInstClass->translate("Upgrading from version")." ".$setQLVersion." ".$myInstClass->translate("to")." ".$preNagiosQL_ver; + $arrTemplate['STEP3_TEXT_05_SHOW'] = "showfield"; + $intError = $myInstClass->updateQLDB($arrTemplate['STEP3_TEXT_06'],$strErrorMessage,$arrUpdate); + } + if (($_SESSION['install']['dbtype'] == "mysql") && (version_compare($setQLVersion,"3.2.0") == -1)) { // Converting database to UTF8 if ($intError == 0) { - $arrTemplate['STEP3_TEXT_07'] = translate("Converting database to utf8 character set"); + $arrTemplate['STEP3_TEXT_07'] = $myInstClass->translate("Converting database to utf8 character set"); $arrTemplate['STEP3_TEXT_07_SHOW'] = "showfield"; $intError = $myInstClass->convQLDB($arrTemplate['STEP3_TEXT_08'],$strErrorMessage); } // Converting database tables to UTF8 if ($intError == 0) { - $arrTemplate['STEP3_TEXT_09'] = translate("Converting database tables to utf8 character set"); + $arrTemplate['STEP3_TEXT_09'] = $myInstClass->translate("Converting database tables to utf8 character set"); $arrTemplate['STEP3_TEXT_09_SHOW'] = "showfield"; $intError = $myInstClass->convQLDBTables($arrTemplate['STEP3_TEXT_10'],$strErrorMessage); } // Converting database fields to UTF8 if ($intError == 0) { - $arrTemplate['STEP3_TEXT_11'] = translate("Converting database fields to utf8 character set"); + $arrTemplate['STEP3_TEXT_11'] = $myInstClass->translate("Converting database fields to utf8 character set"); $arrTemplate['STEP3_TEXT_11_SHOW'] = "showfield"; $intError = $myInstClass->convQLDBFields($arrTemplate['STEP3_TEXT_12'],$strErrorMessage); } - // Reconnect Database with new user - if ($intError == 0) { - $arrTemplate['STEP3_TEXT_17_SHOW'] = "showfield"; - $intError = $myInstClass->openAdmDBSrv($arrTemplate['STEP3_TEXT_18'],$strErrorMessage,1); - $intError = $myInstClass->openDatabase($arrTemplate['STEP3_TEXT_18'],$strErrorMessage,1); - } - // Deploy NagiosQL database settings - if ($intError == 0) { - $arrTemplate['STEP4_VISIBLE'] = "showfield"; - $intError = $myInstClass->updateSettingsDB($arrTemplate['STEP4_TEXT_02'],$strErrorMessage); - } - // Write database settings to file - if ($intError == 0) { - $arrTemplate['STEP4_TEXT_03_SHOW'] = "showfield"; - $intError = $myInstClass->updateSettingsFile($arrTemplate['STEP4_TEXT_04'],$strErrorMessage); - } + } + // Reconnect Database with new user + if ($intError == 0) { + $arrTemplate['STEP3_TEXT_17_SHOW'] = "showfield"; + $intError = $myInstClass->openAdmDBSrv($arrTemplate['STEP3_TEXT_18'],$strErrorMessage,1); + $intError = $myInstClass->openDatabase($arrTemplate['STEP3_TEXT_18'],$strErrorMessage,1); + } + // Deploy NagiosQL database settings + if ($intError == 0) { + $arrTemplate['STEP4_VISIBLE'] = "showfield"; + $intError = $myInstClass->updateSettingsDB($arrTemplate['STEP4_TEXT_02'],$strErrorMessage); + } + // Write database settings to file + if ($intError == 0) { + $arrTemplate['STEP4_TEXT_03_SHOW'] = "showfield"; + $intError = $myInstClass->updateSettingsFile($arrTemplate['STEP4_TEXT_04'],$strErrorMessage); } } else { - $arrTemplate['STEP3_SUB_TITLE'] = translate("Create new NagiosQL database"); + $arrTemplate['STEP3_SUB_TITLE'] = $myInstClass->translate("Create new NagiosQL database"); + // + // Include database class + // ====================== + if ($_SESSION['install']['dbtype'] == "mysqli") { + // Include and initialize mysqli class + include("../functions/mysqli_class.php"); + $myDBClass = new mysqlidb; + } else if ($_SESSION['install']['dbtype'] == "pgsql") { + // Include and initialize pgsql class + include("../functions/pgsql_class.php"); + $myDBClass = new pgsqldb; + //} else if ($_SESSION['install']['dbtype'] == "sqlite3") { + // // Include sqlite3 and initialize class + // include("../functions/sqlite3_class.php"); + // $myDBClass = new sqlite3db; + } else { + $strErrorMessage .= $myInstClass->translate("Database type not defined!")." (".$_SESSION['install']['dbtype'].")
\n"; + $strStatusMessage = "".$myInstClass->translate("failed").""; + $intError = 1; + } + // Set DB parameters + $myDBClass->arrParams['server'] = $_SESSION['install']['dbserver']; + $myDBClass->arrParams['port'] = $_SESSION['install']['dbport']; + $myDBClass->arrParams['username'] = $_SESSION['install']['admuser']; + $myDBClass->arrParams['password'] = $_SESSION['install']['admpass']; + $myDBClass->arrParams['database'] = $_SESSION['install']['dbname']; + // Include classes + if ($intError == 0) $myInstClass->myDBClass =& $myDBClass; // Check database connection $intOldDBStatus = 0; if ($intError == 0) $intError = $myInstClass->openAdmDBSrv($arrTemplate['STEP3_TEXT_02'],$strErrorMessage); + // Does the database already exist? if ($intError == 0) { - $intOldDBStatus = $myInstClass->openDatabase($arrTemplate['STEP3_TEXT_02'],$strErrorMessage); + $intOldDBStatus = $myInstClass->openDatabase($strTmpMessage,$strTmpError); + $myDBClass->strErrorMessage = ""; if (($intOldDBStatus == 0) && ($_SESSION['install']['dbdrop'] == 0)) { - $strErrorMessage .= translate("Database already exists and drop database was not selected, please correct or manage manually")."
"; - $arrTemplate['STEP3_TEXT_02'] = "".translate("failed").""; - $intError = 1; + $strErrorMessage .= $myInstClass->translate("Database already exists and drop database was not selected, please correct or manage manually")."
"; + $arrTemplate['STEP3_TEXT_02'] = "".$myInstClass->translate("failed").""; + $intError = 1; } else { - $arrTemplate['STEP3_TEXT_02'] = "".translate("passed").""; + $myInstClass->openAdmDBSrv($arrTemplate['STEP3_TEXT_02'],$strErrorMessage); } } + $arrTemplate['STEP3_TEXT_02_SHOW'] = "showfield"; + $arrTemplate['STEP3_TEXT_02'] .= " (".$_SESSION['install']['dbtype'].")"; // Check database version if ($intError == 0) { $arrTemplate['STEP3_TEXT_03_SHOW'] = "showfield"; $arrTemplate['STEP3_TEXT_05_SHOW'] = "showfield"; $intError = $myInstClass->checkDBVersion($arrTemplate['STEP3_TEXT_06'],$strErrorMessage,$strVersion); if ($strVersion == "unknown") { - $arrTemplate['STEP3_TEXT_04'] = "".translate("unknown").""; + $arrTemplate['STEP3_TEXT_04'] = "".$myInstClass->translate("unknown").""; } else { $arrTemplate['STEP3_TEXT_04'] = "".$strVersion.""; } @@ -157,18 +219,19 @@ if ($_SESSION['install']['mode'] == "Update") { if ($intError == 0) { $arrTemplate['STEP3_TEXT_09_SHOW'] = "showfield"; $intError = $myInstClass->createDB($arrTemplate['STEP3_TEXT_10'],$strErrorMessage); + echo $strErrorMessage; + } + // Write initial SQL data to database + if ($intError == 0) $intError = $myInstClass->openDatabase($strTmp,$strErrorMessage); + if ($intError == 0) { + $arrTemplate['STEP3_TEXT_11_SHOW'] = "showfield"; + $arrInsert[] = $preSqlNewInstall; + $intError = $myInstClass->updateQLDB($arrTemplate['STEP3_TEXT_12'],$strErrorMessage,$arrInsert); } // Grant NagiosQL database user - if ($intError == 0) { - $arrTemplate['STEP3_TEXT_11_SHOW'] = "showfield"; - $intError = $myInstClass->grantDBUser($arrTemplate['STEP3_TEXT_12'],$strErrorMessage); - } - // Write initial SQL data to database - if ($intError == 0) $intError = $myInstClass->openDatabase($arrTemplate['STEP3_TEXT_02'],$strErrorMessage); if ($intError == 0) { $arrTemplate['STEP3_TEXT_13_SHOW'] = "showfield"; - $arrInsert[] = $preSqlNewInstall; - $intError = $myInstClass->updateQLDB($arrTemplate['STEP3_TEXT_14'],$strErrorMessage,$arrInsert); + $intError = $myInstClass->grantDBUser($arrTemplate['STEP3_TEXT_14'],$strErrorMessage); } // Create NagiosQL admin user if ($intError == 0) { @@ -177,6 +240,8 @@ if ($_SESSION['install']['mode'] == "Update") { } // Reconnect Database with new user if ($intError == 0) { + $myDBClass->arrParams['username'] = $_SESSION['install']['dbuser']; + $myDBClass->arrParams['password'] = $_SESSION['install']['dbpass']; $arrTemplate['STEP3_TEXT_17_SHOW'] = "showfield"; if ($intError == 0) $intError = $myInstClass->openAdmDBSrv($arrTemplate['STEP3_TEXT_18'],$strErrorMessage,1); if ($intError == 0) $intError = $myInstClass->openDatabase($arrTemplate['STEP3_TEXT_18'],$strErrorMessage,1); @@ -185,7 +250,7 @@ if ($_SESSION['install']['mode'] == "Update") { if ($intError == 0) { $arrTemplate['STEP4_VISIBLE'] = "showfield"; $intError = $myInstClass->updateSettingsDB($arrTemplate['STEP4_TEXT_02'],$strErrorMessage); - } + } // Write database settings to file if ($intError == 0) { $arrTemplate['STEP4_TEXT_03_SHOW'] = "showfield"; @@ -208,14 +273,14 @@ if ($intError != 0) { $arrTemplate['INFO_TEXT'] = ""; $arrTemplate['BUTTON'] = "
\n";
$arrTemplate['BUTTON'] .= "\n";
- $arrTemplate['BUTTON'] .= "
".translate("Back")."\n"; + $arrTemplate['BUTTON'] .= "
".$myInstClass->translate("Back")."\n"; $arrTemplate['BUTTON'] .= "
\n";
} else {
$arrTemplate['ERRORMESSAGE'] = "";
$arrTemplate['INST_VISIBLE'] = "showfield";
- $arrTemplate['INFO_TEXT'] = translate("Please delete the install directory to continue!");
+ $arrTemplate['INFO_TEXT'] = $myInstClass->translate("Please delete the install directory to continue!");
$arrTemplate['BUTTON'] = "".translate("Back")."\n"; + $arrTemplate['BUTTON'] .= "
".$myInstClass->translate("Back")."\n"; $arrTemplate['BUTTON'] .= "
\n";
- $arrTemplate['BUTTON'] .= "
".translate("Finish")."\n"; + $arrTemplate['BUTTON'] .= "
".$myInstClass->translate("Finish")."\n"; $arrTemplate['BUTTON'] .= "
\n";
}
//
diff --git a/install/templates/index.tpl.htm b/install/templates/index.tpl.htm
old mode 100755
new mode 100644
index 874bf28..0816bbf
--- a/install/templates/index.tpl.htm
+++ b/install/templates/index.tpl.htm
@@ -1,12 +1,12 @@
-
+
-
+
-
-
+
+
@@ -22,7 +22,7 @@
".translate("Finish")."\n"; + $arrTemplate['BUTTON'] .= "
".$myInstClass->translate("Finish")."\n"; $arrTemplate['BUTTON'] .= "
{STEP1_BOX}
{STEP1_TITLE}
{STEP1_SUBTITLE1}
-
Javascript: {CHECK_1_VALUE}
+ Javascript: {CHECK_1_VALUE}{CHECK_1_INFO}
{STEP1_SUBTITLE2}
{CHECK_2_TEXT}: {CHECK_2_VALUE} {CHECK_2_INFO}