X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FContactSelector.php;h=6a701f25f355d11b87db1afe07f5222cb3584236;hb=72fc89d033070a72a01fd0b3f7a91d21d7467acb;hp=797ec78610a01010a039473e886a41ca9cb4f1b0;hpb=af6dbc654f82225cfc647fe2072662acae388e47;p=friendica.git

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 797ec78610..6a701f25f3 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -6,8 +6,8 @@ namespace Friendica\Content;
 
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 
 /**
  * @brief ContactSelector class
@@ -27,9 +27,9 @@ class ContactSelector
 		$o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $disabled name=\"profile-assign\" >\r\n";
 
 		$s = DBA::select('profile', ['id', 'profile-name', 'is-default'], ['uid' => $_SESSION['uid']]);
-		$r = DBA::inArray($s);
+		$r = DBA::toArray($s);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				$selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : "");
 				$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
@@ -75,23 +75,22 @@ class ContactSelector
 	public static function networkToName($s, $profile = "")
 	{
 		$nets = [
-			NETWORK_DFRN     => L10n::t('Friendica'),
-			NETWORK_OSTATUS  => L10n::t('OStatus'),
-			NETWORK_FEED     => L10n::t('RSS/Atom'),
-			NETWORK_MAIL     => L10n::t('Email'),
-			NETWORK_DIASPORA => L10n::t('Diaspora'),
-			NETWORK_FACEBOOK => L10n::t('Facebook'),
-			NETWORK_ZOT      => L10n::t('Zot!'),
-			NETWORK_LINKEDIN => L10n::t('LinkedIn'),
-			NETWORK_XMPP     => L10n::t('XMPP/IM'),
-			NETWORK_MYSPACE  => L10n::t('MySpace'),
-			NETWORK_GPLUS    => L10n::t('Google+'),
-			NETWORK_PUMPIO   => L10n::t('pump.io'),
-			NETWORK_TWITTER  => L10n::t('Twitter'),
-			NETWORK_DIASPORA2 => L10n::t('Diaspora Connector'),
-			NETWORK_STATUSNET => L10n::t('GNU Social Connector'),
-			NETWORK_PNUT      => L10n::t('pnut'),
-			NETWORK_APPNET => L10n::t('App.net')
+			Protocol::DFRN      =>   L10n::t('Friendica'),
+			Protocol::OSTATUS   =>   L10n::t('OStatus'),
+			Protocol::FEED      =>   L10n::t('RSS/Atom'),
+			Protocol::MAIL      =>   L10n::t('Email'),
+			Protocol::DIASPORA  =>   L10n::t('Diaspora'),
+			Protocol::ZOT       =>   L10n::t('Zot!'),
+			Protocol::LINKEDIN  =>   L10n::t('LinkedIn'),
+			Protocol::XMPP      =>   L10n::t('XMPP/IM'),
+			Protocol::MYSPACE   =>   L10n::t('MySpace'),
+			Protocol::GPLUS     =>   L10n::t('Google+'),
+			Protocol::PUMPIO    =>   L10n::t('pump.io'),
+			Protocol::TWITTER   =>   L10n::t('Twitter'),
+			Protocol::DIASPORA2 =>   L10n::t('Diaspora Connector'),
+			Protocol::STATUSNET =>   L10n::t('GNU Social Connector'),
+			Protocol::ACTIVITYPUB => L10n::t('ActivityPub'),
+			Protocol::PNUT      =>   L10n::t('pnut'),
 		];
 
 		Addon::callHooks('network_to_name', $nets);
@@ -101,13 +100,17 @@ class ContactSelector
 
 		$networkname = str_replace($search, $replace, $s);
 
-		if ((in_array($s, [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) && ($profile != "")) {
-			$r = DBA::fetch_first("SELECT `gserver`.`platform` FROM `gcontact`
+		if ((in_array($s, [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) && ($profile != "")) {
+			$r = DBA::fetchFirst("SELECT `gserver`.`platform` FROM `gcontact`
 					INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
 					WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$networkname = $r['platform'];
+
+				if ($s == Protocol::ACTIVITYPUB) {
+					$networkname .= ' (AP)';
+				}
 			}
 		}