From 16ce2eb9690dd4ad6b2cd97b267b942e728323a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20H=C3=A4usler?= Date: Sat, 27 Dec 2014 21:55:24 +0100 Subject: [PATCH] begin cleanup of user edit --- includes/controller/users_controller.php | 4 + includes/pages/admin_user.php | 337 ++++++++++++----------- 2 files changed, 175 insertions(+), 166 deletions(-) diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php index a282c1c7..484d9912 100644 --- a/includes/controller/users_controller.php +++ b/includes/controller/users_controller.php @@ -27,6 +27,10 @@ function users_controller() { } } +function users_link() { + return page_link_to('users'); +} + function user_link($user) { return page_link_to('users') . '&action=view&user_id=' . $user['UID']; } diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index b1ac5c1b..8713d9ab 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -9,165 +9,174 @@ function admin_user() { $html = ''; - if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,}$/", $_REQUEST['id']) && sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($_REQUEST['id'])) > 0) { - $id = $_REQUEST['id']; - if (! isset($_REQUEST['action'])) { - $html .= "Hallo,
" . "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . "bereits sein T-Shirt erhalten hat.

\n"; - - $html .= "
\n"; - $html .= "\n"; - $html .= "\n"; - - $SQL = "SELECT * FROM `User` WHERE `UID`='" . sql_escape($id) . "'"; - $Erg = sql_query($SQL); - list($user_source) = sql_select($SQL); - - $html .= ""; - - $html .= "\n"; - $html .= "
\n"; - $html .= "\n"; - $html .= " \n"; - $html .= " \n"; - $html .= " \n"; - $html .= " \n"; - $html .= " \n"; - $html .= " \n"; - $html .= " \n"; - $html .= " \n"; - $html .= " \n"; - $html .= "\n"; - $html .= " \n"; - $html .= " \n"; - - $options = array( - '1' => "Yes", - '0' => "No" - ); - - // Gekommen? - $html .= " \n"; - - // Aktiv? - $html .= " \n"; - - // Aktiv erzwingen - if (in_array('admin_active', $privileges)) { - $html .= " \n"; - } - - // T-Shirt bekommen? - $html .= " \n"; - - $html .= " \n"; - - $html .= "
Nick" . "
lastLogIn" . date("Y-m-d H:i", $user_source['lastLogIn']) . "
Name" . "
Vorname" . "
Alter" . "
Telefon" . "
Handy" . "
DECT" . "
email" . "
" . form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $user_source['email_shiftinfo']) . "
jabber" . "
Size" . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . "
Gekommen\n"; - $html .= html_options('eGekommen', $options, $user_source['Gekommen']) . "
Aktiv\n"; - $html .= html_options('eAktiv', $options, $user_source['Aktiv']) . "
" . _("Force active") . "\n"; - $html .= html_options('force_active', $options, $user_source['force_active']) . "
T-Shirt\n"; - $html .= html_options('eTshirt', $options, $user_source['Tshirt']) . "
Hometown" . "
\n		" . User_Avatar_render($user_source) . "
\n
\n"; - $html .= "\n"; - $html .= "
"; - - $html .= "
"; - - $html .= form_info('', _('Please visit the angeltypes page or the users profile to manage users angeltypes.')); - - $html .= "Hier kannst Du das Passwort dieses Engels neu setzen:
\n"; - $html .= "\n"; - $html .= " \n"; - $html .= " \n"; - - $html .= "
Passwort" . "
Wiederholung" . "
"; - $html .= "\n"; - $html .= "
"; - - $html .= "
"; - + if (! isset($_REQUEST['id'])) + redirect(users_link()); + + $id = $_REQUEST['id']; + if (! isset($_REQUEST['action'])) { + $user_source = User($id); + if ($user_source === false) + engelsystem_error('Unable to load user.'); + if ($user_source == null) { + error(_('This user does not exist.')); + redirect(users_link()); + } + + $html .= "Hallo,
" . "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . "bereits sein T-Shirt erhalten hat.

