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

Messages app improvements. Output escaped. Display limit added as Default Setting. Media download fixed. Sending of media/file attachments enabled, but not yet functional - waiting on feedback from provider.

This commit is contained in:
Nate 2018-12-29 11:13:18 -07:00
parent 1b0bb6452d
commit 5701e774b7
8 changed files with 215 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/messages/app_config.php
View File

@ -237,5 +237,13 @@
$apps[$x]['default_settings'][$y]['default_setting_value'] = ""; $apps[$x]['default_settings'][$y]['default_setting_value'] = "";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "HTTP Authentication password."; $apps[$x]['default_settings'][$y]['default_setting_description'] = "HTTP Authentication password.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "882007e2-582a-47d6-a830-139c59888ae9";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "message";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "display_last";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "25 messages";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Define the maximum messages, or past time frame of messages, loaded for display.";
?> ?>

13
app/messages/message_media.php
View File

@ -47,7 +47,7 @@
//get media //get media
if (is_uuid($message_media_uuid)) { if (is_uuid($message_media_uuid)) {
$sql = "select message_media_type, 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']."' "; $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) ";
@ -79,16 +79,17 @@
switch ($action) { switch ($action) {
case 'download': case 'download':
header("Content-type: ".$content_type); header("Content-type: ".$content_type."; charset=utf-8");
header("Content-Length: ".strlen($media['message_media_content'])); $filename = $message_media_source != '' ? $message_media_source."_".$message_media_uuid.".".strtolower($media['message_media_type']) : $media['message_media_url'];
header("Content-Disposition: attachment; filename=\"".$message_media_source."_".$message_media_uuid.".".strtolower($media['message_media_type'])."\""); header("Content-Disposition: attachment; filename=\"".$filename."\"");
header("Content-Length: ".strlen(base64_decode($media['message_media_content'])));
echo base64_decode($media['message_media_content']); echo base64_decode($media['message_media_content']);
break; break;
case 'display': case 'display':
echo " <table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'>\n"; echo " <table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'>\n";
echo " <tr>\n"; echo " <tr>\n";
echo " <td align='center' valign='middle'>\n"; echo " <td align='center' valign='middle'>\n";
echo " <img src=\"data:".$content_type.";base64, ".$media['message_media_content']."\" style='width: auto; max-width: 95%; height: auto; max-height: 800px; box-shadow: 0px 1px 20px #888; cursor: pointer;' onclick=\"$('#message_media_layer').fadeOut(200);\" oncontextmenu=\"window.open('message_media.php?id=".$message_media_uuid."&src=".$message_media_source."&action=download'); return false;\" title=\"Click to Close, Right-Click to Save\">\n"; echo " <img src=\"data:".$content_type.";base64,".$media['message_media_content']."\" style='width: auto; max-width: 95%; height: auto; max-height: 800px; box-shadow: 0px 1px 20px #888; cursor: pointer;' onclick=\"$('#message_media_layer').fadeOut(200);\" oncontextmenu=\"window.open('message_media.php?id=".$message_media_uuid."&src=".$message_media_source."&action=download'); return false;\" title=\"Click to Close, Right-Click to Save\">\n";
echo " </td>\n"; echo " </td>\n";
echo " </tr>\n"; echo " </tr>\n";
echo " </table>\n"; echo " </table>\n";
@ -97,4 +98,4 @@
} }
?> ?>

116
app/messages/message_send.php
View File

@ -30,10 +30,7 @@
//check permissions //check permissions
require_once "resources/check_auth.php"; require_once "resources/check_auth.php";
if (permission_exists('message_add') || permission_exists('message_edit')) { if (!permission_exists('message_add') && !permission_exists('message_edit')) {
//access granted
}
else {
echo "access denied"; echo "access denied";
exit; exit;
} }
@ -42,15 +39,12 @@
$language = new text; $language = new text;
$text = $language->get(); $text = $language->get();
//action add or update
$action = "add";
//define the http request //define the http request
function http_request($url, $method, $headers = null, $content) { function http_request($url, $method, $headers = null, $content) {
$options = array( $options = array(
'http'=>array( 'http'=>array(
'method'=>$method, 'method'=>$method,
'header'=> $headers, 'header'=>$headers,
'content'=>$content 'content'=>$content
)); ));
$context = stream_context_create($options); $context = stream_context_create($options);
@ -63,10 +57,10 @@
//get http post variables and set them to php variables //get http post variables and set them to php variables
if (is_array($_POST)) { if (is_array($_POST)) {
$message_type = check_str($_POST["message_type"]);
$message_from = check_str($_POST["message_from"]); $message_from = check_str($_POST["message_from"]);
$message_to = check_str($_POST["message_to"]); $message_to = check_str($_POST["message_to"]);
$message_text = check_str($_POST["message_text"]); $message_text = check_str($_POST["message_text"]);
$message_media = $_FILES["message_media"];
} }
//process the user data and save it to the database //process the user data and save it to the database
@ -76,13 +70,34 @@
$phone_number = preg_replace('{[\D]}', '', $message_to); $phone_number = preg_replace('{[\D]}', '', $message_to);
//error check //error check
if ( if (
($message_type != 'sms' && $message_type != 'mms' && $message_type != 'chat') || !is_numeric($message_from) ||
!is_numeric($message_from) || !is_numeric($message_to) ||
!is_numeric($message_to) || $message_text == '') {
$message_text == '') { exit;
exit; }
}
// handle media (if any)
if (is_array($message_media) && sizeof($message_media) != 0) {
// reorganize media array, ignore errored files
$f = 0;
foreach ($message_media['error'] as $index => $error) {
if ($error == 0) {
$tmp_media[$f]['uuid'] = uuid();
$tmp_media[$f]['name'] = $message_media['name'][$index];
$tmp_media[$f]['type'] = $message_media['type'][$index];
$tmp_media[$f]['tmp_name'] = $message_media['tmp_name'][$index];
$tmp_media[$f]['size'] = $message_media['size'][$index];
$f++;
}
}
$message_media = $tmp_media;
unset($tmp_media, $f);
}
$message_type = is_array($message_media) && sizeof($message_media) != 0 ? 'mms' : 'sms';
//get the contact uuid //get the contact uuid
//$sql = "SELECT trim(c.contact_name_given || ' ' || c.contact_name_family || ' (' || c.contact_organization || ')') AS name, p.phone_number AS number "; //$sql = "SELECT trim(c.contact_name_given || ' ' || c.contact_name_family || ' (' || c.contact_organization || ')') AS name, p.phone_number AS number ";
@ -98,23 +113,31 @@
$row = $prep_statement->fetch(PDO::FETCH_NAMED); $row = $prep_statement->fetch(PDO::FETCH_NAMED);
$contact_uuid = $row['contact_uuid']; $contact_uuid = $row['contact_uuid'];
//set the message id
$message_uuid = uuid();
//build the message array //build the message array
$message['domain_uuid'] = $_SESSION["domain_uuid"]; $message_uuid = uuid();
$message['message_uuid'] = uuid(); $array['messages'][0]['domain_uuid'] = $_SESSION["domain_uuid"];
$message['user_uuid'] = $_SESSION["user_uuid"]; $array['messages'][0]['message_uuid'] = $message_uuid;
$message['contact_uuid'] = $contact_uuid; $array['messages'][0]['user_uuid'] = $_SESSION["user_uuid"];
$message['message_type'] = $message_type; $array['messages'][0]['contact_uuid'] = $contact_uuid;
$message['message_direction'] = 'outbound'; $array['messages'][0]['message_type'] = $message_type;
$message['message_date'] = 'now()'; $array['messages'][0]['message_direction'] = 'outbound';
$message['message_from'] = $message_from; $array['messages'][0]['message_date'] = 'now()';
$message['message_to'] = $message_to; $array['messages'][0]['message_from'] = $message_from;
$message['message_text'] = $message_text; $array['messages'][0]['message_to'] = $message_to;
$array['messages'][0]['message_text'] = $message_text;
//prepare the array //build message media array (if necessary)
$array['messages'][0] = $message; if (is_array($message_media)) {
foreach($message_media as $index => $media) {
$array['message_media'][$index]['message_media_uuid'] = $media['uuid'];
$array['message_media'][$index]['message_uuid'] = $message_uuid;
$array['message_media'][$index]['domain_uuid'] = $_SESSION["domain_uuid"];
$array['message_media'][$index]['user_uuid'] = $_SESSION["user_uuid"];
$array['message_media'][$index]['message_media_type'] = strtolower(pathinfo($media['name'], PATHINFO_EXTENSION));
$array['message_media'][$index]['message_media_url'] = $media['name'];
$array['message_media'][$index]['message_media_content'] = base64_encode(file_get_contents($media['tmp_name']));
}
}
//save to the data //save to the data
$database = new database; $database = new database;
@ -123,18 +146,24 @@
$database->uuid($message_uuid); $database->uuid($message_uuid);
$database->save($array); $database->save($array);
$message = $database->message; $message = $database->message;
unset($array, $message);
//debug info //debug info
//echo "<pre>"; //echo "<pre>".print_r($message, true)."</pre>"; exit;
//print_r($message);
//echo "</pre>";
//exit;
//send the message to the provider //santize the from
$array["to"] = $message_to; $message_from = preg_replace('{[\D]}', '', $message_from);
$array["text"] = $message_text;
//$array["media"] = ''; //prepare message to send
$http_content = json_encode($array); $message['to'] = $message_to;
$message['text'] = $message_text;
if (is_array($message_media) && sizeof($message_media) != 0) {
$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) ? 'https://' : 'http://';
foreach ($message_media as $index => $media) {
$message['media'][] = $protocol.$_SERVER['HTTP_HOST'].'/app/messages/message_media.php?id='.$media['uuid'].'&action=download';
}
}
$http_content = json_encode($message);
//settings needed for REST API //settings needed for REST API
$http_method = $_SESSION['message']['http_method']['text']; $http_method = $_SESSION['message']['http_method']['text'];
@ -145,9 +174,6 @@
$http_auth_user = $_SESSION['message']['http_auth_user']['text']; $http_auth_user = $_SESSION['message']['http_auth_user']['text'];
$http_auth_password = $_SESSION['message']['http_auth_password']['text']; $http_auth_password = $_SESSION['message']['http_auth_password']['text'];
//santize the from
$message_from = preg_replace('{[\D]}', '', $message_from);
//exchange variable name with their values //exchange variable name with their values
$http_destination = str_replace("\${from}", $message_from, $http_destination); $http_destination = str_replace("\${from}", $message_from, $http_destination);
@ -157,11 +183,11 @@
$headers[] = "Authorization: Basic ".base64_encode($http_auth_user.':'.$http_auth_password); $headers[] = "Authorization: Basic ".base64_encode($http_auth_user.':'.$http_auth_password);
} }
$response = http_request($http_destination, $http_method, $headers, $http_content); $response = http_request($http_destination, $http_method, $headers, $http_content);
//echo $response; //echo $http_content."<br><br>".$response;
//redirect the user //redirect the user
//$_SESSION["message"] = $text['message-sent']; //$_SESSION["message"] = $text['message-sent'];
return true; return true;
} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0) } //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
?> ?>

