diff --git a/doc/API-Entities.md b/doc/API-Entities.md index da59de77b0..b234912acd 100644 --- a/doc/API-Entities.md +++ b/doc/API-Entities.md @@ -1181,54 +1181,6 @@ Mutually exclusive with link. - -hometown -String - - - - -gender -String - - - - -marital -String - - - - -marital_with -String - - - - -marital_since -String (Date) - - - - -sexual -String - - - - -politic -String - - - - -religion -String - - - public_keywords String @@ -1241,90 +1193,12 @@ Mutually exclusive with link. Comma-separated list of words meant to be used for search only. - -likes -String (Plaintext) - - - - -dislikes -String (Plaintext) - - - - -about -String (Plaintext) - - - - -music -String (Plaintext) - - - - -book -String (Plaintext) - - - - -tv -String (Plaintext) - - - - -film -String (Plaintext) - - - - -interest -String (Plaintext) - - - - -romance -String (Plaintext) - - - - -work -String (Plaintext) - - - - -education -String (Plaintext) - - - - -social_networks -String (Plaintext) - - - homepage String (URL) - -users -List of Contacts -If populated, only these contacts have access to the profile. - - diff --git a/doc/Addons.md b/doc/Addons.md index 171f58ff4a..bf8f9eef45 100644 --- a/doc/Addons.md +++ b/doc/Addons.md @@ -695,9 +695,6 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep- ### src/Content/ContactSelector.php Hook::callAll('network_to_name', $nets); - Hook::callAll('gender_selector', $select); - Hook::callAll('sexpref_selector', $select); - Hook::callAll('marital_selector', $select); ### src/Content/OEmbed.php diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md index 265eb1c58b..6b9689d124 100644 --- a/doc/database/db_profile.md +++ b/doc/database/db_profile.md @@ -16,29 +16,29 @@ Table profile | region | | varchar(255) | NO | | | | | postal-code | | varchar(32) | NO | | | | | country-name | | varchar(255) | NO | | | | -| hometown | | varchar(255) | NO | MUL | | | -| gender | | varchar(32) | NO | | | | -| marital | | varchar(255) | NO | | | | -| with | | text | NO | | NULL | | -| howlong | | datetime | NO | | 0001-01-01 00:00:00 | | -| sexual | | varchar(255) | NO | | | | -| politic | | varchar(255) | NO | | | | -| religion | | varchar(255) | NO | | | | +| hometown | Deprecated | varchar(255) | NO | MUL | | | +| gender | Deprecated | varchar(32) | NO | | | | +| marital | Deprecated | varchar(255) | NO | | | | +| with | Deprecated | text | NO | | NULL | | +| howlong | Deprecated | datetime | NO | | 0001-01-01 00:00:00 | | +| sexual | Deprecated | varchar(255) | NO | | | | +| politic | Deprecated | varchar(255) | NO | | | | +| religion | Deprecated | varchar(255) | NO | | | | | pub_keywords | | text | NO | | NULL | | | prv_keywords | | text | NO | | NULL | | -| likes | | text | NO | | NULL | | -| dislikes | | text | NO | | NULL | | -| about | | text | NO | | NULL | | -| summary | | varchar(255) | NO | | | | -| music | | text | NO | | NULL | | -| book | | text | NO | | NULL | | -| tv | | text | NO | | NULL | | -| film | | text | NO | | NULL | | -| interest | | text | NO | | NULL | | -| romance | | text | NO | | NULL | | -| work | | text | NO | | NULL | | -| education | | text | NO | | NULL | | -| contact | | text | NO | | NULL | | +| likes | Deprecated | text | NO | | NULL | | +| dislikes | Deprecated | text | NO | | NULL | | +| about | Deprecated | text | NO | | NULL | | +| summary | Deprecated | varchar(255) | NO | | | | +| music | Deprecated | text | NO | | NULL | | +| book | Deprecated | text | NO | | NULL | | +| tv | Deprecated | text | NO | | NULL | | +| film | Deprecated | text | NO | | NULL | | +| interest | Deprecated | text | NO | | NULL | | +| romance | Deprecated | text | NO | | NULL | | +| work | Deprecated | text | NO | | NULL | | +| education | Deprecated | text | NO | | NULL | | +| contact | Deprecated | text | NO | | NULL | | | homepage | | varchar(255) | NO | | | | | photo | | varchar(255) | NO | | | | | thumb | | varchar(255) | NO | | | | diff --git a/doc/de/Addons.md b/doc/de/Addons.md index 37bf114d2a..aba36bbea4 100644 --- a/doc/de/Addons.md +++ b/doc/de/Addons.md @@ -408,9 +408,6 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap ### src/Content/ContactSelector.php Hook::callAll('network_to_name', $nets); - Hook::callAll('gender_selector', $select); - Hook::callAll('sexpref_selector', $select); - Hook::callAll('marital_selector', $select); ### src/Content/OEmbed.php diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index a9c6bc269d..64a2b5be9e 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -196,46 +196,6 @@ class ContactSelector return $network_icon; } - /** - * @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 = [ - '' => DI::l10n()->t('No answer'), - 'Male' => DI::l10n()->t('Male'), - 'Female' => DI::l10n()->t('Female'), - 'Currently Male' => DI::l10n()->t('Currently Male'), - 'Currently Female' => DI::l10n()->t('Currently Female'), - 'Mostly Male' => DI::l10n()->t('Mostly Male'), - 'Mostly Female' => DI::l10n()->t('Mostly Female'), - 'Transgender' => DI::l10n()->t('Transgender'), - 'Intersex' => DI::l10n()->t('Intersex'), - 'Transsexual' => DI::l10n()->t('Transsexual'), - 'Hermaphrodite' => DI::l10n()->t('Hermaphrodite'), - 'Neuter' => DI::l10n()->t('Neuter'), - 'Non-specific' => DI::l10n()->t('Non-specific'), - 'Other' => DI::l10n()->t('Other'), - 'Undecided' => DI::l10n()->t('Undecided'), - ]; - - Hook::callAll('gender_selector', $select); - - $o .= "'; - return $o; - } - /** * @param string $current optional, default empty * @param string $suffix optionsl, default empty diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 2014474379..112a3f3fb1 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -722,7 +722,7 @@ class Contact } $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region', - 'country-name', 'gender', 'pub_keywords', 'xmpp', 'net-publish']; + 'country-name', 'pub_keywords', 'xmpp', 'net-publish']; $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]); if (!DBA::isResult($profile)) { return; @@ -733,7 +733,7 @@ class Contact $fields = ['name' => $profile['name'], 'nick' => $user['nickname'], 'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile), 'about' => $profile['about'], 'keywords' => $profile['pub_keywords'], - 'gender' => $profile['gender'], 'contact-type' => $user['account-type'], + 'gender' => '', 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']]; $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); diff --git a/src/Model/GContact.php b/src/Model/GContact.php index f669138d76..05f20ec5b8 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -1117,7 +1117,7 @@ class GContact ); $gcontact = ['name' => $userdata['name'], 'location' => $location, 'about' => $userdata['about'], - 'gender' => $userdata['gender'], 'keywords' => $userdata['pub_keywords'], + 'gender' => '', 'keywords' => $userdata['pub_keywords'], 'birthday' => $userdata['dob'], 'photo' => $userdata['photo'], "notify" => $userdata['notify'], 'url' => $userdata['url'], "hide" => ($userdata['hidewall'] || !$userdata['net-publish']), diff --git a/src/Model/Profile.php b/src/Model/Profile.php index a8f3f6ac6f..0da9fbf359 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -919,7 +919,6 @@ class Profile (`profile`.`locality` LIKE ?) OR (`profile`.`region` LIKE ?) OR (`profile`.`country-name` LIKE ?) OR - (`profile`.`gender` LIKE ?) OR (`profile`.`marital` LIKE ?) OR (`profile`.`sexual` LIKE ?) OR (`profile`.`about` LIKE ?) OR @@ -961,7 +960,6 @@ class Profile (`profile`.`locality` LIKE ?) OR (`profile`.`region` LIKE ?) OR (`profile`.`country-name` LIKE ?) OR - (`profile`.`gender` LIKE ?) OR (`profile`.`marital` LIKE ?) OR (`profile`.`sexual` LIKE ?) OR (`profile`.`about` LIKE ?) OR diff --git a/src/Module/Directory.php b/src/Module/Directory.php index cc12e9dd21..54fbb01ac8 100644 --- a/src/Module/Directory.php +++ b/src/Module/Directory.php @@ -137,7 +137,6 @@ class Directory extends BaseModule $location = ''; } - $gender = (!empty($profile['gender']) ? DI::l10n()->t('Gender:') : false); $marital = (!empty($profile['marital']) ? DI::l10n()->t('Status:') : false); $homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false); $about = (!empty($profile['about']) ? DI::l10n()->t('About:') : false); @@ -160,7 +159,6 @@ class Directory extends BaseModule 'profile' => $profile, 'location' => $location_e, 'tags' => $contact['pub_keywords'], - 'gender' => $gender, 'pdesc' => $pdesc, 'marital' => $marital, 'homepage' => $homepage, diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php index c8b701e403..1df049525d 100644 --- a/src/Module/NoScrape.php +++ b/src/Module/NoScrape.php @@ -103,7 +103,7 @@ class NoScrape extends BaseModule $json_info['last-activity'] = date('o-W', $last_active); //These are optional fields. - $profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about']; + $profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name', 'marital', 'about']; foreach ($profile_fields as $field) { if (!empty($a->profile[$field])) { $json_info["$field"] = $a->profile[$field];