Continued a bit:
- added spaces / curly braces - converted multiple single-line comments into one multi-line comment - used more dbm::is_result() - include/require are no functions, let's not abuse them ... Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
parent
d091759888
commit
3d595c4dcc
391
mod/item.php
391
mod/item.php
|
@ -1,43 +1,44 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/*
|
||||||
*
|
|
||||||
* This is the POST destination for most all locally posted
|
* This is the POST destination for most all locally posted
|
||||||
* text stuff. This function handles status, wall-to-wall status,
|
* text stuff. This function handles status, wall-to-wall status,
|
||||||
* local comments, and remote coments that are posted on this site
|
* local comments, and remote coments that are posted on this site
|
||||||
* (as opposed to being delivered in a feed).
|
* (as opposed to being delivered in a feed).
|
||||||
* Also processed here are posts and comments coming through the
|
* Also processed here are posts and comments coming through the
|
||||||
* statusnet/twitter API.
|
* statusnet/twitter API.
|
||||||
|
*
|
||||||
* All of these become an "item" which is our basic unit of
|
* All of these become an "item" which is our basic unit of
|
||||||
* information.
|
* information.
|
||||||
|
*
|
||||||
* Posts that originate externally or do not fall into the above
|
* Posts that originate externally or do not fall into the above
|
||||||
* posting categories go through item_store() instead of this function.
|
* posting categories go through item_store() instead of this function.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once('include/crypto.php');
|
require_once 'include/crypto.php';
|
||||||
require_once('include/enotify.php');
|
require_once 'include/enotify.php';
|
||||||
require_once('include/email.php');
|
require_once 'include/email.php';
|
||||||
require_once('include/tags.php');
|
require_once 'include/tags.php';
|
||||||
require_once('include/files.php');
|
require_once 'include/files.php';
|
||||||
require_once('include/threads.php');
|
require_once 'include/threads.php';
|
||||||
require_once('include/text.php');
|
require_once 'include/text.php';
|
||||||
require_once('include/items.php');
|
require_once 'include/items.php';
|
||||||
require_once('include/Scrape.php');
|
require_once 'include/Scrape.php';
|
||||||
require_once('include/diaspora.php');
|
require_once 'include/diaspora.php';
|
||||||
require_once('include/Contact.php');
|
require_once 'include/Contact.php';
|
||||||
|
|
||||||
function item_post(App $a) {
|
function item_post(App $a) {
|
||||||
|
|
||||||
if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
|
if ((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
require_once('include/security.php');
|
require_once('include/security.php');
|
||||||
|
|
||||||
$uid = local_user();
|
$uid = local_user();
|
||||||
|
|
||||||
if(x($_REQUEST,'dropitems')) {
|
if (x($_REQUEST, 'dropitems')) {
|
||||||
$arr_drop = explode(',',$_REQUEST['dropitems']);
|
$arr_drop = explode(',', $_REQUEST['dropitems']);
|
||||||
drop_items($arr_drop);
|
drop_items($arr_drop);
|
||||||
$json = array('success' => 1);
|
$json = array('success' => 1);
|
||||||
echo json_encode($json);
|
echo json_encode($json);
|
||||||
|
@ -45,34 +46,31 @@ function item_post(App $a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
call_hooks('post_local_start', $_REQUEST);
|
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);
|
logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
|
||||||
|
|
||||||
$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
|
$api_source = ((x($_REQUEST, 'api_source') && $_REQUEST['api_source']) ? true : false);
|
||||||
|
|
||||||
$message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
|
$message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
|
||||||
|
|
||||||
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
|
$return_path = ((x($_REQUEST, 'return')) ? $_REQUEST['return'] : '');
|
||||||
$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
|
$preview = ((x($_REQUEST, 'preview')) ? intval($_REQUEST['preview']) : 0);
|
||||||
|
|
||||||
|
/*
|
||||||
// Check for doubly-submitted posts, and reject duplicates
|
* Check for doubly-submitted posts, and reject duplicates
|
||||||
// Note that we have to ignore previews, otherwise nothing will post
|
* Note that we have to ignore previews, otherwise nothing will post
|
||||||
// after it's been previewed
|
* 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);
|
logger("item post: duplicate post", LOGGER_DEBUG);
|
||||||
item_post_return(App::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'];
|
$_SESSION['post-random'] = $_REQUEST['post_id_random'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// Is this a reply to something?
|
||||||
* Is this a reply to something?
|
|
||||||
*/
|
|
||||||
|
|
||||||
$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
|
$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
|
||||||
$parent_uri = ((x($_REQUEST,'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
|
$parent_uri = ((x($_REQUEST,'parent_uri')) ? trim($_REQUEST['parent_uri']) : '');
|
||||||
|
|
||||||
|
@ -133,8 +131,9 @@ function item_post(App $a) {
|
||||||
intval($parent_item['contact-id']),
|
intval($parent_item['contact-id']),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
if (dbm::is_result($r))
|
if (dbm::is_result($r)) {
|
||||||
$parent_contact = $r[0];
|
$parent_contact = $r[0];
|
||||||
|
}
|
||||||
|
|
||||||
// If the contact id doesn't fit with the contact, then set the contact to null
|
// 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));
|
$thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
|
||||||
|
@ -153,16 +152,20 @@ function item_post(App $a) {
|
||||||
$parent_contact["addr"] = $probed_contact["addr"];
|
$parent_contact["addr"] = $probed_contact["addr"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logger('no contact found: '.print_r($thrparent, true), LOGGER_DEBUG);
|
logger('no contact found: ' . print_r($thrparent, true), LOGGER_DEBUG);
|
||||||
} else
|
} else {
|
||||||
logger('parent contact: '.print_r($parent_contact, true), LOGGER_DEBUG);
|
logger('parent contact: ' . print_r($parent_contact, true), LOGGER_DEBUG);
|
||||||
|
}
|
||||||
|
|
||||||
if ($parent_contact["nick"] == "")
|
if ($parent_contact["nick"] == "") {
|
||||||
$parent_contact["nick"] = $parent_contact["name"];
|
$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);
|
$profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
|
||||||
$post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0);
|
$post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0);
|
||||||
|
@ -189,22 +192,23 @@ function item_post(App $a) {
|
||||||
|
|
||||||
// First check that the parent exists and it is a wall item.
|
// 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) ;
|
notice(t('Permission denied.') . EOL) ;
|
||||||
if(x($_REQUEST,'return'))
|
if (x($_REQUEST, 'return')) {
|
||||||
goaway($return_path);
|
goaway($return_path);
|
||||||
|
}
|
||||||
killme();
|
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
|
* 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($a,$profile_uid)) && (! $allow_moderated)) {
|
notice(t('Permission denied.') . EOL) ;
|
||||||
notice( t('Permission denied.') . EOL) ;
|
if (x($_REQUEST, 'return')) {
|
||||||
if(x($_REQUEST,'return'))
|
|
||||||
goaway($return_path);
|
goaway($return_path);
|
||||||
|
}
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -213,7 +217,7 @@ function item_post(App $a) {
|
||||||
|
|
||||||
$orig_post = null;
|
$orig_post = null;
|
||||||
|
|
||||||
if($post_id) {
|
if ($post_id) {
|
||||||
$i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
$i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||||
intval($profile_uid),
|
intval($profile_uid),
|
||||||
intval($post_id)
|
intval($post_id)
|
||||||
|
@ -229,10 +233,11 @@ function item_post(App $a) {
|
||||||
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||||
intval($profile_uid)
|
intval($profile_uid)
|
||||||
);
|
);
|
||||||
if (dbm::is_result($r))
|
if (dbm::is_result($r)) {
|
||||||
$user = $r[0];
|
$user = $r[0];
|
||||||
|
}
|
||||||
|
|
||||||
if($orig_post) {
|
if ($orig_post) {
|
||||||
$str_group_allow = $orig_post['allow_gid'];
|
$str_group_allow = $orig_post['allow_gid'];
|
||||||
$str_contact_allow = $orig_post['allow_cid'];
|
$str_contact_allow = $orig_post['allow_cid'];
|
||||||
$str_group_deny = $orig_post['deny_gid'];
|
$str_group_deny = $orig_post['deny_gid'];
|
||||||
|
@ -254,11 +259,13 @@ function item_post(App $a) {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
// if coming from the API and no privacy settings are set,
|
/*
|
||||||
// use the user default permissions - as they won't have
|
* if coming from the API and no privacy settings are set,
|
||||||
// been supplied via a form.
|
* use the user default permissions - as they won't have
|
||||||
|
* been supplied via a form.
|
||||||
|
*/
|
||||||
|
|
||||||
if(($api_source)
|
if (($api_source)
|
||||||
&& (! array_key_exists('contact_allow',$_REQUEST))
|
&& (! array_key_exists('contact_allow',$_REQUEST))
|
||||||
&& (! array_key_exists('group_allow',$_REQUEST))
|
&& (! array_key_exists('group_allow',$_REQUEST))
|
||||||
&& (! array_key_exists('contact_deny',$_REQUEST))
|
&& (! array_key_exists('contact_deny',$_REQUEST))
|
||||||
|
@ -267,8 +274,7 @@ function item_post(App $a) {
|
||||||
$str_contact_allow = $user['allow_cid'];
|
$str_contact_allow = $user['allow_cid'];
|
||||||
$str_group_deny = $user['deny_gid'];
|
$str_group_deny = $user['deny_gid'];
|
||||||
$str_contact_deny = $user['deny_cid'];
|
$str_contact_deny = $user['deny_cid'];
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
|
|
||||||
// use the posted permissions
|
// use the posted permissions
|
||||||
|
|
||||||
|
@ -287,26 +293,25 @@ function item_post(App $a) {
|
||||||
$network = notags(trim($_REQUEST['network']));
|
$network = notags(trim($_REQUEST['network']));
|
||||||
$guid = get_guid(32);
|
$guid = get_guid(32);
|
||||||
|
|
||||||
|
|
||||||
item_add_language_opt($_REQUEST);
|
item_add_language_opt($_REQUEST);
|
||||||
$postopts = $_REQUEST['postopts'] ? $_REQUEST['postopts'] : "";
|
$postopts = $_REQUEST['postopts'] ? $_REQUEST['postopts'] : "";
|
||||||
|
|
||||||
|
|
||||||
$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
|
$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;
|
$private = 2;
|
||||||
|
}
|
||||||
|
|
||||||
// If this is a comment, set the permissions from the parent.
|
// If this is a comment, set the permissions from the parent.
|
||||||
|
|
||||||
if($parent_item) {
|
if ($parent_item) {
|
||||||
|
|
||||||
// for non native networks use the network of the original post as network of the item
|
// for non native networks use the network of the original post as network of the item
|
||||||
if (($parent_item['network'] != NETWORK_DIASPORA)
|
if (($parent_item['network'] != NETWORK_DIASPORA)
|
||||||
AND ($parent_item['network'] != NETWORK_OSTATUS)
|
AND ($parent_item['network'] != NETWORK_OSTATUS)
|
||||||
AND ($network == ""))
|
AND ($network == "")) {
|
||||||
$network = $parent_item['network'];
|
$network = $parent_item['network'];
|
||||||
|
}
|
||||||
|
|
||||||
$str_contact_allow = $parent_item['allow_cid'];
|
$str_contact_allow = $parent_item['allow_cid'];
|
||||||
$str_group_allow = $parent_item['allow_gid'];
|
$str_group_allow = $parent_item['allow_gid'];
|
||||||
|
@ -315,32 +320,35 @@ function item_post(App $a) {
|
||||||
$private = $parent_item['private'];
|
$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 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 ($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) {
|
if (! $mail_disabled) {
|
||||||
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
|
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
|
||||||
intval(local_user())
|
intval(local_user())
|
||||||
);
|
);
|
||||||
if (dbm::is_result($r) && intval($r[0]['pubmail']))
|
if (dbm::is_result($r) && intval($r[0]['pubmail'])) {
|
||||||
$pubmail_enabled = true;
|
$pubmail_enabled = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(! strlen($body)) {
|
if (! strlen($body)) {
|
||||||
if($preview)
|
if ($preview) {
|
||||||
killme();
|
killme();
|
||||||
info( t('Empty post discarded.') . EOL );
|
}
|
||||||
if(x($_REQUEST,'return'))
|
info(t('Empty post discarded.') . EOL );
|
||||||
|
if (x($_REQUEST, 'return')) {
|
||||||
goaway($return_path);
|
goaway($return_path);
|
||||||
|
}
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strlen($categories)) {
|
if (strlen($categories)) {
|
||||||
// get the "fileas" tags for this post
|
// get the "fileas" tags for this post
|
||||||
$filedas = file_tag_file_to_list($categories, 'file');
|
$filedas = file_tag_file_to_list($categories, 'file');
|
||||||
}
|
}
|
||||||
|
@ -348,7 +356,7 @@ function item_post(App $a) {
|
||||||
$categories_old = $categories;
|
$categories_old = $categories;
|
||||||
$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
|
$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
|
||||||
$categories_new = $categories;
|
$categories_new = $categories;
|
||||||
if(strlen($filedas)) {
|
if (strlen($filedas)) {
|
||||||
// append the fileas stuff to the new categories list
|
// append the fileas stuff to the new categories list
|
||||||
$categories .= file_tag_list_to_file($filedas, 'file');
|
$categories .= file_tag_list_to_file($filedas, 'file');
|
||||||
}
|
}
|
||||||
|
@ -359,21 +367,20 @@ function item_post(App $a) {
|
||||||
$self = false;
|
$self = false;
|
||||||
$contact_id = 0;
|
$contact_id = 0;
|
||||||
|
|
||||||
if((local_user()) && (local_user() == $profile_uid)) {
|
if ((local_user()) && (local_user() == $profile_uid)) {
|
||||||
$self = true;
|
$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` = 1 LIMIT 1",
|
||||||
intval($_SESSION['uid']));
|
intval($_SESSION['uid']));
|
||||||
}
|
} elseif(remote_user()) {
|
||||||
elseif(remote_user()) {
|
if (is_array($_SESSION['remote'])) {
|
||||||
if(is_array($_SESSION['remote'])) {
|
foreach ($_SESSION['remote'] as $v) {
|
||||||
foreach($_SESSION['remote'] as $v) {
|
if ($v['uid'] == $profile_uid) {
|
||||||
if($v['uid'] == $profile_uid) {
|
|
||||||
$contact_id = $v['cid'];
|
$contact_id = $v['cid'];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($contact_id) {
|
if ($contact_id) {
|
||||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||||
intval($contact_id)
|
intval($contact_id)
|
||||||
);
|
);
|
||||||
|
@ -387,30 +394,28 @@ function item_post(App $a) {
|
||||||
|
|
||||||
// get contact info for owner
|
// get contact info for owner
|
||||||
|
|
||||||
if($profile_uid == local_user()) {
|
if ($profile_uid == local_user()) {
|
||||||
$contact_record = $author;
|
$contact_record = $author;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
||||||
intval($profile_uid)
|
intval($profile_uid)
|
||||||
);
|
);
|
||||||
if (dbm::is_result($r))
|
if (dbm::is_result($r)) {
|
||||||
$contact_record = $r[0];
|
$contact_record = $r[0];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$post_type = notags(trim($_REQUEST['type']));
|
$post_type = notags(trim($_REQUEST['type']));
|
||||||
|
|
||||||
if($post_type === 'net-comment') {
|
if ($post_type === 'net-comment' && $parent_item !== null) {
|
||||||
if($parent_item !== null) {
|
if ($parent_item['wall'] == 1) {
|
||||||
if($parent_item['wall'] == 1)
|
|
||||||
$post_type = 'wall-comment';
|
$post_type = 'wall-comment';
|
||||||
else
|
} else {
|
||||||
$post_type = 'remote-comment';
|
$post_type = 'remote-comment';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/*
|
||||||
*
|
|
||||||
* When a photo was uploaded into the message using the (profile wall) ajax
|
* When a photo was uploaded into the message using the (profile wall) ajax
|
||||||
* uploader, The permissions are initially set to disallow anybody but the
|
* 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
|
* owner from seeing it. This is because the permissions may not yet have been
|
||||||
|
@ -418,14 +423,13 @@ function item_post(App $a) {
|
||||||
* appropriately. But we didn't know the final permissions on the post until
|
* 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
|
* 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.
|
* post and set them to the same permissions as the post itself.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$match = null;
|
$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];
|
$images = $match[2];
|
||||||
if(count($images)) {
|
if (count($images)) {
|
||||||
|
|
||||||
$objecttype = ACTIVITY_OBJ_IMAGE;
|
$objecttype = ACTIVITY_OBJ_IMAGE;
|
||||||
|
|
||||||
|
@ -466,16 +470,15 @@ function item_post(App $a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* Next link in any attachment references we find in the post.
|
* Next link in any attachment references we find in the post.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$match = false;
|
$match = false;
|
||||||
|
|
||||||
if((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) {
|
if ((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/", $body, $match)) {
|
||||||
$attaches = $match[1];
|
$attaches = $match[1];
|
||||||
if(count($attaches)) {
|
if (count($attaches)) {
|
||||||
foreach($attaches as $attach) {
|
foreach ($attaches as $attach) {
|
||||||
$r = q("SELECT * FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
$r = q("SELECT * FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||||
intval($profile_uid),
|
intval($profile_uid),
|
||||||
intval($attach)
|
intval($attach)
|
||||||
|
@ -507,46 +510,39 @@ function item_post(App $a) {
|
||||||
$body = bb_translate_video($body);
|
$body = bb_translate_video($body);
|
||||||
|
|
||||||
|
|
||||||
/**
|
// Fold multi-line [code] sequences
|
||||||
* Fold multi-line [code] sequences
|
$body = preg_replace('/\[\/code\]\s*\[code\]/ism', "\n", $body);
|
||||||
*/
|
|
||||||
|
|
||||||
$body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body);
|
|
||||||
|
|
||||||
$body = scale_external_images($body,false);
|
$body = scale_external_images($body,false);
|
||||||
|
|
||||||
|
|
||||||
// Setting the object type if not defined before
|
// Setting the object type if not defined before
|
||||||
if (!$objecttype) {
|
if (!$objecttype) {
|
||||||
$objecttype = ACTIVITY_OBJ_NOTE; // Default value
|
$objecttype = ACTIVITY_OBJ_NOTE; // Default value
|
||||||
require_once("include/plaintext.php");
|
require_once("include/plaintext.php");
|
||||||
$objectdata = get_attached_data($body);
|
$objectdata = get_attached_data($body);
|
||||||
|
|
||||||
if ($post["type"] == "link")
|
if ($post["type"] == "link") {
|
||||||
$objecttype = ACTIVITY_OBJ_BOOKMARK;
|
$objecttype = ACTIVITY_OBJ_BOOKMARK;
|
||||||
elseif ($post["type"] == "video")
|
} elseif ($post["type"] == "video") {
|
||||||
$objecttype = ACTIVITY_OBJ_VIDEO;
|
$objecttype = ACTIVITY_OBJ_VIDEO;
|
||||||
elseif ($post["type"] == "photo")
|
} elseif ($post["type"] == "photo") {
|
||||||
$objecttype = ACTIVITY_OBJ_IMAGE;
|
$objecttype = ACTIVITY_OBJ_IMAGE;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// Look for any tags and linkify them
|
||||||
* Look for any tags and linkify them
|
|
||||||
*/
|
|
||||||
|
|
||||||
$str_tags = '';
|
$str_tags = '';
|
||||||
$inform = '';
|
$inform = '';
|
||||||
|
|
||||||
|
|
||||||
$tags = get_tags($body);
|
$tags = get_tags($body);
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* add a statusnet style reply tag if the original post was from there
|
* add a statusnet style reply tag if the original post was from there
|
||||||
* and we are replying, and there isn't one already
|
* and we are replying, and there isn't one already
|
||||||
*/
|
*/
|
||||||
if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) {
|
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)) {
|
if (!in_array($contact,$tags)) {
|
||||||
$body = $contact.' '.$body;
|
$body = $contact.' '.$body;
|
||||||
|
@ -557,39 +553,43 @@ function item_post(App $a) {
|
||||||
$toplevel_parent = q("SELECT `contact`.* FROM `contact`
|
$toplevel_parent = q("SELECT `contact`.* FROM `contact`
|
||||||
INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `contact`.`url` = `item`.`author-link`
|
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));
|
WHERE `item`.`id` = `item`.`parent` AND `item`.`parent` = %d", intval($parent));
|
||||||
if ($toplevel_parent)
|
if (dbm::is_result($toplevel_parent)) {
|
||||||
$toplevel_contact = '@'.$toplevel_parent[0]['nick'].'+'.$toplevel_parent[0]['id'];
|
$toplevel_contact = '@' . $toplevel_parent[0]['nick'] . '+' . $toplevel_parent[0]['id'];
|
||||||
else {
|
} else {
|
||||||
$toplevel_parent = q("SELECT `author-link`, `author-name` FROM `item` WHERE `id` = `parent` AND `parent` = %d", intval($parent));
|
$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;
|
$tags[] = $toplevel_contact;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$tagged = array();
|
$tagged = array();
|
||||||
|
|
||||||
$private_forum = false;
|
$private_forum = false;
|
||||||
|
|
||||||
if(count($tags)) {
|
if (count($tags)) {
|
||||||
foreach($tags as $tag) {
|
foreach ($tags as $tag) {
|
||||||
|
|
||||||
if(strpos($tag,'#') === 0)
|
if (strpos($tag, '#') === 0) {
|
||||||
continue;
|
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;
|
$fullnametagged = false;
|
||||||
for($x = 0; $x < count($tagged); $x ++) {
|
for ($x = 0; $x < count($tagged); $x ++) {
|
||||||
if(stristr($tagged[$x],$tag . ' ')) {
|
if (stristr($tagged[$x],$tag . ' ')) {
|
||||||
$fullnametagged = true;
|
$fullnametagged = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if($fullnametagged)
|
if ($fullnametagged) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network);
|
$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network);
|
||||||
if ($success['replaced']) {
|
if ($success['replaced']) {
|
||||||
|
@ -668,11 +668,11 @@ function item_post(App $a) {
|
||||||
$datarray['owner-name'] = $contact_record['name'];
|
$datarray['owner-name'] = $contact_record['name'];
|
||||||
$datarray['owner-link'] = $contact_record['url'];
|
$datarray['owner-link'] = $contact_record['url'];
|
||||||
$datarray['owner-avatar'] = $contact_record['thumb'];
|
$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-name'] = $author['name'];
|
||||||
$datarray['author-link'] = $author['url'];
|
$datarray['author-link'] = $author['url'];
|
||||||
$datarray['author-avatar'] = $author['thumb'];
|
$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['created'] = datetime_convert();
|
||||||
$datarray['edited'] = datetime_convert();
|
$datarray['edited'] = datetime_convert();
|
||||||
$datarray['commented'] = datetime_convert();
|
$datarray['commented'] = datetime_convert();
|
||||||
|
@ -707,30 +707,29 @@ function item_post(App $a) {
|
||||||
"photo" => $datarray['author-avatar'], "name" => $datarray['author-name']));
|
"photo" => $datarray['author-avatar'], "name" => $datarray['author-name']));
|
||||||
$datarray['object'] = $object;
|
$datarray['object'] = $object;
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* These fields are for the convenience of plugins...
|
* These fields are for the convenience of plugins...
|
||||||
* 'self' if true indicates the owner is posting on their own wall
|
* 'self' if true indicates the owner is posting on their own wall
|
||||||
* If parent is 0 it is a top-level post.
|
* If parent is 0 it is a top-level post.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$datarray['parent'] = $parent;
|
$datarray['parent'] = $parent;
|
||||||
$datarray['self'] = $self;
|
$datarray['self'] = $self;
|
||||||
// $datarray['prvnets'] = $user['prvnets'];
|
// $datarray['prvnets'] = $user['prvnets'];
|
||||||
|
|
||||||
$datarray['parent-uri'] = ($parent == 0) ? $uri : $parent_item['uri'];
|
$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['last-child'] = 1;
|
||||||
$datarray['visible'] = 1;
|
$datarray['visible'] = 1;
|
||||||
|
|
||||||
if($orig_post)
|
if ($orig_post) {
|
||||||
$datarray['edit'] = true;
|
$datarray['edit'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
// Search for hashtags
|
// Search for hashtags
|
||||||
item_body_set_hashtags($datarray);
|
item_body_set_hashtags($datarray);
|
||||||
|
|
||||||
// preview mode - prepare the body for display and send it via json
|
// preview mode - prepare the body for display and send it via json
|
||||||
|
if ($preview) {
|
||||||
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
|
// We set the datarray ID to -1 because in preview mode the dataray
|
||||||
// doesn't have an ID.
|
// doesn't have an ID.
|
||||||
|
@ -741,12 +740,11 @@ function item_post(App $a) {
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
call_hooks('post_local',$datarray);
|
call_hooks('post_local',$datarray);
|
||||||
|
|
||||||
if(x($datarray,'cancel')) {
|
if (x($datarray, 'cancel')) {
|
||||||
logger('mod_item: post cancelled by plugin.');
|
logger('mod_item: post cancelled by plugin.');
|
||||||
if($return_path) {
|
if ($return_path) {
|
||||||
goaway($return_path);
|
goaway($return_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -762,7 +760,7 @@ function item_post(App $a) {
|
||||||
// Fill the cache field
|
// Fill the cache field
|
||||||
put_item_in_cache($datarray);
|
put_item_in_cache($datarray);
|
||||||
|
|
||||||
if($orig_post) {
|
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",
|
$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']),
|
dbesc($datarray['title']),
|
||||||
dbesc($datarray['body']),
|
dbesc($datarray['body']),
|
||||||
|
@ -785,13 +783,14 @@ function item_post(App $a) {
|
||||||
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
|
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
|
||||||
|
|
||||||
proc_run(PRIORITY_HIGH, "include/notifier.php", 'edit_post', $post_id);
|
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);
|
logger('return: ' . $return_path);
|
||||||
goaway($return_path);
|
goaway($return_path);
|
||||||
}
|
}
|
||||||
killme();
|
killme();
|
||||||
} else
|
} else {
|
||||||
$post_id = 0;
|
$post_id = 0;
|
||||||
|
}
|
||||||
|
|
||||||
q("COMMIT");
|
q("COMMIT");
|
||||||
q("START TRANSACTION;");
|
q("START TRANSACTION;");
|
||||||
|
@ -900,7 +899,7 @@ function item_post(App $a) {
|
||||||
// update filetags in pconfig
|
// update filetags in pconfig
|
||||||
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
|
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
|
||||||
|
|
||||||
if($parent) {
|
if ($parent) {
|
||||||
|
|
||||||
// This item is the last leaf and gets the comment box, clear any ancestors
|
// This item is the last leaf and gets the comment box, clear any ancestors
|
||||||
$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent` = %d AND `last-child` AND `id` != %d",
|
$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent` = %d AND `last-child` AND `id` != %d",
|
||||||
|
@ -916,7 +915,7 @@ function item_post(App $a) {
|
||||||
intval($parent)
|
intval($parent)
|
||||||
);
|
);
|
||||||
|
|
||||||
if($contact_record != $author) {
|
if ($contact_record != $author) {
|
||||||
notification(array(
|
notification(array(
|
||||||
'type' => NOTIFY_COMMENT,
|
'type' => NOTIFY_COMMENT,
|
||||||
'notify_flags' => $user['notify-flags'],
|
'notify_flags' => $user['notify-flags'],
|
||||||
|
@ -948,7 +947,7 @@ function item_post(App $a) {
|
||||||
intval($parent),
|
intval($parent),
|
||||||
intval($post_id));
|
intval($post_id));
|
||||||
|
|
||||||
if($contact_record != $author) {
|
if ($contact_record != $author) {
|
||||||
notification(array(
|
notification(array(
|
||||||
'type' => NOTIFY_WALL,
|
'type' => NOTIFY_WALL,
|
||||||
'notify_flags' => $user['notify-flags'],
|
'notify_flags' => $user['notify-flags'],
|
||||||
|
@ -969,21 +968,22 @@ function item_post(App $a) {
|
||||||
|
|
||||||
call_hooks('post_local_end', $datarray);
|
call_hooks('post_local_end', $datarray);
|
||||||
|
|
||||||
if(strlen($emailcc) && $profile_uid == local_user()) {
|
if (strlen($emailcc) && $profile_uid == local_user()) {
|
||||||
$erecips = explode(',', $emailcc);
|
$erecips = explode(',', $emailcc);
|
||||||
if(count($erecips)) {
|
if (count($erecips)) {
|
||||||
foreach($erecips as $recip) {
|
foreach ($erecips as $recip) {
|
||||||
$addr = trim($recip);
|
$addr = trim($recip);
|
||||||
if(! strlen($addr))
|
if (! strlen($addr)) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username'])
|
$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username'])
|
||||||
. '<br />';
|
. '<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'), 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;
|
$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
|
||||||
if (!$datarray['title']=='') {
|
if (!$datarray['title']=='') {
|
||||||
$subject = email_header_encode($datarray['title'],'UTF-8');
|
$subject = email_header_encode($datarray['title'], 'UTF-8');
|
||||||
} else {
|
} 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 href="' . App::get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
|
$link = '<a href="' . App::get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
|
||||||
$html = prepare_body($datarray);
|
$html = prepare_body($datarray);
|
||||||
|
@ -1032,8 +1032,9 @@ function item_post(App $a) {
|
||||||
function item_post_return($baseurl, $api_source, $return_path) {
|
function item_post_return($baseurl, $api_source, $return_path) {
|
||||||
// figure out how to return, depending on from whence we came
|
// figure out how to return, depending on from whence we came
|
||||||
|
|
||||||
if($api_source)
|
if ($api_source) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ($return_path) {
|
if ($return_path) {
|
||||||
goaway($return_path);
|
goaway($return_path);
|
||||||
|
@ -1094,9 +1095,9 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
|
||||||
$r = null;
|
$r = null;
|
||||||
|
|
||||||
//is it a person tag?
|
//is it a person tag?
|
||||||
if (strpos($tag,'@') === 0) {
|
if (strpos($tag, '@') === 0) {
|
||||||
//is it already replaced?
|
//is it already replaced?
|
||||||
if (strpos($tag,'[url=')) {
|
if (strpos($tag, '[url=')) {
|
||||||
//append tag to str_tags
|
//append tag to str_tags
|
||||||
if (!stristr($str_tags,$tag)) {
|
if (!stristr($str_tags,$tag)) {
|
||||||
if (strlen($str_tags)) {
|
if (strlen($str_tags)) {
|
||||||
|
@ -1111,19 +1112,22 @@ 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",
|
$r = q("SELECT `alias`, `name` FROM `contact` WHERE `nurl` = '%s' AND `alias` != '' AND `uid` = 0",
|
||||||
normalise_link($matches[1]));
|
normalise_link($matches[1]));
|
||||||
if (!$r)
|
if (!dbm::is_result($r)) {
|
||||||
$r = q("SELECT `alias`, `name` FROM `gcontact` WHERE `nurl` = '%s' AND `alias` != ''",
|
$r = q("SELECT `alias`, `name` FROM `gcontact` WHERE `nurl` = '%s' AND `alias` != ''",
|
||||||
normalise_link($matches[1]));
|
normalise_link($matches[1]));
|
||||||
if ($r)
|
}
|
||||||
|
if (dbm::is_result($r)) {
|
||||||
$data = $r[0];
|
$data = $r[0];
|
||||||
else
|
} else {
|
||||||
$data = probe_url($matches[1]);
|
$data = probe_url($matches[1]);
|
||||||
|
}
|
||||||
|
|
||||||
if ($data["alias"] != "") {
|
if ($data["alias"] != "") {
|
||||||
$newtag = '@[url='.$data["alias"].']'.$data["name"].'[/url]';
|
$newtag = '@[url=' . $data["alias"] . ']' . $data["name"] . '[/url]';
|
||||||
if(!stristr($str_tags,$newtag)) {
|
if (!stristr($str_tags, $newtag)) {
|
||||||
if(strlen($str_tags))
|
if (strlen($str_tags)) {
|
||||||
$str_tags .= ',';
|
$str_tags .= ',';
|
||||||
|
}
|
||||||
$str_tags .= $newtag;
|
$str_tags .= $newtag;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1133,7 +1137,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
|
||||||
}
|
}
|
||||||
$stat = false;
|
$stat = false;
|
||||||
//get the person's name
|
//get the person's name
|
||||||
$name = substr($tag,1);
|
$name = substr($tag, 1);
|
||||||
|
|
||||||
// Sometimes the tag detection doesn't seem to work right
|
// Sometimes the tag detection doesn't seem to work right
|
||||||
// This is some workaround
|
// This is some workaround
|
||||||
|
@ -1141,7 +1145,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
|
||||||
$name = $nameparts[0];
|
$name = $nameparts[0];
|
||||||
|
|
||||||
// Try to detect the contact in various ways
|
// 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/...?
|
// Is it in format @user@domain.tld or @http://domain.tld/...?
|
||||||
|
|
||||||
// First check the contact table for the address
|
// First check the contact table for the address
|
||||||
|
@ -1155,7 +1159,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
|
||||||
);
|
);
|
||||||
|
|
||||||
// Then check in the contact table for the url
|
// Then check in the contact table for the url
|
||||||
if (!$r)
|
if (!dbm::is_result($r)) {
|
||||||
$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `contact`
|
$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `contact`
|
||||||
WHERE `nurl` = '%s' AND `uid` = %d AND
|
WHERE `nurl` = '%s' AND `uid` = %d AND
|
||||||
(`network` != '%s' OR (`notify` != '' AND `alias` != ''))
|
(`network` != '%s' OR (`notify` != '' AND `alias` != ''))
|
||||||
|
@ -1164,26 +1168,29 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
|
||||||
intval($profile_uid),
|
intval($profile_uid),
|
||||||
dbesc(NETWORK_OSTATUS)
|
dbesc(NETWORK_OSTATUS)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Then check in the global contacts for the address
|
// 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`
|
$r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
|
||||||
WHERE `addr` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
|
WHERE `addr` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
|
||||||
LIMIT 1",
|
LIMIT 1",
|
||||||
dbesc($name),
|
dbesc($name),
|
||||||
dbesc(NETWORK_OSTATUS)
|
dbesc(NETWORK_OSTATUS)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Then check in the global contacts for the url
|
// Then check in the global contacts for the url
|
||||||
if (!$r)
|
if (!dbm::is_result($r)) {
|
||||||
$r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
|
$r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
|
||||||
WHERE `nurl` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
|
WHERE `nurl` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
|
||||||
LIMIT 1",
|
LIMIT 1",
|
||||||
dbesc(normalise_link($name)),
|
dbesc(normalise_link($name)),
|
||||||
dbesc(NETWORK_OSTATUS)
|
dbesc(NETWORK_OSTATUS)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (!$r) {
|
if (!dbm::is_result($r)) {
|
||||||
$probed = probe_url($name);
|
$probed = probe_url($name);
|
||||||
if ($result['network'] != NETWORK_PHANTOM) {
|
if ($result['network'] != NETWORK_PHANTOM) {
|
||||||
update_gcontact($probed);
|
update_gcontact($probed);
|
||||||
|
@ -1203,8 +1210,8 @@ 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
|
// select someone by attag or nick and the name passed in the current network
|
||||||
if(!$r AND ($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",
|
$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($name),
|
dbesc($name),
|
||||||
|
@ -1213,70 +1220,76 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
|
||||||
);
|
);
|
||||||
|
|
||||||
//select someone from this user's contacts by name in the current network
|
//select someone from this user's contacts by name in the current network
|
||||||
if (!$r AND ($network != ""))
|
if (!dbm::is_result($r) AND ($network != "")) {
|
||||||
$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
|
$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($name),
|
||||||
dbesc($network),
|
dbesc($network),
|
||||||
intval($profile_uid)
|
intval($profile_uid)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
//select someone by attag or nick and the name passed in
|
// select someone by attag or nick and the name passed in
|
||||||
if(!$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",
|
$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),
|
||||||
dbesc($name),
|
dbesc($name),
|
||||||
intval($profile_uid)
|
intval($profile_uid)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// select someone from this user's contacts by name
|
||||||
//select someone from this user's contacts by name
|
if(!dbm::is_result($r)) {
|
||||||
if(!$r)
|
|
||||||
$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
dbesc($name),
|
dbesc($name),
|
||||||
intval($profile_uid)
|
intval($profile_uid)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ($r) {
|
if (dbm::is_result($r)) {
|
||||||
if(strlen($inform) AND (isset($r[0]["notify"]) OR isset($r[0]["id"])))
|
if (strlen($inform) AND (isset($r[0]["notify"]) OR isset($r[0]["id"]))) {
|
||||||
$inform .= ',';
|
$inform .= ',';
|
||||||
|
}
|
||||||
|
|
||||||
if (isset($r[0]["id"]))
|
if (isset($r[0]["id"])) {
|
||||||
$inform .= 'cid:' . $r[0]["id"];
|
$inform .= 'cid:' . $r[0]["id"];
|
||||||
elseif (isset($r[0]["notify"]))
|
} elseif (isset($r[0]["notify"])) {
|
||||||
$inform .= $r[0]["notify"];
|
$inform .= $r[0]["notify"];
|
||||||
|
}
|
||||||
|
|
||||||
$profile = $r[0]["url"];
|
$profile = $r[0]["url"];
|
||||||
$alias = $r[0]["alias"];
|
$alias = $r[0]["alias"];
|
||||||
$newname = $r[0]["nick"];
|
$newname = $r[0]["nick"];
|
||||||
if (($newname == "") OR (($r[0]["network"] != NETWORK_OSTATUS) AND ($r[0]["network"] != NETWORK_TWITTER)
|
if (($newname == "") OR (($r[0]["network"] != NETWORK_OSTATUS) AND ($r[0]["network"] != NETWORK_TWITTER)
|
||||||
AND ($r[0]["network"] != NETWORK_STATUSNET) AND ($r[0]["network"] != NETWORK_APPNET)))
|
AND ($r[0]["network"] != NETWORK_STATUSNET) AND ($r[0]["network"] != NETWORK_APPNET))) {
|
||||||
$newname = $r[0]["name"];
|
$newname = $r[0]["name"];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//if there is an url for this persons profile
|
//if there is an url for this persons profile
|
||||||
if (isset($profile) AND ($newname != "")) {
|
if (isset($profile) AND ($newname != "")) {
|
||||||
|
|
||||||
$replaced = true;
|
$replaced = true;
|
||||||
//create profile link
|
// create profile link
|
||||||
$profile = str_replace(',','%2c',$profile);
|
$profile = str_replace(',','%2c',$profile);
|
||||||
$newtag = '@[url='.$profile.']'.$newname.'[/url]';
|
$newtag = '@[url='.$profile.']'.$newname.'[/url]';
|
||||||
$body = str_replace('@'.$name, $newtag, $body);
|
$body = str_replace('@'.$name, $newtag, $body);
|
||||||
//append tag to str_tags
|
// append tag to str_tags
|
||||||
if(! stristr($str_tags,$newtag)) {
|
if (! stristr($str_tags,$newtag)) {
|
||||||
if(strlen($str_tags))
|
if (strlen($str_tags)) {
|
||||||
$str_tags .= ',';
|
$str_tags .= ',';
|
||||||
|
}
|
||||||
$str_tags .= $newtag;
|
$str_tags .= $newtag;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Status.Net seems to require the numeric ID URL in a mention if the person isn't
|
// 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.
|
// subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
|
||||||
|
if (strlen($alias)) {
|
||||||
if(strlen($alias)) {
|
|
||||||
$newtag = '@[url='.$alias.']'.$newname.'[/url]';
|
$newtag = '@[url='.$alias.']'.$newname.'[/url]';
|
||||||
if(! stristr($str_tags,$newtag)) {
|
if (! stristr($str_tags,$newtag)) {
|
||||||
if(strlen($str_tags))
|
if (strlen($str_tags)) {
|
||||||
$str_tags .= ',';
|
$str_tags .= ',';
|
||||||
|
}
|
||||||
$str_tags .= $newtag;
|
$str_tags .= $newtag;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue