From e6e07c8326c0082b8edf4924c166aaadbd99cdef Mon Sep 17 00:00:00 2001
From: osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>
Date: Mon, 11 Dec 2006 10:03:32 +0000
Subject:  - improved installation wizard with permissions (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@3584 97f52cf1-0a1b-0410-bd0e-c28be96e8082
---
 frontends/php/setup.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'frontends/php/setup.php')

diff --git a/frontends/php/setup.php b/frontends/php/setup.php
index 61d93996..cab676e6 100644
--- a/frontends/php/setup.php
+++ b/frontends/php/setup.php
@@ -36,7 +36,7 @@
 		"distributed"=>	array(T_ZBX_STR, O_OPT,	null,	null,			null),
 		"trouble"=>	array(T_ZBX_STR, O_OPT,	null,	null,			null),
 
-		"type"=>	array(T_ZBX_STR, O_OPT,	null,	IN('"MYSQL","POSTGRESQL","ORACLE"'),	null),
+		"type"=>	array(T_ZBX_STR, O_OPT,	null,	IN('"MYSQL","POSTGRESQL","ORACLE","SQLITE3"'),	null),
 		"server"=>	array(T_ZBX_STR, O_OPT,	null,	NOT_EMPTY,		null),
 		"database"=>	array(T_ZBX_STR, O_OPT,	null,	NOT_EMPTY,		null),
 		"user"=>	array(T_ZBX_STR, O_OPT,	null,	NOT_EMPTY,		null),
@@ -95,6 +95,10 @@
 	{
 		$ZBX_CONFIG['allowed_db']['ORACLE'] = 'Oracle';
 	}
+	/* ORACLE */	if(zbx_is_callable(array('sqlite3_open', 'sqlite3_close', 'sqlite3_query', 'sqlite3_error', 'sqlite3_fetch_array', 'sqlite3_query_close', 'sqlite3_exec')))
+	{
+		$ZBX_CONFIG['allowed_db']['SQLITE3'] = 'SQLite3';
+	}
 	if(count($ZBX_CONFIG['allowed_db']) == 0)
 	{
 		$ZBX_CONFIG['allowed_db']['no'] = array('No');
@@ -102,7 +106,6 @@
 
 ?>
 <?php
-
 	global $ZBX_SETUP_WIZARD;
 
 	$ZBX_SETUP_WIZARD = new CSetupWizard($ZBX_CONFIG);
@@ -124,8 +127,6 @@ include_once "include/page_header.php";
 	echo BR;
 	$ZBX_SETUP_WIZARD->Show();
 
-	//SDI($ZBX_CONFIG);
-
 	global $_POST;
 	unset($_POST);
 ?>
-- 
cgit