<?php
+/**
+ * @file mod/item.php
+ */
/*
* This is the POST destination for most all locally posted
* Posts that originate externally or do not fall into the above
* posting categories go through item_store() instead of this function.
*/
-
use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Network\Probe;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\Email;
+use Friendica\Util\Emailer;
-require_once 'include/crypto.php';
require_once 'include/enotify.php';
-require_once 'include/email.php';
require_once 'include/tags.php';
require_once 'include/files.php';
require_once 'include/threads.php';
require_once 'include/text.php';
require_once 'include/items.php';
-require_once 'include/probe.php';
-require_once 'include/diaspora.php';
-require_once 'include/Contact.php';
function item_post(App $a) {
- if ((! local_user()) && (! remote_user()) && (! x($_REQUEST, 'commenter'))) {
+ if (!local_user() && !remote_user() && !x($_REQUEST, 'commenter')) {
return;
}
if (!$preview && x($_REQUEST, 'post_id_random')) {
if (x($_SESSION, 'post-random') && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
logger("item post: duplicate post", LOGGER_DEBUG);
- item_post_return(App::get_baseurl(), $api_source, $return_path);
+ item_post_return(System::baseUrl(), $api_source, $return_path);
} else {
$_SESSION['post-random'] = $_REQUEST['post_id_random'];
}
}
// Is this a reply to something?
- $parent = ((x($_REQUEST, 'parent')) ? intval($_REQUEST['parent']) : 0);
- $parent_uri = ((x($_REQUEST, 'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
+ $parent = (x($_REQUEST, 'parent') ? intval($_REQUEST['parent']) : 0);
+ $parent_uri = (x($_REQUEST, 'parent_uri') ? trim($_REQUEST['parent_uri']) : '');
$parent_item = null;
$parent_contact = null;
}
// if this isn't the real parent of the conversation, find it
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$parid = $r[0]['parent'];
$parent_uri = $r[0]['uri'];
if ($r[0]['id'] != $r[0]['parent']) {
}
}
- if (! dbm::is_result($r)) {
+ if (!DBM::is_result($r)) {
notice( t('Unable to locate original post.') . EOL);
if (x($_REQUEST, 'return')) {
goaway($return_path);
intval($parent_item['contact-id']),
intval($uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$parent_contact = $r[0];
}
// 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($thr_parent));
- if (dbm::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS)
+ if (DBM::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS)
&& (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
- $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
+ $parent_contact = Contact::getDetailsByURL($thrparent[0]["author-link"]);
if (!isset($parent_contact["nick"])) {
- $probed_contact = probe_url($thrparent[0]["author-link"]);
+ $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"]);
intval($profile_uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
return;
}
// First check that the parent exists and it is a wall item.
- if ((x($_REQUEST, 'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
+ if (x($_REQUEST, 'commenter') && (!$parent || !$parent_item['wall'])) {
notice(t('Permission denied.') . EOL) ;
if (x($_REQUEST, 'return')) {
goaway($return_path);
killme();
}
+ // Allow commenting if it is an answer to a public post
+ $allow_comment = ($profile_uid == 0) && $parent && in_array($parent_item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA]);
+
/*
* Now check that it is a page_type of PAGE_BLOG, and that valid personal details
* have been provided, and run any anti-spam plugins
*/
- if ((! can_write_wall($a, $profile_uid)) && (! $allow_moderated)) {
+ if (!(can_write_wall($profile_uid) || $allow_comment) && !$allow_moderated) {
notice(t('Permission denied.') . EOL) ;
if (x($_REQUEST, 'return')) {
goaway($return_path);
intval($profile_uid),
intval($post_id)
);
- if (! dbm::is_result($i)) {
+ if (! DBM::is_result($i)) {
killme();
}
$orig_post = $i[0];
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
intval($profile_uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$user = $r[0];
}
// 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') && (! get_config('system', 'imap_disabled'))) ? 0 : 1);
+ $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'])) {
+ if (DBM::is_result($r) && intval($r[0]['pubmail'])) {
$pubmail_enabled = true;
}
}
$self = false;
$contact_id = 0;
- if ((local_user()) && (local_user() == $profile_uid)) {
+ if (local_user() && ((local_user() == $profile_uid) || $allow_comment)) {
$self = true;
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval($_SESSION['uid']));
- } elseif(remote_user()) {
+ } elseif (remote_user()) {
if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $v) {
if ($v['uid'] == $profile_uid) {
}
}
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$author = $r[0];
$contact_id = $author['id'];
}
// get contact info for owner
- if ($profile_uid == local_user()) {
+ if ($profile_uid == local_user() || $allow_comment) {
$contact_record = $author;
} else {
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval($profile_uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$contact_record = $r[0];
}
}
}
}
+ // Look for any tags and linkify them
+ $str_tags = '';
+ $inform = '';
+
+ $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'];
+ }
+ } 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;
+ }
+ }
+
+ $tagged = array();
+
+ $private_forum = false;
+ $only_to_forum = false;
+ $forum_contact = array();
+
+ if (count($tags)) {
+ foreach ($tags as $tag) {
+
+ $tag_type = substr($tag, 0, 1);
+
+ if ($tag_type == '#') {
+ continue;
+ }
+
+ /*
+ * If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
+ * Robert Johnson should be first in the $tags array
+ */
+ $fullnametagged = false;
+ /// @TODO $tagged is initialized above if() block and is not filled, maybe old-lost code?
+ foreach ($tagged as $nextTag) {
+ if (stristr($nextTag, $tag . ' ')) {
+ $fullnametagged = true;
+ break;
+ }
+ }
+ if ($fullnametagged) {
+ continue;
+ }
+
+ $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network);
+ if ($success['replaced']) {
+ $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 == '!'))) {
+ $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'] &&
+ ($str_contact_allow == '<' . $success['contact']['id'] . '>')) {
+ $private_forum = false;
+ $only_to_forum = true;
+ $private_id = $success['contact']['id'];
+ $forum_contact = $success['contact'];
+ }
+ }
+ }
+
+ $original_contact_id = $contact_id;
+
+ if (!$parent && count($forum_contact) && ($private_forum || $only_to_forum)) {
+ // we tagged a forum in a top level post. Now we change the post
+ $private = $private_forum;
+
+ $str_group_allow = '';
+ $str_contact_deny = '';
+ $str_group_deny = '';
+ if ($private_forum) {
+ $str_contact_allow = '<' . $private_id . '>';
+ } else {
+ $str_contact_allow = '';
+ }
+ $contact_id = $private_id;
+ $contact_record = $forum_contact;
+ $_REQUEST['origin'] = false;
+ }
+
/*
* When a photo was uploaded into the message using the (profile wall) ajax
* uploader, The permissions are initially set to disallow anybody but the
$match = null;
- if ((! $preview) && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) {
+ if (!$preview && preg_match_all("/\[img([\=0-9x]*?)\](.*?)\[\/img\]/",$body,$match)) {
$images = $match[2];
if (count($images)) {
$objecttype = ACTIVITY_OBJ_IMAGE;
foreach ($images as $image) {
- if (! stristr($image,App::get_baseurl() . '/photo/')) {
+ if (!stristr($image, System::baseUrl() . '/photo/')) {
continue;
}
$image_uri = substr($image,strrpos($image,'/') + 1);
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
- if (! strlen($image_uri)) {
+ if (!strlen($image_uri)) {
continue;
}
- $srch = '<' . intval($contact_id) . '>';
+ $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",
intval($profile_uid)
);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
continue;
}
dbesc($str_group_deny),
dbesc($image_uri),
intval($profile_uid),
- dbesc( t('Wall Photos'))
+ dbesc(t('Wall Photos'))
);
}
}
intval($profile_uid),
intval($attach)
);
- if (dbm::is_result($r)) {
+ 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),
require_once 'include/plaintext.php';
$objectdata = get_attached_data($body);
- if ($post["type"] == "link") {
+ if ($objectdata["type"] == "link") {
$objecttype = ACTIVITY_OBJ_BOOKMARK;
- } elseif ($post["type"] == "video") {
+ } elseif ($objectdata["type"] == "video") {
$objecttype = ACTIVITY_OBJ_VIDEO;
- } elseif ($post["type"] == "photo") {
+ } elseif ($objectdata["type"] == "photo") {
$objecttype = ACTIVITY_OBJ_IMAGE;
}
}
- // Look for any tags and linkify them
- $str_tags = '';
- $inform = '';
-
- $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)) {
- $toplevel_contact = '@' . $toplevel_parent[0]['nick'] . '+' . $toplevel_parent[0]['id'];
- } 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;
- }
- }
-
- $tagged = array();
-
- $private_forum = false;
-
- if (count($tags)) {
- foreach ($tags as $tag) {
-
- if (strpos($tag, '#') === 0) {
- continue;
- }
-
- /*
- * If we already tagged 'Robert Johnson', don't try and tag 'Robert'.
- * Robert Johnson should be first in the $tags array
- */
- $fullnametagged = false;
- /// @TODO $tagged is initialized above if() block and is not filled, maybe old-lost code?
- foreach ($tagged as $nextTag) {
- if (stristr($nextTag, $tag . ' ')) {
- $fullnametagged = true;
- break;
- }
- }
- if ($fullnametagged) {
- continue;
- }
-
- $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network);
- if ($success['replaced']) {
- $tagged[] = $tag;
- }
- if (is_array($success['contact']) && intval($success['contact']['prv'])) {
- $private_forum = true;
- $private_id = $success['contact']['id'];
- }
- }
- }
-
- if (($private_forum) && (! $parent) && (! $private)) {
- // we tagged a private forum in a top level post and the message was public.
- // Restrict it.
- $private = 1;
- $str_contact_allow = '<' . $private_id . '>';
- }
-
$attachments = '';
$match = false;
intval($profile_uid),
intval($mtch)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
if (strlen($attachments)) {
$attachments .= ',';
}
- $attachments .= '[attach]href="' . App::get_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/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
}
$body = str_replace($match[1],'',$body);
}
$wall = 0;
- if ($post_type === 'wall' || $post_type === 'wall-comment') {
+ if (($post_type === 'wall' || $post_type === 'wall-comment') && !count($forum_contact)) {
$wall = 1;
}
$datarray['owner-name'] = $contact_record['name'];
$datarray['owner-link'] = $contact_record['url'];
$datarray['owner-avatar'] = $contact_record['thumb'];
- $datarray['owner-id'] = get_contact($datarray['owner-link'], 0);
+ $datarray['owner-id'] = Contact::getIdForURL($datarray['owner-link'], 0);
$datarray['author-name'] = $author['name'];
$datarray['author-link'] = $author['url'];
$datarray['author-avatar'] = $author['thumb'];
- $datarray['author-id'] = get_contact($datarray['author-link'], 0);
+ $datarray['author-id'] = Contact::getIdForURL($datarray['author-link'], 0);
$datarray['created'] = datetime_convert();
$datarray['edited'] = datetime_convert();
$datarray['commented'] = datetime_convert();
$datarray['postopts'] = $postopts;
$datarray['origin'] = $origin;
$datarray['moderated'] = $allow_moderated;
- $datarray['gcontact-id'] = get_gcontact_id(array("url" => $datarray['author-link'], "network" => $datarray['network'],
+ $datarray['gcontact-id'] = GContact::getId(array("url" => $datarray['author-link'], "network" => $datarray['network'],
"photo" => $datarray['author-avatar'], "name" => $datarray['author-name']));
$datarray['object'] = $object;
$datarray['self'] = $self;
// $datarray['prvnets'] = $user['prvnets'];
+ // This triggers posts via API and the mirror functions
+ $datarray['api_source'] = $api_source;
+
$datarray['parent-uri'] = ($parent == 0) ? $uri : $parent_item['uri'];
- $datarray['plink'] = App::get_baseurl() . '/display/' . urlencode($datarray['guid']);
+ $datarray['plink'] = System::baseUrl() . '/display/' . urlencode($datarray['guid']);
$datarray['last-child'] = 1;
$datarray['visible'] = 1;
$datarray['protocol'] = PROTOCOL_DFRN;
$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $datarray['parent-uri']);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
if ($r['conversation-uri'] != '') {
$datarray['conversation-uri'] = $r['conversation-uri'];
}
$json = array('cancel' => 1);
if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
- $json['reload'] = App::get_baseurl() . '/' . $_REQUEST['jsreload'];
+ $json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload'];
}
echo json_encode($json);
// update filetags in pconfig
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
- proc_run(PRIORITY_HIGH, "include/notifier.php", 'edit_post', $post_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", 'edit_post', $post_id);
if ((x($_REQUEST, 'return')) && strlen($return_path)) {
logger('return: ' . $return_path);
goaway($return_path);
intval($datarray['visible'])
);
- if (dbm::is_result($r)) {
- $r = q("SELECT LAST_INSERT_ID() AS `item-id`");
- if (dbm::is_result($r)) {
- $post_id = $r[0]['item-id'];
- } else {
- $post_id = 0;
- }
+ if (DBM::is_result($r)) {
+ $post_id = dba::lastInsertId();
} else {
logger('mod_item: unable to create post.');
$post_id = 0;
'to_email' => $user['email'],
'uid' => $user['uid'],
'item' => $datarray,
- 'link' => App::get_baseurl().'/display/'.urlencode($datarray['guid']),
+ 'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']),
'source_name' => $datarray['author-name'],
'source_link' => $datarray['author-link'],
'source_photo' => $datarray['author-avatar'],
// Store the comment signature information in case we need to relay to Diaspora
- Diaspora::store_comment_signature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
+ Diaspora::storeCommentSignature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
} else {
$parent = $post_id;
intval($parent),
intval($post_id));
- if ($contact_record != $author) {
+ if (($contact_record != $author) && !count($forum_contact)) {
notification(array(
'type' => NOTIFY_WALL,
'notify_flags' => $user['notify-flags'],
'to_email' => $user['email'],
'uid' => $user['uid'],
'item' => $datarray,
- 'link' => App::get_baseurl().'/display/'.urlencode($datarray['guid']),
+ 'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']),
'source_name' => $datarray['author-name'],
'source_link' => $datarray['author-link'],
'source_photo' => $datarray['author-avatar'],
}
$disclaimer = '<hr />' . sprintf( 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'), App::get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
+ $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;
if (!$datarray['title']=='') {
- $subject = email_header_encode($datarray['title'], 'UTF-8');
+ $subject = Email::encodeHeader($datarray['title'], 'UTF-8');
} else {
- $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'), $a->user['username']), 'UTF-8');
+ $subject = Email::encodeHeader('[Friendica]' . ' ' . sprintf( t('%s posted an update.'), $a->user['username']), 'UTF-8');
}
- $link = '<a href="' . App::get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
+ $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 = array (
- 'fromName' => $a->user['username'],
- 'fromEmail' => $a->user['email'],
- 'toEmail' => $addr,
- 'replyTo' => $a->user['email'],
- 'messageSubject' => $subject,
- 'htmlVersion' => $message,
- 'textVersion' => html2plain($html.$disclaimer),
+ 'fromName' => $a->user['username'],
+ 'fromEmail' => $a->user['email'],
+ 'toEmail' => $addr,
+ 'replyTo' => $a->user['email'],
+ 'messageSubject' => $subject,
+ 'htmlVersion' => $message,
+ 'textVersion' => html2plain($html.$disclaimer)
);
Emailer::send($params);
}
// We now do it in the background to save some time.
// This is important in interactive environments like the frontend or the API.
// We don't fork a new process since this is done anyway with the following command
- proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "include/create_shadowentry.php", $post_id);
+ Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "CreateShadowEntry", $post_id);
// Call the background process that is delivering the item to the receivers
- proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $post_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", $notify_type, $post_id);
logger('post_complete');
- item_post_return(App::get_baseurl(), $api_source, $return_path);
+ item_post_return(System::baseUrl(), $api_source, $return_path);
// NOTREACHED
}
*
* @return boolean true if replaced, false if not replaced
*/
-function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") {
- require_once 'include/socgraph.php';
-
+function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "")
+{
$replaced = false;
$r = null;
+ $tag_type = '@';
//is it a person tag?
- if (strpos($tag, '@') === 0) {
+ if ((strpos($tag, '@') === 0) || (strpos($tag, '!') === 0)) {
+ $tag_type = substr($tag, 0, 1);
//is it already replaced?
if (strpos($tag, '[url=')) {
//append tag to str_tags
}
// Checking for the alias that is used for OStatus
- $pattern = "/@\[url\=(.*?)\](.*?)\[\/url\]/ism";
+ $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)) {
+ 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)) {
+ if (DBM::is_result($r)) {
$data = $r[0];
} else {
- $data = probe_url($matches[1]);
+ $data = Probe::uri($matches[1]);
}
if ($data["alias"] != "") {
// 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` FROM `contact`
+ $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",
);
// Then check in the contact table for the url
- if (!dbm::is_result($r)) {
- $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `contact`
+ 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",
}
// Then check in the global contacts for the address
- if (!dbm::is_result($r)) {
+ 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",
}
// Then check in the global contacts for the url
- if (!dbm::is_result($r)) {
+ 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",
);
}
- if (!dbm::is_result($r)) {
- $probed = probe_url($name);
+ if (!DBM::is_result($r)) {
+ $probed = Probe::uri($name);
if ($result['network'] != NETWORK_PHANTOM) {
- update_gcontact($probed);
+ GContact::update($probed);
$r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
dbesc(normalise_link($probed["url"])));
}
}
// select someone by attag or nick and the name passed in the current network
- if(!dbm::is_result($r) && ($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),
);
//select someone from this user's contacts by name in the current network
- if (!dbm::is_result($r) && ($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),
}
// select someone by attag or nick and the name passed in
- if(!dbm::is_result($r)) {
+ 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),
}
// select someone from this user's contacts by name
- if(!dbm::is_result($r)) {
+ 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)
}
}
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
if (strlen($inform) && (isset($r[0]["notify"]) || isset($r[0]["id"]))) {
$inform .= ',';
}
//if there is an url for this persons profile
if (isset($profile) && ($newname != "")) {
-
$replaced = true;
// create profile link
$profile = str_replace(',', '%2c', $profile);
- $newtag = '@[url=' . $profile . ']' . $newname . '[/url]';
- $body = str_replace('@' . $name, $newtag, $body);
+ $newtag = $tag_type.'[url=' . $profile . ']' . $newname . '[/url]';
+ $body = str_replace($tag_type . $name, $newtag, $body);
// append tag to str_tags
if (! stristr($str_tags, $newtag)) {
if (strlen($str_tags)) {