X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=ec53d064d6b83704d24ff2bd99f8a5b6c8f96640;hb=ed87e634ed18429c2848d5492abc8fc722fe3e58;hp=0dce1c08c67e4bffa272947380a62a0fcdb69d9b;hpb=9b37f5c0855c8071075fa3ce49b7e9c38f2c6a2e;p=friendica.git

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 0dce1c08c6..ec53d064d6 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -7,6 +7,7 @@ namespace Friendica\Model;
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
@@ -19,10 +20,10 @@ use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
-require_once 'include/bbcode.php';
 require_once 'mod/proxy.php';
 
 class Profile
@@ -258,7 +259,7 @@ class Profile
 	 * @param int $block
 	 * @param boolean $show_connect Show connect link
 	 *
-	 * @return HTML string suitable for sidebar inclusion
+	 * @return string HTML sidebar module
 	 *
 	 * @note Returns empty string if passed $profile is wrong type or not populated
 	 *
@@ -486,19 +487,21 @@ class Profile
 		}
 
 		if (isset($p['about'])) {
-			$p['about'] = bbcode($p['about']);
+			$p['about'] = BBCode::convert($p['about']);
 		}
 
 		if (isset($p['address'])) {
-			$p['address'] = bbcode($p['address']);
+			$p['address'] = BBCode::convert($p['address']);
 		} else {
-			$p['address'] = bbcode($p['location']);
+			$p['address'] = BBCode::convert($p['location']);
 		}
 
 		if (isset($p['photo'])) {
 			$p['photo'] = proxy_url($p['photo'], false, PROXY_SIZE_SMALL);
 		}
 
+		$p['url'] = self::magicLink($p['url']);
+
 		$tpl = get_markup_template('profile_vcard.tpl');
 		$o .= replace_macros($tpl, [
 			'$profile' => $p,
@@ -564,8 +567,10 @@ class Profile
 				Cache::set($cachekey, $r, CACHE_HOUR);
 			}
 		}
+
+		$total = 0;
+		$classtoday = '';
 		if (DBM::is_result($r)) {
-			$total = 0;
 			$now = strtotime('now');
 			$cids = [];
 
@@ -619,11 +624,10 @@ class Profile
 		]);
 	}
 
-	public static function getEvents()
+	public static function getEventsReminderHTML()
 	{
-		require_once 'include/bbcode.php';
-
 		$a = get_app();
+		$o = '';
 
 		if (!local_user() || $a->is_mobile || $a->is_tablet) {
 			return $o;
@@ -640,12 +644,26 @@ class Profile
 		$classtoday = '';
 
 		$s = dba::p(
-			"SELECT `event`.* FROM `event`
-			WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
-			ORDER BY `start` ASC ",
+			"SELECT *
+			FROM `event`
+			WHERE `event`.`uid` = ?
+			AND  `event`.`type` != 'birthday'
+			AND  `event`.`start` < ?
+			AND  `event`.`start` >= ?
+			AND NOT EXISTS (
+				SELECT `id`
+				FROM `item`
+				WHERE `item`.`uid` = `event`.`uid`
+				AND `item`.`parent-uri` = `event`.`uri`
+				AND `item`.`verb` = ?
+				AND `item`.`visible`
+				AND NOT `item`.`deleted`
+			)
+			ORDER BY  `event`.`start` ASC",
 			local_user(),
 			DateTimeFormat::utc('now + 7 days'),
-			DateTimeFormat::utc('now - 1 days')
+			DateTimeFormat::utc('now - 1 days'),
+			ACTIVITY_ATTENDNO
 		);
 
 		$r = [];
@@ -663,13 +681,13 @@ class Profile
 					$istoday = true;
 				}
 
-				$title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
+				$title = strip_tags(html_entity_decode(BBCode::convert($rr['summary']), ENT_QUOTES, 'UTF-8'));
 
 				if (strlen($title) > 35) {
 					$title = substr($title, 0, 32) . '... ';
 				}
 
-				$description = substr(strip_tags(bbcode($rr['desc'])), 0, 32) . '... ';
+				$description = substr(strip_tags(BBCode::convert($rr['desc'])), 0, 32) . '... ';
 				if (!$description) {
 					$description = L10n::t('[No description]');
 				}
@@ -721,6 +739,10 @@ class Profile
 
 			$profile['fullname'] = [L10n::t('Full Name:'), $a->profile['name']];
 
+			if (Feature::isEnabled($uid, 'profile_membersince')) {
+				$profile['membersince'] = [L10n::t('Member since:'), DateTimeFormat::local($a->profile['register_date'])];
+			}
+
 			if ($a->profile['gender']) {
 				$profile['gender'] = [L10n::t('Gender:'), $a->profile['gender']];
 			}
@@ -740,7 +762,7 @@ class Profile
 
 			if (!empty($a->profile['dob'])
 				&& $a->profile['dob'] > '0001-01-01'
-				&& $age = age($a->profile['dob'], $a->profile['timezone'], '')
+				&& $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'], '')
 			) {
 				$profile['age'] = [L10n::t('Age:'), $age];
 			}
@@ -755,7 +777,7 @@ class Profile
 			}
 
 			if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
-				$profile['howlong'] = relative_date($a->profile['howlong'], L10n::t('for %1$d %2$s'));
+				$profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
 			}
 
 			if ($a->profile['sexual']) {
@@ -985,6 +1007,29 @@ class Profile
 		}
 	}
 
+	/**
+	 * @brief Returns a magic link to authenticate remote visitors
+	 *
+	 * @param string $contact_url The address of the contact profile
+	 * @param integer $uid The user id, "local_user" is the default
+	 *
+	 * @return string with "redir" link
+	 */
+	public static function magicLink($contact_url, $uid = -1)
+	{
+		if ($uid == -1) {
+			$uid = local_user();
+		}
+		$condition = ['pending' => false, 'uid' => $uid,
+				'nurl' => normalise_link($contact_url),
+				'network' => NETWORK_DFRN, 'self' => false];
+		$contact = dba::selectFirst('contact', ['id'], $condition);
+		if (DBM::is_result($contact)) {
+			return System::baseUrl() . '/redir/' . $contact['id'];
+		}
+		return self::zrl($contact_url);
+	}
+
 	public static function zrl($s, $force = false)
 	{
 		if (!strlen($s)) {