Merge pull request #49 from beardy-unixer/master

[friendica-addons.git] / smiley_pack / smiley_pack.php

diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 932e3830291a170004d48d8748b70072a32962bc..533ebbb108eb37cb4cfe238ec11f7bc89878174f 100644 (file)
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -13,7 +13,7 @@ function smiley_pack_install() {
        register_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
 }
 
-function smiley_pack__uninstall() {
+function smiley_pack_uninstall() {
        unregister_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
 }
 
@@ -133,6 +133,10 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':stupid';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';     
 
+       $b['texts'][] = ':dazed';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';       
+
+
 #Cool Smileys
 
        $b['texts'][] = ':affro';
@@ -181,6 +185,9 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':vomit';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
 
+       $b['texts'][] = ':fartblush';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
+
 #Drinks
 
        $b['texts'][] = ':tea';
@@ -277,6 +284,9 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':pillow';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
 
+       $b['texts'][] = ':yawn';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn' . '" />';
+
 #Fight/Flame/Violent smileys
 
        $b['texts'][] = ':2guns';
@@ -385,6 +395,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':cooking';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
 
+       $b['texts'][] = ':fryegg';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
 
 #Happy smileys