Skip to content

Commit f3a56aa

Browse files
committed
Fixed: username in sys_user table gets not updated when the username in client form is changed.
1 parent aa15001 commit f3a56aa

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

interface/lib/classes/tform.inc.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -906,8 +906,8 @@ function datalogSave($action,$primary_id, $record_old, $record_new) {
906906
$escape = '`';
907907
}
908908

909-
$diffrec = array();
910-
909+
$this->diffrec = array();
910+
/*
911911
if(is_array($record_new) && count($record_new) > 0) {
912912
foreach($record_new as $key => $val) {
913913
if(@$record_old[$key] != $val) {
@@ -926,7 +926,7 @@ function datalogSave($action,$primary_id, $record_old, $record_new) {
926926
}
927927
}
928928
$this->diffrec = $diffrec;
929-
929+
*/
930930

931931
// Full diff records for ISPConfig, they have a different format then the simple diffrec
932932
$diffrec_full = array();
@@ -938,6 +938,8 @@ function datalogSave($action,$primary_id, $record_old, $record_new) {
938938
// Record has changed
939939
$diffrec_full['old'][$key] = $val;
940940
$diffrec_full['new'][$key] = $record_new[$key];
941+
$this->diffrec[$key] = array( 'new' => $record_new[$key],
942+
'old' => $val);
941943
} else {
942944
$diffrec_full['old'][$key] = $val;
943945
$diffrec_full['new'][$key] = $val;
@@ -949,13 +951,16 @@ function datalogSave($action,$primary_id, $record_old, $record_new) {
949951
// Record has changed
950952
$diffrec_full['new'][$key] = $val;
951953
$diffrec_full['old'][$key] = $record_old[$key];
954+
$this->diffrec[$key] = array( 'old' => @$record_old[$key],
955+
'new' => $val);
952956
} else {
953957
$diffrec_full['new'][$key] = $val;
954958
$diffrec_full['old'][$key] = $val;
955959
}
956960
}
957961
}
958962

963+
//$this->diffrec = $diffrec;
959964
// Insert the server_id, if the record has a server_id
960965
$server_id = (isset($record_old["server_id"]) && $record_old["server_id"] > 0)?$record_old["server_id"]:0;
961966
if(isset($record_new["server_id"])) $server_id = $record_new["server_id"];

interface/lib/classes/tform_actions.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ function onUpdate() {
114114
foreach($this->plugins as $plugin) {
115115
$plugin->onInsert();
116116
}
117-
118-
$this->onAfterUpdate();
117+
118+
$this->onAfterUpdate();
119119

120120
// Write data history (sys_datalog)
121121
if($app->tform->formDef['db_history'] == 'yes') {

interface/web/client/client_edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function onAfterUpdate() {
132132
global $app;
133133

134134
// username changed
135-
if(isset($app->tform->diffrec['username'])) {
135+
if($this->oldDataRecord['username'] != $this->dataRecord['username']) {
136136
$username = mysql_real_escape_string($this->dataRecord["username"]);
137137
$client_id = $this->id;
138138
$sql = "UPDATE sys_user SET username = '$username' WHERE client_id = $client_id";

0 commit comments

Comments
 (0)