aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/Contact.php65
-rw-r--r--include/conversation.php118
-rw-r--r--index.php2
-rw-r--r--mod/zperms.php21
-rw-r--r--object/BaseObject.php37
-rw-r--r--object/Conversation.php162
-rw-r--r--object/Item.php638
-rw-r--r--version.inc2
-rw-r--r--view/theme/duepuntozero/css/style.css18
-rw-r--r--view/theme/duepuntozero/php/theme.php14
-rw-r--r--view/tpl/comment_item.tpl9
-rw-r--r--view/tpl/wall_thread.tpl6
12 files changed, 1006 insertions, 86 deletions
diff --git a/include/Contact.php b/include/Contact.php
index 5e0964d03..571c956f1 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -1,15 +1,15 @@
<?php
-function map_perms($entity,$zguid) {
+function map_perms($entity,$zguid,$zsig) {
$is_contact = false;
$is_site = false;
$is_network = false;
$is_anybody = true;
- if(strlen($zguid)) {
-
+ if(strlen($zguid) && strlen($zsig)) {
+
$is_network = true;
$r = q("select * from contact where guid = '%s' and uid = %d limit 1",
@@ -20,23 +20,76 @@ function map_perms($entity,$zguid) {
$is_contact = true;
$contact = $r[0];
}
- $r = q("select * from entity where entity_global_id = '%s' limit 1",
+ $r = q("select * from entity where entity_global_id = '%s'",
dbesc($zguid)
);
if($r && count($r)) {
- $is_site = true;
+ foreach($r as $rr) {
+ if(base64url_encode(rsa_sign($rr['entity_global_id'],$rr['entity_prvkey'])) === $zsig) {
+ $is_site = true;
+ break;
+ }
+ }
}
}
+ $perms = array(
+ 'view_stream' => array('entity_r_stream', PERMS_R_STREAM ),
+ 'view_profile' => array('entity_r_profile', PERMS_R_PROFILE),
+ 'view_photos' => array('entity_r_photos', PERMS_R_PHOTOS),
+ 'view_contacts' => array('entity_r_abook', PERMS_R_ABOOK),
+
+ 'send_stream' => array('entity_w_stream', PERMS_W_STREAM),
+ 'post_wall' => array('entity_w_wall', PERMS_W_WALL),
+ 'tag_deliver' => array('entity_w_tagwall', PERMS_W_TAGWALL),
+ 'post_comments' => array('entity_w_comment', PERMS_W_COMMENT),
+ 'post_mail' => array('entity_w_mail', PERMS_W_MAIL),
+ 'post_photos' => array('entity_w_photos', PERMS_W_PHOTOS),
+ 'chat' => array('entity_w_chat', PERMS_W_CHAT),
+ );
+ $ret = array();
+ foreach($perms as $k => $v) {
+ $ret[$k] = z_check_perms($k,$v,$entity,$contact,$is_contact,$is_site,$is_network,$is_anybody);
+ }
-}
+ return $ret;
+}
+function z_check_perms($k,$v,$entity,$contact,$is_contact,$is_site,$is_network,$is_anybody) {
+ $allow = (($contact['self']) ? true : false);
+
+ switch($entity[$v[0]]) {
+ case PERMS_PUBLIC:
+ if($is_anybody)
+ $allow = true;
+ break;
+ case PERMS_NETWORK:
+ if($is_network)
+ $allow = true;
+ break;
+ case PERMS_SITE:
+ if($is_site)
+ $allow = true;
+ break;
+ case PERMS_CONTACTS:
+ if($is_contact)
+ $allow = true;
+ break;
+ case PERMS_SPECIFIC:
+ if($is_contact && is_array($contact) && ($contact['my_perms'] & $v[1]))
+ $allow = true;
+ break;
+ default:
+ break;
+ }
+ return $allow;
+}
diff --git a/include/conversation.php b/include/conversation.php
index 7fb341ef3..b5faa0b34 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -113,15 +113,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');
@@ -131,7 +131,7 @@ function localize_item(&$item){
break;
}
$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
-
+
}
if ($item['verb']=== ACTIVITY_FRIEND){
@@ -139,12 +139,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){
@@ -153,9 +153,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]';
@@ -171,12 +171,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){
@@ -185,9 +185,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]';
@@ -243,19 +243,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){
@@ -264,9 +264,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",
@@ -340,18 +340,18 @@ 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['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
$nb_items --;
continue;
}
-
+
$items_seen++;
-
+
$comment = '';
$template = $wall_template;
$commentww = '';
@@ -404,10 +404,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);
@@ -420,7 +420,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(x($a->contacts,$normalised))
@@ -453,7 +453,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']) {
@@ -463,14 +463,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'];
@@ -478,7 +478,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';
@@ -543,7 +543,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'],
@@ -584,7 +584,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),
@@ -654,7 +654,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$item_result['comment'] = false;
}
}
-
+
$result[] = $item_result;
}
@@ -667,7 +667,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.
*
*/
@@ -735,19 +735,19 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
$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');
@@ -782,7 +782,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
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(x($a->contacts,$normalised))
@@ -1356,7 +1356,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;
}
@@ -1382,18 +1382,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){
@@ -1425,7 +1425,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>';
}
@@ -1446,10 +1446,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)
@@ -1469,7 +1469,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;
@@ -1495,7 +1495,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
$tpl = get_markup_template("jot.tpl");
-
+
$jotplugins = '';
$jotnets = '';
@@ -1505,7 +1505,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,
@@ -1553,7 +1553,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;
@@ -1620,7 +1620,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) {
@@ -1638,7 +1638,7 @@ function conv_sort($arr,$order) {
usort($y,'sort_thr_created_rev');
$parents[$k]['children'] = $y;*/
}
- }
+ }
}
$ret = array();
diff --git a/index.php b/index.php
index 8f7f8fa92..919d3695f 100644
--- a/index.php
+++ b/index.php
@@ -13,8 +13,10 @@
*/
require_once('boot.php');
+require_once('object/BaseObject.php');
$a = new App;
+BaseObject::set_app($a);
/**
*
diff --git a/mod/zperms.php b/mod/zperms.php
index c15f4dccf..b2c18c7d0 100644
--- a/mod/zperms.php
+++ b/mod/zperms.php
@@ -3,12 +3,15 @@
function zperms_init(&$a) {
require_once('include/zot.php');
+ require_once('include/Contact.php');
+ require_once('include/crypto.php');
$ret = array('success' => false);
- $zguid = ((x($_REQUEST,'guid')) ? $_REQUEST['guid'] : '');
- $zaddr = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : '');
- $ztarget = ((x($_REQUEST,'target')) ? $_REQUEST['target'] : '');
+ $zguid = ((x($_REQUEST,'guid')) ? $_REQUEST['guid'] : '');
+ $zaddr = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : '');
+ $ztarget = ((x($_REQUEST,'target')) ? $_REQUEST['target'] : '');
+ $zsig = ((x($_REQUEST,'target_sig')) ? $_REQUEST['target_sig'] : '');
$r = null;
@@ -31,8 +34,6 @@ function zperms_init(&$a) {
$ret['message'] = 'Item not found.';
json_return_and_die($ret);
}
-
-
$e = $r[0];
$id = $e['entity_id'];
@@ -46,15 +47,16 @@ function zperms_init(&$a) {
}
- $ret['success'] = true;
-
- // Communication details
+ $ret['success'] = true;
$ret['guid'] = $e['entity_global_id'];
$ret['guid_sig'] = base64url_encode(rsa_sign($e['entity_global_id'],$e['entity_prvkey']));
$ret['key'] = $e['entity_pubkey'];
$ret['name'] = $e['entity_name'];
$ret['address'] = $e['entity_address'];
+ $ret['target'] = $ztarget;
+ $ret['target_sig'] = $zsig;
+ $ret['permissions'] = map_perms($r[0],$ztarget,$zsig);
$ret['profile'] = $profile;
@@ -68,6 +70,7 @@ function zperms_init(&$a) {
$ret['hubs'][] = array(
'primary' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false),
'url' => $hub['hubloc_url'],
+ /// hmmm we probably shouldn't sign somebody else's hub. FIXME
'url_sig' => base64url_encode(rsa_sign($hub['hubloc_url'],$e['entity_prvkey'])),
'callback' => $hub['hubloc_callback'],
'sitekey' => $hub['hubloc_sitekey']
@@ -78,4 +81,4 @@ function zperms_init(&$a) {
json_return_and_die($ret);
-} \ No newline at end of file
+}
diff --git a/object/BaseObject.php b/object/BaseObject.php
new file mode 100644
index 000000000..14f0d8fd0
--- /dev/null
+++ b/object/BaseObject.php
@@ -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;
+ }
+}
+?>
diff --git a/object/Conversation.php b/object/Conversation.php
new file mode 100644
index 000000000..8b838f7d0
--- /dev/null
+++ b/object/Conversation.php
@@ -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;
+ }
+}
+?>
diff --git a/object/Item.php b/object/Item.php
new file mode 100644
index 000000000..7fa3fed2d
--- /dev/null
+++ b/object/Item.php
@@ -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;
+ }
+}
+?>
diff --git a/version.inc b/version.inc
index 4f1b480a7..a9a3cd318 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-09-09.72
+2012-09-10.73
diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css
index 34360aacf..f2edad499 100644
--- a/view/theme/duepuntozero/css/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -952,7 +952,6 @@ input#dfrn-url {
position: relative;
-moz-border-radius: 3px;
border-radius: 3px;
-
}
.tread-wrapper .tread-wrapper {
@@ -1210,6 +1209,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;
}
@@ -1229,6 +1232,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;
@@ -1772,12 +1779,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;
@@ -3088,7 +3099,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 {
diff --git a/view/theme/duepuntozero/php/theme.php b/view/theme/duepuntozero/php/theme.php
index e42c2b7b4..a1d436a4b 100644
--- a/view/theme/duepuntozero/php/theme.php
+++ b/view/theme/duepuntozero/php/theme.php
@@ -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() {
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 98173aa30..3de24ca8d 100644
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -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" />
diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl
index 35f613b39..ade8264fa 100644
--- a/view/tpl/wall_thread.tpl
+++ b/view/tpl/wall_thread.tpl
@@ -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,11 +97,13 @@
{{ 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}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 08:29:46 +0000