* All of these become an "item" which is our basic unit of
* information.
*/
+
use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
-use Friendica\Model\GContact;
+use Friendica\Model\Conversation;
use Friendica\Model\Item;
-use Friendica\Network\Probe;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
+use Friendica\Util\DateTimeFormat;
use Friendica\Util\Emailer;
require_once 'include/enotify.php';
-require_once 'include/tags.php';
-require_once 'include/threads.php';
require_once 'include/text.php';
require_once 'include/items.php';
function item_post(App $a) {
if (!local_user() && !remote_user()) {
- return;
+ return 0;
}
require_once 'include/security.php';
$uid = local_user();
- if (x($_REQUEST, 'dropitems')) {
+ if (!empty($_REQUEST['dropitems'])) {
$arr_drop = explode(',', $_REQUEST['dropitems']);
drop_items($arr_drop);
$json = ['success' => 1];
killme();
}
- call_hooks('post_local_start', $_REQUEST);
- // logger('postinput ' . file_get_contents('php://input'));
- logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+ Addon::callHooks('post_local_start', $_REQUEST);
- $api_source = x($_REQUEST, 'api_source') && $_REQUEST['api_source'];
+ logger('postvars ' . print_r($_REQUEST, true), LOGGER_DATA);
- $message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
+ $api_source = defaults($_REQUEST, 'api_source', false);
- $return_path = (x($_REQUEST, 'return') ? $_REQUEST['return'] : '');
- $preview = (x($_REQUEST, 'preview') ? intval($_REQUEST['preview']) : 0);
+ $message_id = ((!empty($_REQUEST['message_id']) && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
+
+ $return_path = defaults($_REQUEST, 'return', '');
+ $preview = intval(defaults($_REQUEST, 'preview', 0));
/*
* Check for doubly-submitted posts, and reject duplicates
* Note that we have to ignore previews, otherwise nothing will post
* after it's been previewed
*/
- if (!$preview && x($_REQUEST, 'post_id_random')) {
- if (x($_SESSION, 'post-random') && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+ if (!$preview && !empty($_REQUEST['post_id_random'])) {
+ if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
logger("item post: duplicate post", LOGGER_DEBUG);
item_post_return(System::baseUrl(), $api_source, $return_path);
} else {
}
// Is this a reply to something?
- $parent = (x($_REQUEST, 'parent') ? intval($_REQUEST['parent']) : 0);
- $parent_uri = (x($_REQUEST, 'parent_uri') ? trim($_REQUEST['parent_uri']) : '');
+ $thr_parent = intval(defaults($_REQUEST, 'parent', 0));
+ $thr_parent_uri = trim(defaults($_REQUEST, 'parent_uri', ''));
+
+ $thr_parent_contact = null;
+ $parent = 0;
$parent_item = null;
- $parent_contact = null;
- $parid = 0;
- $r = false;
- $objecttype = null;
$parent_user = null;
- if ($parent || $parent_uri) {
-
- $objecttype = ACTIVITY_OBJ_COMMENT;
+ $parent_contact = null;
- if (!x($_REQUEST, 'type')) {
- $_REQUEST['type'] = 'net-comment';
+ $objecttype = null;
+ $profile_uid = defaults($_REQUEST, 'profile_uid', local_user());
+ $posttype = defaults($_REQUEST, 'post_type', Item::PT_ARTICLE);
+
+ if ($thr_parent || $thr_parent_uri) {
+ if ($thr_parent) {
+ $parent_item = Item::selectFirst([], ['id' => $thr_parent]);
+ } elseif ($thr_parent_uri) {
+ $parent_item = Item::selectFirst([], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
}
- if ($parent) {
- $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
- intval($parent)
- );
- } elseif ($parent_uri && local_user()) {
- // This is coming from an API source, and we are logged in
- $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($parent_uri),
- intval(local_user())
- );
-
- // if this isn't the real parent of the conversation, find it
- if (DBM::is_result($r)) {
- $parid = $r[0]['parent'];
- if ($r[0]['id'] != $r[0]['parent']) {
- $r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
- intval($parid)
- );
- }
+ // if this isn't the real parent of the conversation, find it
+ if (DBA::isResult($parent_item)) {
+ // The URI and the contact is taken from the direct parent which needn't to be the top parent
+ $thr_parent_uri = $parent_item['uri'];
+ $thr_parent_contact = Contact::getDetailsByURL($parent_item["author-link"]);
+
+ if ($parent_item['id'] != $parent_item['parent']) {
+ $parent_item = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $parent_item['parent']]);
}
}
- if (!DBM::is_result($r)) {
- notice(t('Unable to locate original post.') . EOL);
- if (x($_REQUEST, 'return')) {
+ if (!DBA::isResult($parent_item)) {
+ notice(L10n::t('Unable to locate original post.') . EOL);
+ if (!empty($_REQUEST['return'])) {
goaway($return_path);
}
killme();
}
- $parent_item = $r[0];
+
$parent = $parent_item['id'];
- $parent_uri = $parent_item['uri'];
$parent_user = $parent_item['uid'];
- if ($parent_item['contact-id']) {
- $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
- intval($parent_item['contact-id'])
- );
- if (DBM::is_result($r)) {
- $parent_contact = $r[0];
- }
+ $parent_contact = Contact::getDetailsByURL($parent_item["author-link"]);
- // If the contact id doesn't fit with the contact, then set the contact to null
- $thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($parent_uri));
- if (DBM::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS)
- && (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
- $parent_contact = Contact::getDetailsByURL($thrparent[0]["author-link"]);
-
- if (!isset($parent_contact["nick"])) {
- $probed_contact = Probe::uri($thrparent[0]["author-link"]);
- if ($probed_contact["network"] != NETWORK_FEED) {
- $parent_contact = $probed_contact;
- $parent_contact["nurl"] = normalise_link($probed_contact["url"]);
- $parent_contact["thumb"] = $probed_contact["photo"];
- $parent_contact["micro"] = $probed_contact["photo"];
- $parent_contact["addr"] = $probed_contact["addr"];
- }
- }
- logger('no contact found: ' . print_r($thrparent, true), LOGGER_DEBUG);
- } else {
- logger('parent contact: ' . print_r($parent_contact, true), LOGGER_DEBUG);
- }
-
- if ($parent_contact["nick"] == "") {
- $parent_contact["nick"] = $parent_contact["name"];
- }
- }
+ $objecttype = ACTIVITY_OBJ_COMMENT;
}
if ($parent) {
logger('mod_item: item_post parent=' . $parent);
}
- $profile_uid = (x($_REQUEST, 'profile_uid') ? intval($_REQUEST['profile_uid']) : 0);
- $post_id = (x($_REQUEST, 'post_id') ? intval($_REQUEST['post_id']) : 0);
- $app = (x($_REQUEST, 'source') ? strip_tags($_REQUEST['source']) : '');
- $extid = (x($_REQUEST, 'extid') ? strip_tags($_REQUEST['extid']) : '');
- $object = (x($_REQUEST, 'object') ? $_REQUEST['object'] : '');
+ $post_id = intval(defaults($_REQUEST, 'post_id', 0));
+ $app = strip_tags(defaults($_REQUEST, 'source', ''));
+ $extid = strip_tags(defaults($_REQUEST, 'extid', ''));
+ $object = defaults($_REQUEST, 'object', '');
+
+ // Don't use "defaults" here. It would turn 0 to 1
+ if (!isset($_REQUEST['wall'])) {
+ $wall = 1;
+ } else {
+ $wall = $_REQUEST['wall'];
+ }
// Ensure that the user id in a thread always stay the same
- if (!is_null($parent_user)) {
+ if (!is_null($parent_user) && in_array($parent_user, [local_user(), 0])) {
$profile_uid = $parent_user;
}
// Check for multiple posts with the same message id (when the post was created via API)
if (($message_id != '') && ($profile_uid != 0)) {
- $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($message_id),
- intval($profile_uid)
- );
-
- if (DBM::is_result($r)) {
+ if (Item::exists(['uri' => $message_id, 'uid' => $profile_uid])) {
logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
- return;
+ return 0;
}
}
// Allow commenting if it is an answer to a public post
- $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+ $allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
// Now check that valid personal details have been provided
if (!can_write_wall($profile_uid) && !$allow_comment) {
- notice(t('Permission denied.') . EOL) ;
- if (x($_REQUEST, 'return')) {
+ notice(L10n::t('Permission denied.') . EOL) ;
+
+ if (!empty($_REQUEST['return'])) {
goaway($return_path);
}
+
killme();
}
-
- // is this an edited post?
-
+ // Init post instance
$orig_post = null;
- if ($post_id) {
- $i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
- intval($profile_uid),
- intval($post_id)
- );
- if (!DBM::is_result($i)) {
- killme();
- }
- $orig_post = $i[0];
+ // is this an edited post?
+ if ($post_id > 0) {
+ $orig_post = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
}
- $user = null;
+ $user = DBA::selectFirst('user', [], ['uid' => $profile_uid]);
- $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($profile_uid)
- );
- if (DBM::is_result($r)) {
- $user = $r[0];
+ if (!DBA::isResult($user) && !$parent) {
+ return 0;
}
- if ($orig_post) {
+ $categories = '';
+ $postopts = '';
+ $emailcc = '';
+
+ if (!empty($orig_post)) {
$str_group_allow = $orig_post['allow_gid'];
$str_contact_allow = $orig_post['allow_cid'];
$str_group_deny = $orig_post['deny_gid'];
$coord = $orig_post['coord'];
$verb = $orig_post['verb'];
$objecttype = $orig_post['object-type'];
- $emailcc = $orig_post['emailcc'];
$app = $orig_post['app'];
$categories = $orig_post['file'];
$title = notags(trim($_REQUEST['title']));
$body = escape_tags(trim($_REQUEST['body']));
$private = $orig_post['private'];
- $pubmail_enable = $orig_post['pubmail'];
+ $pubmail_enabled = $orig_post['pubmail'];
$network = $orig_post['network'];
$guid = $orig_post['guid'];
$extid = $orig_post['extid'];
* use the user default permissions - as they won't have
* been supplied via a form.
*/
- /// @TODO use x($_REQUEST, 'foo') here
if ($api_source
&& !array_key_exists('contact_allow', $_REQUEST)
&& !array_key_exists('group_allow', $_REQUEST)
$str_group_deny = $user['deny_gid'];
$str_contact_deny = $user['deny_cid'];
} else {
-
// use the posted permissions
-
- $str_group_allow = perms2str($_REQUEST['group_allow']);
- $str_contact_allow = perms2str($_REQUEST['contact_allow']);
- $str_group_deny = perms2str($_REQUEST['group_deny']);
- $str_contact_deny = perms2str($_REQUEST['contact_deny']);
+ $str_group_allow = perms2str(defaults($_REQUEST, 'group_allow', ''));
+ $str_contact_allow = perms2str(defaults($_REQUEST, 'contact_allow', ''));
+ $str_group_deny = perms2str(defaults($_REQUEST, 'group_deny', ''));
+ $str_contact_deny = perms2str(defaults($_REQUEST, 'contact_deny', ''));
}
- $title = notags(trim($_REQUEST['title']));
- $location = notags(trim($_REQUEST['location']));
- $coord = notags(trim($_REQUEST['coord']));
- $verb = notags(trim($_REQUEST['verb']));
- $emailcc = notags(trim($_REQUEST['emailcc']));
- $body = escape_tags(trim($_REQUEST['body']));
- $network = notags(trim($_REQUEST['network']));
- $guid = get_guid(32);
+ $title = notags(trim(defaults($_REQUEST, 'title' , '')));
+ $location = notags(trim(defaults($_REQUEST, 'location', '')));
+ $coord = notags(trim(defaults($_REQUEST, 'coord' , '')));
+ $verb = notags(trim(defaults($_REQUEST, 'verb' , '')));
+ $emailcc = notags(trim(defaults($_REQUEST, 'emailcc' , '')));
+ $body = escape_tags(trim(defaults($_REQUEST, 'body' , '')));
+ $network = notags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
+ $guid = System::createGUID(32);
- item_add_language_opt($_REQUEST);
- $postopts = $_REQUEST['postopts'] ? $_REQUEST['postopts'] : "";
+ $postopts = defaults($_REQUEST, 'postopts', '');
$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
// If this is a comment, set the permissions from the parent.
if ($parent_item) {
-
// for non native networks use the network of the original post as network of the item
- if (($parent_item['network'] != NETWORK_DIASPORA)
- && ($parent_item['network'] != NETWORK_OSTATUS)
+ if (($parent_item['network'] != Protocol::DIASPORA)
+ && ($parent_item['network'] != Protocol::OSTATUS)
&& ($network == "")) {
$network = $parent_item['network'];
}
$str_contact_deny = $parent_item['deny_cid'];
$str_group_deny = $parent_item['deny_gid'];
$private = $parent_item['private'];
+
+ $wall = $parent_item['wall'];
}
- $pubmail_enable = ((x($_REQUEST, 'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && !$private) ? 1 : 0);
+ $pubmail_enabled = defaults($_REQUEST, 'pubmail_enable', false) && !$private;
// if using the API, we won't see pubmail_enable - figure out if it should be set
-
if ($api_source && $profile_uid && $profile_uid == local_user() && !$private) {
- $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
- if (!$mail_disabled) {
- /// @TODO Check if only pubmail is loaded, * loads all columns
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
- intval(local_user())
- );
- if (DBM::is_result($r) && intval($r[0]['pubmail'])) {
- $pubmail_enabled = true;
- }
+ if (function_exists('imap_open') && !Config::get('system', 'imap_disabled')) {
+ $pubmail_enabled = DBA::exists('mailacct', ["`uid` = ? AND `server` != ? AND `pubmail`", local_user(), '']);
}
}
if ($preview) {
killme();
}
- info(t('Empty post discarded.') . EOL);
- if (x($_REQUEST, 'return')) {
+ info(L10n::t('Empty post discarded.') . EOL);
+ if (!empty($_REQUEST['return'])) {
goaway($return_path);
}
killme();
}
}
- if (strlen($categories)) {
+ if (!empty($categories)) {
// get the "fileas" tags for this post
$filedas = file_tag_file_to_list($categories, 'file');
}
// save old and new categories, so we can determine what needs to be deleted from pconfig
$categories_old = $categories;
- $categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
+ $categories = file_tag_list_to_file(trim(defaults($_REQUEST, 'category', '')), 'category');
$categories_new = $categories;
- if (strlen($filedas)) {
+ if (!empty($filedas)) {
// append the fileas stuff to the new categories list
$categories .= file_tag_list_to_file($filedas, 'file');
}
if (local_user() && ((local_user() == $profile_uid) || $allow_comment)) {
$self = true;
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
- intval($_SESSION['uid']));
+ $author = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
} elseif (remote_user()) {
- if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
+ if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $v) {
if ($v['uid'] == $profile_uid) {
$contact_id = $v['cid'];
}
}
if ($contact_id) {
- $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
- intval($contact_id)
- );
+ $author = DBA::selectFirst('contact', [], ['id' => $contact_id]);
}
}
- if (DBM::is_result($r)) {
- $author = $r[0];
+ if (DBA::isResult($author)) {
$contact_id = $author['id'];
}
// get contact info for owner
-
if ($profile_uid == local_user() || $allow_comment) {
$contact_record = $author;
} else {
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
- intval($profile_uid)
- );
- if (DBM::is_result($r)) {
- $contact_record = $r[0];
- }
- }
-
- $post_type = notags(trim($_REQUEST['type']));
-
- if ($post_type === 'net-comment' && $parent_item !== null) {
- if ($parent_item['wall'] == 1) {
- $post_type = 'wall-comment';
- } else {
- $post_type = 'remote-comment';
- }
+ $contact_record = DBA::selectFirst('contact', [], ['uid' => $profile_uid, 'self' => true]);
}
// Look for any tags and linkify them
$tags = get_tags($body);
- /*
- * add a statusnet style reply tag if the original post was from there
- * and we are replying, and there isn't one already
- */
- if ($parent && ($parent_contact['network'] == NETWORK_OSTATUS)) {
- $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
-
- if (!in_array($contact, $tags)) {
- $body = $contact . ' ' . $body;
- $tags[] = $contact;
- }
-
- $toplevel_contact = "";
- $toplevel_parent = q("SELECT `contact`.* FROM `contact`
- INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `contact`.`url` = `item`.`author-link`
- WHERE `item`.`id` = `item`.`parent` AND `item`.`parent` = %d", intval($parent));
- if (DBM::is_result($toplevel_parent)) {
- if (!empty($toplevel_parent[0]['addr'])) {
- $toplevel_contact = '@' . $toplevel_parent[0]['addr'];
- } else {
- $toplevel_contact = '@' . $toplevel_parent[0]['nick'] . '+' . $toplevel_parent[0]['id'];
+ // Add a tag if the parent contact is from OStatus (This will notify them during delivery)
+ if ($parent) {
+ if ($thr_parent_contact['network'] == Protocol::OSTATUS) {
+ $contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
+ if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
+ $tags[] = $contact;
}
- } else {
- $toplevel_parent = q("SELECT `author-link`, `author-name` FROM `item` WHERE `id` = `parent` AND `parent` = %d", intval($parent));
- $toplevel_contact = '@[url=' . $toplevel_parent[0]['author-link'] . ']' . $toplevel_parent[0]['author-name'] . '[/url]';
}
- if (!in_array($toplevel_contact, $tags)) {
- $tags[] = $toplevel_contact;
+ if ($parent_contact['network'] == Protocol::OSTATUS) {
+ $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
+ if (!stripos(implode($tags), '[url=' . $parent_contact['url'] . ']')) {
+ $tags[] = $contact;
+ }
}
}
if (count($tags)) {
foreach ($tags as $tag) {
-
$tag_type = substr($tag, 0, 1);
if ($tag_type == '#') {
$tagged[] = $tag;
}
// When the forum is private or the forum is addressed with a "!" make the post private
- if (is_array($success['contact']) && ($success['contact']['prv'] || ($tag_type == '!'))) {
+ if (is_array($success['contact']) && (!empty($success['contact']['prv']) || ($tag_type == '!'))) {
$private_forum = $success['contact']['prv'];
$only_to_forum = ($tag_type == '!');
$private_id = $success['contact']['id'];
$forum_contact = $success['contact'];
- } elseif (is_array($success['contact']) && $success['contact']['forum'] &&
+ } elseif (is_array($success['contact']) && !empty($success['contact']['forum']) &&
($str_contact_allow == '<' . $success['contact']['id'] . '>')) {
$private_forum = false;
$only_to_forum = true;
$contact_id = $private_id;
$contact_record = $forum_contact;
$_REQUEST['origin'] = false;
+ $wall = 0;
}
/*
$match = null;
+ /// @todo these lines should be moved to Model/Photo
if (!$preview && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) {
$images = $match[2];
if (count($images)) {
if (!strlen($image_uri)) {
continue;
}
- $srch = '<' . intval($original_contact_id) . '>';
- $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
- AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($srch),
- dbesc($image_uri),
- intval($profile_uid)
- );
+ // Ensure to only modify photos that you own
+ $srch = '<' . intval($original_contact_id) . '>';
- if (!DBM::is_result($r)) {
+ $condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
+ 'resource-id' => $image_uri, 'uid' => $profile_uid];
+ if (!DBA::exists('photo', $condition)) {
continue;
}
- $r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
- WHERE `resource-id` = '%s' AND `uid` = %d AND `album` = '%s' ",
- dbesc($str_contact_allow),
- dbesc($str_group_allow),
- dbesc($str_contact_deny),
- dbesc($str_group_deny),
- dbesc($image_uri),
- intval($profile_uid),
- dbesc(t('Wall Photos'))
- );
+ $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
+ 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
+ $condition = ['resource-id' => $image_uri, 'uid' => $profile_uid, 'album' => L10n::t('Wall Photos')];
+ DBA::update('photo', $fields, $condition);
}
}
}
*/
$match = false;
+ /// @todo these lines should be moved to Model/Attach (Once it exists)
if (!$preview && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/", $body, $match)) {
$attaches = $match[1];
if (count($attaches)) {
foreach ($attaches as $attach) {
- $r = q("SELECT * FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
- intval($profile_uid),
- intval($attach)
- );
- if (DBM::is_result($r)) {
- $r = q("UPDATE `attach` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
- WHERE `uid` = %d AND `id` = %d",
- dbesc($str_contact_allow),
- dbesc($str_group_allow),
- dbesc($str_contact_deny),
- dbesc($str_group_deny),
- intval($profile_uid),
- intval($attach)
- );
+ // Ensure to only modify attachments that you own
+ $srch = '<' . intval($original_contact_id) . '>';
+
+ $condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
+ 'id' => $attach];
+ if (!DBA::exists('attach', $condition)) {
+ continue;
}
+
+ $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
+ 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
+ $condition = ['id' => $attach];
+ DBA::update('attach', $fields, $condition);
}
}
}
// embedded bookmark or attachment in post? set bookmark flag
- $bookmark = 0;
- $data = get_attachment_data($body);
- if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"])) {
+ $data = BBCode::getAttachmentData($body);
+ if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"]))
+ && ($posttype != Item::PT_PERSONAL_NOTE)) {
+ $posttype = Item::PT_PAGE;
$objecttype = ACTIVITY_OBJ_BOOKMARK;
- $bookmark = 1;
}
$body = bb_translate_video($body);
// Fold multi-line [code] sequences
$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
- $body = scale_external_images($body, false);
+ $body = BBCode::scaleExternalImages($body, false);
// Setting the object type if not defined before
if (!$objecttype) {
$objecttype = ACTIVITY_OBJ_NOTE; // Default value
- require_once 'include/plaintext.php';
- $objectdata = get_attached_data($body);
+ $objectdata = BBCode::getAttachedData($body);
if ($objectdata["type"] == "link") {
$objecttype = ACTIVITY_OBJ_BOOKMARK;
if (preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) {
foreach ($match[2] as $mtch) {
- $r = q("SELECT `id`,`filename`,`filesize`,`filetype` FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
- intval($profile_uid),
- intval($mtch)
- );
- if (DBM::is_result($r)) {
+ $fields = ['id', 'filename', 'filesize', 'filetype'];
+ $attachment = DBA::selectFirst('attach', $fields, ['id' => $mtch]);
+ if (DBA::isResult($attachment)) {
if (strlen($attachments)) {
$attachments .= ',';
}
- $attachments .= '[attach]href="' . System::baseUrl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
+ $attachments .= '[attach]href="' . System::baseUrl() . '/attach/' . $attachment['id'] .
+ '" length="' . $attachment['filesize'] . '" type="' . $attachment['filetype'] .
+ '" title="' . ($attachment['filename'] ? $attachment['filename'] : '') . '"[/attach]';
}
$body = str_replace($match[1],'',$body);
}
}
- $wall = 0;
-
- if (($post_type === 'wall' || $post_type === 'wall-comment') && !count($forum_contact)) {
- $wall = 1;
- }
-
if (!strlen($verb)) {
$verb = ACTIVITY_POST;
}
if ($network == "") {
- $network = NETWORK_DFRN;
+ $network = Protocol::DFRN;
}
- $gravity = ($parent ? 6 : 0);
+ $gravity = ($parent ? GRAVITY_COMMENT : GRAVITY_PARENT);
// even if the post arrived via API we are considering that it
// originated on this site by default for determining relayability.
- $origin = (x($_REQUEST, 'origin') ? intval($_REQUEST['origin']) : 1);
+ // Don't use "defaults" here. It would turn 0 to 1
+ if (!isset($_REQUEST['origin'])) {
+ $origin = 1;
+ } else {
+ $origin = $_REQUEST['origin'];
+ }
$notify_type = ($parent ? 'comment-new' : 'wall-new');
- $uri = ($message_id ? $message_id : item_new_uri($a->get_hostname(), $profile_uid, $guid));
+ $uri = ($message_id ? $message_id : Item::newURI($api_source ? $profile_uid : $uid, $guid));
// Fallback so that we alway have a parent uri
- if (!$parent_uri || !$parent) {
- $parent_uri = $uri;
+ if (!$thr_parent_uri || !$parent) {
+ $thr_parent_uri = $uri;
}
$datarray = [];
$datarray['uid'] = $profile_uid;
- $datarray['type'] = $post_type;
$datarray['wall'] = $wall;
$datarray['gravity'] = $gravity;
$datarray['network'] = $network;
$datarray['owner-name'] = $contact_record['name'];
$datarray['owner-link'] = $contact_record['url'];
$datarray['owner-avatar'] = $contact_record['thumb'];
- $datarray['owner-id'] = Contact::getIdForURL($datarray['owner-link'], 0);
+ $datarray['owner-id'] = Contact::getIdForURL($datarray['owner-link']);
$datarray['author-name'] = $author['name'];
$datarray['author-link'] = $author['url'];
$datarray['author-avatar'] = $author['thumb'];
- $datarray['author-id'] = Contact::getIdForURL($datarray['author-link'], 0);
- $datarray['created'] = datetime_convert();
- $datarray['edited'] = datetime_convert();
- $datarray['commented'] = datetime_convert();
- $datarray['received'] = datetime_convert();
- $datarray['changed'] = datetime_convert();
+ $datarray['author-id'] = Contact::getIdForURL($datarray['author-link']);
+ $datarray['created'] = DateTimeFormat::utcNow();
+ $datarray['edited'] = DateTimeFormat::utcNow();
+ $datarray['commented'] = DateTimeFormat::utcNow();
+ $datarray['received'] = DateTimeFormat::utcNow();
+ $datarray['changed'] = DateTimeFormat::utcNow();
$datarray['extid'] = $extid;
$datarray['guid'] = $guid;
$datarray['uri'] = $uri;
$datarray['file'] = $categories;
$datarray['inform'] = $inform;
$datarray['verb'] = $verb;
+ $datarray['post-type'] = $posttype;
$datarray['object-type'] = $objecttype;
$datarray['allow_cid'] = $str_contact_allow;
$datarray['allow_gid'] = $str_group_allow;
$datarray['deny_cid'] = $str_contact_deny;
$datarray['deny_gid'] = $str_group_deny;
$datarray['private'] = $private;
- $datarray['pubmail'] = $pubmail_enable;
+ $datarray['pubmail'] = $pubmail_enabled;
$datarray['attach'] = $attachments;
- $datarray['bookmark'] = intval($bookmark);
- $datarray['parent-uri'] = $parent_uri;
+
+ // This is not a bug. The item store function changes 'parent-uri' to 'thr-parent' and fetches 'parent-uri' new. (We should change this)
+ $datarray['parent-uri'] = $thr_parent_uri;
+
$datarray['postopts'] = $postopts;
$datarray['origin'] = $origin;
$datarray['moderated'] = false;
- $datarray['gcontact-id'] = GContact::getId(["url" => $datarray['author-link'], "network" => $datarray['network'],
- "photo" => $datarray['author-avatar'], "name" => $datarray['author-name']]);
$datarray['object'] = $object;
/*
- * These fields are for the convenience of plugins...
+ * These fields are for the convenience of addons...
* 'self' if true indicates the owner is posting on their own wall
* If parent is 0 it is a top-level post.
*/
$datarray['api_source'] = $api_source;
// This field is for storing the raw conversation data
- $datarray['protocol'] = PROTOCOL_DFRN;
+ $datarray['protocol'] = Conversation::PARCEL_DFRN;
- $r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $datarray['parent-uri']);
- if (DBM::is_result($r)) {
- if ($r['conversation-uri'] != '') {
- $datarray['conversation-uri'] = $r['conversation-uri'];
+ $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $datarray['parent-uri']]);
+ if (DBA::isResult($conversation)) {
+ if ($conversation['conversation-uri'] != '') {
+ $datarray['conversation-uri'] = $conversation['conversation-uri'];
}
- if ($r['conversation-href'] != '') {
- $datarray['conversation-href'] = $r['conversation-href'];
+ if ($conversation['conversation-href'] != '') {
+ $datarray['conversation-href'] = $conversation['conversation-href'];
}
}
if ($orig_post) {
$datarray['edit'] = true;
+ } else {
+ $datarray['edit'] = false;
}
- // Search for hashtags
- item_body_set_hashtags($datarray);
+ // Check for hashtags in the body and repair or add hashtag links
+ if ($preview || $orig_post) {
+ Item::setHashtags($datarray);
+ }
// preview mode - prepare the body for display and send it via json
if ($preview) {
// We set the datarray ID to -1 because in preview mode the dataray
// doesn't have an ID.
$datarray["id"] = -1;
+ $datarray["item_id"] = -1;
+ $datarray["author-network"] = Protocol::DFRN;
+
$o = conversation($a,[array_merge($contact_record,$datarray)],'search', false, true);
logger('preview: ' . $o);
echo json_encode(['preview' => $o]);
killme();
}
- call_hooks('post_local',$datarray);
+ Addon::callHooks('post_local',$datarray);
- if (x($datarray, 'cancel')) {
- logger('mod_item: post cancelled by plugin.');
+ if (!empty($datarray['cancel'])) {
+ logger('mod_item: post cancelled by addon.');
if ($return_path) {
goaway($return_path);
}
$json = ['cancel' => 1];
- if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
+ if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) {
$json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload'];
}
'file' => $datarray['file'],
'rendered-html' => $datarray['rendered-html'],
'rendered-hash' => $datarray['rendered-hash'],
- 'edited' => datetime_convert(),
- 'changed' => datetime_convert()];
+ 'edited' => DateTimeFormat::utcNow(),
+ 'changed' => DateTimeFormat::utcNow()];
Item::update($fields, ['id' => $post_id]);
// update filetags in pconfig
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
- if (x($_REQUEST, 'return') && strlen($return_path)) {
+ if (!empty($_REQUEST['return']) && strlen($return_path)) {
logger('return: ' . $return_path);
goaway($return_path);
}
unset($datarray['self']);
unset($datarray['api_source']);
- $post_id = item_store($datarray);
+ $post_id = Item::insert($datarray);
if (!$post_id) {
logger("Item wasn't stored.");
goaway($return_path);
}
- $datarray = dba::selectFirst('item', [], ['id' => $post_id]);
+ $datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
- if (!DBM::is_result($datarray)) {
+ if (!DBA::isResult($datarray)) {
logger("Item with id ".$post_id." couldn't be fetched.");
goaway($return_path);
}
}
}
- call_hooks('post_local_end', $datarray);
+ Addon::callHooks('post_local_end', $datarray);
if (strlen($emailcc) && $profile_uid == local_user()) {
$erecips = explode(',', $emailcc);
if (!strlen($addr)) {
continue;
}
- $disclaimer = '<hr />' . sprintf(t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username'])
+ $disclaimer = '<hr />' . L10n::t('This message was sent to you by %s, a member of the Friendica social network.', $a->user['username'])
. '<br />';
- $disclaimer .= sprintf(t('You may visit them online at %s'), System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL;
- $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
+ $disclaimer .= L10n::t('You may visit them online at %s', System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL;
+ $disclaimer .= L10n::t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
if (!$datarray['title']=='') {
$subject = Email::encodeHeader($datarray['title'], 'UTF-8');
} else {
- $subject = Email::encodeHeader('[Friendica]' . ' ' . sprintf(t('%s posted an update.'), $a->user['username']), 'UTF-8');
+ $subject = Email::encodeHeader('[Friendica]' . ' ' . L10n::t('%s posted an update.', $a->user['username']), 'UTF-8');
}
$link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
$html = prepare_body($datarray);
$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
- include_once 'include/html2plain.php';
$params = [
'fromName' => $a->user['username'],
'fromEmail' => $a->user['email'],
'replyTo' => $a->user['email'],
'messageSubject' => $subject,
'htmlVersion' => $message,
- 'textVersion' => html2plain($html.$disclaimer)
+ 'textVersion' => HTML::toPlaintext($html.$disclaimer)
];
Emailer::send($params);
}
logger('post_complete');
+ if ($api_source) {
+ return $post_id;
+ }
+
item_post_return(System::baseUrl(), $api_source, $return_path);
// NOTREACHED
}
-function item_post_return($baseurl, $api_source, $return_path) {
+function item_post_return($baseurl, $api_source, $return_path)
+{
// figure out how to return, depending on from whence we came
if ($api_source) {
}
$json = ['success' => 1];
- if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
+ if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) {
$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
}
- logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);
+ logger('post_json: ' . print_r($json, true), LOGGER_DEBUG);
echo json_encode($json);
killme();
}
-
-
-function item_content(App $a) {
-
+function item_content(App $a)
+{
if (!local_user() && !remote_user()) {
return;
}
require_once 'include/security.php';
$o = '';
+
if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
if (is_ajax()) {
- $o = Item::delete($a->argv[2]);
+ $o = Item::deleteForUser(['id' => $a->argv[2]], local_user());
} else {
$o = drop_item($a->argv[2]);
}
+
if (is_ajax()) {
// ajax return: [<item id>, 0 (no perm) | <owner id>]
echo json_encode([intval($a->argv[2]), intval($o)]);
killme();
}
}
+
return $o;
}
// Checking for the alias that is used for OStatus
$pattern = "/[@!]\[url\=(.*?)\](.*?)\[\/url\]/ism";
if (preg_match($pattern, $tag, $matches)) {
-
- $r = q("SELECT `alias`, `name` FROM `contact` WHERE `nurl` = '%s' AND `alias` != '' AND `uid` = 0",
- normalise_link($matches[1]));
- if (!DBM::is_result($r)) {
- $r = q("SELECT `alias`, `name` FROM `gcontact` WHERE `nurl` = '%s' AND `alias` != ''",
- normalise_link($matches[1]));
- }
- if (DBM::is_result($r)) {
- $data = $r[0];
- } else {
- $data = Probe::uri($matches[1]);
- }
+ $data = Contact::getDetailsByURL($matches[1]);
if ($data["alias"] != "") {
- $newtag = '@[url=' . $data["alias"] . ']' . $data["name"] . '[/url]';
- if (!stristr($str_tags, $newtag)) {
+ $newtag = '@[url=' . $data["alias"] . ']' . $data["nick"] . '[/url]';
+
+ if (!stripos($str_tags, '[url=' . $data["alias"] . ']')) {
if (strlen($str_tags)) {
$str_tags .= ',';
}
+
$str_tags .= $newtag;
}
}
return $replaced;
}
+
$stat = false;
//get the person's name
$name = substr($tag, 1);
$name = $nameparts[0];
// Try to detect the contact in various ways
- if ((strpos($name, '@')) || (strpos($name, 'http://'))) {
- // Is it in format @user@domain.tld or @http://domain.tld/...?
-
- // First check the contact table for the address
- $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify`, `forum`, `prv` FROM `contact`
- WHERE `addr` = '%s' AND `uid` = %d AND
- (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
- LIMIT 1",
- dbesc($name),
- intval($profile_uid),
- dbesc(NETWORK_OSTATUS)
- );
-
- // Then check in the contact table for the url
- if (!DBM::is_result($r)) {
- $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify`, `forum`, `prv` FROM `contact`
- WHERE `nurl` = '%s' AND `uid` = %d AND
- (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
- LIMIT 1",
- dbesc(normalise_link($name)),
- intval($profile_uid),
- dbesc(NETWORK_OSTATUS)
- );
- }
-
- // Then check in the global contacts for the address
- if (!DBM::is_result($r)) {
- $r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
- WHERE `addr` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
- LIMIT 1",
- dbesc($name),
- dbesc(NETWORK_OSTATUS)
- );
- }
-
- // Then check in the global contacts for the url
- if (!DBM::is_result($r)) {
- $r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
- WHERE `nurl` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
- LIMIT 1",
- dbesc(normalise_link($name)),
- dbesc(NETWORK_OSTATUS)
- );
- }
-
- if (!DBM::is_result($r)) {
- $probed = Probe::uri($name);
- if ($result['network'] != NETWORK_PHANTOM) {
- GContact::update($probed);
- $r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
- dbesc(normalise_link($probed["url"])));
- }
- }
+ if (strpos($name, 'http://')) {
+ // At first we have to ensure that the contact exists
+ Contact::getIdForURL($name);
+
+ // Now we should have something
+ $contact = Contact::getDetailsByURL($name);
+ } elseif (strpos($name, '@')) {
+ // This function automatically probes when no entry was found
+ $contact = Contact::getDetailsByAddr($name);
} else {
- $r = false;
+ $contact = false;
+ $fields = ['id', 'url', 'nick', 'name', 'alias', 'network', 'forum', 'prv'];
+
if (strrpos($name, '+')) {
// Is it in format @nick+number?
$tagcid = intval(substr($name, strrpos($name, '+') + 1));
+ $contact = DBA::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]);
+ }
- $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($tagcid),
- intval($profile_uid)
- );
+ // select someone by nick or attag in the current network
+ if (!DBA::isResult($contact) && ($network != "")) {
+ $condition = ["(`nick` = ? OR `attag` = ?) AND `network` = ? AND `uid` = ?",
+ $name, $name, $network, $profile_uid];
+ $contact = DBA::selectFirst('contact', $fields, $condition);
}
- // select someone by attag or nick and the name passed in the current network
- if (!DBM::is_result($r) && ($network != ""))
- $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `network` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
- dbesc($name),
- dbesc($name),
- dbesc($network),
- intval($profile_uid)
- );
-
- //select someone from this user's contacts by name in the current network
- if (!DBM::is_result($r) && ($network != "")) {
- $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($name),
- dbesc($network),
- intval($profile_uid)
- );
+ //select someone by name in the current network
+ if (!DBA::isResult($contact) && ($network != "")) {
+ $condition = ['name' => $name, 'network' => $network, 'uid' => $profile_uid];
+ $contact = DBA::selectFirst('contact', $fields, $condition);
}
- // select someone by attag or nick and the name passed in
- if (!DBM::is_result($r)) {
- $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
- dbesc($name),
- dbesc($name),
- intval($profile_uid)
- );
+ // select someone by nick or attag in any network
+ if (!DBA::isResult($contact)) {
+ $condition = ["(`nick` = ? OR `attag` = ?) AND `uid` = ?", $name, $name, $profile_uid];
+ $contact = DBA::selectFirst('contact', $fields, $condition);
}
- // select someone from this user's contacts by name
- if (!DBM::is_result($r)) {
- $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($name),
- intval($profile_uid)
- );
+ // select someone by name in any network
+ if (!DBA::isResult($contact)) {
+ $condition = ['name' => $name, 'uid' => $profile_uid];
+ $contact = DBA::selectFirst('contact', $fields, $condition);
}
}
- if (DBM::is_result($r)) {
- if (strlen($inform) && (isset($r[0]["notify"]) || isset($r[0]["id"]))) {
+ // Check if $contact has been successfully loaded
+ if (DBA::isResult($contact)) {
+ if (strlen($inform) && (isset($contact["notify"]) || isset($contact["id"]))) {
$inform .= ',';
}
- if (isset($r[0]["id"])) {
- $inform .= 'cid:' . $r[0]["id"];
- } elseif (isset($r[0]["notify"])) {
- $inform .= $r[0]["notify"];
+ if (isset($contact["id"])) {
+ $inform .= 'cid:' . $contact["id"];
+ } elseif (isset($contact["notify"])) {
+ $inform .= $contact["notify"];
}
- $profile = $r[0]["url"];
- $alias = $r[0]["alias"];
- $newname = $r[0]["nick"];
- if (($newname == "") || (($r[0]["network"] != NETWORK_OSTATUS) && ($r[0]["network"] != NETWORK_TWITTER)
- && ($r[0]["network"] != NETWORK_STATUSNET) && ($r[0]["network"] != NETWORK_APPNET))) {
- $newname = $r[0]["name"];
+ $profile = $contact["url"];
+ $alias = $contact["alias"];
+ $newname = $contact["nick"];
+
+ if (($newname == "") || (($contact["network"] != Protocol::OSTATUS) && ($contact["network"] != Protocol::TWITTER)
+ && ($contact["network"] != Protocol::STATUSNET))) {
+ $newname = $contact["name"];
}
}
*/
if (strlen($alias)) {
$newtag = '@[url=' . $alias . ']' . $newname . '[/url]';
- if (!stristr($str_tags, $newtag)) {
+ if (!stripos($str_tags, '[url=' . $alias . ']')) {
if (strlen($str_tags)) {
$str_tags .= ',';
}
}
}
- return ['replaced' => $replaced, 'contact' => $r[0]];
+ return ['replaced' => $replaced, 'contact' => $contact];
}
projects / friendica.git / blobdiff