force active function
This commit is contained in:
Philip Häusler
parent
af47aae69a
commit
a9fb05b128
|
|
@ -1,3 +1,6 @@
|
|||
/* force active */
|
||||
ALTER TABLE `User` ADD `force_active` BOOLEAN NOT NULL AFTER `Aktiv`, ADD INDEX ( `force_active` );
|
||||
|
||||
/* freeloader */
|
||||
ALTER TABLE `ShiftEntry` ADD `freeloaded` BOOLEAN NOT NULL, ADD INDEX ( `freeloaded` );
|
||||
ALTER TABLE `ShiftEntry` ADD `freeload_comment` TEXT NULL DEFAULT NULL;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ function admin_active() {
|
|||
|
||||
$msg = "";
|
||||
$search = "";
|
||||
$count = 0;
|
||||
$forced_count = sql_num_query("SELECT * FROM `User` WHERE `force_active`=1");
|
||||
$count = $forced_count;
|
||||
$limit = "";
|
||||
$set_active = "";
|
||||
if (isset($_REQUEST['search']))
|
||||
|
|
@ -16,9 +17,13 @@ function admin_active() {
|
|||
if (isset($_REQUEST['set_active'])) {
|
||||
$ok = true;
|
||||
|
||||
if (isset($_REQUEST['count']) && preg_match("/^[0-9]+$/", $_REQUEST['count']))
|
||||
if (isset($_REQUEST['count']) && preg_match("/^[0-9]+$/", $_REQUEST['count'])) {
|
||||
$count = strip_request_item('count');
|
||||
else {
|
||||
if ($count < $forced_count) {
|
||||
error(sprintf(_("At least %s angels are forced to be active. The number has to be greater."), $forced_count));
|
||||
redirect(page_link_to('admin_active'));
|
||||
}
|
||||
} else {
|
||||
$ok = false;
|
||||
$msg .= error(_("Please enter a number of angels to be marked as active."), true);
|
||||
}
|
||||
|
|
@ -27,7 +32,7 @@ function admin_active() {
|
|||
$limit = " LIMIT " . $count;
|
||||
if (isset($_REQUEST['ack'])) {
|
||||
sql_query("UPDATE `User` SET `Aktiv` = 0 WHERE `Tshirt` = 0");
|
||||
$users = sql_select("SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 GROUP BY `User`.`UID` ORDER BY `shift_length` DESC" . $limit);
|
||||
$users = sql_select("SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 AND `User`.`force_active`=0 GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC" . $limit);
|
||||
$user_nicks = array();
|
||||
foreach ($users as $usr) {
|
||||
sql_query("UPDATE `User` SET `Aktiv` = 1 WHERE `UID`=" . sql_escape($usr['UID']));
|
||||
|
|
@ -80,7 +85,7 @@ function admin_active() {
|
|||
$msg = error(_("Angel not found."), true);
|
||||
}
|
||||
|
||||
$users = sql_select("SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 GROUP BY `User`.`UID` ORDER BY `shift_length` DESC" . $limit);
|
||||
$users = sql_select("SELECT `User`.*, COUNT(`ShiftEntry`.`id`) as `shift_count`, ${shift_sum_formula} as `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC" . $limit);
|
||||
|
||||
$matched_users = array();
|
||||
if ($search == "")
|
||||
|
|
@ -102,8 +107,9 @@ function admin_active() {
|
|||
$usr['nick'] = User_Nick_render($usr);
|
||||
$usr['shirt_size'] = $tshirt_sizes[$usr['Size']];
|
||||
$usr['work_time'] = round($usr['shift_length'] / 60) . ' min (' . round($usr['shift_length'] / 3600) . ' h)';
|
||||
$usr['active'] = $usr['Aktiv'] == 1 ? _("yes") : "";
|
||||
$usr['tshirt'] = $usr['Tshirt'] == 1 ? _("yes") : "";
|
||||
$usr['active'] = '<img src="pic/icons/' . ($usr['Aktiv'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $usr['Aktiv'] . '">';
|
||||
$usr['force_active'] = '<img src="pic/icons/' . ($usr['force_active'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $usr['force_active'] . '">';
|
||||
$usr['tshirt'] = '<img src="pic/icons/' . ($usr['Tshirt'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $usr['Tshirt'] . '">';
|
||||
|
||||
$actions = array();
|
||||
if ($usr['Aktiv'] == 0)
|
||||
|
|
@ -135,6 +141,7 @@ function admin_active() {
|
|||
'shift_count' => _("Shifts"),
|
||||
'work_time' => _("Length"),
|
||||
'active' => _("Active?"),
|
||||
'force_active' => _("Forced"),
|
||||
'tshirt' => _("T-shirt?"),
|
||||
'actions' => ""
|
||||
), $matched_users)
|
||||
|
|
|
|||
|
|
@ -8,15 +8,10 @@ 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) {
|
||||
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,<br />" .
|
||||
"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.<br /><br />\n";
|
||||
if (! isset($_REQUEST['action'])) {
|
||||
$html .= "Hallo,<br />" . "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.<br /><br />\n";
|
||||
|
||||
$html .= "<form action=\"" . page_link_to("admin_user") . "&action=save&id=$id\" method=\"post\">\n";
|
||||
$html .= "<table border=\"0\">\n";
|
||||
|
|
@ -24,46 +19,24 @@ function admin_user() {
|
|||
|
||||
$SQL = "SELECT * FROM `User` WHERE `UID`='" . sql_escape($id) . "'";
|
||||
$Erg = sql_query($SQL);
|
||||
list ($user_source) = sql_select($SQL);
|
||||
list($user_source) = sql_select($SQL);
|
||||
|
||||
$html .= "<tr><td>\n";
|
||||
$html .= "<table>\n";
|
||||
$html .= " <tr><td>Nick</td><td>" .
|
||||
"<input type=\"text\" size=\"40\" name=\"eNick\" value=\"" .
|
||||
$user_source['Nick'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>lastLogIn</td><td>" .
|
||||
date("Y-m-d H:i", $user_source['lastLogIn']) . "</td></tr>\n";
|
||||
$html .= " <tr><td>Name</td><td>" .
|
||||
"<input type=\"text\" size=\"40\" name=\"eName\" value=\"" .
|
||||
$user_source['Name'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Vorname</td><td>" .
|
||||
"<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"" .
|
||||
$user_source['Vorname'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Alter</td><td>" .
|
||||
"<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"" .
|
||||
$user_source['Alter'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Telefon</td><td>" .
|
||||
"<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"" .
|
||||
$user_source['Telefon'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Handy</td><td>" .
|
||||
"<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"" .
|
||||
$user_source['Handy'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>DECT</td><td>" .
|
||||
"<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"" .
|
||||
$user_source['DECT'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>email</td><td>" .
|
||||
"<input type=\"text\" size=\"40\" name=\"eemail\" value=\"" .
|
||||
$user_source['email'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>ICQ</td><td>" .
|
||||
"<input type=\"text\" size=\"40\" name=\"eICQ\" value=\"" .
|
||||
$user_source['ICQ'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>jabber</td><td>" .
|
||||
"<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"" .
|
||||
$user_source['jabber'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Size</td><td>" .
|
||||
html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . "</td></tr>\n";
|
||||
$html .= " <tr><td>Nick</td><td>" . "<input type=\"text\" size=\"40\" name=\"eNick\" value=\"" . $user_source['Nick'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>lastLogIn</td><td>" . date("Y-m-d H:i", $user_source['lastLogIn']) . "</td></tr>\n";
|
||||
$html .= " <tr><td>Name</td><td>" . "<input type=\"text\" size=\"40\" name=\"eName\" value=\"" . $user_source['Name'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Vorname</td><td>" . "<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"" . $user_source['Vorname'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Alter</td><td>" . "<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"" . $user_source['Alter'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Telefon</td><td>" . "<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"" . $user_source['Telefon'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Handy</td><td>" . "<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"" . $user_source['Handy'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>DECT</td><td>" . "<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"" . $user_source['DECT'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>email</td><td>" . "<input type=\"text\" size=\"40\" name=\"eemail\" value=\"" . $user_source['email'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>ICQ</td><td>" . "<input type=\"text\" size=\"40\" name=\"eICQ\" value=\"" . $user_source['ICQ'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>jabber</td><td>" . "<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"" . $user_source['jabber'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Size</td><td>" . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . "</td></tr>\n";
|
||||
|
||||
$options = array (
|
||||
$options = array(
|
||||
'1' => "Yes",
|
||||
'0' => "No"
|
||||
);
|
||||
|
|
@ -76,13 +49,17 @@ function admin_user() {
|
|||
$html .= " <tr><td>Aktiv</td><td>\n";
|
||||
$html .= html_options('eAktiv', $options, $user_source['Aktiv']) . "</td></tr>\n";
|
||||
|
||||
// Aktiv erzwingen
|
||||
if (in_array('admin_active', $privileges)) {
|
||||
$html .= " <tr><td>" . _("Force active") . "</td><td>\n";
|
||||
$html .= html_options('force_active', $options, $user_source['force_active']) . "</td></tr>\n";
|
||||
}
|
||||
|
||||
// T-Shirt bekommen?
|
||||
$html .= " <tr><td>T-Shirt</td><td>\n";
|
||||
$html .= html_options('eTshirt', $options, $user_source['Tshirt']) . "</td></tr>\n";
|
||||
|
||||
$html .= " <tr><td>Hometown</td><td>" .
|
||||
"<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"" .
|
||||
$user_source['Hometown'] . "\"></td></tr>\n";
|
||||
$html .= " <tr><td>Hometown</td><td>" . "<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"" . $user_source['Hometown'] . "\"></td></tr>\n";
|
||||
|
||||
$html .= "</table>\n</td><td valign=\"top\">" . User_Avatar_render($user_source) . "</td></tr>";
|
||||
|
||||
|
|
@ -94,7 +71,7 @@ function admin_user() {
|
|||
$html .= "<hr />";
|
||||
|
||||
// UserAngelType subform
|
||||
list ($user_source) = sql_select($SQL);
|
||||
list($user_source) = sql_select($SQL);
|
||||
|
||||
$selected_angel_types = sql_select_single_col("SELECT `angeltype_id` FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user_source['UID']));
|
||||
$accepted_angel_types = sql_select_single_col("SELECT `angeltype_id` FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user_source['UID']) . " AND `confirm_user_id` IS NOT NULL");
|
||||
|
|
@ -105,13 +82,9 @@ function admin_user() {
|
|||
foreach ($angel_types_source as $angel_type)
|
||||
$angel_types[$angel_type['id']] = $angel_type['name'];
|
||||
|
||||
if (isset ($_REQUEST['submit_user_angeltypes'])) {
|
||||
$selected_angel_types = isset($_REQUEST['selected_angel_types']) && is_array($_REQUEST['selected_angel_types'])?
|
||||
array_intersect($_REQUEST['selected_angel_types'], array_keys($angel_types))
|
||||
: array();
|
||||
$accepted_angel_types = isset($_REQUEST['accepted_angel_types']) && is_array($_REQUEST['accepted_angel_types'])?
|
||||
array_unique(array_diff(array_intersect($_REQUEST['accepted_angel_types'], array_keys($angel_types)), $nonrestricted_angel_types))
|
||||
: array();
|
||||
if (isset($_REQUEST['submit_user_angeltypes'])) {
|
||||
$selected_angel_types = isset($_REQUEST['selected_angel_types']) && is_array($_REQUEST['selected_angel_types']) ? array_intersect($_REQUEST['selected_angel_types'], array_keys($angel_types)) : array();
|
||||
$accepted_angel_types = isset($_REQUEST['accepted_angel_types']) && is_array($_REQUEST['accepted_angel_types']) ? array_unique(array_diff(array_intersect($_REQUEST['accepted_angel_types'], array_keys($angel_types)), $nonrestricted_angel_types)) : array();
|
||||
if (in_array("admin_user_angeltypes", $privileges))
|
||||
$selected_angel_types = array_merge((array) $selected_angel_types, $accepted_angel_types);
|
||||
$selected_angel_types = array_unique($selected_angel_types);
|
||||
|
|
@ -120,19 +93,19 @@ function admin_user() {
|
|||
sql_transaction_start();
|
||||
sql_query("DELETE FROM `UserAngelTypes` WHERE `user_id`=" . sql_escape($user_source['UID']));
|
||||
$user_angel_type_info = array();
|
||||
if (!empty($selected_angel_types)) {
|
||||
if (! empty($selected_angel_types)) {
|
||||
$SQL = "INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`) VALUES ";
|
||||
foreach ($selected_angel_types as $selected_angel_type_id) {
|
||||
$SQL .= "(" . $user_source['UID'] . ", " . $selected_angel_type_id . "),";
|
||||
$user_angel_type_info[] = $angel_types[$selected_angel_type_id] . (in_array($selected_angel_type_id, $accepted_angel_types) ? ' (confirmed)' : '');
|
||||
}
|
||||
// remove superfluous comma
|
||||
$SQL = substr($SQL, 0, -1);
|
||||
$SQL = substr($SQL, 0, - 1);
|
||||
sql_query($SQL);
|
||||
}
|
||||
if (in_array("admin_user_angeltypes", $privileges)) {
|
||||
sql_query("UPDATE `UserAngelTypes` SET `confirm_user_id` = NULL WHERE `user_id` = " . sql_escape($user_source['UID']));
|
||||
if (!empty($accepted_angel_types))
|
||||
if (! empty($accepted_angel_types))
|
||||
sql_query("UPDATE `UserAngelTypes` SET `confirm_user_id` = '" . sql_escape($user['UID']) . "' WHERE `user_id` = '" . sql_escape($user_source['UID']) . "' AND `angeltype_id` IN (" . implode(',', $accepted_angel_types) . ")");
|
||||
}
|
||||
sql_transaction_commit();
|
||||
|
|
@ -142,13 +115,17 @@ function admin_user() {
|
|||
redirect(page_link_to('admin_user') . '&id=' . $user_source['UID']);
|
||||
}
|
||||
|
||||
$html .= form(array (
|
||||
$html .= form(array(
|
||||
msg(),
|
||||
form_multi_checkboxes(array('selected_angel_types' => 'gewünscht', 'accepted_angel_types' => 'akzeptiert'),
|
||||
"Angeltypes",
|
||||
$angel_types,
|
||||
array('selected_angel_types' => $selected_angel_types, 'accepted_angel_types' => array_merge($accepted_angel_types, $nonrestricted_angel_types)),
|
||||
array('accepted_angel_types' => $nonrestricted_angel_types)),
|
||||
form_multi_checkboxes(array(
|
||||
'selected_angel_types' => 'gewünscht',
|
||||
'accepted_angel_types' => 'akzeptiert'
|
||||
), "Angeltypes", $angel_types, array(
|
||||
'selected_angel_types' => $selected_angel_types,
|
||||
'accepted_angel_types' => array_merge($accepted_angel_types, $nonrestricted_angel_types)
|
||||
), array(
|
||||
'accepted_angel_types' => $nonrestricted_angel_types
|
||||
)),
|
||||
form_submit('submit_user_angeltypes', _("Save"))
|
||||
));
|
||||
|
||||
|
|
@ -156,10 +133,8 @@ function admin_user() {
|
|||
|
||||
$html .= "Hier kannst Du das Passwort dieses Engels neu setzen:<form action=\"" . page_link_to("admin_user") . "&action=change_pw&id=$id\" method=\"post\">\n";
|
||||
$html .= "<table>\n";
|
||||
$html .= " <tr><td>Passwort</td><td>" .
|
||||
"<input type=\"password\" size=\"40\" name=\"new_pw\" value=\"\"></td></tr>\n";
|
||||
$html .= " <tr><td>Wiederholung</td><td>" .
|
||||
"<input type=\"password\" size=\"40\" name=\"new_pw2\" value=\"\"></td></tr>\n";
|
||||
$html .= " <tr><td>Passwort</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw\" value=\"\"></td></tr>\n";
|
||||
$html .= " <tr><td>Wiederholung</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw2\" value=\"\"></td></tr>\n";
|
||||
|
||||
$html .= "</table>";
|
||||
$html .= "<input type=\"submit\" value=\"Speichern\">\n";
|
||||
|
|
@ -198,7 +173,7 @@ function admin_user() {
|
|||
$html .= "<hr />";
|
||||
} else {
|
||||
switch ($_REQUEST['action']) {
|
||||
case 'save_groups' :
|
||||
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`");
|
||||
|
|
@ -206,14 +181,14 @@ function admin_user() {
|
|||
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 ();
|
||||
$grouplist = array();
|
||||
foreach ($groups_source as $group) {
|
||||
$groups[$group['UID']] = $group;
|
||||
$grouplist[] = $group['UID'];
|
||||
}
|
||||
|
||||
if (!is_array($_REQUEST['groups']))
|
||||
$_REQUEST['groups'] = array ();
|
||||
if (! is_array($_REQUEST['groups']))
|
||||
$_REQUEST['groups'] = array();
|
||||
|
||||
sql_query("DELETE FROM `UserGroups` WHERE `uid`=" . sql_escape($id));
|
||||
$user_groups_info = array();
|
||||
|
|
@ -234,7 +209,7 @@ function admin_user() {
|
|||
}
|
||||
break;
|
||||
|
||||
case 'delete' :
|
||||
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");
|
||||
|
|
@ -247,30 +222,18 @@ function admin_user() {
|
|||
}
|
||||
break;
|
||||
|
||||
case 'save' :
|
||||
case 'save':
|
||||
$forced_active = $user['force_active'];
|
||||
if (in_array('admin_active', $privileges))
|
||||
$forced_active = $_REQUEST['force_active'];
|
||||
$SQL = "UPDATE `User` SET ";
|
||||
$SQL .= " `Nick` = '" . sql_escape($_POST["eNick"]) . "', `Name` = '" . sql_escape($_POST["eName"]) . "', " .
|
||||
"`Vorname` = '" . sql_escape($_POST["eVorname"]) . "', " .
|
||||
"`Telefon` = '" . sql_escape($_POST["eTelefon"]) . "', " .
|
||||
"`Handy` = '" . sql_escape($_POST["eHandy"]) . "', " .
|
||||
"`Alter` = '" . sql_escape($_POST["eAlter"]) . "', " .
|
||||
"`DECT` = '" . sql_escape($_POST["eDECT"]) . "', " .
|
||||
"`email` = '" . sql_escape($_POST["eemail"]) . "', " .
|
||||
"`ICQ` = '" . sql_escape($_POST["eICQ"]) . "', " .
|
||||
"`jabber` = '" . sql_escape($_POST["ejabber"]) . "', " .
|
||||
"`Size` = '" . sql_escape($_POST["eSize"]) . "', " .
|
||||
"`Gekommen`= '" . sql_escape($_POST["eGekommen"]) . "', " .
|
||||
"`Aktiv`= '" . sql_escape($_POST["eAktiv"]) . "', " .
|
||||
"`Tshirt` = '" . sql_escape($_POST["eTshirt"]) . "', " .
|
||||
"`Hometown` = '" . sql_escape($_POST["Hometown"]) . "' " .
|
||||
"WHERE `UID` = '" . sql_escape($id) .
|
||||
"' LIMIT 1;";
|
||||
$SQL .= " `Nick` = '" . sql_escape($_POST["eNick"]) . "', `Name` = '" . sql_escape($_POST["eName"]) . "', " . "`Vorname` = '" . sql_escape($_POST["eVorname"]) . "', " . "`Telefon` = '" . sql_escape($_POST["eTelefon"]) . "', " . "`Handy` = '" . sql_escape($_POST["eHandy"]) . "', " . "`Alter` = '" . sql_escape($_POST["eAlter"]) . "', " . "`DECT` = '" . sql_escape($_POST["eDECT"]) . "', " . "`email` = '" . sql_escape($_POST["eemail"]) . "', " . "`ICQ` = '" . sql_escape($_POST["eICQ"]) . "', " . "`jabber` = '" . sql_escape($_POST["ejabber"]) . "', " . "`Size` = '" . sql_escape($_POST["eSize"]) . "', " . "`Gekommen`= '" . sql_escape($_POST["eGekommen"]) . "', " . "`Aktiv`= '" . sql_escape($_POST["eAktiv"]) . "', " . "`force_active`= " . sql_escape($force_active) . ", " . "`Tshirt` = '" . sql_escape($_POST["eTshirt"]) . "', " . "`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' :
|
||||
case 'change_pw':
|
||||
if ($_REQUEST['new_pw'] != "" && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) {
|
||||
set_password($id, $_REQUEST['new_pw']);
|
||||
$user_source = User($id);
|
||||
|
|
@ -287,7 +250,7 @@ function admin_user() {
|
|||
|
||||
$html .= "<a href=\"" . page_link_to("register") . "\">Neuen Engel eintragen »</a><br /><br />\n";
|
||||
|
||||
if (!isset ($_GET["OrderBy"]))
|
||||
if (! isset($_GET["OrderBy"]))
|
||||
$_GET["OrderBy"] = "Nick";
|
||||
$SQL = "SELECT * FROM `User` ORDER BY `" . sql_escape($_GET["OrderBy"]) . "` ASC";
|
||||
$angels = sql_select($SQL);
|
||||
|
|
@ -323,19 +286,25 @@ function admin_user() {
|
|||
'DECT' => htmlspecialchars($angel['DECT']),
|
||||
'Alter' => htmlspecialchars($angel['Alter']),
|
||||
'email' => '<a href="mailto:' . htmlspecialchars($angel['email']) . '">' . htmlspecialchars($angel['email']) . '</a>' . $popup,
|
||||
'Gekommen' => '<img src="pic/icons/' . ($angel['Gekommen'] == 1? 'tick' : 'cross') . '.png" alt="' . $angel['Gekommen'] . '">',
|
||||
'Aktiv' => '<img src="pic/icons/' . ($angel['Aktiv'] == 1? 'tick' : 'cross') . '.png" alt="' . $angel['Aktiv'] . '">',
|
||||
'Tshirt' => '<img src="pic/icons/' . ($angel['Tshirt'] == 1? 'tick' : 'cross') . '.png" alt="' . $angel['Tshirt'] . '">',
|
||||
'Gekommen' => '<img src="pic/icons/' . ($angel['Gekommen'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $angel['Gekommen'] . '">',
|
||||
'Aktiv' => '<img src="pic/icons/' . ($angel['Aktiv'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $angel['Aktiv'] . '">',
|
||||
'force_active' => '<img src="pic/icons/' . ($angel['force_active'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $angel['force_active'] . '">',
|
||||
'Tshirt' => '<img src="pic/icons/' . ($angel['Tshirt'] == 1 ? 'tick' : 'cross') . '.png" alt="' . $angel['Tshirt'] . '">',
|
||||
'Size' => $angel['Size'],
|
||||
'lastLogIn' => date('d.m.&\n\b\s\p;H:i', $angel['lastLogIn']),
|
||||
'edit' => img_button(page_link_to('admin_user') . '&id=' . $angel['UID'], 'pencil', _("edit")),
|
||||
'edit' => img_button(page_link_to('admin_user') . '&id=' . $angel['UID'], 'pencil', _("edit"))
|
||||
);
|
||||
}
|
||||
$angels = array_map('prepare_angel_table', $angels);
|
||||
$Gekommen = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Gekommen` = 1");
|
||||
$Active = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Aktiv` = 1");
|
||||
$Tshirt = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Tshirt` = 1");
|
||||
$angels[] = array('Nick' => '<strong>Summe</strong>', 'Gekommen' => $Gekommen, 'Aktiv' => $Active, 'Tshirt' => $Tshirt);
|
||||
$angels[] = array(
|
||||
'Nick' => '<strong>Summe</strong>',
|
||||
'Gekommen' => $Gekommen,
|
||||
'Aktiv' => $Active,
|
||||
'Tshirt' => $Tshirt
|
||||
);
|
||||
$html .= table(array(
|
||||
'Nick' => '<a href="' . page_link_to("admin_user") . '&OrderBy=Nick">Nick</a>',
|
||||
'Name' => '<a href="' . page_link_to("admin_user") . '&OrderBy=Vorname">Vorname</a> <a href="' . page_link_to("admin_user") . '&OrderBy=Name">Name</a>',
|
||||
|
|
@ -344,11 +313,12 @@ function admin_user() {
|
|||
'email' => '<a href="' . page_link_to("admin_user") . '&OrderBy=email">E-Mail</a>',
|
||||
'Gekommen' => '<div class="rotate"><a href="' . page_link_to("admin_user") . '&OrderBy=Gekommen">Gekommen</a></div>',
|
||||
'Aktiv' => '<div class="rotate"><a href="' . page_link_to("admin_user") . '&OrderBy=Aktiv">Aktiv</a></div>',
|
||||
'force_active' => '<div class="rotate"><a href="' . page_link_to("admin_user") . '&OrderBy=force_active">' . _("Forced") . '</a></div>',
|
||||
'Tshirt' => '<div class="rotate"><a href="' . page_link_to("admin_user") . '&OrderBy=Tshirt">T-Shirt</a></div>',
|
||||
'Size' => '<div class="rotate"><a href="' . page_link_to("admin_user") . '&OrderBy=Size">Größe</a></div>',
|
||||
'lastLogIn' => '<a href="' . page_link_to("admin_user") . '&OrderBy=lastLogIn">Last login</a>',
|
||||
'edit' => ''),
|
||||
$angels);
|
||||
'edit' => ''
|
||||
), $angels);
|
||||
}
|
||||
return $html;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue