X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=9d1b002a7911ac5a53294b08f584e1853b69e02a;hb=71b1638d9a6cc44ab294116474c73c12d2df97f7;hp=cb1a15afd3b74c0c23815ca5224748ffc649c524;hpb=1c7f4e3c6331f8ad7b1987f33a17074908ad41eb;p=friendica.git

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index cb1a15afd3..9d1b002a79 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -15,18 +15,15 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Verify;
 use Friendica\Protocol\Diaspora;
-use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
-use dba;
 
 require_once 'include/dba.php';
-require_once 'mod/proxy.php';
 
 class Profile
 {
@@ -41,11 +38,11 @@ class Profile
 	{
 		$location = '';
 
-		if ($profile['locality']) {
+		if (!empty($profile['locality'])) {
 			$location .= $profile['locality'];
 		}
 
-		if ($profile['region'] && ($profile['locality'] != $profile['region'])) {
+		if (!empty($profile['region']) && (defaults($profile, 'locality', '') != $profile['region'])) {
 			if ($location) {
 				$location .= ', ';
 			}
@@ -53,7 +50,7 @@ class Profile
 			$location .= $profile['region'];
 		}
 
-		if ($profile['country-name']) {
+		if (!empty($profile['country-name'])) {
 			if ($location) {
 				$location .= ', ';
 			}
@@ -90,30 +87,27 @@ class Profile
 	 * @param array   $profiledata  array
 	 * @param boolean $show_connect Show connect link
 	 */
-	public static function load(App $a, $nickname, $profile = 0, $profiledata = [], $show_connect = true)
+	public static function load(App $a, $nickname, $profile = 0, array $profiledata = [], $show_connect = true)
 	{
-		$user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
+		$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
 
-		if (!DBM::is_result($user) && empty($profiledata)) {
+		if (!DBA::isResult($user) && empty($profiledata)) {
 			logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
 			notice(L10n::t('Requested account is not available.') . EOL);
 			$a->error = 404;
 			return;
 		}
 
-		if (empty($a->page['aside'])) {
-			$a->page['aside'] = '';
-		}
-
-		if ($profiledata) {
+		if (count($profiledata) > 0) {
+			// Add profile data to sidebar
 			$a->page['aside'] .= self::sidebar($profiledata, true, $show_connect);
 
-			if (!DBM::is_result($user)) {
+			if (!DBA::isResult($user)) {
 				return;
 			}
 		}
 
-		$pdata = self::getByNickname($nickname, $user[0]['uid'], $profile);
+		$pdata = self::getByNickname($nickname, $user['uid'], $profile);
 
 		if (empty($pdata) && empty($profiledata)) {
 			logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
@@ -122,6 +116,10 @@ class Profile
 			return;
 		}
 
+		if (empty($pdata)) {
+			$pdata = ['uid' => 0, 'profile_uid' => 0, 'is-default' => false,'name' => $nickname];
+		}
+
 		// fetch user tags if this isn't the default profile
 
 		if (!$pdata['is-default']) {
@@ -140,7 +138,7 @@ class Profile
 		$a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme');
 		$a->profile['network'] = NETWORK_DFRN;
 
-		$a->page['title'] = $a->profile['name'] . ' @ ' . $a->config['sitename'];
+		$a->page['title'] = $a->profile['name'] . ' @ ' . Config::get('config', 'sitename');
 
 		if (!$profiledata && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
 			$_SESSION['theme'] = $a->profile['theme'];
@@ -204,8 +202,8 @@ class Profile
 		if (remote_user() && count($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $visitor) {
 				if ($visitor['uid'] == $uid) {
-					$contact = dba::selectFirst('contact', ['profile-id'], ['id' => $visitor['cid']]);
-					if (DBM::is_result($contact)) {
+					$contact = DBA::selectFirst('contact', ['profile-id'], ['id' => $visitor['cid']]);
+					if (DBA::isResult($contact)) {
 						$profile_id = $contact['profile-id'];
 					}
 					break;
@@ -216,7 +214,7 @@ class Profile
 		$profile = null;
 
 		if ($profile_id) {
-			$profile = dba::fetch_first(
+			$profile = DBA::fetchFirst(
 				"SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`,
 					`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
 					`profile`.`uid` AS `profile_uid`, `profile`.*,
@@ -229,8 +227,8 @@ class Profile
 				intval($profile_id)
 			);
 		}
-		if (!DBM::is_result($profile)) {
-			$profile = dba::fetch_first(
+		if (!DBA::isResult($profile)) {
+			$profile = DBA::fetchFirst(
 				"SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`,
 					`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
 					`profile`.`uid` AS `profile_uid`, `profile`.*,
@@ -308,6 +306,8 @@ class Profile
 			$connect = false;
 		}
 
+		$profile_url = '';
+
 		// Is the local user already connected to that user?
 		if ($connect && local_user()) {
 			if (isset($profile['url'])) {
@@ -316,7 +316,7 @@ class Profile
 				$profile_url = normalise_link(System::baseUrl() . '/profile/' . $profile['nickname']);
 			}
 
-			if (dba::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) {
+			if (DBA::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) {
 				$connect = false;
 			}
 		}
@@ -345,14 +345,14 @@ class Profile
 					"SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d",
 					intval($profile['uid']),
 					intval(remote_user()),
-					intval(CONTACT_IS_FRIEND)
+					intval(Contact::FRIEND)
 				);
 			} else {
 				$r = q(
 					"SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
 					intval($profile['uid']),
-					dbesc(normalise_link(self::getMyURL())),
-					intval(CONTACT_IS_FRIEND)
+					DBA::escape(normalise_link(self::getMyURL())),
+					intval(Contact::FRIEND)
 				);
 			}
 			if ($r) {
@@ -379,7 +379,7 @@ class Profile
 				'entries' => [],
 			];
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				foreach ($r as $rr) {
 					$profile['menu']['entries'][] = [
 						'photo' => $rr['thumb'],
@@ -438,9 +438,9 @@ class Profile
 				'fullname' => $profile['name'],
 				'firstname' => $firstname,
 				'lastname' => $lastname,
-				'photo300' => $profile['contact_photo'],
-				'photo100' => $profile['contact_thumb'],
-				'photo50' => $profile['contact_micro'],
+				'photo300' => defaults($profile, 'contact_photo', ''),
+				'photo100' => defaults($profile, 'contact_thumb', ''),
+				'photo50' => defaults($profile, 'contact_micro', ''),
 			];
 		} else {
 			$diaspora = false;
@@ -457,7 +457,7 @@ class Profile
 					"SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
 					intval($a->profile['uid'])
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					$updated = date('c', strtotime($r[0]['updated']));
 				}
 
@@ -468,11 +468,11 @@ class Profile
 						AND NOT `hidden` AND NOT `archive`
 						AND `network` IN ('%s', '%s', '%s', '')",
 					intval($profile['uid']),
-					dbesc(NETWORK_DFRN),
-					dbesc(NETWORK_DIASPORA),
-					dbesc(NETWORK_OSTATUS)
+					DBA::escape(NETWORK_DFRN),
+					DBA::escape(NETWORK_DIASPORA),
+					DBA::escape(NETWORK_OSTATUS)
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					$contacts = intval($r[0]['total']);
 				}
 			}
@@ -495,10 +495,10 @@ class Profile
 		}
 
 		if (isset($p['photo'])) {
-			$p['photo'] = proxy_url($p['photo'], false, PROXY_SIZE_SMALL);
+			$p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
 		}
 
-		$p['url'] = Contact::magicLink($p['url']);
+		$p['url'] = Contact::magicLink(defaults($p, 'url', $profile_url));
 
 		$tpl = get_markup_template('profile_vcard.tpl');
 		$o .= replace_macros($tpl, [
@@ -551,7 +551,7 @@ class Profile
 		$cachekey = 'get_birthdays:' . local_user();
 		$r = Cache::get($cachekey);
 		if (is_null($r)) {
-			$s = dba::p(
+			$s = DBA::p(
 				"SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
 				INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
 				WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
@@ -560,15 +560,15 @@ class Profile
 				DateTimeFormat::utc('now + 6 days'),
 				DateTimeFormat::utcNow()
 			);
-			if (DBM::is_result($s)) {
-				$r = dba::inArray($s);
+			if (DBA::isResult($s)) {
+				$r = DBA::toArray($s);
 				Cache::set($cachekey, $r, CACHE_HOUR);
 			}
 		}
 
 		$total = 0;
 		$classtoday = '';
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$now = strtotime('now');
 			$cids = [];
 
@@ -637,7 +637,7 @@ class Profile
 		$bd_format = L10n::t('g A l F d'); // 8 AM Friday January 18
 		$classtoday = '';
 
-		$s = dba::p(
+		$s = DBA::p(
 			"SELECT `event`.*
 			FROM `event`
 			INNER JOIN `item`
@@ -662,10 +662,10 @@ class Profile
 
 		$r = [];
 
-		if (DBM::is_result($s)) {
+		if (DBA::isResult($s)) {
 			$istoday = false;
 
-			while ($rr = dba::fetch($s)) {
+			while ($rr = DBA::fetch($s)) {
 				if (strlen($rr['name'])) {
 					$total ++;
 				}
@@ -702,7 +702,7 @@ class Profile
 
 				$r[] = $rr;
 			}
-			dba::close($s);
+			DBA::close($s);
 			$classtoday = (($istoday) ? 'event-today' : '');
 		}
 		$tpl = get_markup_template('events_reminder.tpl');
@@ -711,7 +711,7 @@ class Profile
 			'$classtoday' => $classtoday,
 			'$count' => count($r),
 			'$event_reminders' => L10n::t('Event Reminders'),
-			'$event_title' => L10n::t('Events this week:'),
+			'$event_title' => L10n::t('Upcoming events the next 7 days:'),
 			'$events' => $r,
 		]);
 	}
@@ -948,6 +948,16 @@ class Profile
 			];
 		}
 
+		if (!empty($_SESSION['new_member']) && $is_owner) {
+			$tabs[] = [
+				'label' => L10n::t('Tips for New Members'),
+				'url'   => System::baseUrl() . '/newmember',
+				'sel'   => false,
+				'title' => L10n::t('Tips for New Members'),
+				'id'    => 'newmember-tab',
+			];
+		}
+
 		if (!$is_owner && empty($a->profile['hide-friends'])) {
 			$tabs[] = [
 				'label' => L10n::t('Contacts'),
@@ -982,11 +992,13 @@ class Profile
 
 	/**
 	 * Process the 'zrl' parameter and initiate the remote authentication.
-	 * 
+	 *
 	 * This method checks if the visitor has a public contact entry and
 	 * redirects the visitor to his/her instance to start the magic auth (Authentication)
 	 * process.
-	 * 
+	 *
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/channel.php
+	 *
 	 * @param App $a Application instance.
 	 */
 	public static function zrlInit(App $a)
@@ -1011,23 +1023,15 @@ class Profile
 				Addon::callHooks('zrl_init', $arr);
 
 				// Try to find the public contact entry of the visitor.
-				$fields = ["id", "url"];
-				$condition = ['uid' => 0, 'nurl' => normalise_link($my_url)];
-
-				$contact = dba::selectFirst('contact',$fields, $condition);
-
-				// Not found? Try to probe the visitor.
-				if (!DBM::is_result($contact)) {
-					Probe::uri($my_url, '', -1, true, true);
-					$contact = dba::selectFirst('contact',$fields, $condition);
-				}
-
-				if (!DBM::is_result($contact)) {
+				$cid = Contact::getIdForURL($my_url);
+				if (!$cid) {
 					logger('No contact record found for ' . $my_url, LOGGER_DEBUG);
 					return;
 				}
 
-				if (DBM::is_result($contact) && remote_user() && remote_user() === $contact['id']) {
+				$contact = DBA::selectFirst('contact',['id', 'url'], ['id' => $cid]);
+
+				if (DBA::isResult($contact) && remote_user() && remote_user() == $contact['id']) {
 					// The visitor is already authenticated.
 					return;
 				}
@@ -1037,12 +1041,12 @@ class Profile
 				// Try to avoid recursion - but send them home to do a proper magic auth.
 				$query = str_replace(array('?zrl=', '&zid='), array('?rzrl=', '&rzrl='), $a->query_string);
 				// The other instance needs to know where to redirect.
-				$dest = urlencode(System::baseUrl() . "/" . $query);
+				$dest = urlencode(System::baseUrl() . '/' . $query);
 
 				// We need to extract the basebath from the profile url
 				// to redirect the visitors '/magic' module.
 				// Note: We should have the basepath of a contact also in the contact table.
-				$urlarr = explode("/profile/", $contact['url']);
+				$urlarr = explode('/profile/', $contact['url']);
 				$basepath = $urlarr[0];
 
 				if ($basepath != System::baseUrl() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
@@ -1055,56 +1059,54 @@ class Profile
 	/**
 	 * OpenWebAuth authentication.
 	 *
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/zid.php
+	 *
 	 * @param string $token
 	 */
-	public static function owtInit($token)
+	public static function openWebAuthInit($token)
 	{
 		$a = get_app();
 
-		// Clean old verify entries.
-		Verify::purge('owt', '3 MINUTE');
+		// Clean old OpenWebAuthToken entries.
+		OpenWebAuthToken::purge('owt', '3 MINUTE');
 
 		// Check if the token we got is the same one
 		// we have stored in the database.
-		$visitor_handle = Verify::getMeta('owt', 0, $token);
+		$visitor_handle = OpenWebAuthToken::getMeta('owt', 0, $token);
 
 		if($visitor_handle === false) {
 			return;
 		}
 
 		// Try to find the public contact entry of the visitor.
-		$condition = ["uid" => 0, "addr" => $visitor_handle];
-		$visitor = dba::selectFirst("contact", [], $condition);
-
-		if (!DBM::is_result($visitor)) {
-			Probe::uri($visitor_handle, '', -1, true, true);
-			$visitor = dba::selectFirst("contact", [], $condition);
-		}
-		if(!DBM::is_result($visitor)) {
+		$cid = Contact::getIdForURL($visitor_handle);
+		if(!$cid) {
 			logger('owt: unable to finger ' . $visitor_handle, LOGGER_DEBUG);
 			return;
 		}
 
+		$visitor = DBA::selectFirst('contact', [], ['id' => $cid]);
+
 		// Authenticate the visitor.
 		$_SESSION['authenticated'] = 1;
 		$_SESSION['visitor_id'] = $visitor['id'];
 		$_SESSION['visitor_handle'] = $visitor['addr'];
 		$_SESSION['visitor_home'] = $visitor['url'];
+		$_SESSION['my_url'] = $visitor['url'];
 
 		$arr = [
 			'visitor' => $visitor,
-			'url' => $a->query_string,
-			'session' => $_SESSION
+			'url' => $a->query_string
 		];
 		/**
 		 * @hooks magic_auth_success
 		 *   Called when a magic-auth was successful.
 		 *   * \e array \b visitor
 		 *   * \e string \b url
-		 *   * \e array \b session
 		 */
 		Addon::callHooks('magic_auth_success', $arr);
-		$a->contact = $visitor;
+
+		$a->contact = $arr['visitor'];
 
 		info(L10n::t('OpenWebAuth: %1$s welcomes %2$s', $a->get_hostname(), $visitor['name']));
 
@@ -1157,7 +1159,7 @@ class Profile
 
 	/**
 	* Stip zrl parameter from a string.
-	* 
+	*
 	* @param string $s The input string.
 	* @return string The zrl.
 	*/
@@ -1168,7 +1170,7 @@ class Profile
 
 	/**
 	* Stip query parameter from a string.
-	* 
+	*
 	* @param string $s The input string.
 	* @return string The query parameter.
 	*/