Merge pull request #30 from fabrixxm/master

viewsrc: show message source in a fancybox via ajax

diff --git a/adult_smile.tgz b/adult_smile.tgz
index 67e2a31ef81ce94d43c433106ac65c3960da4a43..04ef72fb0b2904d78b971e616d1a9503cd5ae4f4 100644 (file)
Binary files a/adult_smile.tgz and b/adult_smile.tgz differ

diff --git a/blockem.tgz b/blockem.tgz
index dd092204f380e65b5cf18babf0de1edc53fb9ebf..c1842e52411ebbf55ee9f96894d11bbafb6234a7 100755 (executable)
Binary files a/blockem.tgz and b/blockem.tgz differ

diff --git a/blockem/blockem.php b/blockem/blockem.php
index 9134bd0b654fea63fdfaeba3bd3fc01a4d4c4a08..5ff87c58b2d0ee2ae3f4690af94df9eee682ffc9 100755 (executable)
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -109,7 +109,7 @@ function blockem_prepare_body(&$a,&$b) {
 
 function blockem_display_item(&$a,&$b) {
        if(strstr($b['output']['body'],'id="blockem-wrap-'))
-               $b['output']['thumb'] = $a->get_baseurl() . "/images/default-profile-sm.jpg";
+               $b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg";
 }
 
 

diff --git a/facebook.tgz b/facebook.tgz
index b1db063bb7aab310929d9dd330b1e94ab6537d1f..18392c78c255e13bdd844e315196b1ec718fbd52 100644 (file)
Binary files a/facebook.tgz and b/facebook.tgz differ

diff --git a/facebook/facebook.php b/facebook/facebook.php
index 9c8c8f085379b693ae00fbd2b04d7f346a57d9a2..24632240652e3decca5ba0b856ae844d2c00bae7 100755 (executable)
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -46,6 +46,12 @@
  * authenticate to your site to establish identity. We will address this 
  * in a future release.
  */
+ 
+ /** TODO
+ * - Implement a method for the administrator to delete all configuration data the plugin has created,
+ *   e.g. the app_access_token
+ * - Implement a configuration option to set the polling interval system-wide
+ */
 
 define('FACEBOOK_MAXPOSTLEN', 420);
 
@@ -56,9 +62,8 @@ function facebook_install() {
        register_hook('jot_networks',     'addon/facebook/facebook.php', 'facebook_jot_nets');
        register_hook('connector_settings',  'addon/facebook/facebook.php', 'facebook_plugin_settings');
        register_hook('cron',             'addon/facebook/facebook.php', 'facebook_cron');
+       register_hook('enotify',          'addon/facebook/facebook.php', 'facebook_enotify');
        register_hook('queue_predeliver', 'addon/facebook/facebook.php', 'fb_queue_hook');
-       
-       if (get_config('facebook', 'realtime_active') == 1) facebook_subscription_add_users(); // Restore settings, if the plugin was installed before
 }
 
 
@@ -68,13 +73,12 @@ function facebook_uninstall() {
        unregister_hook('jot_networks',     'addon/facebook/facebook.php', 'facebook_jot_nets');
        unregister_hook('connector_settings',  'addon/facebook/facebook.php', 'facebook_plugin_settings');
        unregister_hook('cron',             'addon/facebook/facebook.php', 'facebook_cron');
+       unregister_hook('enotify',          'addon/facebook/facebook.php', 'facebook_enotify');
        unregister_hook('queue_predeliver', 'addon/facebook/facebook.php', 'fb_queue_hook');
 
        // hook moved
        unregister_hook('post_local_end',  'addon/facebook/facebook.php', 'facebook_post_hook');
        unregister_hook('plugin_settings',  'addon/facebook/facebook.php', 'facebook_plugin_settings');
-       
-       if (get_config('facebook', 'realtime_active') == 1) facebook_subscription_del_users();
 }
 
 
@@ -150,8 +154,12 @@ function facebook_init(&$a) {
                                                        $s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token);
                                                        if($s) {
                                                                $j = json_decode($s);
-                                                               logger('facebook_init: wall: ' . print_r($j,true), LOGGER_DATA);
-                                                               fb_consume_stream($uid,$j,($private_wall) ? false : true);
+                                                               if (isset($j->data)) {
+                                                                       logger('facebook_init: wall: ' . print_r($j,true), LOGGER_DATA);
+                                                                       fb_consume_stream($uid,$j,($private_wall) ? false : true);
+                                                               } else {
+                                                                       logger('facebook_init: wall: got no data from Facebook: ' . print_r($j,true), LOGGER_NORMAL);
+                                                               }
                                                        }
                                                }
                                                
