Update obsolete App::getBaseUrl calls to DI::baseUrl

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 5c9b4454fbb1c531b7f3771e34f23bc235bb01f9..dd48e7403cb67b91672189841dbc35fbee8a4607 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -10,6 +10,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 
 function fromapp_install()
 {
@@ -48,7 +49,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->getBaseURL() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/gnot/gnot.php b/gnot/gnot.php
index 2168f97a2f17b3b8baaccd963639810f9e755c18..46012e5eaeadcb8eddbf2e93c95cd5c3fd12aa69 100644 (file)
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -12,6 +12,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function gnot_install() {
 
@@ -69,7 +70,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->getBaseURL() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/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 47768df2d7a5f25233e6c2198964c5c553d97785..6d14b6f5f851138e2851275bbc8b801a0230f4a3 100644 (file)
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -9,6 +9,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 
 function group_text_install() {
 
@@ -64,7 +65,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->getBaseURL() . '/addon/group_text/group_text.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/group_text/group_text.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 020dd22193b9a7bca76d320694a3710305bd4221..1ba936a22cbc90d90578351e753d933612c0be1e 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -13,6 +13,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
@@ -61,7 +62,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->getBaseURL() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/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 b943fd9fd302f1bac0269e3a4e5b2c30480db76e..0bc4d6e3c748159319ab46b32f6a19e63026111a 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -47,7 +47,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->getBaseURL().'/addon/impressum/impressum.css" media="all" />';
+        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/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 a71fe6518f2bf69f001849367da57a932ef18f93..0450a7c734bd7e575433c613a2f24fd16fefb5e0 100644 (file)
--- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
+++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
@@ -7,6 +7,7 @@
 */
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\DI;
 
 function infiniteimprobabilitydrive_install()
 {
@@ -32,13 +33,13 @@ function infiniteimprobabilitydrive_module()
 
 function infiniteimprobabilitydrive_content(&$a)
 {
-       $baseurl = $a->getBaseURL() . '/addon/infiniteimprobabilitydrive';
+       $baseurl = DI::baseUrl()->get() . '/addon/infiniteimprobabilitydrive';
        $o = '';
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
+       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
 
 
-       $baseurl = $a->getBaseURL();
+       $baseurl = DI::baseUrl()->get();
 
        $o .= <<< EOT
 

diff --git a/irc/irc.php b/irc/irc.php
index d02b2cbdfe43b31e5dfcd555bd6179e387f6eb76..d7eaed629265a433aff4ce76a1c06693dc7f87d9 100644 (file)
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -12,6 +12,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 function irc_install() {
        Hook::register('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
@@ -80,7 +81,7 @@ function irc_module() {
 
 function irc_content(&$a) {
 
-       $baseurl = $a->getBaseURL() . '/addon/irc';
+       $baseurl = DI::baseUrl()->get() . '/addon/irc';
        $o = '';
 
        /* set the list of popular channels */
@@ -99,7 +100,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->getBaseURL() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
+               $a->page['aside'] .= '<li><a href="' . DI::baseUrl()->get() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
        }
        $a->page['aside'] .= '</ul></div>';
 

diff --git a/krynn/krynn.php b/krynn/krynn.php
index 8f92daf75e9d3d56a704dd96fe8d88500a1d56f9..fe5c197558c2f9a6a843a46715b7eca2bc6ddd8a 100644 (file)
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -13,6 +13,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 
 function krynn_install() {
 
@@ -142,7 +143,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->getBaseURL() . '/addon/krynn/krynn.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/krynn/krynn.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/libertree/libertree.php b/libertree/libertree.php
index 034833e8fc5e95733dc643aae9a74a5a89c064cc..11036d5c913e17a8fb94d14547faf7bd0fc2fdcf 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\Network;
 
 function libertree_install()
@@ -61,7 +62,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->getBaseURL() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
 
     /* Get the current state of our config variables */
 
@@ -206,7 +207,7 @@ function libertree_send(&$a,&$b) {
        $ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token');
        $ltree_url = PConfig::get($b['uid'],'libertree','libertree_url');
        $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
-       $ltree_source = $a->getHostName();
+       $ltree_source = DI::baseUrl()->getHostname();
 
        if ($b['app'] != "")
                $ltree_source .= " (".$b['app'].")";

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 8bc33fc7736637061c84d136505e512f319143e2..6d347b278c182618a66d6b21a663a39494aff73b 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -13,6 +13,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
@@ -61,7 +62,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->getBaseURL() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/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 d9772037b3f8c9e3a9625fbc563fc71ad80ced83..502c92d98a6f80f948485d917d5cfd5f6a090c4e 100644 (file)
--- a/mahjongg/mahjongg.php
+++ b/mahjongg/mahjongg.php
@@ -1,42 +1,40 @@
-<?php\r
-\r
-/**\r
- * Name: Mah Jongg\r
- * Description: Ancient Chinese puzzle game that never gets old.\r
- * Version: 1.0\r
- * Author: Holger Froese\r
- */\r
-use Friendica\Core\Hook;\r
-\r
-function mahjongg_install() {\r
-    Hook::register('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu');\r
-}\r
-\r
-function mahjongg_uninstall() {\r
-    Hook::unregister('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu');\r
-\r
-}\r
-\r
-function mahjongg_app_menu($a,&$b) {\r
-    $b['app_menu'][] = '<div class="app-title"><a href="mahjongg">Mahjongg</a></div>';\r
-}\r
-\r
-\r
-function mahjongg_module() {}\r
-\r
-function mahjongg_content(&$a) {\r
-\r
-$baseurl = $a->getBaseURL() . '/addon/mahjongg';\r
-\r
-$o .= <<< EOT\r
-<br><br>\r
-<p align="left">\r
-<embed src="addon/mahjongg/mahjongg.swf" quality="high" bgcolor="#FFFFFF" width="800" height="600" name="mahjongg" align="middle" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />\r
-<br><br>\r
-<b>Simply locate the matching tiles and find a way to clear them from the board as quickly as possible.\r
-A timer at the top of the screen keeps track of how you are doing.</b><br>\r
-</p>\r
-EOT;\r
-\r
-return $o;\r
-}\r
+<?php
+
+/**
+ * Name: Mah Jongg
+ * Description: Ancient Chinese puzzle game that never gets old.
+ * Version: 1.0
+ * Author: Holger Froese
+ */
+use Friendica\Core\Hook;
+
+function mahjongg_install() {
+    Hook::register('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu');
+}
+
+function mahjongg_uninstall() {
+    Hook::unregister('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu');
+
+}
+
+function mahjongg_app_menu($a,&$b) {
+    $b['app_menu'][] = '<div class="app-title"><a href="mahjongg">Mahjongg</a></div>';
+}
+
+
+function mahjongg_module() {}
+
+function mahjongg_content(&$a) {
+
+$o .= <<< EOT
+<br><br>
+<p align="left">
+<embed src="addon/mahjongg/mahjongg.swf" quality="high" bgcolor="#FFFFFF" width="800" height="600" name="mahjongg" align="middle" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+<br><br>
+<b>Simply locate the matching tiles and find a way to clear them from the board as quickly as possible.
+A timer at the top of the screen keeps track of how you are doing.</b><br>
+</p>
+EOT;
+
+return $o;
+}

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 02e6dcb6a2aee8cd6d8268ebda0198c5445a96e8..1afde867575700cc84cab81bfe7436640e2a9dc2 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -95,7 +95,7 @@ function mailstream_addon_admin_post ($a) {
 
 function mailstream_generate_id($a, $uri) {
        // http://www.jwz.org/doc/mid.html
-       $host = $a->getHostName();
+       $host = DI::baseUrl()->getHostname();
        $resource = hash('md5', $uri);
        $message_id = "<" . $resource . "@" . $host . ">";
        Logger::debug('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri);

diff --git a/namethingy/namethingy.php b/namethingy/namethingy.php
index cb330981acc5b248243907c30cfa652069e435f1..7e314e8916352035d41bca3b3f75081871d6a43e 100644 (file)
--- a/namethingy/namethingy.php
+++ b/namethingy/namethingy.php
@@ -8,6 +8,7 @@
  * Status: Unsupported
  */
 use Friendica\Core\Hook;
+use Friendica\DI;
 
 function namethingy_install() {
     Hook::register('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu');
@@ -27,7 +28,7 @@ function namethingy_module() {}
 
 function namethingy_content(&$a) {
 
-$baseurl = $a->getBaseURL() . '/addon/namethingy';
+$baseurl = DI::baseUrl()->get() . '/addon/namethingy';
 
 $o .= <<< EOT
 <iframe src="http://namethingy.com" width="900" height="700" />

diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index c8d1ccf9ac4efab7b65e02e2bdfad2a95a80785a..1b49a1799d308bb668f79c4c91a4228bd5f6591f 100644 (file)
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -12,6 +12,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Util\Strings;
 
 function newmemberwidget_install()
@@ -40,7 +41,7 @@ function newmemberwidget_network_mod_init ($a, $b)
        }
 
        if (Config::get('newmemberwidget','linklocalsupport', false)) {
-               $t .= '<a href="'.$a->getBaseURL().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL;
+               $t .= '<a href="'.DI::baseUrl()->get().'/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 d8d6b2acec11da7ea594ae9b403559a01c45fb3a..da9ec6937518c933a57d432c78917a23cf76c94d 100644 (file)
--- a/notimeline/notimeline.php
+++ b/notimeline/notimeline.php
@@ -10,6 +10,7 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 
 function notimeline_install()
 {
@@ -41,7 +42,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->getBaseURL() . '/addon/notimeline/notimeline.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/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 b9240103c2dfdb25abe8eac9efbe386b034da5f9..29b95fcb127a50513dbdc933ecba5cc73fc324a6 100644 (file)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -10,6 +10,7 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 
 function nsfw_install()
 {
@@ -65,7 +66,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->getBaseURL() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/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 8bb4e74773528377f6b5b91be92d76a429ccf1bf..bd4f81843dae1f7a0840a788bce2f33cac0d88ad 100644 (file)
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -9,6 +9,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 
 function numfriends_install() {
 
@@ -59,7 +60,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->getBaseURL() . '/addon/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/piwik/piwik.php b/piwik/piwik.php
index cd41ad7b1040124e23e93237e03bc6a281951439..5d3da5c09ad7f02855c7baf3373141f412618bb6 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -36,6 +36,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
@@ -65,7 +66,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->getBaseURL() . '/addon/piwik/piwik.css' . '" media="all" />';
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/piwik/piwik.css' . '" media="all" />';
 
        /*
         *   Get the configuration variables from the config/addon.config.php file.

diff --git a/planets/planets.php b/planets/planets.php
index 48ba5767d6d434123d3969bdd253b3770e5f5462..59d0f49a31259c5b61f0ef2bbca9f19a5a2b3a92 100644 (file)
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -10,6 +10,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 
 function planets_install() {
 
@@ -139,7 +140,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->getBaseURL() . '/addon/planets/planets.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/planets/planets.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/public_server/public_server.php b/public_server/public_server.php
index e6817c645b4f0b0e4989166f24aa2c5bb7c8ada5..7d9259485dc2f1d26c2b3cd115c2030c970056bc 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -14,6 +14,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -74,8 +75,8 @@ function public_server_cron($a, $b)
                                'to_name'      => $rr['username'],
                                'to_email'     => $rr['email'],
                                'source_name'  => L10n::t('Administrator'),
-                               'source_link'  => $a->getBaseURL(),
-                               'source_photo' => $a->getBaseURL() . '/images/person-80.jpg',
+                               'source_link'  => DI::baseUrl()->get(),
+                               'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
                        ]);
 
                        $fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
@@ -126,7 +127,7 @@ function public_server_enotify(&$a, &$b)
 {
        if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
                && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
-               $b['itemlink'] = $a->getBaseURL();
+               $b['itemlink'] = DI::baseUrl()->get();
                $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/qcomment/qcomment.php b/qcomment/qcomment.php
index 7c5e03588d8551378685fc5164a3ef4c91bbb32c..a411354c5aa0c62742f02298ebb6512ba56822c4 100644 (file)
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -20,6 +20,7 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Util\XML;
 
 function qcomment_install() {
@@ -42,7 +43,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->getBaseURL() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/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 ffc3237c3d007f129d907e0256df9a423fe7d079..65eb013338be03f888245ec55e47ecb15655edc2 100644 (file)
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -22,6 +22,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 
 function randplace_install() {
 
@@ -158,7 +159,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->getBaseURL() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/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 7d42c5606295c0078f81f3f3bc3fdda3a8134e0c..a985bf37a142d8b9d26fcc06490ba36ebb8a1608 100644 (file)
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -39,7 +39,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->getBaseURL() . '/addon/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 
@@ -81,7 +81,7 @@ function remote_permissions_content($a, $item_copy) {
                        return;
 
                // Find out if the contact lives here
-               $baseurl = $a->getBaseURL();
+               $baseurl = DI::baseUrl()->get();
                $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 f7bb0c505e9ae2e05ad5ba3d9fec19373bf87ec3..7a446ec870f2268a16d74d1dfa79425911cbb017 100644 (file)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -10,6 +10,7 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Util\Strings;
 
 function showmore_install()
@@ -34,7 +35,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->getBaseURL().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl()->get().'/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 febdd41c395e283c18956af42b45a7941c3d5ddd..892b4a70b445f8455f392f2f77bd45dedf370369 100644 (file)
--- a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
+++ b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
@@ -7,6 +7,7 @@
  * All smileys from sites offering them as Public Domain
  */
 use Friendica\Core\Hook;
+use Friendica\DI;
 
 function smiley_pack_es_install() {
        Hook::register('smilie', 'addon/smiley_pack_es/smiley_pack_es.php', 'smiley_pack_smilies_es');
@@ -30,459 +31,459 @@ function smiley_pack_smilies_es(&$a,&$b) {
 #Animal smileys.
 
        $b['texts'][] = ':conejitoflores';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':conejitoflores' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':conejitoflores' . '" />';
 
        $b['texts'][] = ':pollito';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':pollito' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':pollito' . '" />';
 
        $b['texts'][] = ':abeja';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':abeja' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':abeja' . '" />';
 
        $b['texts'][] = ':mariquita';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':mariquita' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':mariquita' . '" />';
 
        $b['texts'][] = ':araña';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araña' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araña' . '" />';
 
        $b['texts'][] = ':gato';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':gato' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':gato' . '" />';
 
        $b['texts'][] = ':conejito';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':conejito' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':conejito' . '" />';
 
        $b['texts'][] = ':vaca';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
     
        $b['texts'][] = ':cangrejo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
 
        $b['texts'][] = ':delfín';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':delfín' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':delfín' . '" />';
 
        $b['texts'][] = ':libélula';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libélula' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libélula' . '" />';
 
        $b['texts'][] = ':rana';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':rana' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':rana' . '" />';
 
        $b['texts'][] = ':hamster';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
 
        $b['texts'][] = ':mono';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':mono' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':mono' . '" />';
 
        $b['texts'][] = ':caballo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
   
        $b['texts'][] = ':loro';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
 
        $b['texts'][] = ':tux';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
 
        $b['texts'][] = ':caracol';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':caracol' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':caracol' . '" />';
 
        $b['texts'][] = ':oveja';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':oveja' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':oveja' . '" />';
 
        $b['texts'][] = ':perro';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':perro' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':perro' . '" />';
 
        $b['texts'][] = ':elefante';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elefante' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elefante' . '" />';
 
        $b['texts'][] = ':pez';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':pez' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':pez' . '" />';
 
        $b['texts'][] = ':jirafa';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':jirafa' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':jirafa' . '" />';
 
        $b['texts'][] = ':cerdo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cerdo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cerdo' . '" />';
 
 
 
 #Baby Smileys
 
        $b['texts'][] = ':bebé';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bebé' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bebé' . '" />';
 
        $b['texts'][] = ':cuna';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
        
 
        $b['texts'][] = ':embarazada';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
 
        $b['texts'][] = ':cigüeña';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
 
 
 #Confused Smileys      
        $b['texts'][] = ':confundido';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
     
        $b['texts'][] = ':encogehombros';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
 
        $b['texts'][] = ':estúpido';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':estúpido' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':estúpido' . '" />';
 
        $b['texts'][] = ':aturdidp';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':aturdid' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':aturdid' . '" />';
 
 
 #Cool Smileys
 
        $b['texts'][] = ':afro';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
 
        $b['texts'][] = ':guay';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':guay' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':guay' . '" />';
 
 #Devil/Angel Smileys
 
        $b['texts'][] = ':ángel';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ángel' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ángel' . '" />';
 
        $b['texts'][] = ':querubín';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':querubín' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':querubín' . '" />';
 
        $b['texts'][] = ':ángeldemonio';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':ángeldemonio' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':ángeldemonio' . '" />';
 
        $b['texts'][] = ':gatodemonio';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':gatodemonio' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':gatodemonio' . '" />';
 
        $b['texts'][] = ':diabólico';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
        
        $b['texts'][] = ':adbalancín';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
 
        $b['texts'][] = ':vuelvedemonio';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
        
        $b['texts'][] = ':santo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
 
        $b['texts'][] = ':tumba';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tumba' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tumba' . '" />';
 
 #Unpleasent smileys.
 
        $b['texts'][] = ':retrete';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':retrete' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':retrete' . '" />';
 
        $b['texts'][] = ':pedoencama';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pedoencama' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pedoencama' . '" />';
 
        $b['texts'][] = ':vómito';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vómito' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vómito' . '" />';
 
        $b['texts'][] = ':pedosonrojo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pedosonrojo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pedosonrojo' . '" />';
 
 #Drinks
 
        $b['texts'][] = ':té';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':té' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':té' . '" />';
 
        $b['texts'][] = ':baba';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':baba' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':baba' . '" />';
 
 #Sad smileys
 
        $b['texts'][] = ':llorar';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':llorar' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':llorar' . '" />';
 
        $b['texts'][] = ':prisonero';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonero' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonero' . '" />';
 
        $b['texts'][] = ':suspiro';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':suspiro' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fumar' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fumar' . '" />';
 
 #Sport smileys
 
        $b['texts'][] = ':baloncesto';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':baloncesto' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':baloncesto' . '" />';
 
        $b['texts'][] = ':bolos';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bolos' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bolos' . '" />';
 
        $b['texts'][] = ':enbici';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':enbici' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':enbici' . '" />';
 
        $b['texts'][] = ':dardos';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':dardos' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':dardos' . '" />';
 
        $b['texts'][] = ':esgrima';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':esgrima' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':esgrima' . '" />';
 
        $b['texts'][] = ':golf';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
 
        $b['texts'][] = ':malabares';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':malabares' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':malabares' . '" />';
 
        $b['texts'][] = ':comba';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':comba' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':comba' . '" />';
 
        $b['texts'][] = ':tiroconarco';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':tiroconarco' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':tiroconarco' . '" />';
 
        $b['texts'][] = ':fútbol';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':fútbol' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':fútbol' . '" />';
 
        $b['texts'][] = ':surf';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
 
        $b['texts'][] = ':billar';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
   
        $b['texts'][] = ':tenis';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
 
        $b['texts'][] = ':acaballo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':acaballo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':acaballo' . '" />';
 
 #Love smileys
 
        $b['texts'][] = ':tequiero';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':tequiero' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':tequiero' . '" />';
 
        $b['texts'][] = ':enamorada';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':enamorada' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':enamorada' . '" />';
 
        $b['texts'][] = ':amor';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':amor' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':amor' . '" />';
 
        $b['texts'][] = ':osoamoroso';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':osoamoroso' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':osoamoroso' . '" />';
 
        $b['texts'][] = ':camaamor';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':camaamor' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':camaamor' . '" />';
 
        $b['texts'][] = ':corazónamor';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':corazónamor' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':corazónamor' . '" />';
 
 #Tired/Sleep smileys
 
        $b['texts'][] = ':contandoovejas';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':contandoovejas' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':contandoovejas' . '" />';
 
        $b['texts'][] = ':hamaca';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamaca' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamaca' . '" />';
 
        $b['texts'][] = ':almohada';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':almohada' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':almohada' . '" />';
 
        $b['texts'][] = ':bostezo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bostezo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bostezo' . '" />';
 
 #Fight/Flame/Violent smileys
 
        $b['texts'][] = ':pistolas';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':pistolas' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':pistolas' . '" />';
 
        $b['texts'][] = ':peleamarciano';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':peleamarciano' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':peleamarciano' . '" />';
 
        $b['texts'][] = ':alfa';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alfa' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alfa' . '" />';
 
        $b['texts'][] = ':ejército';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':ejército' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':ejército' . '" />';
 
        $b['texts'][] = ':cabezaflecha';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':cabezaflecha' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':cabezaflecha' . '" />';
 
        $b['texts'][] = ':bfg';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
 
        $b['texts'][] = ':arquero';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':arquero' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':arquero' . '" />';
 
        $b['texts'][] = ':motosierra';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':motosierra' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':motosierra' . '" />';
 
        $b['texts'][] = ':ballesta';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':ballesta' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':ballesta' . '" />';
 
        $b['texts'][] = ':cruzado';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':cruzado' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':cruzado' . '" />';
 
        $b['texts'][] = ':muerto';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':muerto' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':muerto' . '" />';
 
        $b['texts'][] = ':martillazo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':martillazo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':martillazo' . '" />';
 
        $b['texts'][] = ':pistolalaser';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistolalaser' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistolalaser' . '" />';
 
        $b['texts'][] = ':metralleta';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':metralleta' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':metralleta' . '" />';
 
        $b['texts'][] = ':marine';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
 
        $b['texts'][] = ':sable';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sable' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sable' . '" />';
 
        $b['texts'][] = ':tanque';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tanque' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tanque' . '" />';
 
        $b['texts'][] = ':vikingo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':vikingo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':vikingo' . '" />';
 
        $b['texts'][] = ':bandas';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':bandas' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':bandas' . '" />';
 
        $b['texts'][] = ':ácido';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':ácido' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alien' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alien' . '" />';
 
        $b['texts'][] = ':bárbaro';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':bárbaro' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':bárbaro' . '" />';
 
        $b['texts'][] = ':dinosaurio';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaurio' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaurio' . '" />';
 
        $b['texts'][] = ':dragón';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragón' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragón' . '" />';
 
        $b['texts'][] = ':draco';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
 
        $b['texts'][] = ':fantasma';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantasma' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantasma' . '" />';
 
        $b['texts'][] = ':momia';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momia' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momia' . '" />';
 
 #Food smileys
 
        $b['texts'][] = ':mazana';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':mazana' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':mazana' . '" />';
 
        $b['texts'][] = ':brócoli';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brócoli' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brócoli' . '" />';
 
        $b['texts'][] = ':pastel';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':pastel' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':pastel' . '" />';
 
        $b['texts'][] = ':zanahoria';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':zanahoria' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':zanahoria' . '" />';
 
        $b['texts'][] = ':palomitas';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':palomitas' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':palomitas' . '" />';
 
        $b['texts'][] = ':tomate';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
 
        $b['texts'][] = ':plátano';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':plátano' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':plátano' . '" />';
 
        $b['texts'][] = ':cocinar';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cocinar' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cocinar' . '" />';
 
        $b['texts'][] = ':huevofrito';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':huevofrito' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':huevofrito' . '" />';
 
 #Happy smileys
 
        $b['texts'][] = ':cloud9';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
 
        $b['texts'][] = ':tearsofjoy';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
 
 #Repsect smileys
 
        $b['texts'][] = ':reverencia';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':reverencia' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':reverencia' . '" />';
 
        $b['texts'][] = ':bravo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
 
        $b['texts'][] = ':vivaelrey';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':vivaelrey' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':vivaelrey' . '" />';
 
        $b['texts'][] = ':número1';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':número1' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':número1' . '" />';
 
 #Laugh smileys
 
        $b['texts'][] = ':jajaja';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':jajaja' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':jajaja' . '" />';
 
        $b['texts'][] = ':jajatv';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':jajatv' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':jajatv' . '" />';
 
        $b['texts'][] = ':meparto';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':meparto' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':meparto' . '" />';
 
 #Music smileys
 
        $b['texts'][] = ':dj';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
 
        $b['texts'][] = ':batería';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batería' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batería' . '" />';
 
        $b['texts'][] = ':elvis';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
 
        $b['texts'][] = ':guitarra';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitarra' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitarra' . '" />';
 
        $b['texts'][] = ':trompeta';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompeta' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompeta' . '" />';
 
        $b['texts'][] = ':violín';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violín' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezagolpe' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezagolpe' . '" />';
 
                $b['texts'][] = ':barba';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barba' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barba' . '" />';
 
        $b['texts'][] = ':barbablanca';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbablanca' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbablanca' . '" />';
 
        $b['texts'][] = ':saludosurf';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':saludosurf' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':saludosurf' . '" />';
 
        $b['texts'][] = ':\\.../';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
 
        $b['texts'][] = ':\\ooo/';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
 
        $b['texts'][] = ':cabezamesa';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezamesa' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
 
        $b['texts'][] = ':-o';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/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 5f10a5b101dd2b25051b360bb4e5492fca8cf55e..7472bd1cb77110803fcba7ac6dd7def8117e557b 100644 (file)
--- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
+++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
@@ -9,6 +9,7 @@
  * 
  */
 use Friendica\Core\Hook;
+use Friendica\DI;
 
 function smiley_pack_fr_install() {
        Hook::register('smilie', 'addon/smiley_pack_fr/smiley_pack_fr.php', 'smiley_pack_fr_smilies');
@@ -32,378 +33,378 @@ function smiley_pack_fr_smilies(&$a,&$b) {
 #Animal smileys.
 
        $b['texts'][] = ':fleurslapin';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':fleurslapin' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':fleurslapin' . '" />';
 
        $b['texts'][] = ':poussin';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
 
        $b['texts'][] = ':bourdon';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bourdon' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bourdon' . '" />';
 
        $b['texts'][] = ':coccinelle';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':coccinelle' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':coccinelle' . '" />';
 
        $b['texts'][] = ':araignée';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araignée' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araignée' . '" />';
 
        $b['texts'][] = ':chat';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':chat' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':chat' . '" />';
 
        $b['texts'][] = ':lapin';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':lapin' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':lapin' . '" />';
 
        $b['texts'][] = ':poussin';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
 
        $b['texts'][] = ':vache';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';
     
        $b['texts'][] = ':crabe';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />';
 
        $b['texts'][] = ':dauphin';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dauphin' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dauphin' . '" />';
 
        $b['texts'][] = ':libellule';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libellule' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libellule' . '" />';
 
        $b['texts'][] = ':grenouille';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':grenouille' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':grenouille' . '" />';
 
        $b['texts'][] = ':singe';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':singe' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':singe' . '" />';
 
        $b['texts'][] = ':cheval';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';
   
        $b['texts'][] = ':perroquet';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
 
        $b['texts'][] = ':escargot';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':escargot' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':escargot' . '" />';
 
        $b['texts'][] = ':mouton';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':mouton' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':mouton' . '" />';
 
        $b['texts'][] = ':chien';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':chien' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':chien' . '" />';
 
        $b['texts'][] = ':éléphant';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':éléphant' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':éléphant' . '" />';
 
        $b['texts'][] = ':poisson';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':poisson' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':poisson' . '" />';
 
        $b['texts'][] = ':girafe';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':girafe' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':girafe' . '" />';
 
        $b['texts'][] = ':cochon';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cochon' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cochon' . '" />';
 
 
 
 #Baby Smileys
 
        $b['texts'][] = ':bébé';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bébé' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bébé' . '" />';
 
        $b['texts'][] = ':litbébé';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';
        
 
        $b['texts'][] = ':enceinte';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';
 
        $b['texts'][] = ':cigogne';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';
 
 
 #Confused Smileys      
        $b['texts'][] = ':paumé';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';
     
        $b['texts'][] = ':hausseépaules';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';
 
        $b['texts'][] = ':stupide';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupide' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupide' . '" />';
 
        $b['texts'][] = ':hébété';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':hébété' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':hébété' . '" />';
 
 
 #Cool Smileys
 
        $b['texts'][] = ':afro';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
 
 #Devil/Angel Smileys
 
        $b['texts'][] = ':ange';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ange' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ange' . '" />';
 
        $b['texts'][] = ':chérubin';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':chérubin' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':chérubin' . '" />';
 
        $b['texts'][] = ':démonange';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':démonange' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':démonange' . '" />';
 
        $b['texts'][] = ':diablechat';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':diablechat' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':diablechat' . '" />';
 
        $b['texts'][] = ':démoniaque';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';
        
        $b['texts'][] = ':bascule';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';
 
        $b['texts'][] = ':possédé';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
        
        $b['texts'][] = ':tombe';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
 
 #Unpleasent smileys.
 
        $b['texts'][] = ':toilettes';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilettes' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilettes' . '" />';
 
        $b['texts'][] = ':pèteaulit';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pèteaulit' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pèteaulit' . '" />';
 
        $b['texts'][] = ':pet';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pet' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pet' . '" />';
 
 #Drinks
 
        $b['texts'][] = ':thé';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':thé' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':thé' . '" />';
 
        $b['texts'][] = ':salive';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':salive' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':salive' . '" />';
 
 #Sad smileys
 
        $b['texts'][] = ':pleure';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':pleure' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':pleure' . '" />';
 
        $b['texts'][] = ':prisonnier';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonnier' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonnier' . '" />';
 
        $b['texts'][] = ':soupir';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':soupir' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fume' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fume' . '" />';
 
 #Sport smileys
 
        $b['texts'][] = ':basket';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basket' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basket' . '" />';
 
        $b['texts'][] = ':vélo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':vélo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':vélo' . '" />';
 
        $b['texts'][] = ':fléchettes';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':fléchettes' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':fléchettes' . '" />';
 
        $b['texts'][] = ':escrime';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':escrime' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':escrime' . '" />';
 
        $b['texts'][] = ':jonglage';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':jonglage' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':jonglage' . '" />';
 
        $b['texts'][] = ':sautàlacorde';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':sautàlacorde' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':sautàlacorde' . '" />';
 
        $b['texts'][] = ':arc';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':arc' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':arc' . '" />';
 
        $b['texts'][] = ':surf';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
 
        $b['texts'][] = ':billard';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
   
        $b['texts'][] = ':équitation';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
 
 #Love smileys
 
        $b['texts'][] = ':jetaime';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':jetaime' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':jetaime' . '" />';
 
        $b['texts'][] = ':amoureux';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':amoureux' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':amoureux' . '" />';
 
        $b['texts'][] = ':oursamour';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':oursamour' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':oursamour' . '" />';
 
        $b['texts'][] = ':amourlit';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':amourlit' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':amourlit' . '" />';
 
        $b['texts'][] = ':coeur';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':coeur' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':coeur' . '" />';
 
 #Tired/Sleep smileys
 
        $b['texts'][] = ':comptemoutons';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':comptemoutons' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':comptemoutons' . '" />';
 
        $b['texts'][] = ':hamac';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamac' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamac' . '" />';
 
        $b['texts'][] = ':oreiller';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':oreiller' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':oreiller' . '" />';
 
        $b['texts'][] = ':bâille';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bâille' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bâille' . '" />';
 
 #Fight/Flame/Violent smileys
 
        $b['texts'][] = ':2pistolets';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2pistolets' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2pistolets' . '" />';
 
        $b['texts'][] = ':combatalien';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':combatalien' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':combatalien' . '" />';
 
        $b['texts'][] = ':armée';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':armée' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':armée' . '" />';
 
        $b['texts'][] = ':flèche';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':flèche' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':flèche' . '" />';
 
        $b['texts'][] = ':bfg';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
 
        $b['texts'][] = ':archer';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':archer' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':archer' . '" />';
 
        $b['texts'][] = ':tronçonneuse';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':tronçonneuse' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':tronçonneuse' . '" />';
 
        $b['texts'][] = ':arbalète';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':arbalète' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':arbalète' . '" />';
 
        $b['texts'][] = ':croisé';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':croisé' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':croisé' . '" />';
 
        $b['texts'][] = ':mort';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':mort' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':mort' . '" />';
 
        $b['texts'][] = ':marteau';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':marteau' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':marteau' . '" />';
 
        $b['texts'][] = ':pistoletlaser';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistoletlaser' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistoletlaser' . '" />';
 
        $b['texts'][] = ':mitrailleuse';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':mitrailleuse' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':mitrailleuse' . '" />';
 
        $b['texts'][] = ':acide';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acide' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':monstrealien' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':monstrealien' . '" />';
 
        $b['texts'][] = ':barbare';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbare' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbare' . '" />';
 
        $b['texts'][] = ':dinosaure';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaure' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaure' . '" />';
 
        $b['texts'][] = ':petitdragon';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':petitdragon' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':petitdragon' . '" />';
 
        $b['texts'][] = ':fantôme';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantôme' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantôme' . '" />';
 
        $b['texts'][] = ':momie';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momie' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momie' . '" />';
 
 #Food smileys
 
        $b['texts'][] = ':pomme';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':pomme' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':pomme' . '" />';
 
        $b['texts'][] = ':brocoli';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocoli' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocoli' . '" />';
 
        $b['texts'][] = ':gâteau';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':gâteau' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':gâteau' . '" />';
 
        $b['texts'][] = ':carotte';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carotte' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carotte' . '" />';
 
        $b['texts'][] = '~popcorn';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . '~popcorn' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . '~popcorn' . '" />';
 
        $b['texts'][] = ':tomate';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
 
        $b['texts'][] = ':banane';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banane' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banane' . '" />';
 
        $b['texts'][] = ':cuisine';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cuisine' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cuisine' . '" />';
 
        $b['texts'][] = ':oeufauplat';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':oeufauplat' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':oeufauplat' . '" />';
 
 #Happy smileys
 
        $b['texts'][] = ':nuage';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':nuage' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':nuage' . '" />';
 
        $b['texts'][] = ':larmesdejoie';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':larmesdejoie' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':larmesdejoie' . '" />';
 
 #Repsect smileys
 
        $b['texts'][] = ':courbette';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':courbette' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':courbette' . '" />';
 
        $b['texts'][] = ':bravo';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
 
        $b['texts'][] = ':viveleroi';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':viveleroi' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':viveleroi' . '" />';
 
        $b['texts'][] = ':numéro1';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':numéro1' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':numéro1' . '" />';
 
 #Laugh smileys
 
 #Music smileys
 
        $b['texts'][] = ':batterie';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batterie' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batterie' . '" />';
 
        $b['texts'][] = ':guitare';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitare' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitare' . '" />';
 
        $b['texts'][] = ':trompette';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompette' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompette' . '" />';
 
        $b['texts'][] = ':violon';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violon' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cognetête' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cognetête' . '" />';
 
                $b['texts'][] = ':barbu';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barbu' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barbu' . '" />';
 
        $b['texts'][] = ':barbeblanche';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbeblanche' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbeblanche' . '" />';
 
        $b['texts'][] = ':tête';
-       $b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':tête' . '" />';
+       $b['icons'][] = '<img src="' . DI::baseUrl()->get() . '/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 607f35570a7e1f9afb8a18caec737c0533df544b..a80ab717c7cb0f08431801bb5a8de4e0121a8eed 100644 (file)
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\Core\Hook;
+use Friendica\DI;
 
 function smiley_pack_install() {
        Hook::register('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
@@ -31,466 +32,466 @@ function smiley_pack_smilies(&$a,&$b) {
 #Animal smileys.
 
        $b['texts'][] = ':bunnyflowers';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
 
        $b['texts'][] = ':chick';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';
 
        $b['texts'][] = ':bumblebee';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee' . '" />';
 
        $b['texts'][] = ':ladybird';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird' . '" />';
 
        $b['texts'][] = ':bigspider';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider' . '" />';
 
        $b['texts'][] = ':cat';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat' . '" />';
 
        $b['texts'][] = ':bunny';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny' . '" />';
 
        $b['texts'][] = ':cow';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow' . '" />';
     
        $b['texts'][] = ':crab';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab' . '" />';
 
        $b['texts'][] = ':dolphin';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin' . '" />';
 
        $b['texts'][] = ':dragonfly';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly' . '" />';
 
        $b['texts'][] = ':frog';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog' . '" />';
 
        $b['texts'][] = ':hamster';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
 
        $b['texts'][] = ':monkey';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey' . '" />';
 
        $b['texts'][] = ':horse';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse' . '" />';
   
        $b['texts'][] = ':parrot';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot' . '" />';
 
        $b['texts'][] = ':tux';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
 
        $b['texts'][] = ':snail';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail' . '" />';
 
        $b['texts'][] = ':sheep';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep' . '" />';
 
        $b['texts'][] = ':dog';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';
 
        $b['texts'][] = ':elephant';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant' . '" />';
 
        $b['texts'][] = ':fish';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish' . '" />';
 
        $b['texts'][] = ':giraffe';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe' . '" />';
 
        $b['texts'][] = ':pig';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig' . '" />';
 
 
 
 #Baby Smileys
 
        $b['texts'][] = ':baby';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';
 
        $b['texts'][] = ':babycot';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot' . '" />';
        
 
        $b['texts'][] = ':pregnant';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant' . '" />';
 
        $b['texts'][] = ':stork';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />';
 
 
 #Confused Smileys      
        $b['texts'][] = ':confused';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />';
     
        $b['texts'][] = ':shrug';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug' . '" />';
 
        $b['texts'][] = ':stupid';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';
 
        $b['texts'][] = ':dazed';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';
 
 
 #Cool Smileys
 
        $b['texts'][] = ':affro';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';
 
 #Devil/Angel Smileys
 
        $b['texts'][] = ':angel';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';
 
        $b['texts'][] = ':cherub';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub' . '" />';
 
        $b['texts'][] = ':devilangel';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel' . '" />';
 
        $b['texts'][] = ':catdevil';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil' . '" />';
 
        $b['texts'][] = ':devillish';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish' . '" />';
        
        $b['texts'][] = ':daseesaw';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';
 
        $b['texts'][] = ':turnevil';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';
        
        $b['texts'][] = ':saint';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';
 
        $b['texts'][] = ':graveside';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';
 
 #Unpleasent smileys.
 
        $b['texts'][] = ':toilet';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';
 
        $b['texts'][] = ':fartinbed';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed' . '" />';
 
        $b['texts'][] = ':fartblush';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
 
 #Drinks
 
        $b['texts'][] = ':tea';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea' . '" />';
 
        $b['texts'][] = ':drool';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool' . '" />';
 
 #Sad smileys
 
        $b['texts'][] = ':crying';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying' . '" />';
 
        $b['texts'][] = ':prisoner';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
 
        $b['texts'][] = ':sigh';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
 
 #Sport smileys
 
        $b['texts'][] = ':basketball';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
 
        $b['texts'][] = '~bowling';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . '~bowling' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . '~bowling' . '" />';
 
        $b['texts'][] = ':cycling';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling' . '" />';
 
        $b['texts'][] = ':darts';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts' . '" />';
 
        $b['texts'][] = ':fencing';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing' . '" />';
 
        $b['texts'][] = ':juggling';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling' . '" />';
 
        $b['texts'][] = ':skipping';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
 
        $b['texts'][] = ':archery';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
 
        $b['texts'][] = ':surfing';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
 
        $b['texts'][] = ':snooker';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
   
        $b['texts'][] = ':horseriding';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
 
 #Love smileys
 
        $b['texts'][] = ':iloveyou';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
 
        $b['texts'][] = ':inlove';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove' . '" />';
 
        $b['texts'][] = '~love';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
 
        $b['texts'][] = ':lovebear';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear' . '" />';
 
        $b['texts'][] = ':lovebed';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed' . '" />';
 
        $b['texts'][] = ':loveheart';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
 
 #Tired/Sleep smileys
 
        $b['texts'][] = ':countsheep';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
 
        $b['texts'][] = ':hammock';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock' . '" />';
 
        $b['texts'][] = ':pillow';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
 
        $b['texts'][] = ':yawn';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn' . '" />';
 
 #Fight/Flame/Violent smileys
 
        $b['texts'][] = ':2guns';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
 
        $b['texts'][] = ':alienfight';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
 
        $b['texts'][] = ':army';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
 
        $b['texts'][] = ':arrowhead';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead' . '" />';
 
        $b['texts'][] = ':bfg';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
 
        $b['texts'][] = ':bowman';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman' . '" />';
 
        $b['texts'][] = ':chainsaw';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw' . '" />';
 
        $b['texts'][] = ':crossbow';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow' . '" />';
 
        $b['texts'][] = ':crusader';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader' . '" />';
 
        $b['texts'][] = ':dead';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead' . '" />';
 
        $b['texts'][] = ':hammersplat';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat' . '" />';
 
        $b['texts'][] = ':lasergun';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun' . '" />';
 
        $b['texts'][] = ':machinegun';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
 
        $b['texts'][] = ':acid';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
 
        $b['texts'][] = ':barbarian';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian' . '" />';
 
        $b['texts'][] = ':dinosaur';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur' . '" />';
 
        $b['texts'][] = ':dragon';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
 
        $b['texts'][] = ':draco';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
 
        $b['texts'][] = ':ghost';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
 
        $b['texts'][] = ':mummy';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
 
 #Food smileys
 
        $b['texts'][] = ':apple';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
 
        $b['texts'][] = ':broccoli';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli' . '" />';
 
        $b['texts'][] = ':cake';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake' . '" />';
 
        $b['texts'][] = ':carrot';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot' . '" />';
 
        $b['texts'][] = ':popcorn';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
 
        $b['texts'][] = ':tomato';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
 
        $b['texts'][] = ':banana';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana' . '" />';
 
        $b['texts'][] = ':cooking';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
 
        $b['texts'][] = ':fryegg';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
 
        $b['texts'][] = ':birthdaycake';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake' . '" />';
 
 #Happy smileys
 
        $b['texts'][] = ':cloud9';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
 
        $b['texts'][] = ':tearsofjoy';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
 
 #Repsect smileys
 
        $b['texts'][] = ':bow';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
 
        $b['texts'][] = ':bravo';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
 
        $b['texts'][] = ':hailking';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking' . '" />';
 
        $b['texts'][] = ':number1';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
 
 #Laugh smileys
 
        $b['texts'][] = ':hahaha';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
 
        $b['texts'][] = ':loltv';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
 
        $b['texts'][] = ':rofl';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
 
 #Music smileys
 
        $b['texts'][] = ':drums';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
 
 
        $b['texts'][] = ':guitar';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
 
        $b['texts'][] = ':trumpet';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
 
                $b['texts'][] = ':beard';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
 
        $b['texts'][] = ':whitebeard';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
 
        $b['texts'][] = ':shaka';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
 
        $b['texts'][] = ':\\.../';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
 
        $b['texts'][] = ':\\ooo/';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
 
        $b['texts'][] = ':headdesk';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headdesk' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
 
        $b['texts'][] = ':-o';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/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->getBaseURL() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';
 
        $b['texts'][] = ':vomit';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
 
        $b['texts'][] = ':golf';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
        
        $b['texts'][] = ':football';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
 
        $b['texts'][] = ':tennis';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
 
        $b['texts'][] = ':alpha';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
 
        $b['texts'][] = ':marine';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
 
        $b['texts'][] = ':sabre';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
 
        $b['texts'][] = ':tank';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
 
        $b['texts'][] = ':viking';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
 
        $b['texts'][] = ':gangs';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
 
 
        $b['texts'][] = ':dj';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
 
 
        $b['texts'][] = ':elvis';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
 
        $b['texts'][] = ':violin';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
 }

diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php
index c0095923ecc2320c0beef133eaf7bea7b36b88d3..84bb24cf53c67817db44e3a4afd0d4e4687ee623 100644 (file)
--- a/smilies_adult/smilies_adult.php
+++ b/smilies_adult/smilies_adult.php
@@ -9,6 +9,7 @@
  * 
  */
 use Friendica\Core\Hook;
+use Friendica\DI;
 
 function smilies_adult_install() {
        Hook::register('smilie', 'addon/smilies_adult/smilies_adult.php', 'smilies_adult_smilies');
@@ -23,21 +24,21 @@ function smilies_adult_uninstall() {
 function smilies_adult_smilies(&$a,&$b) {
 
        $b['texts'][] = '(o)(o)';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
 
        $b['texts'][] = '(.)(.)';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
 
        $b['texts'][] = ':bong';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/bong.gif' . '" alt="' . ':bong' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smilies_adult/icons/bong.gif' . '" alt="' . ':bong' . '" />';
 
        $b['texts'][] = ':sperm';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/sperm.gif' . '" alt="' . ':sperm' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smilies_adult/icons/sperm.gif' . '" alt="' . ':sperm' . '" />';
 
        $b['texts'][] = ':drunk';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/drunk.gif' . '" alt="' . ':drunk' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/addon/smilies_adult/icons/drunk.gif' . '" alt="' . ':drunk' . '" />';
 
        $b['texts'][] = ':finger';
-       $b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/finger.gif' . '" alt="' . ':finger' . '" />';
+       $b['icons'][] = '<img class="smiley" src="' . DI::baseUrl()->get() . '/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 72300838b787c3813fea129a8b048908fc16e20c..97d26b7b90b29e537292815781f1a47964af4ebe 100644 (file)
--- a/sniper/sniper.php
+++ b/sniper/sniper.php
@@ -10,6 +10,7 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 use Friendica\Core\Hook;
+use Friendica\DI;
 
 function sniper_install() {
     Hook::register('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu');
@@ -29,7 +30,7 @@ function sniper_module() {}
 
 function sniper_content(&$a) {
 
-$baseurl = $a->getBaseURL() . '/addon/sniper';
+$baseurl = DI::baseUrl()->get() . '/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 0971818f35d5faa47dc6d221b509e3bdfe5eb583..c2ade1d38898e3a6f699f497caa4499da6fe3c99 100644 (file)
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -10,6 +10,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\DI;
 
 function startpage_install() {
        Hook::register('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
@@ -32,7 +33,7 @@ function startpage_home_init($a, $b)
 
        $page = PConfig::get(local_user(), 'startpage', 'startpage');
        if (strlen($page)) {
-               $a->internalRedirect($page);
+               DI::baseUrl()->redirect($page);
        }
        return;
 }
@@ -71,7 +72,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->getBaseURL() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 

diff --git a/superblock/superblock.php b/superblock/superblock.php
index da4260d0a3926a5d5580ab2e85aee706f197ec3b..99f4a4dc237dba242a99b2fb88a43549ed4862e0 100644 (file)
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -9,6 +9,7 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 use Friendica\Util\Strings;
 
 function superblock_install()
@@ -37,7 +38,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->getBaseURL() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/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 f29dea19bd161a8a2a99de3027c6bcd76ce2477a..5f5dceaae3910f1308c5a37a745053d8b42f9206 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -11,6 +11,7 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
@@ -75,8 +76,8 @@ function testdrive_cron($a,$b) {
                                'to_name'      => $rr['username'],
                                'to_email'     => $rr['email'],
                                'source_name'  => L10n::t('Administrator'),
-                               'source_link'  => $a->getBaseURL(),
-                               'source_photo' => $a->getBaseURL() . '/images/person-80.jpg',
+                               'source_link'  => DI::baseUrl()->get(),
+                               'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
                        ]);
 
                        q("update user set expire_notification_sent = '%s' where uid = %d",
@@ -98,7 +99,7 @@ function testdrive_cron($a,$b) {
 function testdrive_enotify(&$a, &$b) {
     if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
                && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'testdrive_expire') {
-        $b['itemlink'] = $a->getBaseURL();
+        $b['itemlink'] = DI::baseUrl()->get();
         $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/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index a890be2a303383cc972c8c371158b14ddce9097f..d50b4234747ed5562cbd4968558f07e6ed518456 100644 (file)
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -8,6 +8,7 @@
  */
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Database\DBA;
 
@@ -52,7 +53,7 @@ function viewsrc_item_photo_menu(&$a, &$b)
                $item_id = $b['item']['id'];
        }
 
-       $b['menu'] = array_merge([L10n::t('View Source') => $a->getBaseURL() . '/viewsrc/'. $item_id], $b['menu']);
+       $b['menu'] = array_merge([L10n::t('View Source') => DI::baseUrl()->get() . '/viewsrc/'. $item_id], $b['menu']);
 
        //if((! local_user()) || (local_user() != $b['item']['uid']))
        //      return;

diff --git a/widgets/widget_friendheader.php b/widgets/widget_friendheader.php
index 7df1ff7c24910eee5cb2e9fb0c4d0262017a9d70..4d852e2738bdaff963c7d5a78023d16016e107f6 100644 (file)
--- a/widgets/widget_friendheader.php
+++ b/widgets/widget_friendheader.php
@@ -2,6 +2,7 @@
 
 use Friendica\Content\Text\HTML;
 use Friendica\Core\L10n;
+use Friendica\DI;
 
 function friendheader_widget_name()
 {
@@ -47,7 +48,7 @@ function friendheader_widget_content(&$a, $conf)
 
        </style>";
        $o .= _abs_url(HTML::contactBlock());
-       $o .= "<a href='".$a->getBaseURL().'/profile/'.$a->profile['nickname']."' target=new>". L10n::t('Get added to this list!') ."</a>";
+       $o .= "<a href='".DI::baseUrl()->get().'/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 f661a4f05713be7f1b06a76d19dd2fe8c9d7fbb5..37fc30dce685cd48e434fdcbab04fa6f4c0acf97 100644 (file)
--- a/widgets/widget_friends.php
+++ b/widgets/widget_friends.php
@@ -2,6 +2,7 @@
 
 use Friendica\Content\Text\HTML;
 use Friendica\Core\L10n;
+use Friendica\DI;
 
 function friends_widget_name()
 {
@@ -49,6 +50,6 @@ function friends_widget_content(&$a, $conf)
 
        </style>";
        $o .= _abs_url(HTML::contactBlock());
-       $o .= "<a href='".$a->getBaseURL().'/profile/'.$a->profile['nickname']."'>". L10n::t('Connect on Friendica!') ."</a>";
+       $o .= "<a href='".DI::baseUrl()->get().'/profile/'.$a->profile['nickname']."'>". L10n::t('Connect on Friendica!') ."</a>";
        return $o;
 }

diff --git a/widgets/widgets.php b/widgets/widgets.php
index c22c3f68cab903c20af87182e8e957205e470a8c..dd623afd45b1e36b26d185a29ed7cbbd4fd34da3 100644 (file)
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -127,7 +127,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->getBaseURL().'/settings/addon">'. L10n::t("Addon Settings") .'</a>';
+                       $o .= '<a href="'.DI::baseUrl()->get().'/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');
@@ -143,10 +143,10 @@ function widgets_content(&$a) {
 
                $script = file_get_contents(dirname(__file__)."/widgets.js");
                $o .= Renderer::replaceMacros($script, [
-                       '$entrypoint' => $a->getBaseURL()."/widgets/".$a->argv[1]."/cb/",
+                       '$entrypoint' => DI::baseUrl()->get()."/widgets/".$a->argv[1]."/cb/",
                        '$key' => $conf['key'],
                        '$widget_id' => 'f9a_'.$a->argv[1]."_"._randomAlphaNum(6),
-                       '$loader' => $a->getBaseURL()."/images/rotator.gif",
+                       '$loader' => DI::baseUrl()->get()."/images/rotator.gif",
                        '$args' => (isset($_GET['a'])?$_GET['a']:''),
                        '$width' => $widget_size[0],
                        '$height' => $widget_size[1],
@@ -164,7 +164,7 @@ function widgets_content(&$a) {
                        <h4>Copy and paste this code</h4>
                        <code>"
 
-                       .htmlspecialchars('<script src="'.$a->getBaseURL().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
+                       .htmlspecialchars('<script src="'.DI::baseUrl()->get().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
                        .$jsargs
                        .htmlspecialchars('"></script>')
                        ."</code>";

diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index 8d35e787cc86da6b5a60e78da84ca50f217ba975..4283ab16f5e9755b93f86b7bf7ef75beb8ec24b3 100644 (file)
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -107,7 +107,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->getBaseURL() . '/addon/windowsphonepush/windowsphonepush.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/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 bcdedffeaf0728255cbe6e8bdea2301642af91d9..cd3e1cfc9c8c4cd68aa332a2e68735f6194c84b2 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
@@ -69,7 +70,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->getBaseURL() . '/addon/wppost/wppost.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/wppost/wppost.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variables */