diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-07-10 14:57:25 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-07-10 14:57:25 +0000 |
| commit | b78f379fdaad31612d7eb0fa4d4574ac304748a1 (patch) | |
| tree | 422d17ac3f33e3d6e04370068d54e08003f125b2 /frontends/php/include/config.inc.php | |
| parent | 339a3a8d3191149c24119814a09447b976a98373 (diff) | |
| download | zabbix-b78f379fdaad31612d7eb0fa4d4574ac304748a1.tar.gz zabbix-b78f379fdaad31612d7eb0fa4d4574ac304748a1.tar.xz zabbix-b78f379fdaad31612d7eb0fa4d4574ac304748a1.zip | |
- fixed addition of complex triggers for linked hosts (Alexei)
- better localisation support (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@1903 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/config.inc.php')
| -rw-r--r-- | frontends/php/include/config.inc.php | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php index 329bcc89..709e9686 100644 --- a/frontends/php/include/config.inc.php +++ b/frontends/php/include/config.inc.php @@ -26,9 +26,9 @@ // END OF GLOBALS include_once "include/defines.inc.php"; -// include_once "include/locales/en_en.inc.php"; include_once "include/db.inc.php"; include_once "include/html.inc.php"; + include_once "include/locales.inc.php"; include_once "include/audit.inc.php"; include_once "include/escalations.inc.php"; @@ -959,7 +959,7 @@ if(isset($sessionid)) { - $sql="select u.userid,u.alias,u.name,u.surname,u.lang from sessions s,users u where s.sessionid='$sessionid' and s.userid=u.userid and s.lastaccess+900>".time(); + $sql="select u.userid,u.alias,u.name,u.surname,u.lang from sessions s,users u where s.sessionid='$sessionid' and s.userid=u.userid and s.lastaccess+u.autologout>".time(); $result=DBselect($sql); if(DBnum_rows($result)==1) { @@ -1017,17 +1017,21 @@ global $page; global $USER_DETAILS; + include_once "include/locales/en_gb.inc.php"; + if($noauth!=1) { check_authorisation(); - include "include/locales/".$USER_DETAILS["lang"].".inc.php"; + include_once "include/locales/".$USER_DETAILS["lang"].".inc.php"; } + process_locales(); + ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> +<meta http-equiv="Content-Type" content="text/html; charset=<?php echo S_HTML_CHARSET; ?>"> <meta name="Author" content="Alexei Vladishev"> <link rel="stylesheet" href="css.css"> @@ -1036,6 +1040,7 @@ { $refresh=2*$refresh; } + if(defined($title)) $title=constant($title); if($refresh!=0) { echo "<meta http-equiv=\"refresh\" content=\"$refresh\">\n"; @@ -1111,7 +1116,13 @@ echo "</head>"; <table border=0 cellspacing=0 cellpadding=5 width="100%" bgcolor="#FFFFFF"> <tr> <td width="118" height="31" class="top_header_left"><img width="118" height="31" src="images/general/zabbix.png" border="0" alt="ZABBIX"></td> +<?php + if($USER_DETAILS["alias"]=="guest") { +?> +<td width="662" class="top_header_right"><a href="http://www.zabbix.com/manual/v1.1/index.php" class="small_font"><?php echo S_HELP;?></a></td> +<?php } else { ?> <td width="662" class="top_header_right"><a href="http://www.zabbix.com/manual/v1.1/index.php" class="small_font"><?php echo S_HELP;?></a> | <a href="profile.php" class="small_font"><?php echo S_PROFILE;?></a></td> +<?php } ?> </tr> </table> |