remove html templates
This commit is contained in:
Philip Häusler
parent
c8f652f57b
commit
7f43f3bfe5
|
|
@ -28,7 +28,6 @@ function user_messages() {
|
|||
|
||||
$to_select = html_select_key('to', 'to', $to_select_data, '');
|
||||
|
||||
$messages_html = "";
|
||||
$messages = sql_select("SELECT * FROM `Messages` WHERE `SUID`=" . sql_escape($user['UID']) . " OR `RUID`=" . sql_escape($user['UID']) . " ORDER BY `isRead`,`Datum` DESC");
|
||||
foreach ($messages as $message) {
|
||||
$sender_user_source = User($message['SUID']);
|
||||
|
|
@ -38,32 +37,43 @@ function user_messages() {
|
|||
if ($receiver_user_source === false)
|
||||
engelsystem_error(_("Unable to load user."));
|
||||
|
||||
$messages_html .= sprintf('<tr %s> <td>%s</td> <td>%s</td> <td>%s</td> <td>%s</td><td>%s</td>', ($message['isRead'] == 'N' ? ' class="new_message"' : ''), ($message['isRead'] == 'N' ? '•' : ''), date("Y-m-d H:i", $message['Datum']), User_Nick_render($sender_user_source), User_Nick_render($receiver_user_source), str_replace("\n", '<br />', $message['Text']));
|
||||
$messages_table_entry = array(
|
||||
'new' => $message['isRead'] == 'N' ? '<span class="glyphicon glyphicon-envelope"></span>' : '',
|
||||
'timestamp' => date("Y-m-d H:i", $message['Datum']),
|
||||
'from' => User_Nick_render($sender_user_source),
|
||||
'to' => User_Nick_render($receiver_user_source),
|
||||
'text' => str_replace("\n", '<br />', $message['Text'])
|
||||
);
|
||||
|
||||
$messages_html .= '<td>';
|
||||
if ($message['RUID'] == $user['UID']) {
|
||||
if ($message['isRead'] == 'N')
|
||||
$messages_html .= '<a href="' . page_link_to("user_messages") . '&action=read&id=' . $message['id'] . '">' . _("mark as read") . '</a>';
|
||||
} else {
|
||||
$messages_html .= '<a href="' . page_link_to("user_messages") . '&action=delete&id=' . $message['id'] . '">' . _("delete message") . '</a>';
|
||||
$messages_table_entry['actions'] = button(page_link_to("user_messages") . '&action=read&id=' . $message['id'], _("mark as read"), 'btn-xs');
|
||||
} else
|
||||
$messages_table_entry['actions'] = button(page_link_to("user_messages") . '&action=delete&id=' . $message['id'], _("delete message"), 'btn-xs');
|
||||
$messages_table[] = $messages_table_entry;
|
||||
}
|
||||
$messages_html .= '</td></tr>';
|
||||
}
|
||||
|
||||
return template_render('../templates/user_messages.html', array(
|
||||
'title' => messages_title(),
|
||||
'link' => page_link_to("user_messages"),
|
||||
'greeting' => msg() . sprintf(_("Hello %s, here can you leave messages for other angels"), User_Nick_render($user)) . '<br /><br />',
|
||||
'messages' => $messages_html,
|
||||
'new_label' => _("New"),
|
||||
'date_label' => _("Date"),
|
||||
'from_label' => _("Transmitted"),
|
||||
'to_label' => _("Recipient"),
|
||||
'text_label' => _("Message"),
|
||||
'date' => date("Y-m-d H:i"),
|
||||
$messages_table[] = array(
|
||||
'news' => '',
|
||||
'timestamp' => date("Y-m-d H:i"),
|
||||
'from' => User_Nick_render($user),
|
||||
'to_select' => $to_select,
|
||||
'submit_label' => _("Save")
|
||||
'to' => $to_select,
|
||||
'text' => form_textarea('text', _("Message"), ''),
|
||||
'actions' => form_submit('submit', _("Save"))
|
||||
);
|
||||
|
||||
return page_with_title(messages_title(), array(
|
||||
msg(),
|
||||
sprintf(_("Hello %s, here can you leave messages for other angels"), User_Nick_render($user)),
|
||||
form(array(
|
||||
table(array(
|
||||
'new' => _("New"),
|
||||
'timestamp' => _("Date"),
|
||||
'from' => _("Transmitted"),
|
||||
'to' => _("Recipient"),
|
||||
'text' => _("Message"),
|
||||
'actions' => ''
|
||||
), $messages_table)
|
||||
), page_link_to('user_messages') . '&action=send')
|
||||
));
|
||||
} else {
|
||||
switch ($_REQUEST['action']) {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,10 @@ function user_myshifts() {
|
|||
success(_("Key changed."));
|
||||
redirect(page_link_to('user_myshifts'));
|
||||
}
|
||||
return template_render('../templates/user_myshifts_reset.html', array());
|
||||
return page_with_title(_("Reset API key"), array(
|
||||
error(_("If you reset the key, the url to your iCal- and JSON-export and your atom feed changes! You have to update it in every application using one of these exports."), true),
|
||||
button(page_link_to('myshifts') . '&reset=ack', _("Continue"), 'btn-danger')
|
||||
));
|
||||
} elseif (isset($_REQUEST['edit']) && preg_match("/^[0-9]*$/", $_REQUEST['edit'])) {
|
||||
$id = $_REQUEST['edit'];
|
||||
$shift = sql_select("SELECT
|
||||
|
|
|
|||
|
|
@ -1,90 +0,0 @@
|
|||
<?php
|
||||
function wakeup_title() {
|
||||
return _("Wakeup");
|
||||
}
|
||||
|
||||
function user_wakeup() {
|
||||
global $user;
|
||||
|
||||
$html = "";
|
||||
|
||||
if (isset ($_REQUEST['action'])) {
|
||||
switch ($_REQUEST['action']) {
|
||||
case 'create' :
|
||||
$date = DateTime::createFromFormat("Y-m-d H:i", $_REQUEST['Date']);
|
||||
if ($date != null) {
|
||||
$date = $date->getTimestamp();
|
||||
$bemerkung = strip_request_item_nl('Bemerkung');
|
||||
$ort = strip_request_item('Ort');
|
||||
$SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) "
|
||||
. "VALUES ('" . sql_escape($user['UID']) . "', '"
|
||||
. sql_escape($date) . "', '" . sql_escape($ort) . "', " . "'"
|
||||
. sql_escape($bemerkung) . "')";
|
||||
sql_query($SQL);
|
||||
$html .= success(_("Entry saved."), true);
|
||||
} else
|
||||
$html .= error(_("Broken date!"), true);
|
||||
break;
|
||||
|
||||
case 'delete' :
|
||||
if (isset ($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
|
||||
$id = $_REQUEST['id'];
|
||||
else
|
||||
return error(_("Incomplete call, missing wake-up ID."), true);
|
||||
|
||||
$wakeup = sql_select("SELECT * FROM `Wecken` WHERE `ID`=" . sql_escape($id) . " LIMIT 1");
|
||||
if (count($wakeup) > 0 && $wakeup[0]['UID'] == $user['UID']) {
|
||||
sql_query("DELETE FROM `Wecken` WHERE `ID`=" . sql_escape($id) . " LIMIT 1");
|
||||
$html .= success(_("Wake-up call deleted."), true);
|
||||
} else
|
||||
return error(_("No wake-up found."), true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$html .= '<p>' . sprintf(_("Hello %s, here you can register for a wake-up call. Simply say when and where the angel should come to wake you."), User_Nick_render($user)) . '</p>';
|
||||
$html .= _("All ordered wake-up calls, next first.");
|
||||
$html .= '
|
||||
<table border="0" width="100%" class="border" cellpadding="2" cellspacing="1">
|
||||
<tr class="contenttopic">
|
||||
<th>' . _("Date") . '</th>
|
||||
<th>' . _("Nick") . '</th>
|
||||
<th>' . _("Place") . '</th>
|
||||
<th>' . _("Notes") . '</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
';
|
||||
|
||||
$wecken_source = sql_select("SELECT * FROM `Wecken` ORDER BY `Date` ASC");
|
||||
foreach($wecken_source as $wecken) {
|
||||
$html .= '<tr class="content">';
|
||||
$html .= '<td>' . date("Y-m-d H:i", $wecken['Date']) . ' </td>';
|
||||
|
||||
$user_source = User($wecken['UID']);
|
||||
if($user_source === false)
|
||||
engelsystem_error("Unable to load user.");
|
||||
|
||||
$html .= '<td>' . User_Nick_render($user_source) . ' </td>';
|
||||
$html .= '<td>' . $wecken['Ort'] . ' </td>';
|
||||
$html .= '<td>' . $wecken['Bemerkung'] . ' </td>';
|
||||
if ($wecken['UID'] == $user['UID'])
|
||||
$html .= '<td><a href="' . page_link_to("user_wakeup") . '&action=delete&id=' . $wecken['ID'] . "\">" . _("delete") . '</a></td>';
|
||||
else
|
||||
$html .= '<td></td>';
|
||||
$html .= '</tr>';
|
||||
}
|
||||
|
||||
$html .= '</table><hr />' . _("Schedule a new wake-up here:");
|
||||
|
||||
$html .= template_render('../templates/user_wakeup.html', array (
|
||||
'wakeup_link' => page_link_to("user_wakeup"),
|
||||
'date_text' => _("Date"),
|
||||
'date_value' => date("Y-m-d H:i"),
|
||||
'place_text' => _("Place"),
|
||||
'comment_text' => _("Notes"),
|
||||
'comment_value' => "Knock knock Leo, follow the white rabbit to the blue tent",
|
||||
'submit_text' => _("Save")
|
||||
));
|
||||
return $html;
|
||||
}
|
||||
?>
|
||||
|
|
@ -54,7 +54,6 @@ function make_navigation() {
|
|||
"angeltypes" => angeltypes_title(),
|
||||
"user_messages" => messages_title() . ' ' . user_unread_messages(),
|
||||
"user_questions" => questions_title(),
|
||||
"user_wakeup" => wakeup_title(),
|
||||
"admin_arrive" => admin_arrive_title(),
|
||||
"admin_active" => admin_active_title(),
|
||||
"admin_user" => admin_user_title(),
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ require_once ('includes/pages/user_news.php');
|
|||
require_once ('includes/pages/user_questions.php');
|
||||
require_once ('includes/pages/user_settings.php');
|
||||
require_once ('includes/pages/user_shifts.php');
|
||||
require_once ('includes/pages/user_wakeup.php');
|
||||
|
||||
require_once ('vendor/parsedown-0.9.0/Parsedown.php');
|
||||
|
||||
|
|
@ -169,9 +168,6 @@ if (isset($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && (i
|
|||
} elseif ($p == "user_questions") {
|
||||
$title = questions_title();
|
||||
$content = user_questions();
|
||||
} elseif ($p == "user_wakeup") {
|
||||
$title = wakeup_title();
|
||||
$content = user_wakeup();
|
||||
} elseif ($p == "user_settings") {
|
||||
$title = settings_title();
|
||||
$content = user_settings();
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
<div class="col-md-10">
|
||||
<h1>%title%</h1>
|
||||
%greeting%
|
||||
<form action="%link%&action=send" method="post">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>%new_label%</th>
|
||||
<th>%date_label%</th>
|
||||
<th>%from_label%</th>
|
||||
<th>%to_label%</th>
|
||||
<th>%text_label%</th>
|
||||
<th> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
%messages%
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td>%date%</td>
|
||||
<td>%from%</td>
|
||||
<td>%to_select%</td>
|
||||
<td><textarea class="form-control" name="text"></textarea></td>
|
||||
<td><input class="btn btn-primary" type="submit" name="submit" value="%submit_label%" /></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<p class="error">
|
||||
Wenn Du Deinen Key zurück setzt, ändert sich der Link zu Deinem iCal- und JSON-Export, sowie zu dem Atom Feed! Du musst diesen dann an allen Stellen, wo Du ihn verwendest aktualisieren.
|
||||
</p>
|
||||
<p>
|
||||
<a href="?p=user_myshifts&reset=ack">Fortfahren »</a>
|
||||
</p>
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
<p>
|
||||
Beantwortete Fragen:
|
||||
</p>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
Frage
|
||||
</th>
|
||||
<th>
|
||||
Von
|
||||
</th>
|
||||
<th>
|
||||
Antwort
|
||||
</th>
|
||||
<th>
|
||||
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
%answered_questions%
|
||||
</tbody>
|
||||
</table>
|
||||
<hr/>
|
||||
<p>
|
||||
Frage einen Erzengel:
|
||||
</p>
|
||||
<form action="%link%&action=ask" method="post">
|
||||
<table>
|
||||
<tr>
|
||||
<td>
|
||||
Frage:
|
||||
</td>
|
||||
<td>
|
||||
<textarea name="question"></textarea>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<input type="submit" name="submit" value="Fragen" />
|
||||
</form>
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
<form action="%wakeup_link%&action=create" method="post">
|
||||
<table>
|
||||
<tr>
|
||||
<td align="right">
|
||||
%date_text%:
|
||||
</td>
|
||||
<td>
|
||||
<input type="text" name="Date" value="%date_value%">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="right">
|
||||
%place_text%
|
||||
</td>
|
||||
<td>
|
||||
<input type="text" name="Ort" value="">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="right">
|
||||
%comment_text%
|
||||
</td>
|
||||
<td>
|
||||
<textarea name="Bemerkung" rows="5" cols="40">%comment_value%</textarea>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<input type="submit" name="submit" value="%submit_text%" />
|
||||
</form>
|
||||
Loading…
Reference in New Issue