diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-12-08 14:49:35 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-12-08 14:49:35 +0000 |
| commit | 40a607e632c95fdac097c965d537eb12faed9d2b (patch) | |
| tree | f7bd972672339df21ce73d7ef60d105d37c193c2 /frontends/php/setup.php | |
| parent | 1ea1f204761ac4b7d6efc47c5808236227585735 (diff) | |
| download | zabbix-40a607e632c95fdac097c965d537eb12faed9d2b.tar.gz zabbix-40a607e632c95fdac097c965d537eb12faed9d2b.tar.xz zabbix-40a607e632c95fdac097c965d537eb12faed9d2b.zip | |
- [CRITICAL FIX] fixed permission system (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3582 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/setup.php')
| -rw-r--r-- | frontends/php/setup.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/frontends/php/setup.php b/frontends/php/setup.php index e358d10e..61d93996 100644 --- a/frontends/php/setup.php +++ b/frontends/php/setup.php @@ -67,7 +67,7 @@ if(isset($_REQUEST['cancel']) || isset($_REQUEST['finish'])) { - setcookie('ZBX_CONFIG', null, time()-3600); + setcookie('ZBX_CONFIG', null, time()-3600); /* NOTE: don't use zbx_setcookie */ unset($_COOKIE['ZBX_CONFIG']); Redirect('index.php'); } @@ -107,11 +107,17 @@ $ZBX_SETUP_WIZARD = new CSetupWizard($ZBX_CONFIG); - setcookie('ZBX_CONFIG', serialize($ZBX_CONFIG), time()+3600); + zbx_setcookie('ZBX_CONFIG', serialize($ZBX_CONFIG), time()+3600); include_once "include/page_header.php"; - if(isset($_REQUEST['message'])) show_error_message($_REQUEST['message']); + global $ZBX_CONFIGURATION_FILE; + + if(file_exists($ZBX_CONFIGURATION_FILE)) + { + if(isset($_REQUEST['message'])) + show_error_message($_REQUEST['message']); + } insert_showhint_javascript(); |