@@ -589,7 +597,7 @@ function facebook_cron($a,$b) {
                                
                                if(strlen($a->config['admin_email']) && !get_config('facebook', 'realtime_err_mailsent')) {
                                        $res = mail($a->config['admin_email'], t('Problems with Facebook Real-Time Updates'), 
-                                               "Hi!\n\nThere's a problem with the Facebook Real-Time Updates that cannob be solved automatically. Maybe an permission issue?\n\nThis e-mail will only be sent once.",
+                                               "Hi!\n\nThere's a problem with the Facebook Real-Time Updates that cannot be solved automatically. Maybe an permission issue?\n\nThis e-mail will only be sent once.",
                                                'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
                                                . 'Content-type: text/plain; charset=UTF-8' . "\n"
                                                . 'Content-transfer-encoding: 8bit'
@@ -903,6 +911,7 @@ function facebook_post_hook(&$a,&$b) {
                                                        dbesc('fb::' . $retj->id),
                                                        intval($b['id'])
                                                );
+                                               del_pconfig($b['uid'], 'facebook', 'session_expired_mailsent');
                                        }
                                        else {
                                                if(! $likes) {
@@ -911,6 +920,25 @@ function facebook_post_hook(&$a,&$b) {
                                                        add_to_queue($a->contact,NETWORK_FACEBOOK,$s);
                                                        notice( t('Facebook post failed. Queued for retry.') . EOL);
                                                }
+                                               
+                                               if (isset($retj->error) && $retj->error->type == "OAuthException" && $retj->error->code == 190) {
+                                                       logger('Facebook session has expired due to changed password.', LOGGER_DEBUG);
+                                                       if (!get_pconfig($b['uid'], 'facebook', 'session_expired_mailsent')) {
+                                                               require_once('include/enotify.php');
+                                                       
+                                                               $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($b['uid']) );
+                                                               notification(array(
+                                                                       'uid' => $b['uid'],
+                                                                       'type' => NOTIFY_SYSTEM,
+                                                                       'system_type' => 'facebook_connection_invalid',
+                                                                       'language'     => $r[0]['language'],
+                                                                       'to_name'      => $r[0]['username'],
+                                                                       'to_email'     => $r[0]['email'],
+                                                               ));
+                                                               
+                                                               set_pconfig($b['uid'], 'facebook', 'session_expired_mailsent', '1');
+                                                       }
+                                               }
                                        }
                                        
                                        logger('Facebook post returns: ' . $x, LOGGER_DEBUG);
@@ -920,6 +948,13 @@ function facebook_post_hook(&$a,&$b) {
        }
 }
 
+function facebook_enotify(&$app, &$data) {
+       if (x($data, 'params') && $data['params']['type'] == NOTIFY_SYSTEM && x($data['params'], 'system_type') && $data['params']['system_type'] == 'facebook_connection_invalid') {
+               $data['itemlink'] = '/facebook';
+               $data['epreamble'] = $data['preamble'] = t('Your Facebook connection became invalid. Please Re-authenticate.');
+               $data['subject'] = t('Facebook connection became invalid');
+       }
+}
 
 function facebook_post_local(&$a,&$b) {
 
@@ -1018,15 +1053,23 @@ function fb_consume_all($uid) {
                $s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token);
                if($s) {
                        $j = json_decode($s);
-                       logger('fb_consume_stream: wall: ' . print_r($j,true), LOGGER_DATA);
-                       fb_consume_stream($uid,$j,($private_wall) ? false : true);
+                       if (isset($j->data)) {
+                               logger('fb_consume_stream: wall: ' . print_r($j,true), LOGGER_DATA);
+                               fb_consume_stream($uid,$j,($private_wall) ? false : true);
+                       } else {
+                               logger('fb_consume_stream: wall: got no data from Facebook: ' . print_r($j,true), LOGGER_NORMAL);
+                       }
                }
        }
        $s = fetch_url('https://graph.facebook.com/me/home?access_token=' . $access_token);
        if($s) {
                $j = json_decode($s);
-               logger('fb_consume_stream: feed: ' . print_r($j,true), LOGGER_DATA);
-               fb_consume_stream($uid,$j,false);
+               if (isset($j->data)) {
+                       logger('fb_consume_stream: feed: ' . print_r($j,true), LOGGER_DATA);
+                       fb_consume_stream($uid,$j,false);
+               } else {
+                       logger('fb_consume_stream: feed: got no data from Facebook: ' . print_r($j,true), LOGGER_NORMAL);
+               }
        }
 
 }

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
+++ b/frown/frown.css
@@ -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
+++ b/frown/frown.php
@@ -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
deleted file mode 100644 (file)
index 4c67d49..0000000
Binary files a/ijpost.tar.gz and /dev/null differ

