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\System;
use Friendica\Core\Worker;
+use Friendica\Database\DBA;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Item;
$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_contact = Contact::getDetailsByURL($parent_item["author-link"]);
$objecttype = ACTIVITY_OBJ_COMMENT;
-
- if (!x($_REQUEST, 'type')) {
- $_REQUEST['type'] = 'net-comment';
- }
}
if ($parent) {
$app = strip_tags(defaults($_REQUEST, 'source', ''));
$extid = strip_tags(defaults($_REQUEST, 'extid', ''));
$object = defaults($_REQUEST, 'object', '');
+ $wall = intval(defaults($_REQUEST, 'wall', 1));
// Ensure that the user id in a thread always stay the same
if (!is_null($parent_user) && in_array($parent_user, [local_user(), 0])) {
// Check for multiple posts with the same message id (when the post was created via API)
if (($message_id != '') && ($profile_uid != 0)) {
- if (dba::exists('item', ['uri' => $message_id, 'uid' => $profile_uid])) {
+ if (DBA::exists('item', ['uri' => $message_id, 'uid' => $profile_uid])) {
logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
return;
}
// Now check that valid personal details have been provided
if (!can_write_wall($profile_uid) && !$allow_comment) {
notice(L10n::t('Permission denied.') . EOL) ;
+
if (x($_REQUEST, 'return')) {
goaway($return_path);
}
+
killme();
}
-
- // is this an edited post?
-
+ // Init post instance
$orig_post = null;
- if ($post_id) {
+ // is this an edited post?
+ if ($post_id > 0) {
$orig_post = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
}
- $user = dba::selectFirst('user', [], ['uid' => $profile_uid]);
+ $user = DBA::selectFirst('user', [], ['uid' => $profile_uid]);
+
if (!DBM::is_result($user) && !$parent) {
return;
}
$categories = '';
+ $postopts = '';
+ $emailcc = '';
- if ($orig_post) {
+ 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']));
* 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_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(defaults($_REQUEST, 'title' , '')));
// 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)
$str_contact_deny = $parent_item['deny_cid'];
$str_group_deny = $parent_item['deny_gid'];
$private = $parent_item['private'];
+
+ $wall = $parent_item['wall'];
}
$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) {
if (function_exists('imap_open') && !Config::get('system', 'imap_disabled')) {
- $pubmail_enabled = dba::exists('mailacct', ["`uid` = ? AND `server` != ? AND `pubmail`", local_user(), '']);
+ $pubmail_enabled = DBA::exists('mailacct', ["`uid` = ? AND `server` != ? AND `pubmail`", local_user(), '']);
}
}
if (local_user() && ((local_user() == $profile_uid) || $allow_comment)) {
$self = true;
- $author = dba::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
+ $author = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
} elseif (remote_user()) {
if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
foreach ($_SESSION['remote'] as $v) {
}
}
if ($contact_id) {
- $author = dba::selectFirst('contact', [], ['id' => $contact_id]);
+ $author = DBA::selectFirst('contact', [], ['id' => $contact_id]);
}
}
if ($profile_uid == local_user() || $allow_comment) {
$contact_record = $author;
} else {
- $contact_record = dba::selectFirst('contact', [], ['uid' => $profile_uid, 'self' => true]);
- }
-
- $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
$contact_id = $private_id;
$contact_record = $forum_contact;
$_REQUEST['origin'] = false;
+ $wall = 0;
}
/*
$condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
'resource-id' => $image_uri, 'uid' => $profile_uid];
- if (!dba::exists('photo', $condition)) {
+ if (!DBA::exists('photo', $condition)) {
continue;
}
$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);
+ DBA::update('photo', $fields, $condition);
}
}
}
$condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
'id' => $attach];
- if (!dba::exists('attach', $condition)) {
+ 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);
+ DBA::update('attach', $fields, $condition);
}
}
}
// embedded bookmark or attachment in post? set bookmark flag
- $bookmark = 0;
$data = BBCode::getAttachmentData($body);
- if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"])) {
+ 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);
if (preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) {
foreach ($match[2] as $mtch) {
$fields = ['id', 'filename', 'filesize', 'filetype'];
- $attachment = dba::selectFirst('attach', $fields, ['id' => $mtch]);
+ $attachment = DBA::selectFirst('attach', $fields, ['id' => $mtch]);
if (DBM::is_result($attachment)) {
if (strlen($attachments)) {
$attachments .= ',';
}
}
- $wall = 0;
-
- if (($post_type === 'wall' || $post_type === 'wall-comment') && !count($forum_contact)) {
- $wall = 1;
- }
-
if (!strlen($verb)) {
$verb = ACTIVITY_POST;
}
$notify_type = ($parent ? 'comment-new' : 'wall-new');
- $uri = ($message_id ? $message_id : Item::newURI($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 (!$thr_parent_uri || !$parent) {
$datarray = [];
$datarray['uid'] = $profile_uid;
- $datarray['type'] = $post_type;
$datarray['wall'] = $wall;
$datarray['gravity'] = $gravity;
$datarray['network'] = $network;
$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['private'] = $private;
$datarray['pubmail'] = $pubmail_enabled;
$datarray['attach'] = $attachments;
- $datarray['bookmark'] = intval($bookmark);
// 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;
// This field is for storing the raw conversation data
$datarray['protocol'] = PROTOCOL_DFRN;
- $conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $datarray['parent-uri']]);
+ $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $datarray['parent-uri']]);
if (DBM::is_result($conversation)) {
- if ($r['conversation-uri'] != '') {
+ if ($conversation['conversation-uri'] != '') {
$datarray['conversation-uri'] = $conversation['conversation-uri'];
}
- if ($r['conversation-href'] != '') {
+ if ($conversation['conversation-href'] != '') {
$datarray['conversation-href'] = $conversation['conversation-href'];
}
}
if ($orig_post) {
$datarray['edit'] = true;
+ } else {
+ $datarray['edit'] = false;
}
// Check for hashtags in the body and repair or add hashtag links
// 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"] = NETWORK_DFRN;
+
$o = conversation($a,[array_merge($contact_record,$datarray)],'search', false, true);
logger('preview: ' . $o);
echo json_encode(['preview' => $o]);
'replyTo' => $a->user['email'],
'messageSubject' => $subject,
'htmlVersion' => $message,
- 'textVersion' => Friendica\Content\Text\HTML::toPlaintext($html.$disclaimer)
+ 'textVersion' => HTML::toPlaintext($html.$disclaimer)
];
Emailer::send($params);
}
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]);
+ $contact = DBA::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]);
}
// select someone by nick or attag in the current network
if (!DBM::is_result($contact) && ($network != "")) {
$condition = ["(`nick` = ? OR `attag` = ?) AND `network` = ? AND `uid` = ?",
$name, $name, $network, $profile_uid];
- $contact = dba::selectFirst('contact', $fields, $condition);
+ $contact = DBA::selectFirst('contact', $fields, $condition);
}
//select someone by name in the current network
if (!DBM::is_result($contact) && ($network != "")) {
$condition = ['name' => $name, 'network' => $network, 'uid' => $profile_uid];
- $contact = dba::selectFirst('contact', $fields, $condition);
+ $contact = DBA::selectFirst('contact', $fields, $condition);
}
// select someone by nick or attag in any network
if (!DBM::is_result($contact)) {
$condition = ["(`nick` = ? OR `attag` = ?) AND `uid` = ?", $name, $name, $profile_uid];
- $contact = dba::selectFirst('contact', $fields, $condition);
+ $contact = DBA::selectFirst('contact', $fields, $condition);
}
// select someone by name in any network
if (!DBM::is_result($contact)) {
$condition = ['name' => $name, 'uid' => $profile_uid];
- $contact = dba::selectFirst('contact', $fields, $condition);
+ $contact = DBA::selectFirst('contact', $fields, $condition);
}
}
projects / friendica.git / blobdiff