gettext for admin active
This commit is contained in:
parent
7d3239f3fe
commit
8a5915594f
|
@ -13,7 +13,6 @@ function admin_active() {
|
||||||
$set_active = "";
|
$set_active = "";
|
||||||
if (isset($_REQUEST['search']))
|
if (isset($_REQUEST['search']))
|
||||||
$search = strip_request_item('search');
|
$search = strip_request_item('search');
|
||||||
|
|
||||||
if (isset($_REQUEST['set_active'])) {
|
if (isset($_REQUEST['set_active'])) {
|
||||||
$ok = true;
|
$ok = true;
|
||||||
|
|
||||||
|
@ -21,7 +20,7 @@ function admin_active() {
|
||||||
$count = strip_request_item('count');
|
$count = strip_request_item('count');
|
||||||
else {
|
else {
|
||||||
$ok = false;
|
$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)
|
if ($ok)
|
||||||
|
@ -37,9 +36,9 @@ function admin_active() {
|
||||||
engelsystem_log("These angels are active now: " . join(", ", $user_nicks));
|
engelsystem_log("These angels are active now: " . join(", ", $user_nicks));
|
||||||
|
|
||||||
$limit = "";
|
$limit = "";
|
||||||
$msg = success("Marked angels.", true);
|
$msg = success(_("Marked angels."), true);
|
||||||
} else {
|
} else {
|
||||||
$set_active = '<a href="' . page_link_to('admin_active') . '&serach=' . $search . '">« back</a> | <a href="' . page_link_to('admin_active') . '&search=' . $search . '&count=' . $count . '&set_active&ack">apply</a>';
|
$set_active = '<a href="' . page_link_to('admin_active') . '&serach=' . $search . '">« ' . _("back") . '</a> | <a href="' . page_link_to('admin_active') . '&search=' . $search . '&count=' . $count . '&set_active&ack">' . _("apply") . '</a>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,49 +48,46 @@ function admin_active() {
|
||||||
if ($user_source != null) {
|
if ($user_source != null) {
|
||||||
sql_query("UPDATE `User` SET `Aktiv`=1 WHERE `UID`=" . sql_escape($id) . " LIMIT 1");
|
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.");
|
engelsystem_log("User " . User_Nick_render($user_source) . " is active now.");
|
||||||
$msg = success("Angel has been marked as active.", true);
|
$msg = success(_("Angel has been marked as active."), true);
|
||||||
}
|
} else
|
||||||
else $msg = error("Angel not found.", true);
|
$msg = error(_("Angel not found."), true);
|
||||||
}
|
} elseif (isset($_REQUEST['not_active']) && preg_match("/^[0-9]+$/", $_REQUEST['not_active'])) {
|
||||||
elseif (isset ($_REQUEST['not_active']) && preg_match("/^[0-9]+$/", $_REQUEST['not_active'])) {
|
|
||||||
$id = $_REQUEST['not_active'];
|
$id = $_REQUEST['not_active'];
|
||||||
$user_source = User($id);
|
$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");
|
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.");
|
engelsystem_log("User " . User_Nick_render($user_source) . " is NOT active now.");
|
||||||
$msg = success("Angel has been marked as not active.", true);
|
$msg = success(_("Angel has been marked as not active."), true);
|
||||||
}
|
} else
|
||||||
else $msg = error("Angel not found.", true);
|
$msg = error(_("Angel not found."), true);
|
||||||
}
|
} elseif (isset($_REQUEST['tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['tshirt'])) {
|
||||||
elseif (isset ($_REQUEST['tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['tshirt'])) {
|
|
||||||
$id = $_REQUEST['tshirt'];
|
$id = $_REQUEST['tshirt'];
|
||||||
$user_source = User($id);
|
$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");
|
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.");
|
engelsystem_log("User " . User_Nick_render($user_source) . " has tshirt now.");
|
||||||
$msg = success("Angel has got a t-shirt.", true);
|
$msg = success(_("Angel has got a t-shirt."), true);
|
||||||
}
|
} else
|
||||||
else $msg = error("Angel not found.", true);
|
$msg = error("Angel not found.", true);
|
||||||
}
|
} elseif (isset($_REQUEST['not_tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['not_tshirt'])) {
|
||||||
elseif (isset ($_REQUEST['not_tshirt']) && preg_match("/^[0-9]+$/", $_REQUEST['not_tshirt'])) {
|
|
||||||
$id = $_REQUEST['not_tshirt'];
|
$id = $_REQUEST['not_tshirt'];
|
||||||
$user_source = User($id);
|
$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");
|
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.");
|
engelsystem_log("User " . User_Nick_render($user_source) . " has NO tshirt.");
|
||||||
$msg = success("Angel has got no t-shirt.", true);
|
$msg = success(_("Angel has got no t-shirt."), true);
|
||||||
}
|
} else
|
||||||
else $msg = error("Angel not found.", true);
|
$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 `shift_length` DESC" . $limit);
|
||||||
|
|
||||||
$table = "";
|
$matched_users = array();
|
||||||
if ($search == "")
|
if ($search == "")
|
||||||
$tokens = array();
|
$tokens = array();
|
||||||
else
|
else
|
||||||
$tokens = explode(" ", $search);
|
$tokens = explode(" ", $search);
|
||||||
foreach ($users as $usr) {
|
foreach ($users as &$usr) {
|
||||||
if (count($tokens) > 0) {
|
if (count($tokens) > 0) {
|
||||||
$match = false;
|
$match = false;
|
||||||
$index = join("", $usr);
|
$index = join("", $usr);
|
||||||
|
@ -103,46 +99,45 @@ function admin_active() {
|
||||||
if (! $match)
|
if (! $match)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$table .= '<tr>';
|
$usr['nick'] = User_Nick_render($usr);
|
||||||
$table .= '<td>' . User_Nick_render($usr) . '</td>';
|
$usr['shirt_size'] = $tshirt_sizes[$usr['Size']];
|
||||||
$table .= '<td>' . $tshirt_sizes[$usr['Size']] . '</td>';
|
$usr['work_time'] = round($usr['shift_length'] / 60) . ' min (' . round($usr['shift_length'] / 3600) . ' h)';
|
||||||
$table .= '<td>' . $usr['shift_count'] . '</td>';
|
$usr['active'] = $usr['Aktiv'] == 1 ? _("yes") : "";
|
||||||
|
$usr['tshirt'] = $usr['Tshirt'] == 1 ? _("yes") : "";
|
||||||
if ($usr['shift_count'] == 0)
|
|
||||||
$table .= '<td>-</td>';
|
|
||||||
else
|
|
||||||
$table .= '<td>' . round($usr['shift_length'] / 60) . ' min (' . round($usr['shift_length'] / 3600) . ' h)</td>';
|
|
||||||
|
|
||||||
if ($usr['Aktiv'] == 1)
|
|
||||||
$table .= '<td>yes</td>';
|
|
||||||
else
|
|
||||||
$table .= '<td></td>';
|
|
||||||
if ($usr['Tshirt'] == 1)
|
|
||||||
$table .= '<td>yes</td>';
|
|
||||||
else
|
|
||||||
$table .= '<td></td>';
|
|
||||||
|
|
||||||
$actions = array();
|
$actions = array();
|
||||||
if ($usr['Aktiv'] == 0)
|
if ($usr['Aktiv'] == 0)
|
||||||
$actions[] = '<a href="' . page_link_to('admin_active') . '&active=' . $usr['UID'] . '&search=' . $search . '">set active</a>';
|
$actions[] = '<a href="' . page_link_to('admin_active') . '&active=' . $usr['UID'] . '&search=' . $search . '">' . _("set active") . '</a>';
|
||||||
if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) {
|
if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) {
|
||||||
$actions[] = '<a href="' . page_link_to('admin_active') . '&not_active=' . $usr['UID'] . '&search=' . $search . '">remove active</a>';
|
$actions[] = '<a href="' . page_link_to('admin_active') . '&not_active=' . $usr['UID'] . '&search=' . $search . '">' . _("remove active") . '</a>';
|
||||||
$actions[] = '<a href="' . page_link_to('admin_active') . '&tshirt=' . $usr['UID'] . '&search=' . $search . '">got t-shirt</a>';
|
$actions[] = '<a href="' . page_link_to('admin_active') . '&tshirt=' . $usr['UID'] . '&search=' . $search . '">' . _("got t-shirt") . '</a>';
|
||||||
}
|
}
|
||||||
if ($usr['Tshirt'] == 1)
|
if ($usr['Tshirt'] == 1)
|
||||||
$actions[] = '<a href="' . page_link_to('admin_active') . '&not_tshirt=' . $usr['UID'] . '&search=' . $search . '">remove t-shirt</a>';
|
$actions[] = '<a href="' . page_link_to('admin_active') . '&not_tshirt=' . $usr['UID'] . '&search=' . $search . '">' . _("remove t-shirt") . '</a>';
|
||||||
|
|
||||||
$table .= '<td>' . join(' | ', $actions) . '</td>';
|
$usr['actions'] = join(' ', $actions);
|
||||||
|
|
||||||
$table .= '</tr>';
|
$matched_users[] = $usr;
|
||||||
}
|
}
|
||||||
return template_render('../templates/admin_active.html', array (
|
return page(array(
|
||||||
'search' => $search,
|
form(array(
|
||||||
'count' => $count,
|
form_text('search', _("Search angel:"), $search),
|
||||||
'set_active' => $set_active,
|
form_submit('submit', _("Search"))
|
||||||
'table' => $table,
|
)),
|
||||||
'msg' => $msg,
|
$set_active == "" ? form(array(
|
||||||
'link' => page_link_to('admin_active')
|
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)
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
@ -166,7 +166,7 @@ function page($elements) {
|
||||||
*/
|
*/
|
||||||
function table($columns, $rows, $data = true) {
|
function table($columns, $rows, $data = true) {
|
||||||
if (count($rows) == 0)
|
if (count($rows) == 0)
|
||||||
return info("No data available.", true);
|
return info(_("No data found."), true);
|
||||||
$html = "";
|
$html = "";
|
||||||
$html .= '<table' . ($data ? ' class="data"' : '') . '>';
|
$html .= '<table' . ($data ? ' class="data"' : '') . '>';
|
||||||
$html .= '<thead><tr>';
|
$html .= '<thead><tr>';
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
function Questions_view($open_questions, $answered_questions, $ask_action) {
|
function Questions_view($open_questions, $answered_questions, $ask_action) {
|
||||||
foreach ($open_questions as &$question) {
|
foreach ($open_questions as &$question) {
|
||||||
$question['actions'] = '<a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a>';
|
$question['actions'] = '<a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">' . _("delete") . '</a>';
|
||||||
$question['Question'] = str_replace("\n", '<br />', $question['Question']);
|
$question['Question'] = str_replace("\n", '<br />', $question['Question']);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($answered_questions as &$question) {
|
foreach ($answered_questions as &$question) {
|
||||||
$question['Question'] = str_replace("\n", '<br />', $question['Question']);
|
$question['Question'] = str_replace("\n", '<br />', $question['Question']);
|
||||||
$question['Answer'] = str_replace("\n", '<br />', $question['Answer']);
|
$question['Answer'] = str_replace("\n", '<br />', $question['Answer']);
|
||||||
$question['actions'] = '<a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">Löschen</a>';
|
$question['actions'] = '<a href="' . page_link_to("user_questions") . '&action=delete&id=' . $question['QID'] . '">' . _("delete") . '</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
return page(array(
|
return page(array(
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* Available T-Shirt sizes
|
* Available T-Shirt sizes
|
||||||
*/
|
*/
|
||||||
$tshirt_sizes = array (
|
$tshirt_sizes = array (
|
||||||
'' => "Please select...",
|
'' => _("Please select..."),
|
||||||
'S' => "S",
|
'S' => "S",
|
||||||
'M' => "M",
|
'M' => "M",
|
||||||
'L' => "L",
|
'L' => "L",
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
<form action="%link%" method="post">
|
|
||||||
<p>
|
|
||||||
Search Angel: <input type="text" name="search" value="%search%" /><input type="submit" name="submit" value="Search" />
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Mark <input type="text" name="count" value="%count%" style="width: 30px;"/>most working angels as active <input type="submit" name="set_active" value="Preview" />
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
%set_active%
|
|
||||||
</p>
|
|
||||||
</form>
|
|
||||||
%msg%
|
|
||||||
<table>
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>
|
|
||||||
Nickname
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
Size
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
Shifts
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
Length
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
Active?
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
T-shirt?
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
Action
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
%table%
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
Loading…
Reference in New Issue