beautify messages form
This commit is contained in:
parent
b97154d19e
commit
40d83367bb
|
@ -5,7 +5,7 @@ function messages_title() {
|
||||||
|
|
||||||
function user_unread_messages() {
|
function user_unread_messages() {
|
||||||
global $user;
|
global $user;
|
||||||
|
|
||||||
if (isset($user)) {
|
if (isset($user)) {
|
||||||
$new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`=" . sql_escape($user['UID']));
|
$new_messages = sql_num_query("SELECT * FROM `Messages` WHERE isRead='N' AND `RUID`=" . sql_escape($user['UID']));
|
||||||
if ($new_messages > 0)
|
if ($new_messages > 0)
|
||||||
|
@ -16,19 +16,19 @@ function user_unread_messages() {
|
||||||
|
|
||||||
function user_messages() {
|
function user_messages() {
|
||||||
global $user;
|
global $user;
|
||||||
|
|
||||||
if (! isset($_REQUEST['action'])) {
|
if (! isset($_REQUEST['action'])) {
|
||||||
$users = sql_select("SELECT * FROM `User` WHERE NOT `UID`=" . sql_escape($user['UID']) . " ORDER BY `Nick`");
|
$users = sql_select("SELECT * FROM `User` WHERE NOT `UID`=" . sql_escape($user['UID']) . " ORDER BY `Nick`");
|
||||||
|
|
||||||
$to_select_data = array(
|
$to_select_data = array(
|
||||||
"" => _("Select recipient...")
|
"" => _("Select recipient...")
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach ($users as $u)
|
foreach ($users as $u)
|
||||||
$to_select_data[$u['UID']] = $u['Nick'];
|
$to_select_data[$u['UID']] = $u['Nick'];
|
||||||
|
|
||||||
$to_select = html_select_key('to', 'to', $to_select_data, '');
|
$to_select = html_select_key('to', 'to', $to_select_data, '');
|
||||||
|
|
||||||
$messages = sql_select("SELECT * FROM `Messages` WHERE `SUID`=" . sql_escape($user['UID']) . " OR `RUID`=" . sql_escape($user['UID']) . " ORDER BY `isRead`,`Datum` DESC");
|
$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) {
|
foreach ($messages as $message) {
|
||||||
$sender_user_source = User($message['SUID']);
|
$sender_user_source = User($message['SUID']);
|
||||||
|
@ -37,15 +37,15 @@ function user_messages() {
|
||||||
$receiver_user_source = User($message['RUID']);
|
$receiver_user_source = User($message['RUID']);
|
||||||
if ($receiver_user_source === false)
|
if ($receiver_user_source === false)
|
||||||
engelsystem_error(_("Unable to load user."));
|
engelsystem_error(_("Unable to load user."));
|
||||||
|
|
||||||
$messages_table_entry = array(
|
$messages_table_entry = array(
|
||||||
'new' => $message['isRead'] == 'N' ? '<span class="glyphicon glyphicon-envelope"></span>' : '',
|
'new' => $message['isRead'] == 'N' ? '<span class="glyphicon glyphicon-envelope"></span>' : '',
|
||||||
'timestamp' => date("Y-m-d H:i", $message['Datum']),
|
'timestamp' => date("Y-m-d H:i", $message['Datum']),
|
||||||
'from' => User_Nick_render($sender_user_source),
|
'from' => User_Nick_render($sender_user_source),
|
||||||
'to' => User_Nick_render($receiver_user_source),
|
'to' => User_Nick_render($receiver_user_source),
|
||||||
'text' => str_replace("\n", '<br />', $message['Text'])
|
'text' => str_replace("\n", '<br />', $message['Text'])
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($message['RUID'] == $user['UID']) {
|
if ($message['RUID'] == $user['UID']) {
|
||||||
if ($message['isRead'] == 'N')
|
if ($message['isRead'] == 'N')
|
||||||
$messages_table_entry['actions'] = button(page_link_to("user_messages") . '&action=read&id=' . $message['id'], _("mark as read"), 'btn-xs');
|
$messages_table_entry['actions'] = button(page_link_to("user_messages") . '&action=read&id=' . $message['id'], _("mark as read"), 'btn-xs');
|
||||||
|
@ -58,10 +58,10 @@ function user_messages() {
|
||||||
'timestamp' => date("Y-m-d H:i"),
|
'timestamp' => date("Y-m-d H:i"),
|
||||||
'from' => User_Nick_render($user),
|
'from' => User_Nick_render($user),
|
||||||
'to' => $to_select,
|
'to' => $to_select,
|
||||||
'text' => form_textarea('text', _("Message"), ''),
|
'text' => form_textarea('text', '', ''),
|
||||||
'actions' => form_submit('submit', _("Save"))
|
'actions' => form_submit('submit', _("Save"))
|
||||||
);
|
);
|
||||||
|
|
||||||
return page_with_title(messages_title(), array(
|
return page_with_title(messages_title(), array(
|
||||||
msg(),
|
msg(),
|
||||||
sprintf(_("Hello %s, here can you leave messages for other angels"), User_Nick_render($user)),
|
sprintf(_("Hello %s, here can you leave messages for other angels"), User_Nick_render($user)),
|
||||||
|
@ -72,9 +72,9 @@ function user_messages() {
|
||||||
'from' => _("Transmitted"),
|
'from' => _("Transmitted"),
|
||||||
'to' => _("Recipient"),
|
'to' => _("Recipient"),
|
||||||
'text' => _("Message"),
|
'text' => _("Message"),
|
||||||
'actions' => ''
|
'actions' => ''
|
||||||
), $messages_table)
|
), $messages_table)
|
||||||
), page_link_to('user_messages') . '&action=send')
|
), page_link_to('user_messages') . '&action=send')
|
||||||
));
|
));
|
||||||
} else {
|
} else {
|
||||||
switch ($_REQUEST['action']) {
|
switch ($_REQUEST['action']) {
|
||||||
|
@ -83,7 +83,7 @@ function user_messages() {
|
||||||
$id = $_REQUEST['id'];
|
$id = $_REQUEST['id'];
|
||||||
else
|
else
|
||||||
return error(_("Incomplete call, missing Message ID."), true);
|
return error(_("Incomplete call, missing Message ID."), true);
|
||||||
|
|
||||||
$message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
|
$message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
|
||||||
if (count($message) > 0 && $message[0]['RUID'] == $user['UID']) {
|
if (count($message) > 0 && $message[0]['RUID'] == $user['UID']) {
|
||||||
sql_query("UPDATE `Messages` SET `isRead`='Y' WHERE `id`=" . sql_escape($id) . " LIMIT 1");
|
sql_query("UPDATE `Messages` SET `isRead`='Y' WHERE `id`=" . sql_escape($id) . " LIMIT 1");
|
||||||
|
@ -91,13 +91,13 @@ function user_messages() {
|
||||||
} else
|
} else
|
||||||
return error(_("No Message found."), true);
|
return error(_("No Message found."), true);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "delete":
|
case "delete":
|
||||||
if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
|
if (isset($_REQUEST['id']) && preg_match("/^[0-9]{1,11}$/", $_REQUEST['id']))
|
||||||
$id = $_REQUEST['id'];
|
$id = $_REQUEST['id'];
|
||||||
else
|
else
|
||||||
return error(_("Incomplete call, missing Message ID."), true);
|
return error(_("Incomplete call, missing Message ID."), true);
|
||||||
|
|
||||||
$message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
|
$message = sql_select("SELECT * FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
|
||||||
if (count($message) > 0 && $message[0]['SUID'] == $user['UID']) {
|
if (count($message) > 0 && $message[0]['SUID'] == $user['UID']) {
|
||||||
sql_query("DELETE FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
|
sql_query("DELETE FROM `Messages` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
|
||||||
|
@ -105,7 +105,7 @@ function user_messages() {
|
||||||
} else
|
} else
|
||||||
return error(_("No Message found."), true);
|
return error(_("No Message found."), true);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "send":
|
case "send":
|
||||||
if (Message_send($_REQUEST['to'], $_REQUEST['text']) === true) {
|
if (Message_send($_REQUEST['to'], $_REQUEST['text']) === true) {
|
||||||
redirect(page_link_to("user_messages"));
|
redirect(page_link_to("user_messages"));
|
||||||
|
@ -113,7 +113,7 @@ function user_messages() {
|
||||||
return error(_("Transmitting was terminated with an Error."), true);
|
return error(_("Transmitting was terminated with an Error."), true);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return error(_("Wrong action."), true);
|
return error(_("Wrong action."), true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue