Fix the base url detection of AP profiles

[friendica.git] / src / Content / ContactSelector.php

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 6a5ee9112b8ad179246a31c4230284619fc1d8b7..e327069b33fd86653bad93e0b9a661c1c3a1bcc3 100644 (file)
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -4,10 +4,9 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -20,6 +19,8 @@ class ContactSelector
        /**
         * @param string $current     current
         * @param string $foreign_net network
+        * @return string
+        * @throws \Exception
         */
        public static function profileAssign($current, $foreign_net)
        {
@@ -74,6 +75,7 @@ class ContactSelector
         * @param string $network network
         * @param string $profile optional, default empty
         * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function networkToName($network, $profile = "")
        {
@@ -96,7 +98,7 @@ class ContactSelector
                        Protocol::PNUT      =>   L10n::t('pnut'),
                ];
 
-               Addon::callHooks('network_to_name', $nets);
+               Hook::callAll('network_to_name', $nets);
 
                $search  = array_keys($nets);
                $replace = array_values($nets);
@@ -141,12 +143,14 @@ class ContactSelector
        /**
         * @param string $current optional, default empty
         * @param string $suffix  optionsl, default empty
+        * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function gender($current = "", $suffix = "")
        {
                $o = '';
                $select = [
-                       'EMPTY'            => '',
+                       ''                 => L10n::t('No answer'),
                        'Male'             => L10n::t('Male'),
                        'Female'           => L10n::t('Female'),
                        'Currently Male'   => L10n::t('Currently Male'),
@@ -163,7 +167,7 @@ class ContactSelector
                        'Undecided'        => L10n::t('Undecided'),
                ];
 
-               Addon::callHooks('gender_selector', $select);
+               Hook::callAll('gender_selector', $select);
 
                $o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
                foreach ($select as $neutral => $selection) {
@@ -179,12 +183,14 @@ class ContactSelector
        /**
         * @param string $current optional, default empty
         * @param string $suffix  optionsl, default empty
+        * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function sexualPreference($current = "", $suffix = "")
        {
                $o = '';
                $select = [
-                       'EMPTY'         => '',
+                       ''              => L10n::t('No answer'),
                        'Males'         => L10n::t('Males'),
                        'Females'       => L10n::t('Females'),
                        'Gay'           => L10n::t('Gay'),
@@ -200,7 +206,7 @@ class ContactSelector
                        'Nonsexual'     => L10n::t('Nonsexual'),
                ];
 
-               Addon::callHooks('sexpref_selector', $select);
+               Hook::callAll('sexpref_selector', $select);
 
                $o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
                foreach ($select as $neutral => $selection) {
@@ -215,12 +221,14 @@ class ContactSelector
 
        /**
         * @param string $current optional, default empty
+        * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function maritalStatus($current = "")
        {
                $o = '';
                $select = [
-                       'EMPTY'                => '',
+                       ''                     => L10n::t('No answer'),
                        'Single'               => L10n::t('Single'),
                        'Lonely'               => L10n::t('Lonely'),
                        'Available'            => L10n::t('Available'),
@@ -254,7 +262,7 @@ class ContactSelector
                        'Ask me'               => L10n::t('Ask me'),
                ];
 
-               Addon::callHooks('marital_selector', $select);
+               Hook::callAll('marital_selector', $select);
 
                $o .= '<select name="marital" id="marital-select" size="1" >';
                foreach ($select as $neutral => $selection) {