Merge remote-tracking branch 'upstream/master'

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

diff --git a/smiley_pack/smiley_pack.php~ b/smiley_pack/smiley_pack.php~
index 09fcc6ffc39699e3eeafdc729a64965da601be70..bd7c522c2d32a0b259caba8881daa69830466ed5 100644 (file)
--- a/smiley_pack/smiley_pack.php~
+++ b/smiley_pack/smiley_pack.php~
@@ -164,7 +164,7 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bowling' . '" />';
 
        $b['texts'][] = ':cycling';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/cyling.gif' . '" alt="' . ':cycling' . '" />';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling' . '" />';
 
        $b['texts'][] = ':darts';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts' . '" />';
@@ -181,6 +181,25 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':skipping';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
 
+       $b['texts'][] = ':archery';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
+
+       $b['texts'][] = ':football';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
+
+       $b['texts'][] = ':surfing';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
+
+       $b['texts'][] = ':snooker';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
+  
+       $b['texts'][] = ':tennis';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
+
+       $b['texts'][] = ':horseriding';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
+
+
        $b['texts'][] = ':iloveyou';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
 
@@ -298,6 +317,39 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':tomato';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
 
+       $b['texts'][] = ':banana';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana' . '" />';
+
+       $b['texts'][] = ':cooking';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
+
+
+       $b['texts'][] = ':cloud9';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
+
+       $b['texts'][] = ':tearsofjoy';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
+
+       $b['texts'][] = ':bow';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
+
+       $b['texts'][] = ':bravo';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+
+       $b['texts'][] = ':hailking';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking' . '" />';
+
+       $b['texts'][] = ':number1';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
+
+       $b['texts'][] = ':hahaha';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
+
+       $b['texts'][] = ':loltv';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
+
+       $b['texts'][] = ':rofl';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';