summaryrefslogtreecommitdiffstats
path: root/frontends/php/include
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-11-16 08:50:31 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-11-16 08:50:31 +0000
commit50bb9badefdc703d8cfa61470bfc483040653663 (patch)
tree032a68199a298e241f91d0ec4427e75e6a0b29c7 /frontends/php/include
parentee2f224a93faee1cf04b1eae03e610d438216ce7 (diff)
downloadzabbix-50bb9badefdc703d8cfa61470bfc483040653663.tar.gz
zabbix-50bb9badefdc703d8cfa61470bfc483040653663.tar.xz
zabbix-50bb9badefdc703d8cfa61470bfc483040653663.zip
- added checking of timezone setting for PHP5 (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3493 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
-rw-r--r--frontends/php/include/page_header.php5
-rw-r--r--frontends/php/include/setup.inc.php13
2 files changed, 14 insertions, 4 deletions
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php
index a6345d65..a5e96b7b 100644
--- a/frontends/php/include/page_header.php
+++ b/frontends/php/include/page_header.php
@@ -22,6 +22,7 @@
require_once("include/config.inc.php");
require_once("include/perm.inc.php");
+
global $USER_DETAILS;
global $ZBX_CURNODEID;
global $ZBX_LOCALNODEID;
@@ -31,8 +32,6 @@ COpt::profiling_start("page");
unset($denyed_page_requested);
- /* Header for HTML pages */
-
if(!isset($page["type"])) $page["type"] = PAGE_TYPE_HTML;
if(!isset($page["file"])) $page["file"] = basename($_SERVER['PHP_SELF']);
@@ -396,8 +395,6 @@ COpt::compare_files_with_menu($ZBX_MENU);
}
unset($ZBX_MENU);
- destroy_objects();
-
unset($table, $top_page_row, $menu_table, $node_form);
unset($main_menu_row);
unset($db_nodes, $node_data);
diff --git a/frontends/php/include/setup.inc.php b/frontends/php/include/setup.inc.php
index 5e1880c6..114fb006 100644
--- a/frontends/php/include/setup.inc.php
+++ b/frontends/php/include/setup.inc.php
@@ -282,6 +282,19 @@
implode(BR, $img_formats),
!isset($no_img_formats),
'Required images genetarion support [PNG]'));
+
+ if(version_compare(phpversion(), '5.1.0RC1', '>='))
+ {
+ $tmezone = ini_get('date.timezone');
+ $table->AddRow(
+ get_test_result(
+ $final_result,
+ 'PHP Timezone:',
+ empty($tmezone) ? 'n/a' : $tmezone,
+ !empty($tmezone),
+ 'Timezone for PHP is not set. Please set "date.timezone" option in php.ini.'));
+ unset($tmezone);
+ }
if(!$final_result)
{