X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=object%2FItem.php;h=06b3683c6a494753e30dfde75c8f4057dc43155d;hb=ee263aec55fb86c12c0efa81b88abd4a8b72b043;hp=4da5b8a59ff630bf30f8bc81473a3d0d294ac1f9;hpb=1392c58377b462c10f9db5edc97cd82d3a683dc7;p=friendica.git
diff --git a/object/Item.php b/object/Item.php
index 4da5b8a59f..06b3683c6a 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -66,6 +66,7 @@ class Item extends BaseObject {
if(! visible_activity($item)) {
continue;
}
+ $item['pagedrop'] = $data['pagedrop'];
$child = new Item($item);
$this->add_child($child);
}
@@ -85,7 +86,14 @@ class Item extends BaseObject {
$a = $this->get_app();
$item = $this->get_data();
-
+ $edited = false;
+ if (strcmp($item['created'], $item['edited'])<>0) {
+ $edited = array(
+ 'label' => t('This entry was edited'),
+ 'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
+ 'relative' => relative_date($item['edited'])
+ );
+ }
$commentww = '';
$sparkle = '';
$buttons = '';
@@ -115,10 +123,10 @@ class Item extends BaseObject {
$drop = array(
'dropping' => $dropping,
'pagedrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $item['pagedrop'] : ''),
- 'select' => t('Select'),
+ '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);
@@ -133,7 +141,7 @@ class Item extends BaseObject {
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)))
@@ -145,10 +153,30 @@ class Item extends BaseObject {
call_hooks('render_location',$locate);
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+ $searchpath = $a->get_baseurl()."/search?tag=";
$tags=array();
$hashtags = array();
$mentions = array();
- foreach(explode(',',$item['tag']) as $tag){
+
+ $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
+ intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
+
+ foreach($taglist as $tag) {
+
+ if ($tag["url"] == "")
+ $tag["url"] = $searchpath.strtolower($tag["term"]);
+
+ if ($tag["type"] == TERM_HASHTAG) {
+ $hashtags[] = "#".$tag["term"]."";
+ $prefix = "#";
+ } elseif ($tag["type"] == TERM_MENTION) {
+ $mentions[] = "@".$tag["term"]."";
+ $prefix = "@";
+ }
+ $tags[] = $prefix."".$tag["term"]."";
+ }
+
+ /*foreach(explode(',',$item['tag']) as $tag){
$tag = trim($tag);
if ($tag!="") {
$t = bbcode($tag);
@@ -158,8 +186,7 @@ class Item extends BaseObject {
elseif($t[0] == '@')
$mentions[] = $t;
}
-
- }
+ }*/
$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']) : '');
@@ -170,10 +197,10 @@ class Item extends BaseObject {
* 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");
@@ -212,9 +239,34 @@ class Item extends BaseObject {
localize_item($item);
+ if ($item["postopts"]) {
+ //$langdata = explode(";", $item["postopts"]);
+ //$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
+ $langstr = "";
+ if (substr($item["postopts"], 0, 5) == "lang=") {
+ $postopts = substr($item["postopts"], 5);
+
+ $languages = explode(":", $postopts);
+
+ if (sizeof($languages) == 1) {
+ $languages = array();
+ $languages[] = $postopts;
+ }
+
+ foreach ($languages as $language) {
+ $langdata = explode(";", $language);
+ if ($langstr != "")
+ $langstr .= ", ";
+
+ //$langstr .= $langdata[0]." (".round($langdata[1]*100, 1)."%)";
+ $langstr .= round($langdata[1]*100, 1)."% ".$langdata[0];
+ }
+ }
+ }
+
$body = prepare_body($item,true);
- list($categories, $folders) = get_cats_and_terms($item);
+ list($categories, $folders) = get_cats_and_terms($item);
if($a->theme['template_engine'] === 'internal') {
$body_e = template_escape($body);
@@ -235,17 +287,17 @@ class Item extends BaseObject {
$tmp_item = array(
'template' => $this->get_template(),
-
+
'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
'tags' => $tags,
- 'hashtags' => $hashtags,
- 'mentions' => $mentions,
+ 'hashtags' => $hashtags,
+ 'mentions' => $mentions,
'txt_cats' => t('Categories:'),
'txt_folders' => t('Filed under:'),
'has_cats' => ((count($categories)) ? 'true' : ''),
'has_folders' => ((count($folders)) ? 'true' : ''),
- 'categories' => $categories,
- 'folders' => $folders,
+ 'categories' => $categories,
+ 'folders' => $folders,
'body' => $body_e,
'text' => $text_e,
'id' => $this->get_id(),
@@ -280,13 +332,14 @@ class Item extends BaseObject {
'drop' => $drop,
'vote' => $buttons,
'like' => $like,
- 'dislike' => $dislike,
+ 'dislike' => $dislike,
'switchcomment' => t('Comment'),
'comment' => $this->get_comment_box($indent),
'previewing' => ($conv->is_preview() ? ' preview ' : ''),
'wait' => t('Please wait'),
- 'remove' => t('remove'),
- 'thread_level' => $thread_level
+ 'thread_level' => $thread_level,
+ 'postopts' => $langstr,
+ 'edited' => $edited
);
$arr = array('item' => $item, 'output' => $tmp_item);
@@ -316,12 +369,12 @@ class Item extends BaseObject {
}
}
}
-
+
if ($this->is_toplevel()) {
$result['total_comments_num'] = "$total_children";
$result['total_comments_text'] = tt('comment', 'comments', $total_children);
}
-
+
$result['private'] = $item['private'];
$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
@@ -492,13 +545,7 @@ class Item extends BaseObject {
return false;
}
- if($a->theme['template_engine'] === 'smarty3') {
- $template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
- }
- else {
- $template_file = $this->available_templates[$name];
- }
- $this->template = $template_file;
+ $this->template = $this->available_templates[$name];
}
/**
@@ -588,7 +635,7 @@ class Item extends BaseObject {
$qcomment = (($qc) ? explode("\n",$qc) : null);
}
$comment_box = replace_macros($template,array(
- '$return_path' => '',
+ '$return_path' => $a->query_string,
'$threaded' => $this->is_threaded(),
// '$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
'$jsreload' => '',