diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index b8d40025..19e7d8d3 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -5,28 +5,27 @@ function admin_active_title() { function admin_active() { global $tshirt_sizes, $shift_sum_formula; - + $msg = ""; $search = ""; $count = 0; $limit = ""; $set_active = ""; - if (isset ($_REQUEST['search'])) + if (isset($_REQUEST['search'])) $search = strip_request_item('search'); - - if (isset ($_REQUEST['set_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 { $ok = false; - $msg .= error("Please enter a number of angels to be marked as active.", true); + $msg .= error(_("Please enter a number of angels to be marked as active."), true); } - + if ($ok) $limit = " LIMIT " . $count; - if (isset ($_REQUEST['ack'])) { + 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); $user_nicks = array(); @@ -35,114 +34,110 @@ function admin_active() { $user_nicks[] = User_Nick_render($usr); } engelsystem_log("These angels are active now: " . join(", ", $user_nicks)); - + $limit = ""; - $msg = success("Marked angels.", true); + $msg = success(_("Marked angels."), true); } else { - $set_active = '« back | apply'; + $set_active = '« ' . _("back") . ' | ' . _("apply") . ''; } } - - if (isset ($_REQUEST['active']) && preg_match("/^[0-9]+$/", $_REQUEST['active'])) { + + if (isset($_REQUEST['active']) && preg_match("/^[0-9]+$/", $_REQUEST['active'])) { $id = $_REQUEST['active']; $user_source = User($id); - if($user_source != null) { + if ($user_source != null) { sql_query("UPDATE `User` SET `Aktiv`=1 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); engelsystem_log("User " . User_Nick_render($user_source) . " is active now."); - $msg = success("Angel has been marked as active.", true); - } - else $msg = error("Angel not found.", true); - } - elseif (isset ($_REQUEST['not_active']) && preg_match("/^[0-9]+$/", $_REQUEST['not_active'])) { + $msg = success(_("Angel has been marked as active."), true); + } else + $msg = error(_("Angel not found."), true); + } elseif (isset($_REQUEST['not_active']) && preg_match("/^[0-9]+$/", $_REQUEST['not_active'])) { $id = $_REQUEST['not_active']; $user_source = User($id); - if($user_source != null) { + if ($user_source != null) { sql_query("UPDATE `User` SET `Aktiv`=0 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); engelsystem_log("User " . User_Nick_render($user_source) . " is NOT active now."); - $msg = success("Angel has been marked as not active.", true); - } - else $msg = error("Angel not found.", true); - } - elseif (isset ($_REQUEST['tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['tshirt'])) { + $msg = success(_("Angel has been marked as not active."), true); + } else + $msg = error(_("Angel not found."), true); + } elseif (isset($_REQUEST['tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['tshirt'])) { $id = $_REQUEST['tshirt']; $user_source = User($id); - if($user_source != null) { + if ($user_source != null) { sql_query("UPDATE `User` SET `Tshirt`=1 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); engelsystem_log("User " . User_Nick_render($user_source) . " has tshirt now."); - $msg = success("Angel has got a t-shirt.", true); - } - else $msg = error("Angel not found.", true); - } - elseif (isset ($_REQUEST['not_tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['not_tshirt'])) { + $msg = success(_("Angel has got a t-shirt."), true); + } else + $msg = error("Angel not found.", true); + } elseif (isset($_REQUEST['not_tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['not_tshirt'])) { $id = $_REQUEST['not_tshirt']; $user_source = User($id); - if($user_source != null) { + if ($user_source != null) { sql_query("UPDATE `User` SET `Tshirt`=0 WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); engelsystem_log("User " . User_Nick_render($user_source) . " has NO tshirt."); - $msg = success("Angel has got no t-shirt.", true); - } - else $msg = error("Angel not found.", true); + $msg = success(_("Angel has got no t-shirt."), true); + } else + $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); - - $table = ""; + + $matched_users = array(); if ($search == "") - $tokens = array (); + $tokens = array(); else $tokens = explode(" ", $search); - foreach ($users as $usr) { + foreach ($users as &$usr) { if (count($tokens) > 0) { $match = false; $index = join("", $usr); foreach ($tokens as $t) if (stristr($index, trim($t))) { - $match = true; - break; - } - if (!$match) + $match = true; + break; + } + if (! $match) continue; } - $table .= ''; - $table .= '' . User_Nick_render($usr) . ''; - $table .= '' . $tshirt_sizes[$usr['Size']] . ''; - $table .= '' . $usr['shift_count'] . ''; - - if ($usr['shift_count'] == 0) - $table .= '-'; - else - $table .= '' . round($usr['shift_length'] / 60) . ' min (' . round($usr['shift_length'] / 3600) . ' h)'; - - if ($usr['Aktiv'] == 1) - $table .= 'yes'; - else - $table .= ''; - if ($usr['Tshirt'] == 1) - $table .= 'yes'; - else - $table .= ''; - - $actions = array (); + $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") : ""; + + $actions = array(); if ($usr['Aktiv'] == 0) - $actions[] = 'set active'; + $actions[] = '' . _("set active") . ''; if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) { - $actions[] = 'remove active'; - $actions[] = 'got t-shirt'; + $actions[] = '' . _("remove active") . ''; + $actions[] = '' . _("got t-shirt") . ''; } if ($usr['Tshirt'] == 1) - $actions[] = 'remove t-shirt'; - - $table .= '' . join(' | ', $actions) . ''; - - $table .= ''; + $actions[] = '' . _("remove t-shirt") . ''; + + $usr['actions'] = join(' ', $actions); + + $matched_users[] = $usr; } - return template_render('../templates/admin_active.html', array ( - 'search' => $search, - 'count' => $count, - 'set_active' => $set_active, - 'table' => $table, - 'msg' => $msg, - 'link' => page_link_to('admin_active') + return page(array( + form(array( + form_text('search', _("Search angel:"), $search), + form_submit('submit', _("Search")) + )), + $set_active == "" ? form(array( + form_text('count', _("How much angels should be active?"), $count), + form_submit('set_active', _("Preview")) + )) : $set_active, + msg(), + table(array( + 'nick' => _("Nickname"), + 'shirt_size' => _("Size"), + 'shift_count' => _("Shifts"), + 'work_time' => _("Length"), + 'active' => _("Active?"), + 'tshirt' => _("T-shirt?"), + 'actions' => "" + ), $matched_users) )); } ?> diff --git a/includes/sys_template.php b/includes/sys_template.php index f59cff37..569783a7 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -166,7 +166,7 @@ function page($elements) { */ function table($columns, $rows, $data = true) { if (count($rows) == 0) - return info("No data available.", true); + return info(_("No data found."), true); $html = ""; $html .= ''; $html .= ''; diff --git a/includes/view/Questions_view.php b/includes/view/Questions_view.php index 02cec393..be2375bb 100644 --- a/includes/view/Questions_view.php +++ b/includes/view/Questions_view.php @@ -2,14 +2,14 @@ function Questions_view($open_questions, $answered_questions, $ask_action) { foreach ($open_questions as &$question) { - $question['actions'] = 'Löschen'; + $question['actions'] = '' . _("delete") . ''; $question['Question'] = str_replace("\n", '
', $question['Question']); } foreach ($answered_questions as &$question) { $question['Question'] = str_replace("\n", '
', $question['Question']); $question['Answer'] = str_replace("\n", '
', $question['Answer']); - $question['actions'] = 'Löschen'; + $question['actions'] = '' . _("delete") . ''; } return page(array( diff --git a/includes/view/User_view.php b/includes/view/User_view.php index eb69b8c4..ef4f9831 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -4,7 +4,7 @@ * Available T-Shirt sizes */ $tshirt_sizes = array ( - '' => "Please select...", + '' => _("Please select..."), 'S' => "S", 'M' => "M", 'L' => "L", diff --git a/templates/admin_active.html b/templates/admin_active.html deleted file mode 100644 index a1b244be..00000000 --- a/templates/admin_active.html +++ /dev/null @@ -1,42 +0,0 @@ -
-

- Search Angel: -

-

- Mark most working angels as active -

-

- %set_active% -

-
-%msg% - - - - - - - - - - - - - - %table% - -
- Nickname - - Size - - Shifts - - Length - - Active? - - T-shirt? - - Action -