combine user edit & user details
This commit is contained in:
Andrew Dolgov
parent
e2e095233f
commit
bf9cc9ad95
3 changed files with 89 additions and 109 deletions
|
|
@ -17,9 +17,93 @@ class Pref_Users extends Handler_Protected {
|
||||||
return array_search($method, $csrf_ignored) !== false;
|
return array_search($method, $csrf_ignored) !== false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function userdetails() {
|
function edit() {
|
||||||
|
global $access_level_names;
|
||||||
|
|
||||||
$uid = sprintf("%d", $_REQUEST["id"]);
|
print '<div dojoType="dijit.layout.TabContainer" style="height : 400px">
|
||||||
|
<div dojoType="dijit.layout.ContentPane" title="'.__('Edit user').'">';
|
||||||
|
|
||||||
|
print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
|
||||||
|
|
||||||
|
$id = (int) $this->dbh->escape_string($_REQUEST["id"]);
|
||||||
|
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$id\">";
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-users\">";
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"editSave\">";
|
||||||
|
|
||||||
|
$result = $this->dbh->query("SELECT * FROM ttrss_users WHERE id = '$id'");
|
||||||
|
|
||||||
|
$login = $this->dbh->fetch_result($result, 0, "login");
|
||||||
|
$access_level = $this->dbh->fetch_result($result, 0, "access_level");
|
||||||
|
$email = $this->dbh->fetch_result($result, 0, "email");
|
||||||
|
|
||||||
|
$sel_disabled = ($id == $_SESSION["uid"]) ? "disabled" : "";
|
||||||
|
|
||||||
|
print "<div class=\"dlgSec\">".__("User")."</div>";
|
||||||
|
print "<div class=\"dlgSecCont\">";
|
||||||
|
|
||||||
|
if ($sel_disabled) {
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"login\" value=\"$login\">";
|
||||||
|
}
|
||||||
|
|
||||||
|
print "<input size=\"30\" style=\"font-size : 16px\"
|
||||||
|
dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
|
||||||
|
$sel_disabled
|
||||||
|
name=\"login\" value=\"$login\">";
|
||||||
|
|
||||||
|
print "</div>";
|
||||||
|
|
||||||
|
print "<div class=\"dlgSec\">".__("Authentication")."</div>";
|
||||||
|
print "<div class=\"dlgSecCont\">";
|
||||||
|
|
||||||
|
print __('Access level: ') . " ";
|
||||||
|
|
||||||
|
if (!$sel_disabled) {
|
||||||
|
print_select_hash("access_level", $access_level, $access_level_names,
|
||||||
|
"dojoType=\"dijit.form.Select\" $sel_disabled");
|
||||||
|
} else {
|
||||||
|
print_select_hash("", $access_level, $access_level_names,
|
||||||
|
"dojoType=\"dijit.form.Select\" $sel_disabled");
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"access_level\" value=\"$access_level\">";
|
||||||
|
}
|
||||||
|
|
||||||
|
print "<hr/>";
|
||||||
|
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" size=\"20\" placeholder=\"Change password\"
|
||||||
|
name=\"password\">";
|
||||||
|
|
||||||
|
print "</div>";
|
||||||
|
|
||||||
|
print "<div class=\"dlgSec\">".__("Options")."</div>";
|
||||||
|
print "<div class=\"dlgSecCont\">";
|
||||||
|
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" size=\"30\" name=\"email\" placeholder=\"E-mail\"
|
||||||
|
value=\"$email\">";
|
||||||
|
|
||||||
|
print "</div>";
|
||||||
|
|
||||||
|
print "</table>";
|
||||||
|
|
||||||
|
print "</form>";
|
||||||
|
|
||||||
|
print '</div>'; #tab
|
||||||
|
print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\"
|
||||||
|
dojoType=\"dijit.layout.ContentPane\" title=\"".__('User details')."\">";
|
||||||
|
|
||||||
|
print '</div>';
|
||||||
|
print '</div>';
|
||||||
|
|
||||||
|
print "<div class=\"dlgButtons\">
|
||||||
|
<button dojoType=\"dijit.form.Button\" type=\"submit\">".
|
||||||
|
__('Save')."</button>
|
||||||
|
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('userEditDlg').hide()\">".
|
||||||
|
__('Cancel')."</button></div>";
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
function userdetails() {
|
||||||
|
$id = (int) $this->dbh->escape_string($_REQUEST["id"]);
|
||||||
|
|
||||||
$result = $this->dbh->query("SELECT login,
|
$result = $this->dbh->query("SELECT login,
|
||||||
".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
|
".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
|
||||||
|
|
@ -28,7 +112,7 @@ class Pref_Users extends Handler_Protected {
|
||||||
WHERE owner_uid = id) AS stored_articles,
|
WHERE owner_uid = id) AS stored_articles,
|
||||||
".SUBSTRING_FOR_DATE."(created,1,16) AS created
|
".SUBSTRING_FOR_DATE."(created,1,16) AS created
|
||||||
FROM ttrss_users
|
FROM ttrss_users
|
||||||
WHERE id = '$uid'");
|
WHERE id = '$id'");
|
||||||
|
|
||||||
if ($this->dbh->num_rows($result) == 0) {
|
if ($this->dbh->num_rows($result) == 0) {
|
||||||
print "<h1>".__('User not found')."</h1>";
|
print "<h1>".__('User not found')."</h1>";
|
||||||
|
|
@ -49,7 +133,7 @@ class Pref_Users extends Handler_Protected {
|
||||||
print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
|
print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
|
||||||
|
|
||||||
$result = $this->dbh->query("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
|
$result = $this->dbh->query("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
|
||||||
WHERE owner_uid = '$uid'");
|
WHERE owner_uid = '$id'");
|
||||||
|
|
||||||
$num_feeds = $this->dbh->fetch_result($result, 0, "num_feeds");
|
$num_feeds = $this->dbh->fetch_result($result, 0, "num_feeds");
|
||||||
|
|
||||||
|
|
@ -61,7 +145,7 @@ class Pref_Users extends Handler_Protected {
|
||||||
print "<h1>".__('Subscribed feeds')."</h1>";
|
print "<h1>".__('Subscribed feeds')."</h1>";
|
||||||
|
|
||||||
$result = $this->dbh->query("SELECT id,title,site_url FROM ttrss_feeds
|
$result = $this->dbh->query("SELECT id,title,site_url FROM ttrss_feeds
|
||||||
WHERE owner_uid = '$uid' ORDER BY title");
|
WHERE owner_uid = '$id' ORDER BY title");
|
||||||
|
|
||||||
print "<ul class=\"userFeedList\">";
|
print "<ul class=\"userFeedList\">";
|
||||||
|
|
||||||
|
|
@ -86,86 +170,6 @@ class Pref_Users extends Handler_Protected {
|
||||||
}
|
}
|
||||||
|
|
||||||
print "</ul>";
|
print "</ul>";
|
||||||
|
|
||||||
print "<div align='center'>
|
|
||||||
<button dojoType=\"dijit.form.Button\" type=\"submit\">".__("Close this window").
|
|
||||||
"</button></div>";
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
function edit() {
|
|
||||||
global $access_level_names;
|
|
||||||
|
|
||||||
$id = $this->dbh->escape_string($_REQUEST["id"]);
|
|
||||||
print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
|
|
||||||
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$id\">";
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-users\">";
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"editSave\">";
|
|
||||||
|
|
||||||
$result = $this->dbh->query("SELECT * FROM ttrss_users WHERE id = '$id'");
|
|
||||||
|
|
||||||
$login = $this->dbh->fetch_result($result, 0, "login");
|
|
||||||
$access_level = $this->dbh->fetch_result($result, 0, "access_level");
|
|
||||||
$email = $this->dbh->fetch_result($result, 0, "email");
|
|
||||||
|
|
||||||
$sel_disabled = ($id == $_SESSION["uid"]) ? "disabled" : "";
|
|
||||||
|
|
||||||
print "<div class=\"dlgSec\">".__("User")."</div>";
|
|
||||||
print "<div class=\"dlgSecCont\">";
|
|
||||||
|
|
||||||
if ($sel_disabled) {
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"login\" value=\"$login\">";
|
|
||||||
}
|
|
||||||
|
|
||||||
print "<input size=\"30\" style=\"font-size : 16px\"
|
|
||||||
dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
|
|
||||||
onkeypress=\"return filterCR(event, userEditSave)\" $sel_disabled
|
|
||||||
name=\"login\" value=\"$login\">";
|
|
||||||
|
|
||||||
print "</div>";
|
|
||||||
|
|
||||||
print "<div class=\"dlgSec\">".__("Authentication")."</div>";
|
|
||||||
print "<div class=\"dlgSecCont\">";
|
|
||||||
|
|
||||||
print __('Access level: ') . " ";
|
|
||||||
|
|
||||||
if (!$sel_disabled) {
|
|
||||||
print_select_hash("access_level", $access_level, $access_level_names,
|
|
||||||
"dojoType=\"dijit.form.Select\" $sel_disabled");
|
|
||||||
} else {
|
|
||||||
print_select_hash("", $access_level, $access_level_names,
|
|
||||||
"dojoType=\"dijit.form.Select\" $sel_disabled");
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"access_level\" value=\"$access_level\">";
|
|
||||||
}
|
|
||||||
|
|
||||||
print "<hr/>";
|
|
||||||
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" size=\"20\" onkeypress=\"return filterCR(event, userEditSave)\" placeholder=\"Change password\"
|
|
||||||
name=\"password\">";
|
|
||||||
|
|
||||||
print "</div>";
|
|
||||||
|
|
||||||
print "<div class=\"dlgSec\">".__("Options")."</div>";
|
|
||||||
print "<div class=\"dlgSecCont\">";
|
|
||||||
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" size=\"30\" name=\"email\" onkeypress=\"return filterCR(event, userEditSave)\" placeholder=\"E-mail\"
|
|
||||||
value=\"$email\">";
|
|
||||||
|
|
||||||
print "</div>";
|
|
||||||
|
|
||||||
print "</table>";
|
|
||||||
|
|
||||||
print "</form>";
|
|
||||||
|
|
||||||
print "<div class=\"dlgButtons\">
|
|
||||||
<button dojoType=\"dijit.form.Button\" type=\"submit\">".
|
|
||||||
__('Save')."</button>
|
|
||||||
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('userEditDlg').hide()\">".
|
|
||||||
__('Cancel')."</button></div>";
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function editSave() {
|
function editSave() {
|
||||||
|
|
@ -338,8 +342,6 @@ class Pref_Users extends Handler_Protected {
|
||||||
print "<button dojoType=\"dijit.form.Button\" onclick=\"addUser()\">".__('Create user')."</button>";
|
print "<button dojoType=\"dijit.form.Button\" onclick=\"addUser()\">".__('Create user')."</button>";
|
||||||
|
|
||||||
print "
|
print "
|
||||||
<button dojoType=\"dijit.form.Button\" onclick=\"selectedUserDetails()\">".
|
|
||||||
__('Details')."</button dojoType=\"dijit.form.Button\">
|
|
||||||
<button dojoType=\"dijit.form.Button\" onclick=\"editSelectedUser()\">".
|
<button dojoType=\"dijit.form.Button\" onclick=\"editSelectedUser()\">".
|
||||||
__('Edit')."</button dojoType=\"dijit.form.Button\">
|
__('Edit')."</button dojoType=\"dijit.form.Button\">
|
||||||
<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedUsers()\">".
|
<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedUsers()\">".
|
||||||
|
|
|
||||||
|
|
@ -502,27 +502,6 @@ function infobox_callback2(transport, title) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function filterCR(e, f)
|
|
||||||
{
|
|
||||||
var key;
|
|
||||||
|
|
||||||
if(window.event)
|
|
||||||
key = window.event.keyCode; //IE
|
|
||||||
else
|
|
||||||
key = e.which; //firefox
|
|
||||||
|
|
||||||
if (key == 13) {
|
|
||||||
if (typeof f != 'undefined') {
|
|
||||||
f();
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function getInitParam(key) {
|
function getInitParam(key) {
|
||||||
return init_params[key];
|
return init_params[key];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,6 @@ function editUser(id, event) {
|
||||||
style: "width: 600px",
|
style: "width: 600px",
|
||||||
execute: function() {
|
execute: function() {
|
||||||
if (this.validate()) {
|
if (this.validate()) {
|
||||||
|
|
||||||
notify_progress("Saving data...", true);
|
notify_progress("Saving data...", true);
|
||||||
|
|
||||||
var query = dojo.formToQuery("user_edit_form");
|
var query = dojo.formToQuery("user_edit_form");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue