rename App Methods

- rename get_baseurl() to getBaseURL()
pull/743/head
Philipp Holzer 2018-10-09 20:13:22 +02:00
parent cac6cbc235
commit 1454abfdb4
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
62 changed files with 523 additions and 523 deletions

View File

@ -42,7 +42,7 @@ function blockem_addon_settings (App $a, &$s)
}
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/blockem/blockem.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/blockem/blockem.css' . '" media="all" />' . "\r\n";
$words = PConfig::get(local_user(), 'blockem', 'words');
@ -147,7 +147,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data)
function blockem_display_item(App $a, array &$b = null)
{
if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) {
$b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg";
$b['output']['thumb'] = $a->getBaseURL() . "/images/person-80.jpg";
}
}

View File

@ -62,7 +62,7 @@ function blogger_settings(App $a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */

View File

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

View File

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

View File

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

View File

@ -136,7 +136,7 @@ function diaspora_settings(App $a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */

View File

@ -60,7 +60,7 @@ function dwpost_settings(App $a, &$s)
}
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/dwpost/dwpost.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/dwpost/dwpost.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */
$enabled = PConfig::get(local_user(), 'dwpost', 'post');

View File

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

View File

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

View File

@ -47,7 +47,7 @@ function fromapp_settings(&$a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */

View File

@ -178,7 +178,7 @@ function geonames_addon_admin(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/geonames/geonames.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/geonames/geonames.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */

View File

@ -67,7 +67,7 @@ function gnot_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */

View File

@ -63,7 +63,7 @@ function group_text_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/group_text/group_text.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/group_text/group_text.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */

View File

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

View File

@ -56,7 +56,7 @@ function ijpost_settings(&$a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */

View File

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

View File

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

View File

@ -30,7 +30,7 @@ function irc_addon_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
// $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/irc/irc.css' . '" media="all" />' . "\r\n";
// $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/irc/irc.css' . '" media="all" />' . "\r\n";
/* setting popular channels, auto connect channels */
$sitechats = PConfig::get( local_user(), 'irc','sitechats'); /* popular channels */
@ -74,7 +74,7 @@ function irc_module() {
function irc_content(&$a) {
$baseurl = $a->get_baseurl() . '/addon/irc';
$baseurl = $a->getBaseURL() . '/addon/irc';
$o = '';
/* set the list of popular channels */
@ -93,7 +93,7 @@ function irc_content(&$a) {
$a->page['aside'] .= '<div class="widget"><h3>' . L10n::t('Popular Channels') . '</h3><ul>';
foreach($chats as $chat) {
$a->page['aside'] .= '<li><a href="' . $a->get_baseurl() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
$a->page['aside'] .= '<li><a href="' . $a->getBaseURL() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
}
$a->page['aside'] .= '</ul></div>';

View File

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

View File

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

View File

@ -141,7 +141,7 @@ function krynn_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/krynn/krynn.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/krynn/krynn.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */

View File

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

View File

@ -51,7 +51,7 @@ function libertree_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */

View File

@ -54,7 +54,7 @@ function ljpost_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */

View File

@ -26,7 +26,7 @@ function mahjongg_module() {}
function mahjongg_content(&$a) {
$baseurl = $a->get_baseurl() . '/addon/mahjongg';
$baseurl = $a->getBaseURL() . '/addon/mahjongg';
$o .= <<< EOT
<br><br>

View File

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

View File

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

View File

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

View File

@ -41,7 +41,7 @@ function notimeline_settings(&$a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/notimeline/notimeline.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/notimeline/notimeline.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */

View File

@ -65,7 +65,7 @@ function nsfw_addon_settings(&$a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
$enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
$words = PConfig::get(local_user(), 'nsfw', 'words');

View File

@ -58,7 +58,7 @@ function numfriends_settings(&$a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */

View File

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

View File

@ -41,7 +41,7 @@ function pageheader_addon_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
$words = Config::get('pageheader','text');
@ -79,7 +79,7 @@ function pageheader_fetch($a,&$b) {
}
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
. $a->get_baseurl() . '/addon/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
. $a->getBaseURL() . '/addon/pageheader/pageheader.css' . '" media="all" />' . "\r\n";
if(! $s)
$s = '';

View File

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

View File

@ -138,7 +138,7 @@ function planets_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/planets/planets.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/planets/planets.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */

View File

@ -30,7 +30,7 @@ function pledgie_addon_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/pledgie/pledgie.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/pledgie/pledgie.css' . '" media="all" />' . "\r\n";
$campaign = Config::get('pledgie-campaign','text');
$describe = Config::get('pledgie-describe','text');

View File

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

View File

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

View File

@ -41,7 +41,7 @@ function qcomment_addon_settings(&$a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
$words = PConfig::get(local_user(), 'qcomment', 'words', L10n::t(':-)') . "\n" . L10n::t(':-(') . "\n" . L10n::t('lol'));

View File

@ -157,7 +157,7 @@ function randplace_settings(&$a,&$s) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */

View File

@ -36,7 +36,7 @@ function remote_permissions_settings(&$a,&$o) {
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */
@ -78,7 +78,7 @@ function remote_permissions_content($a, $item_copy) {
return;
// Find out if the contact lives here
$baseurl = $a->get_baseurl();
$baseurl = $a->getBaseURL();
$baseurl = substr($baseurl, strpos($baseurl, '://') + 3);
if(strpos($r[0]['url'], $baseurl) === false)
return;

View File

@ -33,7 +33,7 @@ function showmore_addon_settings(&$a, &$s)
/* Add our stylesheet to the page so we can make our settings look nice */
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
$enable_checked = (intval(PConfig::get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"');
$chars = PConfig::get(local_user(), 'showmore', 'chars', 1100);

View File

@ -30,459 +30,459 @@ function smiley_pack_smilies_es(&$a,&$b) {
#Animal smileys.
$b['texts'][] = ':conejitoflores';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':conejitoflores' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':conejitoflores' . '" />';
$b['texts'][] = ':pollito';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':pollito' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':pollito' . '" />';
$b['texts'][] = ':abeja';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':abeja' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':abeja' . '" />';
$b['texts'][] = ':mariquita';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':mariquita' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':mariquita' . '" />';
$b['texts'][] = ':araña';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araña' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araña' . '" />';
$b['texts'][] = ':gato';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':gato' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':gato' . '" />';
$b['texts'][] = ':conejito';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':conejito' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':conejito' . '" />';
$b['texts'][] = ':vaca';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
$b['texts'][] = ':cangrejo';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
$b['texts'][] = ':delfín';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':delfín' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':delfín' . '" />';
$b['texts'][] = ':libélula';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libélula' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libélula' . '" />';
$b['texts'][] = ':rana';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':rana' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':rana' . '" />';
$b['texts'][] = ':hamster';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
$b['texts'][] = ':mono';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':mono' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':mono' . '" />';
$b['texts'][] = ':caballo';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
$b['texts'][] = ':loro';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
$b['texts'][] = ':tux';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
$b['texts'][] = ':caracol';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':caracol' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':caracol' . '" />';
$b['texts'][] = ':oveja';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':oveja' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':oveja' . '" />';
$b['texts'][] = ':perro';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':perro' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':perro' . '" />';
$b['texts'][] = ':elefante';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elefante' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elefante' . '" />';
$b['texts'][] = ':pez';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':pez' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':pez' . '" />';
$b['texts'][] = ':jirafa';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':jirafa' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':jirafa' . '" />';
$b['texts'][] = ':cerdo';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cerdo' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cerdo' . '" />';
#Baby Smileys
$b['texts'][] = ':bebé';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bebé' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bebé' . '" />';
$b['texts'][] = ':cuna';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
$b['texts'][] = ':embarazada';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
$b['texts'][] = ':cigüeña';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
#Confused Smileys
$b['texts'][] = ':confundido';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
$b['texts'][] = ':encogehombros';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
$b['texts'][] = ':estúpido';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':estúpido' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':estúpido' . '" />';
$b['texts'][] = ':aturdidp';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':aturdid' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':aturdid' . '" />';
#Cool Smileys
$b['texts'][] = ':afro';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
$b['texts'][] = ':guay';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':guay' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':guay' . '" />';
#Devil/Angel Smileys
$b['texts'][] = ':ángel';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ángel' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ángel' . '" />';
$b['texts'][] = ':querubín';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':querubín' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':querubín' . '" />';
$b['texts'][] = ':ángeldemonio';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':ángeldemonio' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':ángeldemonio' . '" />';
$b['texts'][] = ':gatodemonio';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':gatodemonio' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':gatodemonio' . '" />';
$b['texts'][] = ':diabólico';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
$b['texts'][] = ':adbalancín';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
$b['texts'][] = ':vuelvedemonio';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
$b['texts'][] = ':santo';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
$b['texts'][] = ':tumba';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tumba' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tumba' . '" />';
#Unpleasent smileys.
$b['texts'][] = ':retrete';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':retrete' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':retrete' . '" />';
$b['texts'][] = ':pedoencama';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pedoencama' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pedoencama' . '" />';
$b['texts'][] = ':vómito';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vómito' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vómito' . '" />';
$b['texts'][] = ':pedosonrojo';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pedosonrojo' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pedosonrojo' . '" />';
#Drinks
$b['texts'][] = ':té';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':té' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':té' . '" />';
$b['texts'][] = ':baba';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':baba' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':baba' . '" />';
#Sad smileys
$b['texts'][] = ':llorar';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':llorar' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':llorar' . '" />';
$b['texts'][] = ':prisonero';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonero' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonero' . '" />';
$b['texts'][] = ':suspiro';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':suspiro' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':suspiro' . '" />';
#Smoking - only one smiley in here, maybe it needs moving elsewhere?
$b['texts'][] = ':fumar';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fumar' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fumar' . '" />';
#Sport smileys
$b['texts'][] = ':baloncesto';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':baloncesto' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':baloncesto' . '" />';
$b['texts'][] = ':bolos';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bolos' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bolos' . '" />';
$b['texts'][] = ':enbici';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':enbici' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':enbici' . '" />';
$b['texts'][] = ':dardos';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':dardos' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':dardos' . '" />';
$b['texts'][] = ':esgrima';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':esgrima' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':esgrima' . '" />';
$b['texts'][] = ':golf';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
$b['texts'][] = ':malabares';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':malabares' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':malabares' . '" />';
$b['texts'][] = ':comba';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':comba' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':comba' . '" />';
$b['texts'][] = ':tiroconarco';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':tiroconarco' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':tiroconarco' . '" />';
$b['texts'][] = ':fútbol';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':fútbol' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':fútbol' . '" />';
$b['texts'][] = ':surf';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
$b['texts'][] = ':billar';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
$b['texts'][] = ':tenis';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
$b['texts'][] = ':acaballo';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':acaballo' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':acaballo' . '" />';
#Love smileys
$b['texts'][] = ':tequiero';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':tequiero' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':tequiero' . '" />';
$b['texts'][] = ':enamorada';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':enamorada' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':enamorada' . '" />';
$b['texts'][] = ':amor';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':amor' . '" />';
$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/love.gif' .