]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge branch 'master' of git://github.com/friendica/friendica-addons
authorTobias Hößl <tobias@hoessl.eu>
Mon, 19 Mar 2012 21:10:54 +0000 (21:10 +0000)
committerTobias Hößl <tobias@hoessl.eu>
Mon, 19 Mar 2012 21:10:54 +0000 (21:10 +0000)
111 files changed:
adult_smile/icons/drunk.gif [new file with mode: 0644]
adult_smile/icons/sperm.gif [new file with mode: 0644]
dwpost.tgz
dwpost/dwpost.css
dwpost/dwpost.php
facebook.tgz
facebook/facebook.php
frown.tgz [new file with mode: 0644]
frown/frown.css [new file with mode: 0755]
frown/frown.php [new file with mode: 0755]
ijpost.tar.gz [new file with mode: 0644]
ijpost/ijpost.css [new file with mode: 0644]
ijpost/ijpost.php [new file with mode: 0644]
irc.tgz
irc/irc.php
ljpost.tgz
ljpost/ljpost.php
smiley_pack/icons/animals/bee.gif [new file with mode: 0644]
smiley_pack/icons/animals/bigspider.gif [new file with mode: 0644]
smiley_pack/icons/animals/bunny.gif [new file with mode: 0644]
smiley_pack/icons/animals/bunnyflowers.gif [new file with mode: 0644]
smiley_pack/icons/animals/cat.gif [new file with mode: 0644]
smiley_pack/icons/animals/chick.gif [new file with mode: 0644]
smiley_pack/icons/animals/cow.gif [new file with mode: 0644]
smiley_pack/icons/animals/crab.gif [new file with mode: 0644]
smiley_pack/icons/animals/dog.gif [new file with mode: 0644]
smiley_pack/icons/animals/dolphin.gif [new file with mode: 0644]
smiley_pack/icons/animals/dragonfly.gif [new file with mode: 0644]
smiley_pack/icons/animals/frog.gif [new file with mode: 0644]
smiley_pack/icons/animals/hamster.gif [new file with mode: 0644]
smiley_pack/icons/animals/horse.gif [new file with mode: 0644]
smiley_pack/icons/animals/ladybird.gif [new file with mode: 0644]
smiley_pack/icons/animals/monkey.gif [new file with mode: 0644]
smiley_pack/icons/animals/parrot.gif [new file with mode: 0644]
smiley_pack/icons/animals/sheep.gif [new file with mode: 0644]
smiley_pack/icons/animals/snail.gif [new file with mode: 0644]
smiley_pack/icons/animals/tux.gif [new file with mode: 0644]
smiley_pack/icons/babies/baby.gif [new file with mode: 0644]
smiley_pack/icons/babies/babycot.gif [new file with mode: 0644]
smiley_pack/icons/babies/pregnant.gif [new file with mode: 0644]
smiley_pack/icons/babies/stork.gif [new file with mode: 0644]
smiley_pack/icons/confused/confused.gif [new file with mode: 0644]
smiley_pack/icons/confused/shrug.gif [new file with mode: 0644]
smiley_pack/icons/confused/stupid.gif [new file with mode: 0644]
smiley_pack/icons/cool/affro.gif [new file with mode: 0644]
smiley_pack/icons/cool/cool.gif [new file with mode: 0644]
smiley_pack/icons/devilangel/angel.gif [new file with mode: 0644]
smiley_pack/icons/devilangel/blondedevil.gif [new file with mode: 0644]
smiley_pack/icons/devilangel/catdevil.gif [new file with mode: 0644]
smiley_pack/icons/devilangel/cherub.gif [new file with mode: 0644]
smiley_pack/icons/devilangel/devil.gif [new file with mode: 0644]
smiley_pack/icons/devilangel/graveside.gif [new file with mode: 0644]
smiley_pack/icons/disgust/fartinbed.gif [new file with mode: 0644]
smiley_pack/icons/disgust/toilet.gif [new file with mode: 0644]
smiley_pack/icons/disgust/vomit.gif [new file with mode: 0644]
smiley_pack/icons/drink/tea.gif [new file with mode: 0644]
smiley_pack/icons/drool/drool.gif [new file with mode: 0644]
smiley_pack/icons/fantasy/alienmonster.gif [new file with mode: 0644]
smiley_pack/icons/fantasy/barbarian.gif [new file with mode: 0644]
smiley_pack/icons/fantasy/dinosaur.gif [new file with mode: 0644]
smiley_pack/icons/fantasy/dragon.gif [new file with mode: 0644]
smiley_pack/icons/fantasy/dragonwhelp.gif [new file with mode: 0644]
smiley_pack/icons/fantasy/ghost.gif [new file with mode: 0644]
smiley_pack/icons/fantasy/mummy.gif [new file with mode: 0644]
smiley_pack/icons/fight/2guns.gif [new file with mode: 0644]
smiley_pack/icons/fight/alienfight.gif [new file with mode: 0644]
smiley_pack/icons/fight/army.gif [new file with mode: 0644]
smiley_pack/icons/fight/arrowhead.gif [new file with mode: 0644]
smiley_pack/icons/fight/bfg.gif [new file with mode: 0644]
smiley_pack/icons/fight/bowman.gif [new file with mode: 0644]
smiley_pack/icons/fight/chainsaw.gif [new file with mode: 0644]
smiley_pack/icons/fight/crossbow.gif [new file with mode: 0644]
smiley_pack/icons/fight/crusader.gif [new file with mode: 0644]
smiley_pack/icons/fight/dead.gif [new file with mode: 0644]
smiley_pack/icons/fight/hammersplat.gif [new file with mode: 0644]
smiley_pack/icons/fight/lasergun.gif [new file with mode: 0644]
smiley_pack/icons/fight/machinegun.gif [new file with mode: 0644]
smiley_pack/icons/fight/marine.gif [new file with mode: 0644]
smiley_pack/icons/fight/sabre.gif [new file with mode: 0644]
smiley_pack/icons/fight/samurai.gif [new file with mode: 0644]
smiley_pack/icons/fight/tank.gif [new file with mode: 0644]
smiley_pack/icons/fight/viking.gif [new file with mode: 0644]
smiley_pack/icons/food/apple.gif [new file with mode: 0644]
smiley_pack/icons/food/broccoli.gif [new file with mode: 0644]
smiley_pack/icons/food/cake.gif [new file with mode: 0644]
smiley_pack/icons/food/carrot.gif [new file with mode: 0644]
smiley_pack/icons/food/popcorn.gif [new file with mode: 0644]
smiley_pack/icons/food/tomato.gif [new file with mode: 0644]
smiley_pack/icons/happy/cloud9.gif [new file with mode: 0644]
smiley_pack/icons/happy/tearsofjoy.gif [new file with mode: 0644]
smiley_pack/icons/love/iloveyou.gif [new file with mode: 0644]
smiley_pack/icons/love/inlove.gif [new file with mode: 0644]
smiley_pack/icons/love/love.gif [new file with mode: 0644]
smiley_pack/icons/love/lovebear.gif [new file with mode: 0644]
smiley_pack/icons/love/lovebed.gif [new file with mode: 0644]
smiley_pack/icons/love/loveheart.gif [new file with mode: 0644]
smiley_pack/icons/sad/crying.png [new file with mode: 0644]
smiley_pack/icons/sad/prisoner.gif [new file with mode: 0644]
smiley_pack/icons/smoking/smoking.gif [new file with mode: 0644]
smiley_pack/icons/sport/basketball.gif [new file with mode: 0644]
smiley_pack/icons/sport/bowling.gif [new file with mode: 0644]
smiley_pack/icons/sport/cycling.gif [new file with mode: 0644]
smiley_pack/icons/sport/darts.gif [new file with mode: 0644]
smiley_pack/icons/sport/fencing.gif [new file with mode: 0644]
smiley_pack/icons/sport/golf.gif [new file with mode: 0644]
smiley_pack/icons/sport/juggling.gif [new file with mode: 0644]
smiley_pack/icons/sport/skipping.gif [new file with mode: 0644]
smiley_pack/icons/tired/countsheep.gif [new file with mode: 0644]
smiley_pack/icons/tired/hammock.gif [new file with mode: 0644]
smiley_pack/icons/tired/pillow.gif [new file with mode: 0644]
smiley_pack/smiley_pack.php [new file with mode: 0644]

diff --git a/adult_smile/icons/drunk.gif b/adult_smile/icons/drunk.gif
new file mode 100644 (file)
index 0000000..4a1c064
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 (file)
index 0000000..6ba9219
Binary files /dev/null and b/adult_smile/icons/sperm.gif differ
index ecbb5198f0da94735d63ced4755d6e827db97e45..c0fbb96bd402bb314142fe5cf36d531e8d4d03d6 100644 (file)
Binary files a/dwpost.tgz and b/dwpost.tgz differ
index 8edab3d99e56a93f18658f9ab64a57ffedc3679e..3b0ee32ab9cc6c5183b7343ec5b4575b71198653 100644 (file)
@@ -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
+}
index 5f8dcc733ae6f531f1844529c0012bea7df63835..2391b5711cdbf41b8dac81f60cf45659514e8027 100644 (file)
@@ -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);
 
        }
index 783425cedb897604f662a7b1261b797dc0e28e49..b1db063bb7aab310929d9dd330b1e94ab6537d1f 100644 (file)
Binary files a/facebook.tgz and b/facebook.tgz differ
index a0fa39362b1a2179b2f631a69ca4b5fa38855b2f..1749a058451d9b51c7e4fd4a43dfd221bbda8283 100755 (executable)
@@ -1187,7 +1187,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/frown.tgz b/frown.tgz
new file mode 100644 (file)
index 0000000..6a2343f
Binary files /dev/null and b/frown.tgz differ
diff --git a/frown/frown.css b/frown/frown.css
new file mode 100755 (executable)
index 0000000..3690b62
--- /dev/null
@@ -0,0 +1,14 @@
+
+
+
+#frown-enable-label {
+       float: left;
+       width: 200px;
+       margin-bottom: 25px;
+}
+
+#frown-checkbox {
+       float: left;
+}
+
+
diff --git a/frown/frown.php b/frown/frown.php
new file mode 100755 (executable)
index 0000000..003039d
--- /dev/null
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Name: Frown
+ * Description: Disable graphical smilies
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * 
+ *
+ */
+
+
+function frown_install() {
+
+       register_hook('plugin_settings', 'addon/frown/frown.php', 'frown_settings');
+       register_hook('plugin_settings_post', 'addon/frown/frown.php', 'frown_settings_post');
+
+       logger("installed frown");
+}
+
+
+function frown_uninstall() {
+
+       unregister_hook('plugin_settings', 'addon/frown/frown.php', 'frown_settings');
+       unregister_hook('plugin_settings_post', 'addon/frown/frown.php', 'frown_settings_post');
+
+
+       logger("removed frown");
+}
+
+
+
+/**
+ *
+ * Callback from the settings post function.
+ * $post contains the $_POST array.
+ * We will make sure we've got a valid user account
+ * and if so set our configuration setting for this person.
+ *
+ */
+
+function frown_settings_post($a,$post) {
+       if(! local_user() || (! x($_POST,'frown-submit')))
+               return;
+       set_pconfig(local_user(),'system','no_smilies',intval($_POST['frown']));
+
+       info( t('Frown settings updated.') . EOL);
+}
+
+
+/**
+ *
+ * Called from the Plugin Setting form. 
+ * Add our own settings info to the page.
+ *
+ */
+
+
+
+function frown_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/frown/frown.css' . '" media="all" />' . "\r\n";
+
+       /* Get the current state of our config variable */
+
+       $enabled = get_pconfig(local_user(),'system','no_smilies');
+       $checked = (($enabled) ? ' checked="checked" ' : '');
+
+       /* Add some HTML to the existing form */
+
+       $s .= '<div class="settings-block">';
+       $s .= '<h3>' . t('Frown Settings') . '</h3>';
+       $s .= '<div id="frown-enable-wrapper">';
+       $s .= '<label id="frown-enable-label" for="frown-checkbox">' . t('Disable graphical smilies') . '</label>';
+       $s .= '<input id="frown-checkbox" type="checkbox" name="frown" value="1" ' . $checked . '/>';
+       $s .= '</div><div class="clear"></div>';
+
+       /* provide a submit button */
+
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="frown-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+
+}
diff --git a/ijpost.tar.gz b/ijpost.tar.gz
new file mode 100644 (file)
index 0000000..4c67d49
Binary files /dev/null and b/ijpost.tar.gz differ
diff --git a/ijpost/ijpost.css b/ijpost/ijpost.css
new file mode 100644 (file)
index 0000000..8b42491
--- /dev/null
@@ -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 (file)
index 0000000..d6861f4
--- /dev/null
@@ -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/irc.tgz b/irc.tgz
index 999c8d212c37698a5e50fde466e28e627896d263..e10b0769e74e5dc9864e683e79dd7f0111abc479 100644 (file)
Binary files a/irc.tgz and b/irc.tgz differ
index 397844e051f726ad86ae8867ba83865f8bc6bf43..1e05195099fa03172726bff3f6b9ba7ebe30aa38 100644 (file)
@@ -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;
 
