diff --git a/db/update.sql b/db/update.sql index a67d51aa..407a8539 100644 --- a/db/update.sql +++ b/db/update.sql @@ -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; diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 19e7d8d3..41fa69a8 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -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'] = '' . $usr['Aktiv'] . ''; + $usr['force_active'] = '' . $usr['force_active'] . ''; + $usr['tshirt'] = '' . $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) diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 2da454cf..a748a580 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -5,216 +5,191 @@ function admin_user_title() { function admin_user() { global $user, $privileges, $tshirt_sizes, $privileges; - + $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,
" . - "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"; - + 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); - + 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" + $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 .= " \n"; + $html .= "
Nick" . - "
lastLogIn" . - date("Y-m-d H:i", $user_source['lastLogIn']) . "
Name" . - "
Vorname" . - "
Alter" . - "
Telefon" . - "
Handy" . - "
DECT" . - "
email" . - "
ICQ" . - "
jabber" . - "
Size" . - html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . "
Nick" . "
lastLogIn" . date("Y-m-d H:i", $user_source['lastLogIn']) . "
Name" . "
Vorname" . "
Alter" . "
Telefon" . "
Handy" . "
DECT" . "
email" . "
ICQ" . "
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" . - "
Hometown" . "
\n		" . User_Avatar_render($user_source) . "
\n
\n"; $html .= "\n"; $html .= "
"; - + $html .= "
"; - + // 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"); $nonrestricted_angel_types = sql_select_single_col("SELECT `id` FROM `AngelTypes` WHERE `restricted` = 0"); - + $angel_types_source = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `name`"); $angel_types = array(); 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); - + // Assign angel-types 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(); - + engelsystem_log("Set angeltypes of " . User_Nick_render($user_source) . " to: " . join(", ", $user_angel_type_info)); success("Angeltypes saved."); redirect(page_link_to('admin_user') . '&id=' . $user_source['UID']); } - - $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_submit('submit_user_angeltypes', _("Save")) + + $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_submit('submit_user_angeltypes', _("Save")) )); - + $html .= "
"; - + $html .= "Hier kannst Du das Passwort dieses Engels neu setzen:
\n"; $html .= "\n"; - $html .= " \n"; - $html .= " \n"; - + $html .= " \n"; + $html .= " \n"; + $html .= "
Passwort" . - "
Wiederholung" . - "
Passwort" . "
Wiederholung" . "
"; $html .= "\n"; $html .= "
"; - + $html .= "
"; - + $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']; - + $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) { $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 .= ''; - + $html .= '
' . $group['Name'] . '
'; - + $html .= "\n"; $html .= "
"; - + $html .= "
"; } - + $html .= "
\n"; $html .= "\n"; $html .= "
"; - + $html .= "
"; } 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`"); - + 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(); foreach ($_REQUEST['groups'] as $group) { @@ -233,8 +208,8 @@ function admin_user() { $html .= error("Du kannst Deine eigenen Rechte nicht bearbeiten.", true); } 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"); @@ -246,31 +221,19 @@ function admin_user() { $html .= error("Du kannst Dich nicht selber löschen!", true); } 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); @@ -284,19 +247,19 @@ function admin_user() { } } else { // Userliste, keine UID uebergeben... - + $html .= "Neuen Engel eintragen »

\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); - + // anzahl zeilen $Zeilen = count($angels); - + $html .= "Anzahl Engel: $Zeilen

\n"; - + function prepare_angel_table($angel) { global $privileges; $groups = sql_select_single_col("SELECT `Name` FROM `UserGroups` JOIN `Groups` ON (`Groups`.`UID` = `UserGroups`.`group_id`) WHERE `UserGroups`.`uid`=" . sql_escape($angel["UID"]) . " ORDER BY `Groups`.`Name`"); @@ -318,37 +281,44 @@ function admin_user() { if (strlen($angel["jabber"]) > 0) $popup .= "
Jabber: " . $angel["jabber"]; return array( - 'Nick' => User_Nick_render($angel), - 'Name' => htmlspecialchars($angel['Vorname'] . ' ' . $angel['Name']), - 'DECT' => htmlspecialchars($angel['DECT']), - 'Alter' => htmlspecialchars($angel['Alter']), - 'email' => '' . htmlspecialchars($angel['email']) . '' . $popup, - 'Gekommen' => '' . $angel['Gekommen'] . '', - 'Aktiv' => '' . $angel['Aktiv'] . '', - 'Tshirt' => '' . $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")), + 'Nick' => User_Nick_render($angel), + 'Name' => htmlspecialchars($angel['Vorname'] . ' ' . $angel['Name']), + 'DECT' => htmlspecialchars($angel['DECT']), + 'Alter' => htmlspecialchars($angel['Alter']), + 'email' => '' . htmlspecialchars($angel['email']) . '' . $popup, + 'Gekommen' => '' . $angel['Gekommen'] . '', + 'Aktiv' => '' . $angel['Aktiv'] . '', + 'force_active' => '' . $angel['force_active'] . '', + 'Tshirt' => '' . $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")) ); } $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' => 'Summe', 'Gekommen' => $Gekommen, 'Aktiv' => $Active, 'Tshirt' => $Tshirt); + $angels[] = array( + 'Nick' => 'Summe', + 'Gekommen' => $Gekommen, + 'Aktiv' => $Active, + 'Tshirt' => $Tshirt + ); $html .= table(array( - 'Nick' => 'Nick', - 'Name' => 'Vorname Name', - 'DECT' => 'DECT', - 'Alter' => 'Alter', - 'email' => 'E-Mail', - 'Gekommen' => '
Gekommen
', - 'Aktiv' => '
Aktiv
', - 'Tshirt' => '
T-Shirt
', - 'Size' => '
Größe
', - 'lastLogIn' => 'Last login', - 'edit' => ''), - $angels); + 'Nick' => 'Nick', + 'Name' => 'Vorname Name', + 'DECT' => 'DECT', + 'Alter' => 'Alter', + 'email' => 'E-Mail', + 'Gekommen' => '
Gekommen
', + 'Aktiv' => '
Aktiv
', + 'force_active' => '
' . _("Forced") . '
', + 'Tshirt' => '
T-Shirt
', + 'Size' => '
Größe
', + 'lastLogIn' => 'Last login', + 'edit' => '' + ), $angels); } return $html; }