dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Messages: Sending of media files now functional. Permission added to control New Messages.

Browse Source
This commit is contained in:
Nate
2019-01-02 13:21:14 -07:00
parent b9a5d37e0b
commit bb5f0c310a
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/messages/message_media.php
+3 -8
View File
@@ -27,13 +27,6 @@
//includes //includes
require_once "root.php"; require_once "root.php";
require_once "resources/require.php"; require_once "resources/require.php";
require_once "resources/check_auth.php";
//check permissions
if (!permission_exists('message_view')) {
echo "access denied";
exit;
}
//add multi-lingual support //add multi-lingual support
$language = new text; $language = new text;
@@ -49,7 +42,9 @@
$sql = "select message_media_type, message_media_url, message_media_content from v_message_media "; $sql = "select message_media_type, message_media_url, message_media_content from v_message_media ";
$sql .= "where message_media_uuid = '".$message_media_uuid."' "; $sql .= "where message_media_uuid = '".$message_media_uuid."' ";
$sql .= "and user_uuid = '".$_SESSION['user_uuid']."' "; if (is_uuid($_SESSION['user_uuid'])) {
$sql .= "and user_uuid = '".$_SESSION['user_uuid']."' ";
}
$sql .= "and (domain_uuid = '".$domain_uuid."' or domain_uuid is null) "; $sql .= "and (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
app/messages/message_send.php
+3 -1
View File
@@ -160,7 +160,9 @@
if (is_array($message_media) && sizeof($message_media) != 0) { if (is_array($message_media) && sizeof($message_media) != 0) {
$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? 'https://' : 'http://'; $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? 'https://' : 'http://';
foreach ($message_media as $index => $media) { foreach ($message_media as $index => $media) {
$message['media'][] = $protocol.$_SERVER['HTTP_HOST'].'/app/messages/message_media.php?id='.$media['uuid'].'&action=download'; $path = $protocol.$_SERVER['HTTP_HOST'].'/app/messages/message_media.php?id='.$media['uuid'].'&action=download&.'.strtolower(pathinfo($media['name'], PATHINFO_EXTENSION));
$message['media'][] = $path;
//echo $path."<br><br>";
} }
} }
$http_content = json_encode($message); $http_content = json_encode($message);
app/messages/messages.php
+3 -1
View File
@@ -170,7 +170,9 @@
echo " <td width='50%' align='left' nowrap='nowrap'><b>".$text['title-messages']."</b><br><br></td>\n"; echo " <td width='50%' align='left' nowrap='nowrap'><b>".$text['title-messages']."</b><br><br></td>\n";
echo " <form method='get' action=''>\n"; echo " <form method='get' action=''>\n";
echo " <td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n"; echo " <td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
echo " <input type='button' class='btn' name='' alt='".$text['label-new_message']."' onclick=\"$('#message_new_layer').fadeIn(200); unload_thread();\" value='".$text['label-new_message']."'>\n"; if (permission_exists('message_add')) {
echo " <input type='button' class='btn' name='' alt='".$text['label-new_message']."' onclick=\"$('#message_new_layer').fadeIn(200); unload_thread();\" value='".$text['label-new_message']."'>\n";
}
echo " <a href='messages_log.php'><input type='button' class='btn' alt=\"".$text['label-log']."\" value=\"".$text['label-log']."\"></a>\n"; echo " <a href='messages_log.php'><input type='button' class='btn' alt=\"".$text['label-log']."\" value=\"".$text['label-log']."\"></a>\n";
echo " </td>\n"; echo " </td>\n";
echo " </form>\n"; echo " </form>\n";