X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=morechoice%2Fmorechoice.php;h=b8a170a1b4678cc5f1fa18ba7daeb8bb015f42af;hp=05aa327e30c6ae28a5d9d3cf6b7603a71c592408;hb=3268eecd722126c532f9cef18b8657c10046a89e;hpb=1c955bff9bcd9a8ea1a5aa3d7ff96b6f2aef8f6f

diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index 05aa327e..b8a170a1 100644
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -4,24 +4,27 @@
  * Description: Additional gender/sexual preference/marital status options
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ *    - who takes no responsibility for any additional content which may appear herein
  *
  */
-
+use Friendica\Core\Addon;
 
 function morechoice_install() {
 
-	register_hook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
-	register_hook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
-	register_hook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
-
+	Addon::registerHook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
+	Addon::registerHook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
+	Addon::registerHook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
 }
 
 
 function morechoice_uninstall() {
 
-	unregister_hook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
-	unregister_hook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
-	unregister_hook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
+	Addon::unregisterHook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
+	Addon::unregisterHook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
+	Addon::unregisterHook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
+
+// We need to leave this here for a while, because we now have a situation where people can end up with an orphaned hook.
+	Addon::unregisterHook('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs');
 
 }
 
@@ -29,9 +32,29 @@ function morechoice_uninstall() {
 
 function morechoice_gender_selector($a,&$b) {
 	if($a->config['system']['language'] == 'en') {
+		$b[] = 'Androgyne';
+		$b[] = 'Bear';	
+		$b[] = 'Bigender';	
+		$b[] = 'Cross dresser';
+		$b[] = 'Drag queen';
+		$b[] = 'Eunuch';
+		$b[] = 'Faux queen';	
+		$b[] = 'Gender fluid';
+		$b[] = 'Kathoey';
+		$b[] = 'Lady';
+		$b[] = 'Lipstick lesbian';
+		$b[] = 'Metrosexual';
+		$b[] = 'Monk';
+		$b[] = 'Nun';
+		$b[] = 'Soft butch';
+		$b[] = 'Stone femme';
+		$b[] = 'Tomboy';
+		$b[] = 'Transman';
+		$b[] = 'Transwoman';
+		$b[] = 'Transvesti';
 		$b[] = 'Trigender';
-
-
+		$b[] = 'Can\'t remember';
+		$b[] = 'Hard to tell these days';
 	}
 }
 
@@ -41,7 +64,52 @@ function morechoice_sexpref_selector($a,&$b) {
 		$b[] = 'Millionaires';
 		$b[] = 'Guys with big schlongs';
 		$b[] = 'Easy women';
-
+		$b[] = 'People with impaired mobility';
+		$b[] = 'Amputees';
+		$b[] = 'Statues, mannequins and immobility';
+		$b[] = 'Pain';
+		$b[] = 'Trans men';
+		$b[] = 'Older women';
+		$b[] = 'Asphyxiation';
+		$b[] = 'In public';
+		$b[] = 'In danger';
+		$b[] = 'Pretending to be male';
+		$b[] = 'Pretending to be female';
+		$b[] = 'Breats';
+		$b[] = 'Scat';
+		$b[] = 'Crying';
+		$b[] = 'Nappies/Diapers';
+		$b[] = 'Trees';
+		$b[] = 'Vomit';
+		$b[] = 'Murder';
+		$b[] = 'Fat people';
+		$b[] = 'Feet';
+		$b[] = 'Covered in insects';
+		$b[] = 'Turning a human being into furniture';
+		$b[] = 'Elderly people';
+		$b[] = 'Transgender people';
+		$b[] = 'Criminals';
+		$b[] = 'Stealing';
+		$b[] = 'Breast milk';
+		$b[] = 'Immersing genitals in liquids';
+		$b[] = 'Giants';
+		$b[] = 'Masochism';
+		$b[] = 'Cars';
+		$b[] = 'Menstruation';
+		$b[] = 'Mucus';
+		$b[] = 'Obscene language';
+		$b[] = 'Noses';
+		$b[] = 'Navels';
+		$b[] = 'Corpses';
+		$b[] = 'Smells';
+		$b[] = 'Buttocks';
+		$b[] = 'Nonliving objects';
+		$b[] = 'Sleeping people';
+		$b[] = 'Urination';
+		$b[] = 'Eating people';
+		$b[] = 'Being eaten';
+		$b[] = 'Animals';
+		$b[] = 'I\'d rather just have some chocolate';
 	}
 }
 
@@ -49,6 +117,10 @@ function morechoice_marital_selector($a,&$b) {
 	if($a->config['system']['language'] == 'en') {
 		$b[] = 'Married to my job';
 		$b[] = 'Polygamist';
-
+		$b[] = 'Half married';
+		$b[] = 'Living in the past';
+		$b[] = 'Pretending to be over my ex';
+		$b[] = 'Hurt in the past';
+		$b[] = 'Wallowing in self-pity';
 	}
-}
+}
\ No newline at end of file