\n"; + + $html .= "
\n"; + $html .= "\n"; + $html .= "\n"; + + $SQL = "SELECT * FROM `User` WHERE `UID`='" . sql_escape($id) . "'"; + list($user_source) = sql_select($SQL); + + $html .= ""; + + $html .= "\n"; + $html .= "
\n"; + $html .= "\n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= " \n"; + $html .= "\n"; + $html .= " \n"; + $html .= " \n"; + + $options = array( + '1' => "Yes", + '0' => "No" + ); + + // Gekommen? + $html .= " \n"; + + // Aktiv? + $html .= " \n"; + + // Aktiv erzwingen + if (in_array('admin_active', $privileges)) { + $html .= " \n"; + } + + // T-Shirt bekommen? + $html .= " \n"; + + $html .= " \n"; + + $html .= "
Nick" . "
lastLogIn" . date("Y-m-d H:i", $user_source['lastLogIn']) . "
Name" . "
Vorname" . "
Alter" . "
Telefon" . "
Handy" . "
DECT" . "
email" . "
" . form_checkbox('email_shiftinfo', _("Please send me an email if my shifts change"), $user_source['email_shiftinfo']) . "
jabber" . "
Size" . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . "
Gekommen\n"; + $html .= html_options('eGekommen', $options, $user_source['Gekommen']) . "
Aktiv\n"; + $html .= html_options('eAktiv', $options, $user_source['Aktiv']) . "
" . _("Force active") . "\n"; + $html .= html_options('force_active', $options, $user_source['force_active']) . "
T-Shirt\n"; + $html .= html_options('eTshirt', $options, $user_source['Tshirt']) . "
Hometown" . "
\n		" . User_Avatar_render($user_source) . "
\n
\n"; + $html .= "\n"; + $html .= "
"; + + $html .= "
"; + + $html .= form_info('', _('Please visit the angeltypes page or the users profile to manage users angeltypes.')); + + $html .= "Hier kannst Du das Passwort dieses Engels neu setzen:
\n"; + $html .= "\n"; + $html .= " \n"; + $html .= " \n"; + + $html .= "
Passwort" . "
Wiederholung" . "
"; + $html .= "\n"; + $html .= "
"; + + $html .= "
"; + + $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($user['UID']) . " ORDER BY `uid` LIMIT 1"); + if (count($my_highest_group) > 0) + $my_highest_group = $my_highest_group[0]['group_id']; + + $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($id) . " ORDER BY `uid` LIMIT 1"); + if (count($his_highest_group) > 0) + $his_highest_group = $his_highest_group[0]['group_id']; + + if ($id != $user['UID'] && $my_highest_group <= $his_highest_group) { $html .= "Hier kannst Du die Benutzergruppen des Engels festlegen:
\n"; $html .= ''; - $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($user['UID']) . " ORDER BY `uid` LIMIT 1"); - if (count($my_highest_group) > 0) - $my_highest_group = $my_highest_group[0]['group_id']; + $groups = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = " . sql_escape($id) . ") WHERE `Groups`.`UID` >= " . sql_escape($my_highest_group) . " ORDER BY `Groups`.`Name`"); + foreach ($groups as $group) + $html .= ''; - $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($id) . " ORDER BY `uid` LIMIT 1"); - if (count($his_highest_group) > 0) - $his_highest_group = $his_highest_group[0]['group_id']; + $html .= '
' . $group['Name'] . '
'; - if ($id != $user['UID'] && $my_highest_group <= $his_highest_group) { - $groups = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = " . sql_escape($id) . ") WHERE `Groups`.`UID` >= " . sql_escape($my_highest_group) . " ORDER BY `Groups`.`Name`"); - foreach ($groups as $group) - $html .= '' . $group['Name'] . ''; - - $html .= ''; - - $html .= "\n"; - $html .= "
"; - - $html .= "
"; - } - - $html .= "
\n"; - $html .= "\n"; + $html .= "\n"; $html .= "
"; $html .= "
"; - } else { - switch ($_REQUEST['action']) { - case 'save_groups': - if ($id != $user['UID']) { - $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($user['UID']) . " ORDER BY `group_id`"); - $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($id) . " ORDER BY `group_id`"); - - if (count($my_highest_group) > 0 && (count($his_highest_group) == 0 || ($my_highest_group[0]['group_id'] <= $his_highest_group[0]['group_id']))) { - $groups_source = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = " . sql_escape($id) . ") WHERE `Groups`.`UID` >= " . sql_escape($my_highest_group[0]['group_id']) . " ORDER BY `Groups`.`Name`"); - $groups = array(); - $grouplist = array(); - foreach ($groups_source as $group) { - $groups[$group['UID']] = $group; - $grouplist[] = $group['UID']; - } - - if (! is_array($_REQUEST['groups'])) - $_REQUEST['groups'] = array(); - - sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id)); - $user_groups_info = array(); - foreach ($_REQUEST['groups'] as $group) { - if (in_array($group, $grouplist)) { - sql_query("INSERT INTO `UserGroups` SET `uid`=" . sql_escape($id) . ", `group_id`=" . sql_escape($group)); - $user_groups_info[] = $groups[$group]['Name']; - } - } - $user_source = User($id); - engelsystem_log("Set groups of " . User_Nick_render($user_source) . " to: " . join(", ", $user_groups_info)); - $html .= success("Benutzergruppen gespeichert.", true); - } else { - $html .= error("Du kannst keine Engel mit mehr Rechten bearbeiten.", true); + } + + $html .= "
\n"; + $html .= "\n"; + $html .= "
"; + + $html .= "
"; + } else { + switch ($_REQUEST['action']) { + case 'save_groups': + if ($id != $user['UID']) { + $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($user['UID']) . " ORDER BY `group_id`"); + $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`=" . sql_escape($id) . " ORDER BY `group_id`"); + + if (count($my_highest_group) > 0 && (count($his_highest_group) == 0 || ($my_highest_group[0]['group_id'] <= $his_highest_group[0]['group_id']))) { + $groups_source = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = " . sql_escape($id) . ") WHERE `Groups`.`UID` >= " . sql_escape($my_highest_group[0]['group_id']) . " ORDER BY `Groups`.`Name`"); + $groups = array(); + $grouplist = array(); + foreach ($groups_source as $group) { + $groups[$group['UID']] = $group; + $grouplist[] = $group['UID']; } - } else { - $html .= error("Du kannst Deine eigenen Rechte nicht bearbeiten.", true); - } - break; - - case 'delete': - if ($user['UID'] != $id) { - $user_source = sql_select("SELECT `Nick`, `UID` FROM `User` WHERE `UID` = '" . sql_escape($id) . "' LIMIT 1"); - sql_query("DELETE FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); + + if (! is_array($_REQUEST['groups'])) + $_REQUEST['groups'] = array(); + sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id)); - engelsystem_log("Deleted user " . User_Nick_render($user_source)); - $html .= success("Benutzer gelöscht!", true); + $user_groups_info = array(); + foreach ($_REQUEST['groups'] as $group) { + if (in_array($group, $grouplist)) { + sql_query("INSERT INTO `UserGroups` SET `uid`=" . sql_escape($id) . ", `group_id`=" . sql_escape($group)); + $user_groups_info[] = $groups[$group]['Name']; + } + } + $user_source = User($id); + engelsystem_log("Set groups of " . User_Nick_render($user_source) . " to: " . join(", ", $user_groups_info)); + $html .= success("Benutzergruppen gespeichert.", true); } else { - $html .= error("Du kannst Dich nicht selber löschen!", true); + $html .= error("Du kannst keine Engel mit mehr Rechten bearbeiten.", true); } - break; - - case 'save': - $force_active = $user['force_active']; - if (in_array('admin_active', $privileges)) - $force_active = $_REQUEST['force_active']; - $SQL = "UPDATE `User` SET + } else { + $html .= error("Du kannst Deine eigenen Rechte nicht bearbeiten.", true); + } + break; + + case 'delete': + if ($user['UID'] != $id) { + $user_source = sql_select("SELECT `Nick`, `UID` 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)); + engelsystem_log("Deleted user " . User_Nick_render($user_source)); + $html .= success("Benutzer gelöscht!", true); + } else { + $html .= error("Du kannst Dich nicht selber löschen!", true); + } + break; + + case 'save': + $force_active = $user['force_active']; + if (in_array('admin_active', $privileges)) + $force_active = $_REQUEST['force_active']; + $SQL = "UPDATE `User` SET `Nick` = '" . sql_escape($_POST["eNick"]) . "', `Name` = '" . sql_escape($_POST["eName"]) . "', `Vorname` = '" . sql_escape($_POST["eVorname"]) . "', @@ -186,26 +195,22 @@ function admin_user() { `Hometown` = '" . sql_escape($_POST["Hometown"]) . "' WHERE `UID` = '" . sql_escape($id) . "' LIMIT 1;"; - sql_query($SQL); - engelsystem_log("Updated user: " . $_POST["eNick"] . ", " . $_POST["eSize"] . ", arrived: " . $_POST["eGekommen"] . ", active: " . $_POST["eAktiv"] . ", tshirt: " . $_POST["eTshirt"]); - $html .= success("Änderung wurde gespeichert...\n", true); - break; - - case 'change_pw': - if ($_REQUEST['new_pw'] != "" && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) { - set_password($id, $_REQUEST['new_pw']); - $user_source = User($id); - engelsystem_log("Set new password for " . User_Nick_render($user_source)); - $html .= success("Passwort neu gesetzt.", true); - } else { - $html .= error("Die Eingaben müssen übereinstimmen und dürfen nicht leer sein!", true); - } - break; - } + sql_query($SQL); + engelsystem_log("Updated user: " . $_POST["eNick"] . ", " . $_POST["eSize"] . ", arrived: " . $_POST["eGekommen"] . ", active: " . $_POST["eAktiv"] . ", tshirt: " . $_POST["eTshirt"]); + $html .= success("Änderung wurde gespeichert...\n", true); + break; + + case 'change_pw': + if ($_REQUEST['new_pw'] != "" && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) { + set_password($id, $_REQUEST['new_pw']); + $user_source = User($id); + engelsystem_log("Set new password for " . User_Nick_render($user_source)); + $html .= success("Passwort neu gesetzt.", true); + } else { + $html .= error("Die Eingaben müssen übereinstimmen und dürfen nicht leer sein!", true); + } + break; } - } else { - msg(); - redirect(page_link_to('users')); } return page_with_title(_('Edit user'), array(