Update functions and calls

Update function name and calls.

diff --git a/mod/profiles.php b/mod/profiles.php
index 279a198aa524764053794c39c49e637350f2a1ce..5fcd2d8f171fc8a6e161a0eb07c96be3deb6b4b1 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -3,6 +3,7 @@
  * @file mod/profiles.php
  */
 use Friendica\App;
+use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
@@ -623,10 +624,7 @@ function profiles_content(App $a) {
                        notice( t('Profile not found.') . EOL);
                        return;
                }
-
-               require_once 'include/profile_selectors.php';
-
-
+               
                $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
                        '$baseurl' => System::baseUrl(true),
                ));
@@ -718,11 +716,11 @@ function profiles_content(App $a) {
                        '$postal_code' => array('postal_code', t('Postal/Zip Code:'), $r[0]['postal-code']),
                        '$country_name' => array('country_name', t('Country:'), $r[0]['country-name']),
                        '$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
-                       '$gender' => gender_selector($r[0]['gender']),
-                       '$marital' => marital_selector($r[0]['marital']),
+                       '$gender' => ContactSelector::gender($r[0]['gender']),
+                       '$marital' => ContactSelector::maritalStatus($r[0]['marital']),
                        '$with' => array('with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')),
                        '$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
-                       '$sexual' => sexpref_selector($r[0]['sexual']),
+                       '$sexual' => ContactSelector::sexualPreference($r[0]['sexual']),
                        '$about' => array('about', t('Tell us about yourself...'), $r[0]['about']),
                        '$xmpp' => array('xmpp', t('XMPP (Jabber) address:'), $r[0]['xmpp'], t("The XMPP address will be propagated to your contacts so that they can follow you.")),
                        '$homepage' => array('homepage', t('Homepage URL:'), $r[0]['homepage']),

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 7b7cff4c9860e5b8614a4b9a7f3e05ea3c536595..35f4fac33b37d392227c2c23c1605beac21fa95c 100644 (file)
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -113,7 +113,12 @@ class ContactSelector
                return $networkname;
        }
 
-       function gender_selector($current="",$suffix="") {
+       /**
+        * @param string $current optional, default empty
+        * @param string $suffix  optionsl, default empty
+        */
+       public static function gender($current = "", $suffix = "")
+       {
                $o = '';
                $select = array('', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided'));
        
@@ -130,7 +135,12 @@ class ContactSelector
                return $o;
        }
        
-       function sexpref_selector($current="",$suffix="") {
+       /**
+        * @param string $current optional, default empty
+        * @param string $suffix  optionsl, default empty
+        */
+       public static function sexualPreference($current = "", $suffix = "")
+       {
                $o = '';
                $select = array('', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual'));
        
@@ -148,8 +158,10 @@ class ContactSelector
                return $o;
        }
        
-       
-       function marital_selector($current = "")
+       /**
+        * @param string $current optional, default empty
+        */
+       public static function maritalStatus($current = "")
        {
                $o = '';
                $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me'));