40
app/messages/messages.php
View File

@ -106,8 +106,7 @@
echo " <table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'>\n"; echo " <table cellpadding='0' cellspacing='0' border='0' width='100%' height='100%'>\n";
echo " <tr>\n"; echo " <tr>\n";
echo " <td align='center' valign='middle'>\n"; echo " <td align='center' valign='middle'>\n";
echo " <form id='message_new'>\n"; echo " <form id='message_new' method='post' enctype='multipart/form-data' action='message_send.php'>\n";
echo " <input type='hidden' name='message_type' value='sms'>\n";
echo " <span id='message_new_container'>\n"; echo " <span id='message_new_container'>\n";
echo " <b>".$text['label-new_message']."</b><br /><br />\n"; echo " <b>".$text['label-new_message']."</b><br /><br />\n";
echo " <table width='100%'>\n"; echo " <table width='100%'>\n";
@ -138,14 +137,12 @@
echo " <textarea class='formfld' style='width: 100%; height: 80px;' name='message_text' name='message_new_text'></textarea>\n"; echo " <textarea class='formfld' style='width: 100%; height: 80px;' name='message_text' name='message_new_text'></textarea>\n";
echo " </td>\n"; echo " </td>\n";
echo " </tr>\n"; echo " </tr>\n";
/*
echo " <tr>\n"; echo " <tr>\n";
echo " <td class='vncell'>".$text['label-message_media']."</td>\n"; echo " <td class='vncell'>".$text['label-message_media']."</td>\n";
echo " <td class='vtable'>\n"; echo " <td class='vtable'>\n";
echo " <input type='file' class='formfld' name='message_media' id='message_new_media'>\n"; echo " <input type='file' class='formfld' multiple='multiple' name='message_media[]' id='message_new_media'>\n";
echo " </td>\n"; echo " </td>\n";
echo " </tr>\n"; echo " </tr>\n";
*/
echo " </table>\n"; echo " </table>\n";
echo " <center>\n"; echo " <center>\n";
echo " <input type='reset' class='btn' style='float: left; margin-top: 15px;' value='".$text['button-clear']."' onclick=\"$('#message_new').reset();\">\n"; echo " <input type='reset' class='btn' style='float: left; margin-top: 15px;' value='".$text['button-clear']."' onclick=\"$('#message_new').reset();\">\n";
@ -169,21 +166,7 @@
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"; 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_all')) {
if ($_GET['show'] == 'all') {
echo " <input type='hidden' name='show' value='all'>";
}
else {
echo " <input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='messages.php?show=all';\">\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 " <input type='text' class='txt' style='width: 150px; margin-left: 15px;' name='search' id='search' value='".escape($search)."'>\n";
echo " <input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
*/
echo " </td>\n"; echo " </td>\n";
echo " </form>\n"; echo " </form>\n";
echo " </tr>\n"; echo " </tr>\n";
@ -281,14 +264,17 @@
echo " $('#message_new').submit(function(event) {\n"; echo " $('#message_new').submit(function(event) {\n";
echo " event.preventDefault();\n"; echo " event.preventDefault();\n";
echo " $.ajax({\n"; echo " $.ajax({\n";
echo " url: 'message_send.php',\n"; echo " url: $(this).attr('action'),\n";
echo " type: 'POST',\n"; echo " type: $(this).attr('method'),\n";
echo " data: $('#message_new').serialize(),\n"; echo " data: new FormData(this),\n";
echo " processData: false,\n";
echo " contentType: false,\n";
echo " cache: false,\n";
echo " success: function(){\n"; echo " success: function(){\n";
echo " document.getElementById('message_new').reset();\n"; echo " document.getElementById('message_new').reset();\n";
echo " $('#message_new_layer').fadeOut(400);\n"; echo " $('#message_new_layer').fadeOut(400);\n";
echo " refresh_contacts();\n"; echo " refresh_contacts();\n";
echo " }\n"; echo " }\n";
echo " });\n"; echo " });\n";
echo " });\n"; echo " });\n";
@ -308,4 +294,4 @@
//include the footer //include the footer
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>

6
app/messages/messages_contacts.php
View File

@ -121,11 +121,11 @@
foreach($numbers as $number) { foreach($numbers as $number) {
echo " <tr><td valign='top' class='".$row_style[$c]."' onclick=\"load_thread('".urlencode($number)."');\">"; echo " <tr><td valign='top' class='".$row_style[$c]."' onclick=\"load_thread('".urlencode($number)."');\">";
if ($contact[$number]['contact_name_given'] != '' || $contact[$number]['contact_name_family'] != '') { if ($contact[$number]['contact_name_given'] != '' || $contact[$number]['contact_name_family'] != '') {
echo " <i>".$contact[$number]['contact_name_given'].' '.$contact[$number]['contact_name_family'].'</i>'; echo " <i>".escape($contact[$number]['contact_name_given'].' '.$contact[$number]['contact_name_family']).'</i>';
echo "<span style='float: right; font-size: 65%; line-height: 60%; margin-top: 5px; margin-left: 5px;'>".format_phone($number).'</span>'; echo "<span style='float: right; font-size: 65%; line-height: 60%; margin-top: 5px; margin-left: 5px;'>".escape(format_phone($number)).'</span>';
} }
else { else {
echo " ".format_phone($number); echo " ".escape(format_phone($number));
} }
echo "</td></tr>\n"; echo "</td></tr>\n";
$c = $c == 0 ? 1 : 0; $c = $c == 0 ? 1 : 0;

61
app/messages/messages_thread.php
View File

@ -46,16 +46,29 @@
$refresh = $_GET['refresh'] == 'true' ? true : false; $refresh = $_GET['refresh'] == 'true' ? true : false;
//get messages //get messages
$since = date("Y-m-d H:i:s", strtotime("-24 hours")); if (isset($_SESSION['message']['display_last']['text']) && $_SESSION['message']['display_last']['text'] != '') {
$array = explode(' ',$_SESSION['message']['display_last']['text']);
if (is_array($array) && is_numeric($array[0]) && $array[0] > 0) {
if ($array[1] == 'messages') {
$limit = "limit ".$array[0]." offset 0 ";
}
else {
$since = "and message_date >= '".date("Y-m-d H:i:s", strtotime('-'.$_SESSION['message']['display_last']['text']))."' ";
}
}
}
if ($limit == '' && $since == '') { $limit = "limit 25 offset 0"; } //default (message count)
$sql = "select * from v_messages "; $sql = "select * from v_messages ";
$sql .= "where user_uuid = '".$_SESSION['user_uuid']."' "; $sql .= "where 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) ";
//$sql .= "and message_date >= '".$since."' "; $sql .= $since;
$sql .= "and (message_from like '%".$number."' or message_to like '%".$number."') "; $sql .= "and (message_from like '%".$number."' or message_to like '%".$number."') ";
$sql .= "order by message_date asc "; $sql .= "order by message_date desc ";
$sql .= $limit;
$prep_statement = $db->prepare(check_sql($sql)); $prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $prep_statement->execute();
$messages = $prep_statement->fetchAll(PDO::FETCH_NAMED); $messages = $prep_statement->fetchAll(PDO::FETCH_NAMED);
$messages = array_reverse($messages);
unset ($prep_statement, $sql); unset ($prep_statement, $sql);
//get media (if any) //get media (if any)
@ -154,7 +167,7 @@
//message bubble //message bubble
echo "<span class='message-bubble message-bubble-".($message['message_direction'] == 'inbound' ? 'em' : 'me')."'>"; echo "<span class='message-bubble message-bubble-".($message['message_direction'] == 'inbound' ? 'em' : 'me')."'>";
if ($message['message_text'] != '') { if ($message['message_text'] != '') {
echo str_replace("\n",'<br />',$message['message_text'])."<br />\n"; echo str_replace("\n",'<br />',escape($message['message_text']))."<br />\n";
} }
if (is_array($message_media[$message['message_uuid']]) && sizeof($message_media[$message['message_uuid']]) != 0) { if (is_array($message_media[$message['message_uuid']]) && sizeof($message_media[$message['message_uuid']]) != 0) {
@ -172,10 +185,10 @@
} }
} }
} }
echo "<span class='message-bubble-when'>".format_when_local($message['message_date'])."</span>\n"; echo " <span class='message-bubble-when'>".format_when_local($message['message_date'])."</span>\n";
echo "</span>\n"; echo "</span>\n";
} }
echo " <span id='thread_bottom'></span>\n"; echo "<span id='thread_bottom'></span>\n";
} }
if (!$refresh) { if (!$refresh) {
@ -183,18 +196,23 @@
if (permission_exists('message_add')) { if (permission_exists('message_add')) {
//output input form //output input form
echo "<form id='message_compose'>\n"; echo "<form id='message_compose' method='post' enctype='multipart/form-data' action='message_send.php'>\n";
echo "<input type='hidden' name='message_type' value='sms'>\n";
echo "<input type='hidden' name='message_from' value='".$message_from."'>\n"; echo "<input type='hidden' name='message_from' value='".$message_from."'>\n";
echo "<input type='hidden' name='message_to' value='".$number."'>\n"; echo "<input type='hidden' name='message_to' value='".$number."'>\n";
echo "<textarea class='formfld' id='message_text' name='message_text' style='width: 100%; max-width: 100%; height: 40px; border: 1px solid #cbcbcb; resize: vertical; padding: 5px 8px; margin-top: 10px;' placeholder=\"".$text['description-enter_response']."\"></textarea>"; echo "<textarea class='formfld' id='message_text' name='message_text' style='width: 100%; max-width: 100%; min-height: 55px; border: 1px solid #cbcbcb; resize: vertical; padding: 5px 8px; margin-top: 10px; margin-bottom: 5px;' placeholder=\"".$text['description-enter_response']."\"></textarea>";
echo "<span style='position: relative;'>\n"; echo "<table cellpadding='0' cellspacing='0' border='0' width='100%' style='margin-top: 5px;'>\n";
echo " <center>\n"; echo " <tr>\n";
echo " <input type='reset' class='btn' style='float: left; margin-top: 15px;' value='".$text['button-clear']."' onclick=\"$('#message_text').focus();\">\n"; echo " <td><img src='resources/images/attachment.png' style='min-width: 20px; height: 20px; border: none; padding-right: 5px;'></td>\n";
echo " <span id='thread_refresh_state'><img src='resources/images/refresh_active.gif' style='width: 16px; height: 16px; border: none; margin-top: 3px; cursor: pointer;' onclick=\"refresh_thread_stop('".$number."');\" alt=\"".$text['label-refresh_pause']."\" title=\"".$text['label-refresh_pause']."\"></span> "; echo " <td width='100%'><input type='file' class='formfld' multiple='multiple' name='message_media[]' id='message_new_media'></td>\n";
echo " <input type='submit' class='btn' style='float: right; margin-top: 15px;' value='".$text['button-send']."' title=\"".$text['label-ctrl_enter']."\">\n"; echo " </td>\n";
echo " </center>\n"; echo "</table>\n";
echo "</span>\n"; echo "<table cellpadding='0' cellspacing='0' border='0' width='100%' style='margin-top: 15px;'>\n";
echo " <tr>\n";
echo " <td align='left'><input type='reset' class='btn' value='".$text['button-clear']."' onclick=\"$('#message_text').focus();\"></td>\n";
echo " <td align='center'><span id='thread_refresh_state'><img src='resources/images/refresh_active.gif' style='width: 16px; height: 16px; border: none; cursor: pointer;' onclick=\"refresh_thread_stop('".$number."');\" alt=\"".$text['label-refresh_pause']."\" title=\"".$text['label-refresh_pause']."\"></span></td>\n";
echo " <td align='right'><input type='submit' class='btn' value='".$text['button-send']."' title=\"".$text['label-ctrl_enter']."\"></td>\n";
echo " </td>\n";
echo "</table>\n";
echo "</form>\n"; echo "</form>\n";
//js to load messages for clicked number //js to load messages for clicked number
@ -203,9 +221,12 @@
echo " $('#message_compose').submit(function(event) {\n"; echo " $('#message_compose').submit(function(event) {\n";
echo " event.preventDefault();\n"; echo " event.preventDefault();\n";
echo " $.ajax({\n"; echo " $.ajax({\n";
echo " url: 'message_send.php',\n"; echo " url: $(this).attr('action'),\n";
echo " type: 'POST',\n"; echo " type: $(this).attr('method'),\n";
echo " data: $('#message_compose').serialize(),\n"; echo " data: new FormData(this),\n";
echo " processData: false,\n";
echo " contentType: false,\n";
echo " cache: false,\n";
echo " success: function(){\n"; echo " success: function(){\n";
echo " document.getElementById('message_compose').reset();\n"; echo " document.getElementById('message_compose').reset();\n";
if (!http_user_agent('mobile')) { if (!http_user_agent('mobile')) {
@ -228,6 +249,4 @@
} }
} }
?> ?>

60
core/default_settings/app_languages.php
View File

@ -581,6 +581,66 @@ $text['label-12-hour']['ru-ru'] = "12-часовой";
$text['label-12-hour']['sv-se'] = "12-timmars"; $text['label-12-hour']['sv-se'] = "12-timmars";
$text['label-12-hour']['uk-ua'] = "12-годинний"; $text['label-12-hour']['uk-ua'] = "12-годинний";
$text['label-hours']['en-us'] = "Hour(s)";
$text['label-hours']['ar-eg'] = "";
$text['label-hours']['de-at'] = "";
$text['label-hours']['de-ch'] = "";
$text['label-hours']['de-de'] = "";
$text['label-hours']['es-cl'] = "";
$text['label-hours']['es-mx'] = "";
$text['label-hours']['fr-ca'] = "";
$text['label-hours']['fr-fr'] = "";
$text['label-hours']['he-il'] = "";
$text['label-hours']['it-it'] = "";
$text['label-hours']['nl-nl'] = "";
$text['label-hours']['pl-pl'] = "";
$text['label-hours']['pt-br'] = "";
$text['label-hours']['pt-pt'] = "";
$text['label-hours']['ro-ro'] = "";
$text['label-hours']['ru-ru'] = "";
$text['label-hours']['sv-se'] = "";
$text['label-hours']['uk-ua'] = "";
$text['label-days']['en-us'] = "Day(s)";
$text['label-days']['ar-eg'] = "";
$text['label-days']['de-at'] = "";
$text['label-days']['de-ch'] = "";
$text['label-days']['de-de'] = "";
$text['label-days']['es-cl'] = "";
$text['label-days']['es-mx'] = "";
$text['label-days']['fr-ca'] = "";
$text['label-days']['fr-fr'] = "";
$text['label-days']['he-il'] = "";
$text['label-days']['it-it'] = "";
$text['label-days']['nl-nl'] = "";
$text['label-days']['pl-pl'] = "";
$text['label-days']['pt-br'] = "";
$text['label-days']['pt-pt'] = "";
$text['label-days']['ro-ro'] = "";
$text['label-days']['ru-ru'] = "";
$text['label-days']['sv-se'] = "";
$text['label-days']['uk-ua'] = "";
$text['label-messages']['en-us'] = "Message(s)";
$text['label-messages']['ar-eg'] = "";
$text['label-messages']['de-at'] = "";
$text['label-messages']['de-ch'] = "";
$text['label-messages']['de-de'] = "";
$text['label-messages']['es-cl'] = "";
$text['label-messages']['es-mx'] = "";
$text['label-messages']['fr-ca'] = "";
$text['label-messages']['fr-fr'] = "";
$text['label-messages']['he-il'] = "";
$text['label-messages']['it-it'] = "";
$text['label-messages']['nl-nl'] = "";
$text['label-messages']['pl-pl'] = "";
$text['label-messages']['pt-br'] = "";
$text['label-messages']['pt-pt'] = "";
$text['label-messages']['ro-ro'] = "";
$text['label-messages']['ru-ru'] = "";
$text['label-messages']['sv-se'] = "";
$text['label-messages']['uk-ua'] = "";
$text['header-default_settings']['en-us'] = "Default Settings"; $text['header-default_settings']['en-us'] = "Default Settings";
$text['header-default_settings']['ar-eg'] = ""; $text['header-default_settings']['ar-eg'] = "";
$text['header-default_settings']['de-at'] = "Standard Einstellungen"; //copied from de-de $text['header-default_settings']['de-at'] = "Standard Einstellungen"; //copied from de-de

12
core/default_settings/default_setting_edit.php
View File

@ -497,6 +497,18 @@
echo " <option value='7' ".(($default_setting_value == "7") ? "selected='selected'" : null).">MMM DD</option>\n"; echo " <option value='7' ".(($default_setting_value == "7") ? "selected='selected'" : null).">MMM DD</option>\n";
echo " </select>\n"; echo " </select>\n";
} }
elseif ($category == "message" && $subcategory == "display_last" && $name == "text") {
$array = explode(' ',$default_setting_value);
if (!is_numeric($array[0])) { $array[1] = $array[0]; $array[0] = ''; }
echo " <input type='text' class='formfld' id='default_setting_value_1' value=\"".$array[0]."\" onchange=\"$('#default_setting_value').val($('#default_setting_value_1').val() + ' ' + $('#default_setting_value_2 option:selected').val());\">\n";
echo " <select class='formfld' id='default_setting_value_2' onchange=\"$('#default_setting_value').val($('#default_setting_value_1').val() + ' ' + $('#default_setting_value_2 option:selected').val());\">\n";
echo " <option value='hours' ".($array[1] == "hours" ? "selected='selected'" : null).">".$text['label-hours']."</option>\n";
echo " <option value='days' ".($array[1] == "days" ? "selected='selected'" : null).">".$text['label-days']."</option>\n";
echo " <option value='messages' ".($array[1] == "messages" ? "selected='selected'" : null).">".$text['label-messages']."</option>\n";
echo " </select>\n";
echo " <input type='hidden' id='default_setting_value' name='default_setting_value' value=\"".$default_setting_value."\">\n";
unset($array);
}
elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) { elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n"; echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n"; echo " <option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";