X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=504856d7d2d9883618edefa4ac4f8b8157e7c42e;hb=9513f1f1668a33be3fc2b241fe3662e9de42d84b;hp=20a2488c51b869e2586abf3841694a06f03e3256;hpb=e8c39ff49fdb12461b375db8ab6591ced646f613;p=friendica.git diff --git a/mod/item.php b/mod/item.php index 20a2488c51..504856d7d2 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1,5 +1,12 @@ get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); + if(strlen($str_tags)) + $str_tags .= ','; + $str_tags .= '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]'; + continue; + } + if(strpos($tag,'@') === 0) { + $name = substr($tag,1); + if((strpos($name,'@')) || (strpos($name,'http://'))) { + $newname = $name; + $links = @lrdd($name); + if(count($links)) { + foreach($links as $link) { + if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') + $profile = $link['@attributes']['href']; + if($link['@attributes']['rel'] === 'salmon') { + if(strlen($inform)) + $inform .= ','; + $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']); + } + } + } + } + else { + $newname = $name; + if(strstr($name,'_')) { + $newname = str_replace('_',' ',$name); + $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1", + dbesc($newname), + intval($profile_uid) + ); + } + else { + $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1", + dbesc($name), + intval($profile_uid) + ); + } + if(count($r)) { + $profile = $r[0]['url']; + $newname = $r[0]['name']; + if(strlen($inform)) + $inform .= ','; + $inform .= 'cid:' . $r[0]['id']; + } + } + if($profile) { + $body = str_replace($name,'[url=' . $profile . ']' . $newname . '[/url]', $body); + $profile = str_replace(',','%2c',$profile); + if(strlen($str_tags)) + $str_tags .= ','; + $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]'; + } + } + } + } + + $wall = 0; + if($post_type === 'wall' || $post_type === 'wall-comment') + $wall = 1; + + if(! strlen($verb)) + $verb = ACTIVITY_POST ; + + $gravity = (($parent) ? 6 : 0 ); + $notify_type = (($parent) ? 'comment-new' : 'wall-new' ); $uri = item_new_uri($a->get_hostname(),$profile_uid); - $r = q("INSERT INTO `item` (`uid`,`type`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, - `author-name`, `author-link`, `author-avatar`, `created`, - `edited`, `changed`, `uri`, `title`, `body`, `location`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`) - VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", + $r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, + `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, + `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`) + VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", intval($profile_uid), dbesc($post_type), + intval($wall), + intval($gravity), intval($contact_id), dbesc($contact_record['name']), dbesc($contact_record['url']), @@ -127,6 +215,10 @@ function item_post(&$a) { dbesc($title), dbesc($body), dbesc($location), + dbesc($coord), + dbesc($str_tags), + dbesc($inform), + dbesc($verb), dbesc($str_contact_allow), dbesc($str_group_allow), dbesc($str_contact_deny), @@ -136,6 +228,7 @@ function item_post(&$a) { dbesc($uri)); if(count($r)) { $post_id = $r[0]['id']; + logger('mod_item: saved item ' . $post_id); if($parent) { @@ -157,16 +250,18 @@ function item_post(&$a) { intval($post_id) ); + // Send a notification email to the conversation owner, unless the owner is me and I wrote this item if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) { require_once('bbcode.php'); $from = $author['name']; - $tpl = file_get_contents('view/cmnt_received_eml.tpl'); + $tpl = load_view_file('view/cmnt_received_eml.tpl'); $email_tpl = replace_macros($tpl, array( '$sitename' => $a->config['sitename'], '$siteurl' => $a->get_baseurl(), '$username' => $user['username'], '$email' => $user['email'], '$from' => $from, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, '$body' => strip_tags(bbcode($body)) )); @@ -177,16 +272,19 @@ function item_post(&$a) { else { $parent = $post_id; + // let me know if somebody did a wall-to-wall post on my profile + if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) { require_once('bbcode.php'); $from = $author['name']; - $tpl = file_get_contents('view/wall_received_eml.tpl'); + $tpl = load_view_file('view/wall_received_eml.tpl'); $email_tpl = replace_macros($tpl, array( '$sitename' => $a->config['sitename'], '$siteurl' => $a->get_baseurl(), '$username' => $user['username'], '$email' => $user['email'], '$from' => $from, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, '$body' => strip_tags(bbcode($body)) )); @@ -202,7 +300,11 @@ function item_post(&$a) { dbesc(datetime_convert()), intval($post_id) ); + // photo comments turn the corresponding item visible to the profile wall + // This way we don't see every picture in your new photo album posted to your wall at once. + // They will show up as people comment on them. + if(! $parent_item['visible']) { $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d LIMIT 1", intval($parent_item['id']) @@ -212,7 +314,9 @@ function item_post(&$a) { $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" > notify.out &", + logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &"); + + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &", array(),$foo)); goaway($a->get_baseurl() . "/" . $_POST['return'] ); @@ -228,7 +332,7 @@ function item_content(&$a) { $uid = $_SESSION['uid']; - if(($a->argc == 3) && ($a->argv[1] == 'drop') && intval($a->argv[2])) { + if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) { // locate item to be deleted @@ -302,7 +406,7 @@ function item_content(&$a) { // send the notification upstream/downstream as the case may be - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" > drop.out &", + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &", array(), $foo)); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); @@ -311,7 +415,7 @@ function item_content(&$a) { else { notice( t('Permission denied.') . EOL); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); - return; //NOTREACHED + //NOTREACHED } } } \ No newline at end of file