diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-09 15:58:29 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-09 15:58:29 +0000 |
| commit | e0798bff5b48ff0073b610d2154b142a2cdd274a (patch) | |
| tree | bd684bcdeddc94756d740bbc60bb5ce9f3fffeaf /frontends/php | |
| parent | cd1c62734e8764107414b3fa3f44f6f9901aa8ad (diff) | |
| download | zabbix-e0798bff5b48ff0073b610d2154b142a2cdd274a.tar.gz zabbix-e0798bff5b48ff0073b610d2154b142a2cdd274a.tar.xz zabbix-e0798bff5b48ff0073b610d2154b142a2cdd274a.zip | |
- fixed canceling of frontend installation screen (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3978 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php')
| -rw-r--r-- | frontends/php/include/config.inc.php | 2 | ||||
| -rw-r--r-- | frontends/php/setup.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 76c273f2..5aa2b2ef 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -97,6 +97,8 @@ function TODO($msg) { echo "TODO: ".$msg.BR; } // DEBUG INFO!!! $ZBX_CONFIGURATION_FILE = realpath(dirname($ZBX_CONFIGURATION_FILE)).'/'.basename($ZBX_CONFIGURATION_FILE); + unset($show_setup); + if(file_exists($ZBX_CONFIGURATION_FILE) && !isset($_COOKIE['ZBX_CONFIG'])) { include $ZBX_CONFIGURATION_FILE; diff --git a/frontends/php/setup.php b/frontends/php/setup.php index 62e88049..9e77eb6b 100644 --- a/frontends/php/setup.php +++ b/frontends/php/setup.php @@ -68,6 +68,7 @@ { zbx_unsetcookie('ZBX_CONFIG'); Redirect('index.php'); + exit; } $ZBX_CONFIG = get_cookie('ZBX_CONFIG', null); |