rename App Methods

- rename get_baseurl() to getBaseURL()

diff --git a/blockem/blockem.php b/blockem/blockem.php
index c915cd6cee6795612108cb07840617ea948336aa..2a5fd8b60e0248791e17211a59dd886fd882be93 100644 (file)
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -42,7 +42,7 @@ function blockem_addon_settings (App $a, &$s)
        }
 
        /* 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/blockem/blockem.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/blockem/blockem.css' . '" media="all" />' . "\r\n";
 
        $words = PConfig::get(local_user(), 'blockem', 'words');
 
@@ -147,7 +147,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data)
 function blockem_display_item(App $a, array &$b = null)
 {
        if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) {
-               $b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg";
+               $b['output']['thumb'] = $a->getBaseURL() . "/images/person-80.jpg";
        }
 }
 

diff --git a/blogger/blogger.php b/blogger/blogger.php
index 68837cd8ebf4fc96e21436b628bd42b5a76bd150..e747c3a6b5ba98ea64f3b957eb0a94e5356eeb16 100644 (file)
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -62,7 +62,7 @@ function blogger_settings(App $a, &$s)
 
        /* 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/blogger/blogger.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
 

diff --git a/buffer/buffer.php b/buffer/buffer.php
index 4fc45c857f1fa9816a7863ec58359126b4168db4..048a27dafcf2642b80262d520666e9e9d0c30952 100644 (file)
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -105,7 +105,7 @@ function buffer_connect(App $a)
        $client_secret = Config::get('buffer','client_secret');
 
        // The callback URL is the script that gets called after the user authenticates with buffer
-       $callback_url = $a->get_baseurl()."/buffer/connect";
+       $callback_url = $a->getBaseURL()."/buffer/connect";
 
        $buffer = new BufferApp($client_id, $client_secret, $callback_url);
 
@@ -114,7 +114,7 @@ function buffer_connect(App $a)
        } else {
                logger("buffer_connect: authenticated");
                $o .= L10n::t("You are now authenticated to buffer. ");
-               $o .= '<br /><a href="' . $a->get_baseurl() . '/settings/connectors">' . L10n::t("return to the connector page") . '</a>';
+               $o .= '<br /><a href="' . $a->getBaseURL() . '/settings/connectors">' . L10n::t("return to the connector page") . '</a>';
                PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token);
        }
 
@@ -145,7 +145,7 @@ function buffer_settings(App $a, &$s)
 
        /* 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/buffer/buffer.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/buffer/buffer.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
 
@@ -174,7 +174,7 @@ function buffer_settings(App $a, &$s)
 
        if ($access_token == "") {
                $s .= '<div id="buffer-authenticate-wrapper">';
-               $s .= '<a href="'.$a->get_baseurl().'/buffer/connect">'.L10n::t("Authenticate your Buffer connection").'</a>';
+               $s .= '<a href="'.$a->getBaseURL().'/buffer/connect">'.L10n::t("Authenticate your Buffer connection").'</a>';
                $s .= '</div><div class="clear"></div>';
        } else {
                $s .= '<div id="buffer-enable-wrapper">';
@@ -193,7 +193,7 @@ function buffer_settings(App $a, &$s)
                $s .= '</div><div class="clear"></div>';
 
                // The callback URL is the script that gets called after the user authenticates with buffer
-               $callback_url = $a->get_baseurl() . '/buffer/connect';
+               $callback_url = $a->getBaseURL() . '/buffer/connect';
 
                $buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
 

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 490c6394f1b26f2c94f4c562f8d1a706a30be5a7..27e48b7af3c2fdb18b7a61af4d6a0cd79b55de80 100644 (file)
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -82,7 +82,7 @@ function catavatar_addon_settings_post(App $a, &$s)
        $seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
 
        if (!empty($_POST['catavatar-usecat'])) {
-               $url = $a->get_baseurl() . '/catavatar/' . local_user() . '?ts=' . time();
+               $url = $a->getBaseURL() . '/catavatar/' . local_user() . '?ts=' . time();
 
                $self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
                if (!DBA::isResult($self)) {
@@ -109,7 +109,7 @@ function catavatar_addon_settings_post(App $a, &$s)
                Contact::updateSelfFromUserID(local_user(), true);
 
                // Update global directory in background
-               $url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+               $url = $a->getBaseURL() . '/profile/' . $a->user['nickname'];
                if ($url && strlen(Config::get('system', 'directory'))) {
                        Worker::add(PRIORITY_LOW, 'Directory', $url);
                }
@@ -138,7 +138,7 @@ function catavatar_addon_settings_post(App $a, &$s)
 function catavatar_lookup(App $a, &$b)
 {
        $user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
-       $url = $a->get_baseurl() . '/catavatar/' . $user['uid'];
+       $url = $a->getBaseURL() . '/catavatar/' . $user['uid'];
 
        switch($b['size']) {
                case 175: $url .= "/4"; break;

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 044f5a154d53dbec72ce6ef9d9e7a49c304ceb53..c4cf3ab468453afbce6633e0696e901035c8e2cd 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -103,7 +103,7 @@ function curweather_network_mod_init(App $a, &$b)
                return;
        }
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/curweather/curweather.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/curweather/curweather.css' . '" media="all" />' . "\r\n";
 
        // $rpt value is needed for location
        // $lang will be taken from the browser session to honour user settings

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index a547255821144c0e5adf133b338ede76a79e700b..ed053c75fc20b6fb2488fd9776ed574db0e95193 100644 (file)
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -136,7 +136,7 @@ function diaspora_settings(App $a, &$s)
 
        /* 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/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
 

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 0174bf105a247ce06f317b40ae64dbc6aafdd9f5..f6f266347a52400fd0cc1128f3c32f5f02748a6d 100644 (file)
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -60,7 +60,7 @@ function dwpost_settings(App $a, &$s)
        }
 
        /* 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/dwpost/dwpost.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/dwpost/dwpost.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
        $enabled = PConfig::get(local_user(), 'dwpost', 'post');

diff --git a/fortunate/fortunate.php b/fortunate/fortunate.php
index ebece48981546f3a17dfae8a6aa7d11e8a22607e..b92f6085ff6ffdb1ed64b4169c71485a54a93075 100644 (file)
--- a/fortunate/fortunate.php
+++ b/fortunate/fortunate.php
@@ -30,7 +30,7 @@ function fortunate_uninstall()
 function fortunate_fetch(&$a, &$b)
 {
        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
-               . $a->get_baseurl() . '/addon/fortunate/fortunate.css' . '" media="all" />' . "\r\n";
+               . $a->getBaseURL() . '/addon/fortunate/fortunate.css' . '" media="all" />' . "\r\n";
 
        if (FORTUNATE_SERVER != 'hostname.com') {
                $s = Network::fetchUrl('http://' . FORTUNATE_SERVER . '/cookie.php?numlines=2&equal=1&rand=' . mt_rand());

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 9f7dd877829ee9052b6d929bea82893d348226d3..0c2aa265637f407d71a6eb2b19fdf69c4f763d98 100644 (file)
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -43,7 +43,7 @@ function forumdirectory_app_menu(App $a, array &$b)
 
 function forumdirectory_init(App $a)
 {
-       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/forumdirectory/forumdirectory.css" media="all" />';
+       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/forumdirectory/forumdirectory.css" media="all" />';
 
        $a->set_pager_itemspage(60);
 
@@ -130,7 +130,7 @@ function forumdirectory_content(App $a)
                }
 
                foreach ($r as $rr) {
-                       $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+                       $profile_link = $a->getBaseURL() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 
                        $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index afdb087b37cf163da27dd5d1d84ce5bb012ed5c1..6a33cd03774e6d6446dc8f979b9399a9c0cdbbdb 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -47,7 +47,7 @@ function fromapp_settings(&$a, &$s)
 
        /* 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/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 4cd1b27cbcdcd3b9298d243218b49ff9efb6cdf2..dc6e116b76773795893f353ee436089a40ec2997 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -178,7 +178,7 @@ function geonames_addon_admin(&$a,&$s) {
 
        /* 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/geonames/geonames.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/geonames/geonames.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/gnot/gnot.php b/gnot/gnot.php
index c7678a2185e8dbc0e08308e633df7d553980f7f6..2c4555ba3a8776a21793aeca5c62a0fcb3b3e65a 100644 (file)
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -67,7 +67,7 @@ function gnot_settings(&$a,&$s) {
 
        /* 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/gnot/gnot.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/group_text/group_text.php b/group_text/group_text.php
index 4c0cb14a9a3aeb211ae2626fbecedcb14323f9f9..3f91ff355a4ad67966f212b92a8cdb6cb9f5278f 100644 (file)
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -63,7 +63,7 @@ function group_text_settings(&$a,&$s) {
 
        /* 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/group_text/group_text.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/group_text/group_text.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index ddd64394c84e4d60c4c35b3f0003e173b50adf7d..2e48319ab777656663601ba9625472bd5c127198 100644 (file)
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -64,7 +64,7 @@ function ifttt_settings(App $a, &$s)
        $s .= '<div id="ifttt-configuration-wrapper">';
        $s .= '<p>' . L10n::t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:') . '</p>';
        $s .= '<h4>URL</h4>';
-       $s .= '<p>' . $a->get_baseurl() . '/ifttt/' . $a->user['nickname'] . '</p>';
+       $s .= '<p>' . $a->getBaseURL() . '/ifttt/' . $a->user['nickname'] . '</p>';
        $s .= '<h4>Method</h4>';
        $s .= '<p>POST</p>';
        $s .= '<h4>Content Type</h4>';

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index b003742f719a68e14b0bf035ce84a77d3999102a..5d24509e374854629126fcbe40580d34d16717c6 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -56,7 +56,7 @@ function ijpost_settings(&$a, &$s)
 
        /* 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";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
 

diff --git a/impressum/impressum.php b/impressum/impressum.php
index b7cf64e4036eb56c7bddffb55d1dda3fbccb9ed5..74d87180985a1c1769b3dddad1585ba9f338f05f 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -43,7 +43,7 @@ function impressum_footer($a, &$b) {
     $text = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum','footer_text')));
 
     if (! $text == '') {
-        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />';
+        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/impressum/impressum.css" media="all" />';
         $b .= '<div class="clear"></div>';
         $b .= '<div id="impressum_footer">'.$text.'</div>';
     }

diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
index e92d34407ea861b192ffb79c407eaf1edfc15f7c..3106a2fe6b3c17e23aa788c7876701cc11c0da42 100644 (file)
--- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
+++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
@@ -32,13 +32,13 @@ function infiniteimprobabilitydrive_module()
 
 function infiniteimprobabilitydrive_content(&$a)
 {
-       $baseurl = $a->get_baseurl() . '/addon/infiniteimprobabilitydrive';
+       $baseurl = $a->getBaseURL() . '/addon/infiniteimprobabilitydrive';
        $o = '';
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
+       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
 
 
-       $baseurl = $a->get_baseurl();
+       $baseurl = $a->getBaseURL();
 
        $o .= <<< EOT
 

diff --git a/irc/irc.php b/irc/irc.php
index 6aeacbe65ce4c90d59ef3f7b262eb09607461b2e..38ce5f24b5ffdd3146a7123321e2107dd105d385 100644 (file)
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -30,7 +30,7 @@ function irc_addon_settings(&$a,&$s) {
 
     /* 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/irc/irc.css' . '" media="all" />' . "\r\n";
+//     $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/irc/irc.css' . '" media="all" />' . "\r\n";
 
     /* setting popular channels, auto connect channels */
        $sitechats = PConfig::get( local_user(), 'irc','sitechats'); /* popular channels */
