a few new smilieys, plus case-insensitivty for a couple of core smileys

diff --git a/smiley_pack/.smiley_pack.php.kate-swp b/smiley_pack/.smiley_pack.php.kate-swp
new file mode 100644 (file)
index 0000000..73a77b3
Binary files /dev/null and b/smiley_pack/.smiley_pack.php.kate-swp differ

diff --git a/smiley_pack/icons/animals/elephant.gif b/smiley_pack/icons/animals/elephant.gif
new file mode 100644 (file)
index 0000000..4311e97
Binary files /dev/null and b/smiley_pack/icons/animals/elephant.gif differ

diff --git a/smiley_pack/icons/animals/fish.gif b/smiley_pack/icons/animals/fish.gif
new file mode 100644 (file)
index 0000000..3a7a584
Binary files /dev/null and b/smiley_pack/icons/animals/fish.gif differ

diff --git a/smiley_pack/icons/animals/giraffe.gif b/smiley_pack/icons/animals/giraffe.gif
new file mode 100644 (file)
index 0000000..4c95ea4
Binary files /dev/null and b/smiley_pack/icons/animals/giraffe.gif differ

diff --git a/smiley_pack/icons/animals/pig.gif b/smiley_pack/icons/animals/pig.gif
new file mode 100644 (file)
index 0000000..bdc68e8
Binary files /dev/null and b/smiley_pack/icons/animals/pig.gif differ

diff --git a/smiley_pack/icons/oldcore/laughing.gif b/smiley_pack/icons/oldcore/laughing.gif
new file mode 100755 (executable)
index 0000000..1bf29de
Binary files /dev/null and b/smiley_pack/icons/oldcore/laughing.gif differ

diff --git a/smiley_pack/icons/oldcore/surprised.gif b/smiley_pack/icons/oldcore/surprised.gif
new file mode 100755 (executable)
index 0000000..b074653
Binary files /dev/null and b/smiley_pack/icons/oldcore/surprised.gif differ

diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 4cfcc95d7322cee7cbcaa3d8a684a61973a73d12..aa79a7f01172204b4c6b788a50a84fd5a4818ac8 100644 (file)
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -21,6 +21,15 @@ function smiley_pack__uninstall() {
 
 function smiley_pack_smilies(&$a,&$b) {
 
+#Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
+
+#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
+#when all else fails.
+
+
+
+#Animal smileys.
+
        $b['texts'][] = ':bunnyflowers';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
 
@@ -84,6 +93,7 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':dog';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';    
 
+#Baby Smileys
 
        $b['texts'][] = ':baby';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';   
@@ -98,7 +108,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':stork';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />'; 
 
-       
+
+#Confused Smileys      
        $b['texts'][] = ':confused';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />'; 
     
@@ -108,12 +119,16 @@ 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' . '" />';     
 
+#Cool Smileys
+
        $b['texts'][] = ':affro';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';   
 
        $b['texts'][] = ':cool';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';     
 
+#Devil/Angel Smileys
+
        $b['texts'][] = ':angel';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';     
 
@@ -141,6 +156,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':graveside';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';     
 
+#Unpleasent smileys.
+
        $b['texts'][] = ':toilet';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';      
 
@@ -150,21 +167,29 @@ 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' . '" />';
 
+#Drinks
+
        $b['texts'][] = ':tea';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea' . '" />';
 
        $b['texts'][] = ':drool';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool' . '" />';
 
+#Sad smileys
+
        $b['texts'][] = ':crying';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying' . '" />';
 
        $b['texts'][] = ':prisoner';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
 
+#Smoking - only one smiley in here, maybe it needs moving elsewhere?
+
        $b['texts'][] = ':smoking';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
 
+#Sport smileys
+
        $b['texts'][] = ':basketball';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
 
@@ -207,6 +232,7 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':horseriding';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
 
+#Love smileys
 
        $b['texts'][] = ':iloveyou';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
@@ -226,6 +252,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':loveheart';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
 
+#Tired/Sleep smileys
+
        $b['texts'][] = ':countsheep';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
 
@@ -235,6 +263,8 @@ 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' . '" />';
 
+#Fight/Flame/Violent smileys
+
        $b['texts'][] = ':2guns';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
 
@@ -292,6 +322,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':acid';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
 
+#Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
+
        $b['texts'][] = ':alienmonster';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
 
@@ -313,6 +345,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':mummy';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
 
+#Food smileys
+
        $b['texts'][] = ':apple';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
 
@@ -338,12 +372,16 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
 
 
+#Happy smileys
+
        $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' . '" />';
 
+#Repsect smileys
+
        $b['texts'][] = ':bow';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
 
@@ -356,6 +394,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':number1';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
 
+#Laugh smileys
+
        $b['texts'][] = ':hahaha';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
 
@@ -365,6 +405,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':rofl';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
 
+#Music smileys
+
        $b['texts'][] = ':dj';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
 
@@ -383,6 +425,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':violin';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
 
+#Smileys that used to be in core
+
        $b['texts'][] = ':headbang';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
 
@@ -404,5 +448,15 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':headdesk';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headdesk.gif' . '" alt="' . ':headdesk' . '" />';
 
+#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
+
+       $b['texts'][] = ':-d';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
+
+       $b['texts'][] = ':-o';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
+
+
+
 
 }