harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply max_import_size to Diaspora posts

Browse Source
This commit is contained in:
friendica 2015-02-09 19:54:48 -08:00
parent fce51876c9
commit 55c3c54ef6
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/diaspora.php
View File

@ -827,6 +827,12 @@ function diaspora_post($importer,$xml,$msg) {
$body = scale_external_images($body); $body = scale_external_images($body);
} }
$maxlen = get_max_import_size();
if($maxlen && mb_strlen($body) > $maxlen) {
$body = mb_substr($body,0,$maxlen,'UTF-8');
logger('message length exceeds max_import_size: truncated');
}
//WTF? FIXME //WTF? FIXME
// Add OEmbed and other information to the body // Add OEmbed and other information to the body
@ -1040,6 +1046,14 @@ function diaspora_reshare($importer,$xml,$msg) {
//return; //return;
} }
$maxlen = get_max_import_size();
if($maxlen && mb_strlen($body) > $maxlen) {
$body = mb_substr($body,0,$maxlen,'UTF-8');
logger('message length exceeds max_import_size: truncated');
}
//if(! $body) { //if(! $body) {
// logger('diaspora_reshare: empty body: source= ' . $x); // logger('diaspora_reshare: empty body: source= ' . $x);
// return; // return;
@ -1354,6 +1368,15 @@ function diaspora_comment($importer,$xml,$msg) {
$body = diaspora2bb($text); $body = diaspora2bb($text);
$maxlen = get_max_import_size();
if($maxlen && mb_strlen($body) > $maxlen) {
$body = mb_substr($body,0,$maxlen,'UTF-8');
logger('message length exceeds max_import_size: truncated');
}
$datarray = array(); $datarray = array();
$tags = get_tags($body); $tags = get_tags($body);
@ -1540,6 +1563,15 @@ function diaspora_conversation($importer,$xml,$msg) {
$body = diaspora2bb($msg_text); $body = diaspora2bb($msg_text);
$maxlen = get_max_import_size();
if($maxlen && mb_strlen($body) > $maxlen) {
$body = mb_substr($body,0,$maxlen,'UTF-8');
logger('message length exceeds max_import_size: truncated');
}
$author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid; $author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid;
$author_signature = base64_decode($msg_author_signature); $author_signature = base64_decode($msg_author_signature);
@ -1677,6 +1709,17 @@ function diaspora_message($importer,$xml,$msg) {
$subject = $conversation['subject']; $subject = $conversation['subject'];
$body = diaspora2bb($msg_text); $body = diaspora2bb($msg_text);
$maxlen = get_max_import_size();
if($maxlen && mb_strlen($body) > $maxlen) {
$body = mb_substr($body,0,$maxlen,'UTF-8');
logger('message length exceeds max_import_size: truncated');
}
$message_id = $msg_diaspora_handle . ':' . $msg_guid; $message_id = $msg_diaspora_handle . ':' . $msg_guid;
$author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($xml->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid; $author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($xml->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid;