diff --git a/.gitignore b/.gitignore
new file mode 100755
index 00000000..88dec63d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+favicon.*
+.htconfig.php
+\#*
+include/jquery-1.4.2.min.js
+*.log
+*.out
+*.version*
+#favicon.*
+#home.html
+#addon
+*~
+
+#ignore documentation, it should be newly built
+#doc/api
+
+#ignore reports, should be generted with every build
+report/
+
+#ignore config files from eclipse, we don't want IDE files in our repository
+.project
+.buildpath
+.externalToolBuilders
+.settings
diff --git a/page.tgz b/page.tgz
index ade28eb2..aebbe4dd 100644
Binary files a/page.tgz and b/page.tgz differ
diff --git a/page/page.php b/page/page.php
index 584ac556..2a65cab8 100755
--- a/page/page.php
+++ b/page/page.php
@@ -1,7 +1,7 @@
* based on pages plugin by
@@ -50,7 +50,7 @@ function page_page_end($a,&$b) {
$contacts = page_getpage($a->user['uid']);
foreach($contacts as $contact) {
- $page .= '
'.
+ $page .= '
'.
$contact["name"]."";
}
$page .= "";
diff --git a/smiley_pack/.smiley_pack.php.kate-swp b/smiley_pack/.smiley_pack.php.kate-swp
new file mode 100644
index 00000000..73a77b3a
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
index 00000000..4311e97d
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
index 00000000..3a7a584b
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
index 00000000..4c95ea4c
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
index 00000000..bdc68e83
Binary files /dev/null and b/smiley_pack/icons/animals/pig.gif differ
diff --git a/smiley_pack/icons/confused/dazed.gif b/smiley_pack/icons/confused/dazed.gif
new file mode 100644
index 00000000..f5e7ec26
Binary files /dev/null and b/smiley_pack/icons/confused/dazed.gif differ
diff --git a/smiley_pack/icons/disgust/fart.gif b/smiley_pack/icons/disgust/fart.gif
new file mode 100644
index 00000000..4160a1fc
Binary files /dev/null and b/smiley_pack/icons/disgust/fart.gif differ
diff --git a/smiley_pack/icons/food/fryegg.gif b/smiley_pack/icons/food/fryegg.gif
new file mode 100644
index 00000000..bd1b4ff0
Binary files /dev/null and b/smiley_pack/icons/food/fryegg.gif differ
diff --git a/smiley_pack/icons/oldcore/laughing.gif b/smiley_pack/icons/oldcore/laughing.gif
new file mode 100755
index 00000000..1bf29de7
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
index 00000000..b0746532
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 4cfcc95d..d85f9b5e 100644
--- 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'][] = '
';
@@ -84,6 +93,21 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':dog';
$b['icons'][] = '
';
+ $b['texts'][] = ':elephant';
+ $b['icons'][] = '
';
+
+ $b['texts'][] = ':fish';
+ $b['icons'][] = '
';
+
+ $b['texts'][] = ':giraffe';
+ $b['icons'][] = '
';
+
+ $b['texts'][] = ':pig';
+ $b['icons'][] = '
';
+
+
+
+#Baby Smileys
$b['texts'][] = ':baby';
$b['icons'][] = '
';
@@ -98,7 +122,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':stork';
$b['icons'][] = '
';
-
+
+#Confused Smileys
$b['texts'][] = ':confused';
$b['icons'][] = '
';
@@ -108,12 +133,20 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':stupid';
$b['icons'][] = '
';
+ $b['texts'][] = ':dazed';
+ $b['icons'][] = '
';
+
+
+#Cool Smileys
+
$b['texts'][] = ':affro';
$b['icons'][] = '
';
$b['texts'][] = ':cool';
$b['icons'][] = '
';
+#Devil/Angel Smileys
+
$b['texts'][] = ':angel';
$b['icons'][] = '
';
@@ -141,6 +174,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':graveside';
$b['icons'][] = '
';
+#Unpleasent smileys.
+
$b['texts'][] = ':toilet';
$b['icons'][] = '
';
@@ -150,21 +185,32 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':vomit';
$b['icons'][] = '
';
+ $b['texts'][] = ':fartblush';
+ $b['icons'][] = '
';
+
+#Drinks
+
$b['texts'][] = ':tea';
$b['icons'][] = '
';
$b['texts'][] = ':drool';
$b['icons'][] = '
';
+#Sad smileys
+
$b['texts'][] = ':crying';
$b['icons'][] = '
';
$b['texts'][] = ':prisoner';
$b['icons'][] = '
';
+#Smoking - only one smiley in here, maybe it needs moving elsewhere?
+
$b['texts'][] = ':smoking';
$b['icons'][] = '
';
+#Sport smileys
+
$b['texts'][] = ':basketball';
$b['icons'][] = '
';
@@ -207,6 +253,7 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':horseriding';
$b['icons'][] = '
';
+#Love smileys
$b['texts'][] = ':iloveyou';
$b['icons'][] = '
';
@@ -226,6 +273,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':loveheart';
$b['icons'][] = '
';
+#Tired/Sleep smileys
+
$b['texts'][] = ':countsheep';
$b['icons'][] = '
';
@@ -235,6 +284,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':pillow';
$b['icons'][] = '
';
+#Fight/Flame/Violent smileys
+
$b['texts'][] = ':2guns';
$b['icons'][] = '
';
@@ -292,6 +343,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':acid';
$b['icons'][] = '
';
+#Fantasy smileys - monsters and dragons fantasy. The other type of fantasy belongs in adult smileys
+
$b['texts'][] = ':alienmonster';
$b['icons'][] = '
';
@@ -313,6 +366,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':mummy';
$b['icons'][] = '
';
+#Food smileys
+
$b['texts'][] = ':apple';
$b['icons'][] = '
';
@@ -337,6 +392,10 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':cooking';
$b['icons'][] = '
';
+ $b['texts'][] = ':fryegg';
+ $b['icons'][] = '
';
+
+#Happy smileys
$b['texts'][] = ':cloud9';
$b['icons'][] = '
';
@@ -344,6 +403,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':tearsofjoy';
$b['icons'][] = '
';
+#Repsect smileys
+
$b['texts'][] = ':bow';
$b['icons'][] = '
';
@@ -356,6 +417,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':number1';
$b['icons'][] = '
';
+#Laugh smileys
+
$b['texts'][] = ':hahaha';
$b['icons'][] = '
';
@@ -365,6 +428,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':rofl';
$b['icons'][] = '
';
+#Music smileys
+
$b['texts'][] = ':dj';
$b['icons'][] = '
';
@@ -383,6 +448,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':violin';
$b['icons'][] = '
';
+#Smileys that used to be in core
+
$b['texts'][] = ':headbang';
$b['icons'][] = '
';
@@ -404,5 +471,15 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':headdesk';
$b['icons'][] = '
';
+#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'][] = '
';
+
+ $b['texts'][] = ':-o';
+ $b['icons'][] = '
';
+
+
+
}