Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
23770896c1
|
|
@ -59,8 +59,8 @@ function item_redir_and_replace_images($body, $images, $cid) {
|
|||
while($pos !== false && $cnt < 1000) {
|
||||
|
||||
$search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is';
|
||||
$replace = '[url=' . z_path() . '/redir/' . $cid
|
||||
. '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]';
|
||||
$replace = '[url=' . z_path() . '/redir/' . $cid
|
||||
. '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]';
|
||||
|
||||
$newbody .= substr($origbody, 0, $pos['start']['open']);
|
||||
$subject = substr($origbody, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']);
|
||||
|
|
@ -101,15 +101,15 @@ function localize_item(&$item){
|
|||
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
||||
if ($item['verb']=== ACTIVITY_LIKE || $item['verb']=== ACTIVITY_DISLIKE){
|
||||
|
||||
$r = q("SELECT * from `item`,`contact` WHERE
|
||||
$r = q("SELECT * from `item`,`contact` WHERE
|
||||
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
|
||||
dbesc($item['parent-uri']));
|
||||
if(count($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]';
|
||||
|
||||
|
||||
switch($obj['verb']){
|
||||
case ACTIVITY_POST:
|
||||
switch ($obj['object-type']){
|
||||
|
|
@ -123,15 +123,15 @@ function localize_item(&$item){
|
|||
default:
|
||||
if($obj['resource-id']){
|
||||
$post_type = t('photo');
|
||||
$m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
|
||||
$m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
|
||||
$rr['plink'] = $m[1];
|
||||
} else {
|
||||
$post_type = t('status');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
|
||||
|
||||
|
||||
switch($item['verb']){
|
||||
case ACTIVITY_LIKE :
|
||||
$bodyverb = t('%1$s likes %2$s\'s %3$s');
|
||||
|
|
@ -141,7 +141,7 @@ function localize_item(&$item){
|
|||
break;
|
||||
}
|
||||
$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
|
||||
|
||||
|
||||
}
|
||||
if ($item['verb']=== ACTIVITY_FRIEND){
|
||||
|
||||
|
|
@ -149,12 +149,12 @@ function localize_item(&$item){
|
|||
|
||||
$Aname = $item['author-name'];
|
||||
$Alink = $item['author-link'];
|
||||
|
||||
|
||||
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
||||
|
||||
|
||||
$obj = parse_xml_string($xmlhead.$item['object']);
|
||||
$links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
|
||||
|
||||
|
||||
$Bname = $obj->title;
|
||||
$Blink = ""; $Bphoto = "";
|
||||
foreach ($links->link as $l){
|
||||
|
|
@ -163,9 +163,9 @@ function localize_item(&$item){
|
|||
case "alternate": $Blink = $atts['href'];
|
||||
case "photo": $Bphoto = $atts['href'];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
|
||||
$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
|
||||
if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
|
||||
|
|
@ -181,12 +181,12 @@ function localize_item(&$item){
|
|||
|
||||
$Aname = $item['author-name'];
|
||||
$Alink = $item['author-link'];
|
||||
|
||||
|
||||
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
||||
|
||||
|
||||
$obj = parse_xml_string($xmlhead.$item['object']);
|
||||
$links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
|
||||
|
||||
|
||||
$Bname = $obj->title;
|
||||
$Blink = ""; $Bphoto = "";
|
||||
foreach ($links->link as $l){
|
||||
|
|
@ -195,9 +195,9 @@ function localize_item(&$item){
|
|||
case "alternate": $Blink = $atts['href'];
|
||||
case "photo": $Bphoto = $atts['href'];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
|
||||
$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
|
||||
if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
|
||||
|
|
@ -224,22 +224,22 @@ function localize_item(&$item){
|
|||
$Aname = $item['author-name'];
|
||||
$Alink = $item['author-link'];
|
||||
$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
|
||||
|
||||
|
||||
$txt = t('%1$s is currently %2$s');
|
||||
|
||||
$item['body'] = sprintf($txt, $A, t($verb));
|
||||
}
|
||||
|
||||
if ($item['verb']===ACTIVITY_TAG){
|
||||
$r = q("SELECT * from `item`,`contact` WHERE
|
||||
if ($item['verb']===ACTIVITY_TAG){
|
||||
$r = q("SELECT * from `item`,`contact` WHERE
|
||||
`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
|
||||
dbesc($item['parent-uri']));
|
||||
if(count($r)==0) return;
|
||||
$obj=$r[0];
|
||||
|
||||
$author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
|
||||
|
||||
$author = '[url=' . zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
|
||||
$objauthor = '[url=' . zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
|
||||
|
||||
|
||||
switch($obj['verb']){
|
||||
case ACTIVITY_POST:
|
||||
switch ($obj['object-type']){
|
||||
|
|
@ -253,19 +253,19 @@ function localize_item(&$item){
|
|||
default:
|
||||
if($obj['resource-id']){
|
||||
$post_type = t('photo');
|
||||
$m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
|
||||
$m=array(); preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
|
||||
$rr['plink'] = $m[1];
|
||||
} else {
|
||||
$post_type = t('status');
|
||||
}
|
||||
}
|
||||
$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
|
||||
|
||||
|
||||
$parsedobj = parse_xml_string($xmlhead.$item['object']);
|
||||
|
||||
|
||||
$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
|
||||
$item['body'] = sprintf( t('%1$s tagged %2$s\'s %3$s with %4$s'), $author, $objauthor, $plink, $tag );
|
||||
|
||||
|
||||
}
|
||||
if ($item['verb']=== ACTIVITY_FAVORITE){
|
||||
|
||||
|
|
@ -274,9 +274,9 @@ function localize_item(&$item){
|
|||
|
||||
$Aname = $item['author-name'];
|
||||
$Alink = $item['author-link'];
|
||||
|
||||
|
||||
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
||||
|
||||
|
||||
$obj = parse_xml_string($xmlhead.$item['object']);
|
||||
if(strlen($obj->id)) {
|
||||
$r = q("select * from item where uri = '%s' and uid = %d limit 1",
|
||||
|
|
@ -318,7 +318,7 @@ function localize_item(&$item){
|
|||
$y = best_link_url($item,$sparkle,true);
|
||||
if(strstr($y,'/redir/'))
|
||||
$item['plink'] = $y . '?f=&url=' . $item['plink'];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -353,9 +353,9 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
$wallwall_template = 'wallwall_thread.tpl';
|
||||
$items_seen = 0;
|
||||
$nb_items = count($items);
|
||||
|
||||
|
||||
$total_children = $nb_items;
|
||||
|
||||
|
||||
foreach($items as $item) {
|
||||
if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
|
||||
// Don't count it as a visible item
|
||||
|
|
@ -378,9 +378,9 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
$items_seen++;
|
||||
|
||||
|
||||
$comment = '';
|
||||
$template = $wall_template;
|
||||
$commentww = '';
|
||||
|
|
@ -417,13 +417,13 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
$item_writeable = (($item['writable'] || $item['self']) ? true : false);
|
||||
|
||||
// This will allow us to comment on wall-to-wall items owned by our friends
|
||||
// and community forums even if somebody else wrote the post.
|
||||
// and community forums even if somebody else wrote the post.
|
||||
|
||||
if($visiting && $mode == 'profile')
|
||||
$item_writeable = true;
|
||||
|
||||
$show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
|
||||
$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|
||||
$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|
||||
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
|
||||
? t('Private Message')
|
||||
: false);
|
||||
|
|
@ -436,10 +436,10 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
|
||||
$drop = array(
|
||||
'dropping' => $dropping,
|
||||
'select' => t('Select'),
|
||||
'select' => t('Select'),
|
||||
'delete' => t('Delete'),
|
||||
);
|
||||
|
||||
|
||||
$filer = (($profile_owner == local_user()) ? t("save to folder") : false);
|
||||
|
||||
$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
|
||||
|
|
@ -454,7 +454,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
if($sp)
|
||||
$sparkle = ' sparkle';
|
||||
else
|
||||
$profile_link = zrl($profile_link);
|
||||
$profile_link = zrl($profile_link);
|
||||
|
||||
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
|
||||
if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
|
||||
|
|
@ -487,7 +487,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
$owner_photo = $a->page_contact['thumb'];
|
||||
$owner_name = $a->page_contact['name'];
|
||||
$template = $wallwall_template;
|
||||
$commentww = 'ww';
|
||||
$commentww = 'ww';
|
||||
}
|
||||
else if($item['owner-link']) {
|
||||
|
||||
|
|
@ -497,14 +497,14 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
|
||||
|
||||
// The author url doesn't match the owner (typically the contact)
|
||||
// and also doesn't match the contact alias.
|
||||
// The name match is a hack to catch several weird cases where URLs are
|
||||
// and also doesn't match the contact alias.
|
||||
// The name match is a hack to catch several weird cases where URLs are
|
||||
// all over the park. It can be tricked, but this prevents you from
|
||||
// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
|
||||
// well that it's the same Bob Smith.
|
||||
// well that it's the same Bob Smith.
|
||||
|
||||
// But it could be somebody else with the same name. It just isn't highly likely.
|
||||
|
||||
// But it could be somebody else with the same name. It just isn't highly likely.
|
||||
|
||||
|
||||
$owner_url = $item['owner-link'];
|
||||
$owner_photo = $item['owner-avatar'];
|
||||
|
|
@ -512,7 +512,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
$template = $wallwall_template;
|
||||
$commentww = 'ww';
|
||||
// If it is our contact, use a friendly redirect link
|
||||
if((link_compare($item['owner-link'],$item['url']))
|
||||
if((link_compare($item['owner-link'],$item['url']))
|
||||
&& ($item['network'] === NETWORK_DFRN)) {
|
||||
$owner_url = $redirect_url;
|
||||
$osparkle = ' sparkle';
|
||||
|
|
@ -577,7 +577,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
}
|
||||
$comment = replace_macros($cmnt_tpl,array(
|
||||
'$return_path' => '',
|
||||
'$threaded' => $comments_threaded,
|
||||
'$threaded' => $comments_threaded,
|
||||
'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
|
||||
'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
|
||||
'$id' => $item['item_id'],
|
||||
|
|
@ -618,7 +618,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
'comment_lastcollapsed' => $lastcollapsed,
|
||||
// template to use to render item (wall, walltowall, search)
|
||||
'template' => $template,
|
||||
|
||||
|
||||
'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
|
||||
'tags' => $tags,
|
||||
'body' => template_escape($body),
|
||||
|
|
@ -690,7 +690,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
$item_result['comment'] = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$result[] = $item_result;
|
||||
}
|
||||
|
||||
|
|
@ -703,7 +703,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
|
|||
* - Sequential or unthreaded ("New Item View" or search results)
|
||||
* - conversation view
|
||||
* The $mode parameter decides between the various renderings and also
|
||||
* figures out how to determine page owner and other contextual items
|
||||
* figures out how to determine page owner and other contextual items
|
||||
* that are based on unique features of the calling module.
|
||||
*
|
||||
*/
|
||||
|
|
@ -768,19 +768,19 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
|
||||
$alike = array();
|
||||
$dlike = array();
|
||||
|
||||
|
||||
|
||||
|
||||
// array with html for each thread (parent+comments)
|
||||
$threads = array();
|
||||
$threadsid = -1;
|
||||
|
||||
$page_template = get_markup_template("conversation.tpl");
|
||||
|
||||
|
||||
if($items && count($items)) {
|
||||
|
||||
if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
|
||||
|
||||
// "New Item View" on network page or search page results
|
||||
// "New Item View" on network page or search page results
|
||||
// - just loop through the items and format them minimally for display
|
||||
|
||||
//$tpl = get_markup_template('search_item.tpl');
|
||||
|
|
@ -796,18 +796,18 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
$sparkle = '';
|
||||
|
||||
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']))
|
||||
continue;
|
||||
$nickname = $item['nickname'];
|
||||
}
|
||||
else
|
||||
$nickname = $a->user['nickname'];
|
||||
|
||||
|
||||
// prevent private email from leaking.
|
||||
if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
|
||||
continue;
|
||||
|
||||
|
||||
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
|
||||
if($item['author-link'] && (! $item['author-name']))
|
||||
$profile_name = $item['author-link'];
|
||||
|
|
@ -821,7 +821,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
if($sp)
|
||||
$sparkle = ' sparkle';
|
||||
else
|
||||
$profile_link = zrl($profile_link);
|
||||
$profile_link = zrl($profile_link);
|
||||
|
||||
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
|
||||
if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
|
||||
|
|
@ -843,19 +843,19 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
|
||||
$drop = array(
|
||||
'dropping' => $dropping,
|
||||
'select' => t('Select'),
|
||||
'select' => t('Select'),
|
||||
'delete' => t('Delete'),
|
||||
);
|
||||
|
||||
$star = false;
|
||||
$isstarred = "unstarred";
|
||||
|
||||
|
||||
$lock = false;
|
||||
$likebuttons = false;
|
||||
$shareable = false;
|
||||
|
||||
$body = prepare_body($item,true);
|
||||
|
||||
|
||||
//$tmp_item = replace_macros($tpl,array(
|
||||
$tmp_item = array(
|
||||
'template' => $tpl,
|
||||
|
|
@ -906,25 +906,44 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
// Normal View
|
||||
$page_template = get_markup_template("threaded_conversation.tpl");
|
||||
|
||||
require_once('object/Conversation.php');
|
||||
require_once('object/Item.php');
|
||||
|
||||
$conv = new Conversation($mode, $preview);
|
||||
|
||||
// get all the topmost parents
|
||||
// this shouldn't be needed, as we should have only them in ou array
|
||||
// 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();
|
||||
foreach($items as $item) {
|
||||
|
||||
// Can we put this after the visibility check?
|
||||
like_puller($a,$item,$alike,'like');
|
||||
like_puller($a,$item,$dlike,'dislike');
|
||||
|
||||
// Only add what is visible
|
||||
if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
|
||||
continue;
|
||||
}
|
||||
if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if($item['id'] == $item['parent']) {
|
||||
$threads[] = $item;
|
||||
$item_object = new Item($item);
|
||||
$conv->add_thread($item_object);
|
||||
}
|
||||
}
|
||||
|
||||
$threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $previewing);
|
||||
$threads = $conv->get_template_data($alike, $dlike);
|
||||
if(!$threads) {
|
||||
logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
|
||||
$threads = array();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$o = replace_macros($page_template, array(
|
||||
'$baseurl' => $a->get_baseurl($ssl_state),
|
||||
'$mode' => $mode,
|
||||
|
|
@ -985,7 +1004,7 @@ function item_photo_menu($item){
|
|||
$posts_link="";
|
||||
|
||||
$sparkle = false;
|
||||
$profile_link = best_link_url($item,$sparkle,$ssl_state);
|
||||
$profile_link = best_link_url($item,$sparkle,$ssl_state);
|
||||
if($profile_link === 'mailbox')
|
||||
$profile_link = '';
|
||||
|
||||
|
|
@ -1001,7 +1020,7 @@ function item_photo_menu($item){
|
|||
$profile_link = zrl($profile_link);
|
||||
if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
|
||||
$cid = $item['contact-id'];
|
||||
}
|
||||
}
|
||||
else {
|
||||
$cid = 0;
|
||||
}
|
||||
|
|
@ -1027,18 +1046,18 @@ function item_photo_menu($item){
|
|||
t("View Status") => $status_link,
|
||||
t("View Profile") => $profile_link,
|
||||
t("View Photos") => $photos_link,
|
||||
t("Network Posts") => $posts_link,
|
||||
t("Network Posts") => $posts_link,
|
||||
t("Edit Contact") => $contact_url,
|
||||
t("Send PM") => $pm_url,
|
||||
t("Poke") => $poke_link
|
||||
);
|
||||
|
||||
|
||||
|
||||
|
||||
$args = array('item' => $item, 'menu' => $menu);
|
||||
|
||||
|
||||
call_hooks('item_photo_menu', $args);
|
||||
|
||||
$menu = $args['menu'];
|
||||
$menu = $args['menu'];
|
||||
|
||||
$o = "";
|
||||
foreach($menu as $k=>$v){
|
||||
|
|
@ -1070,7 +1089,7 @@ function like_puller($a,$item,&$arr,$mode) {
|
|||
$arr[$item['thr-parent'] . '-l'] = array();
|
||||
if(! isset($arr[$item['thr-parent']]))
|
||||
$arr[$item['thr-parent']] = 1;
|
||||
else
|
||||
else
|
||||
$arr[$item['thr-parent']] ++;
|
||||
$arr[$item['thr-parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['author-name'] . '</a>';
|
||||
}
|
||||
|
|
@ -1091,10 +1110,10 @@ function format_like($cnt,$arr,$type,$id) {
|
|||
$o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
|
||||
else {
|
||||
$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
|
||||
$o .= (($type === 'like') ?
|
||||
$o .= (($type === 'like') ?
|
||||
sprintf( t('<span %1$s>%2$d people</span> like this.'), $spanatts, $cnt)
|
||||
:
|
||||
sprintf( t('<span %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) );
|
||||
:
|
||||
sprintf( t('<span %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) );
|
||||
$o .= EOL ;
|
||||
$total = count($arr);
|
||||
if($total >= MAX_LIKERS)
|
||||
|
|
@ -1114,7 +1133,7 @@ function format_like($cnt,$arr,$type,$id) {
|
|||
function status_editor($a,$x, $notes_cid = 0, $popup=false) {
|
||||
|
||||
$o = '';
|
||||
|
||||
|
||||
$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
|
||||
|
||||
$plaintext = false;
|
||||
|
|
@ -1156,7 +1175,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
|
|||
|
||||
|
||||
$tpl = get_markup_template("jot.tpl");
|
||||
|
||||
|
||||
$jotplugins = '';
|
||||
$jotnets = '';
|
||||
|
||||
|
|
@ -1187,7 +1206,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
|
|||
if($notes_cid)
|
||||
$jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
|
||||
|
||||
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
|
||||
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$return_path' => $a->query_string,
|
||||
|
|
@ -1236,7 +1255,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
|
|||
|
||||
if ($popup==true){
|
||||
$o = '<div id="jot-popup" style="display: none;">'.$o.'</div>';
|
||||
|
||||
|
||||
}
|
||||
|
||||
return $o;
|
||||
|
|
@ -1252,7 +1271,7 @@ function get_item_children($arr, $parent) {
|
|||
$thr_parent = $item['thr-parent'];
|
||||
if($thr_parent == '')
|
||||
$thr_parent = $item['parent-uri'];
|
||||
|
||||
|
||||
if($thr_parent == $parent['uri']) {
|
||||
$item['children'] = get_item_children($arr, $item);
|
||||
$children[] = $item;
|
||||
|
|
@ -1303,7 +1322,7 @@ function conv_sort($arr,$order) {
|
|||
usort($parents,'sort_thr_commented');
|
||||
|
||||
if(count($parents))
|
||||
foreach($parents as $i=>$_x)
|
||||
foreach($parents as $i=>$_x)
|
||||
$parents[$i]['children'] = get_item_children($arr, $_x);
|
||||
|
||||
/*foreach($arr as $x) {
|
||||
|
|
@ -1321,7 +1340,7 @@ function conv_sort($arr,$order) {
|
|||
usort($y,'sort_thr_created_rev');
|
||||
$parents[$k]['children'] = $y;*/
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$ret = array();
|
||||
|
|
|
|||
|
|
@ -2620,22 +2620,32 @@ function local_delivery($importer,$data) {
|
|||
// Specifically, the recipient?
|
||||
|
||||
$is_a_remote_comment = false;
|
||||
|
||||
// POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
|
||||
$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`,
|
||||
`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item`
|
||||
LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||
WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' or `item`.`thr-parent` = '%s')
|
||||
AND `item`.`uid` = %d
|
||||
$sql_extra
|
||||
$top_uri = $parent_uri;
|
||||
|
||||
$r = q("select `item`.`parent-uri` from `item`
|
||||
WHERE `item`.`uri` = '%s'
|
||||
LIMIT 1",
|
||||
dbesc($parent_uri),
|
||||
dbesc($parent_uri),
|
||||
dbesc($parent_uri),
|
||||
intval($importer['importer_uid'])
|
||||
dbesc($parent_uri)
|
||||
);
|
||||
if($r && count($r))
|
||||
$is_a_remote_comment = true;
|
||||
if($r && count($r)) {
|
||||
$top_uri = $r[0]['parent-uri'];
|
||||
|
||||
// POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
|
||||
$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`,
|
||||
`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item`
|
||||
LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||
WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' or `item`.`thr-parent` = '%s')
|
||||
AND `item`.`uid` = %d
|
||||
$sql_extra
|
||||
LIMIT 1",
|
||||
dbesc($top_uri),
|
||||
dbesc($top_uri),
|
||||
dbesc($top_uri),
|
||||
intval($importer['importer_uid'])
|
||||
);
|
||||
if($r && count($r))
|
||||
$is_a_remote_comment = true;
|
||||
}
|
||||
|
||||
// Does this have the characteristics of a community or private group comment?
|
||||
// If it's a reply to a wall post on a community/prvgroup page it's a
|
||||
|
|
@ -2939,7 +2949,7 @@ function local_delivery($importer,$data) {
|
|||
if(!x($datarray['type']) || $datarray['type'] != 'activity') {
|
||||
|
||||
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
|
||||
dbesc($parent_uri),
|
||||
dbesc($top_uri),
|
||||
intval($importer['importer_uid'])
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -13,8 +13,10 @@
|
|||
*/
|
||||
|
||||
require_once('boot.php');
|
||||
require_once('object/BaseObject.php');
|
||||
|
||||
$a = new App;
|
||||
BaseObject::set_app($a);
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
|||
37
object/BaseObject.php
Normal file
37
object/BaseObject.php
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
<?php
|
||||
if(class_exists('BaseObject'))
|
||||
return;
|
||||
|
||||
require_once('boot.php');
|
||||
|
||||
/**
|
||||
* Basic object
|
||||
*
|
||||
* Contains what is usefull to any object
|
||||
*/
|
||||
class BaseObject {
|
||||
private static $app = null;
|
||||
|
||||
/**
|
||||
* Get the app
|
||||
*
|
||||
* Same as get_app from boot.php
|
||||
*/
|
||||
public function get_app() {
|
||||
if(self::$app)
|
||||
return self::$app;
|
||||
|
||||
global $a;
|
||||
self::$app = $a;
|
||||
|
||||
return self::$app;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the app
|
||||
*/
|
||||
public static function set_app($app) {
|
||||
self::$app = $app;
|
||||
}
|
||||
}
|
||||
?>
|
||||
162
object/Conversation.php
Normal file
162
object/Conversation.php
Normal file
|
|
@ -0,0 +1,162 @@
|
|||
<?php
|
||||
if(class_exists('Conversation'))
|
||||
return;
|
||||
|
||||
require_once('boot.php');
|
||||
require_once('object/BaseObject.php');
|
||||
require_once('object/Item.php');
|
||||
require_once('include/text.php');
|
||||
|
||||
/**
|
||||
* A list of threads
|
||||
*
|
||||
* We should think about making this a SPL Iterator
|
||||
*/
|
||||
class Conversation extends BaseObject {
|
||||
private $threads = array();
|
||||
private $mode = null;
|
||||
private $writable = false;
|
||||
private $profile_owner = 0;
|
||||
private $preview = false;
|
||||
|
||||
public function __construct($mode, $preview) {
|
||||
$this->set_mode($mode);
|
||||
$this->preview = $preview;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the mode we'll be displayed on
|
||||
*/
|
||||
private function set_mode($mode) {
|
||||
if($this->get_mode() == $mode)
|
||||
return;
|
||||
|
||||
$a = $this->get_app();
|
||||
|
||||
switch($mode) {
|
||||
case 'network':
|
||||
case 'notes':
|
||||
$this->profile_owner = local_user();
|
||||
$this->writable = true;
|
||||
break;
|
||||
case 'profile':
|
||||
$this->profile_owner = $a->profile['profile_uid'];
|
||||
$this->writable = can_write_wall($a,$this->profile_owner);
|
||||
break;
|
||||
case 'display':
|
||||
$this->profile_owner = $a->profile['uid'];
|
||||
$this->writable = can_write_wall($a,$this->profile_owner);
|
||||
break;
|
||||
default:
|
||||
logger('[ERROR] Conversation::set_mode : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
$this->mode = $mode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get mode
|
||||
*/
|
||||
public function get_mode() {
|
||||
return $this->mode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if page is writable
|
||||
*/
|
||||
public function is_writable() {
|
||||
return $this->writable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if page is a preview
|
||||
*/
|
||||
public function is_preview() {
|
||||
return $this->preview;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get profile owner
|
||||
*/
|
||||
public function get_profile_owner() {
|
||||
return $this->profile_owner;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a thread to the conversation
|
||||
*
|
||||
* Returns:
|
||||
* _ The inserted item on success
|
||||
* _ false on failure
|
||||
*/
|
||||
public function add_thread($item) {
|
||||
$item_id = $item->get_id();
|
||||
if(!$item_id) {
|
||||
logger('[ERROR] Conversation::add_thread : Item has no ID!!', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
if($this->get_thread($item->get_id())) {
|
||||
logger('[WARN] Conversation::add_thread : Thread already exists ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
|
||||
/*
|
||||
* Only add will be displayed
|
||||
*/
|
||||
if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
|
||||
logger('[WARN] Conversation::add_thread : Thread is a mail ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
if($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) {
|
||||
logger('[WARN] Conversation::add_thread : Thread is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
$item->set_conversation($this);
|
||||
$this->threads[] = $item;
|
||||
return end($this->threads);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get data in a form usable by a conversation template
|
||||
*
|
||||
* We should find a way to avoid using those arguments (at least most of them)
|
||||
*
|
||||
* Returns:
|
||||
* _ The data requested on success
|
||||
* _ false on failure
|
||||
*/
|
||||
public function get_template_data($alike, $dlike) {
|
||||
$result = array();
|
||||
|
||||
foreach($this->threads as $item) {
|
||||
if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid'))
|
||||
continue;
|
||||
$item_data = $item->get_template_data($alike, $dlike);
|
||||
if(!$item_data) {
|
||||
logger('[ERROR] Conversation::get_template_data : Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
$result[] = $item_data;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a thread based on its item id
|
||||
*
|
||||
* Returns:
|
||||
* _ The found item on success
|
||||
* _ false on failure
|
||||
*/
|
||||
private function get_thread($id) {
|
||||
foreach($this->threads as $item) {
|
||||
if($item->get_id() == $id)
|
||||
return $item;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
?>
|
||||
638
object/Item.php
Normal file
638
object/Item.php
Normal file
|
|
@ -0,0 +1,638 @@
|
|||
<?php
|
||||
if(class_exists('Item'))
|
||||
return;
|
||||
|
||||
require_once('object/BaseObject.php');
|
||||
require_once('include/text.php');
|
||||
require_once('boot.php');
|
||||
|
||||
/**
|
||||
* An item
|
||||
*/
|
||||
class Item extends BaseObject {
|
||||
private $data = array();
|
||||
private $template = null;
|
||||
private $available_templates = array(
|
||||
'wall' => 'wall_thread.tpl',
|
||||
'wall2wall' => 'wallwall_thread.tpl'
|
||||
);
|
||||
private $comment_box_template = 'comment_item.tpl';
|
||||
private $toplevel = false;
|
||||
private $writable = false;
|
||||
private $children = array();
|
||||
private $parent = null;
|
||||
private $conversation = null;
|
||||
private $redirect_url = null;
|
||||
private $owner_url = '';
|
||||
private $owner_photo = '';
|
||||
private $owner_name = '';
|
||||
private $wall_to_wall = false;
|
||||
private $threaded = false;
|
||||
private $visiting = false;
|
||||
|
||||
public function __construct($data) {
|
||||
$a = $this->get_app();
|
||||
|
||||
$this->data = $data;
|
||||
$this->set_template('wall');
|
||||
$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
|
||||
|
||||
if(is_array($_SESSION['remote'])) {
|
||||
foreach($_SESSION['remote'] as $visitor) {
|
||||
if($visitor['cid'] == $this->get_data_value('contact-id')) {
|
||||
$this->visiting = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->writable = ($this->get_data_value('writable') || $this->get_data_value('self'));
|
||||
|
||||
$ssl_state = ((local_user()) ? true : false);
|
||||
$this->redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $this->get_data_value('cid') ;
|
||||
|
||||
if(get_config('system','thread_allow') && $a->theme_thread_allow && !$this->is_toplevel())
|
||||
$this->threaded = true;
|
||||
|
||||
// Prepare the children
|
||||
if(count($data['children'])) {
|
||||
foreach($data['children'] as $item) {
|
||||
/*
|
||||
* Only add will be displayed
|
||||
*/
|
||||
if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
|
||||
continue;
|
||||
}
|
||||
if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
|
||||
continue;
|
||||
}
|
||||
$child = new Item($item);
|
||||
$this->add_child($child);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get data in a form usable by a conversation template
|
||||
*
|
||||
* Returns:
|
||||
* _ The data requested on success
|
||||
* _ false on failure
|
||||
*/
|
||||
public function get_template_data($alike, $dlike, $thread_level=1) {
|
||||
$result = array();
|
||||
|
||||
$a = $this->get_app();
|
||||
|
||||
$item = $this->get_data();
|
||||
|
||||
$commentww = '';
|
||||
$sparkle = '';
|
||||
$buttons = '';
|
||||
$dropping = false;
|
||||
$star = false;
|
||||
$isstarred = "unstarred";
|
||||
$indent = '';
|
||||
$osparkle = '';
|
||||
$total_children = $this->count_descendants();
|
||||
|
||||
$conv = $this->get_conversation();
|
||||
|
||||
$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid'])
|
||||
|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
|
||||
? t('Private Message')
|
||||
: false);
|
||||
$shareable = ((($conv->get_profile_owner() == local_user()) && ($item['private'] != 1)) ? true : false);
|
||||
if(local_user() && link_compare($a->contact['url'],$item['author-link']))
|
||||
$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
|
||||
else
|
||||
$edpost = false;
|
||||
if(($this->get_data_value('uid') == local_user()) || $this->is_visiting())
|
||||
$dropping = true;
|
||||
|
||||
$drop = array(
|
||||
'dropping' => $dropping,
|
||||
'select' => t('Select'),
|
||||
'delete' => t('Delete'),
|
||||
);
|
||||
|
||||
$filer = (($conv->get_profile_owner() == local_user()) ? t("save to folder") : false);
|
||||
|
||||
$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
|
||||
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
|
||||
if($item['author-link'] && (! $item['author-name']))
|
||||
$profile_name = $item['author-link'];
|
||||
|
||||
$sp = false;
|
||||
$profile_link = best_link_url($item,$sp);
|
||||
if($profile_link === 'mailbox')
|
||||
$profile_link = '';
|
||||
if($sp)
|
||||
$sparkle = ' sparkle';
|
||||
else
|
||||
$profile_link = zrl($profile_link);
|
||||
|
||||
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
|
||||
if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
|
||||
$profile_avatar = $a->contacts[$normalised]['thumb'];
|
||||
else
|
||||
$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($this->get_data_value('thumb')));
|
||||
|
||||
$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
|
||||
call_hooks('render_location',$locate);
|
||||
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
|
||||
|
||||
$tags=array();
|
||||
foreach(explode(',',$item['tag']) as $tag){
|
||||
$tag = trim($tag);
|
||||
if ($tag!="") $tags[] = bbcode($tag);
|
||||
}
|
||||
|
||||
$like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
|
||||
$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
|
||||
|
||||
/*
|
||||
* We should avoid doing this all the time, but it depends on the conversation mode
|
||||
* And the conv mode may change when we change the conv, or it changes its mode
|
||||
* Maybe we should establish a way to be notified about conversation changes
|
||||
*/
|
||||
$this->check_wall_to_wall();
|
||||
|
||||
if($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url()))
|
||||
$osparkle = ' sparkle';
|
||||
|
||||
if($this->is_toplevel()) {
|
||||
if($conv->get_profile_owner() == local_user()) {
|
||||
$isstarred = (($item['starred']) ? "starred" : "unstarred");
|
||||
|
||||
$star = array(
|
||||
'do' => t("add star"),
|
||||
'undo' => t("remove star"),
|
||||
'toggle' => t("toggle star status"),
|
||||
'classdo' => (($item['starred']) ? "hidden" : ""),
|
||||
'classundo' => (($item['starred']) ? "" : "hidden"),
|
||||
'starred' => t('starred'),
|
||||
'tagger' => t("add tag"),
|
||||
'classtagger' => "",
|
||||
);
|
||||
}
|
||||
} else {
|
||||
$indent = 'comment';
|
||||
}
|
||||
|
||||
if($conv->is_writable()) {
|
||||
$buttons = array(
|
||||
'like' => array( t("I like this \x28toggle\x29"), t("like")),
|
||||
'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
|
||||
);
|
||||
if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
|
||||
}
|
||||
|
||||
if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
|
||||
$indent .= ' shiny';
|
||||
|
||||
localize_item($item);
|
||||
|
||||
$body = prepare_body($item,true);
|
||||
|
||||
$tmp_item = array(
|
||||
'template' => $this->get_template(),
|
||||
|
||||
'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
|
||||
'tags' => $tags,
|
||||
'body' => template_escape($body),
|
||||
'text' => strip_tags(template_escape($body)),
|
||||
'id' => $this->get_id(),
|
||||
'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
|
||||
'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
|
||||
'to' => t('to'),
|
||||
'wall' => t('Wall-to-Wall'),
|
||||
'vwall' => t('via Wall-To-Wall:'),
|
||||
'profile_url' => $profile_link,
|
||||
'item_photo_menu' => item_photo_menu($item),
|
||||
'name' => template_escape($profile_name),
|
||||
'thumb' => $profile_avatar,
|
||||
'osparkle' => $osparkle,
|
||||
'sparkle' => $sparkle,
|
||||
'title' => template_escape($item['title']),
|
||||
'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
|
||||
'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
|
||||
'lock' => $lock,
|
||||
'location' => template_escape($location),
|
||||
'indent' => $indent,
|
||||
'owner_url' => $this->get_owner_url(),
|
||||
'owner_photo' => $this->get_owner_photo(),
|
||||
'owner_name' => template_escape($this->get_owner_name()),
|
||||
'plink' => get_plink($item),
|
||||
'edpost' => $edpost,
|
||||
'isstarred' => $isstarred,
|
||||
'star' => $star,
|
||||
'filer' => $filer,
|
||||
'drop' => $drop,
|
||||
'vote' => $buttons,
|
||||
'like' => $like,
|
||||
'dislike' => $dislike,
|
||||
'comment' => $this->get_comment_box($indent),
|
||||
'previewing' => ($conv->is_preview() ? ' preview ' : ''),
|
||||
'wait' => t('Please wait'),
|
||||
'thread_level' => $thread_level
|
||||
);
|
||||
|
||||
$arr = array('item' => $item, 'output' => $tmp_item);
|
||||
call_hooks('display_item', $arr);
|
||||
|
||||
$result = $arr['output'];
|
||||
|
||||
$result['children'] = array();
|
||||
$children = $this->get_children();
|
||||
$nb_children = count($children);
|
||||
if($nb_children > 0) {
|
||||
foreach($children as $child) {
|
||||
$result['children'][] = $child->get_template_data($alike, $dlike, $thread_level + 1);
|
||||
}
|
||||
// Collapse
|
||||
if(($nb_children > 2) || ($thread_level > 1)) {
|
||||
$result['children'][0]['comment_firstcollapsed'] = true;
|
||||
$result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
|
||||
$result['children'][0]['hide_text'] = t('show more');
|
||||
if($thread_level > 1) {
|
||||
$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
|
||||
}
|
||||
else {
|
||||
$result['children'][$nb_children - 3]['comment_lastcollapsed'] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$result['private'] = $item['private'];
|
||||
$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
|
||||
|
||||
if($this->is_threaded()) {
|
||||
$result['flatten'] = false;
|
||||
$result['threaded'] = true;
|
||||
}
|
||||
else {
|
||||
$result['flatten'] = true;
|
||||
$result['threaded'] = false;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function get_id() {
|
||||
return $this->get_data_value('id');
|
||||
}
|
||||
|
||||
public function is_threaded() {
|
||||
return $this->threaded;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a child item
|
||||
*/
|
||||
public function add_child($item) {
|
||||
$item_id = $item->get_id();
|
||||
if(!$item_id) {
|
||||
logger('[ERROR] Item::add_child : Item has no ID!!', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
if($this->get_child($item->get_id())) {
|
||||
logger('[WARN] Item::add_child : Item already exists ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
/*
|
||||
* Only add what will be displayed
|
||||
*/
|
||||
if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) {
|
||||
logger('[WARN] Item::add_child : Item is a mail ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
if($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) {
|
||||
logger('[WARN] Item::add_child : Item is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
|
||||
$item->set_parent($this);
|
||||
$this->children[] = $item;
|
||||
return end($this->children);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a child by its ID
|
||||
*/
|
||||
public function get_child($id) {
|
||||
foreach($this->get_children() as $child) {
|
||||
if($child->get_id() == $id)
|
||||
return $child;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all ou children
|
||||
*/
|
||||
public function get_children() {
|
||||
return $this->children;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set our parent
|
||||
*/
|
||||
protected function set_parent($item) {
|
||||
$parent = $this->get_parent();
|
||||
if($parent) {
|
||||
$parent->remove_child($this);
|
||||
}
|
||||
$this->parent = $item;
|
||||
$this->set_conversation($item->get_conversation());
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove our parent
|
||||
*/
|
||||
protected function remove_parent() {
|
||||
$this->parent = null;
|
||||
$this->conversation = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a child
|
||||
*/
|
||||
public function remove_child($item) {
|
||||
$id = $item->get_id();
|
||||
foreach($this->get_children() as $key => $child) {
|
||||
if($child->get_id() == $id) {
|
||||
$child->remove_parent();
|
||||
unset($this->children[$key]);
|
||||
// Reindex the array, in order to make sure there won't be any trouble on loops using count()
|
||||
$this->children = array_values($this->children);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
logger('[WARN] Item::remove_child : Item is not a child ('. $id .').', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get parent item
|
||||
*/
|
||||
protected function get_parent() {
|
||||
return $this->parent;
|
||||
}
|
||||
|
||||
/**
|
||||
* set conversation
|
||||
*/
|
||||
public function set_conversation($conv) {
|
||||
$previous_mode = ($this->conversation ? $this->conversation->get_mode() : '');
|
||||
|
||||
$this->conversation = $conv;
|
||||
|
||||
// Set it on our children too
|
||||
foreach($this->get_children() as $child)
|
||||
$child->set_conversation($conv);
|
||||
}
|
||||
|
||||
/**
|
||||
* get conversation
|
||||
*/
|
||||
public function get_conversation() {
|
||||
return $this->conversation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get raw data
|
||||
*
|
||||
* We shouldn't need this
|
||||
*/
|
||||
public function get_data() {
|
||||
return $this->data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a data value
|
||||
*
|
||||
* Returns:
|
||||
* _ value on success
|
||||
* _ false on failure
|
||||
*/
|
||||
public function get_data_value($name) {
|
||||
if(!isset($this->data[$name])) {
|
||||
logger('[ERROR] Item::get_data_value : Item has no value name "'. $name .'".', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
|
||||
return $this->data[$name];
|
||||
}
|
||||
|
||||
/**
|
||||
* Set template
|
||||
*/
|
||||
private function set_template($name) {
|
||||
if(!x($this->available_templates, $name)) {
|
||||
logger('[ERROR] Item::set_template : Template not available ("'. $name .'").', LOGGER_DEBUG);
|
||||
return false;
|
||||
}
|
||||
$this->template = $this->available_templates[$name];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get template
|
||||
*/
|
||||
private function get_template() {
|
||||
return $this->template;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if this is a toplevel post
|
||||
*/
|
||||
private function is_toplevel() {
|
||||
return $this->toplevel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if this is writable
|
||||
*/
|
||||
private function is_writable() {
|
||||
$conv = $this->get_conversation();
|
||||
|
||||
if($conv) {
|
||||
// This will allow us to comment on wall-to-wall items owned by our friends
|
||||
// and community forums even if somebody else wrote the post.
|
||||
return ($this->writable || ($this->is_visiting() && $conv->get_mode() == 'profile'));
|
||||
}
|
||||
return $this->writable;
|
||||
}
|
||||
|
||||
/**
|
||||
* Count the total of our descendants
|
||||
*/
|
||||
private function count_descendants() {
|
||||
$children = $this->get_children();
|
||||
$total = count($children);
|
||||
if($total > 0) {
|
||||
foreach($children as $child) {
|
||||
$total += $child->count_descendants();
|
||||
}
|
||||
}
|
||||
return $total;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the template for the comment box
|
||||
*/
|
||||
private function get_comment_box_template() {
|
||||
return $this->comment_box_template;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the comment box
|
||||
*
|
||||
* Returns:
|
||||
* _ The comment box string (empty if no comment box)
|
||||
* _ false on failure
|
||||
*/
|
||||
private function get_comment_box($indent) {
|
||||
if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$comment_box = '';
|
||||
$conv = $this->get_conversation();
|
||||
$template = get_markup_template($this->get_comment_box_template());
|
||||
$ww = '';
|
||||
if( ($conv->get_mode() === 'network') && $this->is_wall_to_wall() )
|
||||
$ww = 'ww';
|
||||
|
||||
if($conv->is_writable() && $this->is_writable()) {
|
||||
$a = $this->get_app();
|
||||
$qc = $qcomment = null;
|
||||
|
||||
/*
|
||||
* Hmmm, code depending on the presence of a particular plugin?
|
||||
* This should be better if done by a hook
|
||||
*/
|
||||
if(in_array('qcomment',$a->plugins)) {
|
||||
$qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
|
||||
$qcomment = (($qc) ? explode("\n",$qc) : null);
|
||||
}
|
||||
$comment_box = replace_macros($template,array(
|
||||
'$return_path' => '',
|
||||
'$threaded' => $this->is_threaded(),
|
||||
'$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
|
||||
'$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
|
||||
'$id' => $this->get_id(),
|
||||
'$parent' => $this->get_id(),
|
||||
'$qcomment' => $qcomment,
|
||||
'$profile_uid' => $conv->get_profile_owner(),
|
||||
'$mylink' => $a->contact['url'],
|
||||
'$mytitle' => t('This is you'),
|
||||
'$myphoto' => $a->contact['thumb'],
|
||||
'$comment' => t('Comment'),
|
||||
'$submit' => t('Submit'),
|
||||
'$edbold' => t('Bold'),
|
||||
'$editalic' => t('Italic'),
|
||||
'$eduline' => t('Underline'),
|
||||
'$edquote' => t('Quote'),
|
||||
'$edcode' => t('Code'),
|
||||
'$edimg' => t('Image'),
|
||||
'$edurl' => t('Link'),
|
||||
'$edvideo' => t('Video'),
|
||||
'$preview' => t('Preview'),
|
||||
'$indent' => $indent,
|
||||
'$sourceapp' => t($a->sourcename),
|
||||
'$ww' => (($conv->get_mode() === 'network') ? $ww : '')
|
||||
));
|
||||
}
|
||||
|
||||
return $comment_box;
|
||||
}
|
||||
|
||||
private function get_redirect_url() {
|
||||
return $this->redirect_url;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if we are a wall to wall item and set the relevant properties
|
||||
*/
|
||||
protected function check_wall_to_wall() {
|
||||
$a = $this->get_app();
|
||||
$conv = $this->get_conversation();
|
||||
$this->wall_to_wall = false;
|
||||
|
||||
if($this->is_toplevel()) {
|
||||
if( (! $this->get_data_value('self')) && ($conv->get_mode() !== 'profile')) {
|
||||
if($this->get_data_value('wall')) {
|
||||
|
||||
// On the network page, I am the owner. On the display page it will be the profile owner.
|
||||
// This will have been stored in $a->page_contact by our calling page.
|
||||
// Put this person as the wall owner of the wall-to-wall notice.
|
||||
|
||||
$this->owner_url = zrl($a->page_contact['url']);
|
||||
$this->owner_photo = $a->page_contact['thumb'];
|
||||
$this->owner_name = $a->page_contact['name'];
|
||||
$this->set_template('wall2wall');
|
||||
$this->wall_to_wall = true;
|
||||
}
|
||||
else if($this->get_data_value('owner-link')) {
|
||||
|
||||
$owner_linkmatch = (($this->get_data_value('owner-link')) && link_compare($this->get_data_value('owner-link'),$this->get_data_value('author-link')));
|
||||
$alias_linkmatch = (($this->get_data_value('alias')) && link_compare($this->get_data_value('alias'),$this->get_data_value('author-link')));
|
||||
$owner_namematch = (($this->get_data_value('owner-name')) && $this->get_data_value('owner-name') == $this->get_data_value('author-name'));
|
||||
if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
|
||||
|
||||
// The author url doesn't match the owner (typically the contact)
|
||||
// and also doesn't match the contact alias.
|
||||
// The name match is a hack to catch several weird cases where URLs are
|
||||
// all over the park. It can be tricked, but this prevents you from
|
||||
// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
|
||||
// well that it's the same Bob Smith.
|
||||
|
||||
// But it could be somebody else with the same name. It just isn't highly likely.
|
||||
|
||||
|
||||
$this->owner_photo = $this->get_data_value('owner-avatar');
|
||||
$this->owner_name = $this->get_data_value('owner-name');
|
||||
$this->set_template('wall2wall');
|
||||
$this->wall_to_wall = true;
|
||||
// If it is our contact, use a friendly redirect link
|
||||
if((link_compare($this->get_data_value('owner-link'),$this->get_data_value('url')))
|
||||
&& ($this->get_data_value('network') === NETWORK_DFRN)) {
|
||||
$this->owner_url = $this->get_redirect_url();
|
||||
}
|
||||
else
|
||||
$this->owner_url = zrl($this->get_data_value('owner-link'));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!$this->wall_to_wall) {
|
||||
$this->set_template('wall');
|
||||
$this->owner_url = '';
|
||||
$this->owner_photo = '';
|
||||
$this->owner_name = '';
|
||||
}
|
||||
}
|
||||
|
||||
private function is_wall_to_wall() {
|
||||
return $this->wall_to_wall;
|
||||
}
|
||||
|
||||
private function get_owner_url() {
|
||||
return $this->owner_url;
|
||||
}
|
||||
|
||||
private function get_owner_photo() {
|
||||
return $this->owner_photo;
|
||||
}
|
||||
|
||||
private function get_owner_name() {
|
||||
return $this->owner_name;
|
||||
}
|
||||
|
||||
private function is_visiting() {
|
||||
return $this->visiting;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
{{ if $threaded }}
|
||||
<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
{{ else }}
|
||||
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
{{ if $threaded }}
|
||||
<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
|
||||
<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
{{ else }}
|
||||
{{ endif }}
|
||||
<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
{{ endif }}
|
||||
<input type="hidden" name="type" value="$type" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="parent" value="$parent" />
|
||||
|
|
|
|||
|
|
@ -23,13 +23,23 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); }
|
|||
nav #banner #logo-text a { color: #ffffff; }
|
||||
|
||||
.wall-item-content-wrapper {
|
||||
border: 1px solid #444444;
|
||||
background: #444;
|
||||
|
||||
border: 1px solid #444444;
|
||||
background: #444444;
|
||||
}
|
||||
.wall-item-outside-wrapper.threaded > .wall-item-content-wrapper {
|
||||
-moz-border-radius: 3px 3px 0px;
|
||||
border-radius: 3px 3px 0px;
|
||||
}
|
||||
.wall-item-tools { background-color: #444444; background-image: none;}
|
||||
.comment-wwedit-wrapper{ background-color: #444444; }
|
||||
.toplevel_item > .wall-item-comment-wrapper > .comment-wwedit-wrapper{ background-color: #333333; }
|
||||
.comment-wwedit-wrapper{
|
||||
background-color: #333333;
|
||||
}
|
||||
.comment-wwedit-wrapper.threaded {
|
||||
border: solid #444444;
|
||||
border-width: 0px 3px 3px;
|
||||
-moz-border-radius: 0px 0px 3px 3px;
|
||||
border-radius: 0px 0px 3px 3px;
|
||||
}
|
||||
.comment-edit-preview{ color: #000000; }
|
||||
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
|
||||
.photo-top-album-name{ background-color: #333333; }
|
||||
|
|
|
|||
|
|
@ -45,11 +45,19 @@ function insertFormatting(comment,BBcode,id) {
|
|||
return true;
|
||||
}
|
||||
|
||||
function cmtBbOpen(id) {
|
||||
$(".comment-edit-bb-" + id).show();
|
||||
function cmtBbOpen(comment, id) {
|
||||
if($(comment).hasClass('comment-edit-text-full')) {
|
||||
$(".comment-edit-bb-" + id).show();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
function cmtBbClose(id) {
|
||||
$(".comment-edit-bb-" + id).hide();
|
||||
function cmtBbClose(comment, id) {
|
||||
if($(comment).hasClass('comment-edit-text-empty')) {
|
||||
$(".comment-edit-bb-" + id).hide();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
|
|
@ -96,4 +104,4 @@ $('.savedsearchterm').hover(
|
|||
|
||||
</script>
|
||||
EOT;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{{ if $threaded }}
|
||||
<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
{{ else }}
|
||||
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
{{ if $threaded }}
|
||||
<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
|
||||
<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
{{ else }}
|
||||
{{ endif }}
|
||||
<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
{{ endif }}
|
||||
<input type="hidden" name="type" value="$type" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="parent" value="$parent" />
|
||||
|
|
@ -43,7 +42,7 @@
|
|||
onclick="insertFormatting('$comment','video', $id);"></a></li>
|
||||
</ul>
|
||||
<div class="comment-edit-bb-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen(this, $id);" onBlur="commentClose(this,$id);cmtBbClose(this,$id);" >$comment</textarea>
|
||||
{{ if $qcomment }}
|
||||
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
|
||||
<option value=""></option>
|
||||
|
|
|
|||
|
|
@ -932,7 +932,6 @@ input#dfrn-url {
|
|||
position: relative;
|
||||
-moz-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
|
||||
}
|
||||
|
||||
.tread-wrapper .tread-wrapper {
|
||||
|
|
@ -1196,6 +1195,10 @@ input#dfrn-url {
|
|||
width: 100px;
|
||||
float: left;
|
||||
}
|
||||
.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
|
||||
width: 40px;
|
||||
}
|
||||
|
||||
.comment-edit-photo img {
|
||||
width: 25px;
|
||||
}
|
||||
|
|
@ -1215,6 +1218,10 @@ input#dfrn-url {
|
|||
margin: 10px 0px 10px 110px;
|
||||
}
|
||||
|
||||
.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
|
||||
margin-left: 50px;
|
||||
}
|
||||
|
||||
#profile-jot-plugin-wrapper,
|
||||
#profile-jot-submit-wrapper {
|
||||
margin-top: 15px;
|
||||
|
|
@ -1758,12 +1765,16 @@ input#dfrn-url {
|
|||
|
||||
.comment-edit-text-empty {
|
||||
color: gray;
|
||||
height: 30px;
|
||||
height: 5em;
|
||||
width: 175px;
|
||||
overflow: auto;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
|
||||
height: 1.5em;
|
||||
}
|
||||
|
||||
.comment-edit-text-full {
|
||||
color: black;
|
||||
height: 150px;
|
||||
|
|
@ -3046,7 +3057,8 @@ aside input[type='text'] {
|
|||
[class^="comment-edit-bb"] {
|
||||
list-style: none;
|
||||
display: none;
|
||||
margin: 0px 0 -5px 60px;
|
||||
margin: 0px 0 -5px 0px;
|
||||
padding: 0px;
|
||||
width: 75%;
|
||||
}
|
||||
[class^="comment-edit-bb"] > li {
|
||||
|
|
|
|||
|
|
@ -34,11 +34,19 @@ function insertFormatting(comment,BBcode,id) {
|
|||
return true;
|
||||
}
|
||||
|
||||
function cmtBbOpen(id) {
|
||||
$(".comment-edit-bb-" + id).show();
|
||||
function cmtBbOpen(comment, id) {
|
||||
if($(comment).hasClass('comment-edit-text-full')) {
|
||||
$(".comment-edit-bb-" + id).show();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
function cmtBbClose(comment, id) {
|
||||
$(".comment-edit-bb-" + id).hide();
|
||||
if($(comment).hasClass('comment-edit-text-empty')) {
|
||||
$(".comment-edit-bb-" + id).hide();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
$(document).ready(function() {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
{{ if $threaded }}
|
||||
<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
|
||||
<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
{{ else }}
|
||||
<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
{{ endif }}
|
||||
<input type="hidden" name="type" value="$type" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="parent" value="$parent" />
|
||||
<input type="hidden" name="return" value="$return_path" />
|
||||
<input type="hidden" name="jsreload" value="$jsreload" />
|
||||
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
|
||||
|
||||
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
|
||||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
</div>
|
||||
<div class="comment-edit-photo-end"></div>
|
||||
<ul class="comment-edit-bb-$id">
|
||||
<li><a class="editicon boldbb shadow"
|
||||
style="cursor: pointer;" title="$edbold"
|
||||
onclick="insertFormatting('$comment','b', $id);"></a></li>
|
||||
<li><a class="editicon italicbb shadow"
|
||||
style="cursor: pointer;" title="$editalic"
|
||||
onclick="insertFormatting('$comment','i', $id);"></a></li>
|
||||
<li><a class="editicon underlinebb shadow"
|
||||
style="cursor: pointer;" title="$eduline"
|
||||
onclick="insertFormatting('$comment','u', $id);"></a></li>
|
||||
<li><a class="editicon quotebb shadow"
|
||||
style="cursor: pointer;" title="$edquote"
|
||||
onclick="insertFormatting('$comment','quote', $id);"></a></li>
|
||||
<li><a class="editicon codebb shadow"
|
||||
style="cursor: pointer;" title="$edcode"
|
||||
onclick="insertFormatting('$comment','code', $id);"></a></li>
|
||||
<li><a class="editicon imagebb shadow"
|
||||
style="cursor: pointer;" title="$edimg"
|
||||
onclick="insertFormatting('$comment','img', $id);"></a></li>
|
||||
<li><a class="editicon urlbb shadow"
|
||||
style="cursor: pointer;" title="$edurl"
|
||||
onclick="insertFormatting('$comment','url', $id);"></a></li>
|
||||
<li><a class="editicon videobb shadow"
|
||||
style="cursor: pointer;" title="$edvideo"
|
||||
onclick="insertFormatting('$comment','video', $id);"></a></li>
|
||||
</ul>
|
||||
<div class="comment-edit-bb-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
{{ if $qcomment }}
|
||||
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
|
||||
<option value=""></option>
|
||||
{{ for $qcomment as $qc }}
|
||||
<option value="$qc">$qc</option>
|
||||
{{ endfor }}
|
||||
</select>
|
||||
{{ endif }}
|
||||
|
||||
<div class="comment-edit-text-end"></div>
|
||||
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
|
||||
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
|
||||
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
|
||||
<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
|
||||
</div>
|
||||
|
||||
<div class="comment-edit-end"></div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
8
view/theme/smoothly/follow.tpl
Normal file
8
view/theme/smoothly/follow.tpl
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
<div id="follow-sidebar" class="widget">
|
||||
<h3>$connect</h3>
|
||||
<div id="connect-desc">$desc</div>
|
||||
<form action="follow" method="post" />
|
||||
<input id="side-follow-url" type="text-sidebar" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
|
||||
<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
|
||||
<input type="hidden" name="type" value="$type" />
|
||||
<input type="hidden" name="profile_uid" value="$profile_uid" />
|
||||
<input type="hidden" name="parent" value="$parent" />
|
||||
<input type="hidden" name="return" value="$return_path" />
|
||||
<input type="hidden" name="jsreload" value="$jsreload" />
|
||||
<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
|
||||
|
||||
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
|
||||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
</div>
|
||||
<div class="comment-edit-photo-end"></div>
|
||||
<div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none">
|
||||
<div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div>
|
||||
<input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" />
|
||||
<div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div>
|
||||
<input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" />
|
||||
<div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div>
|
||||
<input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" />
|
||||
</div>
|
||||
<ul class="comment-edit-bb-$id">
|
||||
<li><a class="editicon boldbb shadow"
|
||||
style="cursor: pointer;" title="$edbold"
|
||||
onclick="insertFormatting('$comment','b', $id);"></a></li>
|
||||
<li><a class="editicon italicbb shadow"
|
||||
style="cursor: pointer;" title="$editalic"
|
||||
onclick="insertFormatting('$comment','i', $id);"></a></li>
|
||||
<li><a class="editicon underlinebb shadow"
|
||||
style="cursor: pointer;" title="$eduline"
|
||||
onclick="insertFormatting('$comment','u', $id);"></a></li>
|
||||
<li><a class="editicon quotebb shadow"
|
||||
style="cursor: pointer;" title="$edquote"
|
||||
onclick="insertFormatting('$comment','quote', $id);"></a></li>
|
||||
<li><a class="editicon codebb shadow"
|
||||
style="cursor: pointer;" title="$edcode"
|
||||
onclick="insertFormatting('$comment','code', $id);"></a></li>
|
||||
<li><a class="editicon imagebb shadow"
|
||||
style="cursor: pointer;" title="$edimg"
|
||||
onclick="insertFormatting('$comment','img', $id);"></a></li>
|
||||
<li><a class="editicon urlbb shadow"
|
||||
style="cursor: pointer;" title="$edurl"
|
||||
onclick="insertFormatting('$comment','url', $id);"></a></li>
|
||||
<li><a class="editicon videobb shadow"
|
||||
style="cursor: pointer;" title="$edvideo"
|
||||
onclick="insertFormatting('$comment','video', $id);"></a></li>
|
||||
</ul>
|
||||
<div class="comment-edit-bb-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
|
||||
<div class="comment-edit-text-end"></div>
|
||||
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
|
||||
<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
|
||||
<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
|
||||
<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
|
||||
</div>
|
||||
|
||||
<div class="comment-edit-end"></div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
14
view/theme/smoothly/peoplefind.tpl
Normal file
14
view/theme/smoothly/peoplefind.tpl
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<div id="peoplefind-sidebar" class="widget">
|
||||
<h3>$findpeople</h3>
|
||||
<div id="peoplefind-desc">$desc</div>
|
||||
<form action="dirfind" method="post" />
|
||||
<input id="side-peoplefind-url" type="text-sidebar" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
|
||||
</form>
|
||||
<div class="side-link" id="side-match-link"><a href="match" >$similar</a></div>
|
||||
<div class="side-link" id="side-suggest-link"><a href="suggest" >$suggest</a></div>
|
||||
<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >$random</a></div>
|
||||
{{ if $inv }}
|
||||
<div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
|
||||
{{ endif }}
|
||||
</div>
|
||||
|
||||
|
|
@ -88,8 +88,19 @@ input[type=text] {
|
|||
border-radius: 3px 3px 3px 3px;
|
||||
}
|
||||
|
||||
input[type=text-sidebar] {
|
||||
border: 1px solid #b0b0b0;
|
||||
padding: 2px;
|
||||
width: 172px;
|
||||
margin-left: 10px;
|
||||
margin-top: 10px;
|
||||
-webkit-border-radius: 3px 3px 3px 3px;
|
||||
-moz-border-radius: 3px 3px 3px 3px;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
}
|
||||
|
||||
input[type=submit] {
|
||||
margin: 0px 0px 5px 2px;
|
||||
margin: 10px;
|
||||
border: none;
|
||||
font-size: 0.9em;
|
||||
padding: 5px;
|
||||
|
|
@ -127,7 +138,7 @@ input[type=submit]:active {
|
|||
|
||||
section {
|
||||
float: left;
|
||||
padding-top: 60px;
|
||||
padding-top: 40px; /*60*/
|
||||
width: 730px;
|
||||
font-size: 0.9em;
|
||||
line-height: 1.2em;
|
||||
|
|
@ -277,10 +288,10 @@ nav {
|
|||
padding: 0;
|
||||
width: 960px;
|
||||
z-index: 10000;
|
||||
height: 50px;
|
||||
height: 40px;
|
||||
position: fixed;
|
||||
color: #efefef;
|
||||
background: url("nav-bg.png") no-repeat scroll 0px 7px transparent;
|
||||
background: url("nav-bg.png") no-repeat scroll 0px 0px transparent;
|
||||
/*background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );*/
|
||||
/*background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );*/
|
||||
/*filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');*/
|
||||
|
|
@ -295,7 +306,7 @@ nav #banner {
|
|||
display: block;
|
||||
position: absolute;
|
||||
margin-left: 3px; /*10*/
|
||||
margin-top: 10px; /*5*/
|
||||
margin-top: 3px; /*5*/
|
||||
padding-bottom:5px;
|
||||
}
|
||||
nav #banner #logo-text a {
|
||||
|
|
@ -309,7 +320,7 @@ nav #user-menu {
|
|||
width: 190px; /*240*/
|
||||
float: right;
|
||||
margin-right: 5px; /*20%*/
|
||||
margin-top: 11px;
|
||||
margin-top: 3px;
|
||||
padding: 5px;
|
||||
position: relative;
|
||||
vertical-align: middle;
|
||||
|
|
@ -376,7 +387,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
|
|||
#notifications {
|
||||
height: 32px;
|
||||
position: absolute;
|
||||
top:10px; left: 35%;
|
||||
top:3px; left: 35%;
|
||||
}
|
||||
.nav-ajax-update {
|
||||
width: 44px;
|
||||
|
|
@ -390,7 +401,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in
|
|||
padding-left: 11px;
|
||||
}
|
||||
#notify-update { background-position: 0px -168px; }
|
||||
#net-update { background-position: 0px -126px }
|
||||
#net-update { background-position: 0px -126px; }
|
||||
#mail-update { background-position: 0px -40px; }
|
||||
#intro-update { background-position: 0px -84px; }
|
||||
#home-update { background-position: 0px 0px; }
|
||||
|
|
@ -550,11 +561,11 @@ aside h4 { font-size: 1.3em; }
|
|||
padding: 5px 5px 5px 5px;
|
||||
}
|
||||
#netsearch-box input[type="text"] {
|
||||
width: 175px;
|
||||
width: 97%;
|
||||
}
|
||||
#netsearch-box input[type="submit"] {
|
||||
width: 48%;
|
||||
margin-top: 5px;
|
||||
width: auto;
|
||||
/*margin-top: 5px;*/
|
||||
}
|
||||
|
||||
h3#search:before {
|
||||
|
|
@ -909,10 +920,9 @@ profile-jot-banner-wrapper {
|
|||
.tabs {
|
||||
min-width: 400px;
|
||||
list-style: none;
|
||||
padding: 0px; /*10*/
|
||||
padding: 20px 0px 0px;
|
||||
/*border-bottom: 1px solid #efefef;*/
|
||||
font-size: 0.9em;
|
||||
margin-top: 0px;
|
||||
}
|
||||
.tabs li { display: inline;}
|
||||
|
||||
|
|
@ -1162,7 +1172,7 @@ profile-jot-banner-wrapper {
|
|||
}
|
||||
|
||||
.icon.drop,
|
||||
.icon.drophide { float: left;}
|
||||
.icon.drophide { float: right;}
|
||||
#item-delete-selected { overflow: auto; width: 100%;}
|
||||
|
||||
|
||||
|
|
@ -1254,6 +1264,7 @@ profile-jot-banner-wrapper {
|
|||
|
||||
#item-delete-selected-desc {
|
||||
color: #898989;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.wall-item-body code {
|
||||
|
|
@ -1305,7 +1316,7 @@ div[id$="wrapper"] br { clear: left; }
|
|||
#profile-listing-new-link-wrapper {
|
||||
float: left;
|
||||
display: inline;
|
||||
width: 130px;
|
||||
width: auto;
|
||||
margin-left:5px;
|
||||
margin-top: 20px;
|
||||
padding: 5px 10px 5px 10px;
|
||||
|
|
@ -1779,7 +1790,7 @@ margin-left: 0px;
|
|||
|
||||
.mail-list-detail {
|
||||
margin-left: 100px;
|
||||
width: 300px;
|
||||
width: 600px;
|
||||
min-height: 70px;
|
||||
padding: 20px;
|
||||
padding-top:10px;
|
||||
|
|
@ -1820,6 +1831,7 @@ margin-left: 0px;
|
|||
|
||||
.mail-conv-outside-wrapper {
|
||||
margin-bottom: 10px;
|
||||
margin-top: 30px;
|
||||
}
|
||||
|
||||
.mail-conv-sender {float: left; margin: 0px 5px 5px 0px; }
|
||||
|
|
@ -1837,8 +1849,8 @@ margin-left: 0px;
|
|||
|
||||
.mail-conv-detail {
|
||||
width: 500px;
|
||||
padding: 30px;
|
||||
padding-bottom: 10px;
|
||||
padding: 20px;
|
||||
padding-bottom: 20px;
|
||||
margin-left: 20px;
|
||||
margin-bottom: 0px;
|
||||
vertical-align: middle;
|
||||
|
|
@ -2048,14 +2060,16 @@ margin-left: 0px;
|
|||
}
|
||||
|
||||
#side-follow-submit {
|
||||
width: 70px;
|
||||
width: 178px;
|
||||
margin: 10px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#side-match-link {
|
||||
width: 180px;
|
||||
width: 158px;
|
||||
padding: 10px;
|
||||
margin: auto;
|
||||
margin-bottom: 20px;
|
||||
margin: auto 10px 20px;
|
||||
/*margin-bottom: 20px;*/
|
||||
-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
|
|
@ -2068,7 +2082,7 @@ margin-left: 0px;
|
|||
border-radius:5px;
|
||||
padding: 5px 10px 5px 10px;
|
||||
color: #efefef;
|
||||
font-size: 1.2em;
|
||||
font-size: 1.1em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
|
@ -2091,7 +2105,7 @@ margin-left: 0px;
|
|||
}
|
||||
|
||||
#side-invite-link {
|
||||
width: 180px;
|
||||
width: 80%;
|
||||
padding: 10px;
|
||||
margin: auto;
|
||||
margin-bottom: 20px;
|
||||
|
|
@ -2107,7 +2121,7 @@ margin-left: 0px;
|
|||
border-radius:5px;
|
||||
padding: 5px 10px 5px 10px;
|
||||
color: #efefef;
|
||||
font-size: 1.2em;
|
||||
font-size: 1.1em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
|
@ -2131,7 +2145,7 @@ margin-left: 0px;
|
|||
}
|
||||
|
||||
#side-suggest-link {
|
||||
width: 180px;
|
||||
width: 80%;
|
||||
padding: 10px;
|
||||
margin: auto;
|
||||
margin-bottom: 20px;
|
||||
|
|
@ -2147,7 +2161,7 @@ margin-left: 0px;
|
|||
border-radius:5px;
|
||||
padding: 5px 10px 5px 10px;
|
||||
color: #efefef;
|
||||
font-size: 1.2em;
|
||||
font-size: 1.1em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
|
|
@ -2309,14 +2323,16 @@ margin-left: 0px;
|
|||
}
|
||||
|
||||
#settings-default-perms {
|
||||
width: 160px;
|
||||
width: 260px;
|
||||
text-align: center;
|
||||
-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
box-shadow:inset 0px 1px 0px 0px #cfcfcf;
|
||||
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );
|
||||
background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );
|
||||
/*background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );*/
|
||||
background: -moz-linear-gradient(center top , #BDBDBD 5%, #A2A2A2 100%) repeat scroll 0 0 #BDBDBD;
|
||||
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');
|
||||
color: #EFEFEF;
|
||||
background-color:#7c7d7b;
|
||||
-moz-border-radius:5px;
|
||||
-webkit-border-radius:5px;
|
||||
|
|
@ -2774,7 +2790,7 @@ tr {
|
|||
list-style-position: inside;
|
||||
font-size: 1em;
|
||||
padding: 5px;
|
||||
width: 100px;
|
||||
width: auto;
|
||||
margin: 5px;
|
||||
}
|
||||
|
||||
|
|
@ -2834,7 +2850,8 @@ tr {
|
|||
/* =============== */
|
||||
|
||||
.field {
|
||||
margin-bottom: 5px;
|
||||
margin-bottom: 10px;
|
||||
margin-top: 10px;
|
||||
padding-bottom: 0px;
|
||||
/*overflow: auto;*/
|
||||
width: 90%;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,11 @@
|
|||
{{endif}}
|
||||
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
|
||||
<a name="$item.id" ></a>
|
||||
{{ if $item.threaded }}
|
||||
<div class="wall-item-outside-wrapper $item.indent$item.previewing threaded" id="wall-item-outside-wrapper-$item.id" >
|
||||
{{ else }}
|
||||
<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
|
||||
{{ endif }}
|
||||
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
|
||||
<div class="wall-item-info" id="wall-item-info-$item.id">
|
||||
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"
|
||||
|
|
@ -93,10 +97,12 @@
|
|||
{{ inc $item.template }}{{ endinc }}
|
||||
{{ endfor }}
|
||||
|
||||
{{ if $item.comment }}
|
||||
{{ if $item.flatten }}
|
||||
<div class="wall-item-comment-wrapper" >
|
||||
$item.comment
|
||||
</div>
|
||||
{{ endif }}
|
||||
{{ endif }}
|
||||
</div>
|
||||
{{if $item.comment_lastcollapsed}}</div>{{endif}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue