- [DEV-144] improvements in users authentication methods (Artem)

 - [ZBX-387] fixed issue with undefined function ctype_digit (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5814 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 104 insertions, 108 deletions

diff --git a/frontends/php/users.php b/frontends/php/users.php
index 9f7330ba..ce4b1461 100644
--- a/frontends/php/users.php
+++ b/frontends/php/users.php
@@ -19,23 +19,23 @@
 **/
 ?>
 <?php
-	require_once "include/config.inc.php";
-	require_once "include/triggers.inc.php";
-	require_once "include/media.inc.php";
-	require_once "include/users.inc.php";
-	require_once "include/forms.inc.php";
-	require_once "include/js.inc.php";
-
-	$page["title"] = "S_USERS";
-	$page["file"] = "users.php";
+	require_once 'include/config.inc.php';
+	require_once 'include/triggers.inc.php';
+	require_once 'include/media.inc.php';
+	require_once 'include/users.inc.php';
+	require_once 'include/forms.inc.php';
+	require_once 'include/js.inc.php';
+
+	$page['title'] = 'S_USERS';
+	$page['file'] = 'users.php';
 	$page['hist_arg'] = array('config');
 
-include_once "include/page_header.php";
+include_once 'include/page_header.php';
 
 ?>
 <?php
-	$_REQUEST["config"]=get_request("config",get_profile("web.users.config",0));
-	update_profile("web.users.config",$_REQUEST["config"],PROFILE_TYPE_INT);
+	$_REQUEST['config']=get_request('config',get_profile('web.users.config',0));
+	update_profile('web.users.config',$_REQUEST['config'],PROFILE_TYPE_INT);
 ?>
 <?php
 //		VAR			TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
@@ -147,29 +147,26 @@ include_once "include/page_header.php";
 			$user_groups = get_request('user_groups', array());
 			$user_medias = get_request('user_medias', array());
 
-			$_REQUEST["password1"] = get_request("password1", null);
-			$_REQUEST["password2"] = get_request("password2", null);
+			$_REQUEST['password1'] = get_request('password1', '');
+			$_REQUEST['password2'] = get_request('password2', '');
 
-			if(isset($_REQUEST["password1"]) && empty($_REQUEST["password1"]) && $_REQUEST["alias"]!=ZBX_GUEST_USER){
-				show_error_message(S_ONLY_FOR_GUEST_ALLOWED_EMPTY_PASSWORD);
-			}
-			else if($_REQUEST["password1"]!=$_REQUEST["password2"]){
-				if(isset($_REQUEST["userid"]))
+			if($_REQUEST['password1']!=$_REQUEST['password2']){
+				if(isset($_REQUEST['userid']))
 					show_error_message(S_CANNOT_UPDATE_USER_BOTH_PASSWORDS);
 				else
 					show_error_message(S_CANNOT_ADD_USER_BOTH_PASSWORDS_MUST);
 			}
-			else if(isset($_REQUEST["password1"]) && $_REQUEST["password1"] != "" && $_REQUEST["alias"]==ZBX_GUEST_USER){
+			else if(isset($_REQUEST['password1']) && $_REQUEST['password1'] != '' && $_REQUEST['alias']==ZBX_GUEST_USER){
 				show_error_message(S_FOR_GUEST_PASSWORD_MUST_BE_EMPTY);
 			}
 			else {
-				if(isset($_REQUEST["userid"])){
+				if(isset($_REQUEST['userid'])){
 					$action = AUDIT_ACTION_UPDATE;
 					DBstart();
-					$result=update_user($_REQUEST["userid"],
-						$_REQUEST["name"],$_REQUEST["surname"],$_REQUEST["alias"],
-						$_REQUEST["password1"],$_REQUEST["url"],get_request("autologin",0),$_REQUEST["autologout"],
-						$_REQUEST["lang"],$_REQUEST['theme'],$_REQUEST["refresh"],$_REQUEST["user_type"],
+					$result=update_user($_REQUEST['userid'],
+						$_REQUEST['name'],$_REQUEST['surname'],$_REQUEST['alias'],
+						$_REQUEST['password1'],$_REQUEST['url'],get_request('autologin',0),$_REQUEST['autologout'],
+						$_REQUEST['lang'],$_REQUEST['theme'],$_REQUEST['refresh'],$_REQUEST['user_type'],
 						$user_groups, $user_medias);
 					$result = DBend();
 					
@@ -179,21 +176,21 @@ include_once "include/page_header.php";
 					$action = AUDIT_ACTION_ADD;
 					DBstart();
 					$result=add_user(
-						$_REQUEST["name"],$_REQUEST["surname"],$_REQUEST["alias"],
-						$_REQUEST["password1"],$_REQUEST["url"],get_request("autologin",0),$_REQUEST["autologout"],
-						$_REQUEST["lang"],$_REQUEST['theme'],$_REQUEST["refresh"],$_REQUEST["user_type"],
+						$_REQUEST['name'],$_REQUEST['surname'],$_REQUEST['alias'],
+						$_REQUEST['password1'],$_REQUEST['url'],get_request('autologin',0),$_REQUEST['autologout'],
+						$_REQUEST['lang'],$_REQUEST['theme'],$_REQUEST['refresh'],$_REQUEST['user_type'],
 						$user_groups, $user_medias);
 					$result = DBend();
 					
 					show_messages($result, S_USER_ADDED, S_CANNOT_ADD_USER);
 				}
 				if($result){
-					add_audit($action,AUDIT_RESOURCE_USER,"User alias [".$_REQUEST["alias"]."] name [".$_REQUEST["name"]."] surname [".$_REQUEST["surname"]."]");
-					unset($_REQUEST["form"]);
+					add_audit($action,AUDIT_RESOURCE_USER,'User alias ['.$_REQUEST['alias'].'] name ['.$_REQUEST['name'].'] surname ['.$_REQUEST['surname'].']');
+					unset($_REQUEST['form']);
 				}
 			}
 		}
-		else if(isset($_REQUEST["del_user_media"])){
+		else if(isset($_REQUEST['del_user_media'])){
 			$user_medias_to_del = get_request('user_medias_to_del', array());
 			foreach($user_medias_to_del as $mediaid){
 				if(isset($_REQUEST['user_medias'][$mediaid]))
@@ -201,7 +198,7 @@ include_once "include/page_header.php";
 			}
 			
 		}
-		else if(isset($_REQUEST["del_user_group"])){
+		else if(isset($_REQUEST['del_user_group'])){
 			$user_groups_to_del = get_request('user_groups_to_del', array());
 			foreach($user_groups_to_del as $groupid){
 				if(isset($_REQUEST['user_groups'][$groupid]))
@@ -209,7 +206,7 @@ include_once "include/page_header.php";
 			}
 			
 		}
-		else if(isset($_REQUEST["delete_selected"])&&isset($_REQUEST['group_userid'])){
+		else if(isset($_REQUEST['delete_selected'])&&isset($_REQUEST['group_userid'])){
 			$result = false;
 
 			$group_userid = get_request('group_userid', array());
@@ -221,34 +218,33 @@ include_once "include/page_header.php";
 				$result = DBend();
 				if($result){
 					add_audit(AUDIT_ACTION_DELETE,AUDIT_RESOURCE_USER,
-						"User alias [".$user_data["alias"]."] name [".$user_data["name"]."] surname [".
-						$user_data["surname"]."]");
+						'User alias ['.$user_data['alias'].'] name ['.$user_data['name'].'] surname ['.
+						$user_data['surname'].']');
 				}
 			}
 			
 			show_messages($result, S_USER_DELETED,NULL);
 		}
-		else if(isset($_REQUEST["delete"])&&isset($_REQUEST["userid"])){
-			$user=get_user_by_userid($_REQUEST["userid"]);
+		else if(isset($_REQUEST['delete'])&&isset($_REQUEST['userid'])){
+			$user=get_user_by_userid($_REQUEST['userid']);
 			
 			DBstart();
-			$result=delete_user($_REQUEST["userid"]);
+			$result=delete_user($_REQUEST['userid']);
 			$result = DBend();
 			
 			show_messages($result, S_USER_DELETED, S_CANNOT_DELETE_USER);
 			if($result){
 				add_audit(AUDIT_ACTION_DELETE,AUDIT_RESOURCE_USER,
-					"User alias [".$user["alias"]."] name [".$user["name"]."] surname [".
-					$user["surname"]."]");
+					'User alias ['.$user['alias'].'] name ['.$user['name'].'] surname ['.$user['surname'].']');
 
-				unset($_REQUEST["userid"]);
-				unset($_REQUEST["form"]);
+				unset($_REQUEST['userid']);
+				unset($_REQUEST['form']);
 			}
 		}
 // Add USER to GROUP
 		else if(isset($_REQUEST['grpaction'])&&isset($_REQUEST['usrgrpid'])&&isset($_REQUEST['userid'])&&($_REQUEST['grpaction']==1)){
-			$user=get_user_by_userid($_REQUEST["userid"]);
-			$group=get_group_by_usrgrpid($_REQUEST["usrgrpid"]);
+			$user=get_user_by_userid($_REQUEST['userid']);
+			$group=get_group_by_usrgrpid($_REQUEST['usrgrpid']);
 			
 			DBstart();
 			$result=add_user_to_group($_REQUEST['userid'],$_REQUEST['usrgrpid']);
@@ -257,18 +253,18 @@ include_once "include/page_header.php";
 			show_messages($result, S_USER_UPDATED, S_CANNOT_UPDATE_USER);
 			if($result){
 				add_audit(AUDIT_ACTION_ADD,AUDIT_RESOURCE_USER_GROUP,
-					"User alias [".$user["alias"]."] name [".$user["name"]."] surname [".$user["surname"]."]");
+					'User alias ['.$user['alias'].'] name ['.$user['name'].'] surname ['.$user['surname'].']');
 				
-				unset($_REQUEST["usrgrpid"]);
-				unset($_REQUEST["userid"]);
+				unset($_REQUEST['usrgrpid']);
+				unset($_REQUEST['userid']);
 			}
 			unset($_REQUEST['grpaction']);
-			unset($_REQUEST["form"]);
+			unset($_REQUEST['form']);
 		}
 // Remove USER from GROUP
 		else if(isset($_REQUEST['grpaction'])&&isset($_REQUEST['usrgrpid'])&&isset($_REQUEST['userid'])&&($_REQUEST['grpaction']==0)){
-			$user=get_user_by_userid($_REQUEST["userid"]);
-			$group=get_group_by_usrgrpid($_REQUEST["usrgrpid"]);
+			$user=get_user_by_userid($_REQUEST['userid']);
+			$group=get_group_by_usrgrpid($_REQUEST['usrgrpid']);
 			
 			DBstart();
 			$result=remove_user_from_group($_REQUEST['userid'],$_REQUEST['usrgrpid']);
@@ -277,13 +273,13 @@ include_once "include/page_header.php";
 			show_messages($result, S_USER_UPDATED, S_CANNOT_UPDATE_USER);
 			if($result){
 				add_audit(AUDIT_ACTION_DELETE,AUDIT_RESOURCE_USER_GROUP,
-					"User alias [".$user["alias"]."] name [".$user["name"]."] surname [".$user["surname"]."]");
+					'User alias ['.$user['alias'].'] name ['.$user['name'].'] surname ['.$user['surname'].']');
 
-				unset($_REQUEST["usrgrpid"]);
-				unset($_REQUEST["userid"]);
+				unset($_REQUEST['usrgrpid']);
+				unset($_REQUEST['userid']);
 			}
 			unset($_REQUEST['grpaction']);
-			unset($_REQUEST["form"]);
+			unset($_REQUEST['form']);
 		}
 	}
 	else /* config == 1 */{
@@ -311,29 +307,29 @@ include_once "include/page_header.php";
 					unset($_REQUEST['group_rights'][$name]);
 			}
 		}
-		else if(isset($_REQUEST["new_right"])){
+		else if(isset($_REQUEST['new_right'])){
 			$_REQUEST['group_rights'] = get_request('group_rights', array());
 			foreach(array('type', 'id', 'permission') as $fld_name)
 				$_REQUEST['group_rights'][$_REQUEST['new_right']['name']][$fld_name] = $_REQUEST['new_right'][$fld_name];
 		}
-		else if(isset($_REQUEST["new_user"])){
+		else if(isset($_REQUEST['new_user'])){
 			$_REQUEST['group_users'] = get_request('group_users', array());
 			$_REQUEST['group_users'][$_REQUEST['new_user']['userid']] = $_REQUEST['new_user']['alias'];
 		}
-		else if(isset($_REQUEST["del_group_user"])&&isset($_REQUEST['group_users_to_del'])){
+		else if(isset($_REQUEST['del_group_user'])&&isset($_REQUEST['group_users_to_del'])){
 			foreach($_REQUEST['group_users_to_del'] as $userid)
 				if(isset($_REQUEST['group_users'][$userid]))
 					unset($_REQUEST['group_users'][$userid]);
 		}
-		else if(isset($_REQUEST["save"])){
-			$group_users	= get_request("group_users", array());;
-			$group_rights	= get_request("group_rights", array());;
+		else if(isset($_REQUEST['save'])){
+			$group_users	= get_request('group_users', array());;
+			$group_rights	= get_request('group_rights', array());;
 
-			if(isset($_REQUEST["usrgrpid"])){
+			if(isset($_REQUEST['usrgrpid'])){
 				$action = AUDIT_ACTION_UPDATE;
 				
 				DBstart();
-				$result=update_user_group($_REQUEST["usrgrpid"], $_REQUEST["gname"], $_REQUEST['users_status'], $_REQUEST['gui_access'], $group_users, $group_rights);
+				$result=update_user_group($_REQUEST['usrgrpid'], $_REQUEST['gname'], $_REQUEST['users_status'], $_REQUEST['gui_access'], $group_users, $group_rights);
 				$result = DBend();
 				
 				show_messages($result, S_GROUP_UPDATED, S_CANNOT_UPDATE_GROUP);
@@ -342,18 +338,18 @@ include_once "include/page_header.php";
 				$action = AUDIT_ACTION_ADD;
 				
 				DBstart();
-				$result=add_user_group($_REQUEST["gname"], $_REQUEST['users_status'], $_REQUEST['gui_access'], $group_users, $group_rights);
+				$result=add_user_group($_REQUEST['gname'], $_REQUEST['users_status'], $_REQUEST['gui_access'], $group_users, $group_rights);
 				$result = DBend();
 				
 				show_messages($result, S_GROUP_ADDED, S_CANNOT_ADD_GROUP);
 			}
 
 			if($result){
-				add_audit($action,AUDIT_RESOURCE_USER_GROUP,"Group name [".$_REQUEST["gname"]."]");
-				unset($_REQUEST["form"]);
+				add_audit($action,AUDIT_RESOURCE_USER_GROUP,'Group name ['.$_REQUEST['gname'].']');
+				unset($_REQUEST['form']);
 			}
 		}
-		else if(isset($_REQUEST["delete_selected"])&&isset($_REQUEST['group_groupid'])){
+		else if(isset($_REQUEST['delete_selected'])&&isset($_REQUEST['group_groupid'])){
 			$result = false;
 			$group_groupid = get_request('group_groupid', array());
 			foreach($group_groupid as $usrgrpid){
@@ -363,44 +359,44 @@ include_once "include/page_header.php";
 				$result = delete_user_group($usrgrpid);
 				$result = DBend();
 				if($result){
-					add_audit(AUDIT_ACTION_DELETE,AUDIT_RESOURCE_USER_GROUP,"Group name [".$group["name"]."]");
+					add_audit(AUDIT_ACTION_DELETE,AUDIT_RESOURCE_USER_GROUP,'Group name ['.$group['name'].']');
 				}
 			}
 			if($result){
 				show_messages($result, S_GROUP_DELETED);
 			}
 		}
-		else if(isset($_REQUEST["delete"])){
-			$group = get_group_by_usrgrpid($_REQUEST["usrgrpid"]);
+		else if(isset($_REQUEST['delete'])){
+			$group = get_group_by_usrgrpid($_REQUEST['usrgrpid']);
 			
 			DBstart();
-			$result=delete_user_group($_REQUEST["usrgrpid"]);
+			$result=delete_user_group($_REQUEST['usrgrpid']);
 			$result = DBend();
 			
 			show_messages($result, S_GROUP_DELETED, S_CANNOT_DELETE_GROUP);
 			if($result){
-				add_audit(AUDIT_ACTION_DELETE,AUDIT_RESOURCE_USER_GROUP,"Group name [".$group["name"]."]");
+				add_audit(AUDIT_ACTION_DELETE,AUDIT_RESOURCE_USER_GROUP,'Group name ['.$group['name'].']');
 
-				unset($_REQUEST["usrgrpid"]);
-				unset($_REQUEST["form"]);
+				unset($_REQUEST['usrgrpid']);
+				unset($_REQUEST['form']);
 			}
 		}
 		else if(isset($_REQUEST['set_gui_access'])&&isset($_REQUEST['usrgrpid'])){
-			$group=get_group_by_usrgrpid($_REQUEST["usrgrpid"]);
-			$result=change_group_gui_access($_REQUEST["usrgrpid"],$_REQUEST['set_gui_access']);
+			$group=get_group_by_usrgrpid($_REQUEST['usrgrpid']);
+			$result=change_group_gui_access($_REQUEST['usrgrpid'],$_REQUEST['set_gui_access']);
 			
 			show_messages($result, S_GROUP.' "'.$group['name'].'" '.S_GUI_ACCESS_UPDATED, S_CANNOT_UPDATE_GUI_ACCESS);
 			if($result){
 				$audit_action = ($_REQUEST['set_gui_access'] == GROUP_GUI_ACCESS_DISABLED)?AUDIT_ACTION_DISABLE:AUDIT_ACTION_UPDATE;
 				add_audit($audit_action,AUDIT_RESOURCE_USER_GROUP,'GUI access for group name ['.$group['name'].']');
 				
-				unset($_REQUEST["usrgrpid"]);
+				unset($_REQUEST['usrgrpid']);
 			}
 			unset($_REQUEST['form']);
 		}
-		else if(isset($_REQUEST["set_users_status"])&&isset($_REQUEST["usrgrpid"])){
-			$group=get_group_by_usrgrpid($_REQUEST["usrgrpid"]);
-			$result=change_group_status($_REQUEST["usrgrpid"],$_REQUEST['set_users_status']);
+		else if(isset($_REQUEST['set_users_status'])&&isset($_REQUEST['usrgrpid'])){
+			$group=get_group_by_usrgrpid($_REQUEST['usrgrpid']);
+			$result=change_group_status($_REQUEST['usrgrpid'],$_REQUEST['set_users_status']);
 			
 			$status_msg1 = ($_REQUEST['set_users_status'] == GROUP_STATUS_ENABLED)?S_ENABLED:S_DISABLED;
 			$status_msg2 = ($_REQUEST['set_users_status'] == GROUP_STATUS_ENABLED)?S_ENABLE:S_DISABLE;
@@ -410,7 +406,7 @@ include_once "include/page_header.php";
 				$audit_action = ($_REQUEST['set_users_status'] == GROUP_STATUS_ENABLED)?AUDIT_ACTION_ENABLE:AUDIT_ACTION_DISABLE;
 				add_audit($audit_action,AUDIT_RESOURCE_USER_GROUP,'Group name ['.$group['name'].']');
 				
-				unset($_REQUEST["usrgrpid"]);
+				unset($_REQUEST['usrgrpid']);
 			}
 			unset($_REQUEST['form']);
 		}
@@ -420,20 +416,20 @@ include_once "include/page_header.php";
 	$frmForm = new CForm();
 	$frmForm->SetMethod('get');
 	
-	$cmbConf = new CComboBox("config",$_REQUEST["config"],"submit()");
+	$cmbConf = new CComboBox('config',$_REQUEST['config'],'submit()');
 	$cmbConf->AddItem(0,S_USERS);
 	$cmbConf->AddItem(1,S_USER_GROUPS);
 
 	$frmForm->AddItem($cmbConf);
-	$frmForm->AddItem(SPACE."|".SPACE);
-	$frmForm->AddItem($btnNew = new CButton("form",($_REQUEST["config"] == 0) ? S_CREATE_USER : S_CREATE_GROUP));
+	$frmForm->AddItem(SPACE.'|'.SPACE);
+	$frmForm->AddItem($btnNew = new CButton('form',($_REQUEST['config'] == 0) ? S_CREATE_USER : S_CREATE_GROUP));
 	show_table_header(S_CONFIGURATION_OF_USERS_AND_USER_GROUPS, $frmForm);
 	echo SBR; 
 ?>
 <?php
-	if($_REQUEST["config"]==0){
-		if(isset($_REQUEST["form"])){
-			insert_user_form(get_request("userid",null));
+	if($_REQUEST['config']==0){
+		if(isset($_REQUEST['form'])){
+			insert_user_form(get_request('userid',null));
 		}
 		else{
 			$form = new CForm(null,'post');
@@ -442,7 +438,7 @@ include_once "include/page_header.php";
 			show_table_header(S_USERS_BIG);
 			$table=new CTableInfo(S_NO_USERS_DEFINED);
 			$table->setHeader(array(
-				array(new CCheckBox("all_users",NULL,
+				array(new CCheckBox('all_users',NULL,
                                         "CheckAll('".$form->GetName()."','all_users','group_userid');"),
 					make_sorting_link(S_ALIAS,'u.alias')
 				),
@@ -463,7 +459,7 @@ include_once "include/page_header.php";
 			while($db_user=DBfetch($db_users)){
 //Log Out 10min or Autologout time
 				$online_time = (($db_user['autologout'] == 0) || (ZBX_USER_ONLINE_TIME<$db_user['autologout']))?ZBX_USER_ONLINE_TIME:$db_user['autologout'];
-				$online=new CCol(S_NO,"disabled");
+				$online=new CCol(S_NO,'disabled');
 				
 				$sql = 'SELECT s.lastaccess, s.status'.
 						' FROM sessions s, users u'.
@@ -474,10 +470,10 @@ include_once "include/page_header.php";
 				$db_sessions = DBselect($sql,1);
 				if($db_ses=DBfetch($db_sessions)){
 					if((ZBX_SESSION_ACTIVE == $db_ses['status']) && (($db_ses['lastaccess']+$online_time) >= time())){
-						$online=new CCol(S_YES.' ('.date('r',$db_ses['lastaccess']).')',"enabled");
+						$online=new CCol(S_YES.' ('.date('r',$db_ses['lastaccess']).')','enabled');
 					}
 					else{
-						$online=new CCol(S_NO.' ('.date('r',$db_ses['lastaccess']).')',"disabled");
+						$online=new CCol(S_NO.' ('.date('r',$db_ses['lastaccess']).')','disabled');
 					}
 				}	
 				
@@ -510,13 +506,13 @@ include_once "include/page_header.php";
 //*/		
 				$table->addRow(array(
 					array(
-						new CCheckBox("group_userid[".$db_user["userid"]."]",NULL,NULL,$db_user["userid"]),
-						new CLink($db_user["alias"],
-							"users.php?form=update".url_param("config").
-							"&userid=".$db_user["userid"]."#form", 'action')
+						new CCheckBox('group_userid['.$db_user['userid'].']',NULL,NULL,$db_user['userid']),
+						new CLink($db_user['alias'],
+							'users.php?form=update'.url_param('config').
+							'&userid='.$db_user['userid'].'#form', 'action')
 					),
-					$db_user["name"],
-					$db_user["surname"],
+					$db_user['name'],
+					$db_user['surname'],
 					user_type2str($db_user['type']),
 					$user_groups,
 					$online,
@@ -534,8 +530,8 @@ include_once "include/page_header.php";
 			$jsmenu->InsertJavaScript();
 		}
 	}
-	else if($_REQUEST["config"]==1){
-		if(isset($_REQUEST["form"])){
+	else if($_REQUEST['config']==1){
+		if(isset($_REQUEST['form'])){
 			insert_usergroups_form();
 		}
 		else{
@@ -544,7 +540,7 @@ include_once "include/page_header.php";
 
 			$table = new CTableInfo(S_NO_USER_GROUPS_DEFINED);
 			$table->setHeader(array(
-				 array(  new CCheckBox("all_groups",NULL,
+				 array(  new CCheckBox('all_groups',NULL,
                                         "CheckAll('".$form->GetName()."','all_groups');"),
 					make_sorting_link(S_NAME,'ug.name')),
 				S_MEMBERS,
@@ -588,15 +584,15 @@ include_once "include/page_header.php";
 					$gui_access = new CLink($gui_access,
 								'users.php?form=update'.
 								'&set_gui_access='.$next_gui_auth.
-								'&usrgrpid='.$row["usrgrpid"].
-								url_param("config"),
+								'&usrgrpid='.$row['usrgrpid'].
+								url_param('config'),
 								($row['gui_access'] == GROUP_GUI_ACCESS_DISABLED)?'orange':'enabled');
 
 					$users_status = new CLink($users_status,
 								'users.php?form=update'.
 								'&set_users_status='.(($row['users_status'] == GROUP_STATUS_ENABLED)?GROUP_STATUS_DISABLED:GROUP_STATUS_ENABLED).
-								'&usrgrpid='.$row["usrgrpid"].
-								url_param("config"),
+								'&usrgrpid='.$row['usrgrpid'].
+								url_param('config'),
 								($row['users_status'] == GROUP_STATUS_ENABLED)?'enabled':'disabled');
 
 				}
@@ -607,10 +603,10 @@ include_once "include/page_header.php";
 								
 				$table->addRow(array(
 					array(
-						 new CCheckBox('group_groupid['.$row["usrgrpid"].']',NULL,NULL,$row["usrgrpid"]),
-						$alias = new CLink($row["name"],
-							"users.php?form=update".url_param("config").
-							"&usrgrpid=".$row["usrgrpid"]."#form", 'action')
+						 new CCheckBox('group_groupid['.$row['usrgrpid'].']',NULL,NULL,$row['usrgrpid']),
+						$alias = new CLink($row['name'],
+							'users.php?form=update'.url_param('config').
+							'&usrgrpid='.$row['usrgrpid'].'#form', 'action')
 					),
 					implode(', ',$users),
 					$gui_access,
@@ -626,6 +622,6 @@ include_once "include/page_header.php";
 ?>
 <?php
 
-include_once "include/page_footer.php"
+include_once 'include/page_footer.php'
 
 ?>