@@ -74,7 +74,7 @@ function irc_module() {
 
 function irc_content(&$a) {
 
-       $baseurl = $a->get_baseurl() . '/addon/irc';
+       $baseurl = $a->getBaseURL() . '/addon/irc';
        $o = '';
 
        /* set the list of popular channels */
@@ -93,7 +93,7 @@ function irc_content(&$a) {
 
        $a->page['aside'] .= '<div class="widget"><h3>' . L10n::t('Popular Channels') . '</h3><ul>';
        foreach($chats as $chat) {
-               $a->page['aside'] .= '<li><a href="' . $a->get_baseurl() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
+               $a->page['aside'] .= '<li><a href="' . $a->getBaseURL() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
        }
        $a->page['aside'] .= '</ul></div>';
 

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index ad25b6f94fa4ac3525f44ec7a470df7fb450e078..8111f9fd8724236737c531f0406e7399ffce8e47 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -323,10 +323,10 @@ function jappixmini_settings(App $a, &$s)
 
        if (!$activate) {
                // load scripts if not yet activated so that password can be saved
-               $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>' . "\r\n";
-               $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
+               $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>' . "\r\n";
+               $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
 
-               $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+               $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
        }
 
        $s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
@@ -489,10 +489,10 @@ function jappixmini_script(App $a)
                return;
        }
 
-       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>' . "\r\n";
-       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
+       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>' . "\r\n";
+       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
 
-       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
 
        $username = PConfig::get(local_user(), 'jappixmini', 'username');
        $username = str_replace("'", "\\'", $username);
@@ -513,7 +513,7 @@ function jappixmini_script(App $a)
        // set proxy if necessary
        $use_proxy = Config::get('jappixmini', 'bosh_proxy');
        if ($use_proxy) {
-               $proxy = $a->get_baseurl() . '/addon/jappixmini/proxy.php';
+               $proxy = $a->getBaseURL() . '/addon/jappixmini/proxy.php';
        } else {
                $proxy = "";
        }
@@ -568,10 +568,10 @@ function jappixmini_login(App $a, &$o)
 {
        // create client secret on login to be able to encrypt jabber passwords
        // for setDB and str_sha1, needed by jappixmini_addon_set_client_secret
-       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=datastore.js~jsjac.js"></script>' . "\r\n";
+       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=datastore.js~jsjac.js"></script>' . "\r\n";
 
        // for jappixmini_addon_set_client_secret
-       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+       $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
 
        // save hash of password
        $o = str_replace("<form ", "<form onsubmit=\"jappixmini_addon_set_client_secret(this.elements['id_password'].value);return true;\" ", $o);
@@ -699,6 +699,6 @@ function jappixmini_download_source(App $a, &$b)
 {
        // Jappix Mini source download link on About page
        $b .= '<h1>Jappix Mini</h1>';
-       $b .= '<p>This site uses the jappixmini addon, which includes Jappix Mini by the <a href="' . $a->get_baseurl() . '/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="' . $a->get_baseurl() . '/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
-       $b .= '<p>You can download the <a href="' . $a->get_baseurl() . '/addon/jappixmini.tgz">source code of the addon</a>. The rest of Friendica is distributed under compatible licenses and can be retrieved from <a href="https://github.com/friendica/friendica">https://github.com/friendica/friendica</a> and <a href="https://github.com/friendica/friendica-addons">https://github.com/friendica/friendica-addons</a></p>';
+       $b .= '<p>This site uses the jappixmini addon, which includes Jappix Mini by the <a href="' . $a->getBaseURL() . '/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="' . $a->getBaseURL() . '/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
+       $b .= '<p>You can download the <a href="' . $a->getBaseURL() . '/addon/jappixmini.tgz">source code of the addon</a>. The rest of Friendica is distributed under compatible licenses and can be retrieved from <a href="https://github.com/friendica/friendica">https://github.com/friendica/friendica</a> and <a href="https://github.com/friendica/friendica-addons">https://github.com/friendica/friendica-addons</a></p>';
 }

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 28903f87e9028e9589b5fd52880c425a34da7748..adeba838c9ac8328d7420d6e13f2ab9ea532bbf7 100644 (file)
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -38,8 +38,8 @@ function js_upload_form(&$a,&$b) {
 
        $b['default_upload'] = false;
 
-       $b['addon_text'] .= '<link href="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">';
-       $b['addon_text'] .= '<script src="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.js" type="text/javascript"></script>';
+       $b['addon_text'] .= '<link href="' . $a->getBaseURL() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">';
+       $b['addon_text'] .= '<script src="' . $a->getBaseURL() . '/addon/js_upload/file-uploader/client/fileuploader.js" type="text/javascript"></script>';
 
        $upload_msg = L10n::t('Select files for upload');
        $drop_msg = L10n::t('Drop files here to upload');

diff --git a/krynn/krynn.php b/krynn/krynn.php
index 47372926d9273920954299615a4b92def7eea189..4b6e1f7f74186bda3904655f90bc3d120ee669a4 100644 (file)
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -141,7 +141,7 @@ function krynn_settings(&$a,&$s) {
 
        /* 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/krynn/krynn.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/krynn/krynn.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index fe413d63e00583de65ff713bfd8b7403c6447166..6922ac82387cf5a1de16f62b93963098be149e49 100644 (file)
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -121,7 +121,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
 
        // Never filter own messages
        // TODO: find a better way to extract this
-       $logged_user_profile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+       $logged_user_profile = $a->getBaseURL() . '/profile/' . $a->user['nickname'];
        if ($logged_user_profile == $hook_data['item']['author-link']) {
                return;
        }

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 7fce4b4e8d5daaf88a563424e834e944ec96246a..c6e3f9f1ef3cc6aca62b78cb3f6017a24065cd21 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -51,7 +51,7 @@ function libertree_settings(&$a,&$s) {
 
     /* 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/libertree/libertree.css' . '" media="all" />' . "\r\n";
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
 
     /* Get the current state of our config variables */
 

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 669788fd6079343e44273caeecec7f09fa4fbe6b..61c96b7dbf1a70eaf7557e0030046081518f0299 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -54,7 +54,7 @@ function ljpost_settings(&$a,&$s) {
 
     /* 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/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
 
     /* Get the current state of our config variables */
 

diff --git a/mahjongg/mahjongg.php b/mahjongg/mahjongg.php
index 3567792b4df645f35878dd817778678c7d2181d0..6d772a9373cb3871fe6d7a1685d2788712f27859 100644 (file)
--- a/mahjongg/mahjongg.php
+++ b/mahjongg/mahjongg.php
@@ -26,7 +26,7 @@ function mahjongg_module() {}
 \r
 function mahjongg_content(&$a) {\r
 \r
-$baseurl = $a->get_baseurl() . '/addon/mahjongg';\r
+$baseurl = $a->getBaseURL() . '/addon/mahjongg';\r
 \r
 $o .= <<< EOT\r
 <br><br>\r

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 7aad5861cdc29399128b34d9fd2d0f4b94c459f3..5d9153d432109bc83f6f2b76f9c4795d233d3f20 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -152,7 +152,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
                return;
        }
        $attachments = [];
-       $baseurl = $a->get_baseurl();
+       $baseurl = $a->getBaseURL();
        preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1);
        preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2);
        foreach (array_merge($matches1[3], $matches2[1]) as $url) {
@@ -289,7 +289,7 @@ function mailstream_send($a, $message_id, $item, $user) {
                $mail->CharSet = 'utf-8';
                $template = get_markup_template('mail.tpl', 'addon/mailstream/');
                $item['body'] = BBCode::convert($item['body']);
-               $item['url'] = $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item['id'];
+               $item['url'] = $a->getBaseURL() . '/display/' . $user['nickname'] . '/' . $item['id'];
                $mail->Body = replace_macros($template, [
                                                 '$upstream' => L10n::t('Upstream'),
                                                 '$local' => L10n::t('Local'),

diff --git a/namethingy/namethingy.php b/namethingy/namethingy.php
index c758fc08af3408edc57b5dc449845b1b01d9b134..f6a717fc8b27cbb74ef0ffc517abbebec9aee03c 100644 (file)
--- a/namethingy/namethingy.php
+++ b/namethingy/namethingy.php
@@ -27,7 +27,7 @@ function namethingy_module() {}
 
 function namethingy_content(&$a) {
 
-$baseurl = $a->get_baseurl() . '/addon/namethingy';
+$baseurl = $a->getBaseURL() . '/addon/namethingy';
 
 $o .= <<< EOT
 <iframe src="http://namethingy.com" width="900" height="700" />

diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 5aff1c96a21622c7dca0be5f4aa54de9bc7bd841..d7f38068c025d5edf06bb5338ced5f4e4de910d9 100644 (file)
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -37,7 +37,7 @@ function newmemberwidget_network_mod_init ($a, $b)
        }
 
        if (Config::get('newmemberwidget','linklocalsupport', false)) {
-               $t .= '<a href="'.$a->get_baseurl().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL;
+               $t .= '<a href="'.$a->getBaseURL().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL;
        }
 
        $ft = Config::get('newmemberwidget','freetext', '');

diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php
index 707eae758182fc0ea18120cfdb4009760bb494ee..6f747ca96730eedbda7ea227002905160900794a 100644 (file)
--- a/notimeline/notimeline.php
+++ b/notimeline/notimeline.php
@@ -41,7 +41,7 @@ function notimeline_settings(&$a, &$s)
 
        /* 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/notimeline/notimeline.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/notimeline/notimeline.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index bb0932496ea4bb1574a5d14c28125a5ae93649d8..77d172cecea8ade75af8e69e36c46b8c81f204bc 100644 (file)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -65,7 +65,7 @@ function nsfw_addon_settings(&$a, &$s)
 
        /* 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/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
 
        $enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
        $words = PConfig::get(local_user(), 'nsfw', 'words');

diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 247c7dc7593e98aa9fa66e4ba42c12e12b7cd55c..0cfea73660342df697eac6fa0d6681097cd7a0c3 100644 (file)
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -58,7 +58,7 @@ function numfriends_settings(&$a, &$s)
 
        /* 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/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 26d51e1a5ebbae398bf1b858ba55df2b6a0d97e2..839483607cc0f566dab07ad6a6c887d760f2d4fb 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -51,7 +51,7 @@ function openstreetmap_load_config(\Friendica\App $a)
 
 function openstreetmap_alterheader($a, &$navHtml)
 {
-       $addScriptTag = '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
+       $addScriptTag = '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
        $a->page['htmlhead'] .= $addScriptTag;
 }
 

diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index eb121fb53638d60cc980ac8e271c63562a29fffd..ce0d6e2bbadbee68e43e491bf2ef0f366fe82237 100644 (file)
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -41,7 +41,7 @@ function pageheader_addon_settings(&$a,&$s) {
 
     /* 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/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
 
 
        $words = Config::get('pageheader','text');
@@ -79,7 +79,7 @@ function pageheader_fetch($a,&$b) {
        }
 
     $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
-        . $a->get_baseurl() . '/addon/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
+        . $a->getBaseURL() . '/addon/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
     
     if(! $s)
         $s = '';

diff --git a/piwik/piwik.php b/piwik/piwik.php
index 5e34e0987b8298e1d1479ab92b1dd423384c97a4..b161382acd2e9a57c42ee04df2b497653ef9fbba 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -60,7 +60,7 @@ function piwik_analytics($a,&$b) {
         *   associated CSS file. We just have to tell Friendica to get it
         *   into the page header.
         */
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/piwik/piwik.css' . '" media="all" />';
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/piwik/piwik.css' . '" media="all" />';
 
        /*
         *   Get the configuration variables from the config/addon.ini.php file.

diff --git a/planets/planets.php b/planets/planets.php
index cb4e7631981fa0e051105ec2bf55e2aec9999320..6a1b787fc4838b2d556ca925114a38747047539a 100644 (file)
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -138,7 +138,7 @@ function planets_settings(&$a,&$s) {
 
        /* 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/planets/planets.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/planets/planets.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/pledgie/pledgie.php b/pledgie/pledgie.php
index 8b736d8b9d48d13a05325d6f8772a9ff374b9f2d..4fd5a6c30e50033f63ff84e2b97af168e51b30cf 100644 (file)
--- a/pledgie/pledgie.php
+++ b/pledgie/pledgie.php
@@ -30,7 +30,7 @@ function pledgie_addon_settings(&$a,&$s) {
 
        /* 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/pledgie/pledgie.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/pledgie/pledgie.css' . '" media="all" />' . "\r\n";
 
        $campaign = Config::get('pledgie-campaign','text');
        $describe = Config::get('pledgie-describe','text');

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 19aca3a86289cef53376d3513c02f279fc0e9ea5..64f9d5d22e94a944afe0ac41326d817ce94d3670 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -69,8 +69,8 @@ function public_server_cron($a, $b)
                                'to_name'      => $rr['username'],
                                'to_email'     => $rr['email'],
                                'source_name'  => L10n::t('Administrator'),
-                               'source_link'  => $a->get_baseurl(),
-                               'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
+                               'source_link'  => $a->getBaseURL(),
+                               'source_photo' => $a->getBaseURL() . '/images/person-80.jpg',
                        ]);
 
                        $fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
@@ -121,7 +121,7 @@ function public_server_enotify(&$a, &$b)
 {
        if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
                && x($b['params'], 'system_type') && $b['params']['system_type'] === 'public_server_expire') {
-               $b['itemlink'] = $a->get_baseurl();
+               $b['itemlink'] = $a->getBaseURL();
                $b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
                $b['subject'] = L10n::t('Your Friendica account is about to expire.');
                $b['body'] = L10n::t("Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days", $b['params']['to_name'], "[url=" . Config::get('system', 'url') . "]" . Config::get('config', 'sitename') . "[/url]");

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 907d928a090cbb550e8fd98a2f506310b109cc1a..4529ccd2df8fec5b22bc889647e9cc77ec761b3e 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -111,8 +111,8 @@ function pumpio_registerclient(App $a, $host)
        $params["contacts"] = $adminlist[0];
        $params["application_type"] = "native";
        $params["application_name"] = $application_name;
-       $params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png";
-       $params["redirect_uris"] = $a->get_baseurl()."/pumpio/connect";
+       $params["logo_url"] = $a->getBaseURL()."/images/friendica-256.png";
+       $params["redirect_uris"] = $a->getBaseURL()."/pumpio/connect";
 
        logger("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG);
 
@@ -163,7 +163,7 @@ function pumpio_connect(App $a)
        }
 
        // The callback URL is the script that gets called after the user authenticates with pumpio
-       $callback_url = $a->get_baseurl()."/pumpio/connect";
+       $callback_url = $a->getBaseURL()."/pumpio/connect";
 
        // Let's begin.  First we need a Request Token.  The request token is required to send the user
        // to pumpio's login page.
@@ -200,7 +200,7 @@ function pumpio_connect(App $a)
        if ($success) {
                logger("pumpio_connect: authenticated");
                $o = L10n::t("You are now authenticated to pumpio.");
-               $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
+               $o .= '<br /><a href="'.$a->getBaseURL().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
        } else {
                logger("pumpio_connect: could not connect");
                $o = 'Could not connect to pumpio. Refresh the page or try again later.';
@@ -233,7 +233,7 @@ function pumpio_settings(App $a, &$s)
 
        /* 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/pumpio/pumpio.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/pumpio/pumpio.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
 
@@ -283,7 +283,7 @@ function pumpio_settings(App $a, &$s)
                $s .= '<div id="pumpio-password-wrapper">';
                if (($oauth_token == "") || ($oauth_token_secret == "")) {
                        $s .= '<div id="pumpio-authenticate-wrapper">';
-                       $s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.L10n::t("Authenticate your pump.io connection").'</a>';
+                       $s .= '<a href="'.$a->getBaseURL().'/pumpio/connect">'.L10n::t("Authenticate your pump.io connection").'</a>';
                        $s .= '</div><div class="clear"></div>';
                } else {
                        $s .= '<div id="pumpio-import-wrapper">';

diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index c499fb868cd744a3ad3b0a8a3e589874969be131..2ce81d991c419bd7bd429410cb61fa4dec1d60a5 100644 (file)
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -41,7 +41,7 @@ function qcomment_addon_settings(&$a, &$s)
 
        /* 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/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
 
        $words = PConfig::get(local_user(), 'qcomment', 'words', L10n::t(':-)') . "\n" . L10n::t(':-(') . "\n" .  L10n::t('lol'));
 

diff --git a/randplace/randplace.php b/randplace/randplace.php
index abf59e2dffd1ab852041109a4734092ede016311..019d6f7666318803f8959709f13ab008ec481d83 100644 (file)
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -157,7 +157,7 @@ function randplace_settings(&$a,&$s) {
 
        /* 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/randplace/randplace.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index 36cf34dab656e610c35740cf5f7b46ae54b9766b..c883c5b89696de73b9fa5a1f777823a9f66a8822 100644 (file)
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -36,7 +36,7 @@ function remote_permissions_settings(&$a,&$o) {
 
        /* 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/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 
@@ -78,7 +78,7 @@ function remote_permissions_content($a, $item_copy) {
                        return;
 
                // Find out if the contact lives here
-               $baseurl = $a->get_baseurl();
+               $baseurl = $a->getBaseURL();
                $baseurl = substr($baseurl, strpos($baseurl, '://') + 3);
                if(strpos($r[0]['url'], $baseurl) === false)
                        return;

diff --git a/showmore/showmore.php b/showmore/showmore.php
index e7140d193637031783157f8b9d6b59eb4c3572f2..8fc9cc91dfd8bbdb8c594f90aefe891b8df61c00 100644 (file)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -33,7 +33,7 @@ function showmore_addon_settings(&$a, &$s)
 
        /* 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/showmore/showmore.css'.'" media="all"/>'."\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
 
        $enable_checked = (intval(PConfig::get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"');
        $chars = PConfig::get(local_user(), 'showmore', 'chars', 1100);

diff --git a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
index 4756638002b5c1ac049725620623163d986e261e..c832fbbaf8afc01829365838bb8309cf8fe6b45c 100644 (file)
--- a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
+++ b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
@@ -30,459 +30,459 @@ function smiley_pack_smilies_es(&$a,&$b) {
 #Animal smileys.
 
        $b['texts'][] = ':conejitoflores';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':conejitoflores' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':conejitoflores' . '" />';
 
        $b['texts'][] = ':pollito';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':pollito' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':pollito' . '" />';
 
        $b['texts'][] = ':abeja';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':abeja' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':abeja' . '" />';
 
        $b['texts'][] = ':mariquita';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':mariquita' . '" />'; 
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':mariquita' . '" />';
 
        $b['texts'][] = ':araña';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araña' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araña' . '" />';
 
        $b['texts'][] = ':gato';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':gato' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':gato' . '" />';
 
        $b['texts'][] = ':conejito';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':conejito' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':conejito' . '" />';
 
        $b['texts'][] = ':vaca';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
     
        $b['texts'][] = ':cangrejo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';      
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
 
        $b['texts'][] = ':delfín';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':delfín' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':delfín' . '" />';
 
        $b['texts'][] = ':libélula';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libélula' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libélula' . '" />';
 
        $b['texts'][] = ':rana';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':rana' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':rana' . '" />';
 
        $b['texts'][] = ':hamster';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
 
        $b['texts'][] = ':mono';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':mono' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':mono' . '" />';
 
        $b['texts'][] = ':caballo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';      
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
   
        $b['texts'][] = ':loro';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
 
        $b['texts'][] = ':tux';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
 
        $b['texts'][] = ':caracol';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':caracol' . '" />';      
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':caracol' . '" />';
 
        $b['texts'][] = ':oveja';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':oveja' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':oveja' . '" />';
 
        $b['texts'][] = ':perro';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':perro' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':perro' . '" />';
 
        $b['texts'][] = ':elefante';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elefante' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elefante' . '" />';
 
        $b['texts'][] = ':pez';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':pez' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':pez' . '" />';
 
        $b['texts'][] = ':jirafa';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':jirafa' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':jirafa' . '" />';
 
        $b['texts'][] = ':cerdo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cerdo' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cerdo' . '" />';
 
 
 
 #Baby Smileys
 
        $b['texts'][] = ':bebé';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bebé' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bebé' . '" />';
 
        $b['texts'][] = ':cuna';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
        
 
        $b['texts'][] = ':embarazada';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />'; 
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
 
        $b['texts'][] = ':cigüeña';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
 
 
 #Confused Smileys      
        $b['texts'][] = ':confundido';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';       
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
     
        $b['texts'][] = ':encogehombros';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';       
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
 
        $b['texts'][] = ':estúpido';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':estúpido' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':estúpido' . '" />';
 
        $b['texts'][] = ':aturdidp';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':aturdid' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':aturdid' . '" />';
 
 
 #Cool Smileys
 
        $b['texts'][] = ':afro';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
 
        $b['texts'][] = ':guay';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':guay' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':guay' . '" />';
 
 #Devil/Angel Smileys
 
        $b['texts'][] = ':ángel';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ángel' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ángel' . '" />';
 
        $b['texts'][] = ':querubín';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':querubín' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':querubín' . '" />';
 
        $b['texts'][] = ':ángeldemonio';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':ángeldemonio' . '" />';       
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':ángeldemonio' . '" />';
 
        $b['texts'][] = ':gatodemonio';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':gatodemonio' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':gatodemonio' . '" />';
 
        $b['texts'][] = ':diabólico';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
        
        $b['texts'][] = ':adbalancín';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
 
        $b['texts'][] = ':vuelvedemonio';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
        
        $b['texts'][] = ':santo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
 
        $b['texts'][] = ':tumba';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tumba' . '" />'; 
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tumba' . '" />';
 
 #Unpleasent smileys.
 
        $b['texts'][] = ':retrete';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':retrete' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':retrete' . '" />';
 
        $b['texts'][] = ':pedoencama';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pedoencama' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pedoencama' . '" />';
 
        $b['texts'][] = ':vómito';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vómito' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vómito' . '" />';
 
        $b['texts'][] = ':pedosonrojo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pedosonrojo' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pedosonrojo' . '" />';
 
 #Drinks
 
        $b['texts'][] = ':té';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':té' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':té' . '" />';
 
        $b['texts'][] = ':baba';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':baba' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':baba' . '" />';
 
 #Sad smileys
 
        $b['texts'][] = ':llorar';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':llorar' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':llorar' . '" />';
 
        $b['texts'][] = ':prisonero';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonero' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonero' . '" />';
 
        $b['texts'][] = ':suspiro';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':suspiro' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':suspiro' . '" />';
 
 #Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
        $b['texts'][] = ':fumar';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fumar' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fumar' . '" />';
 
 #Sport smileys
 
        $b['texts'][] = ':baloncesto';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':baloncesto' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':baloncesto' . '" />';
 
        $b['texts'][] = ':bolos';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bolos' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bolos' . '" />';
 
        $b['texts'][] = ':enbici';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':enbici' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':enbici' . '" />';
 
        $b['texts'][] = ':dardos';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':dardos' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':dardos' . '" />';
 
        $b['texts'][] = ':esgrima';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':esgrima' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':esgrima' . '" />';
 
        $b['texts'][] = ':golf';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
 
        $b['texts'][] = ':malabares';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':malabares' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':malabares' . '" />';
 
        $b['texts'][] = ':comba';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':comba' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':comba' . '" />';
 
        $b['texts'][] = ':tiroconarco';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':tiroconarco' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':tiroconarco' . '" />';
 
        $b['texts'][] = ':fútbol';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':fútbol' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':fútbol' . '" />';
 
        $b['texts'][] = ':surf';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
 
        $b['texts'][] = ':billar';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
   
        $b['texts'][] = ':tenis';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
 
        $b['texts'][] = ':acaballo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':acaballo' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':acaballo' . '" />';
 
 #Love smileys
 
        $b['texts'][] = ':tequiero';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':tequiero' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':tequiero' . '" />';
 
        $b['texts'][] = ':enamorada';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':enamorada' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':enamorada' . '" />';
 
        $b['texts'][] = ':amor';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':amor' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':amor' . '" />';
 
        $b['texts'][] = ':osoamoroso';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':osoamoroso' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':osoamoroso' . '" />';
 
        $b['texts'][] = ':camaamor';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':camaamor' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':camaamor' . '" />';
 
        $b['texts'][] = ':corazónamor';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':corazónamor' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':corazónamor' . '" />';
 
 #Tired/Sleep smileys
 
        $b['texts'][] = ':contandoovejas';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':contandoovejas' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':contandoovejas' . '" />';
 
        $b['texts'][] = ':hamaca';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamaca' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamaca' . '" />';
 
        $b['texts'][] = ':almohada';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':almohada' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':almohada' . '" />';
 
        $b['texts'][] = ':bostezo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bostezo' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bostezo' . '" />';
 
 #Fight/Flame/Violent smileys
 
        $b['texts'][] = ':pistolas';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':pistolas' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':pistolas' . '" />';
 
        $b['texts'][] = ':peleamarciano';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':peleamarciano' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':peleamarciano' . '" />';
 
        $b['texts'][] = ':alfa';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alfa' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alfa' . '" />';
 
        $b['texts'][] = ':ejército';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':ejército' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':ejército' . '" />';
 
        $b['texts'][] = ':cabezaflecha';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':cabezaflecha' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':cabezaflecha' . '" />';
 
        $b['texts'][] = ':bfg';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
 
        $b['texts'][] = ':arquero';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':arquero' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':arquero' . '" />';
 
        $b['texts'][] = ':motosierra';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':motosierra' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':motosierra' . '" />';
 
        $b['texts'][] = ':ballesta';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':ballesta' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':ballesta' . '" />';
 
        $b['texts'][] = ':cruzado';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':cruzado' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':cruzado' . '" />';
 
        $b['texts'][] = ':muerto';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':muerto' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':muerto' . '" />';
 
        $b['texts'][] = ':martillazo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':martillazo' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':martillazo' . '" />';
 
        $b['texts'][] = ':pistolalaser';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistolalaser' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistolalaser' . '" />';
 
        $b['texts'][] = ':metralleta';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':metralleta' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':metralleta' . '" />';
 
        $b['texts'][] = ':marine';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
 
        $b['texts'][] = ':sable';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sable' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sable' . '" />';
 
        $b['texts'][] = ':tanque';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tanque' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tanque' . '" />';
 
        $b['texts'][] = ':vikingo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':vikingo' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':vikingo' . '" />';
 
        $b['texts'][] = ':bandas';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':bandas' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':bandas' . '" />';
 
        $b['texts'][] = ':ácido';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':ácido' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':ácido' . '" />';
 
 #Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
 
        $b['texts'][] = ':alien';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alien' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alien' . '" />';
 
        $b['texts'][] = ':bárbaro';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':bárbaro' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':bárbaro' . '" />';
 
        $b['texts'][] = ':dinosaurio';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaurio' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaurio' . '" />';
 
        $b['texts'][] = ':dragón';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragón' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragón' . '" />';
 
        $b['texts'][] = ':draco';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
 
        $b['texts'][] = ':fantasma';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantasma' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantasma' . '" />';
 
        $b['texts'][] = ':momia';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momia' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momia' . '" />';
 
 #Food smileys
 
        $b['texts'][] = ':mazana';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':mazana' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':mazana' . '" />';
 
        $b['texts'][] = ':brócoli';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brócoli' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brócoli' . '" />';
 
        $b['texts'][] = ':pastel';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':pastel' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':pastel' . '" />';
 
        $b['texts'][] = ':zanahoria';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':zanahoria' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':zanahoria' . '" />';
 
        $b['texts'][] = ':palomitas';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':palomitas' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':palomitas' . '" />';
 
        $b['texts'][] = ':tomate';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
 
        $b['texts'][] = ':plátano';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':plátano' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':plátano' . '" />';
 
        $b['texts'][] = ':cocinar';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cocinar' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cocinar' . '" />';
 
        $b['texts'][] = ':huevofrito';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':huevofrito' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':huevofrito' . '" />';
 
 #Happy smileys
 
        $b['texts'][] = ':cloud9';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/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' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
 
 #Repsect smileys
 
        $b['texts'][] = ':reverencia';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':reverencia' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':reverencia' . '" />';
 
        $b['texts'][] = ':bravo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
 
        $b['texts'][] = ':vivaelrey';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':vivaelrey' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':vivaelrey' . '" />';
 
        $b['texts'][] = ':número1';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':número1' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':número1' . '" />';
 
 #Laugh smileys
 
        $b['texts'][] = ':jajaja';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':jajaja' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':jajaja' . '" />';
 
        $b['texts'][] = ':jajatv';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':jajatv' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':jajatv' . '" />';
 
        $b['texts'][] = ':meparto';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':meparto' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':meparto' . '" />';
 
 #Music smileys
 
        $b['texts'][] = ':dj';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
 
        $b['texts'][] = ':batería';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batería' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batería' . '" />';
 
        $b['texts'][] = ':elvis';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
 
        $b['texts'][] = ':guitarra';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitarra' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitarra' . '" />';
 
        $b['texts'][] = ':trompeta';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompeta' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompeta' . '" />';
 
        $b['texts'][] = ':violín';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violín' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violín' . '" />';
 
 #Smileys that used to be in core
 
        $b['texts'][] = ':cabezagolpe';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezagolpe' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezagolpe' . '" />';
 
                $b['texts'][] = ':barba';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barba' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barba' . '" />';
 
        $b['texts'][] = ':barbablanca';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbablanca' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbablanca' . '" />';
 
        $b['texts'][] = ':saludosurf';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':saludosurf' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':saludosurf' . '" />';
 
        $b['texts'][] = ':\\.../';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/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['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
 
        $b['texts'][] = ':cabezamesa';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezamesa' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezamesa' . '" />';
 
 #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['icons'][] = '<img src="' . $a->getBaseURL() . '/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' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
 
 
 

diff --git a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
index 282c0dde07ae8743527cf6946fe6da09059da182..08ddb034340c03df91df71b9b6146eb802a01afc 100644 (file)
--- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
+++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
@@ -32,378 +32,378 @@ function smiley_pack_fr_smilies(&$a,&$b) {
 #Animal smileys.
 
        $b['texts'][] = ':fleurslapin';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':fleurslapin' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':fleurslapin' . '" />';
 
        $b['texts'][] = ':poussin';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
 
        $b['texts'][] = ':bourdon';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bourdon' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bourdon' . '" />';
 
        $b['texts'][] = ':coccinelle';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':coccinelle' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':coccinelle' . '" />';
 
        $b['texts'][] = ':araignée';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araignée' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araignée' . '" />';
 
        $b['texts'][] = ':chat';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':chat' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':chat' . '" />';
 
        $b['texts'][] = ':lapin';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':lapin' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':lapin' . '" />';
 
        $b['texts'][] = ':poussin';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';      
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
 
        $b['texts'][] = ':vache';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';
     
        $b['texts'][] = ':crabe';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />'; 
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />';
 
        $b['texts'][] = ':dauphin';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dauphin' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dauphin' . '" />';
 
        $b['texts'][] = ':libellule';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libellule' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libellule' . '" />';
 
        $b['texts'][] = ':grenouille';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':grenouille' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':grenouille' . '" />';
 
        $b['texts'][] = ':singe';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':singe' . '" />';       
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':singe' . '" />';
 
        $b['texts'][] = ':cheval';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';       
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';
   
        $b['texts'][] = ':perroquet';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
 
        $b['texts'][] = ':escargot';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':escargot' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':escargot' . '" />';
 
        $b['texts'][] = ':mouton';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':mouton' . '" />';       
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':mouton' . '" />';
 
        $b['texts'][] = ':chien';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':chien' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':chien' . '" />';
 
        $b['texts'][] = ':éléphant';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':éléphant' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':éléphant' . '" />';
 
        $b['texts'][] = ':poisson';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':poisson' . '" />';       
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':poisson' . '" />';
 
        $b['texts'][] = ':girafe';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':girafe' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':girafe' . '" />';
 
        $b['texts'][] = ':cochon';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cochon' . '" />'; 
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cochon' . '" />';
 
 
 
 #Baby Smileys
 
        $b['texts'][] = ':bébé';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bébé' . '" />'; 
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bébé' . '" />';
 
        $b['texts'][] = ':litbébé';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';
        
 
        $b['texts'][] = ':enceinte';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';
 
        $b['texts'][] = ':cigogne';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';       
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';
 
 
 #Confused Smileys      
        $b['texts'][] = ':paumé';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';
     
        $b['texts'][] = ':hausseépaules';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';      
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';
 
        $b['texts'][] = ':stupide';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupide' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupide' . '" />';
 
        $b['texts'][] = ':hébété';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':hébété' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':hébété' . '" />';
 
 
 #Cool Smileys
 
        $b['texts'][] = ':afro';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';    
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
 
 #Devil/Angel Smileys
 
        $b['texts'][] = ':ange';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ange' . '" />';      
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ange' . '" />';
 
        $b['texts'][] = ':chérubin';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':chérubin' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':chérubin' . '" />';
 
        $b['texts'][] = ':démonange';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':démonange' . '" />';  
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':démonange' . '" />';
 
        $b['texts'][] = ':diablechat';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':diablechat' . '" />';     
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':diablechat' . '" />';
 
        $b['texts'][] = ':démoniaque';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';       
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';
        
        $b['texts'][] = ':bascule';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';        
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';
 
        $b['texts'][] = ':possédé';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';      
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
        
        $b['texts'][] = ':tombe';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />'; 
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
 
 #Unpleasent smileys.
 
        $b['texts'][] = ':toilettes';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilettes' . '" />';   
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilettes' . '" />';
 
        $b['texts'][] = ':pèteaulit';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pèteaulit' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pèteaulit' . '" />';
 
        $b['texts'][] = ':pet';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pet' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pet' . '" />';
 
 #Drinks
 
        $b['texts'][] = ':thé';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':thé' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':thé' . '" />';
 
        $b['texts'][] = ':salive';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':salive' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':salive' . '" />';
 
 #Sad smileys
 
        $b['texts'][] = ':pleure';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':pleure' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':pleure' . '" />';
 
        $b['texts'][] = ':prisonnier';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonnier' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonnier' . '" />';
 
        $b['texts'][] = ':soupir';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':soupir' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':soupir' . '" />';
 
 #Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
        $b['texts'][] = ':fume';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fume' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fume' . '" />';
 
 #Sport smileys
 
        $b['texts'][] = ':basket';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basket' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basket' . '" />';
 
        $b['texts'][] = ':vélo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':vélo' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':vélo' . '" />';
 
        $b['texts'][] = ':fléchettes';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':fléchettes' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':fléchettes' . '" />';
 
        $b['texts'][] = ':escrime';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':escrime' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':escrime' . '" />';
 
        $b['texts'][] = ':jonglage';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':jonglage' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':jonglage' . '" />';
 
        $b['texts'][] = ':sautàlacorde';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':sautàlacorde' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':sautàlacorde' . '" />';
 
        $b['texts'][] = ':arc';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':arc' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':arc' . '" />';
 
        $b['texts'][] = ':surf';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
 
        $b['texts'][] = ':billard';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
   
        $b['texts'][] = ':équitation';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
 
 #Love smileys
 
        $b['texts'][] = ':jetaime';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':jetaime' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':jetaime' . '" />';
 
        $b['texts'][] = ':amoureux';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':amoureux' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':amoureux' . '" />';
 
        $b['texts'][] = ':oursamour';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':oursamour' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':oursamour' . '" />';
 
        $b['texts'][] = ':amourlit';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':amourlit' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':amourlit' . '" />';
 
        $b['texts'][] = ':coeur';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':coeur' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':coeur' . '" />';
 
 #Tired/Sleep smileys
 
        $b['texts'][] = ':comptemoutons';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':comptemoutons' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':comptemoutons' . '" />';
 
        $b['texts'][] = ':hamac';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamac' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamac' . '" />';
 
        $b['texts'][] = ':oreiller';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':oreiller' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':oreiller' . '" />';
 
        $b['texts'][] = ':bâille';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bâille' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bâille' . '" />';
 
 #Fight/Flame/Violent smileys
 
        $b['texts'][] = ':2pistolets';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2pistolets' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2pistolets' . '" />';
 
        $b['texts'][] = ':combatalien';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':combatalien' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':combatalien' . '" />';
 
        $b['texts'][] = ':armée';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':armée' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':armée' . '" />';
 
        $b['texts'][] = ':flèche';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':flèche' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':flèche' . '" />';
 
        $b['texts'][] = ':bfg';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
 
        $b['texts'][] = ':archer';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':archer' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':archer' . '" />';
 
        $b['texts'][] = ':tronçonneuse';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':tronçonneuse' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':tronçonneuse' . '" />';
 
        $b['texts'][] = ':arbalète';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':arbalète' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':arbalète' . '" />';
 
        $b['texts'][] = ':croisé';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':croisé' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':croisé' . '" />';
 
        $b['texts'][] = ':mort';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':mort' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':mort' . '" />';
 
        $b['texts'][] = ':marteau';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':marteau' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':marteau' . '" />';
 
        $b['texts'][] = ':pistoletlaser';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistoletlaser' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistoletlaser' . '" />';
 
        $b['texts'][] = ':mitrailleuse';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':mitrailleuse' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':mitrailleuse' . '" />';
 
        $b['texts'][] = ':acide';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acide' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acide' . '" />';
 
 #Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
 
        $b['texts'][] = ':monstrealien';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':monstrealien' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':monstrealien' . '" />';
 
        $b['texts'][] = ':barbare';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbare' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbare' . '" />';
 
        $b['texts'][] = ':dinosaure';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaure' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaure' . '" />';
 
        $b['texts'][] = ':petitdragon';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':petitdragon' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':petitdragon' . '" />';
 
        $b['texts'][] = ':fantôme';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantôme' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantôme' . '" />';
 
        $b['texts'][] = ':momie';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momie' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momie' . '" />';
 
 #Food smileys
 
        $b['texts'][] = ':pomme';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':pomme' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':pomme' . '" />';
 
        $b['texts'][] = ':brocoli';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocoli' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocoli' . '" />';
 
        $b['texts'][] = ':gâteau';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':gâteau' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':gâteau' . '" />';
 
        $b['texts'][] = ':carotte';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carotte' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carotte' . '" />';
 
        $b['texts'][] = '~popcorn';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . '~popcorn' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . '~popcorn' . '" />';
 
        $b['texts'][] = ':tomate';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
 
        $b['texts'][] = ':banane';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banane' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banane' . '" />';
 
        $b['texts'][] = ':cuisine';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cuisine' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cuisine' . '" />';
 
        $b['texts'][] = ':oeufauplat';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':oeufauplat' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':oeufauplat' . '" />';
 
 #Happy smileys
 
        $b['texts'][] = ':nuage';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':nuage' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':nuage' . '" />';
 
        $b['texts'][] = ':larmesdejoie';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':larmesdejoie' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':larmesdejoie' . '" />';
 
 #Repsect smileys
 
        $b['texts'][] = ':courbette';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':courbette' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':courbette' . '" />';
 
        $b['texts'][] = ':bravo';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
 
        $b['texts'][] = ':viveleroi';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':viveleroi' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':viveleroi' . '" />';
 
        $b['texts'][] = ':numéro1';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':numéro1' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':numéro1' . '" />';
 
 #Laugh smileys
 
 #Music smileys
 
        $b['texts'][] = ':batterie';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batterie' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batterie' . '" />';
 
        $b['texts'][] = ':guitare';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitare' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitare' . '" />';
 
        $b['texts'][] = ':trompette';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompette' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompette' . '" />';
 
        $b['texts'][] = ':violon';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violon' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violon' . '" />';
 
 #Smileys that used to be in core
 
        $b['texts'][] = ':cognetête';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cognetête' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cognetête' . '" />';
 
                $b['texts'][] = ':barbu';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barbu' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barbu' . '" />';
 
        $b['texts'][] = ':barbeblanche';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbeblanche' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbeblanche' . '" />';
 
        $b['texts'][] = ':tête';
-       $b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':tête' . '" />';
+       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':tête' . '" />';
 
 }

diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index ea3490ebb3bbe21a92d63702af13bbcaea78675a..a373c6253334f63d8a91d79ad46c16681be18929 100644 (file)
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -31,466 +31,466 @@ function smiley_pack_smilies(&$a,&$b) {
 #Animal smileys.
 
        $b['texts'][] = ':bunnyflowers';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
 
        $b['texts'][] = ':chick';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';
 
        $b['texts'][] = ':bumblebee';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee' . '" />';     
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee' . '" />';
 
        $b['texts'][] = ':ladybird';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird' . '" />';   
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird' . '" />';
 
        $b['texts'][] = ':bigspider';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider' . '" />'; 
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider' . '" />';
 
        $b['texts'][] = ':cat';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat' . '" />';     
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat' . '" />';
 
        $b['texts'][] = ':bunny';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny' . '" />'; 
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny' . '" />';
 
        $b['texts'][] = ':cow';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow' . '" />';     
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow' . '" />';
     
        $b['texts'][] = ':crab';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab' . '" />';   
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab' . '" />';
 
        $b['texts'][] = ':dolphin';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin' . '" />';     
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin' . '" />';
 
        $b['texts'][] = ':dragonfly';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly' . '" />'; 
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly' . '" />';
 
        $b['texts'][] = ':frog';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog' . '" />';   
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog' . '" />';
 
        $b['texts'][] = ':hamster';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';     
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
 
        $b['texts'][] = ':monkey';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey' . '" />';       
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey' . '" />';
 
        $b['texts'][] = ':horse';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse' . '" />'; 
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse' . '" />';
   
        $b['texts'][] = ':parrot';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot' . '" />';       
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot' . '" />';
 
        $b['texts'][] = ':tux';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';     
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
 
        $b['texts'][] = ':snail';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail' . '" />'; 
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail' . '" />';
 
        $b['texts'][] = ':sheep';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep' . '" />'; 
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep' . '" />';
 
        $b['texts'][] = ':dog';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';     
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';
 
        $b['texts'][] = ':elephant';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant' . '" />';   
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant' . '" />';
 
        $b['texts'][] = ':fish';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish' . '" />';   
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish' . '" />';
 
        $b['texts'][] = ':giraffe';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe' . '" />';     
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe' . '" />';
 
        $b['texts'][] = ':pig';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig' . '" />';     
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig' . '" />';
 
 
 
 #Baby Smileys
 
        $b['texts'][] = ':baby';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';    
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';
 
        $b['texts'][] = ':babycot';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot' . '" />';      
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot' . '" />';
        
 
        $b['texts'][] = ':pregnant';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant' . '" />';    
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant' . '" />';
 
        $b['texts'][] = ':stork';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />';  
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />';
 
 
 #Confused Smileys      
        $b['texts'][] = ':confused';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />';  
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />';
     
        $b['texts'][] = ':shrug';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug' . '" />';        
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug' . '" />';
 
        $b['texts'][] = ':stupid';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';      
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';
 
        $b['texts'][] = ':dazed';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';        
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';
 
 
 #Cool Smileys
 
        $b['texts'][] = ':affro';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';    
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';
 
 #Devil/Angel Smileys
 
        $b['texts'][] = ':angel';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';      
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';
 
        $b['texts'][] = ':cherub';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub' . '" />';    
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub' . '" />';
 
        $b['texts'][] = ':devilangel';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel' . '" />';   
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel' . '" />';
 
        $b['texts'][] = ':catdevil';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil' . '" />';        
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil' . '" />';
 
        $b['texts'][] = ':devillish';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish' . '" />';  
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish' . '" />';
        
        $b['texts'][] = ':daseesaw';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';        
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';
 
        $b['texts'][] = ':turnevil';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';        
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';
        
        $b['texts'][] = ':saint';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';      
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';
 
        $b['texts'][] = ':graveside';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';      
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';
 
 #Unpleasent smileys.
 
        $b['texts'][] = ':toilet';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';       
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';
 
        $b['texts'][] = ':fartinbed';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed' . '" />';
 
        $b['texts'][] = ':fartblush';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
 
 #Drinks
 
        $b['texts'][] = ':tea';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea' . '" />';
 
        $b['texts'][] = ':drool';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool' . '" />';
 
 #Sad smileys
 
        $b['texts'][] = ':crying';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying' . '" />';
 
        $b['texts'][] = ':prisoner';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
 
        $b['texts'][] = ':sigh';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh' . '" />';
 
 #Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
        $b['texts'][] = ':smoking';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
 
 #Sport smileys
 
        $b['texts'][] = ':basketball';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
 
        $b['texts'][] = '~bowling';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . '~bowling' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . '~bowling' . '" />';
 
        $b['texts'][] = ':cycling';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling' . '" />';
 
        $b['texts'][] = ':darts';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts' . '" />';
 
        $b['texts'][] = ':fencing';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing' . '" />';
 
        $b['texts'][] = ':juggling';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling' . '" />';
 
        $b['texts'][] = ':skipping';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
 
        $b['texts'][] = ':archery';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
 
        $b['texts'][] = ':surfing';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
 
        $b['texts'][] = ':snooker';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
   
        $b['texts'][] = ':horseriding';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
 
 #Love smileys
 
        $b['texts'][] = ':iloveyou';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
 
        $b['texts'][] = ':inlove';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove' . '" />';
 
        $b['texts'][] = '~love';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
 
        $b['texts'][] = ':lovebear';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear' . '" />';
 
        $b['texts'][] = ':lovebed';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed' . '" />';
 
        $b['texts'][] = ':loveheart';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
 
 #Tired/Sleep smileys
 
        $b['texts'][] = ':countsheep';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
 
        $b['texts'][] = ':hammock';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock' . '" />';
 
        $b['texts'][] = ':pillow';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
 
        $b['texts'][] = ':yawn';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn' . '" />';
 
 #Fight/Flame/Violent smileys
 
        $b['texts'][] = ':2guns';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
 
        $b['texts'][] = ':alienfight';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
 
        $b['texts'][] = ':army';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
 
        $b['texts'][] = ':arrowhead';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead' . '" />';
 
        $b['texts'][] = ':bfg';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
 
        $b['texts'][] = ':bowman';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman' . '" />';
 
        $b['texts'][] = ':chainsaw';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw' . '" />';
 
        $b['texts'][] = ':crossbow';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow' . '" />';
 
        $b['texts'][] = ':crusader';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader' . '" />';
 
        $b['texts'][] = ':dead';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead' . '" />';
 
        $b['texts'][] = ':hammersplat';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat' . '" />';
 
        $b['texts'][] = ':lasergun';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun' . '" />';
 
        $b['texts'][] = ':machinegun';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
 
        $b['texts'][] = ':acid';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/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 class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
 
        $b['texts'][] = ':barbarian';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian' . '" />';
 
        $b['texts'][] = ':dinosaur';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur' . '" />';
 
        $b['texts'][] = ':dragon';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
 
        $b['texts'][] = ':draco';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
 
        $b['texts'][] = ':ghost';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
 
        $b['texts'][] = ':mummy';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
 
 #Food smileys
 
        $b['texts'][] = ':apple';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
 
        $b['texts'][] = ':broccoli';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli' . '" />';
 
        $b['texts'][] = ':cake';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake' . '" />';
 
        $b['texts'][] = ':carrot';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot' . '" />';
 
        $b['texts'][] = ':popcorn';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
 
        $b['texts'][] = ':tomato';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
 
        $b['texts'][] = ':banana';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana' . '" />';
 
        $b['texts'][] = ':cooking';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
 
        $b['texts'][] = ':fryegg';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
 
        $b['texts'][] = ':birthdaycake';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake' . '" />';
 
 #Happy smileys
 
        $b['texts'][] = ':cloud9';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
 
        $b['texts'][] = ':tearsofjoy';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
 
 #Repsect smileys
 
        $b['texts'][] = ':bow';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
 
        $b['texts'][] = ':bravo';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
 
        $b['texts'][] = ':hailking';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking' . '" />';
 
        $b['texts'][] = ':number1';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
 
 #Laugh smileys
 
        $b['texts'][] = ':hahaha';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
 
        $b['texts'][] = ':loltv';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
 
        $b['texts'][] = ':rofl';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
 
 #Music smileys
 
        $b['texts'][] = ':drums';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
 
 
        $b['texts'][] = ':guitar';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
 
        $b['texts'][] = ':trumpet';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet' . '" />';
 
 #Smileys that used to be in core
 
        $b['texts'][] = ':headbang';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
 
                $b['texts'][] = ':beard';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
 
        $b['texts'][] = ':whitebeard';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
 
        $b['texts'][] = ':shaka';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
 
        $b['texts'][] = ':\\.../';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
 
        $b['texts'][] = ':\\ooo/';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
 
        $b['texts'][] = ':headdesk';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headdesk' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.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 class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
 
        $b['texts'][] = ':-o';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
 
 # Regex killers - stick these at the bottom so they appear at the end of the English and 
 # at the start of $OtherLanguage.
 
        $b['texts'][] = ':cool';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';      
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';
 
        $b['texts'][] = ':vomit';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
 
        $b['texts'][] = ':golf';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
        
        $b['texts'][] = ':football';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
 
        $b['texts'][] = ':tennis';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
 
        $b['texts'][] = ':alpha';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
 
        $b['texts'][] = ':marine';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
 
        $b['texts'][] = ':sabre';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
 
        $b['texts'][] = ':tank';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
 
        $b['texts'][] = ':viking';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
 
        $b['texts'][] = ':gangs';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
 
 
        $b['texts'][] = ':dj';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
 
 
        $b['texts'][] = ':elvis';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
 
        $b['texts'][] = ':violin';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
 }

diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index f613d2902d452ad0ba337dbbabe929db141629fe..e5aaef9c9cd1a06fef0af50a29b8718867dd7f76 100644 (file)
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -69,29 +69,29 @@ function show_button(Friendica\App $a, &$b) {
        ];
 
        $icons = [
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-kiss.gif" alt=":-X" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-laughing.gif" alt=":-D" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt=":-O" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O_o" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-cry.gif" alt=":\'(" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-undecided.gif" alt=":-/" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-embarassed.gif" alt=":-[" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-cool.gif" alt="8-)" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":beer" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" />',
-               '<img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" />'
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-heart.gif" alt="<3" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-brokenheart.gif" alt="</3" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-smile.gif" alt=":-)" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-wink.gif" alt=";-)" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-frown.gif" alt=":-(" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-tongue-out.gif" alt=":-P" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-kiss.gif" alt=":-X" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-laughing.gif" alt=":-D" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-surprised.gif" alt=":-O" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-Oo.gif" alt="O_o" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-cry.gif" alt=":\'(" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-undecided.gif" alt=":-/" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-embarassed.gif" alt=":-[" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-cool.gif" alt="8-)" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/beer_mug.gif" alt=":beer" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/coffee.gif" alt=":coffee" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/like.gif" alt=":like" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/dislike.gif" alt=":dislike" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/friendica-16.png" alt="~friendica" />',
+               '<img class="smiley" src="' . $a->getBaseURL() . '/images/rhash-16.png" alt="red" />'
        ];
 
        // Call hooks to get aditional smileies from other addons
@@ -115,7 +115,7 @@ function show_button(Friendica\App $a, &$b) {
        $css_file = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.css';
        if (! file_exists($css_file))
                $css_file = 'addon/smileybutton/view/default.css';
-       $css_url = $a->get_baseurl().'/'.$css_file;
+       $css_url = $a->getBaseURL().'/'.$css_file;
 
        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$css_url.'" media="all" />'."\r\n";
 
@@ -124,7 +124,7 @@ function show_button(Friendica\App $a, &$b) {
        $image = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.png';
        if (! file_exists($image))
                $image = 'addon/smileybutton/view/default.png';
-       $image_url = $a->get_baseurl().'/'.$image;
+       $image_url = $a->getBaseURL().'/'.$image;
 
        //Add the hmtl and script to the page
        $b = <<< EOT

diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php
index bb673f23de8ddfe14f46f4d45d2c83b59ed41cfd..b12cf615849b2e18a37a63bb86b86469fa9b5b02 100644 (file)
--- a/smilies_adult/smilies_adult.php
+++ b/smilies_adult/smilies_adult.php
@@ -23,21 +23,21 @@ function smilies_adult_uninstall() {
 function smilies_adult_smilies(&$a,&$b) {
 
        $b['texts'][] = '(o)(o)';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
 
        $b['texts'][] = '(.)(.)';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
 
        $b['texts'][] = ':bong';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smilies_adult/icons/bong.gif' . '" alt="' . ':bong' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/bong.gif' . '" alt="' . ':bong' . '" />';
 
        $b['texts'][] = ':sperm';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smilies_adult/icons/sperm.gif' . '" alt="' . ':sperm' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/sperm.gif' . '" alt="' . ':sperm' . '" />';
 
        $b['texts'][] = ':drunk';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smilies_adult/icons/drunk.gif' . '" alt="' . ':drunk' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/drunk.gif' . '" alt="' . ':drunk' . '" />';
 
        $b['texts'][] = ':finger';
-       $b['icons'][] = '<img class="smiley" src="' . $a->get_baseurl() . '/addon/smilies_adult/icons/finger.gif' . '" alt="' . ':finger' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/finger.gif' . '" alt="' . ':finger' . '" />';
 
 }
\ No newline at end of file

diff --git a/sniper/sniper.php b/sniper/sniper.php
index ffebedb3031e70749174290cb294fd18c1d97446..751aa53b2c05e943c4ca7fbe102bef20a0260ad6 100644 (file)
--- a/sniper/sniper.php
+++ b/sniper/sniper.php
@@ -29,7 +29,7 @@ function sniper_module() {}
 
 function sniper_content(&$a) {
 
-$baseurl = $a->get_baseurl() . '/addon/sniper';
+$baseurl = $a->getBaseURL() . '/addon/sniper';
 
 $o .= <<< EOT
 <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="620" height="480" id="hotshotsniper" align="middle">

diff --git a/startpage/startpage.php b/startpage/startpage.php
index 00079f9c165066c9e55f17e15aa08b709fd740d9..14b8abbb7aa72fcf1307d15168e94960969102d9 100644 (file)
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -70,7 +70,7 @@ function startpage_settings(&$a, &$s)
 
        /* 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/startpage/startpage.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index cf5eec289d1a980033539b074d22ee74f62d3292..08c2645bce1204ba7e304d7ccc3f32ee2bad9716 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -231,7 +231,7 @@ function statusnet_settings(App $a, &$s)
        if (!local_user()) {
                return;
        }
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/statusnet/statusnet.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/statusnet/statusnet.css' . '" media="all" />' . "\r\n";
        /*       * *
         * 1) Check that we have a base api url and a consumer key & secret
         * 2) If no OAuthtoken & stuff is present, generate button to get some
@@ -687,7 +687,7 @@ function statusnet_prepare_body(App $a, &$b)
                }
 
                $item = $b["item"];
-               $item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
+               $item["plink"] = $a->getBaseURL() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
 
                $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()];
                $orig_post = Item::selectFirst(['author-link', 'uri'], $condition);
@@ -1488,7 +1488,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
                        if ($mtch[1] == "#") {
                                // Replacing the hash tags that are directed to the GNU Social server with internal links
                                $snhash = "#[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
-                               $frdchash = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($mtch[3]) . ']' . $mtch[3] . '[/url]';
+                               $frdchash = '#[url=' . $a->getBaseURL() . '/search?tag=' . rawurlencode($mtch[3]) . ']' . $mtch[3] . '[/url]';
                                $body = str_replace($snhash, $frdchash, $body);
 
                                $str_tags .= $frdchash;

diff --git a/superblock/superblock.php b/superblock/superblock.php
index 5d4b93fe45d0fe64dd0a6cbf4cf27b565c466849..8e42d4737e380b93ccff684ba6bee89e1fd7b0ac 100644 (file)
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -36,7 +36,7 @@ function superblock_addon_settings(&$a, &$s)
 
        /* 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/superblock/superblock.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
 
        $words = PConfig::get(local_user(), 'system', 'blocked');
        if (!$words) {

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index e67479df894aa568cf6141a2c0594fdb24566254..2a65692885b24b0e19f025a329b0299ac269017a 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -76,8 +76,8 @@ function testdrive_cron($a,$b) {
                                'to_name'      => $rr['username'],
                                'to_email'     => $rr['email'],
                                'source_name'  => L10n::t('Administrator'),
-                               'source_link'  => $a->get_baseurl(),
-                               'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
+                               'source_link'  => $a->getBaseURL(),
+                               'source_photo' => $a->getBaseURL() . '/images/person-80.jpg',
                        ]);
 
                        q("update user set expire_notification_sent = '%s' where uid = %d",
@@ -99,7 +99,7 @@ function testdrive_cron($a,$b) {
 function testdrive_enotify(&$a, &$b) {
     if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
                && x($b['params'], 'system_type') && $b['params']['system_type'] === 'testdrive_expire') {
-        $b['itemlink'] = $a->get_baseurl();
+        $b['itemlink'] = $a->getBaseURL();
         $b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
         $b['subject'] = L10n::t('Your Friendica test account is about to expire.');
         $b['body'] = L10n::t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".Config::get('system', 'url')."]".Config::get('config', 'sitename')."[/url]", get_server());

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index dc3d9db1c5dca4086a3524f123b9eb1482654b7f..5862958de77a29a3e41e3b3a251a9ff0ce288902 100644 (file)
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -104,7 +104,7 @@ function tumblr_connect(App $a)
 
        // The callback URL is the script that gets called after the user authenticates with tumblr
        // In this example, it would be the included callback.php
-       $callback_url = $a->get_baseurl()."/tumblr/callback";
+       $callback_url = $a->getBaseURL()."/tumblr/callback";
 
        // Let's begin.  First we need a Request Token.  The request token is required to send the user
        // to Tumblr's login page.
@@ -183,7 +183,7 @@ function tumblr_callback(App $a)
        PConfig::set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
 
        $o = L10n::t("You are now authenticated to tumblr.");
-       $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
+       $o .= '<br /><a href="'.$a->getBaseURL().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
 
        return $o;
 }
@@ -212,7 +212,7 @@ function tumblr_settings(App $a, &$s)
 
        /* 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/tumblr/tumblr.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/tumblr/tumblr.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
 
@@ -235,7 +235,7 @@ function tumblr_settings(App $a, &$s)
        $s .= '</span>';
 
        $s .= '<div id="tumblr-username-wrapper">';
-       $s .= '<a href="'.$a->get_baseurl().'/tumblr/connect">'.L10n::t("(Re-)Authenticate your tumblr page").'</a>';
+       $s .= '<a href="'.$a->getBaseURL().'/tumblr/connect">'.L10n::t("(Re-)Authenticate your tumblr page").'</a>';
        $s .= '</div><div class="clear"></div>';
 
        $s .= '<div id="tumblr-enable-wrapper">';

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 4c54364e73c009573b6e2c90804bb698511e0f16..54c330c76e35aae8989dd80366c1b8e2ad1aba55 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -282,7 +282,7 @@ function twitter_settings(App $a, &$s)
        if (!local_user()) {
                return;
        }
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
        /*       * *
         * 1) Check that we have global consumer key & secret
         * 2) If no OAuthtoken & stuff is present, generate button to get some
@@ -765,7 +765,7 @@ function twitter_prepare_body(App $a, array &$b)
        if ($b["preview"]) {
                $max_char = 280;
                $item = $b["item"];
-               $item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
+               $item["plink"] = $a->getBaseURL() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
 
                $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()];
                $orig_post = Item::selectFirst(['author-link'], $condition);
@@ -1138,7 +1138,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
        $tags_arr = [];
 
        foreach ($item->entities->hashtags AS $hashtag) {
-               $url = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($hashtag->text) . ']' . $hashtag->text . '[/url]';
+               $url = '#[url=' . $a->getBaseURL() . '/search?tag=' . rawurlencode($hashtag->text) . ']' . $hashtag->text . '[/url]';
                $tags_arr['#' . $hashtag->text] = $url;
                $body = str_replace('#' . $hashtag->text, $url, $body);
        }
@@ -1269,7 +1269,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
                                }
 
                                $basetag = str_replace('_', ' ', substr($tag, 1));
-                               $url = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+                               $url = '#[url=' . $a->getBaseURL() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
                                $body = str_replace($tag, $url, $body);
                                $tags_arr['#' . $basetag] = $url;
                        } elseif (strpos($tag, '@') === 0) {

diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index ab5d3afab8ce6971417d97eecf8f8754efcab27f..5d00888ba378c876ec8b26436b8c23d9ec6446e3 100644 (file)
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -52,10 +52,10 @@ function viewsrc_item_photo_menu(&$a, &$b)
                $item_id = $b['item']['id'];
        }
 
-       $b['menu'] = array_merge([L10n::t('View Source') => $a->get_baseurl() . '/viewsrc/'. $item_id], $b['menu']);
+       $b['menu'] = array_merge([L10n::t('View Source') => $a->getBaseURL() . '/viewsrc/'. $item_id], $b['menu']);
 
        //if((! local_user()) || (local_user() != $b['item']['uid']))
        //      return;
 
-       //$b['menu'] = array_merge(array(L10n::t('View Source') => $a->get_baseurl() . '/viewsrc/'. $b['item']['id']), $b['menu']);
+       //$b['menu'] = array_merge(array(L10n::t('View Source') => $a->getBaseURL() . '/viewsrc/'. $b['item']['id']), $b['menu']);
 }

diff --git a/widgets/widget_friendheader.php b/widgets/widget_friendheader.php
index f8033667563656f08a92cde29d1980ded0bd7410..df03419f4086278b83f50e5edef65259b3c237e0 100644 (file)
--- a/widgets/widget_friendheader.php
+++ b/widgets/widget_friendheader.php
@@ -46,7 +46,7 @@ function friendheader_widget_content(&$a, $conf)
 
        </style>";
        $o .= _abs_url(contact_block());
-       $o .= "<a href='".$a->get_baseurl().'/profile/'.$a->profile['nickname']."' target=new>". L10n::t('Get added to this list!') ."</a>";
+       $o .= "<a href='".$a->getBaseURL().'/profile/'.$a->profile['nickname']."' target=new>". L10n::t('Get added to this list!') ."</a>";
 
        return $o;
 }

diff --git a/widgets/widget_friends.php b/widgets/widget_friends.php
index b5a078861e949f0229f63bd26f83f98b40e8ccc6..36212713d253715a8f32f378f8de9ef7b2010e4d 100644 (file)
--- a/widgets/widget_friends.php
+++ b/widgets/widget_friends.php
@@ -48,6 +48,6 @@ function friends_widget_content(&$a, $conf)
 
        </style>";
        $o .= _abs_url(contact_block());
-       $o .= "<a href='".$a->get_baseurl().'/profile/'.$a->profile['nickname']."'>". L10n::t('Connect on Friendica!') ."</a>";
+       $o .= "<a href='".$a->getBaseURL().'/profile/'.$a->profile['nickname']."'>". L10n::t('Connect on Friendica!') ."</a>";
        return $o;
 }

diff --git a/widgets/widget_like.php b/widgets/widget_like.php
index deb4d261b5c447774eff9104ae5c231d1d931ec3..238d15ad994721a91d4d67289411139312a717df 100644 (file)
--- a/widgets/widget_like.php
+++ b/widgets/widget_like.php
@@ -64,7 +64,7 @@ function like_widget_content(&$a, $conf){
                '$dislike'      => $dislikes,
                '$strdislike'=> L10n::tt("%d person doesn't like this", "%d people don't like this", $dislikes),
 
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => $a->getBaseURL(),
        ]);
 
        return $o;

diff --git a/widgets/widgets.php b/widgets/widgets.php
index f116dccdc5a30a4a52550350fd0015c475ccd458..5cb8a2797c64c34d247ece083b58fe1c735aa5c8 100644 (file)
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -60,7 +60,7 @@ function widgets_settings(&$a,&$o) {
        $t = get_markup_template("settings.tpl", "addon/widgets/");
        $o .= replace_macros($t, [
                '$submit' => L10n::t('Generate new key'),
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => $a->getBaseURL(),
                '$title' => "Widgets",
                '$label' => L10n::t('Widgets key'),
                '$key' => $key,
@@ -76,7 +76,7 @@ function widgets_module() {
 
 function _abs_url($s){
        $a = get_app();
-       return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->get_baseurl()."/\$2", $s);
+       return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->getBaseURL()."/\$2", $s);
 }
 
 function _randomAlphaNum($length){
@@ -126,7 +126,7 @@ function widgets_content(&$a) {
                if (isset($_GET['p']) && local_user()==$conf['uid'] ) {
                        $o .= "<style>.f9k_widget { float: left;border:1px solid black; }</style>";
                        $o .= "<h1>Preview Widget</h1>";
-                       $o .= '<a href="'.$a->get_baseurl().'/settings/addon">'. L10n::t("Addon Settings") .'</a>';
+                       $o .= '<a href="'.$a->getBaseURL().'/settings/addon">'. L10n::t("Addon Settings") .'</a>';
 
                        $o .=  "<h4>".call_user_func($a->argv[1].'_widget_name')."</h4>";
                        $o .=  call_user_func($a->argv[1].'_widget_help');
@@ -142,10 +142,10 @@ function widgets_content(&$a) {
 
                $script = file_get_contents(dirname(__file__)."/widgets.js");
                $o .= replace_macros($script, [
-                       '$entrypoint' => $a->get_baseurl()."/widgets/".$a->argv[1]."/cb/",
+                       '$entrypoint' => $a->getBaseURL()."/widgets/".$a->argv[1]."/cb/",
                        '$key' => $conf['key'],
                        '$widget_id' => 'f9a_'.$a->argv[1]."_"._randomAlphaNum(6),
-                       '$loader' => $a->get_baseurl()."/images/rotator.gif",
+                       '$loader' => $a->getBaseURL()."/images/rotator.gif",
                        '$args' => (isset($_GET['a'])?$_GET['a']:''),
                        '$width' => $widget_size[0],
                        '$height' => $widget_size[1],
@@ -163,7 +163,7 @@ function widgets_content(&$a) {
                        <h4>Copy and paste this code</h4>
                        <code>"
 
-                       .htmlspecialchars('<script src="'.$a->get_baseurl().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
+                       .htmlspecialchars('<script src="'.$a->getBaseURL().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
                        .$jsargs
                        .htmlspecialchars('"></script>')
                        ."</code>";

diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index c3f5ff151b0b0e1214424a3b8172af9f32d4da35..589d222322a45d6e96c6a811004184b8139c7ab4 100644 (file)
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -105,7 +105,7 @@ function windowsphonepush_settings(&$a, &$s)
        }
 
        /* 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/windowsphonepush/windowsphonepush.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/windowsphonepush/windowsphonepush.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
        $enabled = PConfig::get(local_user(), 'windowsphonepush', 'enable');

diff --git a/wppost/wppost.php b/wppost/wppost.php
index 45b48993ff545a61433f97bb8911b0a8bd4cab8d..d3e219498300e757df16c1675ca444c45ea38f2b 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -58,7 +58,7 @@ function wppost_settings(&$a,&$s) {
 
        /* 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/wppost/wppost.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/wppost/wppost.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */
 

diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index e589f9229706e21e80ea1ce63d19c25200b58118..0f8d4b1c18ae1eab6661f6b1689072ee4f581edd 100644 (file)
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -49,7 +49,7 @@ function xmpp_addon_settings(App $a, &$s)
 
        /* Add our stylesheet to the xmpp so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/xmpp/xmpp.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/xmpp/xmpp.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */