From 117ecd60c809bbc19a3c1f795f6db9e53465cdec Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Thu, 19 Jun 2014 07:00:44 -0400
Subject: [PATCH] - autoselect password if you use "Generate Password" function (saves a click if you want to copy the password).
---
interface/web/admin/users_edit.php | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/interface/web/admin/users_edit.php b/interface/web/admin/users_edit.php
index d94ef61..2b1be7f 100644
--- a/interface/web/admin/users_edit.php
+++ b/interface/web/admin/users_edit.php
@@ -66,7 +66,14 @@
if(@is_array($this->dataRecord['modules']) && !in_array($this->dataRecord['startmodule'], $this->dataRecord['modules'])) {
$app->tform->errorMessage .= $app->tform->wordbook['startmodule_err'];
}
+
$this->oldDataRecord = $app->tform->getDataRecord($this->id);
+
+ //* A user that belongs to a client record (client or reseller) may not have typ admin
+ if(isset($this->dataRecord['typ']) && $this->dataRecord['typ'][0] == 'admin' && $this->oldDataRecord['client_id'] > 0) {
+ $app->tform->errorMessage .= $app->tform->wordbook['client_not_admin_err'];
+ }
+
}
/*
@@ -77,7 +84,7 @@
global $app, $conf;
$client = $app->db->queryOneRecord("SELECT * FROM sys_user WHERE userid = ".$this->id);
- $client_id = $client['client_id'];
+ $client_id = $app->functions->intval($client['client_id']);
$username = $app->db->quote($this->dataRecord["username"]);
$old_username = $app->db->quote($this->oldDataRecord['username']);
--
Gitblit v1.9.1