From b93508c7b63e89efd30a1a6c304f2eea27388244 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 7 Dec 2006 08:46:19 +0000 Subject: Minor changes. git-svn-id: svn://svn.zabbix.com/trunk@3572 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/defines.inc.php | 2 +- frontends/php/include/forms.inc.php | 2 +- frontends/php/include/locales/en_gb.inc.php | 8 ++++---- frontends/php/include/page_header.php | 4 ++-- frontends/php/include/perm.inc.php | 4 ++-- frontends/php/include/users.inc.php | 4 ++-- frontends/php/popup.php | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'frontends/php') diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index 2849c62d..4582686d 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -263,7 +263,7 @@ define("USER_TYPE_ZABBIX_USER", 1); define("USER_TYPE_ZABBIX_ADMIN", 2); - define("USER_TYPE_SUPPER_ADMIN", 3); + define("USER_TYPE_SUPER_ADMIN", 3); define("PERM_MAX", 3); define("PERM_READ_WRITE", 3); diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index ce56932c..fa28d98b 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -296,7 +296,7 @@ $cmbUserType = new CComboBox('user_type', $user_type, $perm_details ? 'submit();' : null); $cmbUserType->AddItem(USER_TYPE_ZABBIX_USER, user_type2str(USER_TYPE_ZABBIX_USER)); $cmbUserType->AddItem(USER_TYPE_ZABBIX_ADMIN, user_type2str(USER_TYPE_ZABBIX_ADMIN)); - $cmbUserType->AddItem(USER_TYPE_SUPPER_ADMIN, user_type2str(USER_TYPE_SUPPER_ADMIN)); + $cmbUserType->AddItem(USER_TYPE_SUPER_ADMIN, user_type2str(USER_TYPE_SUPER_ADMIN)); $frmUser->AddRow(S_USER_TYPE, $cmbUserType); } diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 0d29d698..d0a52d7d 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -334,7 +334,7 @@ "S_COMPARE"=> "Compare", // Footer - "S_ZABBIX_VER"=> "ZABBIX 1.3", + "S_ZABBIX_VER"=> "ZABBIX 1.3.1", "S_COPYRIGHT_BY"=> "Copyright 2001-2006 by ", "S_CONNECTED_AS"=> "Connected as", "S_SIA_ZABBIX"=> "SIA Zabbix", @@ -805,7 +805,7 @@ "S_RESOURCE"=> "Resource", "S_RESOURCES"=> "Resources", "S_RESOURCE_TYPE"=> "Resource type", - "S_RIGHTS_OF_RESOURCES"=> "Rights of resources", + "S_RIGHTS_OF_RESOURCES"=> "User rights", "S_NO_RESOURCES_DEFINED"=> "No resources defined", "S_SIMPLE_GRAPH"=> "Simple graph", "S_GRAPH_NAME"=> "Graph name", @@ -987,7 +987,7 @@ // users.php "S_ZABBIX_USER"=> "ZABBIX User", "S_ZABBIX_ADMIN"=> "ZABBIX Admin", - "S_SUPPER_ADMIN"=> "ZABBIX Supper Admin", + "S_SUPER_ADMIN"=> "ZABBIX Super Admin", "S_USER_TYPE"=> "User type", "S_USERS"=> "Users", "S_USER_ADDED"=> "User added", @@ -1000,7 +1000,7 @@ "S_PERMISSION_ADDED"=> "Permission added", "S_CANNOT_ADD_PERMISSION"=> "Cannot add permission", "S_USER_UPDATED"=> "User updated", - "S_ONLY_FOR_GUEST_ALLOWED_EMPTY_PASSWORD"=> "Only for guest allowed empty passwod.", + "S_ONLY_FOR_GUEST_ALLOWED_EMPTY_PASSWORD"=> "Only user 'guest' may have an empty password.", "S_CANNOT_UPDATE_USER"=> "Cannot update user", "S_CANNOT_UPDATE_USER_BOTH_PASSWORDS"=> "Cannot update user. Both passwords must be equal.", "S_GROUP_ADDED"=> "Group added", diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php index 0baf504a..8bd598e1 100644 --- a/frontends/php/include/page_header.php +++ b/frontends/php/include/page_header.php @@ -252,7 +252,7 @@ COpt::profiling_start("page"); { $deny = true; } - elseif($label=='admin' && (!in_array($USER_DETAILS['type'], array(USER_TYPE_SUPPER_ADMIN)) || + elseif($label=='admin' && (!in_array($USER_DETAILS['type'], array(USER_TYPE_SUPER_ADMIN)) || !in_array($ZBX_CURNODEID, get_accessible_nodes_by_user( $USER_DETAILS,PERM_READ_WRITE,null, PERM_RES_IDS_ARRAY,$ZBX_CURNODEID)))) @@ -260,7 +260,7 @@ COpt::profiling_start("page"); $deny = true; } elseif($label=='config' && ( - !in_array($USER_DETAILS['type'], array(USER_TYPE_SUPPER_ADMIN, USER_TYPE_ZABBIX_ADMIN)) || + !in_array($USER_DETAILS['type'], array(USER_TYPE_SUPER_ADMIN, USER_TYPE_ZABBIX_ADMIN)) || !in_array($ZBX_CURNODEID, get_accessible_nodes_by_user( $USER_DETAILS,PERM_READ_LIST,null, PERM_RES_IDS_ARRAY,$ZBX_CURNODEID)))) diff --git a/frontends/php/include/perm.inc.php b/frontends/php/include/perm.inc.php index 21b1c00b..fda4a822 100644 --- a/frontends/php/include/perm.inc.php +++ b/frontends/php/include/perm.inc.php @@ -363,7 +363,7 @@ COpt::counter_up('perm'); /* deny if no rights defined (for local node read/write)*/ if(is_null($node_data['permission'])) { - if($user_type == USER_TYPE_SUPPER_ADMIN) + if($user_type == USER_TYPE_SUPER_ADMIN) $node_data['permission'] = PERM_READ_WRITE; else $node_data['permission'] = @@ -627,7 +627,7 @@ COpt::counter_up('perm'); if(isset($node_perm[$node_data['nodeid']])) $node_data['permission'] = $node_perm[$node_data['nodeid']]; - elseif($node_data['nodeid'] == $ZBX_LOCALNODEID || $user_type == USER_TYPE_SUPPER_ADMIN) + elseif($node_data['nodeid'] == $ZBX_LOCALNODEID || $user_type == USER_TYPE_SUPER_ADMIN) /* for local node or superuser default permission is READ_WRITE */ $node_data['permission'] = PERM_READ_WRITE; diff --git a/frontends/php/include/users.inc.php b/frontends/php/include/users.inc.php index a15bb65a..9a66245c 100644 --- a/frontends/php/include/users.inc.php +++ b/frontends/php/include/users.inc.php @@ -23,7 +23,7 @@ { $str_user_type[USER_TYPE_ZABBIX_USER] = S_ZABBIX_USER; $str_user_type[USER_TYPE_ZABBIX_ADMIN] = S_ZABBIX_ADMIN; - $str_user_type[USER_TYPE_SUPPER_ADMIN] = S_SUPPER_ADMIN; + $str_user_type[USER_TYPE_SUPER_ADMIN] = S_SUPER_ADMIN; if(isset($str_user_type[$user_type_int])) return $str_user_type[$user_type_int]; @@ -38,7 +38,7 @@ global $USER_DETAILS; global $ZBX_CURNODEID; - if($USER_DETAILS['type'] != USER_TYPE_SUPPER_ADMIN) + if($USER_DETAILS['type'] != USER_TYPE_SUPER_ADMIN) { error("Insufficient permissions"); return 0; diff --git a/frontends/php/popup.php b/frontends/php/popup.php index 59e397e8..c67e2016 100644 --- a/frontends/php/popup.php +++ b/frontends/php/popup.php @@ -51,7 +51,7 @@ break; case 'usrgrp': $page["title"] = "S_GROUPS"; - $min_user_type = USER_TYPE_SUPPER_ADMIN; + $min_user_type = USER_TYPE_SUPER_ADMIN; break; case 'items': $page["title"] = "S_ITEMS_BIG"; -- cgit