Merge branch '2019.01-rc' into bug/6334-escape-get-app

src/Core/Theme.php

@@ -6,6 +6,7 @@
 
 namespace Friendica\Core;
 
+use Friendica\BaseObject;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 
@@ -191,11 +192,16 @@ class Theme
 	 */
 	public static function getStylesheetPath($theme)
 	{
-		$a = \get_app();
+		$a = BaseObject::getApp();
 
 		$opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
 		if (file_exists('view/theme/' . $theme . '/style.php')) {
-			return 'view/theme/' . $theme . '/style.pcss' . $opts;
+			if ($a->is_mobile) {
+				// Workaround for iOS Safari not sending the cookie for static files
+				return 'view/theme/' . $theme . '/style' . $opts;
+			} else {
+				return 'view/theme/' . $theme . '/style.pcss' . $opts;
+			}
 		}
 
 		return 'view/theme/' . $theme . '/style.css';

src/Model/APContact.php

@@ -61,7 +61,7 @@ class APContact extends BaseObject
 	 * Fetches a profile from a given url
 	 *
 	 * @param string  $url    profile url
-	 * @param boolean $update true = always update, false = never update, null = update when not found
+	 * @param boolean $update true = always update, false = never update, null = update when not found or outdated
 	 * @return array profile array
 	 */
 	public static function getByURL($url, $update = null)
@@ -71,18 +71,22 @@ class APContact extends BaseObject
 		}
 
 		if (empty($update)) {
+			if (is_null($update)) {
+				$ref_update = DateTimeFormat::utc('now - 1 month');
+			} else {
+				$ref_update = DBA::NULL_DATETIME;
+			}
+
 			$apcontact = DBA::selectFirst('apcontact', [], ['url' => $url]);
-			if (DBA::isResult($apcontact)) {
-				return $apcontact;
+			if (!DBA::isResult($apcontact)) {
+				$apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
 			}
 
-			$apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
-			if (DBA::isResult($apcontact)) {
-				return $apcontact;
+			if (!DBA::isResult($apcontact)) {
+				$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
 			}
 
-			$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
-			if (DBA::isResult($apcontact)) {
+			if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update)) {
 				return $apcontact;
 			}
 
@@ -185,6 +189,22 @@ class APContact extends BaseObject
 
 		// Update some data in the contact table with various ways to catch them all
 		$contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about']];
+
+		// Fetch the type and match it with the contact type
+		$contact_types = array_keys(ActivityPub::ACCOUNT_TYPES, $apcontact['type']);
+		if (!empty($contact_types)) {
+			$contact_type = array_pop($contact_types);
+			if (is_int($contact_type)) {
+				$contact_fields['contact-type'] = $contact_type;
+
+				// Resetting the 'forum' and 'prv' field when it isn't a forum
+				if ($contact_fields['contact-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) {
+					$contact_fields['forum'] = false;
+					$contact_fields['prv'] = false;
+				}
+			}
+		}
+
 		DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
 
 		$contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]);
@@ -194,6 +214,9 @@ class APContact extends BaseObject
 		DBA::close($contacts);
 
 		// Update the gcontact table
+		// These two fields don't exist in the gcontact table
+		unset($contact_fields['forum']);
+		unset($contact_fields['prv']);
 		DBA::update('gcontact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
 
 		Logger::log('Updated profile for ' . $url, Logger::DEBUG);

src/Model/Profile.php

@@ -514,6 +514,10 @@ class Profile
 			$p['address'] = $p['location'];
 		}
 
+		if (isset($p['address'])) {
+			$p['address'] = BBCode::convert($p['address']);
+		}
+
 		if (isset($p['photo'])) {
 			$p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
 		}

src/Model/User.php

@@ -771,7 +771,7 @@ class User
 			If you ever want to delete your account, you can do so at %3$s/removeme
 
 			Thank you and welcome to %2$s.',
-			$user['email'], $sitename, $siteurl, $user['username'], $password
+			$user['nickname'], $sitename, $siteurl, $user['username'], $password
 		));
 
 		return notification([

src/Module/Contact.php

@@ -642,7 +642,7 @@ class Contact extends BaseModule
 				'$profileurllabel'=> L10n::t('Profile URL'),
 				'$profileurl'     => $contact['url'],
 				'$account_type'   => Model\Contact::getAccountType($contact),
-				'$location'       => $contact['location'],
+				'$location'       => BBCode::convert($contact['location']),
 				'$location_label' => L10n::t('Location:'),
 				'$xmpp'           => BBCode::convert($contact['xmpp']),
 				'$xmpp_label'     => L10n::t('XMPP:'),

src/Protocol/Diaspora.php

@@ -1326,15 +1326,8 @@ class Diaspora
 			$x = false;
 		}
 
-		// This will work for older Diaspora and Friendica servers
 		if (!$x) {
-			$source_url = $server."/p/".urlencode($guid).".xml";
-			Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
-
-			$x = Network::fetchUrl($source_url);
-			if (!$x) {
-				return false;
-			}
+			return false;
 		}
 
 		$source_xml = XML::parseString($x);

src/Protocol/OStatus.php

@@ -1228,7 +1228,7 @@ class OStatus
 	{
 		$siteinfo = BBCode::getAttachedData($body);
 
-		if (($siteinfo["type"] == "photo")) {
+		if (($siteinfo["type"] == "photo") && (!empty($siteinfo["preview"]) || !empty($siteinfo["image"]))) {
 			if (isset($siteinfo["preview"])) {
 				$preview = $siteinfo["preview"];
 			} else {