diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-22 12:24:14 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-22 12:24:14 +0000 |
| commit | dc973146155891aee48aa92e94033413eba3d1b9 (patch) | |
| tree | 679fe8ae92fc29f79c73752f22f803d5e8c57cf0 /frontends/php/include/config.inc.php | |
| parent | ea3bf2726f4600d556df46bdc78945a002cc4c01 (diff) | |
| download | zabbix-dc973146155891aee48aa92e94033413eba3d1b9.tar.gz zabbix-dc973146155891aee48aa92e94033413eba3d1b9.tar.xz zabbix-dc973146155891aee48aa92e94033413eba3d1b9.zip | |
- [ZBX-283] fixes in SQL statement (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5270 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/config.inc.php')
| -rw-r--r-- | frontends/php/include/config.inc.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index e2fa1cbe..b3d104c9 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -72,7 +72,6 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! include_once("include/classes/cserverinfo.mod.php"); include_once("include/classes/cflashclock.mod.php"); - require_once "include/db.inc.php"; require_once "include/perm.inc.php"; require_once "include/audit.inc.php"; require_once "include/js.inc.php"; @@ -105,7 +104,8 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! if(file_exists($ZBX_CONFIGURATION_FILE) && !isset($_COOKIE['ZBX_CONFIG'])){ include $ZBX_CONFIGURATION_FILE; - + require_once "include/db.inc.php"; + $error = ''; if(!DBconnect($error)){ $_REQUEST['message'] = $error; @@ -133,9 +133,11 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; } // DEBUG INFO!!! unset($error); } else{ - if(file_exists($ZBX_CONFIGURATION_FILE)) + if(file_exists($ZBX_CONFIGURATION_FILE)){ include $ZBX_CONFIGURATION_FILE; - + require_once "include/db.inc.php"; + } + define('ZBX_PAGE_NO_AUTHERIZATION', true); define('ZBX_DISTRIBUTED', false); $show_setup = true; |