X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fitem.php;h=6da9ce88e8301ab991a7e594188baad3003bcf60;hb=f94a10bf00de699a5f3d22ea74665053a5661175;hp=29a210135567ff326f6fd5222372c2b9406fa523;hpb=724f9c80e79783957d75d011a0393f6d6bb1949e;p=friendica.git diff --git a/mod/item.php b/mod/item.php index 29a2101355..6da9ce88e8 100644 --- a/mod/item.php +++ b/mod/item.php @@ -27,7 +27,7 @@ require_once('include/Scrape.php'); require_once('include/diaspora.php'); require_once('include/Contact.php'); -function item_post(&$a) { +function item_post(App $a) { if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) return; @@ -59,13 +59,14 @@ function item_post(&$a) { // 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 && 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($a->get_baseurl(), $api_source, $return_path); + item_post_return(App::get_baseurl(), $api_source, $return_path); } - else + else { $_SESSION['post-random'] = $_REQUEST['post_id_random']; + } } /** @@ -82,18 +83,19 @@ function item_post(&$a) { $r = false; $objecttype = null; - if($parent || $parent_uri) { + if ($parent || $parent_uri) { $objecttype = ACTIVITY_OBJ_COMMENT; - if(! x($_REQUEST,'type')) + if (! x($_REQUEST,'type')) { $_REQUEST['type'] = 'net-comment'; + } - if($parent) { + if ($parent) { $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($parent) ); - } elseif($parent_uri && local_user()) { + } 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), @@ -102,20 +104,21 @@ function item_post(&$a) { } // if this isn't the real parent of the conversation, find it - if($r !== false && count($r)) { + if (dbm::is_result($r)) { $parid = $r[0]['parent']; $parent_uri = $r[0]['uri']; - if($r[0]['id'] != $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(($r === false) || (! count($r))) { + if (! dbm::is_result($r)) { notice( t('Unable to locate original post.') . EOL); - if(x($_REQUEST,'return')) + if (x($_REQUEST,'return')) { goaway($return_path); + } killme(); } $parent_item = $r[0]; @@ -125,7 +128,7 @@ function item_post(&$a) { //if(($parid) && ($parid != $parent)) $thr_parent = $parent_uri; - if($parent_item['contact-id'] && $uid) { + if ($parent_item['contact-id'] && $uid) { $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($parent_item['contact-id']), intval($uid) @@ -135,18 +138,9 @@ function item_post(&$a) { // 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 (count($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS) + if (dbm::is_result($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS) AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) { - $parent_contact = null; - - $r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", - dbesc(normalise_link($thrparent[0]["author-link"]))); - if (count($r)) { - $parent_contact = $r[0]; - $parent_contact["thumb"] = $parent_contact["photo"]; - $parent_contact["micro"] = $parent_contact["photo"]; - unset($parent_contact["id"]); - } + $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]); if (!isset($parent_contact["nick"])) { require_once("include/Scrape.php"); @@ -173,7 +167,8 @@ function item_post(&$a) { $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']) : ''); + $extid = ((x($_REQUEST,'extid')) ? strip_tags($_REQUEST['extid']) : ''); + $object = ((x($_REQUEST,'object')) ? $_REQUEST['object'] : ''); // Check for multiple posts with the same message id (when the post was created via API) if (($message_id != '') AND ($profile_uid != 0)) { @@ -223,8 +218,9 @@ function item_post(&$a) { intval($profile_uid), intval($post_id) ); - if(! count($i)) + if (! dbm::is_result($i)) { killme(); + } $orig_post = $i[0]; } @@ -329,7 +325,7 @@ function item_post(&$a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if(count($r) && intval($r[0]['pubmail'])) + if (dbm::is_result($r) && intval($r[0]['pubmail'])) $pubmail_enabled = true; } } @@ -357,20 +353,6 @@ function item_post(&$a) { $categories .= file_tag_list_to_file($filedas, 'file'); } - // Work around doubled linefeeds in Tinymce 3.5b2 - // First figure out if it's a status post that would've been - // created using tinymce. Otherwise leave it alone. - -/* $plaintext = (local_user() ? intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled($profile_uid,'richtext') : 0); - if((! $parent) && (! $api_source) && (! $plaintext)) { - $body = fix_mce_lf($body); - }*/ - $plaintext = (local_user() ? !feature_enabled($profile_uid,'richtext') : 0); - if((! $parent) && (! $api_source) && (! $plaintext)) { - $body = fix_mce_lf($body); - } - - // get contact info for poster $author = null; @@ -447,13 +429,15 @@ function item_post(&$a) { $objecttype = ACTIVITY_OBJ_IMAGE; - foreach($images as $image) { - if(! stristr($image,$a->get_baseurl() . '/photo/')) + foreach ($images as $image) { + if (! stristr($image,App::get_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) . '>'; $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' @@ -463,8 +447,9 @@ function item_post(&$a) { intval($profile_uid) ); - if(! count($r)) + if (! dbm::is_result($r)) { 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' ", @@ -560,12 +545,8 @@ function item_post(&$a) { * 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 AND ($parent_contact['network'] === NETWORK_OSTATUS)) { - if ($parent_contact['id'] != "") - $contact = '@'.$parent_contact['nick'].'+'.$parent_contact['id']; - else - $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]'; + if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) { + $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]'; if (!in_array($contact,$tags)) { $body = $contact.' '.$body; @@ -611,16 +592,17 @@ function item_post(&$a) { continue; $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network); - if($success['replaced']) + if ($success['replaced']) { $tagged[] = $tag; - if(is_array($success['contact']) && intval($success['contact']['prv'])) { + } + if (is_array($success['contact']) && intval($success['contact']['prv'])) { $private_forum = true; $private_id = $success['contact']['id']; } } } - if(($private_forum) && (! $parent) && (! $private)) { + if (($private_forum) && (! $parent) && (! $private)) { // we tagged a private forum in a top level post and the message was public. // Restrict it. $private = 1; @@ -630,16 +612,17 @@ function item_post(&$a) { $attachments = ''; $match = false; - if(preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) { - foreach($match[2] as $mtch) { + 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)) { - if(strlen($attachments)) + if (strlen($attachments)) { $attachments .= ','; - $attachments .= '[attach]href="' . $a->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="' . App::get_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); } @@ -647,14 +630,17 @@ function item_post(&$a) { $wall = 0; - if($post_type === 'wall' || $post_type === 'wall-comment') + if ($post_type === 'wall' || $post_type === 'wall-comment') { $wall = 1; + } - if(! strlen($verb)) + if (! strlen($verb)) { $verb = ACTIVITY_POST ; + } - if ($network == "") + if ($network == "") { $network = NETWORK_DFRN; + } $gravity = (($parent) ? 6 : 0 ); @@ -668,8 +654,9 @@ function item_post(&$a) { $uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid, $guid)); // Fallback so that we alway have a thr-parent - if(!$thr_parent) + if (!$thr_parent) { $thr_parent = $uri; + } $datarray = array(); $datarray['uid'] = $profile_uid; @@ -718,6 +705,7 @@ function item_post(&$a) { $datarray['moderated'] = $allow_moderated; $datarray['gcontact-id'] = get_gcontact_id(array("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... @@ -730,7 +718,7 @@ function item_post(&$a) { // $datarray['prvnets'] = $user['prvnets']; $datarray['parent-uri'] = ($parent == 0) ? $uri : $parent_item['uri']; - $datarray['plink'] = $a->get_baseurl().'/display/'.urlencode($datarray['guid']); + $datarray['plink'] = App::get_baseurl().'/display/'.urlencode($datarray['guid']); $datarray['last-child'] = 1; $datarray['visible'] = 1; @@ -744,6 +732,9 @@ function item_post(&$a) { if($preview) { require_once('include/conversation.php'); + // We set the datarray ID to -1 because in preview mode the dataray + // doesn't have an ID. + $datarray["id"] = -1; $o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false, true); logger('preview: ' . $o); echo json_encode(array('preview' => $o)); @@ -760,8 +751,9 @@ function item_post(&$a) { } $json = array('cancel' => 1); - if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) - $json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload']; + if (x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) { + $json['reload'] = App::get_baseurl() . '/' . $_REQUEST['jsreload']; + } echo json_encode($json); killme(); @@ -812,7 +804,7 @@ function item_post(&$a) { `tag`, `inform`, `verb`, `object-type`, `postopts`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach`, `bookmark`,`origin`, `moderated`, `file`, - `rendered-html`, `rendered-hash`, + `rendered-html`, `rendered-hash`, `gcontact-id`, `object`, `parent`, `parent-uri`, `plink`, `last-child`, `visible`) VALUES('%s', '%s', %d, '%s', %d, %d, '%s', %d, '%s', '%s', '%s', %d, @@ -822,7 +814,7 @@ function item_post(&$a) { '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s', - '%s', '%s', + '%s', '%s', %d, '%s', %d, '%s', '%s', %d, %d)", dbesc($datarray['guid']), dbesc($datarray['extid']), @@ -870,6 +862,8 @@ function item_post(&$a) { dbesc($datarray['file']), dbesc($datarray['rendered-html']), dbesc($datarray['rendered-hash']), + intval($datarray['gcontact-id']), + dbesc($datarray['object']), intval($datarray['parent']), dbesc($datarray['parent-uri']), dbesc($datarray['plink']), @@ -931,7 +925,7 @@ function item_post(&$a) { 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $datarray, - 'link' => $a->get_baseurl().'/display/'.urlencode($datarray['guid']), + 'link' => App::get_baseurl().'/display/'.urlencode($datarray['guid']), 'source_name' => $datarray['author-name'], 'source_link' => $datarray['author-link'], 'source_photo' => $datarray['author-avatar'], @@ -945,7 +939,7 @@ function item_post(&$a) { // 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::store_comment_signature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id); } else { $parent = $post_id; @@ -963,7 +957,7 @@ function item_post(&$a) { 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $datarray, - 'link' => $a->get_baseurl().'/display/'.urlencode($datarray['guid']), + 'link' => App::get_baseurl().'/display/'.urlencode($datarray['guid']), 'source_name' => $datarray['author-name'], 'source_link' => $datarray['author-link'], 'source_photo' => $datarray['author-avatar'], @@ -984,14 +978,14 @@ function item_post(&$a) { continue; $disclaimer = '