diff --git a/ijpost.tgz b/ijpost.tgz
new file mode 100644 (file)
index 0000000..555e060
Binary files /dev/null and b/ijpost.tgz differ

diff --git a/page.tgz b/page.tgz
new file mode 100644 (file)
index 0000000..aebbe4d
Binary files /dev/null and b/page.tgz differ

diff --git a/page/page.php b/page/page.php
new file mode 100755 (executable)
index 0000000..2a65cab
--- /dev/null
+++ b/page/page.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Name: Page
+ * Description: Shows lists of community pages (improved performance over 'pages')
+ * Version: 1.0
+ * Author: Mike Macgirvin <mike@macgirvin.com>
+ * based on pages plugin by
+ * Author: Michael Vogel <ike@piratenpartei.de>
+ *
+ */
+
+function page_install() {
+       register_hook('page_end', 'addon/page/page.php', 'page_page_end');
+}
+
+function page_uninstall() {
+       unregister_hook('page_end', 'addon/page/page.php', 'page_page_end');
+}
+
+
+function page_getpage($uid) {
+
+
+       $pagelist = array();
+
+       $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
+                       WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d",
+                       intval($uid)
+       );
+
+       $page = array();
+
+       // Look if the profile is a community page
+       foreach($contacts as $contact) {
+               $page[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
+       }
+       return($page);
+}
+
+function page_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;
+
+       $page = '<div id="page-sidebar" class="widget">
+                       <div class="title tool">
+                       <h3>'.t("Community Pages").'</h3></div>
+                       <div id="sidebar-page-list"><ul>';
+
+       $contacts = page_getpage($a->user['uid']);
+
+       foreach($contacts as $contact) {
+               $page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" title="' . $contact['url'] . '" class="label" target="external-link">'.
+                               $contact["name"]."</a></li>";
+       }
+       $page .= "</ul></div></div>";
+       if (sizeof($contacts) > 0)
+               $a->page['aside'] = $page . $a->page['aside'];
+}
+?>

diff --git a/smiley_pack.tgz b/smiley_pack.tgz
new file mode 100644 (file)
index 0000000..384c6b9
Binary files /dev/null and b/smiley_pack.tgz differ

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

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

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

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

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

diff --git a/smiley_pack/icons/devilangel/daseesaw.gif b/smiley_pack/icons/devilangel/daseesaw.gif
new file mode 100644 (file)
index 0000000..1c04b2e
Binary files /dev/null and b/smiley_pack/icons/devilangel/daseesaw.gif differ

diff --git a/smiley_pack/icons/devilangel/saint.gif b/smiley_pack/icons/devilangel/saint.gif
new file mode 100644 (file)
index 0000000..52c22c4
Binary files /dev/null and b/smiley_pack/icons/devilangel/saint.gif differ

diff --git a/smiley_pack/icons/devilangel/turnevil.gif b/smiley_pack/icons/devilangel/turnevil.gif
new file mode 100644 (file)
index 0000000..1490c0f
Binary files /dev/null and b/smiley_pack/icons/devilangel/turnevil.gif differ

diff --git a/smiley_pack/icons/disgust/fart.gif b/smiley_pack/icons/disgust/fart.gif
new file mode 100644 (file)
index 0000000..4160a1f
Binary files /dev/null and b/smiley_pack/icons/disgust/fart.gif differ

diff --git a/smiley_pack/icons/disgust/fartblush.gif b/smiley_pack/icons/disgust/fartblush.gif
new file mode 100644 (file)
index 0000000..4160a1f
Binary files /dev/null and b/smiley_pack/icons/disgust/fartblush.gif differ

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

diff --git a/smiley_pack/icons/fight/gangs.gif b/smiley_pack/icons/fight/gangs.gif
new file mode 100644 (file)
index 0000000..2c655b1
Binary files /dev/null and b/smiley_pack/icons/fight/gangs.gif differ

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

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

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

diff --git a/smiley_pack/icons/laugh/hahaha.gif b/smiley_pack/icons/laugh/hahaha.gif
new file mode 100644 (file)
index 0000000..37aa92a
Binary files /dev/null and b/smiley_pack/icons/laugh/hahaha.gif differ

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

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

diff --git a/smiley_pack/icons/music/dj.gif b/smiley_pack/icons/music/dj.gif
new file mode 100644 (file)
index 0000000..66bc075
Binary files /dev/null and b/smiley_pack/icons/music/dj.gif differ

