diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php index e389d5619..4841ba52e 100644 --- a/birdavatar/birdavatar.php +++ b/birdavatar/birdavatar.php @@ -69,7 +69,7 @@ function birdavatar_addon_settings_post(&$s) } if (!empty($_POST['birdavatar-usebird'])) { - $url = DI::baseUrl()->get() . '/birdavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time(); + $url = DI::baseUrl() . '/birdavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time(); $self = DBA::selectFirst('contact', ['id'], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]); if (!DBA::isResult($self)) { @@ -120,9 +120,9 @@ function birdavatar_lookup(array &$b) { $user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]); if (DBA::isResult($user)) { - $url = DI::baseUrl()->get() . '/birdavatar/' . $user['uid']; + $url = DI::baseUrl() . '/birdavatar/' . $user['uid']; } else { - $url = DI::baseUrl()->get() . '/birdavatar/' . md5(trim(strtolower($b['email']))); + $url = DI::baseUrl() . '/birdavatar/' . md5(trim(strtolower($b['email']))); } switch ($b['size']) { diff --git a/blockem/blockem.php b/blockem/blockem.php index 77c8215d9..ac937a9b7 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -125,7 +125,7 @@ function blockem_prepare_body_content_filter(array &$hook_data) function blockem_display_item(array &$b = null) { if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) { - $b['output']['thumb'] = DI::baseUrl()->get() . "/images/person-80.jpg"; + $b['output']['thumb'] = DI::baseUrl() "/images/person-80.jpg"; } } diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index 69f71ef60..2116ac44b 100644 --- a/catavatar/catavatar.php +++ b/catavatar/catavatar.php @@ -70,7 +70,7 @@ function catavatar_addon_settings_post(&$s) } if (!empty($_POST['catavatar-usecat'])) { - $url = DI::baseUrl()->get() . '/catavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time(); + $url = DI::baseUrl() . '/catavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time(); $self = DBA::selectFirst('contact', ['id'], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]); if (!DBA::isResult($self)) { @@ -121,9 +121,9 @@ function catavatar_lookup(array &$b) { $user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]); if (DBA::isResult($user)) { - $url = DI::baseUrl()->get() . '/catavatar/' . $user['uid']; + $url = DI::baseUrl() . '/catavatar/' . $user['uid']; } else { - $url = DI::baseUrl()->get() . '/catavatar/' . md5(trim(strtolower($b['email']))); + $url = DI::baseUrl() . '/catavatar/' . md5(trim(strtolower($b['email']))); } switch($b['size']) { diff --git a/curweather/curweather.php b/curweather/curweather.php index 6b6c53cc0..f614840a2 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -92,7 +92,7 @@ function curweather_network_mod_init(string &$body) return; } - DI::page()['htmlhead'] .= '' . "\r\n"; + DI::page()['htmlhead'] .= '' . "\r\n"; // $rpt value is needed for location // $lang will be taken from the browser session to honour user settings diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 2e1b3607b..d48ddac62 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -186,7 +186,7 @@ function diaspora_post_local(array &$b) function diaspora_send(array &$b) { - $hostname = DI::baseUrl()->getHostname(); + $hostname = DI::baseUrl()->getHost(); Logger::notice('diaspora_send: invoked'); diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index d0606facf..6d4f402c5 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -55,7 +55,7 @@ function ifttt_settings(array &$data) 'new_photo_upload_body' => DI::l10n()->t('Body for "new photo upload"'), 'new_link_post_body' => DI::l10n()->t('Body for "new link post"'), ], - '$url' => DI::baseUrl()->get() . '/ifttt/' . DI::userSession()->getLocalUserNickname(), + '$url' => DI::baseUrl() . '/ifttt/' . DI::userSession()->getLocalUserNickname(), '$new_status_message_body' => 'key=' . $key . '&type=status&msg=<<<{{Message}}>>>&date=<<<{{UpdatedAt}}>>>&url=<<<{{PageUrl}}>>>', '$new_photo_upload_body' => 'key=' . $key . '&type=photo&link=<<<{{Link}}>>>&image=<<<{{ImageSource}}>>>&msg=<<<{{Caption}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>', '$new_link_post_body' => 'key=' . $key . '&type=link&link=<<<{{Link}}>>>&title=<<<{{Title}}>>>&msg=<<<{{Message}}>>>&description=<<<{{Description}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>', diff --git a/impressum/impressum.php b/impressum/impressum.php index f2564a504..1d572f856 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -48,7 +48,7 @@ function impressum_footer(string &$body) $text = ProxyUtils::proxifyHtml(BBCode::convert(DI::config()->get('impressum', 'footer_text'))); if ($text != '') { - DI::page()['htmlhead'] .= ''; + DI::page()['htmlhead'] .= ''; $body .= '
'; $body .= ''; } diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php index b602d4ad2..aff7aec0b 100644 --- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php +++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php @@ -30,13 +30,12 @@ function infiniteimprobabilitydrive_module() {} function infiniteimprobabilitydrive_content() { - $baseurl = DI::baseUrl()->get() . '/addon/infiniteimprobabilitydrive'; $o = ''; - DI::page()['htmlhead'] .= ''; + DI::page()['htmlhead'] .= ''; - $baseurl = DI::baseUrl()->get(); + $baseurl = (string)DI::baseUrl(); $o .= <<< EOT diff --git a/irc/irc.php b/irc/irc.php index 8bd05fb7c..d44358511 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -73,7 +73,7 @@ function irc_module() {} function irc_content() { - $baseurl = DI::baseUrl()->get() . '/addon/irc'; + $baseurl = DI::baseUrl() . '/addon/irc'; $o = ''; /* set the list of popular channels */ @@ -95,7 +95,7 @@ function irc_content() DI::page()['aside'] .= '

' . DI::l10n()->t('Popular Channels') . '

'; diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index 020a32df9..61b357f6c 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -107,7 +107,7 @@ function langfilter_prepare_body_content_filter(&$hook_data) // Never filter own messages // TODO: find a better way to extract this - $logged_user_profile = DI::baseUrl()->get() . '/profile/' . DI::userSession()->getLocalUserNickname(); + $logged_user_profile = DI::baseUrl() . '/profile/' . DI::userSession()->getLocalUserNickname(); if ($logged_user_profile == $hook_data['item']['author-link']) { return; } diff --git a/libertree/libertree.php b/libertree/libertree.php index 0a909f350..8e8c9ba98 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -162,7 +162,7 @@ function libertree_send(array &$b) $ltree_api_token = DI::pConfig()->get($b['uid'],'libertree','libertree_api_token'); $ltree_url = DI::pConfig()->get($b['uid'],'libertree','libertree_url'); $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token"; - $ltree_source = DI::baseUrl()->getHostname(); + $ltree_source = DI::baseUrl()->getHost(); if ($b['app'] != "") $ltree_source .= " (".$b['app'].")"; diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index bf4c99065..71b123add 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -103,7 +103,7 @@ function mailstream_addon_admin_post() */ function mailstream_generate_id(string $uri): string { - $host = DI::baseUrl()->getHostname(); + $host = DI::baseUrl()->getHost(); $resource = hash('md5', $uri); $message_id = "<" . $resource . "@" . $host . ">"; Logger::debug('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri); @@ -411,7 +411,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool $template = Renderer::getMarkupTemplate('mail.tpl', 'addon/mailstream/'); $mail->AltBody = BBCode::toPlaintext($item['body']); $item['body'] = BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::CONNECTORS); - $item['url'] = DI::baseUrl()->get() . '/display/' . $item['guid']; + $item['url'] = DI::baseUrl() . '/display/' . $item['guid']; $mail->Body = Renderer::replaceMacros($template, [ '$upstream' => DI::l10n()->t('Upstream'), '$local' => DI::l10n()->t('Local'), diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php index 5689971bd..356597b76 100644 --- a/newmemberwidget/newmemberwidget.php +++ b/newmemberwidget/newmemberwidget.php @@ -34,7 +34,7 @@ function newmemberwidget_network_mod_init ($b) } if (DI::config()->get('newmemberwidget','linklocalsupport', false)) { - $t .= ''.DI::l10n()->t('Local Support Forum').'
'; + $t .= ''.DI::l10n()->t('Local Support Forum').'
'; } $ft = DI::config()->get('newmemberwidget','freetext', ''); diff --git a/notifyall/NotifyAllEmail.php b/notifyall/NotifyAllEmail.php index abdb95496..3bb16f274 100644 --- a/notifyall/NotifyAllEmail.php +++ b/notifyall/NotifyAllEmail.php @@ -43,7 +43,7 @@ class NotifyAllEmail extends Email } if (!$config->get('config', 'sender_email')) { - $sender_email = 'noreply@' . $baseUrl->getHostname(); + $sender_email = 'noreply@' . $baseUrl->getHost(); } else { $sender_email = $config->get('config', 'sender_email'); } diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index 0c291f048..966a91843 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -24,7 +24,7 @@ function notifyall_module() {} function notifyall_addon_admin(string &$o) { - $o = '
    ' . DI::l10n()->t('Send email to all members') . '
'; + $o = '
    ' . DI::l10n()->t('Send email to all members') . '
'; } diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index 3c21a51f2..3b7c4a586 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -42,7 +42,7 @@ function openstreetmap_load_config(ConfigFileManager $loader) function openstreetmap_alterheader(&$navHtml) { - $addScriptTag = '' . "\r\n"; + $addScriptTag = '' . "\r\n"; DI::page()['htmlhead'] .= $addScriptTag; } @@ -145,7 +145,7 @@ function openstreetmap_generate_map(array &$b) { $tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS); - if (strpos(DI::baseUrl()->get(true), 'https:') !== false) { + if (strpos(DI::baseUrl(), 'https:') !== false) { $tmsserver = str_replace('http:','https:',$tmsserver); } diff --git a/piwik/piwik.php b/piwik/piwik.php index ad2bed754..89893d7a1 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -60,7 +60,7 @@ function piwik_analytics(string &$b) * associated CSS file. We just have to tell Friendica to get it * into the page header. */ - DI::page()['htmlhead'] .= ''; + DI::page()['htmlhead'] .= ''; /* * Get the configuration values. diff --git a/public_server/public_server.php b/public_server/public_server.php index 792010075..7591c7d0d 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -59,8 +59,8 @@ function public_server_cron($b) 'uid' => $rr['uid'], 'system_type' => 'public_server_expire', 'source_name' => DI::l10n()->t('Administrator'), - 'source_link' => DI::baseUrl()->get(), - 'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg', + 'source_link' => DI::baseUrl(), + 'source_photo' => DI::baseUrl() . '/images/person-80.jpg', ]); $fields = ['expire_notification_sent' => DateTimeFormat::utcNow()]; @@ -104,7 +104,7 @@ function public_server_enotify(array &$b) { if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') { - $b['itemlink'] = DI::baseUrl()->get(); + $b['itemlink'] = DI::baseUrl(); $b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename')); $b['subject'] = DI::l10n()->t('Your Friendica account is about to expire.'); $b['body'] = DI::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=" . DI::config()->get('system', 'url') . "]" . DI::config()->get('config', 'sitename') . "[/url]"); diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 11cac8cdb..026bd089f 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -96,7 +96,7 @@ function pumpio_registerclient($host) $application_name = DI::config()->get('pumpio', 'application_name'); if ($application_name == '') { - $application_name = DI::baseUrl()->getHostname(); + $application_name = DI::baseUrl()->getHost(); } $firstAdmin = User::getFirstAdmin(['email']); @@ -105,8 +105,8 @@ function pumpio_registerclient($host) $params['contacts'] = $firstAdmin['email']; $params['application_type'] = 'native'; $params['application_name'] = $application_name; - $params['logo_url'] = DI::baseUrl()->get() . '/images/friendica-256.png'; - $params['redirect_uris'] = DI::baseUrl()->get() . '/pumpio/connect'; + $params['logo_url'] = DI::baseUrl() . '/images/friendica-256.png'; + $params['redirect_uris'] = DI::baseUrl() . '/pumpio/connect'; Logger::info('pumpio_registerclient: ' . $url . ' parameters', $params); @@ -157,7 +157,7 @@ function pumpio_connect() } // The callback URL is the script that gets called after the user authenticates with pumpio - $callback_url = DI::baseUrl()->get() . '/pumpio/connect'; + $callback_url = DI::baseUrl() . '/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. @@ -194,7 +194,7 @@ function pumpio_connect() if ($success) { Logger::notice('pumpio_connect: authenticated'); $o = DI::l10n()->t('You are now authenticated to pumpio.'); - $o .= '
' . DI::l10n()->t('return to the connector page') . ''; + $o .= '
' . DI::l10n()->t('return to the connector page') . ''; } else { Logger::notice('pumpio_connect: could not connect'); $o = 'Could not connect to pumpio. Refresh the page or try again later.'; @@ -252,7 +252,7 @@ function pumpio_settings(array &$data) '$pumpio_user' => $pumpio_user, '$oauth_token' => $oauth_token, '$oauth_token_secret' => $oauth_token_secret, - '$authenticate_url' => DI::baseUrl()->get() . '/pumpio/connect', + '$authenticate_url' => DI::baseUrl() . '/pumpio/connect', '$servername' => ['pumpio_host', DI::l10n()->t('Pump.io servername (without "http://" or "https://" )'), $pumpio_host], '$username' => ['pumpio_user', DI::l10n()->t('Pump.io username (without the servername)'), $pumpio_user], '$import' => ['pumpio_import', DI::l10n()->t('Import the remote timeline'), $import_enabled], @@ -711,7 +711,7 @@ function pumpio_fetchtimeline(int $uid) $application_name = DI::config()->get('pumpio', 'application_name'); } if ($application_name == '') { - $application_name = DI::baseUrl()->getHostname(); + $application_name = DI::baseUrl()->getHost(); } $first_time = ($lastdate == ''); diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php index 2832adbab..c614104f4 100644 --- a/securemail/SecureTestEmail.php +++ b/securemail/SecureTestEmail.php @@ -38,7 +38,7 @@ class SecureTestEmail extends Email { $sitename = $config->get('config', 'sitename'); - $hostname = $baseUrl->getHostname(); + $hostname = $baseUrl->getHost(); if (strpos($hostname, ':')) { $hostname = substr($hostname, 0, strpos($hostname, ':')); } 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 b76033f42..38b208da1 100644 --- a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php +++ b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php @@ -27,459 +27,459 @@ function smiley_pack_smilies_es(array &$b) { #Animal smileys. $b['texts'][] = ':conejitoflores'; - $b['icons'][] = '' . ':conejitoflores' . ''; + $b['icons'][] = '' . ':conejitoflores' . ''; $b['texts'][] = ':pollito'; - $b['icons'][] = '' . ':pollito' . ''; + $b['icons'][] = '' . ':pollito' . ''; $b['texts'][] = ':abeja'; - $b['icons'][] = '' . ':abeja' . ''; + $b['icons'][] = '' . ':abeja' . ''; $b['texts'][] = ':mariquita'; - $b['icons'][] = '' . ':mariquita' . ''; + $b['icons'][] = '' . ':mariquita' . ''; $b['texts'][] = ':araña'; - $b['icons'][] = '' . ':araña' . ''; + $b['icons'][] = '' . ':araña' . ''; $b['texts'][] = ':gato'; - $b['icons'][] = '' . ':gato' . ''; + $b['icons'][] = '' . ':gato' . ''; $b['texts'][] = ':conejito'; - $b['icons'][] = '' . ':conejito' . ''; + $b['icons'][] = '' . ':conejito' . ''; $b['texts'][] = ':vaca'; - $b['icons'][] = '' . ':vaca' . ''; + $b['icons'][] = '' . ':vaca' . ''; $b['texts'][] = ':cangrejo'; - $b['icons'][] = '' . ':cangrejo' . ''; + $b['icons'][] = '' . ':cangrejo' . ''; $b['texts'][] = ':delfín'; - $b['icons'][] = '' . ':delfín' . ''; + $b['icons'][] = '' . ':delfín' . ''; $b['texts'][] = ':libélula'; - $b['icons'][] = '' . ':libélula' . ''; + $b['icons'][] = '' . ':libélula' . ''; $b['texts'][] = ':rana'; - $b['icons'][] = '' . ':rana' . ''; + $b['icons'][] = '' . ':rana' . ''; $b['texts'][] = ':hamster'; - $b['icons'][] = '' . ':hamster' . ''; + $b['icons'][] = '' . ':hamster' . ''; $b['texts'][] = ':mono'; - $b['icons'][] = '' . ':mono' . ''; + $b['icons'][] = '' . ':mono' . ''; $b['texts'][] = ':caballo'; - $b['icons'][] = '' . ':caballo' . ''; + $b['icons'][] = '' . ':caballo' . ''; $b['texts'][] = ':loro'; - $b['icons'][] = '' . ':loro' . ''; + $b['icons'][] = '' . ':loro' . ''; $b['texts'][] = ':tux'; - $b['icons'][] = '' . ':tux' . ''; + $b['icons'][] = '' . ':tux' . ''; $b['texts'][] = ':caracol'; - $b['icons'][] = '' . ':caracol' . ''; + $b['icons'][] = '' . ':caracol' . ''; $b['texts'][] = ':oveja'; - $b['icons'][] = '' . ':oveja' . ''; + $b['icons'][] = '' . ':oveja' . ''; $b['texts'][] = ':perro'; - $b['icons'][] = '' . ':perro' . ''; + $b['icons'][] = '' . ':perro' . ''; $b['texts'][] = ':elefante'; - $b['icons'][] = '' . ':elefante' . ''; + $b['icons'][] = '' . ':elefante' . ''; $b['texts'][] = ':pez'; - $b['icons'][] = '' . ':pez' . ''; + $b['icons'][] = '' . ':pez' . ''; $b['texts'][] = ':jirafa'; - $b['icons'][] = '' . ':jirafa' . ''; + $b['icons'][] = '' . ':jirafa' . ''; $b['texts'][] = ':cerdo'; - $b['icons'][] = '' . ':cerdo' . ''; + $b['icons'][] = '' . ':cerdo' . ''; #Baby Smileys $b['texts'][] = ':bebé'; - $b['icons'][] = '' . ':bebé' . ''; + $b['icons'][] = '' . ':bebé' . ''; $b['texts'][] = ':cuna'; - $b['icons'][] = '' . ':cuna' . ''; + $b['icons'][] = '' . ':cuna' . ''; $b['texts'][] = ':embarazada'; - $b['icons'][] = '' . ':embarazada' . ''; + $b['icons'][] = '' . ':embarazada' . ''; $b['texts'][] = ':cigüeña'; - $b['icons'][] = '' . ':cigüeña' . ''; + $b['icons'][] = '' . ':cigüeña' . ''; #Confused Smileys $b['texts'][] = ':confundido'; - $b['icons'][] = '' . ':confundido' . ''; + $b['icons'][] = '' . ':confundido' . ''; $b['texts'][] = ':encogehombros'; - $b['icons'][] = '' . ':encogehombros' . ''; + $b['icons'][] = '' . ':encogehombros' . ''; $b['texts'][] = ':estúpido'; - $b['icons'][] = '' . ':estúpido' . ''; + $b['icons'][] = '' . ':estúpido' . ''; $b['texts'][] = ':aturdidp'; - $b['icons'][] = '' . ':aturdid' . ''; + $b['icons'][] = '' . ':aturdid' . ''; #Cool Smileys $b['texts'][] = ':afro'; - $b['icons'][] = '' . ':afro' . ''; + $b['icons'][] = '' . ':afro' . ''; $b['texts'][] = ':guay'; - $b['icons'][] = '' . ':guay' . ''; + $b['icons'][] = '' . ':guay' . ''; #Devil/Angel Smileys $b['texts'][] = ':ángel'; - $b['icons'][] = '' . ':ángel' . ''; + $b['icons'][] = '' . ':ángel' . ''; $b['texts'][] = ':querubín'; - $b['icons'][] = '' . ':querubín' . ''; + $b['icons'][] = '' . ':querubín' . ''; $b['texts'][] = ':ángeldemonio'; - $b['icons'][] = '' . ':ángeldemonio' . ''; + $b['icons'][] = '' . ':ángeldemonio' . ''; $b['texts'][] = ':gatodemonio'; - $b['icons'][] = '' . ':gatodemonio' . ''; + $b['icons'][] = '' . ':gatodemonio' . ''; $b['texts'][] = ':diabólico'; - $b['icons'][] = '' . ':diabólico' . ''; + $b['icons'][] = '' . ':diabólico' . ''; $b['texts'][] = ':adbalancín'; - $b['icons'][] = '' . ':adbalancín' . ''; + $b['icons'][] = '' . ':adbalancín' . ''; $b['texts'][] = ':vuelvedemonio'; - $b['icons'][] = '' . ':vuelvedemonio' . ''; + $b['icons'][] = '' . ':vuelvedemonio' . ''; $b['texts'][] = ':santo'; - $b['icons'][] = '' . ':santo' . ''; + $b['icons'][] = '' . ':santo' . ''; $b['texts'][] = ':tumba'; - $b['icons'][] = '' . ':tumba' . ''; + $b['icons'][] = '' . ':tumba' . ''; #Unpleasent smileys. $b['texts'][] = ':retrete'; - $b['icons'][] = '' . ':retrete' . ''; + $b['icons'][] = '' . ':retrete' . ''; $b['texts'][] = ':pedoencama'; - $b['icons'][] = '' . ':pedoencama' . ''; + $b['icons'][] = '' . ':pedoencama' . ''; $b['texts'][] = ':vómito'; - $b['icons'][] = '' . ':vómito' . ''; + $b['icons'][] = '' . ':vómito' . ''; $b['texts'][] = ':pedosonrojo'; - $b['icons'][] = '' . ':pedosonrojo' . ''; + $b['icons'][] = '' . ':pedosonrojo' . ''; #Drinks $b['texts'][] = ':té'; - $b['icons'][] = '' . ':té' . ''; + $b['icons'][] = '' . ':té' . ''; $b['texts'][] = ':baba'; - $b['icons'][] = '' . ':baba' . ''; + $b['icons'][] = '' . ':baba' . ''; #Sad smileys $b['texts'][] = ':llorar'; - $b['icons'][] = '' . ':llorar' . ''; + $b['icons'][] = '' . ':llorar' . ''; $b['texts'][] = ':prisonero'; - $b['icons'][] = '' . ':prisonero' . ''; + $b['icons'][] = '' . ':prisonero' . ''; $b['texts'][] = ':suspiro'; - $b['icons'][] = '' . ':suspiro' . ''; + $b['icons'][] = '' . ':suspiro' . ''; #Smoking - only one smiley in here, maybe it needs moving elsewhere? $b['texts'][] = ':fumar'; - $b['icons'][] = '' . ':fumar' . ''; + $b['icons'][] = '' . ':fumar' . ''; #Sport smileys $b['texts'][] = ':baloncesto'; - $b['icons'][] = '' . ':baloncesto' . ''; + $b['icons'][] = '' . ':baloncesto' . ''; $b['texts'][] = ':bolos'; - $b['icons'][] = '' . ':bolos' . ''; + $b['icons'][] = '' . ':bolos' . ''; $b['texts'][] = ':enbici'; - $b['icons'][] = '' . ':enbici' . ''; + $b['icons'][] = '' . ':enbici' . ''; $b['texts'][] = ':dardos'; - $b['icons'][] = '' . ':dardos' . ''; + $b['icons'][] = '' . ':dardos' . ''; $b['texts'][] = ':esgrima'; - $b['icons'][] = '' . ':esgrima' . ''; + $b['icons'][] = '' . ':esgrima' . ''; $b['texts'][] = ':golf'; - $b['icons'][] = '' . ':golf' . ''; + $b['icons'][] = '' . ':golf' . ''; $b['texts'][] = ':malabares'; - $b['icons'][] = '' . ':malabares' . ''; + $b['icons'][] = '' . ':malabares' . ''; $b['texts'][] = ':comba'; - $b['icons'][] = '' . ':comba' . ''; + $b['icons'][] = '' . ':comba' . ''; $b['texts'][] = ':tiroconarco'; - $b['icons'][] = '' . ':tiroconarco' . ''; + $b['icons'][] = '' . ':tiroconarco' . ''; $b['texts'][] = ':fútbol'; - $b['icons'][] = '' . ':fútbol' . ''; + $b['icons'][] = '' . ':fútbol' . ''; $b['texts'][] = ':surf'; - $b['icons'][] = '' . ':surf' . ''; + $b['icons'][] = '' . ':surf' . ''; $b['texts'][] = ':billar'; - $b['icons'][] = '' . ':billar' . ''; + $b['icons'][] = '' . ':billar' . ''; $b['texts'][] = ':tenis'; - $b['icons'][] = '' . ':tenis' . ''; + $b['icons'][] = '' . ':tenis' . ''; $b['texts'][] = ':acaballo'; - $b['icons'][] = '' . ':acaballo' . ''; + $b['icons'][] = '' . ':acaballo' . ''; #Love smileys $b['texts'][] = ':tequiero'; - $b['icons'][] = '' . ':tequiero' . ''; + $b['icons'][] = '' . ':tequiero' . ''; $b['texts'][] = ':enamorada'; - $b['icons'][] = '' . ':enamorada' . ''; + $b['icons'][] = '' . ':enamorada' . ''; $b['texts'][] = ':amor'; - $b['icons'][] = '' . ':amor' . ''; + $b['icons'][] = '' . ':amor' . ''; $b['texts'][] = ':osoamoroso'; - $b['icons'][] = '' . ':osoamoroso' . ''; + $b['icons'][] = '' . ':osoamoroso' . ''; $b['texts'][] = ':camaamor'; - $b['icons'][] = '' . ':camaamor' . ''; + $b['icons'][] = '' . ':camaamor' . ''; $b['texts'][] = ':corazónamor'; - $b['icons'][] = '' . ':corazónamor' . ''; + $b['icons'][] = '' . ':corazónamor' . ''; #Tired/Sleep smileys $b['texts'][] = ':contandoovejas'; - $b['icons'][] = '' . ':contandoovejas' . ''; + $b['icons'][] = '' . ':contandoovejas' . ''; $b['texts'][] = ':hamaca'; - $b['icons'][] = '' . ':hamaca' . ''; + $b['icons'][] = '' . ':hamaca' . ''; $b['texts'][] = ':almohada'; - $b['icons'][] = '' . ':almohada' . ''; + $b['icons'][] = '' . ':almohada' . ''; $b['texts'][] = ':bostezo'; - $b['icons'][] = '' . ':bostezo' . ''; + $b['icons'][] = '' . ':bostezo' . ''; #Fight/Flame/Violent smileys $b['texts'][] = ':pistolas'; - $b['icons'][] = '' . ':pistolas' . ''; + $b['icons'][] = '' . ':pistolas' . ''; $b['texts'][] = ':peleamarciano'; - $b['icons'][] = '' . ':peleamarciano' . ''; + $b['icons'][] = '' . ':peleamarciano' . ''; $b['texts'][] = ':alfa'; - $b['icons'][] = '' . ':alfa' . ''; + $b['icons'][] = '' . ':alfa' . ''; $b['texts'][] = ':ejército'; - $b['icons'][] = '' . ':ejército' . ''; + $b['icons'][] = '' . ':ejército' . ''; $b['texts'][] = ':cabezaflecha'; - $b['icons'][] = '' . ':cabezaflecha' . ''; + $b['icons'][] = '' . ':cabezaflecha' . ''; $b['texts'][] = ':bfg'; - $b['icons'][] = '' . ':bfg' . ''; + $b['icons'][] = '' . ':bfg' . ''; $b['texts'][] = ':arquero'; - $b['icons'][] = '' . ':arquero' . ''; + $b['icons'][] = '' . ':arquero' . ''; $b['texts'][] = ':motosierra'; - $b['icons'][] = '' . ':motosierra' . ''; + $b['icons'][] = '' . ':motosierra' . ''; $b['texts'][] = ':ballesta'; - $b['icons'][] = '' . ':ballesta' . ''; + $b['icons'][] = '' . ':ballesta' . ''; $b['texts'][] = ':cruzado'; - $b['icons'][] = '' . ':cruzado' . ''; + $b['icons'][] = '' . ':cruzado' . ''; $b['texts'][] = ':muerto'; - $b['icons'][] = '' . ':muerto' . ''; + $b['icons'][] = '' . ':muerto' . ''; $b['texts'][] = ':martillazo'; - $b['icons'][] = '' . ':martillazo' . ''; + $b['icons'][] = '' . ':martillazo' . ''; $b['texts'][] = ':pistolalaser'; - $b['icons'][] = '' . ':pistolalaser' . ''; + $b['icons'][] = '' . ':pistolalaser' . ''; $b['texts'][] = ':metralleta'; - $b['icons'][] = '' . ':metralleta' . ''; + $b['icons'][] = '' . ':metralleta' . ''; $b['texts'][] = ':marine'; - $b['icons'][] = '' . ':marine' . ''; + $b['icons'][] = '' . ':marine' . ''; $b['texts'][] = ':sable'; - $b['icons'][] = '' . ':sable' . ''; + $b['icons'][] = '' . ':sable' . ''; $b['texts'][] = ':tanque'; - $b['icons'][] = '' . ':tanque' . ''; + $b['icons'][] = '' . ':tanque' . ''; $b['texts'][] = ':vikingo'; - $b['icons'][] = '' . ':vikingo' . ''; + $b['icons'][] = '' . ':vikingo' . ''; $b['texts'][] = ':bandas'; - $b['icons'][] = '' . ':bandas' . ''; + $b['icons'][] = '' . ':bandas' . ''; $b['texts'][] = ':ácido'; - $b['icons'][] = '' . ':ácido' . ''; + $b['icons'][] = '' . ':ácido' . ''; #Fantasy smileys - monsters and dragons fantasy. The other type of fantasy belongs in adult smileys $b['texts'][] = ':alien'; - $b['icons'][] = '' . ':alien' . ''; + $b['icons'][] = '' . ':alien' . ''; $b['texts'][] = ':bárbaro'; - $b['icons'][] = '' . ':bárbaro' . ''; + $b['icons'][] = '' . ':bárbaro' . ''; $b['texts'][] = ':dinosaurio'; - $b['icons'][] = '' . ':dinosaurio' . ''; + $b['icons'][] = '' . ':dinosaurio' . ''; $b['texts'][] = ':dragón'; - $b['icons'][] = '' . ':dragón' . ''; + $b['icons'][] = '' . ':dragón' . ''; $b['texts'][] = ':draco'; - $b['icons'][] = '' . ':draco' . ''; + $b['icons'][] = '' . ':draco' . ''; $b['texts'][] = ':fantasma'; - $b['icons'][] = '' . ':fantasma' . ''; + $b['icons'][] = '' . ':fantasma' . ''; $b['texts'][] = ':momia'; - $b['icons'][] = '' . ':momia' . ''; + $b['icons'][] = '' . ':momia' . ''; #Food smileys $b['texts'][] = ':mazana'; - $b['icons'][] = '' . ':mazana' . ''; + $b['icons'][] = '' . ':mazana' . ''; $b['texts'][] = ':brócoli'; - $b['icons'][] = '' . ':brócoli' . ''; + $b['icons'][] = '' . ':brócoli' . ''; $b['texts'][] = ':pastel'; - $b['icons'][] = '' . ':pastel' . ''; + $b['icons'][] = '' . ':pastel' . ''; $b['texts'][] = ':zanahoria'; - $b['icons'][] = '' . ':zanahoria' . ''; + $b['icons'][] = '' . ':zanahoria' . ''; $b['texts'][] = ':palomitas'; - $b['icons'][] = '' . ':palomitas' . ''; + $b['icons'][] = '' . ':palomitas' . ''; $b['texts'][] = ':tomate'; - $b['icons'][] = '' . ':tomate' . ''; + $b['icons'][] = '' . ':tomate' . ''; $b['texts'][] = ':plátano'; - $b['icons'][] = '' . ':plátano' . ''; + $b['icons'][] = '' . ':plátano' . ''; $b['texts'][] = ':cocinar'; - $b['icons'][] = '' . ':cocinar' . ''; + $b['icons'][] = '' . ':cocinar' . ''; $b['texts'][] = ':huevofrito'; - $b['icons'][] = '' . ':huevofrito' . ''; + $b['icons'][] = '' . ':huevofrito' . ''; #Happy smileys $b['texts'][] = ':cloud9'; - $b['icons'][] = '' . ':cloud9' . ''; + $b['icons'][] = '' . ':cloud9' . ''; $b['texts'][] = ':tearsofjoy'; - $b['icons'][] = '' . ':tearsofjoy' . ''; + $b['icons'][] = '' . ':tearsofjoy' . ''; #Repsect smileys $b['texts'][] = ':reverencia'; - $b['icons'][] = '' . ':reverencia' . ''; + $b['icons'][] = '' . ':reverencia' . ''; $b['texts'][] = ':bravo'; - $b['icons'][] = '' . ':bravo' . ''; + $b['icons'][] = '' . ':bravo' . ''; $b['texts'][] = ':vivaelrey'; - $b['icons'][] = '' . ':vivaelrey' . ''; + $b['icons'][] = '' . ':vivaelrey' . ''; $b['texts'][] = ':número1'; - $b['icons'][] = '' . ':número1' . ''; + $b['icons'][] = '' . ':número1' . ''; #Laugh smileys $b['texts'][] = ':jajaja'; - $b['icons'][] = '' . ':jajaja' . ''; + $b['icons'][] = '' . ':jajaja' . ''; $b['texts'][] = ':jajatv'; - $b['icons'][] = '' . ':jajatv' . ''; + $b['icons'][] = '' . ':jajatv' . ''; $b['texts'][] = ':meparto'; - $b['icons'][] = '' . ':meparto' . ''; + $b['icons'][] = '' . ':meparto' . ''; #Music smileys $b['texts'][] = ':dj'; - $b['icons'][] = '' . ':dj' . ''; + $b['icons'][] = '' . ':dj' . ''; $b['texts'][] = ':batería'; - $b['icons'][] = '' . ':batería' . ''; + $b['icons'][] = '' . ':batería' . ''; $b['texts'][] = ':elvis'; - $b['icons'][] = '' . ':elivs' . ''; + $b['icons'][] = '' . ':elivs' . ''; $b['texts'][] = ':guitarra'; - $b['icons'][] = '' . ':guitarra' . ''; + $b['icons'][] = '' . ':guitarra' . ''; $b['texts'][] = ':trompeta'; - $b['icons'][] = '' . ':trompeta' . ''; + $b['icons'][] = '' . ':trompeta' . ''; $b['texts'][] = ':violín'; - $b['icons'][] = '' . ':violín' . ''; + $b['icons'][] = '' . ':violín' . ''; #Smileys that used to be in core $b['texts'][] = ':cabezagolpe'; - $b['icons'][] = '' . ':cabezagolpe' . ''; + $b['icons'][] = '' . ':cabezagolpe' . ''; $b['texts'][] = ':barba'; - $b['icons'][] = '' . ':barba' . ''; + $b['icons'][] = '' . ':barba' . ''; $b['texts'][] = ':barbablanca'; - $b['icons'][] = '' . ':barbablanca' . ''; + $b['icons'][] = '' . ':barbablanca' . ''; $b['texts'][] = ':saludosurf'; - $b['icons'][] = '' . ':saludosurf' . ''; + $b['icons'][] = '' . ':saludosurf' . ''; $b['texts'][] = ':\\.../'; - $b['icons'][] = '' . ':\\.../' . ''; + $b['icons'][] = '' . ':\\.../' . ''; $b['texts'][] = ':\\ooo/'; - $b['icons'][] = '' . ':\\ooo/' . ''; + $b['icons'][] = '' . ':\\ooo/' . ''; $b['texts'][] = ':cabezamesa'; - $b['icons'][] = '' . ':cabezamesa' . ''; + $b['icons'][] = '' . ':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'][] = '' . ':-d' . ''; + $b['icons'][] = '' . ':-d' . ''; $b['texts'][] = ':-o'; - $b['icons'][] = '' . ':-o' . ''; + $b['icons'][] = '' . ':-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 feceab261..63cf613e0 100644 --- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php +++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php @@ -31,377 +31,377 @@ function smiley_pack_fr_smilies(array &$b) #Animal smileys. $b['texts'][] = ':fleurslapin'; - $b['icons'][] = '' . ':fleurslapin' . ''; + $b['icons'][] = '' . ':fleurslapin' . ''; $b['texts'][] = ':poussin'; - $b['icons'][] = '' . ':poussin' . ''; + $b['icons'][] = '' . ':poussin' . ''; $b['texts'][] = ':bourdon'; - $b['icons'][] = '' . ':bourdon' . ''; + $b['icons'][] = '' . ':bourdon' . ''; $b['texts'][] = ':coccinelle'; - $b['icons'][] = '' . ':coccinelle' . ''; + $b['icons'][] = '' . ':coccinelle' . ''; $b['texts'][] = ':araignée'; - $b['icons'][] = '' . ':araignée' . ''; + $b['icons'][] = '' . ':araignée' . ''; $b['texts'][] = ':chat'; - $b['icons'][] = '' . ':chat' . ''; + $b['icons'][] = '' . ':chat' . ''; $b['texts'][] = ':lapin'; - $b['icons'][] = '' . ':lapin' . ''; + $b['icons'][] = '' . ':lapin' . ''; $b['texts'][] = ':poussin'; - $b['icons'][] = '' . ':poussin' . ''; + $b['icons'][] = '' . ':poussin' . ''; $b['texts'][] = ':vache'; - $b['icons'][] = '' . ':vache' . ''; + $b['icons'][] = '' . ':vache' . ''; $b['texts'][] = ':crabe'; - $b['icons'][] = '' . ':crabe' . ''; + $b['icons'][] = '' . ':crabe' . ''; $b['texts'][] = ':dauphin'; - $b['icons'][] = '' . ':dauphin' . ''; + $b['icons'][] = '' . ':dauphin' . ''; $b['texts'][] = ':libellule'; - $b['icons'][] = '' . ':libellule' . ''; + $b['icons'][] = '' . ':libellule' . ''; $b['texts'][] = ':grenouille'; - $b['icons'][] = '' . ':grenouille' . ''; + $b['icons'][] = '' . ':grenouille' . ''; $b['texts'][] = ':singe'; - $b['icons'][] = '' . ':singe' . ''; + $b['icons'][] = '' . ':singe' . ''; $b['texts'][] = ':cheval'; - $b['icons'][] = '' . ':cheval' . ''; + $b['icons'][] = '' . ':cheval' . ''; $b['texts'][] = ':perroquet'; - $b['icons'][] = '' . ':perroquet' . ''; + $b['icons'][] = '' . ':perroquet' . ''; $b['texts'][] = ':escargot'; - $b['icons'][] = '' . ':escargot' . ''; + $b['icons'][] = '' . ':escargot' . ''; $b['texts'][] = ':mouton'; - $b['icons'][] = '' . ':mouton' . ''; + $b['icons'][] = '' . ':mouton' . ''; $b['texts'][] = ':chien'; - $b['icons'][] = '' . ':chien' . ''; + $b['icons'][] = '' . ':chien' . ''; $b['texts'][] = ':éléphant'; - $b['icons'][] = '' . ':éléphant' . ''; + $b['icons'][] = '' . ':éléphant' . ''; $b['texts'][] = ':poisson'; - $b['icons'][] = '' . ':poisson' . ''; + $b['icons'][] = '' . ':poisson' . ''; $b['texts'][] = ':girafe'; - $b['icons'][] = '' . ':girafe' . ''; + $b['icons'][] = '' . ':girafe' . ''; $b['texts'][] = ':cochon'; - $b['icons'][] = '' . ':cochon' . ''; + $b['icons'][] = '' . ':cochon' . ''; #Baby Smileys $b['texts'][] = ':bébé'; - $b['icons'][] = '' . ':bébé' . ''; + $b['icons'][] = '' . ':bébé' . ''; $b['texts'][] = ':litbébé'; - $b['icons'][] = '' . ':litbébé' . ''; + $b['icons'][] = '' . ':litbébé' . ''; $b['texts'][] = ':enceinte'; - $b['icons'][] = '' . ':enceinte' . ''; + $b['icons'][] = '' . ':enceinte' . ''; $b['texts'][] = ':cigogne'; - $b['icons'][] = '' . ':cigogne' . ''; + $b['icons'][] = '' . ':cigogne' . ''; #Confused Smileys $b['texts'][] = ':paumé'; - $b['icons'][] = '' . ':paumé' . ''; + $b['icons'][] = '' . ':paumé' . ''; $b['texts'][] = ':hausseépaules'; - $b['icons'][] = '' . ':hausseépaules' . ''; + $b['icons'][] = '' . ':hausseépaules' . ''; $b['texts'][] = ':stupide'; - $b['icons'][] = '' . ':stupide' . ''; + $b['icons'][] = '' . ':stupide' . ''; $b['texts'][] = ':hébété'; - $b['icons'][] = '' . ':hébété' . ''; + $b['icons'][] = '' . ':hébété' . ''; #Cool Smileys $b['texts'][] = ':afro'; - $b['icons'][] = '' . ':afro' . ''; + $b['icons'][] = '' . ':afro' . ''; #Devil/Angel Smileys $b['texts'][] = ':ange'; - $b['icons'][] = '' . ':ange' . ''; + $b['icons'][] = '' . ':ange' . ''; $b['texts'][] = ':chérubin'; - $b['icons'][] = '' . ':chérubin' . ''; + $b['icons'][] = '' . ':chérubin' . ''; $b['texts'][] = ':démonange'; - $b['icons'][] = '' . ':démonange' . ''; + $b['icons'][] = '' . ':démonange' . ''; $b['texts'][] = ':diablechat'; - $b['icons'][] = '' . ':diablechat' . ''; + $b['icons'][] = '' . ':diablechat' . ''; $b['texts'][] = ':démoniaque'; - $b['icons'][] = '' . ':démoniaque' . ''; + $b['icons'][] = '' . ':démoniaque' . ''; $b['texts'][] = ':bascule'; - $b['icons'][] = '' . ':bascule' . ''; + $b['icons'][] = '' . ':bascule' . ''; $b['texts'][] = ':possédé'; - $b['icons'][] = '' . ':possédé' . ''; + $b['icons'][] = '' . ':possédé' . ''; $b['texts'][] = ':tombe'; - $b['icons'][] = '' . ':tombe' . ''; + $b['icons'][] = '' . ':tombe' . ''; #Unpleasent smileys. $b['texts'][] = ':toilettes'; - $b['icons'][] = '' . ':toilettes' . ''; + $b['icons'][] = '' . ':toilettes' . ''; $b['texts'][] = ':pèteaulit'; - $b['icons'][] = '' . ':pèteaulit' . ''; + $b['icons'][] = '' . ':pèteaulit' . ''; $b['texts'][] = ':pet'; - $b['icons'][] = '' . ':pet' . ''; + $b['icons'][] = '' . ':pet' . ''; #Drinks $b['texts'][] = ':thé'; - $b['icons'][] = '' . ':thé' . ''; + $b['icons'][] = '' . ':thé' . ''; $b['texts'][] = ':salive'; - $b['icons'][] = '' . ':salive' . ''; + $b['icons'][] = '' . ':salive' . ''; #Sad smileys $b['texts'][] = ':pleure'; - $b['icons'][] = '' . ':pleure' . ''; + $b['icons'][] = '' . ':pleure' . ''; $b['texts'][] = ':prisonnier'; - $b['icons'][] = '' . ':prisonnier' . ''; + $b['icons'][] = '' . ':prisonnier' . ''; $b['texts'][] = ':soupir'; - $b['icons'][] = '' . ':soupir' . ''; + $b['icons'][] = '' . ':soupir' . ''; #Smoking - only one smiley in here, maybe it needs moving elsewhere? $b['texts'][] = ':fume'; - $b['icons'][] = '' . ':fume' . ''; + $b['icons'][] = '' . ':fume' . ''; #Sport smileys $b['texts'][] = ':basket'; - $b['icons'][] = '' . ':basket' . ''; + $b['icons'][] = '' . ':basket' . ''; $b['texts'][] = ':vélo'; - $b['icons'][] = '' . ':vélo' . ''; + $b['icons'][] = '' . ':vélo' . ''; $b['texts'][] = ':fléchettes'; - $b['icons'][] = '' . ':fléchettes' . ''; + $b['icons'][] = '' . ':fléchettes' . ''; $b['texts'][] = ':escrime'; - $b['icons'][] = '' . ':escrime' . ''; + $b['icons'][] = '' . ':escrime' . ''; $b['texts'][] = ':jonglage'; - $b['icons'][] = '' . ':jonglage' . ''; + $b['icons'][] = '' . ':jonglage' . ''; $b['texts'][] = ':sautàlacorde'; - $b['icons'][] = '' . ':sautàlacorde' . ''; + $b['icons'][] = '' . ':sautàlacorde' . ''; $b['texts'][] = ':arc'; - $b['icons'][] = '' . ':arc' . ''; + $b['icons'][] = '' . ':arc' . ''; $b['texts'][] = ':surf'; - $b['icons'][] = '' . ':surf' . ''; + $b['icons'][] = '' . ':surf' . ''; $b['texts'][] = ':billard'; - $b['icons'][] = '' . ':billard' . ''; + $b['icons'][] = '' . ':billard' . ''; $b['texts'][] = ':équitation'; - $b['icons'][] = '' . ':équitation' . ''; + $b['icons'][] = '' . ':équitation' . ''; #Love smileys $b['texts'][] = ':jetaime'; - $b['icons'][] = '' . ':jetaime' . ''; + $b['icons'][] = '' . ':jetaime' . ''; $b['texts'][] = ':amoureux'; - $b['icons'][] = '' . ':amoureux' . ''; + $b['icons'][] = '' . ':amoureux' . ''; $b['texts'][] = ':oursamour'; - $b['icons'][] = '' . ':oursamour' . ''; + $b['icons'][] = '' . ':oursamour' . ''; $b['texts'][] = ':amourlit'; - $b['icons'][] = '' . ':amourlit' . ''; + $b['icons'][] = '' . ':amourlit' . ''; $b['texts'][] = ':coeur'; - $b['icons'][] = '' . ':coeur' . ''; + $b['icons'][] = '' . ':coeur' . ''; #Tired/Sleep smileys $b['texts'][] = ':comptemoutons'; - $b['icons'][] = '' . ':comptemoutons' . ''; + $b['icons'][] = '' . ':comptemoutons' . ''; $b['texts'][] = ':hamac'; - $b['icons'][] = '' . ':hamac' . ''; + $b['icons'][] = '' . ':hamac' . ''; $b['texts'][] = ':oreiller'; - $b['icons'][] = '' . ':oreiller' . ''; + $b['icons'][] = '' . ':oreiller' . ''; $b['texts'][] = ':bâille'; - $b['icons'][] = '' . ':bâille' . ''; + $b['icons'][] = '' . ':bâille' . ''; #Fight/Flame/Violent smileys $b['texts'][] = ':2pistolets'; - $b['icons'][] = '' . ':2pistolets' . ''; + $b['icons'][] = '' . ':2pistolets' . ''; $b['texts'][] = ':combatalien'; - $b['icons'][] = '' . ':combatalien' . ''; + $b['icons'][] = '' . ':combatalien' . ''; $b['texts'][] = ':armée'; - $b['icons'][] = '' . ':armée' . ''; + $b['icons'][] = '' . ':armée' . ''; $b['texts'][] = ':flèche'; - $b['icons'][] = '' . ':flèche' . ''; + $b['icons'][] = '' . ':flèche' . ''; $b['texts'][] = ':bfg'; - $b['icons'][] = '' . ':bfg' . ''; + $b['icons'][] = '' . ':bfg' . ''; $b['texts'][] = ':archer'; - $b['icons'][] = '' . ':archer' . ''; + $b['icons'][] = '' . ':archer' . ''; $b['texts'][] = ':tronçonneuse'; - $b['icons'][] = '' . ':tronçonneuse' . ''; + $b['icons'][] = '' . ':tronçonneuse' . ''; $b['texts'][] = ':arbalète'; - $b['icons'][] = '' . ':arbalète' . ''; + $b['icons'][] = '' . ':arbalète' . ''; $b['texts'][] = ':croisé'; - $b['icons'][] = '' . ':croisé' . ''; + $b['icons'][] = '' . ':croisé' . ''; $b['texts'][] = ':mort'; - $b['icons'][] = '' . ':mort' . ''; + $b['icons'][] = '' . ':mort' . ''; $b['texts'][] = ':marteau'; - $b['icons'][] = '' . ':marteau' . ''; + $b['icons'][] = '' . ':marteau' . ''; $b['texts'][] = ':pistoletlaser'; - $b['icons'][] = '' . ':pistoletlaser' . ''; + $b['icons'][] = '' . ':pistoletlaser' . ''; $b['texts'][] = ':mitrailleuse'; - $b['icons'][] = '' . ':mitrailleuse' . ''; + $b['icons'][] = '' . ':mitrailleuse' . ''; $b['texts'][] = ':acide'; - $b['icons'][] = '' . ':acide' . ''; + $b['icons'][] = '' . ':acide' . ''; #Fantasy smileys - monsters and dragons fantasy. The other type of fantasy belongs in adult smileys $b['texts'][] = ':monstrealien'; - $b['icons'][] = '' . ':monstrealien' . ''; + $b['icons'][] = '' . ':monstrealien' . ''; $b['texts'][] = ':barbare'; - $b['icons'][] = '' . ':barbare' . ''; + $b['icons'][] = '' . ':barbare' . ''; $b['texts'][] = ':dinosaure'; - $b['icons'][] = '' . ':dinosaure' . ''; + $b['icons'][] = '' . ':dinosaure' . ''; $b['texts'][] = ':petitdragon'; - $b['icons'][] = '' . ':petitdragon' . ''; + $b['icons'][] = '' . ':petitdragon' . ''; $b['texts'][] = ':fantôme'; - $b['icons'][] = '' . ':fantôme' . ''; + $b['icons'][] = '' . ':fantôme' . ''; $b['texts'][] = ':momie'; - $b['icons'][] = '' . ':momie' . ''; + $b['icons'][] = '' . ':momie' . ''; #Food smileys $b['texts'][] = ':pomme'; - $b['icons'][] = '' . ':pomme' . ''; + $b['icons'][] = '' . ':pomme' . ''; $b['texts'][] = ':brocoli'; - $b['icons'][] = '' . ':brocoli' . ''; + $b['icons'][] = '' . ':brocoli' . ''; $b['texts'][] = ':gâteau'; - $b['icons'][] = '' . ':gâteau' . ''; + $b['icons'][] = '' . ':gâteau' . ''; $b['texts'][] = ':carotte'; - $b['icons'][] = '' . ':carotte' . ''; + $b['icons'][] = '' . ':carotte' . ''; $b['texts'][] = '~popcorn'; - $b['icons'][] = '' . '~popcorn' . ''; + $b['icons'][] = '' . '~popcorn' . ''; $b['texts'][] = ':tomate'; - $b['icons'][] = '' . ':tomate' . ''; + $b['icons'][] = '' . ':tomate' . ''; $b['texts'][] = ':banane'; - $b['icons'][] = '' . ':banane' . ''; + $b['icons'][] = '' . ':banane' . ''; $b['texts'][] = ':cuisine'; - $b['icons'][] = '' . ':cuisine' . ''; + $b['icons'][] = '' . ':cuisine' . ''; $b['texts'][] = ':oeufauplat'; - $b['icons'][] = '' . ':oeufauplat' . ''; + $b['icons'][] = '' . ':oeufauplat' . ''; #Happy smileys $b['texts'][] = ':nuage'; - $b['icons'][] = '' . ':nuage' . ''; + $b['icons'][] = '' . ':nuage' . ''; $b['texts'][] = ':larmesdejoie'; - $b['icons'][] = '' . ':larmesdejoie' . ''; + $b['icons'][] = '' . ':larmesdejoie' . ''; #Repsect smileys $b['texts'][] = ':courbette'; - $b['icons'][] = '' . ':courbette' . ''; + $b['icons'][] = '' . ':courbette' . ''; $b['texts'][] = ':bravo'; - $b['icons'][] = '' . ':bravo' . ''; + $b['icons'][] = '' . ':bravo' . ''; $b['texts'][] = ':viveleroi'; - $b['icons'][] = '' . ':viveleroi' . ''; + $b['icons'][] = '' . ':viveleroi' . ''; $b['texts'][] = ':numéro1'; - $b['icons'][] = '' . ':numéro1' . ''; + $b['icons'][] = '' . ':numéro1' . ''; #Laugh smileys #Music smileys $b['texts'][] = ':batterie'; - $b['icons'][] = '' . ':batterie' . ''; + $b['icons'][] = '' . ':batterie' . ''; $b['texts'][] = ':guitare'; - $b['icons'][] = '' . ':guitare' . ''; + $b['icons'][] = '' . ':guitare' . ''; $b['texts'][] = ':trompette'; - $b['icons'][] = '' . ':trompette' . ''; + $b['icons'][] = '' . ':trompette' . ''; $b['texts'][] = ':violon'; - $b['icons'][] = '' . ':violon' . ''; + $b['icons'][] = '' . ':violon' . ''; #Smileys that used to be in core $b['texts'][] = ':cognetête'; - $b['icons'][] = '' . ':cognetête' . ''; + $b['icons'][] = '' . ':cognetête' . ''; $b['texts'][] = ':barbu'; - $b['icons'][] = '' . ':barbu' . ''; + $b['icons'][] = '' . ':barbu' . ''; $b['texts'][] = ':barbeblanche'; - $b['icons'][] = '' . ':barbeblanche' . ''; + $b['icons'][] = '' . ':barbeblanche' . ''; $b['texts'][] = ':tête'; - $b['icons'][] = '' . ':tête' . ''; + $b['icons'][] = '' . ':tête' . ''; } diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php index 7892eac46..4361b2f5a 100644 --- a/smiley_pack/smiley_pack.php +++ b/smiley_pack/smiley_pack.php @@ -28,515 +28,515 @@ function smiley_pack_smilies(array &$b) #Animal smileys. $b['texts'][] = ':bunnyflowers:'; - $b['icons'][] = '' . ':bunnyflowers:' . ''; + $b['icons'][] = '' . ':bunnyflowers:' . ''; $b['texts'][] = ':chick:'; - $b['icons'][] = '' . ':chick:' . ''; + $b['icons'][] = '' . ':chick:' . ''; $b['texts'][] = ':bumblebee:'; - $b['icons'][] = '' . ':bee:' . ''; + $b['icons'][] = '' . ':bee:' . ''; $b['texts'][] = ':ladybird:'; - $b['icons'][] = '' . ':ladybird:' . ''; + $b['icons'][] = '' . ':ladybird:' . ''; $b['texts'][] = ':bigspider:'; - $b['icons'][] = '' . ':bigspider:' . ''; + $b['icons'][] = '' . ':bigspider:' . ''; $b['texts'][] = ':cat:'; - $b['icons'][] = '' . ':cat:' . ''; + $b['icons'][] = '' . ':cat:' . ''; $b['texts'][] = ':bunny:'; - $b['icons'][] = '' . ':bunny:' . ''; + $b['icons'][] = '' . ':bunny:' . ''; $b['texts'][] = ':cow:'; - $b['icons'][] = '' . ':cow:' . ''; + $b['icons'][] = '' . ':cow:' . ''; $b['texts'][] = ':crab:'; - $b['icons'][] = '' . ':crab:' . ''; + $b['icons'][] = '' . ':crab:' . ''; $b['texts'][] = ':dolphin:'; - $b['icons'][] = '' . ':dolphin:' . ''; + $b['icons'][] = '' . ':dolphin:' . ''; $b['texts'][] = ':dragonfly:'; - $b['icons'][] = '' . ':dragonfly:' . ''; + $b['icons'][] = '' . ':dragonfly:' . ''; $b['texts'][] = ':frog:'; - $b['icons'][] = '' . ':frog:' . ''; + $b['icons'][] = '' . ':frog:' . ''; $b['texts'][] = ':hamster:'; - $b['icons'][] = '' . ':hamster:' . ''; + $b['icons'][] = '' . ':hamster:' . ''; $b['texts'][] = ':monkey:'; - $b['icons'][] = '' . ':monkey:' . ''; + $b['icons'][] = '' . ':monkey:' . ''; $b['texts'][] = ':horse:'; - $b['icons'][] = '' . ':horse:' . ''; + $b['icons'][] = '' . ':horse:' . ''; $b['texts'][] = ':parrot:'; - $b['icons'][] = '' . ':parrot:' . ''; + $b['icons'][] = '' . ':parrot:' . ''; $b['texts'][] = ':tux:'; - $b['icons'][] = '' . ':tux:' . ''; + $b['icons'][] = '' . ':tux:' . ''; $b['texts'][] = ':snail:'; - $b['icons'][] = '' . ':snail:' . ''; + $b['icons'][] = '' . ':snail:' . ''; $b['texts'][] = ':sheep:'; - $b['icons'][] = '' . ':sheep:' . ''; + $b['icons'][] = '' . ':sheep:' . ''; $b['texts'][] = ':dog:'; - $b['icons'][] = '' . ':dog:' . ''; + $b['icons'][] = '' . ':dog:' . ''; $b['texts'][] = ':elephant:'; - $b['icons'][] = '' . ':elephant:' . ''; + $b['icons'][] = '' . ':elephant:' . ''; $b['texts'][] = ':fish:'; - $b['icons'][] = '' . ':fish:' . ''; + $b['icons'][] = '' . ':fish:' . ''; $b['texts'][] = ':giraffe:'; - $b['icons'][] = '' . ':giraffe:' . ''; + $b['icons'][] = '' . ':giraffe:' . ''; $b['texts'][] = ':pig:'; - $b['icons'][] = '' . ':pig:' . ''; + $b['icons'][] = '' . ':pig:' . ''; #Baby Smileys $b['texts'][] = ':baby:'; - $b['icons'][] = '' . ':baby:' . ''; + $b['icons'][] = '' . ':baby:' . ''; $b['texts'][] = ':babycot:'; - $b['icons'][] = '' . ':babycot:' . ''; + $b['icons'][] = '' . ':babycot:' . ''; $b['texts'][] = ':pregnant:'; - $b['icons'][] = '' . ':pregnant:' . ''; + $b['icons'][] = '' . ':pregnant:' . ''; $b['texts'][] = ':stork:'; - $b['icons'][] = '' . ':stork:' . ''; + $b['icons'][] = '' . ':stork:' . ''; #Confused Smileys $b['texts'][] = ':confused:'; - $b['icons'][] = '' . ':confused:' . ''; + $b['icons'][] = '' . ':confused:' . ''; $b['texts'][] = ':shrug:'; - $b['icons'][] = '' . ':shrug:' . ''; + $b['icons'][] = '' . ':shrug:' . ''; $b['texts'][] = ':stupid:'; - $b['icons'][] = '' . ':stupid:' . ''; + $b['icons'][] = '' . ':stupid:' . ''; $b['texts'][] = ':dazed:'; - $b['icons'][] = '' . ':dazed:' . ''; + $b['icons'][] = '' . ':dazed:' . ''; #Cool Smileys $b['texts'][] = ':affro:'; - $b['icons'][] = '' . ':affro:' . ''; + $b['icons'][] = '' . ':affro:' . ''; #Devil/Angel Smileys $b['texts'][] = ':angel:'; - $b['icons'][] = '' . ':angel:' . ''; + $b['icons'][] = '' . ':angel:' . ''; $b['texts'][] = ':cherub:'; - $b['icons'][] = '' . ':cherub:' . ''; + $b['icons'][] = '' . ':cherub:' . ''; $b['texts'][] = ':devilangel:'; - $b['icons'][] = '' . ':devilangel:' . ''; + $b['icons'][] = '' . ':devilangel:' . ''; $b['texts'][] = ':catdevil:'; - $b['icons'][] = '' . ':catdevil:' . ''; + $b['icons'][] = '' . ':catdevil:' . ''; $b['texts'][] = ':devillish:'; - $b['icons'][] = '' . ':devillish:' . ''; + $b['icons'][] = '' . ':devillish:' . ''; $b['texts'][] = ':daseesaw:'; - $b['icons'][] = '' . ':daseesaw:' . ''; + $b['icons'][] = '' . ':daseesaw:' . ''; $b['texts'][] = ':turnevil:'; - $b['icons'][] = '' . ':turnevil:' . ''; + $b['icons'][] = '' . ':turnevil:' . ''; $b['texts'][] = ':saint:'; - $b['icons'][] = '' . ':saint:' . ''; + $b['icons'][] = '' . ':saint:' . ''; $b['texts'][] = ':graveside:'; - $b['icons'][] = '' . ':graveside:' . ''; + $b['icons'][] = '' . ':graveside:' . ''; #Unpleasent smileys. $b['texts'][] = ':toilet:'; - $b['icons'][] = '' . ':toilet:' . ''; + $b['icons'][] = '' . ':toilet:' . ''; $b['texts'][] = ':fartinbed:'; - $b['icons'][] = '' . ':fartinbed:' . ''; + $b['icons'][] = '' . ':fartinbed:' . ''; $b['texts'][] = ':fartblush:'; - $b['icons'][] = '' . ':fartblush:' . ''; + $b['icons'][] = '' . ':fartblush:' . ''; #Drinks $b['texts'][] = ':tea:'; - $b['icons'][] = '' . ':tea:' . ''; + $b['icons'][] = '' . ':tea:' . ''; $b['texts'][] = ':drool:'; - $b['icons'][] = '' . ':drool:' . ''; + $b['icons'][] = '' . ':drool:' . ''; #Sad smileys $b['texts'][] = ':crying:'; - $b['icons'][] = '' . ':crying:' . ''; + $b['icons'][] = '' . ':crying:' . ''; $b['texts'][] = ':prisoner:'; - $b['icons'][] = '' . ':prisoner:' . ''; + $b['icons'][] = '' . ':prisoner:' . ''; $b['texts'][] = ':sigh:'; - $b['icons'][] = '' . ':sigh:' . ''; + $b['icons'][] = '' . ':sigh:' . ''; #Smoking - only one smiley in here, maybe it needs moving elsewhere? $b['texts'][] = ':smoking:'; - $b['icons'][] = '' . ':smoking:' . ''; + $b['icons'][] = '' . ':smoking:' . ''; #Sport smileys $b['texts'][] = ':basketball:'; - $b['icons'][] = '' . ':basketball:' . ''; + $b['icons'][] = '' . ':basketball:' . ''; $b['texts'][] = '~bowling'; - $b['icons'][] = '' . '~bowling' . ''; + $b['icons'][] = '' . '~bowling' . ''; $b['texts'][] = ':cycling:'; - $b['icons'][] = '' . ':cycling:' . ''; + $b['icons'][] = '' . ':cycling:' . ''; $b['texts'][] = ':darts:'; - $b['icons'][] = '' . ':darts:' . ''; + $b['icons'][] = '' . ':darts:' . ''; $b['texts'][] = ':fencing:'; - $b['icons'][] = '' . ':fencing:' . ''; + $b['icons'][] = '' . ':fencing:' . ''; $b['texts'][] = ':juggling:'; - $b['icons'][] = '' . ':juggling:' . ''; + $b['icons'][] = '' . ':juggling:' . ''; $b['texts'][] = ':skipping:'; - $b['icons'][] = '' . ':skipping:' . ''; + $b['icons'][] = '' . ':skipping:' . ''; $b['texts'][] = ':archery:'; - $b['icons'][] = '' . ':archery:' . ''; + $b['icons'][] = '' . ':archery:' . ''; $b['texts'][] = ':surfing:'; - $b['icons'][] = '' . ':surfing:' . ''; + $b['icons'][] = '' . ':surfing:' . ''; $b['texts'][] = ':snooker:'; - $b['icons'][] = '' . ':snooker:' . ''; + $b['icons'][] = '' . ':snooker:' . ''; $b['texts'][] = ':horseriding:'; - $b['icons'][] = '' . ':horseriding:' . ''; + $b['icons'][] = '' . ':horseriding:' . ''; #Love smileys $b['texts'][] = ':iloveyou:'; - $b['icons'][] = '' . ':iloveyou:' . ''; + $b['icons'][] = '' . ':iloveyou:' . ''; $b['texts'][] = ':inlove:'; - $b['icons'][] = '' . ':inlove:' . ''; + $b['icons'][] = '' . ':inlove:' . ''; $b['texts'][] = '~love'; - $b['icons'][] = '' . ':love' . ''; + $b['icons'][] = '' . ':love' . ''; $b['texts'][] = ':lovebear:'; - $b['icons'][] = '' . ':lovebear:' . ''; + $b['icons'][] = '' . ':lovebear:' . ''; $b['texts'][] = ':lovebed:'; - $b['icons'][] = '' . ':lovebed:' . ''; + $b['icons'][] = '' . ':lovebed:' . ''; $b['texts'][] = ':loveheart:'; - $b['icons'][] = '' . ':loveheart:' . ''; + $b['icons'][] = '' . ':loveheart:' . ''; #Tired/Sleep smileys $b['texts'][] = ':countsheep'; - $b['icons'][] = '' . ':countsheep:' . ''; + $b['icons'][] = '' . ':countsheep:' . ''; $b['texts'][] = ':hammock:'; - $b['icons'][] = '' . ':hammock:' . ''; + $b['icons'][] = '' . ':hammock:' . ''; $b['texts'][] = ':pillow:'; - $b['icons'][] = '' . ':pillow:' . ''; + $b['icons'][] = '' . ':pillow:' . ''; $b['texts'][] = ':yawn:'; - $b['icons'][] = '' . ':yawn:' . ''; + $b['icons'][] = '' . ':yawn:' . ''; #Fight/Flame/Violent smileys $b['texts'][] = ':2guns:'; - $b['icons'][] = '' . ':2guns:' . ''; + $b['icons'][] = '' . ':2guns:' . ''; $b['texts'][] = ':alienfight'; - $b['icons'][] = '' . ':alienfight' . ''; + $b['icons'][] = '' . ':alienfight' . ''; $b['texts'][] = ':army:'; - $b['icons'][] = '' . ':army:' . ''; + $b['icons'][] = '' . ':army:' . ''; $b['texts'][] = ':arrowhead:'; - $b['icons'][] = '' . ':arrowhead:' . ''; + $b['icons'][] = '' . ':arrowhead:' . ''; $b['texts'][] = ':bfg:'; - $b['icons'][] = '' . ':bfg:' . ''; + $b['icons'][] = '' . ':bfg:' . ''; $b['texts'][] = ':bowman:'; - $b['icons'][] = '' . ':bowman:' . ''; + $b['icons'][] = '' . ':bowman:' . ''; $b['texts'][] = ':chainsaw:'; - $b['icons'][] = '' . ':chainsaw:' . ''; + $b['icons'][] = '' . ':chainsaw:' . ''; $b['texts'][] = ':crossbow:'; - $b['icons'][] = '' . ':crossbow:' . ''; + $b['icons'][] = '' . ':crossbow:' . ''; $b['texts'][] = ':crusader:'; - $b['icons'][] = '' . ':crusader:' . ''; + $b['icons'][] = '' . ':crusader:' . ''; $b['texts'][] = ':dead:'; - $b['icons'][] = '' . ':dead:' . ''; + $b['icons'][] = '' . ':dead:' . ''; $b['texts'][] = ':hammersplat:'; - $b['icons'][] = '' . ':hammersplat:' . ''; + $b['icons'][] = '' . ':hammersplat:' . ''; $b['texts'][] = ':lasergun:'; - $b['icons'][] = '' . ':lasergun:' . ''; + $b['icons'][] = '' . ':lasergun:' . ''; $b['texts'][] = ':machinegun:'; - $b['icons'][] = '' . ':machinegun:' . ''; + $b['icons'][] = '' . ':machinegun:' . ''; $b['texts'][] = ':acid:'; - $b['icons'][] = '' . ':acid:' . ''; + $b['icons'][] = '' . ':acid:' . ''; #Fantasy smileys - monsters and dragons fantasy. The other type of fantasy belongs in adult smileys $b['texts'][] = ':alienmonster:'; - $b['icons'][] = '' . ':alienmonster:' . ''; + $b['icons'][] = '' . ':alienmonster:' . ''; $b['texts'][] = ':barbarian:'; - $b['icons'][] = '' . ':barbarian:' . ''; + $b['icons'][] = '' . ':barbarian:' . ''; $b['texts'][] = ':dinosaur:'; - $b['icons'][] = '' . ':dinosaur:' . ''; + $b['icons'][] = '' . ':dinosaur:' . ''; $b['texts'][] = ':dragon:'; - $b['icons'][] = '' . ':dragon:' . ''; + $b['icons'][] = '' . ':dragon:' . ''; $b['texts'][] = ':draco:'; - $b['icons'][] = '' . ':draco:' . ''; + $b['icons'][] = '' . ':draco:' . ''; $b['texts'][] = ':ghost:'; - $b['icons'][] = '' . ':ghost:' . ''; + $b['icons'][] = '' . ':ghost:' . ''; $b['texts'][] = ':mummy:'; - $b['icons'][] = '' . ':mummy:' . ''; + $b['icons'][] = '' . ':mummy:' . ''; #Food smileys $b['texts'][] = ':apple:'; - $b['icons'][] = '' . ':apple:' . ''; + $b['icons'][] = '' . ':apple:' . ''; $b['texts'][] = ':broccoli:'; - $b['icons'][] = '' . ':brocolli:' . ''; + $b['icons'][] = '' . ':brocolli:' . ''; $b['texts'][] = ':cake:'; - $b['icons'][] = '' . ':cake:' . ''; + $b['icons'][] = '' . ':cake:' . ''; $b['texts'][] = ':carrot:'; - $b['icons'][] = '' . ':carrot:' . ''; + $b['icons'][] = '' . ':carrot:' . ''; $b['texts'][] = ':popcorn:'; - $b['icons'][] = '' . ':popcorn:' . ''; + $b['icons'][] = '' . ':popcorn:' . ''; $b['texts'][] = ':tomato:'; - $b['icons'][] = '' . ':tomato:' . ''; + $b['icons'][] = '' . ':tomato:' . ''; $b['texts'][] = ':banana:'; - $b['icons'][] = '' . ':banana:' . ''; + $b['icons'][] = '' . ':banana:' . ''; $b['texts'][] = ':cooking:'; - $b['icons'][] = '' . ':cooking:' . ''; + $b['icons'][] = '' . ':cooking:' . ''; $b['texts'][] = ':fryegg:'; - $b['icons'][] = '' . ':fryegg:' . ''; + $b['icons'][] = '' . ':fryegg:' . ''; $b['texts'][] = ':birthdaycake:'; - $b['icons'][] = '' . ':birthdaycake:' . ''; + $b['icons'][] = '' . ':birthdaycake:' . ''; #Happy smileys $b['texts'][] = ':cloud9:'; - $b['icons'][] = '' . ':cloud9:' . ''; + $b['icons'][] = '' . ':cloud9:' . ''; $b['texts'][] = ':tearsofjoy:'; - $b['icons'][] = '' . ':tearsofjoy:' . ''; + $b['icons'][] = '' . ':tearsofjoy:' . ''; #Repsect smileys $b['texts'][] = ':bow:'; - $b['icons'][] = '' . ':bow:' . ''; + $b['icons'][] = '' . ':bow:' . ''; $b['texts'][] = ':bravo:'; - $b['icons'][] = '' . ':bravo:' . ''; + $b['icons'][] = '' . ':bravo:' . ''; $b['texts'][] = ':hailking:'; - $b['icons'][] = '' . ':hailking:' . ''; + $b['icons'][] = '' . ':hailking:' . ''; $b['texts'][] = ':number1:'; - $b['icons'][] = '' . ':number1:' . ''; + $b['icons'][] = '' . ':number1:' . ''; #Laugh smileys $b['texts'][] = ':hahaha:'; - $b['icons'][] = '' . ':hahaha:' . ''; + $b['icons'][] = '' . ':hahaha:' . ''; $b['texts'][] = ':loltv:'; - $b['icons'][] = '' . ':loltv:' . ''; + $b['icons'][] = '' . ':loltv:' . ''; $b['texts'][] = ':rofl:'; - $b['icons'][] = '' . ':rofl:' . ''; + $b['icons'][] = '' . ':rofl:' . ''; #Music smileys $b['texts'][] = ':drums:'; - $b['icons'][] = '' . ':drums:' . ''; + $b['icons'][] = '' . ':drums:' . ''; $b['texts'][] = ':guitar:'; - $b['icons'][] = '' . ':guitar:' . ''; + $b['icons'][] = '' . ':guitar:' . ''; $b['texts'][] = ':trumpet:'; - $b['icons'][] = '' . ':trumpet:' . ''; + $b['icons'][] = '' . ':trumpet:' . ''; #Smileys that used to be in core $b['texts'][] = ':headbang:'; - $b['icons'][] = '' . ':headbang:' . ''; + $b['icons'][] = '' . ':headbang:' . ''; $b['texts'][] = ':beard:'; - $b['icons'][] = '' . ':beard:' . ''; + $b['icons'][] = '' . ':beard:' . ''; $b['texts'][] = ':whitebeard:'; - $b['icons'][] = '' . ':whitebeard:' . ''; + $b['icons'][] = '' . ':whitebeard:' . ''; $b['texts'][] = ':shaka:'; - $b['icons'][] = '' . ':shaka:' . ''; + $b['icons'][] = '' . ':shaka:' . ''; $b['texts'][] = ':\\.../'; - $b['icons'][] = '' . ':\\.../' . ''; + $b['icons'][] = '' . ':\\.../' . ''; $b['texts'][] = ':\\ooo/'; - $b['icons'][] = '' . ':\\ooo/' . ''; + $b['icons'][] = '' . ':\\ooo/' . ''; $b['texts'][] = ':headdesk:'; - $b['icons'][] = '' . ':headdesk:' . ''; + $b['icons'][] = '' . ':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'][] = '' . ':-d' . ''; + $b['icons'][] = '' . ':-d' . ''; $b['texts'][] = ':-o'; - $b['icons'][] = '' . ':-o' . ''; + $b['icons'][] = '' . ':-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'][] = '' . ':cool:' . ''; + $b['icons'][] = '' . ':cool:' . ''; $b['texts'][] = ':vomit:'; - $b['icons'][] = '' . ':vomit:' . ''; + $b['icons'][] = '' . ':vomit:' . ''; $b['texts'][] = ':golf:'; - $b['icons'][] = '' . ':golf:' . ''; + $b['icons'][] = '' . ':golf:' . ''; $b['texts'][] = ':football:'; - $b['icons'][] = '' . ':football:' . ''; + $b['icons'][] = '' . ':football:' . ''; $b['texts'][] = ':tennis:'; - $b['icons'][] = '' . ':tennis:' . ''; + $b['icons'][] = '' . ':tennis:' . ''; $b['texts'][] = ':alpha:'; - $b['icons'][] = '' . ':alpha:' . ''; + $b['icons'][] = '' . ':alpha:' . ''; $b['texts'][] = ':marine:'; - $b['icons'][] = '' . ':marine:' . ''; + $b['icons'][] = '' . ':marine:' . ''; $b['texts'][] = ':sabre:'; - $b['icons'][] = '' . ':sabre:' . ''; + $b['icons'][] = '' . ':sabre:' . ''; $b['texts'][] = ':tank:'; - $b['icons'][] = '' . ':tank:' . ''; + $b['icons'][] = '' . ':tank:' . ''; $b['texts'][] = ':viking:'; - $b['icons'][] = '' . ':viking:' . ''; + $b['icons'][] = '' . ':viking:' . ''; $b['texts'][] = ':gangs:'; - $b['icons'][] = '' . ':gangs:' . ''; + $b['icons'][] = '' . ':gangs:' . ''; $b['texts'][] = ':dj:'; - $b['icons'][] = '' . ':dj:' . ''; + $b['icons'][] = '' . ':dj:' . ''; $b['texts'][] = ':elvis:'; - $b['icons'][] = '' . ':elivs:' . ''; + $b['icons'][] = '' . ':elivs:' . ''; $b['texts'][] = ':violin:'; - $b['icons'][] = '' . ':violin:' . ''; + $b['icons'][] = '' . ':violin:' . ''; # New Gif Emoji (@one@loma.ml) # Fediverse $b['texts'][] = ':friendica:'; - $b['icons'][] = '' . ':friendica:' . ''; + $b['icons'][] = '' . ':friendica:' . ''; $b['texts'][] = ':mastodon:'; - $b['icons'][] = '' . ':mastodon:' . ''; + $b['icons'][] = '' . ':mastodon:' . ''; $b['texts'][] = ':pleroma:'; - $b['icons'][] = '' . ':pleroma:' . ''; + $b['icons'][] = '' . ':pleroma:' . ''; $b['texts'][] = ':misskey:'; - $b['icons'][] = '' . ':misskey:' . ''; + $b['icons'][] = '' . ':misskey:' . ''; $b['texts'][] = ':diaspora:'; - $b['icons'][] = '' . ':diaspora:' . ''; + $b['icons'][] = '' . ':diaspora:' . ''; $b['texts'][] = ':hubzilla:'; - $b['icons'][] = '' . ':hubzilla:' . ''; + $b['icons'][] = '' . ':hubzilla:' . ''; $b['texts'][] = ':pixelfed:'; - $b['icons'][] = '' . ':pixelfeed:' . ''; + $b['icons'][] = '' . ':pixelfeed:' . ''; $b['texts'][] = ':nextcloud:'; - $b['icons'][] = '' . ':nextcloud:' . ''; + $b['icons'][] = '' . ':nextcloud:' . ''; $b['texts'][] = ':activitypub:'; - $b['icons'][] = '' . ':activitypub:' . ''; + $b['icons'][] = '' . ':activitypub:' . ''; # ccc $b['texts'][] = ':ccc event:'; - $b['icons'][] = '' . ':ccc event:' . ''; + $b['icons'][] = '' . ':ccc event:' . ''; # Commercial $b['texts'][] = ':youtube:'; - $b['icons'][] = '' . ':youtube:' . ''; + $b['icons'][] = '' . ':youtube:' . ''; $b['texts'][] = ':spotify:'; - $b['icons'][] = '' . ':spotify:' . ''; + $b['icons'][] = '' . ':spotify:' . ''; $b['texts'][] = ':twitter:'; - $b['icons'][] = '' . ':twitter:' . ''; + $b['icons'][] = '' . ':twitter:' . ''; $b['texts'][] = ':twitch:'; - $b['icons'][] = '' . ':twitch:' . ''; + $b['icons'][] = '' . ':twitch:' . ''; } diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php index 1f9310992..fc20888f1 100644 --- a/smileybutton/smileybutton.php +++ b/smileybutton/smileybutton.php @@ -56,29 +56,29 @@ function smileybutton_jot_tool(string &$body) ]; $icons = [ - '<3', - '</3', - ':-)', - ';-)', - ':-(', - ':-P', - ':-X', - ':-D', - ':-O', - '\\o/', - 'O_o', - ':\'(', - ':-!', - ':-/', - ':-[', - '8-)', - ':beer', - ':coffee', - ':facepalm', - ':like', - ':dislike', - '~friendica', - 'red' + '<3', + '</3', + ':-)', + ';-)', + ':-(', + ':-P', + ':-X', + ':-D', + ':-O', + '\\o/', + 'O_o', + ':\'(', + ':-!', + ':-/', + ':-[', + '8-)', + ':beer', + ':coffee', + ':facepalm', + ':like', + ':dislike', + '~friendica', + 'red' ]; // Call hooks to get aditional smileies from other addons @@ -110,7 +110,7 @@ function smileybutton_jot_tool(string &$body) $image = 'addon/smileybutton/view/default.png'; } - $image_url = DI::baseUrl()->get() . '/' . $image; + $image_url = DI::baseUrl() . '/' . $image; //Add the hmtl and script to the page $body = <<< EOT diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php index a7e0c3831..e8af21e16 100644 --- a/smilies_adult/smilies_adult.php +++ b/smilies_adult/smilies_adult.php @@ -20,20 +20,20 @@ function smilies_adult_install() { function smilies_adult_smilies(array &$b) { $b['texts'][] = '(o)(o)'; - $b['icons'][] = '' . '(o)(o)' . ''; + $b['icons'][] = '' . '(o)(o)' . ''; $b['texts'][] = '(.)(.)'; - $b['icons'][] = '' . '(.)(.)' . ''; + $b['icons'][] = '' . '(.)(.)' . ''; $b['texts'][] = ':bong'; - $b['icons'][] = '' . ':bong' . ''; + $b['icons'][] = '' . ':bong' . ''; $b['texts'][] = ':sperm'; - $b['icons'][] = '' . ':sperm' . ''; + $b['icons'][] = '' . ':sperm' . ''; $b['texts'][] = ':drunk'; - $b['icons'][] = '' . ':drunk' . ''; + $b['icons'][] = '' . ':drunk' . ''; $b['texts'][] = ':finger'; - $b['icons'][] = '' . ':finger' . ''; + $b['icons'][] = '' . ':finger' . ''; } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index c168d612b..8fe64f34a 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -266,7 +266,7 @@ function statusnet_settings(array &$data) '$request_token' => $request_token ?? null, '$account' => $account ?? null, - '$authenticate_url' => DI::baseUrl()->get() . '/statusnet/connect', + '$authenticate_url' => DI::baseUrl() . '/statusnet/connect', '$consumerkey' => ['statusnet-consumerkey', DI::l10n()->t('OAuth Consumer Key'), '', '', false, ' size="35'], '$consumersecret' => ['statusnet-consumersecret', DI::l10n()->t('OAuth Consumer Secret'), '', '', false, ' size="35'], diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index d9bc0b3b4..556452845 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -59,8 +59,8 @@ function testdrive_cron($b) 'uid' => $rr['uid'], 'system_type' => 'testdrive_expire', 'source_name' => DI::l10n()->t('Administrator'), - 'source_link' => DI::baseUrl()->get(), - 'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg', + 'source_link' => DI::baseUrl(), + 'source_photo' => DI::baseUrl() . '/images/person-80.jpg', ]); DBA::update('user', ['expire_notification_sent' => DateTimeFormat::utcNow()], ['uid' => $rr['uid']]); @@ -76,7 +76,7 @@ function testdrive_enotify(array &$b) { if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'testdrive_expire') { - $b['itemlink'] = DI::baseUrl()->get(); + $b['itemlink'] = DI::baseUrl(); $b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename')); $b['subject'] = DI::l10n()->t('Your Friendica test account is about to expire.'); $b['body'] = DI::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=".DI::config()->get('system', 'url')."]".DI::config()->get('config', 'sitename')."[/url]", Search::getGlobalDirectory()); diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 6cf47fbe9..0e619dab7 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -96,7 +96,7 @@ function tumblr_connect() // The callback URL is the script that gets called after the user authenticates with tumblr // In this example, it would be the included callback.php - $callback_url = DI::baseUrl()->get() . '/tumblr/callback'; + $callback_url = DI::baseUrl() . '/tumblr/callback'; // Let's begin. First we need a Request Token. The request token is required to send the user // to Tumblr's login page. @@ -175,7 +175,7 @@ function tumblr_callback() DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'oauth_token_secret', $access_token['oauth_token_secret']); $o = DI::l10n()->t("You are now authenticated to tumblr."); - $o .= '
' . DI::l10n()->t("return to the connector page") . ''; + $o .= '
' . DI::l10n()->t("return to the connector page") . ''; return $o; } @@ -232,7 +232,7 @@ function tumblr_settings(array &$data) 'noconnect' => DI::l10n()->t('You are not authenticated to tumblr'), ], - '$authenticate_url' => DI::baseUrl()->get() . '/tumblr/connect', + '$authenticate_url' => DI::baseUrl() . '/tumblr/connect', '$enable' => ['tumblr', DI::l10n()->t('Enable Tumblr Post Addon'), $enabled], '$bydefault' => ['tumblr_bydefault', DI::l10n()->t('Post to Tumblr by default'), $def_enabled], diff --git a/twitter/twitter.php b/twitter/twitter.php index 8c396dcfc..c55489a00 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -1100,7 +1100,7 @@ function twitter_prepare_body(array &$b) if ($b['preview']) { $max_char = 280; $item = $b['item']; - $item['plink'] = DI::baseUrl()->get() . '/display/' . $item['guid']; + $item['plink'] = DI::baseUrl() . '/display/' . $item['guid']; $condition = ['uri' => $item['thr-parent'], 'uid' => DI::userSession()->getLocalUserId()]; $orig_post = Post::selectFirst(['author-link'], $condition); @@ -1292,7 +1292,7 @@ function twitter_fetchtimeline(int $uid): void $application_name = DI::keyValue()->get('twitter_application_name') ?? ''; if ($application_name == '') { - $application_name = DI::baseUrl()->getHostname(); + $application_name = DI::baseUrl()->getHost(); } $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret); @@ -1694,7 +1694,7 @@ function twitter_expand_entities($body, stdClass $status) $replacementList = []; foreach ($status->entities->hashtags AS $hashtag) { - $replace = '#[url=' . DI::baseUrl()->get() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]'; + $replace = '#[url=' . DI::baseUrl() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]'; $taglist['#' . $hashtag->text] = ['#', $hashtag->text, '']; $replacementList[$hashtag->indices[0]] = [ @@ -2191,7 +2191,7 @@ function twitter_fetchhometimeline(int $uid): void $application_name = DI::keyValue()->get('twitter_application_name') ?? ''; if ($application_name == '') { - $application_name = DI::baseUrl()->getHostname(); + $application_name = DI::baseUrl()->getHost(); } $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret); diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php index eefb71058..c4d21ccbd 100644 --- a/viewsrc/viewsrc.php +++ b/viewsrc/viewsrc.php @@ -36,5 +36,5 @@ function viewsrc_item_photo_menu(array &$b) return; } - $b['menu'] = array_merge([DI::l10n()->t('View Source') => DI::baseUrl()->get() . '/viewsrc/'. $b['item']['uri-id']], $b['menu']); + $b['menu'] = array_merge([DI::l10n()->t('View Source') => DI::baseUrl() . '/viewsrc/'. $b['item']['uri-id']], $b['menu']); }