diff --git a/adult_smile.tgz b/adult_smile.tgz
new file mode 100644
index 00000000..67e2a31e
Binary files /dev/null and b/adult_smile.tgz differ
diff --git a/adult_smile/adult_smile.php b/adult_smile/adult_smile.php
new file mode 100644
index 00000000..46574143
--- /dev/null
+++ b/adult_smile/adult_smile.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ * Name: Adult Smilies
+ * Description: Smily icons that could or should not be included in core
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * 
+ * This is a template for how to extend the "smily" code.
+ * 
+ */
+
+function adult_smile_install() {
+	register_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
+}
+
+function adult_smile_uninstall() {
+	unregister_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
+}
+
+ 
+
+function adult_smile_smilies(&$a,&$b) {
+
+	$b['texts'][] = '(o)(o)';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
+
+	$b['texts'][] = '(.)(.)';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
+
+	$b['texts'][] = ':bong';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/bong.gif' . '" alt="' . ':bong' . '" />';
+
+
+}
\ No newline at end of file
diff --git a/adult_smile/icons/bong.gif b/adult_smile/icons/bong.gif
new file mode 100644
index 00000000..4b671226
Binary files /dev/null and b/adult_smile/icons/bong.gif differ
diff --git a/adult_smile/icons/drunk.gif b/adult_smile/icons/drunk.gif
new file mode 100644
index 00000000..4a1c064a
Binary files /dev/null and b/adult_smile/icons/drunk.gif differ
diff --git a/adult_smile/icons/sperm.gif b/adult_smile/icons/sperm.gif
new file mode 100644
index 00000000..6ba92190
Binary files /dev/null and b/adult_smile/icons/sperm.gif differ
diff --git a/adult_smile/icons/tits.gif b/adult_smile/icons/tits.gif
new file mode 100644
index 00000000..4c1658c5
Binary files /dev/null and b/adult_smile/icons/tits.gif differ
diff --git a/blackout.tgz b/blackout.tgz
index 2c0f6cf7..ef87ed74 100644
Binary files a/blackout.tgz and b/blackout.tgz differ
diff --git a/blockem.tgz b/blockem.tgz
index ec7119f8..dd092204 100755
Binary files a/blockem.tgz and b/blockem.tgz differ
diff --git a/buglink.tgz b/buglink.tgz
index fce2e54c..171a17e9 100755
Binary files a/buglink.tgz and b/buglink.tgz differ
diff --git a/calc.tgz b/calc.tgz
index a849ef0e..002917c4 100755
Binary files a/calc.tgz and b/calc.tgz differ
diff --git a/communityhome.tgz b/communityhome.tgz
index ff915f2e..b08f2e56 100755
Binary files a/communityhome.tgz and b/communityhome.tgz differ
diff --git a/convert.tgz b/convert.tgz
index c522abe1..56e0080c 100755
Binary files a/convert.tgz and b/convert.tgz differ
diff --git a/dwpost.tgz b/dwpost.tgz
index 7841e419..c0fbb96b 100644
Binary files a/dwpost.tgz and b/dwpost.tgz differ
diff --git a/dwpost/dwpost.css b/dwpost/dwpost.css
index 8edab3d9..3b0ee32a 100644
--- a/dwpost/dwpost.css
+++ b/dwpost/dwpost.css
@@ -1,15 +1,15 @@
 
-#ljpost-enable-label, #ljpost-username-label, #ljpost-password-label, #ljpost-bydefault-label {
+#dwpost-enable-label, #dwpost-username-label, #dwpost-password-label, #dwpost-bydefault-label {
 float: left;
 width: 200px;
 margin-top: 10px;
 }
 
-#ljpost-checkbox, #ljpost-username, #ljpost-password, #ljpost-bydefault {
+#dwpost-checkbox, #dwpost-username, #dwpost-password, #dwpost-bydefault {
 float: left;
 margin-top: 10px;
 }
 
-#ljpost-submit {
+#dwpost-submit {
 margin-top: 15px;
-}
\ No newline at end of file
+}
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 5f8dcc73..2391b571 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -4,7 +4,7 @@
  * Name: Dreamwidth Post Connector
  * Description: Post to dreamwidth
  * Version: 1.0
- * Author: Tony Baldwin <http://tonybaldwin.me/friendica/profile/tony>
+ * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  * Author: Michael Johnston
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
@@ -213,7 +213,7 @@ EOT;
 		logger('dwpost: data: ' . $xml, LOGGER_DATA);
 
 		if($dw_blog !== 'test')
-			$x = post_url($dw_blog,$xml);
+			$x = post_url($dw_blog,$xml,array("Content-Type: text/xml"));
 		logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
 
 	}
diff --git a/editplain.tgz b/editplain.tgz
index c99c7f63..be813177 100644
Binary files a/editplain.tgz and b/editplain.tgz differ
diff --git a/extcron.tgz b/extcron.tgz
index 30c0f7e3..0e5b2892 100755
Binary files a/extcron.tgz and b/extcron.tgz differ
diff --git a/facebook.tgz b/facebook.tgz
index 2cb406a1..b1db063b 100644
Binary files a/facebook.tgz and b/facebook.tgz differ
diff --git a/facebook/facebook.php b/facebook/facebook.php
index 35338fa1..9c8c8f08 100755
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -1051,7 +1051,7 @@ function fb_consume_stream($uid,$j,$wall = false) {
 	$a = get_app();
 
 
-	$user = q("SELECT `nickname`, `blockwall` FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
+	$user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
 		intval($uid)
 	);
 	if(! count($user))
@@ -1174,14 +1174,19 @@ 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']) == '') {
+				logger('facebook: empty body');
+				continue;
+			}
+
 			$top_item = item_store($datarray);
 			$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($top_item),
 				intval($uid)
-			);			
+			);
 			if(count($r)) {
 				$orig_post = $r[0];
 				logger('fb: new top level item posted');
@@ -1308,6 +1313,47 @@ function fb_consume_stream($uid,$j,$wall = false) {
 				$cmntdata['author-avatar'] = 'https://graph.facebook.com/' . $cmnt->from->id . '/picture';
 				$cmntdata['body'] = $cmnt->message;
 				$item = item_store($cmntdata);			
+				
+				$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
+					dbesc($orig_post['uri']),
+					intval($uid)
+				);
+
+				if(count($myconv)) {
+					$importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+
+					foreach($myconv as $conv) {
+
+						// now if we find a match, it means we're in this conversation
+	
+						if(! link_compare($conv['author-link'],$importer_url))
+							continue;
+
+						require_once('include/enotify.php');
+								
+						$conv_parent = $conv['parent'];
+
+						notification(array(
+							'type'         => NOTIFY_COMMENT,
+							'notify_flags' => $user[0]['notify-flags'],
+							'language'     => $user[0]['language'],
+							'to_name'      => $user[0]['username'],
+							'to_email'     => $user[0]['email'],
+							'uid'          => $user[0]['uid'],
+							'item'         => $cmntdata,
+							'link'		   => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $item,
+							'source_name'  => $cmntdata['author-name'],
+							'source_link'  => $cmntdata['author-link'],
+							'source_photo' => $cmntdata['author-avatar'],
+							'verb'         => ACTIVITY_POST,
+							'otype'        => 'item',
+							'parent'       => $conv_parent,
+						));
+
+						// only send one notification
+						break;
+					}
+				}
 			}
 		}
 	}
diff --git a/geonames.tgz b/geonames.tgz
index 9467ebaa..952a7602 100644
Binary files a/geonames.tgz and b/geonames.tgz differ
diff --git a/gnot.tgz b/gnot.tgz
index fbf7f267..8d9fcd3c 100644
Binary files a/gnot.tgz and b/gnot.tgz differ
diff --git a/ijpost.tar.gz b/ijpost.tar.gz
new file mode 100644
index 00000000..4c67d491
Binary files /dev/null and b/ijpost.tar.gz differ
diff --git a/ijpost/ijpost.css b/ijpost/ijpost.css
new file mode 100644
index 00000000..8b424917
--- /dev/null
+++ b/ijpost/ijpost.css
@@ -0,0 +1,15 @@
+
+#ijpost-enable-label, #ijpost-username-label, #ijpost-password-label, #ijpost-bydefault-label {
+float: left;
+width: 200px;
+margin-top: 10px;
+}
+
+#ijpost-checkbox, #ijpost-username, #ijpost-password, #ijpost-bydefault {
+float: left;
+margin-top: 10px;
+}
+
+#ijpost-submit {
+margin-top: 15px;
+}
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
new file mode 100644
index 00000000..d6861f46
--- /dev/null
+++ b/ijpost/ijpost.php
@@ -0,0 +1,227 @@
+<?php
+
+/**
+ * Name: Insanejournal Post Connector
+ * Description: Post to Insanejournal
+ * Version: 1.0
+ * Author: Tony Baldwin <https://free-haven.org/profile/tony>
+ * Author: Michael Johnston
+ * Author: Cat Gray <https://free-haven.org/profile/catness>
+ */
+
+function ijpost_install() {
+    register_hook('post_local',           'addon/ijpost/ijpost.php', 'ijpost_post_local');
+    register_hook('notifier_normal',      'addon/ijpost/ijpost.php', 'ijpost_send');
+    register_hook('jot_networks',         'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
+    register_hook('connector_settings',      'addon/ijpost/ijpost.php', 'ijpost_settings');
+    register_hook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
+
+}
+function ijpost_uninstall() {
+    unregister_hook('post_local',       'addon/ijpost/ijpost.php', 'ijpost_post_local');
+    unregister_hook('notifier_normal',  'addon/ijpost/ijpost.php', 'ijpost_send');
+    unregister_hook('jot_networks',     'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
+    unregister_hook('connector_settings',      'addon/ijpost/ijpost.php', 'ijpost_settings');
+    unregister_hook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
+
+}
+
+
+function ijpost_jot_nets(&$a,&$b) {
+    if(! local_user())
+        return;
+
+    $ij_post = get_pconfig(local_user(),'ijpost','post');
+    if(intval($ij_post) == 1) {
+        $ij_defpost = get_pconfig(local_user(),'ijpost','post_by_default');
+        $selected = ((intval($ij_defpost) == 1) ? ' checked="checked" ' : '');
+        $b .= '<div class="profile-jot-net"><input type="checkbox" name="ijpost_enable" ' . $selected . ' value="1" /> '
+            . t('Post to Insanejournal') . '</div>';
+    }
+}
+
+
+function ijpost_settings(&$a,&$s) {
+
+    if(! local_user())
+        return;
+
+    /* Add our stylesheet to the page so we can make our settings look nice */
+
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
+
+    /* Get the current state of our config variables */
+
+    $enabled = get_pconfig(local_user(),'ijpost','post');
+
+    $checked = (($enabled) ? ' checked="checked" ' : '');
+
+    $def_enabled = get_pconfig(local_user(),'ijpost','post_by_default');
+
+    $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+	$ij_username = get_pconfig(local_user(), 'ijpost', 'ij_username');
+	$ij_password = get_pconfig(local_user(), 'ijpost', 'ij_password');
+
+
+    /* Add some HTML to the existing form */
+
+    $s .= '<div class="settings-block">';
+    $s .= '<h3>' . t('InsaneJournal Post Settings') . '</h3>';
+    $s .= '<div id="ijpost-enable-wrapper">';
+    $s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . t('Enable InsaneJournal Post Plugin') . '</label>';
+    $s .= '<input id="ijpost-checkbox" type="checkbox" name="ijpost" value="1" ' . $checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="ijpost-username-wrapper">';
+    $s .= '<label id="ijpost-username-label" for="ijpost-username">' . t('InsaneJournal username') . '</label>';
+    $s .= '<input id="ijpost-username" type="text" name="ij_username" value="' . $ij_username . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="ijpost-password-wrapper">';
+    $s .= '<label id="ijpost-password-label" for="ijpost-password">' . t('InsaneJournal password') . '</label>';
+    $s .= '<input id="ijpost-password" type="password" name="ij_password" value="' . $ij_password . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="ijpost-bydefault-wrapper">';
+    $s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . t('Post to InsaneJournal by default') . '</label>';
+    $s .= '<input id="ijpost-bydefault" type="checkbox" name="ij_bydefault" value="1" ' . $def_checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    /* provide a submit button */
+
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+
+}
+
+
+function ijpost_settings_post(&$a,&$b) {
+
+	if(x($_POST,'ijpost-submit')) {
+
+		set_pconfig(local_user(),'ijpost','post',intval($_POST['ijpost']));
+		set_pconfig(local_user(),'ijpost','post_by_default',intval($_POST['ij_bydefault']));
+		set_pconfig(local_user(),'ijpost','ij_username',trim($_POST['ij_username']));
+		set_pconfig(local_user(),'ijpost','ij_password',trim($_POST['ij_password']));
+
+	}
+
+}
+
+function ijpost_post_local(&$a,&$b) {
+
+	// This can probably be changed to allow editing by pointing to a different API endpoint
+
+	if($b['edit'])
+		return;
+
+	if((! local_user()) || (local_user() != $b['uid']))
+		return;
+
+	if($b['private'] || $b['parent'])
+		return;
+
+    $ij_post   = intval(get_pconfig(local_user(),'ijpost','post'));
+
+	$ij_enable = (($ij_post && x($_REQUEST,'ijpost_enable')) ? intval($_REQUEST['ijpost_enable']) : 0);
+
+	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'ijpost','post_by_default')))
+		$ij_enable = 1;
+
+    if(! $ij_enable)
+       return;
+
+    if(strlen($b['postopts']))
+       $b['postopts'] .= ',';
+     $b['postopts'] .= 'ijpost';
+}
+
+
+
+
+function ijpost_send(&$a,&$b) {
+
+    if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+        return;
+
+    if(! strstr($b['postopts'],'ijpost'))
+        return;
+
+    if($b['parent'] != $b['id'])
+        return;
+
+	// insanejournal post in the LJ user's timezone. 
+	// Hopefully the person's Friendica account
+	// will be set to the same thing.
+
+	$tz = 'UTC';
+
+	$x = q("select timezone from user where uid = %d limit 1",
+		intval($b['uid'])
+	);
+	if($x && strlen($x[0]['timezone']))
+		$tz = $x[0]['timezone'];	
+
+	$ij_username = get_pconfig($b['uid'],'ijpost','ij_username');
+	$ij_password = get_pconfig($b['uid'],'ijpost','ij_password');
+	$ij_blog = 'http://www.insanejournal.com/interface/xmlrpc';
+
+	if($ij_username && $ij_password && $ij_blog) {
+
+		require_once('include/bbcode.php');
+		require_once('include/datetime.php');
+
+		$title = $b['title'];
+		$post = bbcode($b['body']);
+		$post = xmlify($post);
+		$tags = ijpost_get_tags($b['tag']);
+
+		$date = datetime_convert('UTC',$tz,$b['created'],'Y-m-d H:i:s');
+		$year = intval(substr($date,0,4));
+		$mon  = intval(substr($date,5,2));
+		$day  = intval(substr($date,8,2));
+		$hour = intval(substr($date,11,2));
+		$min  = intval(substr($date,14,2));
+
+		$xml = <<< EOT
+<?xml version="1.0" encoding="utf-8"?>
+<methodCall><methodName>LJ.XMLRPC.postevent</methodName>
+<params><param>
+<value><struct>
+<member><name>year</name><value><int>$year</int></value></member>
+<member><name>mon</name><value><int>$mon</int></value></member>
+<member><name>day</name><value><int>$day</int></value></member>
+<member><name>hour</name><value><int>$hour</int></value></member>
+<member><name>min</name><value><int>$min</int></value></member>
+<member><name>event</name><value><string>$post</string></value></member>
+<member><name>username</name><value><string>$ij_username</string></value></member>
+<member><name>password</name><value><string>$ij_password</string></value></member>
+<member><name>subject</name><value><string>$title</string></value></member>
+<member><name>lineendings</name><value><string>unix</string></value></member>
+<member><name>ver</name><value><int>1</int></value></member>
+<member><name>props</name>
+<value><struct>
+<member><name>useragent</name><value><string>Friendica</string></value></member>
+<member><name>taglist</name><value><string>$tags</string></value></member>
+</struct></value></member>
+</struct></value>
+</param></params>
+</methodCall>
+
+EOT;
+
+		logger('ijpost: data: ' . $xml, LOGGER_DATA);
+
+		if($ij_blog !== 'test')
+			$x = post_url($ij_blog,$xml,array("Content-Type: text/xml"));
+		logger('posted to insanejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
+
+	}
+}
+
+function ijpost_get_tags($post)
+{
+	preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
+	$tags = implode(', ',$matches[1]);
+	return $tags;
+}
diff --git a/impressum.tgz b/impressum.tgz
index a8ea7ee0..4f8ab29f 100755
Binary files a/impressum.tgz and b/impressum.tgz differ
diff --git a/irc.tgz b/irc.tgz
new file mode 100644
index 00000000..e10b0769
Binary files /dev/null and b/irc.tgz differ
diff --git a/irc/irc.php b/irc/irc.php
index 397844e0..1e051950 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -3,9 +3,14 @@
 * Name: IRC Chat Plugin
 * Description: add an Internet Relay Chat chatroom
 * Version: 1.0
-* Author: tony baldwin <http://tonybaldwin.me>
+* Author: tony baldwin <https://free-haven.org/profile/tony>
 */
 
+/* enable in admin->plugins
+ * you will then have "irc chatroom" listed at yoursite/apps
+ * and the app will run at yoursite/irc
+ * documentation at http://tonybaldwin.me/hax/doku.php?id=friendica:irc
+ */
 
 function irc_install() {
 register_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
@@ -32,9 +37,13 @@ $baseurl = $a->get_baseurl() . '/addon/irc';
 $o = '';
 
 
- // add the chatroom frame and some html
+/* add the chatroom frame and some html
+ * by altering the "channels=friendica" part of the URL, you can add/remove channels.  
+ * At free-haven.org, I have "?channels=friendica,free-haven", for instance, to open #friendica and #free-haven
+ */
   $o .= <<< EOT
 <h2>IRC chat</h2>
+<p><a href="http://tldp.org/HOWTO/IRC/beginners.html" target="_blank">a beginner's guide to using IRC.</a></p>
 <iframe src="http://webchat.freenode.net?channels=friendica" width="600" height="600"></iframe>
 EOT;
 
diff --git a/js_upload.tgz b/js_upload.tgz
index fe51b8ae..7b684103 100755
Binary files a/js_upload.tgz and b/js_upload.tgz differ
diff --git a/ldapauth.tgz b/ldapauth.tgz
index 28bbed62..c308e7ea 100755
Binary files a/ldapauth.tgz and b/ldapauth.tgz differ
diff --git a/ljpost.tgz b/ljpost.tgz
index 60c223f4..840e2ee2 100644
Binary files a/ljpost.tgz and b/ljpost.tgz differ
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index e1bd2d63..dc17e83f 100755
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -4,7 +4,7 @@
  * Name: LiveJournal Post Connector
  * Description: Post to LiveJournal
  * Version: 1.0
- * Author: Tony Baldwin <http://tonybaldwin.me/friendica/profile/tony>
+ * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  * Author: Michael Johnston
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
@@ -232,7 +232,7 @@ EOT;
 		logger('ljpost: data: ' . $xml, LOGGER_DATA);
 
 		if($lj_blog !== 'test')
-			$x = post_url($lj_blog,$xml);
+			$x = post_url($lj_blog,$xml,array("Content-Type: text/xml"));
 		logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
 
 	}
diff --git a/membersince.tgz b/membersince.tgz
index f1310f4a..85acb560 100755
Binary files a/membersince.tgz and b/membersince.tgz differ
diff --git a/nsfw.tgz b/nsfw.tgz
index 8a1e3a3c..b7caadbd 100755
Binary files a/nsfw.tgz and b/nsfw.tgz differ
diff --git a/numfriends.tgz b/numfriends.tgz
index df472580..61196a54 100644
Binary files a/numfriends.tgz and b/numfriends.tgz differ
diff --git a/openstreetmap.tgz b/openstreetmap.tgz
index e54b0c78..64a55d81 100644
Binary files a/openstreetmap.tgz and b/openstreetmap.tgz differ
diff --git a/pageheader.tgz b/pageheader.tgz
index 2dfa6785..876d37e4 100755
Binary files a/pageheader.tgz and b/pageheader.tgz differ
diff --git a/pages.tgz b/pages.tgz
new file mode 100644
index 00000000..7be170af
Binary files /dev/null and b/pages.tgz differ
diff --git a/pages/README b/pages/README
new file mode 100755
index 00000000..6ec314b7
--- /dev/null
+++ b/pages/README
@@ -0,0 +1,3 @@
+Pages
+
+Shows lists of community pages
diff --git a/pages/pages.php b/pages/pages.php
new file mode 100755
index 00000000..bc56d2e4
--- /dev/null
+++ b/pages/pages.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Name: Pages
+ * Description: Shows lists of community pages
+ * Version: 1.0
+ * Author: Michael Vogel <ike@piratenpartei.de>
+ *
+ */
+
+function pages_install() {
+	register_hook('page_end', 'addon/pages/pages.php', 'pages_page_end');
+}
+
+function pages_uninstall() {
+	unregister_hook('page_end', 'addon/pages/pages.php', 'pages_page_end');
+}
+
+function pages_iscommunity($url, &$pagelist) {
+	// check every week for the status - should be enough
+	if ($pagelist[$url]["checked"]<time()-86400*7) {
+		// When too old or not found fetch the status from the profile
+		$ch = curl_init();
+
+		$url = str_replace("/profile/","/hcard/", $url);
+
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_HEADER, 0);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 2);
+ 
+		$page = curl_exec($ch);
+ 
+		curl_close($ch);
+
+		$iscommunity = (strpos($page, '<meta name="friendika.community" content="true" />') != 0);
+
+		$pagelist[$url] = array("community" => $iscommunity, "checked" => time());
+	} else // Fetch from cache
+		$iscommunity = $pagelist[$url]["community"];
+	return($iscommunity);
+}
+
+function pages_getpages($uid) {
+
+	// Fetch cached pagelist from configuration
+	$pagelist = get_pconfig($uid,'pages','pagelist');
+
+	if (sizeof($pagelist) == 0)
+		$pagelist = array();
+
+	$contacts = q("SELECT `id`, `url`, `Name` FROM `contact`
+			WHERE `network`= 'dfrn' AND `uid` = %d",
+			intval($uid));
+
+	$pages = array();
+
+	// Look if the profile is a community page
+	foreach($contacts as $contact) {
+		if (pages_iscommunity($contact["url"], $pagelist))
+			$pages[] = array("url"=>$contact["url"], "Name"=>$contact["Name"], "id"=>$contact["id"]);
+	}
+
+	// Write back cached pagelist
+	set_pconfig($uid,'pages','pagelist', $pagelist);
+	return($pages);
+}
+
+function pages_page_end($a,&$b) {
+	// Only move on if if it's the "network" module and there is a logged on user
+	if (($a->module != "network") OR ($a->user['uid'] == 0))
+		return;
+
+	$pages = '<div id="pages-sidebar" class="widget">
+			<div class="title tool">
+			<h3>'.t("Community").'</h3></div>
+			<div id="sidebar-pages-list"><ul>';
+
+	$contacts = pages_getpages($a->user['uid']);
+
+	foreach($contacts as $contact) {
+		$pages .= '<li class="tool"><a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" class="label" target="external-link">'.
+				$contact["Name"]."</a></li>";
+	}
+	$pages .= "</ul></div></div>";
+	if (sizeof($contacts) > 0)
+		$a->page['aside'] = $pages.$a->page['aside'];
+}
+?>
diff --git a/piwik.tgz b/piwik.tgz
index 65c92244..febb641e 100755
Binary files a/piwik.tgz and b/piwik.tgz differ
diff --git a/poormancron.tgz b/poormancron.tgz
index 24a862f4..cdf40ee1 100755
Binary files a/poormancron.tgz and b/poormancron.tgz differ
diff --git a/posterous.tgz b/posterous.tgz
index 3dcc536d..88643513 100755
Binary files a/posterous.tgz and b/posterous.tgz differ
diff --git a/qcomment.tgz b/qcomment.tgz
index 1ab55a43..dfb423b4 100644
Binary files a/qcomment.tgz and b/qcomment.tgz differ
diff --git a/randplace.tgz b/randplace.tgz
index 98b28a9d..931781d0 100755
Binary files a/randplace.tgz and b/randplace.tgz differ
diff --git a/showmore.tgz b/showmore.tgz
index ef095853..6c2203a1 100644
Binary files a/showmore.tgz and b/showmore.tgz differ
diff --git a/smiley_pack/icons/animals/bee.gif b/smiley_pack/icons/animals/bee.gif
new file mode 100644
index 00000000..206c2e3e
Binary files /dev/null and b/smiley_pack/icons/animals/bee.gif differ
diff --git a/smiley_pack/icons/animals/bigspider.gif b/smiley_pack/icons/animals/bigspider.gif
new file mode 100644
index 00000000..bc43debd
Binary files /dev/null and b/smiley_pack/icons/animals/bigspider.gif differ
diff --git a/smiley_pack/icons/animals/bunny.gif b/smiley_pack/icons/animals/bunny.gif
new file mode 100644
index 00000000..402b2b31
Binary files /dev/null and b/smiley_pack/icons/animals/bunny.gif differ
diff --git a/smiley_pack/icons/animals/bunnyflowers.gif b/smiley_pack/icons/animals/bunnyflowers.gif
new file mode 100644
index 00000000..6d665e2c
Binary files /dev/null and b/smiley_pack/icons/animals/bunnyflowers.gif differ
diff --git a/smiley_pack/icons/animals/cat.gif b/smiley_pack/icons/animals/cat.gif
new file mode 100644
index 00000000..3a0db669
Binary files /dev/null and b/smiley_pack/icons/animals/cat.gif differ
diff --git a/smiley_pack/icons/animals/chick.gif b/smiley_pack/icons/animals/chick.gif
new file mode 100644
index 00000000..6bcddcd8
Binary files /dev/null and b/smiley_pack/icons/animals/chick.gif differ
diff --git a/smiley_pack/icons/animals/cow.gif b/smiley_pack/icons/animals/cow.gif
new file mode 100644
index 00000000..3f94cfa6
Binary files /dev/null and b/smiley_pack/icons/animals/cow.gif differ
diff --git a/smiley_pack/icons/animals/crab.gif b/smiley_pack/icons/animals/crab.gif
new file mode 100644
index 00000000..db5b8ce3
Binary files /dev/null and b/smiley_pack/icons/animals/crab.gif differ
diff --git a/smiley_pack/icons/animals/dog.gif b/smiley_pack/icons/animals/dog.gif
new file mode 100644
index 00000000..7b28477b
Binary files /dev/null and b/smiley_pack/icons/animals/dog.gif differ
diff --git a/smiley_pack/icons/animals/dolphin.gif b/smiley_pack/icons/animals/dolphin.gif
new file mode 100644
index 00000000..672ebd72
Binary files /dev/null and b/smiley_pack/icons/animals/dolphin.gif differ
diff --git a/smiley_pack/icons/animals/dragonfly.gif b/smiley_pack/icons/animals/dragonfly.gif
new file mode 100644
index 00000000..566e95c2
Binary files /dev/null and b/smiley_pack/icons/animals/dragonfly.gif differ
diff --git a/smiley_pack/icons/animals/frog.gif b/smiley_pack/icons/animals/frog.gif
new file mode 100644
index 00000000..85e4b56e
Binary files /dev/null and b/smiley_pack/icons/animals/frog.gif differ
diff --git a/smiley_pack/icons/animals/hamster.gif b/smiley_pack/icons/animals/hamster.gif
new file mode 100644
index 00000000..96c7323c
Binary files /dev/null and b/smiley_pack/icons/animals/hamster.gif differ
diff --git a/smiley_pack/icons/animals/horse.gif b/smiley_pack/icons/animals/horse.gif
new file mode 100644
index 00000000..9103abfa
Binary files /dev/null and b/smiley_pack/icons/animals/horse.gif differ
diff --git a/smiley_pack/icons/animals/ladybird.gif b/smiley_pack/icons/animals/ladybird.gif
new file mode 100644
index 00000000..69444a9e
Binary files /dev/null and b/smiley_pack/icons/animals/ladybird.gif differ
diff --git a/smiley_pack/icons/animals/monkey.gif b/smiley_pack/icons/animals/monkey.gif
new file mode 100644
index 00000000..b9b338d2
Binary files /dev/null and b/smiley_pack/icons/animals/monkey.gif differ
diff --git a/smiley_pack/icons/animals/parrot.gif b/smiley_pack/icons/animals/parrot.gif
new file mode 100644
index 00000000..ae6faf66
Binary files /dev/null and b/smiley_pack/icons/animals/parrot.gif differ
diff --git a/smiley_pack/icons/animals/sheep.gif b/smiley_pack/icons/animals/sheep.gif
new file mode 100644
index 00000000..8fafc11d
Binary files /dev/null and b/smiley_pack/icons/animals/sheep.gif differ
diff --git a/smiley_pack/icons/animals/snail.gif b/smiley_pack/icons/animals/snail.gif
new file mode 100644
index 00000000..3bdb44cb
Binary files /dev/null and b/smiley_pack/icons/animals/snail.gif differ
diff --git a/smiley_pack/icons/animals/tux.gif b/smiley_pack/icons/animals/tux.gif
new file mode 100644
index 00000000..08e006e1
Binary files /dev/null and b/smiley_pack/icons/animals/tux.gif differ
diff --git a/smiley_pack/icons/babies/baby.gif b/smiley_pack/icons/babies/baby.gif
new file mode 100644
index 00000000..d105afb3
Binary files /dev/null and b/smiley_pack/icons/babies/baby.gif differ
diff --git a/smiley_pack/icons/babies/babycot.gif b/smiley_pack/icons/babies/babycot.gif
new file mode 100644
index 00000000..750f6df1
Binary files /dev/null and b/smiley_pack/icons/babies/babycot.gif differ
diff --git a/smiley_pack/icons/babies/pregnant.gif b/smiley_pack/icons/babies/pregnant.gif
new file mode 100644
index 00000000..d97f4768
Binary files /dev/null and b/smiley_pack/icons/babies/pregnant.gif differ
diff --git a/smiley_pack/icons/babies/stork.gif b/smiley_pack/icons/babies/stork.gif
new file mode 100644
index 00000000..de2371d6
Binary files /dev/null and b/smiley_pack/icons/babies/stork.gif differ
diff --git a/smiley_pack/icons/confused/confused.gif b/smiley_pack/icons/confused/confused.gif
new file mode 100644
index 00000000..8f1b79a7
Binary files /dev/null and b/smiley_pack/icons/confused/confused.gif differ
diff --git a/smiley_pack/icons/confused/shrug.gif b/smiley_pack/icons/confused/shrug.gif
new file mode 100644
index 00000000..31ce007f
Binary files /dev/null and b/smiley_pack/icons/confused/shrug.gif differ
diff --git a/smiley_pack/icons/confused/stupid.gif b/smiley_pack/icons/confused/stupid.gif
new file mode 100644
index 00000000..c17170aa
Binary files /dev/null and b/smiley_pack/icons/confused/stupid.gif differ
diff --git a/smiley_pack/icons/cool/affro.gif b/smiley_pack/icons/cool/affro.gif
new file mode 100644
index 00000000..f06166b8
Binary files /dev/null and b/smiley_pack/icons/cool/affro.gif differ
diff --git a/smiley_pack/icons/cool/cool.gif b/smiley_pack/icons/cool/cool.gif
new file mode 100644
index 00000000..05ba9f13
Binary files /dev/null and b/smiley_pack/icons/cool/cool.gif differ
diff --git a/smiley_pack/icons/devilangel/angel.gif b/smiley_pack/icons/devilangel/angel.gif
new file mode 100644
index 00000000..8e585416
Binary files /dev/null and b/smiley_pack/icons/devilangel/angel.gif differ
diff --git a/smiley_pack/icons/devilangel/blondedevil.gif b/smiley_pack/icons/devilangel/blondedevil.gif
new file mode 100644
index 00000000..09e7e682
Binary files /dev/null and b/smiley_pack/icons/devilangel/blondedevil.gif differ
diff --git a/smiley_pack/icons/devilangel/catdevil.gif b/smiley_pack/icons/devilangel/catdevil.gif
new file mode 100644
index 00000000..269d719b
Binary files /dev/null and b/smiley_pack/icons/devilangel/catdevil.gif differ
diff --git a/smiley_pack/icons/devilangel/cherub.gif b/smiley_pack/icons/devilangel/cherub.gif
new file mode 100644
index 00000000..40872e03
Binary files /dev/null and b/smiley_pack/icons/devilangel/cherub.gif differ
diff --git a/smiley_pack/icons/devilangel/devil.gif b/smiley_pack/icons/devilangel/devil.gif
new file mode 100644
index 00000000..2b567972
Binary files /dev/null and b/smiley_pack/icons/devilangel/devil.gif differ
diff --git a/smiley_pack/icons/devilangel/graveside.gif b/smiley_pack/icons/devilangel/graveside.gif
new file mode 100644
index 00000000..0e909357
Binary files /dev/null and b/smiley_pack/icons/devilangel/graveside.gif differ
diff --git a/smiley_pack/icons/disgust/fartinbed.gif b/smiley_pack/icons/disgust/fartinbed.gif
new file mode 100644
index 00000000..55536499
Binary files /dev/null and b/smiley_pack/icons/disgust/fartinbed.gif differ
diff --git a/smiley_pack/icons/disgust/toilet.gif b/smiley_pack/icons/disgust/toilet.gif
new file mode 100644
index 00000000..092d7ca4
Binary files /dev/null and b/smiley_pack/icons/disgust/toilet.gif differ
diff --git a/smiley_pack/icons/disgust/vomit.gif b/smiley_pack/icons/disgust/vomit.gif
new file mode 100644
index 00000000..6e7e727a
Binary files /dev/null and b/smiley_pack/icons/disgust/vomit.gif differ
diff --git a/smiley_pack/icons/drink/tea.gif b/smiley_pack/icons/drink/tea.gif
new file mode 100644
index 00000000..474b9894
Binary files /dev/null and b/smiley_pack/icons/drink/tea.gif differ
diff --git a/smiley_pack/icons/drool/drool.gif b/smiley_pack/icons/drool/drool.gif
new file mode 100644
index 00000000..4093df65
Binary files /dev/null and b/smiley_pack/icons/drool/drool.gif differ
diff --git a/smiley_pack/icons/fantasy/alienmonster.gif b/smiley_pack/icons/fantasy/alienmonster.gif
new file mode 100644
index 00000000..e0ca7f65
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 00000000..de8a0686
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 00000000..e8c625c3
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 00000000..fd28fbf1
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 00000000..dbc45559
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 00000000..4c5d85d8
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 00000000..50e1dfb9
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 00000000..9e1b6638
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 00000000..9d5e8792
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 00000000..75067008
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 00000000..f4572c43
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 00000000..c2ba9d06
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 00000000..2f1f8f05
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 00000000..71f757c3
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 00000000..20874f3c
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 00000000..95848aea
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 00000000..31adaba3
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 00000000..95bd5409
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 00000000..f3f82cbd
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 00000000..1cff5cc5
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 00000000..88fd2e09
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 00000000..e6239682
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 00000000..8b24385b
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 00000000..f1d969dd
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 00000000..4908eddb
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 00000000..969d4ca8
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 00000000..f379889c
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 00000000..22d0ebd9
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 00000000..387b94c1
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 00000000..b0ea6976
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 00000000..0e3daddb
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 00000000..801c1a39
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 00000000..5de31171
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 00000000..7007515b
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 00000000..30357af2
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 00000000..d8f0d5ba
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 00000000..d13fd185
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 00000000..c5783e0f
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 00000000..541220a9
Binary files /dev/null and b/smiley_pack/icons/love/loveheart.gif differ
diff --git a/smiley_pack/icons/sad/crying.png b/smiley_pack/icons/sad/crying.png
new file mode 100644
index 00000000..62b9646d
Binary files /dev/null and b/smiley_pack/icons/sad/crying.png differ
diff --git a/smiley_pack/icons/sad/prisoner.gif b/smiley_pack/icons/sad/prisoner.gif
new file mode 100644
index 00000000..f2c3181d
Binary files /dev/null and b/smiley_pack/icons/sad/prisoner.gif differ
diff --git a/smiley_pack/icons/smoking/smoking.gif b/smiley_pack/icons/smoking/smoking.gif
new file mode 100644
index 00000000..77720b17
Binary files /dev/null and b/smiley_pack/icons/smoking/smoking.gif differ
diff --git a/smiley_pack/icons/sport/basketball.gif b/smiley_pack/icons/sport/basketball.gif
new file mode 100644
index 00000000..e9ad4b57
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 00000000..0f8300c9
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 00000000..332081e8
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 00000000..09fb6ea9
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 00000000..a4ec5cd3
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 00000000..179fc52d
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 00000000..1a2eb60b
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 00000000..f63270b1
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 00000000..815b090f
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 00000000..8639dd32
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 00000000..367f65ed
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
new file mode 100644
index 00000000..95f3bd87
--- /dev/null
+++ b/smiley_pack/smiley_pack.php
@@ -0,0 +1,309 @@
+<?php
+/*
+ * Name: Smiley Pack
+ * Description: Pack of smileys that make master too AOLish.
+ * Version: 1.0
+ * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) 
+ * All smileys from sites offering them as Public Domain
+ * 
+ * 
+ */
+
+function smiley_pack_install() {
+	register_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
+}
+
+function smiley_pack__uninstall() {
+	unregister_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
+}
+
+ 
+
+function smiley_pack_smilies(&$a,&$b) {
+
+	$b['texts'][] = ':bunnyflowers';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
+
+	$b['texts'][] = ':chick';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';
+
+	$b['texts'][] = ':bee';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee' . '" />';	
+
+	$b['texts'][] = ':ladybird';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird' . '" />';	
+
+	$b['texts'][] = ':bigspider';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider' . '" />';	
+
+	$b['texts'][] = ':cat';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat' . '" />';	
+
+	$b['texts'][] = ':bunny';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny' . '" />';	
+
+	$b['texts'][] = ':chick';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';	
+
+	$b['texts'][] = ':cow';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow' . '" />';	
+    
+	$b['texts'][] = ':crab';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab' . '" />';	
+
+	$b['texts'][] = ':dolphin';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin' . '" />';	
+
+	$b['texts'][] = ':dragonfly';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly' . '" />';	
+
+	$b['texts'][] = ':frog';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog' . '" />';	
+
+	$b['texts'][] = ':hamster';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';	
+
+	$b['texts'][] = ':monkey';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey' . '" />';	
+
+	$b['texts'][] = ':horse';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse' . '" />';	
+  
+	$b['texts'][] = ':parrot';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot' . '" />';	
+
+	$b['texts'][] = ':tux';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';	
+
+	$b['texts'][] = ':snail';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail' . '" />';	
+
+	$b['texts'][] = ':sheep';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep' . '" />';	
+
+	$b['texts'][] = ':dog';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';	
+
+
+	$b['texts'][] = ':baby';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';	
+
+	$b['texts'][] = ':babycot';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot' . '" />';	
+	
+
+	$b['texts'][] = ':pregnant';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant' . '" />';	
+
+	$b['texts'][] = ':stork';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />';	
+
+	
+	$b['texts'][] = ':confused';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />';	
+    
+	$b['texts'][] = ':shrug';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug' . '" />';	
+
+	$b['texts'][] = ':stupid';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';	
+
+	$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' . '" />';	
+
+	$b['texts'][] = ':angel';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';	
+
+	$b['texts'][] = ':cherub';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub' . '" />';	
+
+	$b['texts'][] = ':devilangel';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel' . '" />';	
+
+	$b['texts'][] = ':catdevil';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil' . '" />';	
+
+	$b['texts'][] = ':devil';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devil' . '" />';	
+	
+
+	$b['texts'][] = ':graveside';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';	
+
+	$b['texts'][] = ':toilet';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';	
+
+	$b['texts'][] = ':fartinbed';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed' . '" />';
+
+	$b['texts'][] = ':vomit';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
+
+	$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' . '" />';
+
+	$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' . '" />';
+
+	$b['texts'][] = ':smoking';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
+
+	$b['texts'][] = ':basketball';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
+
+	$b['texts'][] = ':bowling';
+	$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/cycling.gif' . '" alt="' . ':cycling' . '" />';
+
+	$b['texts'][] = ':darts';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts' . '" />';
+
+	$b['texts'][] = ':fencing';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing' . '" />';
+
+	$b['texts'][] = ':golf';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
+
+	$b['texts'][] = ':juggling';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling' . '" />';
+
+	$b['texts'][] = ':skipping';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
+
+	$b['texts'][] = ':iloveyou';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
+
+	$b['texts'][] = ':inlove';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove' . '" />';
+
+	$b['texts'][] = ':love';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
+
+	$b['texts'][] = ':lovebear';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear' . '" />';
+
+	$b['texts'][] = ':lovebed';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed' . '" />';
+
+	$b['texts'][] = ':loveheart';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
+
+	$b['texts'][] = ':countsheep';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
+
+	$b['texts'][] = ':hammock';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock' . '" />';
+
+	$b['texts'][] = ':pillow';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
+
+	$b['texts'][] = ':2guns';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
+
+	$b['texts'][] = ':alienfight';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
+
+	$b['texts'][] = ':army';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
+
+	$b['texts'][] = ':arrowhead';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead' . '" />';
+
+	$b['texts'][] = ':bfg';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+
+	$b['texts'][] = ':bowman';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman' . '" />';
+
+	$b['texts'][] = ':chainsaw';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw' . '" />';
+
+	$b['texts'][] = ':crossbow';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow' . '" />';
+
+	$b['texts'][] = ':crusader';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader' . '" />';
+
+	$b['texts'][] = ':dead';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead' . '" />';
+
+	$b['texts'][] = ':hammersplat';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat' . '" />';
+
+	$b['texts'][] = ':lasergun';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun' . '" />';
+
+	$b['texts'][] = ':machinegun';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
+
+	$b['texts'][] = ':marine';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
+
+	$b['texts'][] = ':sabre';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
+
+	$b['texts'][] = ':tank';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
+
+	$b['texts'][] = ':viking';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
+
+	$b['texts'][] = ':alienmonster';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
+
+	$b['texts'][] = ':barbarian';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian' . '" />';
+
+	$b['texts'][] = ':dinosaur';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur' . '" />';
+
+	$b['texts'][] = ':dragon';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
+
+	$b['texts'][] = ':dragonwhelp';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':dragonwhelp' . '" />';
+
+	$b['texts'][] = ':ghost';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
+
+	$b['texts'][] = ':mummy';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
+
+	$b['texts'][] = ':apple';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
+
+	$b['texts'][] = ':broccoli';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli' . '" />';
+
+	$b['texts'][] = ':cake';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake' . '" />';
+
+	$b['texts'][] = ':carrot';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot' . '" />';
+
+	$b['texts'][] = ':popcorn';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
+
+	$b['texts'][] = ':tomato';
+	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
+
+
+	$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' . '" />';
+
+
+}
diff --git a/sniper.tgz b/sniper.tgz
index 369fcf6d..fa75b3e4 100755
Binary files a/sniper.tgz and b/sniper.tgz differ
diff --git a/statusnet.tgz b/statusnet.tgz
index 05d56d88..1984cdba 100755
Binary files a/statusnet.tgz and b/statusnet.tgz differ
diff --git a/tictac.tgz b/tictac.tgz
index d92e8e95..22b058e6 100755
Binary files a/tictac.tgz and b/tictac.tgz differ
diff --git a/tumblr.tgz b/tumblr.tgz
index a0c2e619..b97ba171 100755
Binary files a/tumblr.tgz and b/tumblr.tgz differ
diff --git a/twitter.tgz b/twitter.tgz
index e3fbdec5..18416d1f 100755
Binary files a/twitter.tgz and b/twitter.tgz differ
diff --git a/twitter/twitter.php b/twitter/twitter.php
index fd032463..4f4d7280 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Twitter Connector
- * Description: Relay public postings to a connected StatusNet account
+ * Description: Relay public postings to a connected Twitter account
  * Version: 1.0.2
  * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias>
  */
@@ -288,7 +288,7 @@ function twitter_post_hook(&$a,&$b) {
                 // longer so we give them 10 characters extra
 		$max_char = 130; // max. length for a tweet
                 // we will only work with up to two times the length of the dent 
-                // we can later send to StatusNet. This way we can "gain" some 
+                // we can later send to Twitter. This way we can "gain" some 
                 // information during shortening of potential links but do not 
                 // shorten all the links in a 200000 character long essay.
                 $tmp = substr($b['body'], 0, 2*$max_char);
diff --git a/uhremotestorage.tgz b/uhremotestorage.tgz
index 055fa76e..4aa58096 100755
Binary files a/uhremotestorage.tgz and b/uhremotestorage.tgz differ
diff --git a/viewsrc.tgz b/viewsrc.tgz
index 2aa7d0fe..4717ab05 100644
Binary files a/viewsrc.tgz and b/viewsrc.tgz differ
diff --git a/widgets.tgz b/widgets.tgz
index 416f08cb..c1d96048 100755
Binary files a/widgets.tgz and b/widgets.tgz differ
diff --git a/wppost.tgz b/wppost.tgz
index 12f96d3b..22194335 100755
Binary files a/wppost.tgz and b/wppost.tgz differ
diff --git a/yourls.tgz b/yourls.tgz
index 2385fd20..d0d2523f 100755
Binary files a/yourls.tgz and b/yourls.tgz differ