attachment preview: some backend work in the item module:

- convert attachment to bbcode and
- add the attachment bbcode to the item body
This commit is contained in:
rabuzarus 2019-02-01 23:42:36 +01:00
parent 07d1932efc
commit a6322b1c4e
2 changed files with 73 additions and 12 deletions

View file

@ -40,6 +40,8 @@ use Friendica\Util\Emailer;
use Friendica\Util\Security; use Friendica\Util\Security;
use Friendica\Util\Strings; use Friendica\Util\Strings;
require_once 'include/items.php';
function item_post(App $a) { function item_post(App $a) {
if (!local_user() && !remote_user()) { if (!local_user() && !remote_user()) {
return 0; return 0;
@ -188,6 +190,40 @@ function item_post(App $a) {
$categories = ''; $categories = '';
$postopts = ''; $postopts = '';
$emailcc = ''; $emailcc = '';
$body = defaults($_REQUEST, 'body', '');
$has_attachment = defaults($_REQUEST, 'has_attachment', 0);
// If we have a speparate attachment, we need to add it to the body.
if (!empty($has_attachment)) {
$attachment_type = defaults($_REQUEST, 'attachment_type', '');
$attachment_title = defaults($_REQUEST, 'attachment_title', '');
$attachment_text = defaults($_REQUEST, 'attachment_text', '');
$attachment_url = hex2bin(defaults($_REQUEST, 'attachment_url', ''));
$attachment_img_src = hex2bin(defaults($_REQUEST, 'attachment_img_src', ''));
$attachment_img_width = defaults($_REQUEST, 'attachment_img_width', 0);
$attachment_img_height = defaults($_REQUEST, 'attachment_img_height', 0);
$attachment = [
'type' => $attachment_type,
'title' => $attachment_title,
'text' => $attachment_text,
'url' => $attachment_url,
];
if (!empty($attachment_img_src)) {
$attachment['images'] = [
0 => [
'src' => $attachment_img_src,
'width' => $attachment_img_width,
'height' => $attachment_img_height
]
];
}
$att_bbcode = add_page_info_data($attachment);
$body .= $att_bbcode;
}
if (!empty($orig_post)) { if (!empty($orig_post)) {
$str_group_allow = $orig_post['allow_gid']; $str_group_allow = $orig_post['allow_gid'];
@ -201,7 +237,7 @@ function item_post(App $a) {
$app = $orig_post['app']; $app = $orig_post['app'];
$categories = $orig_post['file']; $categories = $orig_post['file'];
$title = Strings::escapeTags(trim($_REQUEST['title'])); $title = Strings::escapeTags(trim($_REQUEST['title']));
$body = Strings::escapeHtml(trim($_REQUEST['body'])); $body = Strings::escapeHtml(trim($body));
$private = $orig_post['private']; $private = $orig_post['private'];
$pubmail_enabled = $orig_post['pubmail']; $pubmail_enabled = $orig_post['pubmail'];
$network = $orig_post['network']; $network = $orig_post['network'];
@ -237,7 +273,7 @@ function item_post(App $a) {
$coord = Strings::escapeTags(trim(defaults($_REQUEST, 'coord' , ''))); $coord = Strings::escapeTags(trim(defaults($_REQUEST, 'coord' , '')));
$verb = Strings::escapeTags(trim(defaults($_REQUEST, 'verb' , ''))); $verb = Strings::escapeTags(trim(defaults($_REQUEST, 'verb' , '')));
$emailcc = Strings::escapeTags(trim(defaults($_REQUEST, 'emailcc' , ''))); $emailcc = Strings::escapeTags(trim(defaults($_REQUEST, 'emailcc' , '')));
$body = Strings::escapeHtml(trim(defaults($_REQUEST, 'body' , ''))); $body = Strings::escapeHtml(trim($body));
$network = Strings::escapeTags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN))); $network = Strings::escapeTags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
$guid = System::createUUID(); $guid = System::createUUID();

View file

@ -16,8 +16,13 @@
selector = selector.substr(1); selector = selector.substr(1);
var previewTpl = '\ var previewTpl = '\
<div id="preview_' + selector + '" class="preview {0}">{1}</div>\ <div id="preview_' + selector + '" class="preview {0}">\
<div style="clear: both"></div>'; {1}\
<input type="hidden" name="has_attachment" id="hasAttachment_' + selector + '" value="{2}" />\
<input type="hidden" name="attachment_url" id="attachmentUrl_' + selector + '" value="{3}" />\
<input type="hidden" name="attachment_type" id="attachmentType_' + selector + '" value="{4}" />\
</div>';
var attachmentTpl = '\ var attachmentTpl = '\
<hr class="previewseparator">\ <hr class="previewseparator">\
<div id="closePreview_' + selector + '" title="Remove" class="closePreview" >\ <div id="closePreview_' + selector + '" title="Remove" class="closePreview" >\
@ -32,6 +37,9 @@
<div id="previewImage_' + selector + '" class="previewImage">\ <div id="previewImage_' + selector + '" class="previewImage">\
</div>\ </div>\
<input type="hidden" id="photoNumber_' + selector + '" class="photoNumber" value="0" />\ <input type="hidden" id="photoNumber_' + selector + '" class="photoNumber" value="0" />\
<input type="hidden" name="attachment_img_src" id="attachmentImageSrc_' + selector + '" value="" />\
<input type="hidden" name="attachment_img_width" id="attachmentImageWidth_' + selector + '" value="0" />\
<input type="hidden" name="attachment_img_height" id="attachmentImageHeight_' + selector + '" value="0" />\
</div>\ </div>\
<div id="previewContent_' + selector + '" class="previewContent">\ <div id="previewContent_' + selector + '" class="previewContent">\
<h4 id="previewTitle_' + selector + '" class="previewTitle"></h4>\ <h4 id="previewTitle_' + selector + '" class="previewTitle"></h4>\
@ -73,8 +81,7 @@
}); });
}; };
var resetPreview = function() { var resetPreview = function() {
$('#previewChangeImg_' + selector).removeClass('buttonChangeActive'); $('#hasAttachment_' + selector).val(0);
$('#previewChangeImg_' + selector).addClass('buttonChangeDeactive');
photoNumber = 0; photoNumber = 0;
images = ""; images = "";
} }
@ -90,6 +97,12 @@
isExtern = true; isExtern = true;
} }
// Don't procces the textarea input if we have already
// an attachment preview.
if (!isExtern && isActive) {
return;
}
if (trim(text) !== "") { if (trim(text) !== "") {
if (block === false && urlRegex.test(text)) { if (block === false && urlRegex.test(text)) {
binurl = bin2hex(text); binurl = bin2hex(text);
@ -186,10 +199,12 @@
// Note: if we finish the Preview of other media content type, // Note: if we finish the Preview of other media content type,
// we can move this condition to the beggining of crawlText(); // we can move this condition to the beggining of crawlText();
if (isActive) { if (isActive) {
$('#profile-rotator').hide();
return; return;
} }
if (json.type != 'link' && json.type != 'video' && json.type != 'photo' || json.url == json.title) { if (json.type != 'link' && json.type != 'video' && json.type != 'photo' || json.url == json.title) {
$('#profile-rotator').hide();
return; return;
} }
@ -203,7 +218,13 @@
// Load and add the template if it isn't allready loaded. // Load and add the template if it isn't allready loaded.
if ($('#preview_' + selector).length == 0) { if ($('#preview_' + selector).length == 0) {
var tpl = previewTpl.format(typeClass, attachmentTpl); var tpl = previewTpl.format(
typeClass,
attachmentTpl,
1,
bin2hex(json.url),
json.type
);
$('#' + selector).after(tpl); $('#' + selector).after(tpl);
} }
@ -215,13 +236,12 @@
$('#previewTitle_' + selector).html("\ $('#previewTitle_' + selector).html("\
<span id='previewSpanTitle_" + selector + "' class='previewSpanTitle' >" + escapeHTML(json.title) + "</span>\ <span id='previewSpanTitle_" + selector + "' class='previewSpanTitle' >" + escapeHTML(json.title) + "</span>\
<input type='text' value='" + escapeHTML(json.title) + "' id='previewInputTitle_" + selector + "' class='previewInputTitle inputPreview' style='display: none;'/>" <input type='text' name='attachment_title' value='" + escapeHTML(json.title) + "' id='previewInputTitle_" + selector + "' class='previewInputTitle inputPreview' style='display: none;'/>"
); );
$('#previewDescription_' + selector).html("\ $('#previewDescription_' + selector).html("\
<span id='previewSpanDescription_" + selector + "' class='previewSpanDescription' >" + escapeHTML(description) + "</span>\n\ <span id='previewSpanDescription_" + selector + "' class='previewSpanDescription' >" + escapeHTML(description) + "</span>\n\
<textarea id='previewInputDescription_" + selector + "' class='previewInputDescription' style='display: none;' class='inputPreview' >" + escapeHTML(json.text) + "</textarea>" <textarea id='previewInputDescription_" + selector + "' name='attachment_text' class='previewInputDescription' style='display: none;' class='inputPreview' >" + escapeHTML(json.text) + "</textarea>"
); );
if (json.url) { if (json.url) {
@ -235,6 +255,9 @@
if (Array.isArray(images)) { if (Array.isArray(images)) {
$('#previewImages_' + selector).show(); $('#previewImages_' + selector).show();
$('#attachmentImageSrc_' + selector).val(bin2hex(images[photoNumber].src));
$('#attachmentImageWidth_' + selector).val(images[photoNumber].width);
$('#attachmentImageHeight_' + selector).val(images[photoNumber].height);
} else { } else {
$('#previewImages_' + selector).hide(); $('#previewImages_' + selector).hide();
} }
@ -259,7 +282,7 @@
$('#previewImage_' + selector).html(appendImage + "<div id='whiteImage' style='color: transparent; display:none;'>...</div>"); $('#previewImage_' + selector).html(appendImage + "<div id='whiteImage' style='color: transparent; display:none;'>...</div>");
// more than just one image. // More than just one image.
if (images.length > 1) { if (images.length > 1) {
// Enable the the button to change the preview pictures. // Enable the the button to change the preview pictures.
$('#previewChangeImg_' + selector).show(); $('#previewChangeImg_' + selector).show();
@ -270,7 +293,6 @@
$('#previewChangeImg_' + selector).unbind('click').click(function (e) { $('#previewChangeImg_' + selector).unbind('click').click(function (e) {
e.stopPropagation(); e.stopPropagation();
if (images.length > 1) { if (images.length > 1) {
// photoNumber = parseInt($('#photoNumber_' + selector).val());
$('#imagePreview_' + selector + '_' + photoNumber).css({ $('#imagePreview_' + selector + '_' + photoNumber).css({
'display': 'none' 'display': 'none'
}); });
@ -285,6 +307,9 @@
'display': 'block' 'display': 'block'
}); });
$('#photoNumber_' + selector).val(photoNumber); $('#photoNumber_' + selector).val(photoNumber);
$('#attachmentImageSrc_' + selector).val(bin2hex(images[photoNumber].src));
$('#attachmentImageWidth_' + selector).val(images[photoNumber].width);
$('#attachmentImageHeight_' + selector).val(images[photoNumber].height);
} }
}); });
} }