From 15af404ea2ad11f72e3e2bb61c5511b832f66de4 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 09 Jul 2013 11:29:02 -0400
Subject: [PATCH] - Changed: - added lost password button to login form - added back button to lost password form
---
interface/web/sites/database_user_edit.php | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php
index f54362c..1c2defa 100644
--- a/interface/web/sites/database_user_edit.php
+++ b/interface/web/sites/database_user_edit.php
@@ -128,7 +128,7 @@
$this->oldDataRecord = $app->db->queryOneRecord("SELECT * FROM web_database_user WHERE database_user_id = '".$this->id."'");
$dbuser_prefix = $app->tools_sites->getPrefix($this->oldDataRecord['database_user_prefix'], $dbuser_prefix);
- $this->dataRecord['database_user_prefix'] = ($dbuser_prefix === '' ? '#' : $dbuser_prefix);
+ $this->dataRecord['database_user_prefix'] = $dbuser_prefix;
//* Database username shall not be empty
if($this->dataRecord['database_user'] == '') $app->tform->errorMessage .= $app->tform->wordbook["database_user_error_empty"].'<br />';
@@ -147,7 +147,7 @@
$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
}
- $this->dataRecord['server_id'] = $conf['server_id'];
+ $this->dataRecord['server_id'] = 0; // we need this on all servers
parent::onBeforeUpdate();
}
@@ -163,7 +163,7 @@
$global_config = $app->getconf->get_global_config('sites');
$dbuser_prefix = $app->tools_sites->replacePrefix($global_config['dbuser_prefix'], $this->dataRecord);
- $this->dataRecord['database_user_prefix'] = ($dbuser_prefix === '' ? '#' : $dbuser_prefix);
+ $this->dataRecord['database_user_prefix'] = $dbuser_prefix;
if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'<br />';
@@ -179,7 +179,7 @@
$this->dataRecord['database_user'] = substr($dbuser_prefix . $this->dataRecord['database_user'], 0, 16);
}
- $this->dataRecord['server_id'] = $conf['server_id'];
+ $this->dataRecord['server_id'] = 0; // we need this on all servers
parent::onBeforeInsert();
}
@@ -208,14 +208,18 @@
$client_group_id = $app->functions->intval($this->dataRecord["client_group_id"]);
$app->db->query("UPDATE web_database_user SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE database_user_id = ".$this->id);
}
+
+ /*$password = $app->db->queryOneRecord("SELECT database_password 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'];
+ // Make sure to store the password in encrypted form in sys_datalog
+ $new_rec['database_password'] = $password['database_password'];
$app->db->datalogSave('web_database_user', 'UPDATE', 'database_user_id', $this->id, $this->oldDataRecord, $new_rec);
}
- unset($new_rec);
+ unset($new_rec);*/
}
}
--
Gitblit v1.9.1