fixing error "json not defined" in frio

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

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 86dd6f002d51f2dc69ee43c9d1e12798e8dde278..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,12 +167,12 @@ 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) {
                        if ($selection !== 'NOTRANSLATION') {
-                               $selected = (($selection == $current) ? ' selected="selected" ' : '');
+                               $selected = (($neutral == $current) ? ' selected="selected" ' : '');
                                $o .= "<option value=\"$neutral\" $selected >$selection</option>";
                        }
                }
@@ -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,12 +206,12 @@ 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) {
                        if ($selection !== 'NOTRANSLATION') {
-                               $selected = (($selection == $current) ? ' selected="selected" ' : '');
+                               $selected = (($neutral == $current) ? ' selected="selected" ' : '');
                                $o .= "<option value=\"$neutral\" $selected >$selection</option>";
                        }
                }
@@ -215,51 +221,53 @@ class ContactSelector
 
        /**
         * @param string $current optional, default empty
+        * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function maritalStatus($current = "")
        {
                $o = '';
                $select = [
-                       'EMPTY' => '',
-                       'Single' => L10n::t('Single'),
-                       'Lonely' => L10n::t('Lonely'),
-                       'Available' => L10n::t('Available'),
-                       'Unavailable' => L10n::t('Unavailable'),
-                       'Has crush' => L10n::t('Has crush'),
-                       'Infatuated' => L10n::t('Infatuated'),
-                       'Dating' => L10n::t('Dating'),
-                       'Unfaithful' => L10n::t('Unfaithful'),
-                       'Sex Addict' => L10n::t('Sex Addict'),
-                       'Friends' => L10n::t('Friends'),
-                       'Friends/Benefits' => L10n::t('Friends/Benefits'),
-                       'Casual' => L10n::t('Casual'),
-                       'Engaged' => L10n::t('Engaged'),
-                       'Married' => L10n::t('Married'),
-                       'Imaginarily married' => L10n::t('Imaginarily married'),
-                       'Partners' => L10n::t('Partners'),
-                       'Cohabiting' => L10n::t('Cohabiting'),
-                       'Common law' => L10n::t('Common law'),
-                       'Happy' => L10n::t('Happy'),
-                       'Not looking' => L10n::t('Not looking'),
-                       'Swinger' => L10n::t('Swinger'),
-                       'Betrayed' => L10n::t('Betrayed'),
-                       'Separated' => L10n::t('Separated'),
-                       'Unstable' => L10n::t('Unstable'),
-                       'Divorced' => L10n::t('Divorced'),
+                       ''                     => L10n::t('No answer'),
+                       'Single'               => L10n::t('Single'),
+                       'Lonely'               => L10n::t('Lonely'),
+                       'Available'            => L10n::t('Available'),
+                       'Unavailable'          => L10n::t('Unavailable'),
+                       'Has crush'            => L10n::t('Has crush'),
+                       'Infatuated'           => L10n::t('Infatuated'),
+                       'Dating'               => L10n::t('Dating'),
+                       'Unfaithful'           => L10n::t('Unfaithful'),
+                       'Sex Addict'           => L10n::t('Sex Addict'),
+                       'Friends'              => L10n::t('Friends'),
+                       'Friends/Benefits'     => L10n::t('Friends/Benefits'),
+                       'Casual'               => L10n::t('Casual'),
+                       'Engaged'              => L10n::t('Engaged'),
+                       'Married'              => L10n::t('Married'),
+                       'Imaginarily married'  => L10n::t('Imaginarily married'),
+                       'Partners'             => L10n::t('Partners'),
+                       'Cohabiting'           => L10n::t('Cohabiting'),
+                       'Common law'           => L10n::t('Common law'),
+                       'Happy'                => L10n::t('Happy'),
+                       'Not looking'          => L10n::t('Not looking'),
+                       'Swinger'              => L10n::t('Swinger'),
+                       'Betrayed'             => L10n::t('Betrayed'),
+                       'Separated'            => L10n::t('Separated'),
+                       'Unstable'             => L10n::t('Unstable'),
+                       'Divorced'             => L10n::t('Divorced'),
                        'Imaginarily divorced' => L10n::t('Imaginarily divorced'),
-                       'Widowed' => L10n::t('Widowed'),
-                       'Uncertain' => L10n::t('Uncertain'),
-                       'It\'s complicated' => L10n::t('It\'s complicated'),
-                       'Don\'t care' => L10n::t('Don\'t care'),
-                       'Ask me' => L10n::t('Ask me'),
+                       'Widowed'              => L10n::t('Widowed'),
+                       'Uncertain'            => L10n::t('Uncertain'),
+                       'It\'s complicated'    => L10n::t('It\'s complicated'),
+                       'Don\'t care'          => L10n::t('Don\'t care'),
+                       '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) {
                        if ($selection !== 'NOTRANSLATION') {
-                               $selected = (($selection == $current) ? ' selected="selected" ' : '');
+                               $selected = (($neutral == $current) ? ' selected="selected" ' : '');
                                $o .= "<option value=\"$neutral\" $selected >$selection</option>";
                        }
                }