Commit 9683d304 authored by Florian Schaal's avatar Florian Schaal
Browse files

Fixes #4121 - [3.1rc1] User can not view submitted Support Messages

parent 9e6aa5d0
...@@ -12,7 +12,8 @@ $app->auth->check_module_permissions('help'); ...@@ -12,7 +12,8 @@ $app->auth->check_module_permissions('help');
$app->uses('listform_actions'); $app->uses('listform_actions');
//* Optional limit //* Optional limit
$app->listform_actions->SQLExtWhere = "support_message.recipient_id = ".$app->functions->intval($_SESSION['s']['user']['userid']); $userid=$app->functions->intval($_SESSION['s']['user']['userid']);
$app->listform_actions->SQLExtWhere = "support_message.recipient_id = $userid OR support_message.sender_id = $userid";
//* Start the form rendering and action ahndling //* Start the form rendering and action ahndling
$app->listform_actions->onLoad(); $app->listform_actions->onLoad();
......
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
<table class="table"> <table class="table">
<thead class="dark form-group-sm"> <thead class="dark form-group-sm">
<tr> <tr>
<th data-column="sender_id"><tmpl_var name="sender_id_txt"></th> <tmpl_if name="is_admin"><th data-column="sender_id"><tmpl_var name="sender_id_txt"></th></tmpl_if>
<th data-column="subject"><tmpl_var name="subject_txt"></th> <th data-column="subject"><tmpl_var name="subject_txt"></th>
<th data-column="date"><tmpl_var name="date_txt"></th> <th data-column="date"><tmpl_var name="date_txt"></th>
<th class="small-col text-right">{tmpl_var name='search_limit'}</th> <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
</tr> </tr>
<tr> <tr>
<td><select class="form-control" name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td> <tmpl_if name="is_admin"><td><select class="form-control" name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td></tmpl_if>
<td><input class="form-control" type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td> <td><input class="form-control" type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td class="text-right"> <td class="text-right">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<tbody> <tbody>
<tmpl_loop name="records"> <tmpl_loop name="records">
<tr> <tr>
<td><a href="#" data-load-content="help/support_message_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sender_id"}</a></td> <tmpl_if name="is_admin"><td><a href="#" data-load-content="help/support_message_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sender_id"}</a></td></tmpl_if>
<td><a href="#" data-load-content="help/support_message_edit.php?id={tmpl_var name='id'}">{tmpl_var name="subject"}</a></td> <td><a href="#" data-load-content="help/support_message_edit.php?id={tmpl_var name='id'}">{tmpl_var name="subject"}</a></td>
<td><a href="#" data-load-content="help/support_message_edit.php?id={tmpl_var name='id'}">{tmpl_var name="tstamp"}</a></td> <td><a href="#" data-load-content="help/support_message_edit.php?id={tmpl_var name='id'}">{tmpl_var name="tstamp"}</a></td>
<td class="text-right"> <td class="text-right">
...@@ -43,16 +43,16 @@ ...@@ -43,16 +43,16 @@
</tmpl_loop> </tmpl_loop>
<tmpl_unless name="records"> <tmpl_unless name="records">
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>"> <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
<td colspan="4">{tmpl_var name='globalsearch_noresults_text_txt'}</td> <tmpl_if name="is_admin"><td colspan="4"><tmpl_else><td colspan="3"></tmpl_if>{tmpl_var name='globalsearch_noresults_text_txt'}</td>
</tr> </tr>
</tmpl_unless> </tmpl_unless>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="4"><tmpl_var name="paging"></td> <tmpl_if name="is_admin"><td colspan="4"><tmpl_else><td colspan="3"></tmpl_if><tmpl_var name="paging"></td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</div> </div>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment