X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=f696a96a7ee7d1c10d4965325cfe01a344a6d200;hb=696404739bdd3db8eae4255c2d622de8a45df18d;hp=8fb3ecb5421a556ca6775a3000a51aeeb1aeb82f;hpb=0cd241bcbe762e38e2eba0c58800eb60a2240e36;p=friendica.git diff --git a/mod/item.php b/mod/item.php index 8fb3ecb542..f696a96a7e 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1,43 +1,46 @@ 1); echo json_encode($json); @@ -45,36 +48,33 @@ function item_post(App $a) { } call_hooks('post_local_start', $_REQUEST); -// logger('postinput ' . file_get_contents('php://input')); + // logger('postinput ' . file_get_contents('php://input')); logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); - $api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false); - - $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); + $api_source = ((x($_REQUEST, 'api_source') && $_REQUEST['api_source']) ? true : false); - $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); - $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); + $message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); + $return_path = ((x($_REQUEST, 'return')) ? $_REQUEST['return'] : ''); + $preview = ((x($_REQUEST, 'preview')) ? intval($_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']) { + /* + * 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']) { logger("item post: duplicate post", LOGGER_DEBUG); item_post_return(App::get_baseurl(), $api_source, $return_path); - } - else { + } 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']) : ''); + // 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_item = null; $parent_contact = null; @@ -87,7 +87,7 @@ function item_post(App $a) { $objecttype = ACTIVITY_OBJ_COMMENT; - if (! x($_REQUEST,'type')) { + if (! x($_REQUEST, 'type')) { $_REQUEST['type'] = 'net-comment'; } @@ -116,7 +116,7 @@ function item_post(App $a) { 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(); @@ -125,7 +125,7 @@ function item_post(App $a) { $parent = $r[0]['id']; // multi-level threading - preserve the info but re-parent to our single level threading - //if (($parid) && ($parid != $parent)) + //if(($parid) && ($parid != $parent)) $thr_parent = $parent_uri; if ($parent_item['contact-id'] && $uid) { @@ -133,8 +133,9 @@ function item_post(App $a) { 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)); @@ -143,7 +144,6 @@ function item_post(App $a) { $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]); if (!isset($parent_contact["nick"])) { - require_once("include/Scrape.php"); $probed_contact = probe_url($thrparent[0]["author-link"]); if ($probed_contact["network"] != NETWORK_FEED) { $parent_contact = $probed_contact; @@ -153,22 +153,26 @@ function item_post(App $a) { $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); + 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"] == "") + if ($parent_contact["nick"] == "") { $parent_contact["nick"] = $parent_contact["name"]; + } } } - if ($parent) logger('mod_item: item_post parent=' . $parent); + 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'] : ''); + $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'] : ''); // Check for multiple posts with the same message id (when the post was created via API) if (($message_id != '') AND ($profile_uid != 0)) { @@ -189,22 +193,23 @@ function item_post(App $a) { // First check that the parent exists and it is a wall item. - if ((x($_REQUEST,'commenter')) && ((! $parent) || (! $parent_item['wall']))) { - notice( t('Permission denied.') . EOL) ; - if (x($_REQUEST,'return')) + if ((x($_REQUEST, 'commenter')) && ((! $parent) || (! $parent_item['wall']))) { + notice(t('Permission denied.') . EOL) ; + if (x($_REQUEST, 'return')) { goaway($return_path); + } killme(); } - // 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)) { - notice( t('Permission denied.') . EOL) ; - if (x($_REQUEST,'return')) + /* + * 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)) { + notice(t('Permission denied.') . EOL) ; + if (x($_REQUEST, 'return')) { goaway($return_path); + } killme(); } @@ -229,8 +234,9 @@ function item_post(App $a) { $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 ($orig_post) { $str_group_allow = $orig_post['allow_gid']; @@ -254,21 +260,22 @@ function item_post(App $a) { } else { - // if coming from the API and no privacy settings are set, - // use the user default permissions - as they won't have - // been supplied via a form. - + /* + * if coming from the API and no privacy settings are set, + * 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)) - && (! array_key_exists('contact_deny',$_REQUEST)) - && (! array_key_exists('group_deny',$_REQUEST))) { + && (! array_key_exists('contact_allow', $_REQUEST)) + && (! array_key_exists('group_allow', $_REQUEST)) + && (! array_key_exists('contact_deny', $_REQUEST)) + && (! array_key_exists('group_deny', $_REQUEST))) { $str_group_allow = $user['allow_gid']; $str_contact_allow = $user['allow_cid']; $str_group_deny = $user['deny_gid']; $str_contact_deny = $user['deny_cid']; - } - else { + } else { // use the posted permissions @@ -287,16 +294,14 @@ function item_post(App $a) { $network = notags(trim($_REQUEST['network'])); $guid = get_guid(32); - item_add_language_opt($_REQUEST); $postopts = $_REQUEST['postopts'] ? $_REQUEST['postopts'] : ""; - $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); - - if ($user['hidewall']) + if ($user['hidewall']) { $private = 2; + } // If this is a comment, set the permissions from the parent. @@ -305,8 +310,9 @@ function item_post(App $a) { // for non native networks use the network of the original post as network of the item if (($parent_item['network'] != NETWORK_DIASPORA) AND ($parent_item['network'] != NETWORK_OSTATUS) - AND ($network == "")) + AND ($network == "")) { $network = $parent_item['network']; + } $str_contact_allow = $parent_item['allow_cid']; $str_group_allow = $parent_item['allow_gid']; @@ -315,27 +321,31 @@ function item_post(App $a) { $private = $parent_item['private']; } - $pubmail_enable = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0); + $pubmail_enable = ((x($_REQUEST, 'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 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') && (! get_config('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; + } } } if (! strlen($body)) { - if ($preview) + if ($preview) { killme(); - info( t('Empty post discarded.') . EOL ); - if (x($_REQUEST,'return')) + } + info(t('Empty post discarded.') . EOL ); + if (x($_REQUEST, 'return')) { goaway($return_path); + } killme(); } } @@ -363,9 +373,8 @@ function item_post(App $a) { $self = true; $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); - } - elseif (remote_user()) { - if (is_array($_SESSION['remote'])) { + } elseif(remote_user()) { + if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) { foreach ($_SESSION['remote'] as $v) { if ($v['uid'] == $profile_uid) { $contact_id = $v['cid']; @@ -389,28 +398,26 @@ function item_post(App $a) { if ($profile_uid == local_user()) { $contact_record = $author; - } - else { + } else { $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($profile_uid) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $contact_record = $r[0]; + } } $post_type = notags(trim($_REQUEST['type'])); - if ($post_type === 'net-comment') { - if ($parent_item !== null) { - if ($parent_item['wall'] == 1) - $post_type = 'wall-comment'; - else - $post_type = 'remote-comment'; + if ($post_type === 'net-comment' && $parent_item !== null) { + if ($parent_item['wall'] == 1) { + $post_type = 'wall-comment'; + } else { + $post_type = 'remote-comment'; } } - /** - * + /* * When a photo was uploaded into the message using the (profile wall) ajax * uploader, The permissions are initially set to disallow anybody but the * owner from seeing it. This is because the permissions may not yet have been @@ -418,7 +425,6 @@ function item_post(App $a) { * appropriately. But we didn't know the final permissions on the post until * now. So now we'll look for links of uploaded messages that are in the * post and set them to the same permissions as the post itself. - * */ $match = null; @@ -466,13 +472,12 @@ function item_post(App $a) { } - /** + /* * Next link in any attachment references we find in the post. */ - $match = false; - if ((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) { + if ((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/", $body, $match)) { $attaches = $match[1]; if (count($attaches)) { foreach ($attaches as $attach) { @@ -499,7 +504,7 @@ function item_post(App $a) { $bookmark = 0; $data = get_attachment_data($body); - if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) OR isset($data["type"])) { + if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) OR isset($data["type"])) { $objecttype = ACTIVITY_OBJ_BOOKMARK; $bookmark = 1; } @@ -507,49 +512,42 @@ function item_post(App $a) { $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); + // Fold multi-line [code] sequences + $body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body); + $body = scale_external_images($body, false); // Setting the object type if not defined before if (!$objecttype) { $objecttype = ACTIVITY_OBJ_NOTE; // Default value - require_once("include/plaintext.php"); + require_once 'include/plaintext.php'; $objectdata = get_attached_data($body); - if ($post["type"] == "link") + if ($post["type"] == "link") { $objecttype = ACTIVITY_OBJ_BOOKMARK; - elseif ($post["type"] == "video") + } elseif ($post["type"] == "video") { $objecttype = ACTIVITY_OBJ_VIDEO; - elseif ($post["type"] == "photo") + } elseif ($post["type"] == "photo") { $objecttype = ACTIVITY_OBJ_IMAGE; + } } - /** - * Look for any tags and linkify them - */ - + // 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 AND ($parent_contact['network'] == NETWORK_OSTATUS)) { - $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]'; + $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]'; - if (!in_array($contact,$tags)) { - $body = $contact.' '.$body; + if (!in_array($contact, $tags)) { + $body = $contact . ' ' . $body; $tags[] = $contact; } @@ -557,15 +555,16 @@ function item_post(App $a) { $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 ($toplevel_parent) - $toplevel_contact = '@'.$toplevel_parent[0]['nick'].'+'.$toplevel_parent[0]['id']; - else { + 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]'; + $toplevel_contact = '@[url=' . $toplevel_parent[0]['author-link'] . ']' . $toplevel_parent[0]['author-name'] . '[/url]'; } - if (!in_array($toplevel_contact,$tags)) + if (!in_array($toplevel_contact, $tags)) { $tags[] = $toplevel_contact; + } } $tagged = array(); @@ -575,16 +574,18 @@ function item_post(App $a) { if (count($tags)) { foreach ($tags as $tag) { - if (strpos($tag,'#') === 0) { + 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 - + /* + * If we already tagged 'Robert Johnson', don't try and tag 'Robert'. + * Robert Johnson should be first in the $tags array + */ $fullnametagged = false; - for ($x = 0; $x < count($tagged); $x ++) { - if (stristr($tagged[$x],$tag . ' ')) { + /// @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; } @@ -649,7 +650,7 @@ function item_post(App $a) { // 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); + $origin = ((x($_REQUEST, 'origin')) ? intval($_REQUEST['origin']) : 1); $notify_type = (($parent) ? 'comment-new' : 'wall-new' ); @@ -670,11 +671,11 @@ function item_post(App $a) { $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'] = get_contact($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'] = get_contact($datarray['author-link'], 0); $datarray['created'] = datetime_convert(); $datarray['edited'] = datetime_convert(); $datarray['commented'] = datetime_convert(); @@ -709,32 +710,42 @@ function item_post(App $a) { "photo" => $datarray['author-avatar'], "name" => $datarray['author-name'])); $datarray['object'] = $object; - /** + /* * These fields are for the convenience of plugins... * 'self' if true indicates the owner is posting on their own wall * If parent is 0 it is a top-level post. */ - $datarray['parent'] = $parent; $datarray['self'] = $self; // $datarray['prvnets'] = $user['prvnets']; $datarray['parent-uri'] = ($parent == 0) ? $uri : $parent_item['uri']; - $datarray['plink'] = App::get_baseurl().'/display/'.urlencode($datarray['guid']); + $datarray['plink'] = App::get_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 ($r['conversation-uri'] != '') { + $datarray['conversation-uri'] = $r['conversation-uri']; + } + if ($r['conversation-href'] != '') { + $datarray['conversation-href'] = $r['conversation-href']; + } + } + if ($orig_post) { - $datarray['edit'] = true; + $datarray['edit'] = true; } // Search for hashtags item_body_set_hashtags($datarray); // preview mode - prepare the body for display and send it via json - if ($preview) { - require_once('include/conversation.php'); + 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; @@ -744,17 +755,16 @@ function item_post(App $a) { killme(); } - call_hooks('post_local',$datarray); - if (x($datarray,'cancel')) { + if (x($datarray, 'cancel')) { logger('mod_item: post cancelled by plugin.'); if ($return_path) { goaway($return_path); } $json = array('cancel' => 1); - if (x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) { + if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) { $json['reload'] = App::get_baseurl() . '/' . $_REQUEST['jsreload']; } @@ -765,6 +775,8 @@ function item_post(App $a) { // Fill the cache field put_item_in_cache($datarray); + $datarray = store_conversation($datarray); + if ($orig_post) { $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `attach` = '%s', `file` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s', `edited` = '%s', `changed` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($datarray['title']), @@ -788,16 +800,16 @@ function item_post(App $a) { file_tag_update_pconfig($uid,$categories_old,$categories_new,'category'); proc_run(PRIORITY_HIGH, "include/notifier.php", 'edit_post', $post_id); - if ((x($_REQUEST,'return')) && strlen($return_path)) { + if ((x($_REQUEST, 'return')) && strlen($return_path)) { logger('return: ' . $return_path); goaway($return_path); } killme(); - } else + } else { $post_id = 0; + } - q("COMMIT"); - q("START TRANSACTION;"); + dba::transaction(); $r = q("INSERT INTO `item` (`guid`, `extid`, `uid`,`type`,`wall`,`gravity`, `network`, `contact-id`, `owner-name`,`owner-link`,`owner-avatar`, `owner-id`, @@ -872,7 +884,7 @@ function item_post(App $a) { dbesc($datarray['plink']), intval($datarray['last-child']), intval($datarray['visible']) - ); + ); if (dbm::is_result($r)) { $r = q("SELECT LAST_INSERT_ID() AS `item-id`"); @@ -887,7 +899,7 @@ function item_post(App $a) { } if ($post_id == 0) { - q("COMMIT"); + dba::commit(); logger('mod_item: unable to retrieve post that was just stored.'); notice(t('System error. Post not saved.') . EOL); goaway($return_path); @@ -928,7 +940,7 @@ function item_post(App $a) { 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $datarray, - 'link' => App::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'], @@ -977,21 +989,22 @@ function item_post(App $a) { if (count($erecips)) { foreach ($erecips as $recip) { $addr = trim($recip); - if (! strlen($addr)) + if (! strlen($addr)) { continue; - $disclaimer = '
' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username']) + } + $disclaimer = '
' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'), $a->user['username']) . '
'; $disclaimer .= sprintf( t('You may visit them online at %s'), App::get_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_header_encode($datarray['title'], 'UTF-8'); } else { - $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8'); + $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'), $a->user['username']), 'UTF-8'); } $link = '' . $a->user['username'] . '

'; $html = prepare_body($datarray); $message = '' . $link . $html . $disclaimer . ''; - include_once('include/html2plain.php'); + include_once 'include/html2plain.php'; $params = array ( 'fromName' => $a->user['username'], 'fromEmail' => $a->user['email'], @@ -1012,7 +1025,7 @@ function item_post(App $a) { update_thread($parent, true); } - q("COMMIT"); + dba::commit(); create_tags_from_item($post_id); create_files_from_item($post_id); @@ -1044,7 +1057,7 @@ function item_post_return($baseurl, $api_source, $return_path) { } $json = array('success' => 1); - if (x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) { + if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) { $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload']; } @@ -1062,7 +1075,7 @@ function item_content(App $a) { return; } - require_once('include/security.php'); + require_once 'include/security.php'; $o = ''; if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) { @@ -1090,19 +1103,18 @@ function item_content(App $a) { * * @return boolean true if replaced, false if not replaced */ -function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") { - require_once("include/Scrape.php"); - require_once("include/socgraph.php"); +function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $network = "") { + require_once 'include/socgraph.php'; $replaced = false; $r = null; //is it a person tag? - if (strpos($tag,'@') === 0) { + if (strpos($tag, '@') === 0) { //is it already replaced? - if (strpos($tag,'[url=')) { + if (strpos($tag, '[url=')) { //append tag to str_tags - if (!stristr($str_tags,$tag)) { + if (!stristr($str_tags, $tag)) { if (strlen($str_tags)) { $str_tags .= ','; } @@ -1115,11 +1127,9 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo $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]; @@ -1128,8 +1138,8 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo } if ($data["alias"] != "") { - $newtag = '@[url='.$data["alias"].']'.$data["name"].'[/url]'; - if (!stristr($str_tags,$newtag)) { + $newtag = '@[url=' . $data["alias"] . ']' . $data["name"] . '[/url]'; + if (!stristr($str_tags, $newtag)) { if (strlen($str_tags)) { $str_tags .= ','; } @@ -1142,7 +1152,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo } $stat = false; //get the person's name - $name = substr($tag,1); + $name = substr($tag, 1); // Sometimes the tag detection doesn't seem to work right // This is some workaround @@ -1150,7 +1160,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo $name = $nameparts[0]; // Try to detect the contact in various ways - if ((strpos($name,'@')) || (strpos($name,'http://'))) { + 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 @@ -1176,13 +1186,14 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo } // Then check in the global contacts for the address - if (!$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", dbesc($name), dbesc(NETWORK_OSTATUS) ); + } // Then check in the global contacts for the url if (!dbm::is_result($r)) { @@ -1204,9 +1215,9 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo } } else { $r = false; - if (strrpos($name,'+')) { + if (strrpos($name, '+')) { // Is it in format @nick+number? - $tagcid = intval(substr($name,strrpos($name,'+') + 1)); + $tagcid = intval(substr($name, strrpos($name, '+') + 1)); $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($tagcid), @@ -1214,15 +1225,14 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo ); } - //select someone by attag or nick and the name passed in the current network - if (!dbm::is_result($r) AND ($network != "")) { + // select someone by attag or nick and the name passed in the current network + if(!dbm::is_result($r) AND ($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) AND ($network != "")) { @@ -1233,8 +1243,8 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo ); } - //select someone by attag or nick and the name passed in - if (!dbm::is_result($r)) { + // 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), @@ -1242,8 +1252,8 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo ); } - //select someone from this user's contacts by name - if (!dbm::is_result($r)) { + // 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) @@ -1275,24 +1285,25 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo if (isset($profile) AND ($newname != "")) { $replaced = true; - //create profile link - $profile = str_replace(',','%2c',$profile); - $newtag = '@[url='.$profile.']'.$newname.'[/url]'; - $body = str_replace('@'.$name, $newtag, $body); - //append tag to str_tags - if (! stristr($str_tags,$newtag)) { + // create profile link + $profile = str_replace(',', '%2c', $profile); + $newtag = '@[url=' . $profile . ']' . $newname . '[/url]'; + $body = str_replace('@' . $name, $newtag, $body); + // append tag to str_tags + if (! stristr($str_tags, $newtag)) { if (strlen($str_tags)) { $str_tags .= ','; } $str_tags .= $newtag; } - // Status.Net seems to require the numeric ID URL in a mention if the person isn't - // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both. - + /* + * Status.Net seems to require the numeric ID URL in a mention if the person isn't + * subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both. + */ if (strlen($alias)) { - $newtag = '@[url='.$alias.']'.$newname.'[/url]'; - if (! stristr($str_tags,$newtag)) { + $newtag = '@[url=' . $alias . ']' . $newname . '[/url]'; + if (! stristr($str_tags, $newtag)) { if (strlen($str_tags)) { $str_tags .= ','; }