X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=867a6db4fb6fad2f31ea1a41d65c6a7b9cb8f07d;hb=7b7132971a64a92a685a5fd860fe4709dce1765a;hp=caf0b0869d3fa1aab60312bfdeb782cbbd83577d;hpb=38e5733b6ee10f5a6dd7f017b6b6e7acfde80565;p=friendica.git

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index caf0b0869d..867a6db4fb 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Model/Profile.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Model;
 
 use Friendica\App;
@@ -10,6 +27,7 @@ use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
+use Friendica\Network\Probe;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -184,16 +202,6 @@ class Profile
 			require_once $theme_info_file;
 		}
 
-		if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
-			DI::page()['aside'] .= Renderer::replaceMacros(
-				Renderer::getMarkupTemplate('settings/profile/link.tpl'),
-				[
-					'$editprofile' => DI::l10n()->t('Edit profile'),
-					'$profid' => $a->profile['id']
-				]
-			);
-		}
-
 		$block = ((DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) ? true : false);
 
 		/**
@@ -322,8 +330,9 @@ class Profile
 
 		if (!$local_user_is_self && $show_connect) {
 			if (!$visitor_is_authenticated) {
-				if (!empty($profile['nickname'])) {
-					$follow_link = 'dfrn_request/' . $profile['nickname'];
+				// Remote follow is only available for local profiles
+				if (!empty($profile['nickname']) && strpos($profile_url, DI::baseUrl()->get()) === 0) {
+					$follow_link = 'remote_follow/' . $profile['nickname'];
 				}
 			} elseif ($profile_is_native) {
 				if ($visitor_is_following) {
@@ -369,13 +378,12 @@ class Profile
 			$location = DI::l10n()->t('Location:');
 		}
 
-		$gender   = !empty($profile['gender'])   ? DI::l10n()->t('Gender:')   : false;
 		$homepage = !empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false;
 		$about    = !empty($profile['about'])    ? DI::l10n()->t('About:')    : false;
 		$xmpp     = !empty($profile['xmpp'])     ? DI::l10n()->t('XMPP:')     : false;
 
 		if ((!empty($profile['hidewall']) || $block) && !Session::isAuthenticated()) {
-			$location = $gender = $marital = $homepage = $about = false;
+			$location = $homepage = $about = false;
 		}
 
 		$split_name = Diaspora::splitName($profile['name']);
@@ -386,7 +394,7 @@ class Profile
 			$diaspora = [
 				'guid' => $profile['guid'],
 				'podloc' => DI::baseUrl(),
-				'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false'),
+				'searchable' => ($profile['net-publish'] ? 'true' : 'false'),
 				'nickname' => $profile['nickname'],
 				'fullname' => $profile['name'],
 				'firstname' => $firstname,
@@ -444,10 +452,6 @@ class Profile
 			$p['address'] = BBCode::convert($p['address']);
 		}
 
-		if (isset($p['gender'])) {
-			$p['gender'] = DI::l10n()->t($p['gender']);
-		}
-
 		if (isset($p['photo'])) {
 			$p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
 		}
@@ -468,7 +472,6 @@ class Profile
 			'$wallmessage_link' => $wallmessage_link,
 			'$account_type' => $account_type,
 			'$location' => $location,
-			'$gender' => $gender,
 			'$homepage' => $homepage,
 			'$about' => $about,
 			'$network' => DI::l10n()->t('Network:'),
@@ -784,6 +787,7 @@ class Profile
 		$_SESSION['visitor_handle'] = $visitor['addr'];
 		$_SESSION['visitor_home'] = $visitor['url'];
 		$_SESSION['my_url'] = $visitor['url'];
+		$_SESSION['remote_comment'] = Probe::getRemoteFollowLink($visitor['url']);
 
 		Session::setVisitorsContacts();
 
@@ -909,7 +913,7 @@ class Profile
 				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
 				AND ((`profile`.`name` LIKE ?) OR
 				(`user`.`nickname` LIKE ?) OR
-				(`profile`.`pdesc` LIKE ?) OR
+				(`profile`.`about` LIKE ?) OR
 				(`profile`.`locality` LIKE ?) OR
 				(`profile`.`region` LIKE ?) OR
 				(`profile`.`country-name` LIKE ?) OR
@@ -944,7 +948,7 @@ class Profile
 			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
 			AND ((`profile`.`name` LIKE ?) OR
 				(`user`.`nickname` LIKE ?) OR
-				(`profile`.`pdesc` LIKE ?) OR
+				(`profile`.`about` LIKE ?) OR
 				(`profile`.`locality` LIKE ?) OR
 				(`profile`.`region` LIKE ?) OR
 				(`profile`.`country-name` LIKE ?) OR