X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=05c41e6d27d08a87b39a1881512cfeb0cf35fa97;hb=9f2196aa1aa0dc112e3fc238832828d4e22fe137;hp=7c044a672ca18dbba34c91e7b3502b81afb92a7e;hpb=d810b21f8722190754cb5b9a0cb27896b8648dae;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 7c044a672c..05c41e6d27 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once "include/bbcode.php";
 require_once "include/acl_selectors.php";
@@ -65,7 +66,7 @@ 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
+		$replace = '[url=' . System::baseUrl() . '/redir/' . $cid
 				   . '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]';
 
 		$newbody .= substr($origbody, 0, $pos['start']['open']);
@@ -358,7 +359,7 @@ function localize_item(&$item) {
 	$x = stristr($item['plink'],'/display/');
 	if ($x) {
 		$sparkle = false;
-		$y = best_link_url($item, $sparkle, true);
+		$y = best_link_url($item, $sparkle);
 
 		if (strstr($y, '/redir/')) {
 			$item['plink'] = $y . '?f=&url=' . $item['plink'];
@@ -462,7 +463,14 @@ These Fields are not added below (yet). They are here to for bug search.
 		`author`.`thumb` AS `author-thumb`, `owner`.`thumb` AS `owner-thumb`,
 
 		`contact`.`network`, `contact`.`url`, `contact`.`name`, `contact`.`writable`,
-		`contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`";
+		`contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`,
+
+		`event`.`created` AS `event-created`, `event`.`edited` AS `event-edited`,
+		`event`.`start` AS `event-start`,`event`.`finish` AS `event-finish`,
+		`event`.`summary` AS `event-summary`,`event`.`desc` AS `event-desc`,
+		`event`.`location` AS `event-location`, `event`.`type` AS `event-type`,
+		`event`.`nofinish` AS `event-nofinish`,`event`.`adjust` AS `event-adjust`,
+		`event`.`ignore` AS `event-ignore`, `event`.`id` AS `event-id`";
 }
 
 /**
@@ -472,7 +480,8 @@ function item_joins() {
 	return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND
 		(NOT `contact`.`blocked` OR `contact`.`pending`)
 		LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
-		LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`";
+		LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`
+		LEFT JOIN `event` ON `event-id` = `event`.`id`";
 }
 
 /**
@@ -680,14 +689,19 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 				$hashtags = array();
 				$mentions = array();
 
-				$taglist = dba::p("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?) ORDER BY `tid`",
-						intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
+				$searchpath = System::baseUrl()."/search?tag=";
+
+				$taglist = dba::select('term', array('type', 'term', 'url'),
+							array("`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION),
+							array('order' => array('tid')));
 
 				while ($tag = dba::fetch($taglist)) {
 					if ($tag["url"] == "") {
 						$tag["url"] = $searchpath . strtolower($tag["term"]);
 					}
 
+					$tag["url"] = best_link_url($item, $sp, $tag["url"]);
+
 					if ($tag["type"] == TERM_HASHTAG) {
 						$hashtags[] = "#<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
 						$prefix = "#";
@@ -700,7 +714,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 				dba::close($taglist);
 
 				$sp = false;
-				$profile_link = best_link_url($item,$sp);
+				$profile_link = best_link_url($item, $sp);
 				if ($profile_link === 'mailbox') {
 					$profile_link = '';
 				}
@@ -794,7 +808,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 					'name' => $profile_name_e,
 					'sparkle' => $sparkle,
 					'lock' => $lock,
-					'thumb' => App::remove_baseurl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
+					'thumb' => System::removedBaseUrl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
 					'title' => $item['title_e'],
 					'body' => $body_e,
 					'tags' => $tags_e,
@@ -813,7 +827,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 					'indent' => '',
 					'owner_name' => $owner_name_e,
 					'owner_url' => $owner_url,
-					'owner_photo' => App::remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
+					'owner_photo' => System::removedBaseUrl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
 					'plink' => get_plink($item),
 					'edpost' => false,
 					'isstarred' => $isstarred,
@@ -900,7 +914,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 	}
 
 	$o = replace_macros($page_template, array(
-		'$baseurl' => App::get_baseurl($ssl_state),
+		'$baseurl' => System::baseUrl($ssl_state),
 		'$return_path' => $a->query_string,
 		'$live_update' => $live_update_div,
 		'$remove' => t('remove'),
@@ -913,7 +927,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 	return $o;
 }}
 
-function best_link_url($item, &$sparkle, $ssl_state = false) {
+function best_link_url($item, &$sparkle, $url = '') {
 
 	$best_url = '';
 	$sparkle  = false;
@@ -927,10 +941,20 @@ function best_link_url($item, &$sparkle, $ssl_state = false) {
 		if (dbm::is_result($r)) {
 			$best_url = 'redir/' . $r['id'];
 			$sparkle = true;
+			if ($url != '') {
+				$hostname = get_app()->get_hostname();
+				if (!strstr($url, $hostname)) {
+					$best_url .= "?url=".$url;
+				} else {
+					$best_url = $url;
+				}
+			}
 		}
 	}
 	if (! $best_url) {
-		if (strlen($item['author-link'])) {
+		if ($url != '') {
+			$best_url = $url;
+		} elseif (strlen($item['author-link'])) {
 			$best_url = $item['author-link'];
 		} else {
 			$best_url = $item['url'];
@@ -942,12 +966,6 @@ function best_link_url($item, &$sparkle, $ssl_state = false) {
 
 
 function item_photo_menu($item) {
-	$ssl_state = false;
-
-	if (local_user()) {
-		$ssl_state = true;
-	}
-
 	$sub_link = '';
 	$poke_link = '';
 	$contact_url = '';
@@ -962,7 +980,7 @@ function item_photo_menu($item) {
 	}
 
 	$sparkle = false;
-	$profile_link = best_link_url($item, $sparkle, $ssl_state);
+	$profile_link = best_link_url($item, $sparkle);
 	if ($profile_link === 'mailbox') {
 		$profile_link = '';
 	}
@@ -1216,7 +1234,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
 	$tpl = get_markup_template('jot-header.tpl');
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$newpost' => 'true',
-		'$baseurl' => App::get_baseurl(true),
+		'$baseurl' => System::baseUrl(true),
 		'$geotag' => $geotag,
 		'$nickname' => $x['nickname'],
 		'$ispublic' => t('Visible to <strong>everybody</strong>'),
@@ -1232,7 +1250,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
 	$tpl = get_markup_template('jot-end.tpl');
 	$a->page['end'] .= replace_macros($tpl, array(
 		'$newpost' => 'true',
-		'$baseurl' => App::get_baseurl(true),
+		'$baseurl' => System::baseUrl(true),
 		'$geotag' => $geotag,
 		'$nickname' => $x['nickname'],
 		'$ispublic' => t('Visible to <strong>everybody</strong>'),
@@ -1300,7 +1318,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
 		'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
 		'$content' => $x['content'],
 		'$post_id' => $x['post_id'],
-		'$baseurl' => App::get_baseurl(true),
+		'$baseurl' => System::baseUrl(true),
 		'$defloc' => $x['default_location'],
 		'$visitor' => $x['visitor'],
 		'$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),