';
- $popup .= _("Angeltypes") . ': ' . implode(', ', $angeltypes);
- $popup .= '
' . _("Groups") . ': ' . implode(', ', $groups);
- if (strlen($angel["Telefon"]) > 0)
- $popup .= "
Tel: " . $angel["Telefon"];
- if (strlen($angel["Handy"]) > 0)
- $popup .= "
Handy: " . $angel["Handy"];
- if (strlen($angel["DECT"]) > 0)
- $popup .= "
DECT: " . $angel["DECT"];
- if (strlen($angel["Hometown"]) > 0)
- $popup .= "
Hometown: " . $angel["Hometown"];
- if (strlen($angel["CreateDate"]) > 0)
- $popup .= "
Registered: " . $angel["CreateDate"];
- if (strlen($angel["Art"]) > 0)
- $popup .= "
Type: " . $angel["Art"];
- if (strlen($angel["ICQ"]) > 0)
- $popup .= "
ICQ: " . $angel["ICQ"];
- if (strlen($angel["jabber"]) > 0)
- $popup .= "
Jabber: " . $angel["jabber"];
- return array(
- 'Nick' => User_Nick_render($angel),
- 'Name' => htmlspecialchars($angel['Vorname'] . ' ' . $angel['Name']) . $popup,
- 'DECT' => htmlspecialchars($angel['DECT']),
- 'Gekommen' => '
![' . $angel['Gekommen'] . '](pic/icons/' . ($angel['Gekommen'] == 1 ? 'tick' : 'cross') . '.png)
',
- 'freeloads' => sql_select_single_cell("SELECT COUNT(*) FROM `ShiftEntry` WHERE `freeloaded` = 1 AND `UID` = " . sql_escape($angel['UID'])),
- 'Aktiv' => '
![' . $angel['Aktiv'] . '](pic/icons/' . ($angel['Aktiv'] == 1 ? 'tick' : 'cross') . '.png)
',
- 'force_active' => '
![' . $angel['force_active'] . '](pic/icons/' . ($angel['force_active'] == 1 ? 'tick' : 'cross') . '.png)
',
- 'Tshirt' => '
![' . $angel['Tshirt'] . '](pic/icons/' . ($angel['Tshirt'] == 1 ? 'tick' : 'cross') . '.png)
',
- '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");
- $force_active_count = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `force_active` = 1");
- $freeloads_count = sql_select_single_cell("SELECT COUNT(*) FROM `ShiftEntry` WHERE `freeloaded` = 1");
- $Tshirt = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Tshirt` = 1");
- $angels[] = array(
- 'Nick' => '
Summe',
- 'Gekommen' => $Gekommen,
- 'Aktiv' => $Active,
- 'force_active' => $force_active_count,
- 'freeloads' => $freeloads_count,
- 'Tshirt' => $Tshirt ,
- 'edit' => '
' . count($angels) . ''
- );
- $html .= table(array(
- 'Nick' => '
Nick',
- 'Name' => '
Vorname Name',
- 'DECT' => '
DECT',
- 'Gekommen' => '
',
- 'freeloads' => '
' . _("Freeloads") . '
',
- 'Aktiv' => '
',
- 'force_active' => '
',
- 'Tshirt' => '
',
- 'Size' => '
',
- 'lastLogIn' => '
Last login',
- 'edit' => ''
- ), $angels);
+ redirect(page_link_to('users'));
}
- return page(array(
- '
',
- $html,
- '
'
+
+ return page_with_title(_('Edit user'), array(
+ $html
));
}
?>
diff --git a/includes/sys_template.php b/includes/sys_template.php
index aaa79993..bf0e81fc 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -8,6 +8,24 @@ $themes = array(
"1" => "Engelsystem dark"
);
+/**
+ * Render glyphicon
+ *
+ * @param string $glyph_name
+ */
+function glyph($glyph_name) {
+ return '
';
+}
+
+/**
+ * Renders a tick or a cross by given boolean
+ *
+ * @param boolean $boolean
+ */
+function glyph_bool($boolean) {
+ return '
' . glyph($boolean ? 'ok' : 'remove') . '';
+}
+
function div($class, $content = array(), $id = "") {
$id = $id != '' ? ' id="' . $id . '"' : '';
return '
' . join("\n", $content) . '' . table_buttons($buttons) . '
';
+}
+
+function table_buttons($buttons = array()) {
+ return '' . join(' ', $buttons) . '
';
}
// Load and render template
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 4c783644..a866439d 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -19,6 +19,53 @@ $tshirt_sizes = array(
'XL-G' => "XL Girl"
);
+function Users_view($users, $order_by, $arrived_count, $active_count, $force_active_count, $freeloads_count, $tshirts_count) {
+ foreach ($users as &$user) {
+ $user['Gekommen'] = glyph_bool($user['Gekommen']);
+ $user['Aktiv'] = glyph_bool($user['Aktiv']);
+ $user['force_active'] = glyph_bool($user['force_active']);
+ $user['Tshirt'] = glyph_bool($user['Tshirt']);
+ $user['lastLogIn'] = date(_('m/d/Y h:i a'), $user['lastLogIn']);
+ $user['actions'] = table_buttons(array(
+ button(page_link_to('admin_user') . '&id=' . $user['UID'], _('edit'), 'btn-xs')
+ ));
+ }
+ $users[] = array(
+ 'Nick' => '
' : '';
$angeltype['name'] = '' . $angeltype['name'] . '';
- $angeltype['actions'] = buttons($actions);
+ $angeltype['actions'] = table_buttons($actions);
}
return array(
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index 1f3b3677..b1692e21 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -55,7 +55,46 @@ function user_controller() {
}
function users_list_controller() {
- redirect(page_link_to('admin_user'));
+ global $privileges;
+
+ if (! in_array('admin_user', $privileges))
+ redirect(page_link_to(''));
+
+ $order_by = 'Nick';
+ if (isset($_REQUEST['OrderBy']) && in_array($_REQUEST['OrderBy'], array(
+ 'Nick',
+ 'Name',
+ 'Vorname',
+ 'Alter',
+ 'DECT',
+ 'email',
+ 'Size',
+ 'Gekommen',
+ 'Aktiv',
+ 'force_active',
+ 'Tshirt',
+ 'lastLogIn'
+ )))
+ $order_by = $_REQUEST['OrderBy'];
+
+ $users = Users($order_by);
+ if ($users === false)
+ engelsystem_error('Unable to load users.');
+
+ foreach ($users as &$user) {
+ $user['freeloads'] = sql_select_single_cell("SELECT COUNT(*) FROM `ShiftEntry` WHERE `freeloaded` = 1 AND `UID` = " . sql_escape($user['UID']));
+ }
+
+ $arrived_count = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Gekommen` = 1");
+ $active_count = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Aktiv` = 1");
+ $force_active_count = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `force_active` = 1");
+ $freeloads_count = sql_select_single_cell("SELECT COUNT(*) FROM `ShiftEntry` WHERE `freeloaded` = 1");
+ $tshirts_count = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Tshirt` = 1");
+
+ return array(
+ _('All users'),
+ Users_view($users, $order_by, $arrived_count, $active_count, $force_active_count, $freeloads_count, $tshirts_count)
+ );
}
/**
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index 7d2809f7..af4c4a97 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -1,8 +1,18 @@
0) {
$id = $_REQUEST['id'];
if (! isset($_REQUEST['action'])) {
- $html .= '