diff --git a/facebook.tgz b/facebook.tgz
index d4c6ea868..b1db063bb 100644
Binary files a/facebook.tgz and b/facebook.tgz differ
diff --git a/facebook/facebook.php b/facebook/facebook.php
index 4524a4865..9c8c8f085 100755
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -1174,7 +1174,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
if($entry->privacy && $entry->privacy->value !== 'EVERYONE') {
$datarray['private'] = 1;
- $datarray['allow_cid'] = '<' . $uid . '>';
+ $datarray['allow_cid'] = '<' . $self[0]['id'] . '>';
}
if(trim($datarray['body']) == '') {
diff --git a/smiley_pack/icons/confused/confused-1.gif b/smiley_pack/icons/confused/confused.gif
similarity index 100%
rename from smiley_pack/icons/confused/confused-1.gif
rename to smiley_pack/icons/confused/confused.gif
diff --git a/smiley_pack/icons/devilangel/angel-0062.gif b/smiley_pack/icons/devilangel/angel.gif
similarity index 100%
rename from smiley_pack/icons/devilangel/angel-0062.gif
rename to smiley_pack/icons/devilangel/angel.gif
diff --git a/smiley_pack/icons/fantasy/alienmonster.gif b/smiley_pack/icons/fantasy/alienmonster.gif
new file mode 100644
index 000000000..e0ca7f65f
Binary files /dev/null and b/smiley_pack/icons/fantasy/alienmonster.gif differ
diff --git a/smiley_pack/icons/fantasy/barbarian.gif b/smiley_pack/icons/fantasy/barbarian.gif
new file mode 100644
index 000000000..de8a06861
Binary files /dev/null and b/smiley_pack/icons/fantasy/barbarian.gif differ
diff --git a/smiley_pack/icons/fantasy/dinosaur.gif b/smiley_pack/icons/fantasy/dinosaur.gif
new file mode 100644
index 000000000..e8c625c34
Binary files /dev/null and b/smiley_pack/icons/fantasy/dinosaur.gif differ
diff --git a/smiley_pack/icons/fantasy/dragon.gif b/smiley_pack/icons/fantasy/dragon.gif
new file mode 100644
index 000000000..fd28fbf18
Binary files /dev/null and b/smiley_pack/icons/fantasy/dragon.gif differ
diff --git a/smiley_pack/icons/fantasy/dragonwhelp.gif b/smiley_pack/icons/fantasy/dragonwhelp.gif
new file mode 100644
index 000000000..dbc455596
Binary files /dev/null and b/smiley_pack/icons/fantasy/dragonwhelp.gif differ
diff --git a/smiley_pack/icons/fantasy/ghost.gif b/smiley_pack/icons/fantasy/ghost.gif
new file mode 100644
index 000000000..4c5d85d89
Binary files /dev/null and b/smiley_pack/icons/fantasy/ghost.gif differ
diff --git a/smiley_pack/icons/fantasy/mummy.gif b/smiley_pack/icons/fantasy/mummy.gif
new file mode 100644
index 000000000..50e1dfb9f
Binary files /dev/null and b/smiley_pack/icons/fantasy/mummy.gif differ
diff --git a/smiley_pack/icons/fight/2guns.gif b/smiley_pack/icons/fight/2guns.gif
new file mode 100644
index 000000000..9e1b66383
Binary files /dev/null and b/smiley_pack/icons/fight/2guns.gif differ
diff --git a/smiley_pack/icons/fight/alienfight.gif b/smiley_pack/icons/fight/alienfight.gif
new file mode 100644
index 000000000..9d5e87921
Binary files /dev/null and b/smiley_pack/icons/fight/alienfight.gif differ
diff --git a/smiley_pack/icons/fight/army.gif b/smiley_pack/icons/fight/army.gif
new file mode 100644
index 000000000..75067008d
Binary files /dev/null and b/smiley_pack/icons/fight/army.gif differ
diff --git a/smiley_pack/icons/fight/arrowhead.gif b/smiley_pack/icons/fight/arrowhead.gif
new file mode 100644
index 000000000..f4572c43f
Binary files /dev/null and b/smiley_pack/icons/fight/arrowhead.gif differ
diff --git a/smiley_pack/icons/fight/bfg.gif b/smiley_pack/icons/fight/bfg.gif
new file mode 100644
index 000000000..c2ba9d067
Binary files /dev/null and b/smiley_pack/icons/fight/bfg.gif differ
diff --git a/smiley_pack/icons/fight/bowman.gif b/smiley_pack/icons/fight/bowman.gif
new file mode 100644
index 000000000..2f1f8f055
Binary files /dev/null and b/smiley_pack/icons/fight/bowman.gif differ
diff --git a/smiley_pack/icons/fight/chainsaw.gif b/smiley_pack/icons/fight/chainsaw.gif
new file mode 100644
index 000000000..71f757c3a
Binary files /dev/null and b/smiley_pack/icons/fight/chainsaw.gif differ
diff --git a/smiley_pack/icons/fight/crossbow.gif b/smiley_pack/icons/fight/crossbow.gif
new file mode 100644
index 000000000..20874f3c7
Binary files /dev/null and b/smiley_pack/icons/fight/crossbow.gif differ
diff --git a/smiley_pack/icons/fight/crusader.gif b/smiley_pack/icons/fight/crusader.gif
new file mode 100644
index 000000000..95848aea3
Binary files /dev/null and b/smiley_pack/icons/fight/crusader.gif differ
diff --git a/smiley_pack/icons/fight/dead.gif b/smiley_pack/icons/fight/dead.gif
new file mode 100644
index 000000000..31adaba3f
Binary files /dev/null and b/smiley_pack/icons/fight/dead.gif differ
diff --git a/smiley_pack/icons/fight/hammersplat.gif b/smiley_pack/icons/fight/hammersplat.gif
new file mode 100644
index 000000000..95bd5409c
Binary files /dev/null and b/smiley_pack/icons/fight/hammersplat.gif differ
diff --git a/smiley_pack/icons/fight/lasergun.gif b/smiley_pack/icons/fight/lasergun.gif
new file mode 100644
index 000000000..f3f82cbd3
Binary files /dev/null and b/smiley_pack/icons/fight/lasergun.gif differ
diff --git a/smiley_pack/icons/fight/machinegun.gif b/smiley_pack/icons/fight/machinegun.gif
new file mode 100644
index 000000000..1cff5cc58
Binary files /dev/null and b/smiley_pack/icons/fight/machinegun.gif differ
diff --git a/smiley_pack/icons/fight/marine.gif b/smiley_pack/icons/fight/marine.gif
new file mode 100644
index 000000000..88fd2e09d
Binary files /dev/null and b/smiley_pack/icons/fight/marine.gif differ
diff --git a/smiley_pack/icons/fight/sabre.gif b/smiley_pack/icons/fight/sabre.gif
new file mode 100644
index 000000000..e62396829
Binary files /dev/null and b/smiley_pack/icons/fight/sabre.gif differ
diff --git a/smiley_pack/icons/fight/samurai.gif b/smiley_pack/icons/fight/samurai.gif
new file mode 100644
index 000000000..8b24385b4
Binary files /dev/null and b/smiley_pack/icons/fight/samurai.gif differ
diff --git a/smiley_pack/icons/fight/tank.gif b/smiley_pack/icons/fight/tank.gif
new file mode 100644
index 000000000..f1d969dda
Binary files /dev/null and b/smiley_pack/icons/fight/tank.gif differ
diff --git a/smiley_pack/icons/fight/viking.gif b/smiley_pack/icons/fight/viking.gif
new file mode 100644
index 000000000..4908eddb8
Binary files /dev/null and b/smiley_pack/icons/fight/viking.gif differ
diff --git a/smiley_pack/icons/food/apple.gif b/smiley_pack/icons/food/apple.gif
new file mode 100644
index 000000000..969d4ca87
Binary files /dev/null and b/smiley_pack/icons/food/apple.gif differ
diff --git a/smiley_pack/icons/food/broccoli.gif b/smiley_pack/icons/food/broccoli.gif
new file mode 100644
index 000000000..f379889c1
Binary files /dev/null and b/smiley_pack/icons/food/broccoli.gif differ
diff --git a/smiley_pack/icons/food/cake.gif b/smiley_pack/icons/food/cake.gif
new file mode 100644
index 000000000..22d0ebd99
Binary files /dev/null and b/smiley_pack/icons/food/cake.gif differ
diff --git a/smiley_pack/icons/food/carrot.gif b/smiley_pack/icons/food/carrot.gif
new file mode 100644
index 000000000..387b94c18
Binary files /dev/null and b/smiley_pack/icons/food/carrot.gif differ
diff --git a/smiley_pack/icons/food/popcorn.gif b/smiley_pack/icons/food/popcorn.gif
new file mode 100644
index 000000000..b0ea69767
Binary files /dev/null and b/smiley_pack/icons/food/popcorn.gif differ
diff --git a/smiley_pack/icons/food/tomato.gif b/smiley_pack/icons/food/tomato.gif
new file mode 100644
index 000000000..0e3daddb3
Binary files /dev/null and b/smiley_pack/icons/food/tomato.gif differ
diff --git a/smiley_pack/icons/happy/cloud9.gif b/smiley_pack/icons/happy/cloud9.gif
new file mode 100644
index 000000000..801c1a39f
Binary files /dev/null and b/smiley_pack/icons/happy/cloud9.gif differ
diff --git a/smiley_pack/icons/happy/tearsofjoy.gif b/smiley_pack/icons/happy/tearsofjoy.gif
new file mode 100644
index 000000000..5de31171f
Binary files /dev/null and b/smiley_pack/icons/happy/tearsofjoy.gif differ
diff --git a/smiley_pack/icons/love/iloveyou.gif b/smiley_pack/icons/love/iloveyou.gif
new file mode 100644
index 000000000..7007515b8
Binary files /dev/null and b/smiley_pack/icons/love/iloveyou.gif differ
diff --git a/smiley_pack/icons/love/inlove.gif b/smiley_pack/icons/love/inlove.gif
new file mode 100644
index 000000000..30357af28
Binary files /dev/null and b/smiley_pack/icons/love/inlove.gif differ
diff --git a/smiley_pack/icons/love/love.gif b/smiley_pack/icons/love/love.gif
new file mode 100644
index 000000000..d8f0d5baa
Binary files /dev/null and b/smiley_pack/icons/love/love.gif differ
diff --git a/smiley_pack/icons/love/lovebear.gif b/smiley_pack/icons/love/lovebear.gif
new file mode 100644
index 000000000..d13fd1852
Binary files /dev/null and b/smiley_pack/icons/love/lovebear.gif differ
diff --git a/smiley_pack/icons/love/lovebed.gif b/smiley_pack/icons/love/lovebed.gif
new file mode 100644
index 000000000..c5783e0f6
Binary files /dev/null and b/smiley_pack/icons/love/lovebed.gif differ
diff --git a/smiley_pack/icons/love/loveheart.gif b/smiley_pack/icons/love/loveheart.gif
new file mode 100644
index 000000000..541220a90
Binary files /dev/null and b/smiley_pack/icons/love/loveheart.gif differ
diff --git a/smiley_pack/icons/sport/basketball.gif b/smiley_pack/icons/sport/basketball.gif
new file mode 100644
index 000000000..e9ad4b57b
Binary files /dev/null and b/smiley_pack/icons/sport/basketball.gif differ
diff --git a/smiley_pack/icons/sport/bowling.gif b/smiley_pack/icons/sport/bowling.gif
new file mode 100644
index 000000000..0f8300c93
Binary files /dev/null and b/smiley_pack/icons/sport/bowling.gif differ
diff --git a/smiley_pack/icons/sport/cycling.gif b/smiley_pack/icons/sport/cycling.gif
new file mode 100644
index 000000000..332081e83
Binary files /dev/null and b/smiley_pack/icons/sport/cycling.gif differ
diff --git a/smiley_pack/icons/sport/darts.gif b/smiley_pack/icons/sport/darts.gif
new file mode 100644
index 000000000..09fb6ea99
Binary files /dev/null and b/smiley_pack/icons/sport/darts.gif differ
diff --git a/smiley_pack/icons/sport/fencing.gif b/smiley_pack/icons/sport/fencing.gif
new file mode 100644
index 000000000..a4ec5cd3e
Binary files /dev/null and b/smiley_pack/icons/sport/fencing.gif differ
diff --git a/smiley_pack/icons/sport/golf.gif b/smiley_pack/icons/sport/golf.gif
new file mode 100644
index 000000000..179fc52d1
Binary files /dev/null and b/smiley_pack/icons/sport/golf.gif differ
diff --git a/smiley_pack/icons/sport/juggling.gif b/smiley_pack/icons/sport/juggling.gif
new file mode 100644
index 000000000..1a2eb60b8
Binary files /dev/null and b/smiley_pack/icons/sport/juggling.gif differ
diff --git a/smiley_pack/icons/sport/skipping.gif b/smiley_pack/icons/sport/skipping.gif
new file mode 100644
index 000000000..f63270b19
Binary files /dev/null and b/smiley_pack/icons/sport/skipping.gif differ
diff --git a/smiley_pack/icons/tired/countsheep.gif b/smiley_pack/icons/tired/countsheep.gif
new file mode 100644
index 000000000..815b090f8
Binary files /dev/null and b/smiley_pack/icons/tired/countsheep.gif differ
diff --git a/smiley_pack/icons/tired/hammock.gif b/smiley_pack/icons/tired/hammock.gif
new file mode 100644
index 000000000..8639dd32e
Binary files /dev/null and b/smiley_pack/icons/tired/hammock.gif differ
diff --git a/smiley_pack/icons/tired/pillow.gif b/smiley_pack/icons/tired/pillow.gif
new file mode 100644
index 000000000..367f65edb
Binary files /dev/null and b/smiley_pack/icons/tired/pillow.gif differ
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 2c87acf80..95f3bd874 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -156,4 +156,154 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':smoking';
$b['icons'][] = '';
+
+ $b['texts'][] = ':basketball';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':bowling';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':cycling';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':darts';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':fencing';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':golf';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':juggling';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':skipping';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':iloveyou';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':inlove';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':love';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':lovebear';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':lovebed';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':loveheart';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':countsheep';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':hammock';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':pillow';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':2guns';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':alienfight';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':army';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':arrowhead';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':bfg';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':bowman';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':chainsaw';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':crossbow';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':crusader';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':dead';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':hammersplat';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':lasergun';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':machinegun';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':marine';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':sabre';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':tank';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':viking';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':alienmonster';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':barbarian';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':dinosaur';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':dragon';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':dragonwhelp';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':ghost';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':mummy';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':apple';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':broccoli';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':cake';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':carrot';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':popcorn';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':tomato';
+ $b['icons'][] = '';
+
+
+ $b['texts'][] = ':cloud9';
+ $b['icons'][] = '';
+
+ $b['texts'][] = ':tearsofjoy';
+ $b['icons'][] = '';
+
+
}