nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update messages.php

Browse Source
This commit is contained in:
FusionPBX
2018-08-30 19:48:09 -06:00
committed by GitHub
parent 8e757a0b39
commit 70ed586a82
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/messages/messages.php
View File

@@ -88,12 +88,13 @@
//prepare to page the results
$sql = "select count(message_uuid) as num_rows from v_messages ";
$sql .= "where user_uuid = '".$_SESSION['user_uuid']."' ";
if ($_GET['show'] == "all" && permission_exists('message_all')) {
if (isset($sql_search)) {
$sql .= "where ".$sql_search;
$sql .= "and ".$sql_search;
}
} else {
$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
$sql .= "and (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
if (isset($sql_search)) {
$sql .= "and ".$sql_search;
}
@@ -123,12 +124,13 @@
//get the list
$sql = "select * from v_messages ";
$sql .= "where user_uuid = '".$_SESSION['user_uuid']."' ";
if ($_GET['show'] == "all" && permission_exists('message_all')) {
if (isset($sql_search)) {
$sql .= "where ".$sql_search;
$sql .= "and ".$sql_search;
}
} else {
$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
$sql .= "and (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
if (isset($sql_search)) {
$sql .= "and ".$sql_search;
}
@@ -270,4 +272,4 @@
//include the footer
require_once "resources/footer.php";
?>
?>