From 061c5ea8465797d89a1259db50f43ebf53e96042 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 02 Nov 2012 07:36:31 -0400
Subject: [PATCH] Bugfix:  - database users do not get renamed in mysql  - database passwords get deleted on user or database changing in some situations

---
 interface/web/sites/database_user_edit.php |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php
index c486a5a..86b1382 100644
--- a/interface/web/sites/database_user_edit.php
+++ b/interface/web/sites/database_user_edit.php
@@ -146,6 +146,7 @@
 		}
 		
         $this->dataRecord['server_id'] = $conf['server_id'];
+        $this->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM web_database_user WHERE database_user_id = '".$this->id."'");
         
 		parent::onBeforeUpdate();
 	}
@@ -205,13 +206,11 @@
 			$app->db->query("UPDATE web_database_user SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE database_user_id = ".$this->id);
 		}
         
-        $old_rec = $app->db->queryOneRecord("SELECT * FROM web_database_user WHERE database_user_id = '".$this->id."'");
-        
         $records = $app->db->queryAllRecords("SELECT DISTINCT server_id FROM web_database WHERE database_user_id = '".$app->functions->intval($this->id)."' UNION SELECT DISTINCT server_id FROM web_database WHERE database_ro_user_id = '".$app->functions->intval($this->id)."'");
         foreach($records as $rec) {
             $new_rec = $this->dataRecord;
             $new_rec['server_id'] = $rec['server_id'];
-            $app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->id, $old_rec, $new_rec);
+            $app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->id, $this->oldDataRecord, $new_rec);
         }
         unset($new_rec);
 	}

--
Gitblit v1.9.1