bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please

Browse source 
note that PHP5 allows 'array' as type-hint already (+ interface/class name).

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-04-08 19:05:50 +02:00
parent 8191bcc402
commit a0e5f7a59a
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 209 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

389
include/conversation.php
View file

@ -1,12 +1,14 @@
<?php <?php
require_once("include/bbcode.php"); require_once "include/bbcode.php";
require_once("include/acl_selectors.php"); require_once "include/acl_selectors.php";
// Note: the code in 'item_extract_images' and 'item_redir_and_replace_images' /*
// is identical to the code in mod/message.php for 'item_extract_images' and * Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
// 'item_redir_and_replace_images' * is identical to the code in mod/message.php for 'item_extract_images' and
* 'item_redir_and_replace_images'
*/
if (! function_exists('item_extract_images')) { if (! function_exists('item_extract_images')) {
function item_extract_images($body) { function item_extract_images($body) {
@ -30,14 +32,16 @@ function item_extract_images($body) {
$new_body = $new_body . substr($orig_body, 0, $img_start) . '[!#saved_image' . $cnt . '#!]'; $new_body = $new_body . substr($orig_body, 0, $img_start) . '[!#saved_image' . $cnt . '#!]';
$cnt++; $cnt++;
} } else {
else
$new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]')); $new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]'));
}
$orig_body = substr($orig_body, $img_end + strlen('[/img]')); $orig_body = substr($orig_body, $img_end + strlen('[/img]'));
if ($orig_body === false) // in case the body ends on a closing image tag if ($orig_body === false) {
// in case the body ends on a closing image tag
$orig_body = ''; $orig_body = '';
}
$img_start = strpos($orig_body, '[img'); $img_start = strpos($orig_body, '[img');
$img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false); $img_st_close = ($img_start !== false ? strpos(substr($orig_body, $img_start), ']') : false);
@ -79,17 +83,17 @@ function item_redir_and_replace_images($body, $images, $cid) {
$cnt = 0; $cnt = 0;
foreach ($images as $image) { foreach ($images as $image) {
// We're depending on the property of 'foreach' (specified on the PHP website) that /*
// it loops over the array starting from the first element and going sequentially * We're depending on the property of 'foreach' (specified on the PHP website) that
// to the last element * it loops over the array starting from the first element and going sequentially
* to the last element.
*/
$newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody); $newbody = str_replace('[!#saved_image' . $cnt . '#!]', '[img]' . $image . '[/img]', $newbody);
$cnt++; $cnt++;
} }
return $newbody; return $newbody;
}} }}
/** /**
* Render actions localized * Render actions localized
*/ */
@ -100,24 +104,26 @@ function localize_item(&$item){
$item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']); $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
if (activity_match($item['verb'],ACTIVITY_LIKE) if (activity_match($item['verb'], ACTIVITY_LIKE)
|| activity_match($item['verb'],ACTIVITY_DISLIKE) || activity_match($item['verb'], ACTIVITY_DISLIKE)
|| activity_match($item['verb'],ACTIVITY_ATTEND) || activity_match($item['verb'], ACTIVITY_ATTEND)
|| activity_match($item['verb'],ACTIVITY_ATTENDNO) || activity_match($item['verb'], ACTIVITY_ATTENDNO)
|| activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)){ || activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)){
$r = q("SELECT * from `item`,`contact` WHERE $r = q("SELECT * from `item`,`contact` WHERE
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
dbesc($item['parent-uri'])); dbesc($item['parent-uri']));
if (!dbm::is_result($r)) return; if (!dbm::is_result($r)) {
$obj=$r[0]; return;
}
$obj = $r[0];
$author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
$objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]'; $objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
switch($obj['verb']){ switch ($obj['verb']) {
case ACTIVITY_POST: case ACTIVITY_POST:
switch ($obj['object-type']){ switch ($obj['object-type']) {
case ACTIVITY_OBJ_EVENT: case ACTIVITY_OBJ_EVENT:
$post_type = t('event'); $post_type = t('event');
break; break;
@ -126,9 +132,10 @@ function localize_item(&$item){
} }
break; break;
default: default:
if ($obj['resource-id']){ if ($obj['resource-id']) {
$post_type = t('photo'); $post_type = t('photo');
$m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m); $m = array();
preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
$rr['plink'] = $m[1]; $rr['plink'] = $m[1];
} else { } else {
$post_type = t('status'); $post_type = t('status');
@ -137,25 +144,25 @@ function localize_item(&$item){
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]'; $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
if (activity_match($item['verb'],ACTIVITY_LIKE)) { if (activity_match($item['verb'], ACTIVITY_LIKE)) {
$bodyverb = t('%1$s likes %2$s\'s %3$s'); $bodyverb = t('%1$s likes %2$s\'s %3$s');
} }
elseif (activity_match($item['verb'],ACTIVITY_DISLIKE)) { elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) {
$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
} }
elseif (activity_match($item['verb'],ACTIVITY_ATTEND)) { elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) {
$bodyverb = t('%1$s attends %2$s\'s %3$s'); $bodyverb = t('%1$s attends %2$s\'s %3$s');
} }
elseif (activity_match($item['verb'],ACTIVITY_ATTENDNO)) { elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) {
$bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s'); $bodyverb = t('%1$s doesn\'t attend %2$s\'s %3$s');
} }
elseif (activity_match($item['verb'],ACTIVITY_ATTENDMAYBE)) { elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) {
$bodyverb = t('%1$s attends maybe %2$s\'s %3$s'); $bodyverb = t('%1$s attends maybe %2$s\'s %3$s');
} }
$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink); $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
} }
if (activity_match($item['verb'],ACTIVITY_FRIEND)) { if (activity_match($item['verb'], ACTIVITY_FRIEND)) {
if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return; if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
@ -185,7 +192,7 @@ function localize_item(&$item){
$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto; $item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
} }
if (stristr($item['verb'],ACTIVITY_POKE)) { if (stristr($item['verb'], ACTIVITY_POKE)) {
$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
if (! $verb) if (! $verb)
return; return;
@ -227,7 +234,7 @@ function localize_item(&$item){
$item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto; $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
} }
if (stristr($item['verb'],ACTIVITY_MOOD)) { if (stristr($item['verb'], ACTIVITY_MOOD)) {
$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
if (! $verb) if (! $verb)
return; return;
@ -241,7 +248,7 @@ function localize_item(&$item){
$item['body'] = sprintf($txt, $A, t($verb)); $item['body'] = sprintf($txt, $A, t($verb));
} }
if (activity_match($item['verb'],ACTIVITY_TAG)) { if (activity_match($item['verb'], ACTIVITY_TAG)) {
$r = q("SELECT * from `item`,`contact` WHERE $r = q("SELECT * from `item`,`contact` WHERE
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';", `item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
dbesc($item['parent-uri'])); dbesc($item['parent-uri']));
@ -278,7 +285,7 @@ function localize_item(&$item){
$item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag ); $item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag );
} }
if (activity_match($item['verb'],ACTIVITY_FAVORITE)){ if (activity_match($item['verb'], ACTIVITY_FAVORITE)){
if ($item['object-type']== "") if ($item['object-type']== "")
return; return;
@ -366,7 +373,7 @@ function visible_activity($item) {
} }
} }
if (activity_match($item['verb'],ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) { if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) {
if (! (($item['self']) && ($item['uid'] == local_user()))) { if (! (($item['self']) && ($item['uid'] == local_user()))) {
return false; return false;
} }
@ -468,9 +475,9 @@ function item_condition() {
if (!function_exists('conversation')) { if (!function_exists('conversation')) {
function conversation(App $a, $items, $mode, $update, $preview = false) { function conversation(App $a, $items, $mode, $update, $preview = false) {
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
require_once('include/Contact.php'); require_once 'include/Contact.php';
require_once('mod/proxy.php'); require_once 'mod/proxy.php';
$ssl_state = ((local_user()) ? true : false); $ssl_state = ((local_user()) ? true : false);
@ -497,31 +504,31 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$profile_owner = local_user(); $profile_owner = local_user();
$page_writeable = true; $page_writeable = true;
if (!$update) { if (!$update) {
// The special div is needed for liveUpdate to kick in for this page. /*
// We only launch liveUpdate if you aren't filtering in some incompatible * The special div is needed for liveUpdate to kick in for this page.
// way and also you aren't writing a comment (discovered in javascript). * We only launch liveUpdate if you aren't filtering in some incompatible
* way and also you aren't writing a comment (discovered in javascript).
*/
$live_update_div = '<div id="live-network"></div>' . "\r\n" $live_update_div = '<div id="live-network"></div>' . "\r\n"
. "<script> var profile_uid = " . $_SESSION['uid'] . "<script> var profile_uid = " . $_SESSION['uid']
. "; var netargs = '" . substr($a->cmd,8) . "; var netargs = '" . substr($a->cmd, 8)
. '?f=' . '?f='
. ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET, 'cid')) ? '&cid=' . $_GET['cid'] : '')
. ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') . ((x($_GET, 'search')) ? '&search=' . $_GET['search'] : '')
. ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') . ((x($_GET, 'star')) ? '&star=' . $_GET['star'] : '')
. ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '') . ((x($_GET, 'order')) ? '&order=' . $_GET['order'] : '')
. ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '') . ((x($_GET, 'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
. ((x($_GET,'liked')) ? '&liked=' . $_GET['liked'] : '') . ((x($_GET, 'liked')) ? '&liked=' . $_GET['liked'] : '')
. ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '') . ((x($_GET, 'conv')) ? '&conv=' . $_GET['conv'] : '')
. ((x($_GET,'spam')) ? '&spam=' . $_GET['spam'] : '') . ((x($_GET, 'spam')) ? '&spam=' . $_GET['spam'] : '')
. ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '') . ((x($_GET, 'nets')) ? '&nets=' . $_GET['nets'] : '')
. ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '') . ((x($_GET, 'cmin')) ? '&cmin=' . $_GET['cmin'] : '')
. ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '') . ((x($_GET, 'cmax')) ? '&cmax=' . $_GET['cmax'] : '')
. ((x($_GET,'file')) ? '&file=' . $_GET['file'] : '') . ((x($_GET, 'file')) ? '&file=' . $_GET['file'] : '')
. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
} }
} } elseif ($mode === 'profile') {
else if ($mode === 'profile') {
$profile_owner = $a->profile['profile_uid']; $profile_owner = $a->profile['profile_uid'];
$page_writeable = can_write_wall($a,$profile_owner); $page_writeable = can_write_wall($a,$profile_owner);
@ -529,16 +536,17 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$tab = notags(trim($_GET['tab'])); $tab = notags(trim($_GET['tab']));
$tab = ( $tab ? $tab : 'posts' ); $tab = ( $tab ? $tab : 'posts' );
if ($tab === 'posts') { if ($tab === 'posts') {
// This is ugly, but we can't pass the profile_uid through the session to the ajax updater, /*
// because browser prefetching might change it on us. We have to deliver it with the page. * This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
* because browser prefetching might change it on us. We have to deliver it with the page.
*/
$live_update_div = '<div id="live-profile"></div>' . "\r\n" $live_update_div = '<div id="live-profile"></div>' . "\r\n"
. "<script> var profile_uid = " . $a->profile['profile_uid'] . "<script> var profile_uid = " . $a->profile['profile_uid']
. "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; . "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
} }
} }
} } elseif ($mode === 'notes') {
else if ($mode === 'notes') {
$profile_owner = local_user(); $profile_owner = local_user();
$page_writeable = true; $page_writeable = true;
if (!$update) { if (!$update) {
@ -546,8 +554,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
. "<script> var profile_uid = " . local_user() . "<script> var profile_uid = " . local_user()
. "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
} }
} } elseif ($mode === 'display') {
else if ($mode === 'display') {
$profile_owner = $a->profile['uid']; $profile_owner = $a->profile['uid'];
$page_writeable = can_write_wall($a,$profile_owner); $page_writeable = can_write_wall($a,$profile_owner);
if (!$update) { if (!$update) {
@ -555,26 +562,25 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
. "<script> var profile_uid = " . $_SESSION['uid'] . ";" . "<script> var profile_uid = " . $_SESSION['uid'] . ";"
. " var profile_page = 1; </script>"; . " var profile_page = 1; </script>";
} }
} } elseif ($mode === 'community') {
else if ($mode === 'community') {
$profile_owner = 0; $profile_owner = 0;
$page_writeable = false; $page_writeable = false;
if (!$update) { if (!$update) {
$live_update_div = '<div id="live-community"></div>' . "\r\n" $live_update_div = '<div id="live-community"></div>' . "\r\n"
. "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; . "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
} }
} } elseif ($mode === 'search') {
else if ($mode === 'search') {
$live_update_div = '<div id="live-search"></div>' . "\r\n"; $live_update_div = '<div id="live-search"></div>' . "\r\n";
} }
$page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false);
if ($update) if ($update) {
$return_url = $_SESSION['return_url']; $return_url = $_SESSION['return_url'];
else } else {
$return_url = $_SESSION['return_url'] = $a->query_string; $return_url = $_SESSION['return_url'] = $a->query_string;
}
$cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview); $cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview);
call_hooks('conversation_start',$cb); call_hooks('conversation_start',$cb);
@ -615,8 +621,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
break; break;
} }
} }
if ($blocked) if ($blocked) {
continue; continue;
}
} }
@ -628,25 +635,25 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$sparkle = ''; $sparkle = '';
if ($mode === 'search' || $mode === 'community') { if ($mode === 'search' || $mode === 'community') {
if (((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) if (((activity_match($item['verb'], ACTIVITY_LIKE)) || (activity_match($item['verb'], ACTIVITY_DISLIKE)))
&& ($item['id'] != $item['parent'])) && ($item['id'] != $item['parent']))
continue; continue;
$nickname = $item['nickname']; $nickname = $item['nickname'];
} } else {
else
$nickname = $a->user['nickname']; $nickname = $a->user['nickname'];
}
// prevent private email from leaking. // prevent private email from leaking.
if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
continue; continue;
}
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
if ($item['author-link'] && (! $item['author-name'])) if ($item['author-link'] && (! $item['author-name'])) {
$profile_name = $item['author-link']; $profile_name = $item['author-link'];
}
$tags = array();
$tags=array();
$hashtags = array(); $hashtags = array();
$mentions = array(); $mentions = array();
@ -655,42 +662,48 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
foreach ($taglist as $tag) { foreach ($taglist as $tag) {
if ($tag["url"] == "") if ($tag["url"] == "") {
$tag["url"] = $searchpath.strtolower($tag["term"]); $tag["url"] = $searchpath . strtolower($tag["term"]);
}
if ($tag["type"] == TERM_HASHTAG) { if ($tag["type"] == TERM_HASHTAG) {
$hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>"; $hashtags[] = "#<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
$prefix = "#"; $prefix = "#";
} elseif ($tag["type"] == TERM_MENTION) { } elseif ($tag["type"] == TERM_MENTION) {
$mentions[] = "@<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>"; $mentions[] = "@<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
$prefix = "@"; $prefix = "@";
} }
$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>"; $tags[] = $prefix."<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
} }
$sp = false; $sp = false;
$profile_link = best_link_url($item,$sp); $profile_link = best_link_url($item,$sp);
if ($profile_link === 'mailbox') if ($profile_link === 'mailbox') {
$profile_link = ''; $profile_link = '';
if ($sp) }
if ($sp) {
$sparkle = ' sparkle'; $sparkle = ' sparkle';
else } else {
$profile_link = zrl($profile_link); $profile_link = zrl($profile_link);
}
if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) { if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) {
$author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
if ($author_contact["thumb"]) if ($author_contact["thumb"]) {
$item['author-thumb'] = $author_contact["thumb"]; $item['author-thumb'] = $author_contact["thumb"];
else } else {
$item['author-thumb'] = $item['author-avatar']; $item['author-thumb'] = $item['author-avatar'];
}
} }
if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
$owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner);
if ($owner_contact["thumb"]) if ($owner_contact["thumb"]) {
$item['owner-thumb'] = $owner_contact["thumb"]; $item['owner-thumb'] = $owner_contact["thumb"];
else } else {
$item['owner-thumb'] = $item['owner-avatar']; $item['owner-thumb'] = $item['owner-avatar'];
}
} }
$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
@ -699,11 +712,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate)); $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
localize_item($item); localize_item($item);
if ($mode === 'network-new') if ($mode === 'network-new') {
$dropping = true; $dropping = true;
else } else {
$dropping = false; $dropping = false;
}
$drop = array( $drop = array(
'dropping' => $dropping, 'dropping' => $dropping,
@ -719,8 +732,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$likebuttons = false; $likebuttons = false;
$shareable = false; $shareable = false;
$body = prepare_body($item,true, $preview); $body = prepare_body($item, true, $preview);
list($categories, $folders) = get_cats_and_terms($item); list($categories, $folders) = get_cats_and_terms($item);
@ -733,8 +745,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$mentions_e = template_escape($mentions); $mentions_e = template_escape($mentions);
$location_e = template_escape($location); $location_e = template_escape($location);
$owner_name_e = template_escape($owner_name); $owner_name_e = template_escape($owner_name);
} } else {
else {
$profile_name_e = $profile_name; $profile_name_e = $profile_name;
$item['title_e'] = $item['title']; $item['title_e'] = $item['title'];
$body_e = $body; $body_e = $body;
@ -745,8 +756,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$owner_name_e = $owner_name; $owner_name_e = $owner_name;
} }
if ($item['item_network'] == "") if ($item['item_network'] == "") {
$item['item_network'] = $item['network']; $item['item_network'] = $item['network'];
}
$tmp_item = array( $tmp_item = array(
'template' => $tpl, 'template' => $tpl,
@ -803,39 +815,36 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$threads[$threadsid]['items'] = array($arr['output']); $threads[$threadsid]['items'] = array($arr['output']);
} }
} } else {
else
{
// Normal View // Normal View
$page_template = get_markup_template("threaded_conversation.tpl"); $page_template = get_markup_template("threaded_conversation.tpl");
require_once('object/Conversation.php'); require_once 'object/Conversation.php';
require_once('object/Item.php'); require_once 'object/Item.php';
$conv = new Conversation($mode, $preview); $conv = new Conversation($mode, $preview);
// get all the topmost parents /*
// this shouldn't be needed, as we should have only them in our array * get all the topmost parents
// But for now, this array respects the old style, just in case * this shouldn't be needed, as we should have only them in our array
* But for now, this array respects the old style, just in case
*/
$threads = array(); $threads = array();
foreach ($items as $item) { foreach ($items as $item) {
if ($arr_blocked) { if ($arr_blocked) {
$blocked = false; $blocked = false;
foreach ($arr_blocked as $b) { foreach ($arr_blocked as $b) {
if ($b && link_compare($item['author-link'],$b)) { if ($b && link_compare($item['author-link'],$b)) {
$blocked = true; $blocked = true;
break; break;
} }
} }
if ($blocked) if ($blocked) {
continue; continue;
}
} }
// Can we put this after the visibility check? // Can we put this after the visibility check?
builtin_activity_puller($item, $conv_responses); builtin_activity_puller($item, $conv_responses);
@ -843,6 +852,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) { if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
continue; continue;
} }
if (! visible_activity($item)) { if (! visible_activity($item)) {
continue; continue;
} }
@ -880,7 +890,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
return $o; return $o;
}} }}
function best_link_url($item,&$sparkle,$ssl_state = false) { function best_link_url($item, &$sparkle, $ssl_state = false) {
$best_url = ''; $best_url = '';
$sparkle = false; $sparkle = false;
@ -890,16 +900,17 @@ function best_link_url($item,&$sparkle,$ssl_state = false) {
if (local_user()) { if (local_user()) {
$r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1", $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1",
dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url))); dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url)));
if ($r) { if (dbm::is_result($r)) {
$best_url = 'redir/'.$r[0]['id']; $best_url = 'redir/' . $r[0]['id'];
$sparkle = true; $sparkle = true;
} }
} }
if (! $best_url) { if (! $best_url) {
if (strlen($item['author-link'])) if (strlen($item['author-link'])) {
$best_url = $item['author-link']; $best_url = $item['author-link'];
else } else {
$best_url = $item['url']; $best_url = $item['url'];
}
} }
return $best_url; return $best_url;
@ -907,8 +918,7 @@ function best_link_url($item,&$sparkle,$ssl_state = false) {
if (! function_exists('item_photo_menu')) { if (! function_exists('item_photo_menu')) {
function item_photo_menu($item) function item_photo_menu($item) {
{
$ssl_state = false; $ssl_state = false;
if (local_user()) { if (local_user()) {
@ -939,7 +949,7 @@ function item_photo_menu($item)
$rel = 0; $rel = 0;
$r = q("SELECT `id`, `network`, `rel` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1", $r = q("SELECT `id`, `network`, `rel` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
intval(local_user()), dbesc(normalise_link($item['author-link']))); intval(local_user()), dbesc(normalise_link($item['author-link'])));
if ($r) { if (dbm::is_result($r)) {
$cid = $r[0]['id']; $cid = $r[0]['id'];
$network = $r[0]['network']; $network = $r[0]['network'];
$rel = $r[0]['rel']; $rel = $r[0]['rel'];
@ -1005,6 +1015,7 @@ function item_photo_menu($item)
return $o; return $o;
}} }}
if (! function_exists('builtin_activity_puller')) {
/** /**
* @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.) * @brief Checks item to see if it is one of the builtin activities (like/dislike, event attendance, consensus items, etc.)
* Increments the count of each matching activity and adds a link to the author as needed. * Increments the count of each matching activity and adds a link to the author as needed.
@ -1013,7 +1024,6 @@ function item_photo_menu($item)
* @param array &$conv_responses (already created with builtin activity structure) * @param array &$conv_responses (already created with builtin activity structure)
* @return void * @return void
*/ */
if (! function_exists('builtin_activity_puller')) {
function builtin_activity_puller($item, &$conv_responses) { function builtin_activity_puller($item, &$conv_responses) {
foreach ($conv_responses as $mode => $v) { foreach ($conv_responses as $mode => $v) {
$url = ''; $url = '';
@ -1045,27 +1055,31 @@ function builtin_activity_puller($item, &$conv_responses) {
if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { if ((local_user()) && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
$url = 'redir/' . $item['contact-id']; $url = 'redir/' . $item['contact-id'];
$sparkle = ' class="sparkle" '; $sparkle = ' class="sparkle" ';
} } else {
else
$url = zrl($url); $url = zrl($url);
}
$url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>'; $url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';
if (! $item['thr-parent']) if (! $item['thr-parent']) {
$item['thr-parent'] = $item['parent-uri']; $item['thr-parent'] = $item['parent-uri'];
}
if (! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l'])) if (! ((isset($conv_responses[$mode][$item['thr-parent'] . '-l']))
&& (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) && (is_array($conv_responses[$mode][$item['thr-parent'] . '-l'])))) {
$conv_responses[$mode][$item['thr-parent'] . '-l'] = array(); $conv_responses[$mode][$item['thr-parent'] . '-l'] = array();
}
// only list each unique author once // only list each unique author once
if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) if (in_array($url,$conv_responses[$mode][$item['thr-parent'] . '-l'])) {
continue; continue;
}
if (! isset($conv_responses[$mode][$item['thr-parent']])) if (! isset($conv_responses[$mode][$item['thr-parent']])) {
$conv_responses[$mode][$item['thr-parent']] = 1; $conv_responses[$mode][$item['thr-parent']] = 1;
else } else {
$conv_responses[$mode][$item['thr-parent']] ++; $conv_responses[$mode][$item['thr-parent']] ++;
}
if (public_contact() == $item['author-id']) { if (public_contact() == $item['author-id']) {
$conv_responses[$mode][$item['thr-parent'] . '-self'] = 1; $conv_responses[$mode][$item['thr-parent'] . '-self'] = 1;
@ -1079,15 +1093,16 @@ function builtin_activity_puller($item, &$conv_responses) {
} }
}} }}
// Format the vote text for a profile item
// $cnt = number of people who vote the item
// $arr = array of pre-linked names of likers/dislikers
// $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
// $id = item id
// returns formatted text
if (! function_exists('format_like')) { if (! function_exists('format_like')) {
function format_like($cnt,$arr,$type,$id) { /**
* Format the vote text for a profile item
* @param int $cnt = number of people who vote the item
* @param array $arr = array of pre-linked names of likers/dislikers
* @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
* @param int $id = item id
* @return formatted text
*/
function format_like($cnt, array $arr, $type, $id) {
$o = ''; $o = '';
$expanded = ''; $expanded = '';
@ -1133,7 +1148,7 @@ function format_like($cnt,$arr,$type,$id) {
$spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\""; $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
switch($type) { switch ($type) {
case 'like': case 'like':
$phrase = sprintf( t('<span %1$s>%2$d people</span> like this'), $spanatts, $cnt); $phrase = sprintf( t('<span %1$s>%2$d people</span> like this'), $spanatts, $cnt);
$explikers = sprintf( t('%s like this.'), $likers); $explikers = sprintf( t('%s like this.'), $likers);
@ -1170,11 +1185,10 @@ function format_like($cnt,$arr,$type,$id) {
return $o; return $o;
}} }}
function status_editor($a,$x, $notes_cid = 0, $popup = false) {
function status_editor($a,$x, $notes_cid = 0, $popup=false) {
$o = ''; $o = '';
$geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); $geotag = (x($x, 'allow_location') ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : '');
$tpl = get_markup_template('jot-header.tpl'); $tpl = get_markup_template('jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array( $a->page['htmlhead'] .= replace_macros($tpl, array(
@ -1212,24 +1226,27 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
// Private/public post links for the non-JS ACL form // Private/public post links for the non-JS ACL form
$private_post = 1; $private_post = 1;
if ($_REQUEST['public']) if ($_REQUEST['public']) {
$private_post = 0; $private_post = 0;
}
$query_str = $a->query_string; $query_str = $a->query_string;
if (strpos($query_str, 'public=1') !== false) if (strpos($query_str, 'public=1') !== false) {
$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str); $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
}
// I think $a->query_string may never have ? in it, but I could be wrong /*
// It looks like it's from the index.php?q=[etc] rewrite that the web * I think $a->query_string may never have ? in it, but I could be wrong
// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 * It looks like it's from the index.php?q=[etc] rewrite that the web
if (strpos($query_str, '?') === false) * server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
*/
if (strpos($query_str, '?') === false) {
$public_post_link = '?public=1'; $public_post_link = '?public=1';
else } else {
$public_post_link = '&public=1'; $public_post_link = '&public=1';
}
// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
// $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
$tpl = get_markup_template("jot.tpl"); $tpl = get_markup_template("jot.tpl");
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
@ -1293,7 +1310,6 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
if ($popup==true){ if ($popup==true){
$o = '<div id="jot-popup" style="display: none;">'.$o.'</div>'; $o = '<div id="jot-popup" style="display: none;">'.$o.'</div>';
} }
return $o; return $o;
@ -1305,18 +1321,18 @@ function get_item_children($arr, $parent) {
$a = get_app(); $a = get_app();
foreach ($arr as $item) { foreach ($arr as $item) {
if ($item['id'] != $item['parent']) { if ($item['id'] != $item['parent']) {
if (get_config('system','thread_allow') && $a->theme_thread_allow) { if (get_config('system', 'thread_allow') && $a->theme_thread_allow) {
// Fallback to parent-uri if thr-parent is not set // Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent']; $thr_parent = $item['thr-parent'];
if ($thr_parent == '') if ($thr_parent == '') {
$thr_parent = $item['parent-uri']; $thr_parent = $item['parent-uri'];
}
if ($thr_parent == $parent['uri']) { if ($thr_parent == $parent['uri']) {
$item['children'] = get_item_children($arr, $item); $item['children'] = get_item_children($arr, $item);
$children[] = $item; $children[] = $item;
} }
} } elseif ($item['parent'] == $parent['id']) {
else if ($item['parent'] == $parent['id']) {
$children[] = $item; $children[] = $item;
} }
} }
@ -1324,9 +1340,10 @@ function get_item_children($arr, $parent) {
return $children; return $children;
} }
/// @TODO Add type-hint
function sort_item_children($items) { function sort_item_children($items) {
$result = $items; $result = $items;
usort($result,'sort_thr_created_rev'); usort($result, 'sort_thr_created_rev');
foreach ($result as $k => $i) { foreach ($result as $k => $i) {
if (count($result[$k]['children'])) { if (count($result[$k]['children'])) {
$result[$k]['children'] = sort_item_children($result[$k]['children']); $result[$k]['children'] = sort_item_children($result[$k]['children']);
@ -1335,6 +1352,7 @@ function sort_item_children($items) {
return $result; return $result;
} }
/// @TODO Add type-hint
function add_children_to_list($children, &$arr) { function add_children_to_list($children, &$arr) {
foreach ($children as $y) { foreach ($children as $y) {
$arr[] = $y; $arr[] = $y;
@ -1344,7 +1362,8 @@ function add_children_to_list($children, &$arr) {
} }
} }
function conv_sort($arr,$order) { /// @TODO Add type-hint
function conv_sort($arr, $order) {
if ((!(is_array($arr) && count($arr)))) { if ((!(is_array($arr) && count($arr)))) {
return array(); return array();
@ -1382,6 +1401,7 @@ function conv_sort($arr,$order) {
} }
} }
/// @TODO Old-lost code?
/*foreach ($arr as $x) { /*foreach ($arr as $x) {
if ($x['id'] != $x['parent']) { if ($x['id'] != $x['parent']) {
$p = find_thread_parent_index($parents,$x); $p = find_thread_parent_index($parents,$x);
@ -1393,6 +1413,7 @@ function conv_sort($arr,$order) {
foreach ($parents as $k => $v) { foreach ($parents as $k => $v) {
if (count($parents[$k]['children'])) { if (count($parents[$k]['children'])) {
$parents[$k]['children'] = sort_item_children($parents[$k]['children']); $parents[$k]['children'] = sort_item_children($parents[$k]['children']);
/// @TODO Old-lost code?
/*$y = $parents[$k]['children']; /*$y = $parents[$k]['children'];
usort($y,'sort_thr_created_rev'); usort($y,'sort_thr_created_rev');
$parents[$k]['children'] = $y;*/ $parents[$k]['children'] = $y;*/
@ -1406,6 +1427,7 @@ function conv_sort($arr,$order) {
$ret[] = $x; $ret[] = $x;
if (count($x['children'])) { if (count($x['children'])) {
add_children_to_list($x['children'], $ret); add_children_to_list($x['children'], $ret);
/// @TODO Old-lost code?
/*foreach ($x['children'] as $y) /*foreach ($x['children'] as $y)
$ret[] = $y;*/ $ret[] = $y;*/
} }
@ -1415,20 +1437,23 @@ function conv_sort($arr,$order) {
return $ret; return $ret;
} }
/// @TODO Add type-hint
function sort_thr_created($a,$b) { function sort_thr_created($a, $b) {
return strcmp($b['created'],$a['created']); return strcmp($b['created'], $a['created']);
} }
function sort_thr_created_rev($a,$b) { /// @TODO Add type-hint
return strcmp($a['created'],$b['created']); function sort_thr_created_rev($a, $b) {
return strcmp($a['created'], $b['created']);
} }
function sort_thr_commented($a,$b) { /// @TODO Add type-hint
return strcmp($b['commented'],$a['commented']); function sort_thr_commented($a, $b) {
return strcmp($b['commented'], $a['commented']);
} }
function find_thread_parent_index($arr,$x) { /// @TODO Add type-hint
function find_thread_parent_index($arr, $x) {
foreach ($arr as $k => $v) { foreach ($arr as $k => $v) {
if ($v['id'] == $x['parent']) { if ($v['id'] == $x['parent']) {
return $k; return $k;
@ -1437,21 +1462,25 @@ function find_thread_parent_index($arr,$x) {
return false; return false;
} }
/// @TODO Add type-hint
function render_location_dummy($item) { function render_location_dummy($item) {
if ($item['location'] != "") if ($item['location'] != "") {
return $item['location']; return $item['location'];
}
if ($item['coord'] != "") if ($item['coord'] != "") {
return $item['coord']; return $item['coord'];
}
} }
function get_responses($conv_responses,$response_verbs,$ob,$item) { /// @TODO Add type-hint
function get_responses($conv_responses, $response_verbs, $ob, $item) {
$ret = array(); $ret = array();
foreach ($response_verbs as $v) { foreach ($response_verbs as $v) {
$ret[$v] = array(); $ret[$v] = array();
$ret[$v]['count'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri']] : ''); $ret[$v]['count'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri']] : '');
$ret[$v]['list'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : ''); $ret[$v]['list'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-l'] : '');
$ret[$v]['self'] = ((x($conv_responses[$v],$item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0'); $ret[$v]['self'] = ((x($conv_responses[$v], $item['uri'])) ? $conv_responses[$v][$item['uri'] . '-self'] : '0');
if (count($ret[$v]['list']) > MAX_LIKERS) { if (count($ret[$v]['list']) > MAX_LIKERS) {
$ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS); $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-' array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-'
@ -1459,7 +1488,7 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) {
} else { } else {
$ret[$v]['list_part'] = ''; $ret[$v]['list_part'] = '';
} }
$ret[$v]['button'] = get_response_button_text($v,$ret[$v]['count']); $ret[$v]['button'] = get_response_button_text($v, $ret[$v]['count']);
$ret[$v]['title'] = $conv_responses[$v]['title']; $ret[$v]['title'] = $conv_responses[$v]['title'];
} }
@ -1474,22 +1503,22 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) {
return $ret; return $ret;
} }
function get_response_button_text($v,$count) { function get_response_button_text($v, $count) {
switch($v) { switch ($v) {
case 'like': case 'like':
return tt('Like','Likes',$count,'noun'); return tt('Like','Likes', $count,'noun');
break; break;
case 'dislike': case 'dislike':
return tt('Dislike','Dislikes',$count,'noun'); return tt('Dislike','Dislikes', $count,'noun');
break; break;
case 'attendyes': case 'attendyes':
return tt('Attending','Attending',$count,'noun'); return tt('Attending','Attending', $count,'noun');
break; break;
case 'attendno': case 'attendno':
return tt('Not Attending','Not Attending',$count,'noun'); return tt('Not Attending','Not Attending', $count,'noun');
break; break;
case 'attendmaybe': case 'attendmaybe':
return tt('Undecided','Undecided',$count,'noun'); return tt('Undecided','Undecided', $count,'noun');
break; break;
} }
} }