index 21ec1915e827fb2e36065a5b1feb1ccc317c8e75..840e2ee2abc6ac2551fb6bfc32c22df70578ee2a 100644 (file)
Binary files a/ljpost.tgz and b/ljpost.tgz differ
index e1bd2d630e28beb0e2c56acbbc71316b9cd0b2c8..dc17e83fc8e7d667b71c1bad2a440ba8c2d03238 100755 (executable)
@@ -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/smiley_pack/icons/animals/bee.gif b/smiley_pack/icons/animals/bee.gif
new file mode 100644 (file)
index 0000000..206c2e3
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 (file)
index 0000000..bc43deb
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 (file)
index 0000000..402b2b3
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 (file)
index 0000000..6d665e2
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 (file)
index 0000000..3a0db66
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 (file)
index 0000000..6bcddcd
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 (file)
index 0000000..3f94cfa
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 (file)
index 0000000..db5b8ce
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 (file)
index 0000000..7b28477
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 (file)
index 0000000..672ebd7
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 (file)
index 0000000..566e95c
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 (file)
index 0000000..85e4b56
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 (file)
index 0000000..96c7323
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 (file)
index 0000000..9103abf
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 (file)
index 0000000..69444a9
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 (file)
index 0000000..b9b338d
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 (file)
index 0000000..ae6faf6
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 (file)
index 0000000..8fafc11
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 (file)
index 0000000..3bdb44c
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 (file)
index 0000000..08e006e
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 (file)
index 0000000..d105afb
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 (file)
index 0000000..750f6df
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 (file)
index 0000000..d97f476
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 (file)
index 0000000..de2371d
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 (file)
index 0000000..8f1b79a
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 (file)
index 0000000..31ce007
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 (file)
index 0000000..c17170a
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 (file)
index 0000000..f06166b
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 (file)
index 0000000..05ba9f1
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 (file)
index 0000000..8e58541
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 (file)
index 0000000..09e7e68
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 (file)
index 0000000..269d719
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 (file)
index 0000000..40872e0
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 (file)
index 0000000..2b56797
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 (file)
index 0000000..0e90935
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 (file)
index 0000000..5553649
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 (file)
index 0000000..092d7ca
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 (file)
index 0000000..6e7e727
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 (file)
index 0000000..474b989
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 (file)
index 0000000..4093df6
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 (file)
index 0000000..e0ca7f6
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 (file)
index 0000000..de8a068
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 (file)
index 0000000..e8c625c
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 (file)
index 0000000..fd28fbf
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 (file)
index 0000000..dbc4555
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 (file)
index 0000000..4c5d85d
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 (file)
index 0000000..50e1dfb
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 (file)
index 0000000..9e1b663
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 (file)
index 0000000..9d5e879
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 (file)
index 0000000..7506700
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 (file)
index 0000000..f4572c4
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 (file)
index 0000000..c2ba9d0
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 (file)
index 0000000..2f1f8f0
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 (file)
index 0000000..71f757c
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 (file)
index 0000000..20874f3
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 (file)
index 0000000..95848ae
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 (file)
index 0000000..31adaba
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 (file)
index 0000000..95bd540
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 (file)
index 0000000..f3f82cb
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 (file)
index 0000000..1cff5cc
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 (file)
index 0000000..88fd2e0
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 (file)
index 0000000..e623968
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 (file)
index 0000000..8b24385
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 (file)
index 0000000..f1d969d
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 (file)
index 0000000..4908edd
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 (file)
index 0000000..969d4ca
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 (file)
index 0000000..f379889
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 (file)
index 0000000..22d0ebd
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 (file)
index 0000000..387b94c
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 (file)
index 0000000..b0ea697
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 (file)
index 0000000..0e3dadd
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 (file)
index 0000000..801c1a3
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 (file)
index 0000000..5de3117
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 (file)
index 0000000..7007515
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 (file)
index 0000000..30357af
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 (file)
index 0000000..d8f0d5b
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 (file)
index 0000000..d13fd18
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 (file)
index 0000000..c5783e0
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 (file)
index 0000000..541220a
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 (file)
index 0000000..62b9646
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 (file)
index 0000000..f2c3181
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 (file)
index 0000000..77720b1
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 (file)
index 0000000..e9ad4b5
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 (file)
index 0000000..0f8300c
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 (file)
index 0000000..332081e
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 (file)
index 0000000..09fb6ea
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 (file)
index 0000000..a4ec5cd
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 (file)
index 0000000..179fc52
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 (file)
index 0000000..1a2eb60
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 (file)
index 0000000..f63270b
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 (file)
index 0000000..815b090
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 (file)
index 0000000..8639dd3
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 (file)
index 0000000..367f65e
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 (file)
index 0000000..95f3bd8
--- /dev/null
@@ -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' . '" />';
+
+
+}