From cd072acba40b59634cf43fc61681b42ebca69eaa Mon Sep 17 00:00:00 2001 From: Florian Schaal <florian@schaal-24.de> Date: Fri, 24 Jan 2014 06:21:25 -0500 Subject: [PATCH] changed the regex; new line at the end is allowed - prevents problems when using cut&paste for the private-key in the interface --- interface/web/sites/database_user_edit.php | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php index c13bfea..30996e5 100644 --- a/interface/web/sites/database_user_edit.php +++ b/interface/web/sites/database_user_edit.php @@ -147,6 +147,11 @@ $this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16); } + /* prepare password for MongoDB */ + // TODO: this still doens't work as when only the username changes we have no database_password. + // taking the one from oldData doesn't work as it's encrypted...shit! + $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password']; + $this->dataRecord['server_id'] = 0; // we need this on all servers parent::onBeforeUpdate(); @@ -181,6 +186,9 @@ $this->dataRecord['server_id'] = 0; // we need this on all servers + /* prepare password for MongoDB */ + $this->dataRecord['database_password_mongo'] = $this->dataRecord['database_user'].":mongo:".$this->dataRecord['database_password']; + parent::onBeforeInsert(); } -- Gitblit v1.9.1