diff --git a/smiley_pack/icons/music/drums.gif b/smiley_pack/icons/music/drums.gif
new file mode 100644 (file)
index 0000000..27215f4
Binary files /dev/null and b/smiley_pack/icons/music/drums.gif differ

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

diff --git a/smiley_pack/icons/music/guitar.gif b/smiley_pack/icons/music/guitar.gif
new file mode 100644 (file)
index 0000000..11eccdd
Binary files /dev/null and b/smiley_pack/icons/music/guitar.gif differ

diff --git a/smiley_pack/icons/music/trumpet.gif b/smiley_pack/icons/music/trumpet.gif
new file mode 100644 (file)
index 0000000..4595ccc
Binary files /dev/null and b/smiley_pack/icons/music/trumpet.gif differ

diff --git a/smiley_pack/icons/music/violin.gif b/smiley_pack/icons/music/violin.gif
new file mode 100644 (file)
index 0000000..53592d6
Binary files /dev/null and b/smiley_pack/icons/music/violin.gif differ

diff --git a/smiley_pack/icons/oldcore/beard.png b/smiley_pack/icons/oldcore/beard.png
new file mode 100644 (file)
index 0000000..5d4b284
Binary files /dev/null and b/smiley_pack/icons/oldcore/beard.png differ

diff --git a/smiley_pack/icons/oldcore/headbang.gif b/smiley_pack/icons/oldcore/headbang.gif
new file mode 100644 (file)
index 0000000..91ccb8b
Binary files /dev/null and b/smiley_pack/icons/oldcore/headbang.gif differ

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

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

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

diff --git a/smiley_pack/icons/oldcore/whitebeard.png b/smiley_pack/icons/oldcore/whitebeard.png
new file mode 100644 (file)
index 0000000..2a1fccb
Binary files /dev/null and b/smiley_pack/icons/oldcore/whitebeard.png differ

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

diff --git a/smiley_pack/icons/respect/bravo.gif b/smiley_pack/icons/respect/bravo.gif
new file mode 100644 (file)
index 0000000..34f72ab
Binary files /dev/null and b/smiley_pack/icons/respect/bravo.gif differ

diff --git a/smiley_pack/icons/respect/hailking.gif b/smiley_pack/icons/respect/hailking.gif
new file mode 100644 (file)
index 0000000..07551e5
Binary files /dev/null and b/smiley_pack/icons/respect/hailking.gif differ

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

diff --git a/smiley_pack/icons/sport/archery.gif b/smiley_pack/icons/sport/archery.gif
new file mode 100644 (file)
index 0000000..8b4b9f6
Binary files /dev/null and b/smiley_pack/icons/sport/archery.gif differ

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

diff --git a/smiley_pack/icons/sport/horseriding.gif b/smiley_pack/icons/sport/horseriding.gif
new file mode 100644 (file)
index 0000000..13ca450
Binary files /dev/null and b/smiley_pack/icons/sport/horseriding.gif differ

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

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

diff --git a/smiley_pack/icons/sport/tennis.gif b/smiley_pack/icons/sport/tennis.gif
new file mode 100644 (file)
index 0000000..36e47bf
Binary files /dev/null and b/smiley_pack/icons/sport/tennis.gif differ

diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 95f3bd8745c47add4f6f06de36c86b1c6bdca180..d85f9b5eddd268f97f4c942b738efb8e0aefd204 100644 (file)
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -21,13 +21,22 @@ function smiley_pack__uninstall() {
 
 function smiley_pack_smilies(&$a,&$b) {
 
+#Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
+
+#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
+#when all else fails.
+
+
+
+#Animal smileys.
+
        $b['texts'][] = ':bunnyflowers';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
 
        $b['texts'][] = ':chick';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';
 
-       $b['texts'][] = ':bee';
+       $b['texts'][] = ':bumblebee';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee' . '" />';    
 
        $b['texts'][] = ':ladybird';
@@ -84,6 +93,21 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':dog';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';    
 
+       $b['texts'][] = ':elephant';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant' . '" />';  
+
+       $b['texts'][] = ':fish';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish' . '" />';  
+
+       $b['texts'][] = ':giraffe';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe' . '" />';    
+
+       $b['texts'][] = ':pig';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig' . '" />';    
+
+
+
+#Baby Smileys
 
        $b['texts'][] = ':baby';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';   
@@ -98,7 +122,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':stork';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />'; 
 
-       
+
+#Confused Smileys      
        $b['texts'][] = ':confused';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />'; 
     
@@ -108,12 +133,20 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':stupid';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';     
 
+       $b['texts'][] = ':dazed';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';       
+
+
+#Cool Smileys
+
        $b['texts'][] = ':affro';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';   
 
        $b['texts'][] = ':cool';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';     
 
+#Devil/Angel Smileys
+
        $b['texts'][] = ':angel';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';     
 
@@ -126,13 +159,23 @@ function smiley_pack_smilies(&$a,&$b) {
        $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'][] = ':devillish';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish' . '" />'; 
        
+       $b['texts'][] = ':daseesaw';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';       
+
+       $b['texts'][] = ':turnevil';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';       
+       
+       $b['texts'][] = ':saint';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';     
 
        $b['texts'][] = ':graveside';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';     
 
+#Unpleasent smileys.
+
        $b['texts'][] = ':toilet';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';      
 
@@ -142,21 +185,32 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':vomit';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
 
+       $b['texts'][] = ':fartblush';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
+
+#Drinks
+
        $b['texts'][] = ':tea';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea' . '" />';
 
        $b['texts'][] = ':drool';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool' . '" />';
 
+#Sad smileys
+
        $b['texts'][] = ':crying';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying' . '" />';
 
        $b['texts'][] = ':prisoner';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
 
+#Smoking - only one smiley in here, maybe it needs moving elsewhere?
+
        $b['texts'][] = ':smoking';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
 
+#Sport smileys
+
        $b['texts'][] = ':basketball';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
 
@@ -181,13 +235,33 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':skipping';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
 
+       $b['texts'][] = ':archery';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
+
+       $b['texts'][] = ':football';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
+
+       $b['texts'][] = ':surfing';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
+
+       $b['texts'][] = ':snooker';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
+  
+       $b['texts'][] = ':tennis';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
+
+       $b['texts'][] = ':horseriding';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
+
+#Love smileys
+
        $b['texts'][] = ':iloveyou';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
 
        $b['texts'][] = ':inlove';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove' . '" />';
 
-       $b['texts'][] = ':love';
+       $b['texts'][] = '~love';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
 
        $b['texts'][] = ':lovebear';
@@ -199,6 +273,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':loveheart';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
 
+#Tired/Sleep smileys
+
        $b['texts'][] = ':countsheep';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
 
@@ -208,6 +284,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':pillow';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
 
+#Fight/Flame/Violent smileys
+
        $b['texts'][] = ':2guns';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
 
@@ -259,6 +337,14 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':viking';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
 
+       $b['texts'][] = ':gangs';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
+
+       $b['texts'][] = ':acid';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
+
+#Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
+
        $b['texts'][] = ':alienmonster';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
 
@@ -271,8 +357,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $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'][] = ':draco';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
 
        $b['texts'][] = ':ghost';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
@@ -280,6 +366,8 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':mummy';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
 
+#Food smileys
+
        $b['texts'][] = ':apple';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
 
@@ -298,6 +386,16 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':tomato';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
 
+       $b['texts'][] = ':banana';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana' . '" />';
+
+       $b['texts'][] = ':cooking';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
+
+       $b['texts'][] = ':fryegg';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
+
+#Happy smileys
 
        $b['texts'][] = ':cloud9';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
@@ -305,5 +403,83 @@ function smiley_pack_smilies(&$a,&$b) {
        $b['texts'][] = ':tearsofjoy';
        $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
 
+#Repsect smileys
+
+       $b['texts'][] = ':bow';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
+
+       $b['texts'][] = ':bravo';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+
+       $b['texts'][] = ':hailking';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking' . '" />';
+
+       $b['texts'][] = ':number1';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
+
+#Laugh smileys
+
+       $b['texts'][] = ':hahaha';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
+
+       $b['texts'][] = ':loltv';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
+
+       $b['texts'][] = ':rofl';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
+
+#Music smileys
+
+       $b['texts'][] = ':dj';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
+
+       $b['texts'][] = ':drums';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
+
+       $b['texts'][] = ':elvis';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
+
+       $b['texts'][] = ':guitar';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
+
+       $b['texts'][] = ':trumpet';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet' . '" />';
+
+       $b['texts'][] = ':violin';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
+
+#Smileys that used to be in core
+
+       $b['texts'][] = ':headbang';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
+
+               $b['texts'][] = ':beard';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
+
+       $b['texts'][] = ':whitebeard';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
+
+       $b['texts'][] = ':shaka';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
+
+       $b['texts'][] = ':\\.../';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
+
+       $b['texts'][] = ':\\ooo/';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
+
+       $b['texts'][] = ':headdesk';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headdesk.gif' . '" alt="' . ':headdesk' . '" />';
+
+#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
+
+       $b['texts'][] = ':-d';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
+
+       $b['texts'][] = ':-o';
+       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
+
+
+
 
 }