iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor fixes for logging and user editing and searching

This commit is contained in:
Jan-Philipp Litza 2012-12-27 02:54:57 +01:00
parent 670cd715c5
commit 0f0f847af4
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/pages/admin_free.php
View File

@ -57,6 +57,7 @@ function admin_free() {
return template_render('../templates/admin_free.html', array ( return template_render('../templates/admin_free.html', array (
'search' => $search, 'search' => $search,
'angeltypes' => html_select_key('angeltype', 'angeltype', $angel_types, $_REQUEST['angeltype']), 'angeltypes' => html_select_key('angeltype', 'angeltype', $angel_types, $_REQUEST['angeltype']),
'confirmed_only' => isset($_REQUEST['confirmed_only'])? 'checked' : '',
'table' => $table, 'table' => $table,
'link' => page_link_to('admin_free') 'link' => page_link_to('admin_free')
)); ));

8
includes/pages/admin_user.php
View File

@ -103,9 +103,10 @@ function admin_user() {
if (isset ($_REQUEST['submit_user_angeltypes'])) { if (isset ($_REQUEST['submit_user_angeltypes'])) {
$selected_angel_types = array_intersect($_REQUEST['selected_angel_types'], array_keys($angel_types)); $selected_angel_types = array_intersect($_REQUEST['selected_angel_types'], array_keys($angel_types));
$accepted_angel_types = array_diff(array_intersect($_REQUEST['accepted_angel_types'], array_keys($angel_types)), $nonrestricted_angel_types); $accepted_angel_types = array_unique(array_diff(array_intersect($_REQUEST['accepted_angel_types'], array_keys($angel_types)), $nonrestricted_angel_types));
if (in_array("admin_user_angeltypes", $privileges)) if (in_array("admin_user_angeltypes", $privileges))
$selected_angel_types = array_merge($selected_angel_types, $accepted_angel_types); $selected_angel_types = array_merge((array) $selected_angel_types, $accepted_angel_types);
$selected_angel_types = array_unique($selected_angel_types);
// Assign angel-types // Assign angel-types
sql_start_transaction(); sql_start_transaction();
@ -227,10 +228,11 @@ function admin_user() {
case 'delete' : case 'delete' :
if ($user['UID'] != $id) { if ($user['UID'] != $id) {
$nickname = sql_select("SELECT `Nick` FROM `User` WHERE `UID` = '" . sql_escape($id) . "' LIMIT 1");
sql_query("DELETE FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); sql_query("DELETE FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1");
sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id)); sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id));
sql_query("UPDATE `ShiftEntry` SET `UID`=0, `Comment`=NULL WHERE `UID`=" . sql_escape($id)); sql_query("UPDATE `ShiftEntry` SET `UID`=0, `Comment`=NULL WHERE `UID`=" . sql_escape($id));
engelsystem_log("Deleted user " . $user_source['Nick']); engelsystem_log("Deleted user " . $nickname[0]['Nick']);
$html .= success("Benutzer gelöscht!", true); $html .= success("Benutzer gelöscht!", true);
} else { } else {
$html .= error("Du kannst Dich nicht selber löschen!", true); $html .= error("Du kannst Dich nicht selber löschen!", true);

2
templates/admin_free.html
View File

@ -1,6 +1,6 @@
<form action="%link%" method="post"> <form action="%link%" method="post">
<p> <p>
Search Angel: <input type="text" name="search" value="%search%" placeholder="Name" /> %angeltypes% <input type="submit" name="submit" value="Search" /> Search Angel: <input type="text" name="search" value="%search%" placeholder="Name"> %angeltypes% <label><input type="checkbox" name="confirmed_only" %confirmed_only% value="1"> Nur zugelassene</label> <input type="submit" name="submit" value="Search">
</p> </p>
</form> </form>
<table> <table>