diff --git a/INSTALL.txt b/INSTALL.txt index f45e86b80..c06b08e21 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -6,7 +6,7 @@ To install all addons using git, cd into your top level Friendica directory and git clone https://github.com/friendica/friendica-addons.git addon -This will clone the entire repository in a directory called addon. They can now be activated in the plugins section of your admin panel. +This will clone the entire repository in a directory called addon. They can now be activated in the addons section of your admin panel. ******************** * Install Manually * @@ -15,4 +15,4 @@ This will clone the entire repository in a directory called addon. They can now 1. Download the archive (Download ZIP button) containing the addons. 2. Unzip the contents of the archive to your harddrive. 3. Upload the extracted directory and all it's contents to /path/to/friendica/addon. You will need to create the addon directory if this is the first addon you have installed. -4. Activate the addon in the plugins section of your admin panel. +4. Activate the addon in the addons section of your admin panel. diff --git a/README.md b/README.md index 52fdbb2e0..deffa2a54 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ Addons for Friendica ==================== -This repository is a collection of plugins for the [Friendica Social Communications Server](https://github.com/friendica/friendica). -You can add these plugins to the /addon directory of your Friendica installation +This repository is a collection of addons for the [Friendica Social Communications Server](https://github.com/friendica/friendica). +You can add these addons to the /addon directory of your Friendica installation do extend the functionality of your node. After uploading the addons to your server, you need to activate the desired addons @@ -14,7 +14,7 @@ in cases the addon developers have choosen not to include them here. Connectors ---------- -Among these plugins there are also the [connectors](https://github.com/friendica/friendica/blob/master/doc/Connectors.md) for various other networks +Among these addons there are also the [connectors](https://github.com/friendica/friendica/blob/master/doc/Connectors.md) for various other networks (e.g. Twitter, pump.io, Google+) that are needed for communication when the protocoll is not supported by Friendica core (DFRN, OStatus and Diaspora). @@ -28,7 +28,7 @@ Development The addon interface of Friendica is very flexible and powerful, so if you are missing functionality, your chances are high it may be added with an addon. -See the [documentation](https://github.com/friendica/friendica/blob/master/doc/Plugins.md) for more informations on the plugin development. +See the [documentation](https://github.com/friendica/friendica/blob/master/doc/Addons.md) for more informations on the addon development. Addons can be translated like any other part of Friendica. Translations for the addons included in this repository are done at the [Transifex project](https://www.transifex.com/projects/p/friendica/) for Friendica. diff --git a/blackout/README.md b/blackout/README.md index 1974ef7b0..1bf536ca1 100644 --- a/blackout/README.md +++ b/blackout/README.md @@ -8,12 +8,12 @@ blackout addon About ----- -This plugin will allow you to enter a date/time period during which +This addon will allow you to enter a date/time period during which all your ~friendica visitors from the web will be redirected to a page you can configure in the admin panel as well. Calls to the API and the communication with other ~friendica nodes is -not effected from this plugin. +not effected from this addon. If you enter a period the current date would be affected none of the currently logged in users will be effected as well. But if they log diff --git a/blackout/blackout.php b/blackout/blackout.php index 2693db5a5..1c34862b2 100644 --- a/blackout/blackout.php +++ b/blackout/blackout.php @@ -9,12 +9,12 @@ * About * ===== * - * This plugin will allow you to enter a date/time period during which + * This addon will allow you to enter a date/time period during which * all your ~friendica visitors from the web will be redirected to a page * you can configure in the admin panel as well. * * Calls to the API and the communication with other ~friendica nodes is - * not effected from this plugin. + * not effected from this addon. * * If you enter a period the current date would be affected none of the * currently logged in users will be effected as well. But if they log @@ -50,13 +50,14 @@ */ use Friendica\Core\Config; +use Friendica\Core\Addon; function blackout_install() { - register_hook('page_header', 'addon/blackout/blackout.php', 'blackout_redirect'); + Addon::registerHook('page_header', 'addon/blackout/blackout.php', 'blackout_redirect'); } function blackout_uninstall() { - unregister_hook('page_header', 'addon/blackout/blackout.php', 'blackout_redirect'); + Addon::unregisterHook('page_header', 'addon/blackout/blackout.php', 'blackout_redirect'); } function blackout_redirect ($a, $b) { // if we have a logged in user, don't throw her out @@ -87,7 +88,7 @@ function blackout_redirect ($a, $b) { } } -function blackout_plugin_admin(&$a, &$o) { +function blackout_addon_admin(&$a, &$o) { $mystart = Config::get('blackout','begindate'); if (! is_string($mystart)) { $mystart = "YYYY-MM-DD:hhmm"; } $myend = Config::get('blackout','enddate'); @@ -111,7 +112,7 @@ function blackout_plugin_admin(&$a, &$o) { $o = '

Please double check that the current settings for the blackout. Begin will be '.$mystart.' and it will end '.$myend.'.

' . $o; } } -function blackout_plugin_admin_post (&$a) { +function blackout_addon_admin_post (&$a) { $begindate = trim($_POST['startdate']); $enddate = trim($_POST['enddate']); $url = trim($_POST['rurl']); diff --git a/blockem/blockem.php b/blockem/blockem.php index 2c91373f4..d943f26c6 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -1,6 +1,4 @@ * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function blockem_install() { - register_hook('prepare_body', 'addon/blockem/blockem.php', 'blockem_prepare_body'); - register_hook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item'); - register_hook('plugin_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings'); - register_hook('plugin_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post'); - register_hook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start'); - register_hook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu'); - register_hook('enotify_store', 'addon/blockem/blockem.php', 'blockem_enotify_store' ); + Addon::registerHook('prepare_body', 'addon/blockem/blockem.php', 'blockem_prepare_body'); + Addon::registerHook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item'); + Addon::registerHook('addon_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post'); + Addon::registerHook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start'); + Addon::registerHook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu'); + Addon::registerHook('enotify_store', 'addon/blockem/blockem.php', 'blockem_enotify_store'); } - function blockem_uninstall() { - unregister_hook('prepare_body', 'addon/blockem/blockem.php', 'blockem_prepare_body'); - unregister_hook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item'); - unregister_hook('plugin_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings'); - unregister_hook('plugin_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post'); - unregister_hook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start'); - unregister_hook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu'); - unregister_hook('enotify_store', 'addon/blockem/blockem.php', 'blockem_enotify_store' ); - + Addon::unregisterHook('prepare_body', 'addon/blockem/blockem.php', 'blockem_prepare_body'); + Addon::unregisterHook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item'); + Addon::unregisterHook('addon_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post'); + Addon::unregisterHook('conversation_start', 'addon/blockem/blockem.php', 'blockem_conversation_start'); + Addon::unregisterHook('item_photo_menu', 'addon/blockem/blockem.php', 'blockem_item_photo_menu'); + Addon::unregisterHook('enotify_store', 'addon/blockem/blockem.php', 'blockem_enotify_store'); } - - - - -function blockem_addon_settings(&$a,&$s) { +function blockem_addon_settings(&$a, &$s) +{ if(! local_user()) return; @@ -47,7 +40,7 @@ function blockem_addon_settings(&$a,&$s) { $a->page['htmlhead'] .= '' . "\r\n"; - $words = PConfig::get(local_user(),'blockem','words'); + $words = PConfig::get(local_user(), 'blockem', 'words'); if(! $words) $words = ''; @@ -81,7 +74,6 @@ function blockem_addon_settings_post(&$a,&$b) { } } - function blockem_enotify_store(&$a,&$b) { $words = PConfig::get($b['uid'],'blockem','words'); @@ -145,13 +137,11 @@ function blockem_prepare_body(&$a,&$b) { } } - function blockem_display_item(&$a,&$b) { if(strstr($b['output']['body'],'id="blockem-wrap-')) $b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg"; } - function blockem_conversation_start(&$a,&$b) { if(! local_user()) diff --git a/blogger/blogger.php b/blogger/blogger.php index 093d9049c..050aaa7a1 100644 --- a/blogger/blogger.php +++ b/blogger/blogger.php @@ -1,53 +1,55 @@ ' - . t('Post to blogger') . ''; + . t('Post to blogger') . ''; } } -function blogger_settings(&$a,&$s) { - +function blogger_settings(&$a, &$s) +{ if (! local_user()) { return; } @@ -58,11 +60,11 @@ function blogger_settings(&$a,&$s) { /* Get the current state of our config variables */ - $enabled = PConfig::get(local_user(),'blogger','post'); + $enabled = PConfig::get(local_user(), 'blogger', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $css = (($enabled) ? '' : '-disabled'); - $def_enabled = PConfig::get(local_user(),'blogger','post_by_default'); + $def_enabled = PConfig::get(local_user(), 'blogger', 'post_by_default'); $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); @@ -80,7 +82,7 @@ function blogger_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; @@ -109,17 +111,19 @@ function blogger_settings(&$a,&$s) { } -function blogger_settings_post(&$a,&$b) { - if (x($_POST,'blogger-submit')) { - PConfig::set(local_user(),'blogger','post',intval($_POST['blogger'])); - PConfig::set(local_user(),'blogger','post_by_default',intval($_POST['bl_bydefault'])); - PConfig::set(local_user(),'blogger','bl_username',trim($_POST['bl_username'])); - PConfig::set(local_user(),'blogger','bl_password',trim($_POST['bl_password'])); - PConfig::set(local_user(),'blogger','bl_blog',trim($_POST['bl_blog'])); +function blogger_settings_post(&$a, &$b) +{ + if (x($_POST, 'blogger-submit')) { + PConfig::set(local_user(), 'blogger', 'post', intval($_POST['blogger'])); + PConfig::set(local_user(), 'blogger', 'post_by_default', intval($_POST['bl_bydefault'])); + PConfig::set(local_user(), 'blogger', 'bl_username', trim($_POST['bl_username'])); + PConfig::set(local_user(), 'blogger', 'bl_password', trim($_POST['bl_password'])); + PConfig::set(local_user(), 'blogger', 'bl_blog', trim($_POST['bl_blog'])); } } -function blogger_post_local(&$a,&$b) { +function blogger_post_local(&$a, &$b) +{ // This can probably be changed to allow editing by pointing to a different API endpoint if ($b['edit']) { @@ -134,11 +138,11 @@ function blogger_post_local(&$a,&$b) { return; } - $bl_post = intval(PConfig::get(local_user(),'blogger','post')); + $bl_post = intval(PConfig::get(local_user(), 'blogger', 'post')); - $bl_enable = (($bl_post && x($_REQUEST,'blogger_enable')) ? intval($_REQUEST['blogger_enable']) : 0); + $bl_enable = (($bl_post && x($_REQUEST, 'blogger_enable')) ? intval($_REQUEST['blogger_enable']) : 0); - if ($b['api_source'] && intval(PConfig::get(local_user(),'blogger','post_by_default'))) { + if ($b['api_source'] && intval(PConfig::get(local_user(), 'blogger', 'post_by_default'))) { $bl_enable = 1; } @@ -156,12 +160,13 @@ function blogger_post_local(&$a,&$b) { -function blogger_send(&$a,&$b) { +function blogger_send(&$a, &$b) +{ if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { return; } - if (! strstr($b['postopts'],'blogger')) { + if (! strstr($b['postopts'], 'blogger')) { return; } @@ -169,12 +174,11 @@ function blogger_send(&$a,&$b) { return; } - $bl_username = xmlify(PConfig::get($b['uid'],'blogger','bl_username')); - $bl_password = xmlify(PConfig::get($b['uid'],'blogger','bl_password')); - $bl_blog = PConfig::get($b['uid'],'blogger','bl_blog'); + $bl_username = xmlify(PConfig::get($b['uid'], 'blogger', 'bl_username')); + $bl_password = xmlify(PConfig::get($b['uid'], 'blogger', 'bl_password')); + $bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog'); if ($bl_username && $bl_password && $bl_blog) { - require_once('include/bbcode.php'); $title = '' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . ''; @@ -200,9 +204,9 @@ EOT; logger('blogger: data: ' . $xml, LOGGER_DATA); if ($bl_blog !== 'test') { - $x = post_url($bl_blog,$xml); + $x = post_url($bl_blog, $xml); } logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG); } -} \ No newline at end of file +} diff --git a/blogger/lang/C/messages.po b/blogger/lang/C/messages.po index 1f99bc657..f04bbb392 100644 --- a/blogger/lang/C/messages.po +++ b/blogger/lang/C/messages.po @@ -26,7 +26,7 @@ msgid "Blogger Export" msgstr "" #: blogger.php:82 -msgid "Enable Blogger Post Plugin" +msgid "Enable Blogger Post Addon" msgstr "" #: blogger.php:87 diff --git a/blogger/lang/ca/strings.php b/blogger/lang/ca/strings.php index 354d354ae..572617cab 100644 --- a/blogger/lang/ca/strings.php +++ b/blogger/lang/ca/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to blogger"] = "Enviament a blogger"; $a->strings["Blogger Post Settings"] = "Ajustos d'enviament a blogger"; -$a->strings["Enable Blogger Post Plugin"] = "Habilita el Plugin d'Enviaments a Blogger"; +$a->strings["Enable Blogger Post Addon"] = "Habilita el Addon d'Enviaments a Blogger"; $a->strings["Blogger username"] = "Nom d'usuari a blogger"; $a->strings["Blogger password"] = "Contrasenya a blogger"; $a->strings["Blogger API URL"] = "Blogger API URL"; diff --git a/blogger/lang/cs/messages.po b/blogger/lang/cs/messages.po index 0d2a1227c..e2389585f 100644 --- a/blogger/lang/cs/messages.po +++ b/blogger/lang/cs/messages.po @@ -28,8 +28,8 @@ msgid "Blogger Export" msgstr "Blogger Export" #: blogger.php:82 -msgid "Enable Blogger Post Plugin" -msgstr "Povolit Blogger Post Plugin" +msgid "Enable Blogger Post Addon" +msgstr "Povolit Blogger Post Addon" #: blogger.php:87 msgid "Blogger username" diff --git a/blogger/lang/de/messages.po b/blogger/lang/de/messages.po index 61cb7863c..0ecdfd790 100644 --- a/blogger/lang/de/messages.po +++ b/blogger/lang/de/messages.po @@ -28,8 +28,8 @@ msgid "Blogger Export" msgstr "Blogger Export" #: blogger.php:82 -msgid "Enable Blogger Post Plugin" -msgstr "Blogger-Post-Plugin aktivieren" +msgid "Enable Blogger Post Addon" +msgstr "Blogger-Post-Addon aktivieren" #: blogger.php:87 msgid "Blogger username" diff --git a/blogger/lang/de/strings.php b/blogger/lang/de/strings.php index 8e44b4c20..549b6a2ba 100644 --- a/blogger/lang/de/strings.php +++ b/blogger/lang/de/strings.php @@ -7,7 +7,7 @@ function string_plural_select_de($n){ ; $a->strings["Post to blogger"] = "Auf Blogger posten"; $a->strings["Blogger Export"] = "Blogger Export"; -$a->strings["Enable Blogger Post Plugin"] = "Blogger-Post-Plugin aktivieren"; +$a->strings["Enable Blogger Post Addon"] = "Blogger-Post-Addon aktivieren"; $a->strings["Blogger username"] = "Blogger-Benutzername"; $a->strings["Blogger password"] = "Blogger-Passwort"; $a->strings["Blogger API URL"] = "Blogger-API-URL"; diff --git a/blogger/lang/eo/strings.php b/blogger/lang/eo/strings.php index 5ab29790d..a7783cd8f 100644 --- a/blogger/lang/eo/strings.php +++ b/blogger/lang/eo/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to blogger"] = "Afiŝi al blogger"; $a->strings["Blogger Post Settings"] = "Agordo pri Blogger Afiŝoj"; -$a->strings["Enable Blogger Post Plugin"] = "Ŝalti la Blogger afiŝo kromprogramon"; +$a->strings["Enable Blogger Post Addon"] = "Ŝalti la Blogger afiŝo kromprogramon"; $a->strings["Blogger username"] = "Blogger uzantonomo"; $a->strings["Blogger password"] = "Blogger pasvorto"; $a->strings["Blogger API URL"] = "Blogger API URL"; diff --git a/blogger/lang/es/messages.po b/blogger/lang/es/messages.po index 86b1dcb7a..66b6804fe 100644 --- a/blogger/lang/es/messages.po +++ b/blogger/lang/es/messages.po @@ -27,8 +27,8 @@ msgid "Blogger Export" msgstr "Esportar Blogger" #: blogger.php:82 -msgid "Enable Blogger Post Plugin" -msgstr "Activar plugin de entrada de Blogger" +msgid "Enable Blogger Post Addon" +msgstr "Activar addon de entrada de Blogger" #: blogger.php:87 msgid "Blogger username" diff --git a/blogger/lang/es/strings.php b/blogger/lang/es/strings.php index 01441ae5a..47e44a499 100644 --- a/blogger/lang/es/strings.php +++ b/blogger/lang/es/strings.php @@ -7,7 +7,7 @@ function string_plural_select_es($n){ ; $a->strings["Post to blogger"] = "Entrada para blogger"; $a->strings["Blogger Export"] = "Esportar Blogger"; -$a->strings["Enable Blogger Post Plugin"] = "Activar plugin de entrada de Blogger"; +$a->strings["Enable Blogger Post Addon"] = "Activar addon de entrada de Blogger"; $a->strings["Blogger username"] = "Nombre de usuario de Blogger"; $a->strings["Blogger password"] = "Contraseña de Blogger"; $a->strings["Blogger API URL"] = "URL API de Blogger"; diff --git a/blogger/lang/fr/messages.po b/blogger/lang/fr/messages.po index 0438f3d80..497bf0bed 100644 --- a/blogger/lang/fr/messages.po +++ b/blogger/lang/fr/messages.po @@ -28,7 +28,7 @@ msgid "Blogger Export" msgstr "" #: blogger.php:82 -msgid "Enable Blogger Post Plugin" +msgid "Enable Blogger Post Addon" msgstr "Activer le connecteur Blogger" #: blogger.php:87 diff --git a/blogger/lang/fr/strings.php b/blogger/lang/fr/strings.php index 2265182a4..89a429aef 100644 --- a/blogger/lang/fr/strings.php +++ b/blogger/lang/fr/strings.php @@ -7,7 +7,7 @@ function string_plural_select_fr($n){ ; $a->strings["Post to blogger"] = "Poster sur Blogger"; $a->strings["Blogger Export"] = ""; -$a->strings["Enable Blogger Post Plugin"] = "Activer le connecteur Blogger"; +$a->strings["Enable Blogger Post Addon"] = "Activer le connecteur Blogger"; $a->strings["Blogger username"] = "Nom d'utilisateur Blogger"; $a->strings["Blogger password"] = "Mot de passe Blogger"; $a->strings["Blogger API URL"] = "URL de l'API de Blogger"; diff --git a/blogger/lang/is/messages.po b/blogger/lang/is/messages.po index 1c76cf741..e29ce4968 100644 --- a/blogger/lang/is/messages.po +++ b/blogger/lang/is/messages.po @@ -28,7 +28,7 @@ msgid "Blogger Export" msgstr "Flytja út blogg" #: blogger.php:82 -msgid "Enable Blogger Post Plugin" +msgid "Enable Blogger Post Addon" msgstr "Virkja sendiviðbót fyrir blogg" #: blogger.php:87 diff --git a/blogger/lang/is/strings.php b/blogger/lang/is/strings.php index 01f532f61..deab7af80 100644 --- a/blogger/lang/is/strings.php +++ b/blogger/lang/is/strings.php @@ -7,7 +7,7 @@ function string_plural_select_is($n){ ; $a->strings["Post to blogger"] = "Senda færslu á bloggara"; $a->strings["Blogger Export"] = "Flytja út blogg"; -$a->strings["Enable Blogger Post Plugin"] = "Virkja sendiviðbót fyrir blogg"; +$a->strings["Enable Blogger Post Addon"] = "Virkja sendiviðbót fyrir blogg"; $a->strings["Blogger username"] = "Notandanafn bloggara"; $a->strings["Blogger password"] = "Aðgangsorð bloggara"; $a->strings["Blogger API URL"] = "API slóð bloggs"; diff --git a/blogger/lang/it/messages.po b/blogger/lang/it/messages.po index 6babcabf4..ed0b95d7e 100644 --- a/blogger/lang/it/messages.po +++ b/blogger/lang/it/messages.po @@ -28,8 +28,8 @@ msgid "Blogger Export" msgstr "Esporta Blogger" #: blogger.php:82 -msgid "Enable Blogger Post Plugin" -msgstr "Abilita il plugin di invio a Blogger" +msgid "Enable Blogger Post Addon" +msgstr "Abilita il addon di invio a Blogger" #: blogger.php:87 msgid "Blogger username" diff --git a/blogger/lang/it/strings.php b/blogger/lang/it/strings.php index deea28a52..953fbc0a0 100644 --- a/blogger/lang/it/strings.php +++ b/blogger/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to blogger"] = "Invia a Blogger"; $a->strings["Blogger Export"] = "Esporta Blogger"; -$a->strings["Enable Blogger Post Plugin"] = "Abilita il plugin di invio a Blogger"; +$a->strings["Enable Blogger Post Addon"] = "Abilita il addon di invio a Blogger"; $a->strings["Blogger username"] = "Nome utente Blogger"; $a->strings["Blogger password"] = "Password Blogger"; $a->strings["Blogger API URL"] = "Indirizzo API Blogger"; diff --git a/blogger/lang/nb-no/strings.php b/blogger/lang/nb-no/strings.php index de7246bc7..3c5a03dff 100644 --- a/blogger/lang/nb-no/strings.php +++ b/blogger/lang/nb-no/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to blogger"] = ""; $a->strings["Blogger Post Settings"] = ""; -$a->strings["Enable Blogger Post Plugin"] = ""; +$a->strings["Enable Blogger Post Addon"] = ""; $a->strings["Blogger username"] = ""; $a->strings["Blogger password"] = ""; $a->strings["Blogger API URL"] = ""; diff --git a/blogger/lang/pl/strings.php b/blogger/lang/pl/strings.php index a08b447b5..c2e7e2d62 100644 --- a/blogger/lang/pl/strings.php +++ b/blogger/lang/pl/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to blogger"] = "Post na blogger"; $a->strings["Blogger Post Settings"] = "Ustawienia postów na Blogger"; -$a->strings["Enable Blogger Post Plugin"] = ""; +$a->strings["Enable Blogger Post Addon"] = ""; $a->strings["Blogger username"] = "Nazwa użytkownika na Blogger"; $a->strings["Blogger password"] = "Hasło do Blogger"; $a->strings["Blogger API URL"] = ""; diff --git a/blogger/lang/pt-br/messages.po b/blogger/lang/pt-br/messages.po index af8a5ba05..6b22fc204 100644 --- a/blogger/lang/pt-br/messages.po +++ b/blogger/lang/pt-br/messages.po @@ -29,7 +29,7 @@ msgid "Blogger Export" msgstr "Exportador Blogger" #: blogger.php:82 -msgid "Enable Blogger Post Plugin" +msgid "Enable Blogger Post Addon" msgstr "Habilitar plug-in para publicar no Blogger" #: blogger.php:87 diff --git a/blogger/lang/pt-br/strings.php b/blogger/lang/pt-br/strings.php index dcd10fabb..74a79acad 100644 --- a/blogger/lang/pt-br/strings.php +++ b/blogger/lang/pt-br/strings.php @@ -7,7 +7,7 @@ function string_plural_select_pt_br($n){ ; $a->strings["Post to blogger"] = "Publicar no Blogger"; $a->strings["Blogger Export"] = "Exportador Blogger"; -$a->strings["Enable Blogger Post Plugin"] = "Habilitar plug-in para publicar no Blogger"; +$a->strings["Enable Blogger Post Addon"] = "Habilitar plug-in para publicar no Blogger"; $a->strings["Blogger username"] = "Nome de usuário no Blogger"; $a->strings["Blogger password"] = "Senha do Blogger"; $a->strings["Blogger API URL"] = "URL da API do Blogger"; diff --git a/blogger/lang/ro/messages.po b/blogger/lang/ro/messages.po index 8ba21d2f7..de35da2b8 100644 --- a/blogger/lang/ro/messages.po +++ b/blogger/lang/ro/messages.po @@ -27,7 +27,7 @@ msgid "Blogger Export" msgstr "Export pe Blogger " #: blogger.php:82 -msgid "Enable Blogger Post Plugin" +msgid "Enable Blogger Post Addon" msgstr "Activare Modul Postare pe Blogger " #: blogger.php:87 diff --git a/blogger/lang/ro/strings.php b/blogger/lang/ro/strings.php index f89fd4b98..f6aac95de 100644 --- a/blogger/lang/ro/strings.php +++ b/blogger/lang/ro/strings.php @@ -7,7 +7,7 @@ function string_plural_select_ro($n){ ; $a->strings["Post to blogger"] = "Postați pe Blogger"; $a->strings["Blogger Export"] = "Export pe Blogger "; -$a->strings["Enable Blogger Post Plugin"] = "Activare Modul Postare pe Blogger "; +$a->strings["Enable Blogger Post Addon"] = "Activare Modul Postare pe Blogger "; $a->strings["Blogger username"] = "Utilizator Blogger"; $a->strings["Blogger password"] = "Parolă Blogger "; $a->strings["Blogger API URL"] = "URL Cheie API Blogger "; diff --git a/blogger/lang/ru/messages.po b/blogger/lang/ru/messages.po index 38942ed6d..93d8ce3f7 100644 --- a/blogger/lang/ru/messages.po +++ b/blogger/lang/ru/messages.po @@ -28,7 +28,7 @@ msgid "Blogger Export" msgstr "Экспорт в Blogger" #: blogger.php:82 -msgid "Enable Blogger Post Plugin" +msgid "Enable Blogger Post Addon" msgstr "Включить плагин Blogger" #: blogger.php:87 diff --git a/blogger/lang/ru/strings.php b/blogger/lang/ru/strings.php index a718ce74b..3c2e1a299 100644 --- a/blogger/lang/ru/strings.php +++ b/blogger/lang/ru/strings.php @@ -7,7 +7,7 @@ function string_plural_select_ru($n){ ; $a->strings["Post to blogger"] = "Написать в Blogger"; $a->strings["Blogger Export"] = "Экспорт в Blogger"; -$a->strings["Enable Blogger Post Plugin"] = "Включить плагин Blogger"; +$a->strings["Enable Blogger Post Addon"] = "Включить плагин Blogger"; $a->strings["Blogger username"] = "Имя пользователя Blogger"; $a->strings["Blogger password"] = "Пароль Blogger"; $a->strings["Blogger API URL"] = "Blogger API URL"; diff --git a/blogger/lang/zh-cn/strings.php b/blogger/lang/zh-cn/strings.php index 6134a7d1c..d9b717312 100644 --- a/blogger/lang/zh-cn/strings.php +++ b/blogger/lang/zh-cn/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to blogger"] = "转播到blogger"; $a->strings["Blogger Post Settings"] = "Blogger转播设置"; -$a->strings["Enable Blogger Post Plugin"] = "使Blogger转播插件可用"; +$a->strings["Enable Blogger Post Addon"] = "使Blogger转播插件可用"; $a->strings["Blogger username"] = "Blogger用户名"; $a->strings["Blogger password"] = "Blogger密码"; $a->strings["Blogger API URL"] = "Blogger API URL"; diff --git a/buffer/README.md b/buffer/README.md index 2ba2b01e6..f97cf07b7 100644 --- a/buffer/README.md +++ b/buffer/README.md @@ -5,4 +5,4 @@ Please register an app at [http://bufferapp.com/developers/api](http://bufferapp Please use (your server address)/buffer/connect as Callback URL. After the registration please enter the values for "Client ID" and "Client Secret" in the -[administration](admin/plugins/buffer). +[administration](admin/addons/buffer). diff --git a/buffer/buffer.php b/buffer/buffer.php index b90d90908..9c36f7c44 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -8,23 +8,24 @@ require 'addon/buffer/bufferapp.php'; use Friendica\App; +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; function buffer_install() { - register_hook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local'); - register_hook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send'); - register_hook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets'); - register_hook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings'); - register_hook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post'); + Addon::registerHook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local'); + Addon::registerHook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send'); + Addon::registerHook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets'); + Addon::registerHook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings'); + Addon::registerHook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post'); } function buffer_uninstall() { - unregister_hook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local'); - unregister_hook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send'); - unregister_hook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets'); - unregister_hook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings'); - unregister_hook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post'); + Addon::unregisterHook('post_local', 'addon/buffer/buffer.php', 'buffer_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/buffer/buffer.php', 'buffer_send'); + Addon::unregisterHook('jot_networks', 'addon/buffer/buffer.php', 'buffer_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/buffer/buffer.php', 'buffer_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post'); } function buffer_module() {} @@ -54,22 +55,24 @@ function buffer_content(&$a) { return $o; } -function buffer_plugin_admin(&$a, &$o){ - $t = get_markup_template( "admin.tpl", "addon/buffer/" ); +function buffer_addon_admin(&$a, &$o) +{ + $t = get_markup_template("admin.tpl", "addon/buffer/"); $o = replace_macros($t, [ '$submit' => t('Save Settings'), - // name, label, value, help, [extra values] - '$client_id' => ['client_id', t('Client ID'), Config::get('buffer', 'client_id' ), ''], - '$client_secret' => ['client_secret', t('Client Secret'), Config::get('buffer', 'client_secret' ), ''], + // name, label, value, help, [extra values] + '$client_id' => ['client_id', t('Client ID'), Config::get('buffer', 'client_id'), ''], + '$client_secret' => ['client_secret', t('Client Secret'), Config::get('buffer', 'client_secret'), ''], ]); } -function buffer_plugin_admin_post(&$a){ - $client_id = ((x($_POST,'client_id')) ? notags(trim($_POST['client_id'])) : ''); - $client_secret = ((x($_POST,'client_secret')) ? notags(trim($_POST['client_secret'])): ''); - Config::set('buffer','client_id',$client_id); - Config::set('buffer','client_secret',$client_secret); - info( t('Settings updated.'). EOL ); +function buffer_addon_admin_post(&$a) +{ + $client_id = ((x($_POST, 'client_id')) ? notags(trim($_POST['client_id'])) : ''); + $client_secret = ((x($_POST, 'client_secret')) ? notags(trim($_POST['client_secret'])): ''); + Config::set('buffer', 'client_id', $client_id); + Config::set('buffer', 'client_secret', $client_secret); + info(t('Settings updated.'). EOL); } function buffer_connect(&$a) { @@ -154,7 +157,7 @@ function buffer_settings(&$a,&$s) { $s .= '
'; } else { $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/buffer/lang/C/messages.po b/buffer/lang/C/messages.po index 17522ebef..3d5193379 100644 --- a/buffer/lang/C/messages.po +++ b/buffer/lang/C/messages.po @@ -58,7 +58,7 @@ msgid "Authenticate your Buffer connection" msgstr "" #: buffer.php:146 -msgid "Enable Buffer Post Plugin" +msgid "Enable Buffer Post Addon" msgstr "" #: buffer.php:151 diff --git a/buffer/lang/cs/messages.po b/buffer/lang/cs/messages.po index 7ec1390b6..63e753b0e 100644 --- a/buffer/lang/cs/messages.po +++ b/buffer/lang/cs/messages.po @@ -60,8 +60,8 @@ msgid "Authenticate your Buffer connection" msgstr "Přihlásit ke spojení na Buffer" #: buffer.php:146 -msgid "Enable Buffer Post Plugin" -msgstr "Povolit Buffer Post Plugin" +msgid "Enable Buffer Post Addon" +msgstr "Povolit Buffer Post Addon" #: buffer.php:151 msgid "Post to Buffer by default" diff --git a/buffer/lang/cs/strings.php b/buffer/lang/cs/strings.php index 052b3e8ef..f6ecd1e34 100644 --- a/buffer/lang/cs/strings.php +++ b/buffer/lang/cs/strings.php @@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "návrat ke stránce konektor"; $a->strings["Post to Buffer"] = "Příspěvek na Buffer"; $a->strings["Buffer Export"] = "Buffer Export"; $a->strings["Authenticate your Buffer connection"] = "Přihlásit ke spojení na Buffer"; -$a->strings["Enable Buffer Post Plugin"] = "Povolit Buffer Post Plugin"; +$a->strings["Enable Buffer Post Addon"] = "Povolit Buffer Post Addon"; $a->strings["Post to Buffer by default"] = "Defaultně zaslat na Buffer"; $a->strings["Check to delete this preset"] = "Zaškrtnout pro smazání tohoto nastavení"; $a->strings["Posts are going to all accounts that are enabled by default:"] = "Příspěvky jsou zasílány na všechny účty, které jsou defaultně povoleny:"; diff --git a/buffer/lang/de/messages.po b/buffer/lang/de/messages.po index 21bbdda1f..a252d87c2 100644 --- a/buffer/lang/de/messages.po +++ b/buffer/lang/de/messages.po @@ -60,8 +60,8 @@ msgid "Authenticate your Buffer connection" msgstr "Authentifiziere deine Verbindung zu buffer" #: buffer.php:146 -msgid "Enable Buffer Post Plugin" -msgstr "Buffer Post-Plugin aktivieren" +msgid "Enable Buffer Post Addon" +msgstr "Buffer Post-Addon aktivieren" #: buffer.php:151 msgid "Post to Buffer by default" diff --git a/buffer/lang/de/strings.php b/buffer/lang/de/strings.php index 4ddbf1e97..dbf3f7dc4 100644 --- a/buffer/lang/de/strings.php +++ b/buffer/lang/de/strings.php @@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "zurück zur Connector Seite"; $a->strings["Post to Buffer"] = "Auf buffer veröffentlichen"; $a->strings["Buffer Export"] = "Buffer Export"; $a->strings["Authenticate your Buffer connection"] = "Authentifiziere deine Verbindung zu buffer"; -$a->strings["Enable Buffer Post Plugin"] = "Buffer Post-Plugin aktivieren"; +$a->strings["Enable Buffer Post Addon"] = "Buffer Post-Addon aktivieren"; $a->strings["Post to Buffer by default"] = "Standardmäßig auf buffer veröffentlichen"; $a->strings["Check to delete this preset"] = "Markieren um dieses Preset zu löschen"; $a->strings["Posts are going to all accounts that are enabled by default:"] = "Beiträge werden an alle Accounts geschickt, die Standardmäßig aktiviert sind."; diff --git a/buffer/lang/es/messages.po b/buffer/lang/es/messages.po index 20ceacaed..7a40dd46d 100644 --- a/buffer/lang/es/messages.po +++ b/buffer/lang/es/messages.po @@ -59,8 +59,8 @@ msgid "Authenticate your Buffer connection" msgstr "Autenticar su conexión de Buffer" #: buffer.php:146 -msgid "Enable Buffer Post Plugin" -msgstr "Active el plugin de publicación de Buffer" +msgid "Enable Buffer Post Addon" +msgstr "Active el addon de publicación de Buffer" #: buffer.php:151 msgid "Post to Buffer by default" diff --git a/buffer/lang/es/strings.php b/buffer/lang/es/strings.php index 15c58cd1b..0ee13d761 100644 --- a/buffer/lang/es/strings.php +++ b/buffer/lang/es/strings.php @@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "Vuelva a la página de conexión" $a->strings["Post to Buffer"] = "Publique en Buffer"; $a->strings["Buffer Export"] = "Exportar Buffer"; $a->strings["Authenticate your Buffer connection"] = "Autenticar su conexión de Buffer"; -$a->strings["Enable Buffer Post Plugin"] = "Active el plugin de publicación de Buffer"; +$a->strings["Enable Buffer Post Addon"] = "Active el addon de publicación de Buffer"; $a->strings["Post to Buffer by default"] = "Publicar en Buffer por defecto"; $a->strings["Check to delete this preset"] = "Verificar para eliminar este preajuste"; $a->strings["Posts are going to all accounts that are enabled by default:"] = "Las publicaciones van a todas las cuentas que estén habilitadas por defecto"; diff --git a/buffer/lang/fr/messages.po b/buffer/lang/fr/messages.po index bc1593411..5ba45daad 100644 --- a/buffer/lang/fr/messages.po +++ b/buffer/lang/fr/messages.po @@ -62,7 +62,7 @@ msgid "Authenticate your Buffer connection" msgstr "Authentifier votre connexion à Buffer" #: buffer.php:146 -msgid "Enable Buffer Post Plugin" +msgid "Enable Buffer Post Addon" msgstr "Activer le connecteur Buffer" #: buffer.php:151 diff --git a/buffer/lang/fr/strings.php b/buffer/lang/fr/strings.php index 07460f472..f86822c5f 100644 --- a/buffer/lang/fr/strings.php +++ b/buffer/lang/fr/strings.php @@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "revenir à la page du connecteur" $a->strings["Post to Buffer"] = "Publier sur Buffer"; $a->strings["Buffer Export"] = "Export Buffer"; $a->strings["Authenticate your Buffer connection"] = "Authentifier votre connexion à Buffer"; -$a->strings["Enable Buffer Post Plugin"] = "Activer le connecteur Buffer"; +$a->strings["Enable Buffer Post Addon"] = "Activer le connecteur Buffer"; $a->strings["Post to Buffer by default"] = "Publier sur Buffer par défaut"; $a->strings["Check to delete this preset"] = "Cocher pour supprimer ce préréglage"; $a->strings["Posts are going to all accounts that are enabled by default:"] = "Les posts sont envoyés à tous les comptes activés par défault:"; diff --git a/buffer/lang/it/messages.po b/buffer/lang/it/messages.po index 232cd2d61..f74d2cfa0 100644 --- a/buffer/lang/it/messages.po +++ b/buffer/lang/it/messages.po @@ -61,8 +61,8 @@ msgid "Authenticate your Buffer connection" msgstr "Autentica la tua connessione a Buffer" #: buffer.php:146 -msgid "Enable Buffer Post Plugin" -msgstr "Abilita il plugin di invio a Buffer" +msgid "Enable Buffer Post Addon" +msgstr "Abilita il addon di invio a Buffer" #: buffer.php:151 msgid "Post to Buffer by default" diff --git a/buffer/lang/it/strings.php b/buffer/lang/it/strings.php index 9081af8a5..d0c017709 100644 --- a/buffer/lang/it/strings.php +++ b/buffer/lang/it/strings.php @@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "ritorna alla pagina del connettor $a->strings["Post to Buffer"] = "Invia a Buffer"; $a->strings["Buffer Export"] = "Esporta Buffer"; $a->strings["Authenticate your Buffer connection"] = "Autentica la tua connessione a Buffer"; -$a->strings["Enable Buffer Post Plugin"] = "Abilita il plugin di invio a Buffer"; +$a->strings["Enable Buffer Post Addon"] = "Abilita il addon di invio a Buffer"; $a->strings["Post to Buffer by default"] = "Invia sempre a Buffer"; $a->strings["Check to delete this preset"] = "Seleziona per eliminare questo preset"; $a->strings["Posts are going to all accounts that are enabled by default:"] = "I messaggi andranno a tutti gli account che sono abilitati:"; diff --git a/buffer/lang/pt-br/messages.po b/buffer/lang/pt-br/messages.po index 08884bd41..795f26429 100644 --- a/buffer/lang/pt-br/messages.po +++ b/buffer/lang/pt-br/messages.po @@ -61,8 +61,8 @@ msgid "Authenticate your Buffer connection" msgstr "Autenticar sua conexão de Buffer" #: buffer.php:146 -msgid "Enable Buffer Post Plugin" -msgstr "Habilita plugin para publicar no Buffer" +msgid "Enable Buffer Post Addon" +msgstr "Habilita addon para publicar no Buffer" #: buffer.php:151 msgid "Post to Buffer by default" diff --git a/buffer/lang/pt-br/strings.php b/buffer/lang/pt-br/strings.php index 272a071ef..737a86eb6 100644 --- a/buffer/lang/pt-br/strings.php +++ b/buffer/lang/pt-br/strings.php @@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "Volte a página de conectores."; $a->strings["Post to Buffer"] = "Publicar no Buffer"; $a->strings["Buffer Export"] = "Exportar Buffer"; $a->strings["Authenticate your Buffer connection"] = "Autenticar sua conexão de Buffer"; -$a->strings["Enable Buffer Post Plugin"] = "Habilita plugin para publicar no Buffer"; +$a->strings["Enable Buffer Post Addon"] = "Habilita addon para publicar no Buffer"; $a->strings["Post to Buffer by default"] = "Publica no Buffer por padrão"; $a->strings["Check to delete this preset"] = "Marque para excluir este perfil"; $a->strings["Posts are going to all accounts that are enabled by default:"] = ""; diff --git a/buffer/lang/ro/messages.po b/buffer/lang/ro/messages.po index 383390aac..81e46a5ab 100644 --- a/buffer/lang/ro/messages.po +++ b/buffer/lang/ro/messages.po @@ -59,7 +59,7 @@ msgid "Authenticate your Buffer connection" msgstr "Autentificați-vă conectarea la Buffer" #: buffer.php:146 -msgid "Enable Buffer Post Plugin" +msgid "Enable Buffer Post Addon" msgstr "Activare Modul Postare pe Buffer" #: buffer.php:151 diff --git a/buffer/lang/ro/strings.php b/buffer/lang/ro/strings.php index 7e7e575fe..a6bda064d 100644 --- a/buffer/lang/ro/strings.php +++ b/buffer/lang/ro/strings.php @@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "revenire la pagina de conectare"; $a->strings["Post to Buffer"] = "Postați pe Buffer"; $a->strings["Buffer Export"] = "Export pe Buffer "; $a->strings["Authenticate your Buffer connection"] = "Autentificați-vă conectarea la Buffer"; -$a->strings["Enable Buffer Post Plugin"] = "Activare Modul Postare pe Buffer"; +$a->strings["Enable Buffer Post Addon"] = "Activare Modul Postare pe Buffer"; $a->strings["Post to Buffer by default"] = "Postați implicit pe Buffer"; $a->strings["Check to delete this preset"] = "Bifați pentru a șterge această presetare"; $a->strings["Posts are going to all accounts that are enabled by default:"] = "Posturile merg către toate conturile care sunt activate implicit:"; diff --git a/buffer/lang/ru/messages.po b/buffer/lang/ru/messages.po index 84e2531c3..68107abc1 100644 --- a/buffer/lang/ru/messages.po +++ b/buffer/lang/ru/messages.po @@ -60,7 +60,7 @@ msgid "Authenticate your Buffer connection" msgstr "Аутентифицируйте свое соединение с Buffer" #: buffer.php:146 -msgid "Enable Buffer Post Plugin" +msgid "Enable Buffer Post Addon" msgstr "Включить плагин Buffer" #: buffer.php:151 diff --git a/buffer/lang/ru/strings.php b/buffer/lang/ru/strings.php index 9b8bd0414..8572ffd66 100644 --- a/buffer/lang/ru/strings.php +++ b/buffer/lang/ru/strings.php @@ -15,7 +15,7 @@ $a->strings["return to the connector page"] = "вернуться на стра $a->strings["Post to Buffer"] = "Написать в Buffer"; $a->strings["Buffer Export"] = "Экспорт в Buffer"; $a->strings["Authenticate your Buffer connection"] = "Аутентифицируйте свое соединение с Buffer"; -$a->strings["Enable Buffer Post Plugin"] = "Включить плагин Buffer"; +$a->strings["Enable Buffer Post Addon"] = "Включить плагин Buffer"; $a->strings["Post to Buffer by default"] = "Отправлять в Buffer по умолчанию"; $a->strings["Check to delete this preset"] = "Отметьте для удаления этих настроек"; $a->strings["Posts are going to all accounts that are enabled by default:"] = "Сообщения уходят во все учетные записи по умолчанию:"; diff --git a/buglink/buglink.php b/buglink/buglink.php index 06eaddbb6..5ffa68db4 100644 --- a/buglink/buglink.php +++ b/buglink/buglink.php @@ -5,11 +5,11 @@ * Version: 1.0 * Author: Mike Macgirvin */ +use Friendica\Core\Addon; + +function buglink_install() { Addon::registerHook('page_end', 'addon/buglink/buglink.php', 'buglink_active'); } -function buglink_install() { register_hook('page_end', 'addon/buglink/buglink.php', 'buglink_active'); } - - -function buglink_uninstall() { unregister_hook('page_end', 'addon/buglink/buglink.php', 'buglink_active'); } +function buglink_uninstall() { Addon::unregisterHook('page_end', 'addon/buglink/buglink.php', 'buglink_active'); } function buglink_active(&$a,&$b) { $b .= ''; } diff --git a/calc/calc.php b/calc/calc.php index a299d45e9..176ade857 100644 --- a/calc/calc.php +++ b/calc/calc.php @@ -5,14 +5,14 @@ * Version: 1.0 * Author: Mike Macgirvin */ - +use Friendica\Core\Addon; function calc_install() { - register_hook('app_menu', 'addon/calc/calc.php', 'calc_app_menu'); + Addon::registerHook('app_menu', 'addon/calc/calc.php', 'calc_app_menu'); } function calc_uninstall() { - unregister_hook('app_menu', 'addon/calc/calc.php', 'calc_app_menu'); + Addon::unregisterHook('app_menu', 'addon/calc/calc.php', 'calc_app_menu'); } diff --git a/communityhome/README.md b/communityhome/README.md index 21f2a9465..91838d9f1 100644 --- a/communityhome/README.md +++ b/communityhome/README.md @@ -1,12 +1,12 @@ Community Home -------------- -This plugin overwrites the default home page shown to not logged users. +This addon overwrites the default home page shown to not logged users. On sidebar there are the login form, last ten users (if they have choosed to be in site directory), last ten public photos and last ten "likes" sent by a site user or about a site user's item -In main content is shown the community stream. This plugin doesn't +In main content is shown the community stream. This addon doesn't honour your community page visibility site setting: the community stream is shown also if you have choose to not show the community page. diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php index 8364392bd..169d2416c 100644 --- a/communityhome/communityhome.php +++ b/communityhome/communityhome.php @@ -5,7 +5,7 @@ * Version: 2.0 * Author: Fabio Comuni */ - +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Module\Login; @@ -13,12 +13,12 @@ require_once('mod/community.php'); function communityhome_install() { - register_hook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home'); + Addon::registerHook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home'); logger("installed communityhome"); } function communityhome_uninstall() { - unregister_hook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home'); + Addon::unregisterHook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home'); logger("removed communityhome"); } @@ -33,25 +33,28 @@ function communityhome_getopts() { ]; } -function communityhome_plugin_admin(&$a, &$o) { - $tpl = get_markup_template( 'settings.tpl', 'addon/communityhome/' ); +function communityhome_addon_admin(&$a, &$o) +{ + $tpl = get_markup_template('settings.tpl', 'addon/communityhome/'); $opts = communityhome_getopts(); $ctx = [ '$submit' => t("Submit"), '$fields' => [], ]; - foreach($opts as $k=>$v) { + + foreach ($opts as $k => $v) { $ctx['fields'][] = ['communityhome_'.$k, $v, Config::get('communityhome', $k)]; } $o = replace_macros($tpl, $ctx); } -function communityhome_plugin_admin_post(&$a,&$b) { - if(x($_POST,'communityhome-submit')) { +function communityhome_addon_admin_post(&$a, &$b) +{ + if (x($_POST, 'communityhome-submit')) { $opts = communityhome_getopts(); - foreach($opts as $k=>$v) { - Config::set('communityhome', $k, x($_POST,'communityhome_'.$k)); + foreach ($opts as $k => $v) { + Config::set('communityhome', $k, x($_POST, 'communityhome_'.$k)); } } } diff --git a/convert/convert.php b/convert/convert.php index 03b1e9d5a..1ddd29781 100644 --- a/convert/convert.php +++ b/convert/convert.php @@ -5,13 +5,14 @@ * Version: 1.0 * Author: Mike Macgirvin */ +use Friendica\Core\Addon; function convert_install() { - register_hook('app_menu', 'addon/convert/convert.php', 'convert_app_menu'); + Addon::registerHook('app_menu', 'addon/convert/convert.php', 'convert_app_menu'); } function convert_uninstall() { - unregister_hook('app_menu', 'addon/convert/convert.php', 'convert_app_menu'); + Addon::unregisterHook('app_menu', 'addon/convert/convert.php', 'convert_app_menu'); } function convert_app_menu($a,&$b) { diff --git a/curweather/curweather.php b/curweather/curweather.php index 7b8b89e3d..dc9f9bb83 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -13,6 +13,7 @@ require_once('include/network.php'); require_once("mod/proxy.php"); require_once('include/text.php'); +use Friendica\Core\Addon; use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\PConfig; @@ -65,16 +66,17 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0) return $r; } -function curweather_install() { - register_hook('network_mod_init', 'addon/curweather/curweather.php', 'curweather_network_mod_init'); - register_hook('plugin_settings', 'addon/curweather/curweather.php', 'curweather_plugin_settings'); - register_hook('plugin_settings_post', 'addon/curweather/curweather.php', 'curweather_plugin_settings_post'); +function curweather_install() +{ + Addon::registerHook('network_mod_init', 'addon/curweather/curweather.php', 'curweather_network_mod_init'); + Addon::registerHook('addon_settings', 'addon/curweather/curweather.php', 'curweather_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post'); } function curweather_uninstall() { - unregister_hook('network_mod_init', 'addon/curweather/curweather.php', 'curweather_network_mod_init'); - unregister_hook('plugin_settings', 'addon/curweather/curweather.php', 'curweather_plugin_settings'); - unregister_hook('plugin_settings_post', 'addon/curweather/curweather.php', 'curweather_plugin_settings_post'); + Addon::unregisterHook('network_mod_init', 'addon/curweather/curweather.php', 'curweather_network_mod_init'); + Addon::unregisterHook('addon_settings', 'addon/curweather/curweather.php', 'curweather_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post'); } function curweather_network_mod_init(&$fk_app,&$b) { @@ -140,7 +142,7 @@ function curweather_network_mod_init(&$fk_app,&$b) { } -function curweather_plugin_settings_post($a,$post) { +function curweather_addon_settings_post($a,$post) { if(! local_user() || (! x($_POST,'curweather-settings-submit'))) return; PConfig::set(local_user(),'curweather','curweather_loc',trim($_POST['curweather_loc'])); @@ -151,7 +153,7 @@ function curweather_plugin_settings_post($a,$post) { } -function curweather_plugin_settings(&$a,&$s) { +function curweather_addon_settings(&$a,&$s) { if(! local_user()) return; @@ -185,7 +187,7 @@ function curweather_plugin_settings(&$a,&$s) { } // Config stuff for the admin panel to let the admin of the node set a APPID // for accessing the API of openweathermap -function curweather_plugin_admin_post (&$a) { +function curweather_addon_admin_post (&$a) { if(! is_site_admin()) return; if ($_POST['curweather-submit']) { @@ -194,7 +196,7 @@ function curweather_plugin_admin_post (&$a) { info( t('Curweather settings saved.'.EOL)); } } -function curweather_plugin_admin (&$a, &$o) { +function curweather_addon_admin (&$a, &$o) { if(! is_site_admin()) return; $appid = Config::get('curweather','appid'); diff --git a/dav/README.md b/dav/README.md index 7c2abdb80..b86d47fc8 100644 --- a/dav/README.md +++ b/dav/README.md @@ -30,7 +30,7 @@ At the moment, the calendar system supports the following features: - CalDAV-Sync (http://dmfs.org/caldav/) works, non-free ## Installation -After activating, serveral tables in the database have to be created. The admin-interface of the plugin will try to do this automatically. +After activating, serveral tables in the database have to be created. The admin-interface of the addon will try to do this automatically. In case of errors, the SQL-statement to create the tables manually are shown in the admin-interface. @@ -63,7 +63,7 @@ MIT License -Author of this plugin (the parts that are not part of the libraries above): +Author of this addon (the parts that are not part of the libraries above): Tobias Hößl http://friendica.hoessl.eu/profile/cato http://www.hoessl.eu/ diff --git a/dav/SabreDAV/ChangeLog b/dav/SabreDAV/ChangeLog index 3f424d953..aa7b686d5 100644 --- a/dav/SabreDAV/ChangeLog +++ b/dav/SabreDAV/ChangeLog @@ -17,7 +17,7 @@ * Changed: The Sabre_VObject library now spawned into it's own project! * New feature: Support for caldav notifications! * Changed: Responsibility for dealing with the calendar-query is now - moved from the CalDAV plugin to the CalDAV backends. This allows for + moved from the CalDAV addon to the CalDAV backends. This allows for heavy optimizations. * Changed: The CalDAV PDO backend is now a lot faster for common calendar queries. @@ -27,7 +27,7 @@ receiving "text/x-vcard; charset=utf-8" for a contenttype. * Added: Sabre_DAV_Client now throws more specific exceptions in cases where we already has an exception class. - * Added: Sabre_DAV_PartialUpdate. This plugin allows you to use the + * Added: Sabre_DAV_PartialUpdate. This addon allows you to use the PATCH method to update parts of a file. * Added: Tons of timezone name mappings for Microsoft Exchange. * Added: Support for an 'exception' event. @@ -69,13 +69,13 @@ * Fixed: Issue 112: Stronger validation of iCalendar objects. Now making sure every iCalendar object only contains 1 component, and disallowing vcards, forcing every component to have a UID. - * Fixed: Basic validation for vcards in the CardDAV plugin. + * Fixed: Basic validation for vcards in the CardDAV addon. * Fixed: Issue 213: Workaround for an Evolution bug, that prevented it from updating events. * Fixed: Issue 211: A time-limit query on a non-relative alarm trigger in a recurring event could result in an endless loop. * Fixed: All uri fields are now a maximum of 200 characters. The Bynari - outlook plugin used much longer strings so this should improve + outlook addon used much longer strings so this should improve compatibility. * Fixed: Added a workaround for a bug in KDE 4.8.2 contact syncing. See https://bugs.kde.org/show_bug.cgi?id=300047 @@ -109,7 +109,7 @@ COUNT= parameter in the RRULE property. * Added: Support for time-range filters on VALARM components. * Fixed: Correctly filtering all-day events. - * Fixed: Sending back correct mimetypes from the browser plugin (thanks + * Fixed: Sending back correct mimetypes from the browser addon (thanks Jürgen). * Fixed: Issue 195: Sabre_CardDAV pear package had an incorrect dependency. * Fixed: Calendardata would be destroyed when performing a MOVE request. @@ -134,8 +134,8 @@ * BC Break: Default Principals PDO backend now needs a new field in the 'principals' table. See the website for details. * Added: Ability to create new calendars and addressbooks from within the - browser plugin. - * Added: Browser plugin: icons for various nodes. + browser addon. + * Added: Browser addon: icons for various nodes. * Added: Support for FREEBUSY reports! * Added: Support for creating principals with admin-level privileges. * Added: Possibility to let server send out invitation emails on behalf of @@ -143,11 +143,11 @@ * Changed: beforeCreateFile event now passes data argument by reference. * Changed: The 'propertyMap' property from Sabre_VObject_Reader, must now be specified in Sabre_VObject_Property::$classMap. - * Added: Ability for plugins to tell the ACL plugin which principal - plugins are searchable. + * Added: Ability for addons to tell the ACL addon which principal + addons are searchable. * Added: [DAVACL] Per-node overriding of supported privileges. This allows for custom privileges where needed. - * Added: [DAVACL] Public 'principalSearch' method on the DAVACL plugin, + * Added: [DAVACL] Public 'principalSearch' method on the DAVACL addon, which allows for easy searching for principals, based on their properties. * Added: Sabre_VObject_Component::getComponents() to return a list of only @@ -231,8 +231,8 @@ * Fixed: VObject properties are now always encoded before components. * Fixed: Sabre_DAVACL had issues with multiple levels of privilege aggregration. - * Changed: Added 'GuessContentType' plugin to fileserver.php example. - * Fixed: The Browser plugin will now trigger the correct events when + * Changed: Added 'GuessContentType' addon to fileserver.php example. + * Fixed: The Browser addon will now trigger the correct events when creating files. * Fixed: The ICSExportPlugin now considers ACL's. * Added: Made it optional to supply carddata from an Addressbook backend @@ -251,7 +251,7 @@ files to be locked at the same time. 1.5.4-stable (2011-10-28) - * Fixed: GuessContentType plugin now supports mixed case file extensions. + * Fixed: GuessContentType addon now supports mixed case file extensions. * Fixed: DATE-TIME encoding was wrong in VObject. (we used 'DATETIME'). * Changed: Sending back HTTP 204 after a PUT request on an existing resource instead of HTTP 200. This should fix Evolution CardDAV client @@ -283,7 +283,7 @@ * Fixed: Issue 140: Not returning 201 Created if an event cancelled the creation of a file. * Fixed: Issue 150: Faster URLUtil::encodePath() implementation. - * Fixed: Issue 144: Browser plugin could interfere with + * Fixed: Issue 144: Browser addon could interfere with TemporaryFileFilterPlugin if it was loaded first. * Added: It's not possible to specify more 'alternate uris' in principal backends. @@ -314,7 +314,7 @@ * Added: Clark-notation parser to XML utility. * Added: unset() support to VObject components. * Fixed: Refactored CalDAV property fetching to be faster and simpler. - * Added: Central string-matcher for CalDAV and CardDAV plugins. + * Added: Central string-matcher for CalDAV and CardDAV addons. * Added: i;unicode-casemap support * Fixed: VObject bug: wouldn't parse parameters if they weren't specified in uppercase. @@ -322,7 +322,7 @@ * Fixed: VObject bug: Parameters with no value are now correctly parsed. * Changed: If calendars don't specify which components they allow, 'all' components are assumed (e.g.: VEVENT, VTODO, VJOURNAL). - * Changed: Browser plugin now uses POST variable 'sabreAction' instead of + * Changed: Browser addon now uses POST variable 'sabreAction' instead of 'action' to reduce the chance of collisions. 1.4.4-stable (2011-07-07) @@ -388,7 +388,7 @@ * Added: Ability to automatically generate full .ics feeds off calendars. To use: Add the Sabre_CalDAV_ICSExportPlugin, and add ?export to your calendar url. - * Added: Plugins can now specify a pluginname, for easy access using + * Added: Plugins can now specify a addonname, for easy access using Sabre_DAV_Server::getPlugin(). * Added: beforeGetProperties event. * Added: updateProperties event. @@ -428,7 +428,7 @@ break, so if you implement Sabre_DAV_ICollection directly, add the method. * Changed: Almost all HTTP method implementations now take a uri argument, including events. This allows for internal rerouting of certain calls. - If you have custom plugins, make sure they use this argument. If they + If you have custom addons, make sure they use this argument. If they don't, they will likely still work, but it might get in the way of future changes. * Changed: All getETag methods MUST now surround the etag with @@ -441,7 +441,7 @@ instead. * Removed: Sabre_DAV_IDirectory interface, use Sabre_DAV_ICollection instead. - * Added: Browser plugin now uses {DAV:}displayname if this property is + * Added: Browser addon now uses {DAV:}displayname if this property is available. * Added: Cache layer in the ObjectTree. * Added: Tree classes now have a delete and getChildren method. @@ -488,7 +488,7 @@ * Updated: Small improvements to example files. 1.2.0 (2010-05-24) - * Fixed: Browser plugin now displays international characters. + * Fixed: Browser addon now displays international characters. * Changed: More properties in CalDAV classes are now protected instead of private. @@ -530,7 +530,7 @@ * Update: Complete rewrite of property updating. Now easier to use and atomic. * Fixed: Issue 16, automatically adding trailing / to baseUri. - * Added: text/plain is used for .txt files in GuessContentType plugin. + * Added: text/plain is used for .txt files in GuessContentType addon. * Added: support for principal-property-search and principal-search-property-set reports. * Added: Issue 31: Hiding exception information by default. Can be turned @@ -603,10 +603,10 @@ this. * Added: PDO authentication backend. * Added: Example sql for auth, caldav, locks for sqlite. - * Added: Sabre_DAV_Browser_GuessContentType plugin - * Changed: Authentication plugin refactored, making it possible to + * Added: Sabre_DAV_Browser_GuessContentType addon + * Changed: Authentication addon refactored, making it possible to implement non-digest authentication. - * Fixed: Better error display in browser plugin. + * Fixed: Better error display in browser addon. * Added: Support for {DAV:}supported-report-set * Added: XML utility class with helper functions for the WebDAV protocol. * Added: Tons of unittests @@ -706,15 +706,15 @@ Before, execution would be stopped by anything loosely evaluating to false. * Changed: the getPropertiesForPath method now takes a different set of - arguments, and returns a different response. This allows plugin + arguments, and returns a different response. This allows addon developers to return statuses for properties other than 200 and 404. The hrefs are now also always calculated relative to the baseUri, and not the uri of the request. * Changed: generatePropFindResponse is renamed to generateMultiStatus, and now takes a list of properties similar to the response of getPropertiesForPath. This was also needed to improve flexibility for - plugin development. - * Changed: Auth plugins are no longer included. They were not yet stable + addon development. + * Changed: Auth addons are no longer included. They were not yet stable quality, so they will probably be reintroduced in a later version. * Changed: PROPPATCH also used generateMultiStatus now. * Removed: unknownProperties event. This is replaced by the @@ -732,7 +732,7 @@ * Fixed: Copy and Move could fail in the root directory. This is now fixed. * Added: Plugins can now be retrieved by their classname. This is useful - for inter-plugin communication. + for inter-addon communication. * Added: The Auth backend can now return usernames and user-id's. * Added: The Auth backend got a getUsers method * Added: Sabre_DAV_FSExt_Directory now returns quota info @@ -741,7 +741,7 @@ * Fixed: UNLOCK bug. Unlock didn't work at all 0.12-beta (2009-09-10) - * Updated: Browser plugin now shows multiple {DAV:}resourcetype values + * Updated: Browser addon now shows multiple {DAV:}resourcetype values if available. * Added: Experimental PDO backend for Locks Manager * Fixed: Sending Content-Length: 0 for every empty response. This @@ -766,7 +766,7 @@ * Added: Ability to choose to use auth-int, auth or both for HTTP Digest authentication. (Issue 11) * Changed: Made more methods in Sabre_DAV_Server public. - * Fixed: TemporaryFileFilter plugin now intercepts HTTP LOCK requests + * Fixed: TemporaryFileFilter addon now intercepts HTTP LOCK requests to non-existent files. (Issue 12) * Added: Central list of defined xml namespace prefixes. This can reduce Bandwidth and legibility for xml bodies with user-defined namespaces. @@ -779,8 +779,8 @@ and IDirectory objects. If you created your own Tree objects, this will most likely break in this release. * Changed: Moved all the Locking logic from the Tree and Server classes - into a separate plugin. - * Changed: TemporaryFileFilter is now a plugin. + into a separate addon. + * Changed: TemporaryFileFilter is now a addon. * Added: Comes with an autoloader script. This can be used instead of the includer script, and is preferred by some people. * Added: AWS Authentication class. @@ -790,7 +790,7 @@ priority. This is for example needed to ensure that the Authentication Plugin is used before any other Plugin. * Added: 22 new tests. - * Added: Users-manager plugin for .htdigest files. Experimental and + * Added: Users-manager addon for .htdigest files. Experimental and subject to change. * Added: RFC 2324 HTTP 418 status code * Fixed: Exclusive locks could in some cases be picked up as shared locks @@ -801,7 +801,7 @@ * Changed: Renamed all exceptions! This is a compatibility break. Every Exception now follows Sabre_DAV_Exception_FileNotFound convention instead of Sabre_DAV_FileNotFoundException. - * Added: Browser plugin now allows uploading and creating directories + * Added: Browser addon now allows uploading and creating directories straight from the browser. * Added: 12 more unittests * Fixed: Locking bug, which became prevalent on Windows Vista. @@ -815,14 +815,14 @@ * Added: support for {DAV:}supportedlock. * Added: support for {DAV:}lockdiscovery. * Added: 6 new tests. - * Added: New plugin system. - * Added: Simple HTML directory plugin, for browser access. + * Added: New addon system. + * Added: Simple HTML directory addon, for browser access. * Added: Server class now sends back standard pre-condition error xml bodies. This was new since RFC4918. * Added: Sabre_DAV_Tree_Aggregrate, which can 'host' multiple Tree objects into one. * Added: simple basis for HTTP REPORT method. This method is not used yet, - but can be used by plugins to add reports. + but can be used by addons to add reports. * Changed: ->getSize is only called for files, no longer for collections. r303 * Changed: Sabre_DAV_FilterTree is now Sabre_DAV_Tree_Filter diff --git a/dav/SabreDAV/lib/Sabre/CalDAV/ICSExportPlugin.php b/dav/SabreDAV/lib/Sabre/CalDAV/ICSExportPlugin.php index d3e4e7b72..7d989a951 100644 --- a/dav/SabreDAV/lib/Sabre/CalDAV/ICSExportPlugin.php +++ b/dav/SabreDAV/lib/Sabre/CalDAV/ICSExportPlugin.php @@ -5,7 +5,7 @@ use Sabre\VObject; /** * ICS Exporter * - * This plugin adds the ability to export entire calendars as .ics files. + * This addon adds the ability to export entire calendars as .ics files. * This is useful for clients that don't support CalDAV yet. They often do * support ics files. * @@ -25,7 +25,7 @@ class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin { private $server; /** - * Initializes the plugin and registers event handlers + * Initializes the addon and registers event handlers * * @param Sabre_DAV_Server $server * @return void diff --git a/dav/SabreDAV/lib/Sabre/CalDAV/Notifications/Collection.php b/dav/SabreDAV/lib/Sabre/CalDAV/Notifications/Collection.php index 8f6cb2601..479720c6b 100644 --- a/dav/SabreDAV/lib/Sabre/CalDAV/Notifications/Collection.php +++ b/dav/SabreDAV/lib/Sabre/CalDAV/Notifications/Collection.php @@ -4,7 +4,7 @@ * This node represents a list of notifications. * * It provides no additional functionality, but you must implement this - * interface to allow the Notifications plugin to mark the collection + * interface to allow the Notifications addon to mark the collection * as a notifications collection. * * This collection should only return Sabre_CalDAV_Notifications_INode nodes as diff --git a/dav/SabreDAV/lib/Sabre/CalDAV/Notifications/ICollection.php b/dav/SabreDAV/lib/Sabre/CalDAV/Notifications/ICollection.php index eb873af3f..bdf6bf1ec 100644 --- a/dav/SabreDAV/lib/Sabre/CalDAV/Notifications/ICollection.php +++ b/dav/SabreDAV/lib/Sabre/CalDAV/Notifications/ICollection.php @@ -4,7 +4,7 @@ * This node represents a list of notifications. * * It provides no additional functionality, but you must implement this - * interface to allow the Notifications plugin to mark the collection + * interface to allow the Notifications addon to mark the collection * as a notifications collection. * * This collection should only return Sabre_CalDAV_Notifications_INode nodes as diff --git a/dav/SabreDAV/lib/Sabre/CalDAV/Plugin.php b/dav/SabreDAV/lib/Sabre/CalDAV/Plugin.php index c0e4a206d..f1c93af08 100644 --- a/dav/SabreDAV/lib/Sabre/CalDAV/Plugin.php +++ b/dav/SabreDAV/lib/Sabre/CalDAV/Plugin.php @@ -3,9 +3,9 @@ use Sabre\VObject; /** - * CalDAV plugin + * CalDAV addon * - * This plugin provides functionality added by CalDAV (RFC 4791) + * This addon provides functionality added by CalDAV (RFC 4791) * It implements new reports, and the MKCALENDAR method. * * @package Sabre @@ -67,7 +67,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin { } /** - * Use this method to tell the server this plugin defines additional + * Use this method to tell the server this addon defines additional * HTTP methods. * * This method is passed a uri. It should only return HTTP methods that are @@ -107,9 +107,9 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin { } /** - * Returns a plugin name. + * Returns a addon name. * - * Using this name other plugins will be able to access other plugins + * Using this name other addons will be able to access other addons * using Sabre_DAV_Server::getPlugin * * @return string @@ -121,7 +121,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin { } /** - * Returns a list of reports this plugin supports. + * Returns a list of reports this addon supports. * * This will be used in the {DAV:}supported-report-set property. * Note that you still need to subscribe to the 'report' event to actually @@ -147,7 +147,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin { } /** - * Initializes the plugin + * Initializes the addon * * @param Sabre_DAV_Server $server * @return void @@ -631,7 +631,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin { $acl = $this->server->getPlugin('acl'); if (!$acl) { - throw new Sabre_DAV_Exception('The ACL plugin must be loaded for free-busy queries to work'); + throw new Sabre_DAV_Exception('The ACL addon must be loaded for free-busy queries to work'); } $uri = $this->server->getRequestUri(); $acl->checkPrivileges($uri,'{' . self::NS_CALDAV . '}read-free-busy'); @@ -665,7 +665,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin { /** * This method is triggered before a file gets updated with new content. * - * This plugin uses this method to ensure that CalDAV objects receive + * This addon uses this method to ensure that CalDAV objects receive * valid calendar data. * * @param string $path @@ -685,7 +685,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin { /** * This method is triggered before a new file is created. * - * This plugin uses this method to ensure that newly created calendar + * This addon uses this method to ensure that newly created calendar * objects contain valid calendar data. * * @param string $path @@ -1014,7 +1014,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin { /** * This method allows us to intercept the 'mkcalendar' sabreAction. This - * action enables the user to create new calendars from the browser plugin. + * action enables the user to create new calendars from the browser addon. * * @param string $uri * @param string $action diff --git a/dav/SabreDAV/lib/Sabre/CalDAV/Schedule/Outbox.php b/dav/SabreDAV/lib/Sabre/CalDAV/Schedule/Outbox.php index 09aa07d7f..639f5d0dd 100644 --- a/dav/SabreDAV/lib/Sabre/CalDAV/Schedule/Outbox.php +++ b/dav/SabreDAV/lib/Sabre/CalDAV/Schedule/Outbox.php @@ -5,7 +5,7 @@ * * The outbox is mainly used as an endpoint in the tree for a client to do * free-busy requests. This functionality is completely handled by the - * Scheduling plugin, so this object is actually mostly static. + * Scheduling addon, so this object is actually mostly static. * * @package Sabre * @subpackage CalDAV diff --git a/dav/SabreDAV/lib/Sabre/CardDAV/Plugin.php b/dav/SabreDAV/lib/Sabre/CardDAV/Plugin.php index 30194bb64..aa6a523d3 100644 --- a/dav/SabreDAV/lib/Sabre/CardDAV/Plugin.php +++ b/dav/SabreDAV/lib/Sabre/CardDAV/Plugin.php @@ -3,9 +3,9 @@ use Sabre\VObject; /** - * CardDAV plugin + * CardDAV addon * - * The CardDAV plugin adds CardDAV functionality to the WebDAV server + * The CardDAV addon adds CardDAV functionality to the WebDAV server * * @package Sabre * @subpackage CardDAV @@ -41,7 +41,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin { protected $server; /** - * Initializes the plugin + * Initializes the addon * * @param Sabre_DAV_Server $server * @return void @@ -91,7 +91,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin { } /** - * Returns a list of reports this plugin supports. + * Returns a list of reports this addon supports. * * This will be used in the {DAV:}supported-report-set property. * Note that you still need to subscribe to the 'report' event to actually @@ -290,7 +290,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin { /** * This method is triggered before a file gets updated with new content. * - * This plugin uses this method to ensure that Card nodes receive valid + * This addon uses this method to ensure that Card nodes receive valid * vcard data. * * @param string $path @@ -310,7 +310,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin { /** * This method is triggered before a new file is created. * - * This plugin uses this method to ensure that Card nodes receive valid + * This addon uses this method to ensure that Card nodes receive valid * vcard data. * * @param string $path @@ -671,7 +671,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin { /** * This method allows us to intercept the 'mkcalendar' sabreAction. This - * action enables the user to create new calendars from the browser plugin. + * action enables the user to create new calendars from the browser addon. * * @param string $uri * @param string $action diff --git a/dav/SabreDAV/lib/Sabre/DAV/Auth/Plugin.php b/dav/SabreDAV/lib/Sabre/DAV/Auth/Plugin.php index 55a4e3916..256e0c02a 100644 --- a/dav/SabreDAV/lib/Sabre/DAV/Auth/Plugin.php +++ b/dav/SabreDAV/lib/Sabre/DAV/Auth/Plugin.php @@ -1,7 +1,7 @@ server->tree->getNodeForPath($uri); } catch (Sabre_DAV_Exception_NotFound $e) { // We're simply stopping when the file isn't found to not interfere - // with other plugins. + // with other addons. return; } if ($node instanceof Sabre_DAV_IFile) diff --git a/dav/SabreDAV/lib/Sabre/DAV/Locks/Plugin.php b/dav/SabreDAV/lib/Sabre/DAV/Locks/Plugin.php index 957ac506a..3e5c71bcf 100644 --- a/dav/SabreDAV/lib/Sabre/DAV/Locks/Plugin.php +++ b/dav/SabreDAV/lib/Sabre/DAV/Locks/Plugin.php @@ -1,9 +1,9 @@ plugins as $plugin) $methods = array_merge($methods, $plugin->getHTTPMethods($uri)); array_unique($methods); @@ -1464,7 +1464,7 @@ class Sabre_DAV_Server { * * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin). * It was important to get this done through a centralized function, - * allowing plugins to intercept this using the beforeCreateFile event. + * allowing addons to intercept this using the beforeCreateFile event. * * This method will return true if the file was actually created * @@ -1654,7 +1654,7 @@ class Sabre_DAV_Server { } if (!$hasError) { - // Allowing plugins to take care of property updating + // Allowing addons to take care of property updating $hasError = !$this->broadcastEvent('updateProperties',array( &$remainingProperties, &$result, diff --git a/dav/SabreDAV/lib/Sabre/DAV/ServerPlugin.php b/dav/SabreDAV/lib/Sabre/DAV/ServerPlugin.php index 131863d13..4dcee5879 100644 --- a/dav/SabreDAV/lib/Sabre/DAV/ServerPlugin.php +++ b/dav/SabreDAV/lib/Sabre/DAV/ServerPlugin.php @@ -1,7 +1,7 @@ diff --git a/dav/common/wdcal/js/jquery.calendar.js b/dav/common/wdcal/js/jquery.calendar.js index 201917c0e..c8221a696 100644 --- a/dav/common/wdcal/js/jquery.calendar.js +++ b/dav/common/wdcal/js/jquery.calendar.js @@ -141,7 +141,7 @@ if ($.fn.noSelect == undefined) { - $.fn.noSelect = function (p) { //no select plugin by me :-) + $.fn.noSelect = function (p) { //no select addon by me :-) var prevent; if (p == null) prevent = true; diff --git a/dav/friendica/layout.fnk.php b/dav/friendica/layout.fnk.php index f384c50c3..8a06e64de 100644 --- a/dav/friendica/layout.fnk.php +++ b/dav/friendica/layout.fnk.php @@ -501,14 +501,14 @@ function wdcal_getSettingsPage(&$a) $o .= "

" . t("Warning") . "

"; - $o .= "This plugin still is in a very early stage of development. Expect major bugs!
"; + $o .= "This addon still is in a very early stage of development. Expect major bugs!
"; $o .= "

" . t("Synchronization (iPhone, Thunderbird Lightning, Android, ...)") . "

"; - $o .= 'This plugin enables synchronization of your dates and contacts with CalDAV- and CardDAV-enabled programs or devices.
+ $o .= 'This addon enables synchronization of your dates and contacts with CalDAV- and CardDAV-enabled programs or devices.
As an example, the instructions how to set up two-way synchronization with an iPhone/iPodTouch are provided below.
Unfortunately, Android does not have native support for CalDAV or CardDAV, so an app has to be installed.
- On desktops, the Lightning-extension to Mozilla Thunderbird should be able to use this plugin as a backend.

'; + On desktops, the Lightning-extension to Mozilla Thunderbird should be able to use this addon as a backend.

'; $o .= '

' . t('Synchronizing this calendar with the iPhone') . '

'; diff --git a/dav/friendica/main.php b/dav/friendica/main.php index e1dfe84f8..d73edfd31 100644 --- a/dav/friendica/main.php +++ b/dav/friendica/main.php @@ -1,5 +1,6 @@ strings["Warning"] = "Avís"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Syncronització (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Sncronitzant aquest calendari amb el iPhone"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronitzant els teus contactes a Friendica amb el iPhone"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; $a->strings["Calendar"] = "Calendari"; $a->strings["Extended calendar with CalDAV-support"] = "Calendari ampliat amb suport CalDAV"; $a->strings["noreply"] = "no contestar"; diff --git a/dav/lang/cs/messages.po b/dav/lang/cs/messages.po index d55ac2e06..561206a47 100644 --- a/dav/lang/cs/messages.po +++ b/dav/lang/cs/messages.po @@ -185,7 +185,7 @@ msgstr "Synchronizovat Vaše Friendica kontakty s iPhone" #: friendica/main.php:202 msgid "" -"The current version of this plugin has not been set up correctly. Please " +"The current version of this addon has not been set up correctly. Please " "contact the system administrator of your installation of friendica to fix " "this." msgstr "Stávající verze tohoto rozšíření nebyla správně nastavena. Prosím, kontaktujte administrátora webu, ať to opraví." diff --git a/dav/lang/cs/strings.php b/dav/lang/cs/strings.php index a42a3a307..0c5066f51 100644 --- a/dav/lang/cs/strings.php +++ b/dav/lang/cs/strings.php @@ -45,7 +45,7 @@ $a->strings["Warning"] = "Omezení"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronizace (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Synchronizovat tento kalendář s iPhone"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Synchronizovat Vaše Friendica kontakty s iPhone"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Stávající verze tohoto rozšíření nebyla správně nastavena. Prosím, kontaktujte administrátora webu, ať to opraví."; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Stávající verze tohoto rozšíření nebyla správně nastavena. Prosím, kontaktujte administrátora webu, ať to opraví."; $a->strings["Calendar"] = "Kalendář"; $a->strings["Extended calendar with CalDAV-support"] = "Rozšířený kalendář s podporou CalDAV"; $a->strings["noreply"] = "bez odpovědi"; diff --git a/dav/lang/de/messages.po b/dav/lang/de/messages.po index 9eeb56d66..3f816fb31 100644 --- a/dav/lang/de/messages.po +++ b/dav/lang/de/messages.po @@ -185,7 +185,7 @@ msgstr "Friendica-Kontakte mit dem iPhone synchronisieren" #: friendica/main.php:202 msgid "" -"The current version of this plugin has not been set up correctly. Please " +"The current version of this addon has not been set up correctly. Please " "contact the system administrator of your installation of friendica to fix " "this." msgstr "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben." diff --git a/dav/lang/de/strings.php b/dav/lang/de/strings.php index 441a1dacb..2a938464a 100644 --- a/dav/lang/de/strings.php +++ b/dav/lang/de/strings.php @@ -45,7 +45,7 @@ $a->strings["Warning"] = "Warnung"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Diesen Kalender mit dem iPhone synchronisieren"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Friendica-Kontakte mit dem iPhone synchronisieren"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben."; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben."; $a->strings["Calendar"] = "Kalender"; $a->strings["Extended calendar with CalDAV-support"] = "Erweiterter Kalender mit CalDAV Unterstützung."; $a->strings["noreply"] = "noreply"; diff --git a/dav/lang/eo/strings.php b/dav/lang/eo/strings.php index 6e902d5b5..5ecd486b0 100644 --- a/dav/lang/eo/strings.php +++ b/dav/lang/eo/strings.php @@ -40,7 +40,7 @@ $a->strings["Warning"] = "Averto"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sinkronigo (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Sinkronigi tiun kalendaron kun la iPhone"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sinkronigi viajn Friendica kontaktojn kun la iPhone"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; $a->strings["Calendar"] = "Kalendaro"; $a->strings["Extended calendar with CalDAV-support"] = "Etendita kalendaro kun CalDAV subteno"; $a->strings["noreply"] = "nerespondi"; diff --git a/dav/lang/es/messages.po b/dav/lang/es/messages.po index d00bbe260..7bc95e0bf 100644 --- a/dav/lang/es/messages.po +++ b/dav/lang/es/messages.po @@ -186,10 +186,10 @@ msgstr "Sincronizar sus contactos de Friendica con el iPhone" #: friendica/main.php:202 msgid "" -"The current version of this plugin has not been set up correctly. Please " +"The current version of this addon has not been set up correctly. Please " "contact the system administrator of your installation of friendica to fix " "this." -msgstr "La versión actual de este plugin no se ha instalado correctamente. Por favor contacte con el administrador del sistema de su instalación de Friendica para resolver esto." +msgstr "La versión actual de este addon no se ha instalado correctamente. Por favor contacte con el administrador del sistema de su instalación de Friendica para resolver esto." #: friendica/main.php:239 common/wdcal_edit.inc.php:146 msgid "Calendar" diff --git a/dav/lang/es/strings.php b/dav/lang/es/strings.php index 5300246ab..76a3ad2e6 100644 --- a/dav/lang/es/strings.php +++ b/dav/lang/es/strings.php @@ -45,7 +45,7 @@ $a->strings["Warning"] = "Advertencia"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronización (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Sincronizar este calendario con el iPhone"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronizar sus contactos de Friendica con el iPhone"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versión actual de este plugin no se ha instalado correctamente. Por favor contacte con el administrador del sistema de su instalación de Friendica para resolver esto."; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versión actual de este addon no se ha instalado correctamente. Por favor contacte con el administrador del sistema de su instalación de Friendica para resolver esto."; $a->strings["Calendar"] = "Calendario"; $a->strings["Extended calendar with CalDAV-support"] = "Estendido el calendario con soporte CalDAV"; $a->strings["noreply"] = "no responder"; diff --git a/dav/lang/fr/strings.php b/dav/lang/fr/strings.php index 86dae0d11..0705d6a37 100644 --- a/dav/lang/fr/strings.php +++ b/dav/lang/fr/strings.php @@ -40,7 +40,7 @@ $a->strings["Warning"] = "Avertissement"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronisation (Iphone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Synchronisation avec l'Iphone en cours"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Synchronisation de vos contacts Friendica avec l'Iphone en cours"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La version actuelle de cette extension n'a pas été configurée correctement. Merci de contacter votre administrateur Friendica pour régler ce problème. "; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La version actuelle de cette extension n'a pas été configurée correctement. Merci de contacter votre administrateur Friendica pour régler ce problème. "; $a->strings["Calendar"] = "Calendrier"; $a->strings["Extended calendar with CalDAV-support"] = "Calendrier étendu avec support CalDAV"; $a->strings["noreply"] = "noreply"; diff --git a/dav/lang/is/strings.php b/dav/lang/is/strings.php index e592e7de0..69fc6178c 100644 --- a/dav/lang/is/strings.php +++ b/dav/lang/is/strings.php @@ -40,7 +40,7 @@ $a->strings["Warning"] = ""; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = ""; $a->strings["Synchronizing this calendar with the iPhone"] = ""; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = ""; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; $a->strings["Calendar"] = ""; $a->strings["Extended calendar with CalDAV-support"] = ""; $a->strings["noreply"] = "ekki svara"; diff --git a/dav/lang/it/messages.po b/dav/lang/it/messages.po index ae53f06eb..b1911a708 100644 --- a/dav/lang/it/messages.po +++ b/dav/lang/it/messages.po @@ -185,10 +185,10 @@ msgstr "Sincronizzare i tuoi contatti di Friendica con l'iPhone" #: friendica/main.php:202 msgid "" -"The current version of this plugin has not been set up correctly. Please " +"The current version of this addon has not been set up correctly. Please " "contact the system administrator of your installation of friendica to fix " "this." -msgstr "La versione corrente di questo plugin non è stata configurata correttamente. Contatta l'amministratore." +msgstr "La versione corrente di questo addon non è stata configurata correttamente. Contatta l'amministratore." #: friendica/main.php:239 common/wdcal_edit.inc.php:146 msgid "Calendar" diff --git a/dav/lang/it/strings.php b/dav/lang/it/strings.php index 9fe374cce..ce1f78a89 100644 --- a/dav/lang/it/strings.php +++ b/dav/lang/it/strings.php @@ -45,7 +45,7 @@ $a->strings["Warning"] = "Attenzione"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronizzazione (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Sincronizzare questo calendario con l'iPhone"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronizzare i tuoi contatti di Friendica con l'iPhone"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versione corrente di questo plugin non è stata configurata correttamente. Contatta l'amministratore."; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "La versione corrente di questo addon non è stata configurata correttamente. Contatta l'amministratore."; $a->strings["Calendar"] = "Calendario"; $a->strings["Extended calendar with CalDAV-support"] = "Calendario esteso con supporto CalDAV"; $a->strings["noreply"] = "nonrispondere"; diff --git a/dav/lang/nb-no/strings.php b/dav/lang/nb-no/strings.php index 3ba89070f..132f07504 100644 --- a/dav/lang/nb-no/strings.php +++ b/dav/lang/nb-no/strings.php @@ -40,7 +40,7 @@ $a->strings["Warning"] = ""; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = ""; $a->strings["Synchronizing this calendar with the iPhone"] = ""; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = ""; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; $a->strings["Calendar"] = ""; $a->strings["Extended calendar with CalDAV-support"] = ""; $a->strings["noreply"] = "ikke svar"; diff --git a/dav/lang/pl/strings.php b/dav/lang/pl/strings.php index 171a73e1a..9fcae4b8d 100644 --- a/dav/lang/pl/strings.php +++ b/dav/lang/pl/strings.php @@ -40,7 +40,7 @@ $a->strings["Warning"] = "Ostrzeżenie"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronizacja (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Zsynchronizuj kalendarz z iPhone"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Zsynchronizuj kontakty friendica z iPhone"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; $a->strings["Calendar"] = "Kalendarz"; $a->strings["Extended calendar with CalDAV-support"] = ""; $a->strings["noreply"] = "brak odpowiedzi"; diff --git a/dav/lang/pt-br/strings.php b/dav/lang/pt-br/strings.php index 566c3a84a..d57df030d 100644 --- a/dav/lang/pt-br/strings.php +++ b/dav/lang/pt-br/strings.php @@ -40,7 +40,7 @@ $a->strings["Warning"] = "Aviso"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronização (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Sincronização desta agenda com o iPhone"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronização dos seus contatos Friendica com o iPhone"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; $a->strings["Calendar"] = "Agenda"; $a->strings["Extended calendar with CalDAV-support"] = ""; $a->strings["noreply"] = "naoresponda"; diff --git a/dav/lang/ro/messages.po b/dav/lang/ro/messages.po index c6925954e..ec8cdc19d 100644 --- a/dav/lang/ro/messages.po +++ b/dav/lang/ro/messages.po @@ -184,7 +184,7 @@ msgstr "Sincronizați contactele Friendica cu iPhone" #: friendica/main.php:202 msgid "" -"The current version of this plugin has not been set up correctly. Please " +"The current version of this addon has not been set up correctly. Please " "contact the system administrator of your installation of friendica to fix " "this." msgstr "Versiunea curentă a acestui modul nu a fost corect configurată. Vă rugăm să contactați administratorul de sistem al aplicației dvs. friendica, pentru a corecta această situație." diff --git a/dav/lang/ro/strings.php b/dav/lang/ro/strings.php index f2870213e..cf3ff4496 100644 --- a/dav/lang/ro/strings.php +++ b/dav/lang/ro/strings.php @@ -45,7 +45,7 @@ $a->strings["Warning"] = "Atenție"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronizare (iPhone, Thunderbird Lightning, Android, ...)"; $a->strings["Synchronizing this calendar with the iPhone"] = "Sincronizați acest calendar cu iPhone"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronizați contactele Friendica cu iPhone"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Versiunea curentă a acestui modul nu a fost corect configurată. Vă rugăm să contactați administratorul de sistem al aplicației dvs. friendica, pentru a corecta această situație."; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Versiunea curentă a acestui modul nu a fost corect configurată. Vă rugăm să contactați administratorul de sistem al aplicației dvs. friendica, pentru a corecta această situație."; $a->strings["Calendar"] = "Calendar"; $a->strings["Extended calendar with CalDAV-support"] = "Calendar extins cu suport-CalDAV"; $a->strings["noreply"] = "nu-răspunde"; diff --git a/dav/lang/ru/strings.php b/dav/lang/ru/strings.php index 32921b3b7..7e4a4fb25 100644 --- a/dav/lang/ru/strings.php +++ b/dav/lang/ru/strings.php @@ -40,7 +40,7 @@ $a->strings["Warning"] = ""; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = ""; $a->strings["Synchronizing this calendar with the iPhone"] = ""; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = ""; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = ""; $a->strings["Calendar"] = ""; $a->strings["Extended calendar with CalDAV-support"] = ""; $a->strings["noreply"] = "без ответа"; diff --git a/dav/lang/zh-cn/strings.php b/dav/lang/zh-cn/strings.php index 45de3639b..7ace01d7d 100644 --- a/dav/lang/zh-cn/strings.php +++ b/dav/lang/zh-cn/strings.php @@ -40,7 +40,7 @@ $a->strings["Warning"] = "警告"; $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "同步（iPhone，Thunderbird Lightning, 案桌，等）"; $a->strings["Synchronizing this calendar with the iPhone"] = "正在把这个日历跟iPhone同步"; $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "正在把您的Friendica熟人跟iPhone同步"; -$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "现有的插件没安装好。请跟系统管理您的friendica安装联系为维修。"; +$a->strings["The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "现有的插件没安装好。请跟系统管理您的friendica安装联系为维修。"; $a->strings["Calendar"] = "日历"; $a->strings["Extended calendar with CalDAV-support"] = "增能日历跟CalDAV支持"; $a->strings["noreply"] = "noreply"; diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 3c4a30d2f..0d0d27440 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -9,24 +9,25 @@ require_once("addon/diaspora/Diaspora_Connection.php"); +use Friendica\Core\Addon; use Friendica\Core\PConfig; use Friendica\Database\DBM; function diaspora_install() { - register_hook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); - register_hook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); - register_hook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets'); - register_hook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings'); - register_hook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); - register_hook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook'); + Addon::registerHook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); + Addon::registerHook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); + Addon::registerHook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets'); + Addon::registerHook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings'); + Addon::registerHook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); + Addon::registerHook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook'); } function diaspora_uninstall() { - unregister_hook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); - unregister_hook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); - unregister_hook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets'); - unregister_hook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings'); - unregister_hook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); - unregister_hook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook'); + Addon::unregisterHook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); + Addon::unregisterHook('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); + Addon::unregisterHook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook'); } @@ -171,7 +172,7 @@ function diaspora_settings(&$a,&$s) { } $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/diaspora/lang/C/messages.po b/diaspora/lang/C/messages.po index 0f71c2cd8..6764eaf1e 100644 --- a/diaspora/lang/C/messages.po +++ b/diaspora/lang/C/messages.po @@ -32,7 +32,7 @@ msgid "Diaspora Export" msgstr "" #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" +msgid "Enable Diaspora Post Addon" msgstr "" #: diaspora.php:168 diff --git a/diaspora/lang/cs/messages.po b/diaspora/lang/cs/messages.po index 22e1cfef0..5d8b0a309 100644 --- a/diaspora/lang/cs/messages.po +++ b/diaspora/lang/cs/messages.po @@ -34,8 +34,8 @@ msgid "Diaspora Export" msgstr "Diaspora export" #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" -msgstr "Povolit Diaspora Plugin" +msgid "Enable Diaspora Post Addon" +msgstr "Povolit Diaspora Addon" #: diaspora.php:168 msgid "Diaspora username" diff --git a/diaspora/lang/cs/strings.php b/diaspora/lang/cs/strings.php index 9db097912..1a87dc1f9 100644 --- a/diaspora/lang/cs/strings.php +++ b/diaspora/lang/cs/strings.php @@ -8,7 +8,7 @@ function string_plural_select_cs($n){ $a->strings["Post to Diaspora"] = "Příspěvek na Diaspora"; $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nelze se přihlásit na váš Diaspora účet. Prosím ověřte své uživatelské jméno a heslo a ujistěte se, že jste použili kompletní adresu (včetně http...)"; $a->strings["Diaspora Export"] = "Diaspora export"; -$a->strings["Enable Diaspora Post Plugin"] = "Povolit Diaspora Plugin"; +$a->strings["Enable Diaspora Post Addon"] = "Povolit Diaspora Addon"; $a->strings["Diaspora username"] = "Diaspora uživatelské jméno"; $a->strings["Diaspora password"] = "Diaspora heslo"; $a->strings["Diaspora site URL"] = "Adresa webu Diaspora"; diff --git a/diaspora/lang/de/messages.po b/diaspora/lang/de/messages.po index eaeb24edb..22187254a 100644 --- a/diaspora/lang/de/messages.po +++ b/diaspora/lang/de/messages.po @@ -34,7 +34,7 @@ msgid "Diaspora Export" msgstr "Diaspora Export" #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" +msgid "Enable Diaspora Post Addon" msgstr "Veröffentlichungen bei Diaspora erlauben" #: diaspora.php:168 diff --git a/diaspora/lang/de/strings.php b/diaspora/lang/de/strings.php index 597d4cea9..22990765e 100644 --- a/diaspora/lang/de/strings.php +++ b/diaspora/lang/de/strings.php @@ -8,7 +8,7 @@ function string_plural_select_de($n){ $a->strings["Post to Diaspora"] = "Auf Diaspora veröffentlichen"; $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Anmeldung bei deinem Diaspora Account fehlgeschlagen. Bitte überprüfe Nutzername und Passwort und stelle sicher, dass die komplette Adresse (inklusive des htto...) verwendet wurde."; $a->strings["Diaspora Export"] = "Diaspora Export"; -$a->strings["Enable Diaspora Post Plugin"] = "Veröffentlichungen bei Diaspora erlauben"; +$a->strings["Enable Diaspora Post Addon"] = "Veröffentlichungen bei Diaspora erlauben"; $a->strings["Diaspora username"] = "Diaspora Nutzername"; $a->strings["Diaspora password"] = "Diaspora Passwort"; $a->strings["Diaspora site URL"] = "URL der Diaspora Seite"; diff --git a/diaspora/lang/es/messages.po b/diaspora/lang/es/messages.po index 16ce45390..a7beaa049 100644 --- a/diaspora/lang/es/messages.po +++ b/diaspora/lang/es/messages.po @@ -34,8 +34,8 @@ msgid "Diaspora Export" msgstr "Exportar a Diaspora*" #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" -msgstr "Habilitar publicar a traves de Diaspora* plugin." +msgid "Enable Diaspora Post Addon" +msgstr "Habilitar publicar a traves de Diaspora* addon." #: diaspora.php:168 msgid "Diaspora username" diff --git a/diaspora/lang/es/strings.php b/diaspora/lang/es/strings.php index b32518989..e25594c3f 100644 --- a/diaspora/lang/es/strings.php +++ b/diaspora/lang/es/strings.php @@ -8,7 +8,7 @@ function string_plural_select_es($n){ $a->strings["Post to Diaspora"] = "Publicar hacia Diaspora*"; $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "No se puede ingresar a tu cuenta de Diaspora*. Por favor verificar nombre de usuario, contraseña y asegura de usar la dirección completa, incluyendo https.. ."; $a->strings["Diaspora Export"] = "Exportar a Diaspora*"; -$a->strings["Enable Diaspora Post Plugin"] = "Habilitar publicar a traves de Diaspora* plugin."; +$a->strings["Enable Diaspora Post Addon"] = "Habilitar publicar a traves de Diaspora* addon."; $a->strings["Diaspora username"] = "Nombre de usuario de Diaspora*."; $a->strings["Diaspora password"] = "Contraseña Diaspora*"; $a->strings["Diaspora site URL"] = "URL sitio Diaspora*"; diff --git a/diaspora/lang/fr/messages.po b/diaspora/lang/fr/messages.po index 6f2fa876d..d8f79f976 100644 --- a/diaspora/lang/fr/messages.po +++ b/diaspora/lang/fr/messages.po @@ -35,7 +35,7 @@ msgid "Diaspora Export" msgstr "Export Diaspora" #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" +msgid "Enable Diaspora Post Addon" msgstr "Activer l’extension « Publier sur Diaspora »" #: diaspora.php:168 diff --git a/diaspora/lang/fr/strings.php b/diaspora/lang/fr/strings.php index 8ba2940c5..c9037b6af 100644 --- a/diaspora/lang/fr/strings.php +++ b/diaspora/lang/fr/strings.php @@ -8,7 +8,7 @@ function string_plural_select_fr($n){ $a->strings["Post to Diaspora"] = "Publier sur Diaspora"; $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Impossible de se connecter à votre compte Diaspora. Veuillez vérifier votre identifiant et votre mot de passe, et assurez-vous d’avoir indiqué l’adresse complète (y compris le « http:// » initial)."; $a->strings["Diaspora Export"] = "Export Diaspora"; -$a->strings["Enable Diaspora Post Plugin"] = "Activer l’extension « Publier sur Diaspora »"; +$a->strings["Enable Diaspora Post Addon"] = "Activer l’extension « Publier sur Diaspora »"; $a->strings["Diaspora username"] = "Identifiant Diaspora"; $a->strings["Diaspora password"] = "Mot de passe Diaspora"; $a->strings["Diaspora site URL"] = "Adresse du site Diaspora"; diff --git a/diaspora/lang/it/messages.po b/diaspora/lang/it/messages.po index 514dcbb1f..1468e5235 100644 --- a/diaspora/lang/it/messages.po +++ b/diaspora/lang/it/messages.po @@ -34,8 +34,8 @@ msgid "Diaspora Export" msgstr "Esporta Diaspora" #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" -msgstr "Abilita il plugin di invio a Diaspora" +msgid "Enable Diaspora Post Addon" +msgstr "Abilita il addon di invio a Diaspora" #: diaspora.php:168 msgid "Diaspora username" diff --git a/diaspora/lang/it/strings.php b/diaspora/lang/it/strings.php index 4b8affb6a..4c1673e18 100644 --- a/diaspora/lang/it/strings.php +++ b/diaspora/lang/it/strings.php @@ -8,7 +8,7 @@ function string_plural_select_it($n){ $a->strings["Post to Diaspora"] = "Invia a Diaspora"; $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Non riesco ad autenticarmi con il tuo account Diaspora. Controlla il nome utente e la password e assicurati di aver usato l'indirizzo completo (compreso \"http\" o \"https\")"; $a->strings["Diaspora Export"] = "Esporta Diaspora"; -$a->strings["Enable Diaspora Post Plugin"] = "Abilita il plugin di invio a Diaspora"; +$a->strings["Enable Diaspora Post Addon"] = "Abilita il addon di invio a Diaspora"; $a->strings["Diaspora username"] = "Nome utente Diaspora"; $a->strings["Diaspora password"] = "Password Diaspora"; $a->strings["Diaspora site URL"] = "Indirizzo sito Diaspora"; diff --git a/diaspora/lang/pt-br/messages.po b/diaspora/lang/pt-br/messages.po index 1034ffed6..7b0bc7413 100644 --- a/diaspora/lang/pt-br/messages.po +++ b/diaspora/lang/pt-br/messages.po @@ -34,7 +34,7 @@ msgid "Diaspora Export" msgstr "" #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" +msgid "Enable Diaspora Post Addon" msgstr "Habilitar plug-in para publicar na Diaspora" #: diaspora.php:168 diff --git a/diaspora/lang/ro/messages.po b/diaspora/lang/ro/messages.po index 4ad834a1c..11c6b1ecb 100644 --- a/diaspora/lang/ro/messages.po +++ b/diaspora/lang/ro/messages.po @@ -33,7 +33,7 @@ msgid "Diaspora Export" msgstr "Exportare pe Diaspora " #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" +msgid "Enable Diaspora Post Addon" msgstr "Activare Modul Postare pe Diaspora" #: diaspora.php:168 diff --git a/diaspora/lang/ro/strings.php b/diaspora/lang/ro/strings.php index c40ac8b68..a67981585 100644 --- a/diaspora/lang/ro/strings.php +++ b/diaspora/lang/ro/strings.php @@ -8,7 +8,7 @@ function string_plural_select_ro($n){ $a->strings["Post to Diaspora"] = "Postați pe Diaspora"; $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nu se poate face autentificarea pe contul dvs. Diaspora. Verificați numele de utilizator şi parola şi asigurați-vă că ați folosit adresa completă (inclusiv http ... )"; $a->strings["Diaspora Export"] = "Exportare pe Diaspora "; -$a->strings["Enable Diaspora Post Plugin"] = "Activare Modul Postare pe Diaspora"; +$a->strings["Enable Diaspora Post Addon"] = "Activare Modul Postare pe Diaspora"; $a->strings["Diaspora username"] = "Utilizator Diaspora"; $a->strings["Diaspora password"] = "Parola Diaspora"; $a->strings["Diaspora site URL"] = "URL site Diaspora"; diff --git a/diaspora/lang/ru/messages.po b/diaspora/lang/ru/messages.po index 7a9322c9a..3534b0ac4 100644 --- a/diaspora/lang/ru/messages.po +++ b/diaspora/lang/ru/messages.po @@ -34,7 +34,7 @@ msgid "Diaspora Export" msgstr "Экспорт в Diaspora" #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" +msgid "Enable Diaspora Post Addon" msgstr "Включить плагин отправки сообщений в Diaspora" #: diaspora.php:168 diff --git a/diaspora/lang/ru/strings.php b/diaspora/lang/ru/strings.php index ac120995b..0d46c78de 100644 --- a/diaspora/lang/ru/strings.php +++ b/diaspora/lang/ru/strings.php @@ -8,7 +8,7 @@ function string_plural_select_ru($n){ $a->strings["Post to Diaspora"] = "Отправить в Diaspora"; $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Невозможно войти в вашу учетную запись Diaspora. Пожалуйста, проверьте имя пользователя, пароль и убедитесь, что вы ввели полный адрес пода (включая http/https)"; $a->strings["Diaspora Export"] = "Экспорт в Diaspora"; -$a->strings["Enable Diaspora Post Plugin"] = "Включить плагин отправки сообщений в Diaspora"; +$a->strings["Enable Diaspora Post Addon"] = "Включить плагин отправки сообщений в Diaspora"; $a->strings["Diaspora username"] = "Имя пользователя Diaspora"; $a->strings["Diaspora password"] = "Пароль Diaspora"; $a->strings["Diaspora site URL"] = "URL пода Diaspora"; diff --git a/diaspora/lang/zh-cn/messages.po b/diaspora/lang/zh-cn/messages.po index beb0d17a4..c0a4978e1 100644 --- a/diaspora/lang/zh-cn/messages.po +++ b/diaspora/lang/zh-cn/messages.po @@ -34,7 +34,7 @@ msgid "Diaspora Export" msgstr "Diaspora 导出" #: diaspora.php:163 -msgid "Enable Diaspora Post Plugin" +msgid "Enable Diaspora Post Addon" msgstr "启用 Diaspora 发文插件" #: diaspora.php:168 diff --git a/diaspora/lang/zh-cn/strings.php b/diaspora/lang/zh-cn/strings.php index 47c0f5560..307a634f2 100644 --- a/diaspora/lang/zh-cn/strings.php +++ b/diaspora/lang/zh-cn/strings.php @@ -8,7 +8,7 @@ function string_plural_select_zh_cn($n){ $a->strings["Post to Diaspora"] = "发到 Diaspora"; $a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "无法登录到你的 Diaspora 账户。请检查用户名和密码并确保你用了完整的地址（包括http...）"; $a->strings["Diaspora Export"] = "Diaspora 导出"; -$a->strings["Enable Diaspora Post Plugin"] = "启用 Diaspora 发文插件"; +$a->strings["Enable Diaspora Post Addon"] = "启用 Diaspora 发文插件"; $a->strings["Diaspora username"] = "Diaspora 用户名"; $a->strings["Diaspora password"] = "Diaspora 密码"; $a->strings["Diaspora site URL"] = "Diaspora 站点 URL"; diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index b268d02eb..be2bcd116 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -1,5 +1,4 @@ */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function dwpost_install() { - register_hook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); - register_hook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); - register_hook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); - register_hook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings'); - register_hook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); + Addon::registerHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); + Addon::registerHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); + Addon::registerHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); + Addon::registerHook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings'); + Addon::registerHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); } function dwpost_uninstall() { - unregister_hook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); - unregister_hook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); - unregister_hook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); - unregister_hook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings'); - unregister_hook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); + Addon::unregisterHook('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); + Addon::unregisterHook('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); } @@ -77,7 +76,7 @@ function dwpost_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/dwpost/lang/C/messages.po b/dwpost/lang/C/messages.po index 6bed922ff..c81e9f0fa 100644 --- a/dwpost/lang/C/messages.po +++ b/dwpost/lang/C/messages.po @@ -26,7 +26,7 @@ msgid "Dreamwidth Post Settings" msgstr "" #: dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" +msgid "Enable dreamwidth Post Addon" msgstr "" #: dwpost.php:77 diff --git a/dwpost/lang/ca/strings.php b/dwpost/lang/ca/strings.php index 6ad56a9b5..3b7df6d05 100644 --- a/dwpost/lang/ca/strings.php +++ b/dwpost/lang/ca/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Dreamwidth"] = "Missatge a Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Configuració d'enviaments a Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Habilitat el plugin d'enviaments a Dreamwidth"; +$a->strings["Enable dreamwidth Post Addon"] = "Habilitat el addon d'enviaments a Dreamwidth"; $a->strings["dreamwidth username"] = "Nom d'usuari a Dreamwidth"; $a->strings["dreamwidth password"] = "Contrasenya a Dreamwidth"; $a->strings["Post to dreamwidth by default"] = "Enviar per defecte a Dreamwidth"; diff --git a/dwpost/lang/cs/messages.po b/dwpost/lang/cs/messages.po index 2291657a3..fb01a38e1 100644 --- a/dwpost/lang/cs/messages.po +++ b/dwpost/lang/cs/messages.po @@ -28,8 +28,8 @@ msgid "Dreamwidth Post Settings" msgstr "Dreamwidth nastavení příspěvků" #: dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" -msgstr "Povolit dreamwidth Plugin" +msgid "Enable dreamwidth Post Addon" +msgstr "Povolit dreamwidth Addon" #: dwpost.php:77 msgid "dreamwidth username" diff --git a/dwpost/lang/cs/strings.php b/dwpost/lang/cs/strings.php index 6d02b09f6..df348a839 100644 --- a/dwpost/lang/cs/strings.php +++ b/dwpost/lang/cs/strings.php @@ -7,7 +7,7 @@ function string_plural_select_cs($n){ ; $a->strings["Post to Dreamwidth"] = "Poslat na Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Dreamwidth nastavení příspěvků"; -$a->strings["Enable dreamwidth Post Plugin"] = "Povolit dreamwidth Plugin"; +$a->strings["Enable dreamwidth Post Addon"] = "Povolit dreamwidth Addon"; $a->strings["dreamwidth username"] = "dreamwidth uživatelské jméno"; $a->strings["dreamwidth password"] = "dreamwidth heslo"; $a->strings["Post to dreamwidth by default"] = "Defaultně umístit na dreamwidth"; diff --git a/dwpost/lang/de/messages.po b/dwpost/lang/de/messages.po index 81507eed8..07e6beb65 100644 --- a/dwpost/lang/de/messages.po +++ b/dwpost/lang/de/messages.po @@ -29,8 +29,8 @@ msgid "Dreamwidth Post Settings" msgstr "Dreamwidth Veröffentlichungs-Einstellungen" #: dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" -msgstr "Dreamwidth Post Plugin aktivieren" +msgid "Enable dreamwidth Post Addon" +msgstr "Dreamwidth Post Addon aktivieren" #: dwpost.php:77 msgid "dreamwidth username" diff --git a/dwpost/lang/de/strings.php b/dwpost/lang/de/strings.php index a80958997..a810f79ef 100644 --- a/dwpost/lang/de/strings.php +++ b/dwpost/lang/de/strings.php @@ -7,7 +7,7 @@ function string_plural_select_de($n){ ; $a->strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen"; $a->strings["Dreamwidth Post Settings"] = "Dreamwidth Veröffentlichungs-Einstellungen"; -$a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktivieren"; +$a->strings["Enable dreamwidth Post Addon"] = "Dreamwidth Post Addon aktivieren"; $a->strings["dreamwidth username"] = "Dreamwidth Benutzername"; $a->strings["dreamwidth password"] = "Dreamwidth Passwort"; $a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen"; diff --git a/dwpost/lang/eo/strings.php b/dwpost/lang/eo/strings.php index 967d4b9b6..d0c96db6e 100644 --- a/dwpost/lang/eo/strings.php +++ b/dwpost/lang/eo/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Dreamwidth"] = "Afiŝi al Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Agordoj por Afiŝoj al Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Ŝalti la Dreamwidth Kromprogramon"; +$a->strings["Enable dreamwidth Post Addon"] = "Ŝalti la Dreamwidth Kromprogramon"; $a->strings["dreamwidth username"] = "Dreamwidth salutnomo"; $a->strings["dreamwidth password"] = "Dreamwidth pasvorto"; $a->strings["Post to dreamwidth by default"] = "Defaŭlte afiŝi al Dreamwidth"; diff --git a/dwpost/lang/es/messages.po b/dwpost/lang/es/messages.po index 10368bb28..18036677a 100644 --- a/dwpost/lang/es/messages.po +++ b/dwpost/lang/es/messages.po @@ -28,8 +28,8 @@ msgid "Dreamwidth Post Settings" msgstr "Ajustes de publicación de Dreamwidth" #: dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" -msgstr "Activar el plugin de publicación dreamwidth" +msgid "Enable dreamwidth Post Addon" +msgstr "Activar el addon de publicación dreamwidth" #: dwpost.php:77 msgid "dreamwidth username" diff --git a/dwpost/lang/es/strings.php b/dwpost/lang/es/strings.php index 646b945bd..4c5c116f4 100644 --- a/dwpost/lang/es/strings.php +++ b/dwpost/lang/es/strings.php @@ -7,7 +7,7 @@ function string_plural_select_es($n){ ; $a->strings["Post to Dreamwidth"] = "Publicar en Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Ajustes de publicación de Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Activar el plugin de publicación dreamwidth"; +$a->strings["Enable dreamwidth Post Addon"] = "Activar el addon de publicación dreamwidth"; $a->strings["dreamwidth username"] = "Nombre de usuario de dreamwidth"; $a->strings["dreamwidth password"] = "Contraseña de dreamwidth"; $a->strings["Post to dreamwidth by default"] = "Publicar en dreamwidth por defecto"; diff --git a/dwpost/lang/fr/messages.po b/dwpost/lang/fr/messages.po index d0010280a..1277d5901 100644 --- a/dwpost/lang/fr/messages.po +++ b/dwpost/lang/fr/messages.po @@ -29,7 +29,7 @@ msgid "Dreamwidth Post Settings" msgstr "Paramètres pour Dreamwidth" #: dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" +msgid "Enable dreamwidth Post Addon" msgstr "" #: dwpost.php:77 diff --git a/dwpost/lang/fr/strings.php b/dwpost/lang/fr/strings.php index 138d9d8ad..5ecda4717 100644 --- a/dwpost/lang/fr/strings.php +++ b/dwpost/lang/fr/strings.php @@ -7,7 +7,7 @@ function string_plural_select_fr($n){ ; $a->strings["Post to Dreamwidth"] = "Publier sur Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Paramètres pour Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = ""; +$a->strings["Enable dreamwidth Post Addon"] = ""; $a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth"; $a->strings["dreamwidth password"] = "Mot de passe dreamwidth"; $a->strings["Post to dreamwidth by default"] = "Poster sur Dreamwidth par défaut"; diff --git a/dwpost/lang/is/strings.php b/dwpost/lang/is/strings.php index 96f1f78b0..e5fee4007 100644 --- a/dwpost/lang/is/strings.php +++ b/dwpost/lang/is/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Dreamwidth"] = ""; $a->strings["Dreamwidth Post Settings"] = ""; -$a->strings["Enable dreamwidth Post Plugin"] = ""; +$a->strings["Enable dreamwidth Post Addon"] = ""; $a->strings["dreamwidth username"] = ""; $a->strings["dreamwidth password"] = ""; $a->strings["Post to dreamwidth by default"] = ""; diff --git a/dwpost/lang/it/messages.po b/dwpost/lang/it/messages.po index dbd210168..8b19c2997 100644 --- a/dwpost/lang/it/messages.po +++ b/dwpost/lang/it/messages.po @@ -28,8 +28,8 @@ msgid "Dreamwidth Post Settings" msgstr "Impostazioni di invio a Dreamwidth" #: dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" -msgstr "Abilita il plugin di invio a Dreamwidth" +msgid "Enable dreamwidth Post Addon" +msgstr "Abilita il addon di invio a Dreamwidth" #: dwpost.php:77 msgid "dreamwidth username" diff --git a/dwpost/lang/it/strings.php b/dwpost/lang/it/strings.php index 5cded6e11..df904d620 100644 --- a/dwpost/lang/it/strings.php +++ b/dwpost/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to Dreamwidth"] = "Posta su Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Impostazioni di invio a Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Abilita il plugin di invio a Dreamwidth"; +$a->strings["Enable dreamwidth Post Addon"] = "Abilita il addon di invio a Dreamwidth"; $a->strings["dreamwidth username"] = "Nome utente Dreamwidth"; $a->strings["dreamwidth password"] = "password Dreamwidth"; $a->strings["Post to dreamwidth by default"] = "Invia sempre a Dreamwidth"; diff --git a/dwpost/lang/nb-no/strings.php b/dwpost/lang/nb-no/strings.php index 37677e6df..c4ea612b3 100644 --- a/dwpost/lang/nb-no/strings.php +++ b/dwpost/lang/nb-no/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Dreamwidth"] = ""; $a->strings["Dreamwidth Post Settings"] = ""; -$a->strings["Enable dreamwidth Post Plugin"] = ""; +$a->strings["Enable dreamwidth Post Addon"] = ""; $a->strings["dreamwidth username"] = ""; $a->strings["dreamwidth password"] = ""; $a->strings["Post to dreamwidth by default"] = ""; diff --git a/dwpost/lang/pl/strings.php b/dwpost/lang/pl/strings.php index 237c95d94..9f1ff04e7 100644 --- a/dwpost/lang/pl/strings.php +++ b/dwpost/lang/pl/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Dreamwidth"] = "Opublikuj na Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = ""; -$a->strings["Enable dreamwidth Post Plugin"] = ""; +$a->strings["Enable dreamwidth Post Addon"] = ""; $a->strings["dreamwidth username"] = ""; $a->strings["dreamwidth password"] = ""; $a->strings["Post to dreamwidth by default"] = ""; diff --git a/dwpost/lang/pt-br/messages.po b/dwpost/lang/pt-br/messages.po index 26c3bba6e..f0e49e4e3 100644 --- a/dwpost/lang/pt-br/messages.po +++ b/dwpost/lang/pt-br/messages.po @@ -28,7 +28,7 @@ msgid "Dreamwidth Post Settings" msgstr "Configurações de publicação no Dreamwidth" #: dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" +msgid "Enable dreamwidth Post Addon" msgstr "Habilitar plug-in para publicar no Dreamwidth" #: dwpost.php:77 diff --git a/dwpost/lang/pt-br/strings.php b/dwpost/lang/pt-br/strings.php index 329cf9e3f..03dc7d2d2 100644 --- a/dwpost/lang/pt-br/strings.php +++ b/dwpost/lang/pt-br/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Dreamwidth"] = "Publicar no Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Configurações de publicação no Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Habilitar o plugin de publicação no Dreamwidth"; +$a->strings["Enable dreamwidth Post Addon"] = "Habilitar o addon de publicação no Dreamwidth"; $a->strings["dreamwidth username"] = "Nome de usuário do Dreamwidth"; $a->strings["dreamwidth password"] = "Senha do Dreamwidth"; $a->strings["Post to dreamwidth by default"] = "Publicar no Dreamwidth por padrão"; diff --git a/dwpost/lang/ro/messages.po b/dwpost/lang/ro/messages.po index f2fd9e0c5..912859686 100644 --- a/dwpost/lang/ro/messages.po +++ b/dwpost/lang/ro/messages.po @@ -28,7 +28,7 @@ msgid "Dreamwidth Post Settings" msgstr "Configurări Postări Dreamwidth " #: dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" +msgid "Enable dreamwidth Post Addon" msgstr "Activare Modul Postare pe Dreamwidth" #: dwpost.php:77 diff --git a/dwpost/lang/ro/strings.php b/dwpost/lang/ro/strings.php index d50f38037..ed3ece27f 100644 --- a/dwpost/lang/ro/strings.php +++ b/dwpost/lang/ro/strings.php @@ -7,7 +7,7 @@ function string_plural_select_ro($n){ ; $a->strings["Post to Dreamwidth"] = "Postați pe Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Configurări Postări Dreamwidth "; -$a->strings["Enable dreamwidth Post Plugin"] = "Activare Modul Postare pe Dreamwidth"; +$a->strings["Enable dreamwidth Post Addon"] = "Activare Modul Postare pe Dreamwidth"; $a->strings["dreamwidth username"] = "Utilizator Dreamwidth"; $a->strings["dreamwidth password"] = "Parola Dreamwidth "; $a->strings["Post to dreamwidth by default"] = "Postați implicit pe Dreamwidth"; diff --git a/dwpost/lang/ru/messages.po b/dwpost/lang/ru/messages.po index fc01bce0e..93e400e54 100644 --- a/dwpost/lang/ru/messages.po +++ b/dwpost/lang/ru/messages.po @@ -28,7 +28,7 @@ msgid "Dreamwidth Post Settings" msgstr "Настройки сообщений Dreamwidth" #: dwpost.php:72 -msgid "Enable dreamwidth Post Plugin" +msgid "Enable dreamwidth Post Addon" msgstr "Включить плагин отправки сообщений в Dreamwidth" #: dwpost.php:77 diff --git a/dwpost/lang/ru/strings.php b/dwpost/lang/ru/strings.php index db1b2755d..7b6e5f471 100644 --- a/dwpost/lang/ru/strings.php +++ b/dwpost/lang/ru/strings.php @@ -7,7 +7,7 @@ function string_plural_select_ru($n){ ; $a->strings["Post to Dreamwidth"] = "Отправить в Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Настройки сообщений Dreamwidth"; -$a->strings["Enable dreamwidth Post Plugin"] = "Включить плагин отправки сообщений в Dreamwidth"; +$a->strings["Enable dreamwidth Post Addon"] = "Включить плагин отправки сообщений в Dreamwidth"; $a->strings["dreamwidth username"] = "Имя пользователя Dreamwidth"; $a->strings["dreamwidth password"] = "Пароль Dreamwidth"; $a->strings["Post to dreamwidth by default"] = "Отправлять сообщения в Dreamwidth по умолчанию"; diff --git a/dwpost/lang/zh-cn/strings.php b/dwpost/lang/zh-cn/strings.php index 93e075c6f..131cd9fa2 100644 --- a/dwpost/lang/zh-cn/strings.php +++ b/dwpost/lang/zh-cn/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Dreamwidth"] = "转播到Dreamwidth"; $a->strings["Dreamwidth Post Settings"] = "Dreamwidth转播设置"; -$a->strings["Enable dreamwidth Post Plugin"] = "使Dreamwidth转播插件可用"; +$a->strings["Enable dreamwidth Post Addon"] = "使Dreamwidth转播插件可用"; $a->strings["dreamwidth username"] = "Dreamwidth用户名"; $a->strings["dreamwidth password"] = "Dreamwidth密码"; $a->strings["Post to dreamwidth by default"] = "默认地转播到Dreamwidth"; diff --git a/fortunate/fortunate.php b/fortunate/fortunate.php index 427d620c2..4d87bffe7 100644 --- a/fortunate/fortunate.php +++ b/fortunate/fortunate.php @@ -5,20 +5,21 @@ * Version: 1.0 * Author: Mike Macgirvin */ +use Friendica\Core\Addon; // IMPORTANT: SET THIS to your fortunate server define ('FORTUNATE_SERVER', 'hostname.com'); function fortunate_install() { - register_hook('page_end', 'addon/fortunate/fortunate.php', 'fortunate_fetch'); + Addon::registerHook('page_end', 'addon/fortunate/fortunate.php', 'fortunate_fetch'); if(FORTUNATE_SERVER == 'hostname.com' && is_site_admin()) { - notice('Fortunate plugin requires configuration. See README'); + notice('Fortunate addon requires configuration. See README'); } } function fortunate_uninstall() { - unregister_hook('page_end', 'addon/fortunate/fortunate.php', 'fortunate_fetch'); + Addon::unregisterHook('page_end', 'addon/fortunate/fortunate.php', 'fortunate_fetch'); } diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index 10924c677..572f61570 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -9,6 +9,7 @@ use Friendica\Content\Nav; use Friendica\Content\Widget; +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Database\DBM; use Friendica\Model\Profile; @@ -18,14 +19,12 @@ require_once 'include/dba.php'; require_once 'include/plugin.php'; require_once 'include/text.php'; -function forumdirectory_install() -{ - register_hook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu'); +function forumdirectory_install() { +Addon::registerHook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu'); } -function forumdirectory_uninstall() -{ - unregister_hook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu'); +function forumdirectory_uninstall() { +Addon::unregisterHook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu'); } function forumdirectory_module() diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index 51392ff57..32234d159 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -6,14 +6,14 @@ * Author: Commander Zot * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function fromapp_install() { - register_hook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook'); - register_hook('plugin_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings'); - register_hook('plugin_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post'); + Addon::registerHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook'); + Addon::registerHook('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings'); + Addon::registerHook('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post'); logger("installed fromapp"); } @@ -21,9 +21,9 @@ function fromapp_install() { function fromapp_uninstall() { - unregister_hook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook'); - unregister_hook('plugin_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings'); - unregister_hook('plugin_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post'); + Addon::unregisterHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook'); + Addon::unregisterHook('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post'); logger("removed fromapp"); diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 464829a49..c028ea852 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -9,6 +9,7 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Object\Image; @@ -18,19 +19,19 @@ require_once 'mod/parse_url.php'; require_once 'include/text.php'; function fromgplus_install() { - register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); - register_hook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); - register_hook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron'); + Addon::registerHook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); + Addon::registerHook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); + Addon::registerHook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron'); } function fromgplus_uninstall() { - unregister_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); - unregister_hook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); - unregister_hook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron'); + Addon::unregisterHook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); + Addon::unregisterHook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron'); // Old hooks - unregister_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); - unregister_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); + Addon::unregisterHook('addon_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); } function fromgplus_addon_settings(&$a,&$s) { @@ -93,19 +94,21 @@ function fromgplus_addon_settings_post(&$a,&$b) { } } -function fromgplus_plugin_admin(&$a, &$o){ - $t = get_markup_template("admin.tpl", "addon/fromgplus/"); +function fromgplus_addon_admin(&$a, &$o) +{ + $t = get_markup_template("admin.tpl", "addon/fromgplus/"); - $o = replace_macros($t, [ - '$submit' => t('Save Settings'), - '$key' => ['key', t('Key'), trim(Config::get('fromgplus', 'key')), t('')], - ]); + $o = replace_macros($t, [ + '$submit' => t('Save Settings'), + '$key' => ['key', t('Key'), trim(Config::get('fromgplus', 'key')), t('')], + ]); } -function fromgplus_plugin_admin_post(&$a){ - $key = ((x($_POST,'key')) ? trim($_POST['key']) : ''); - Config::set('fromgplus','key',$key); - info( t('Settings updated.'). EOL ); +function fromgplus_addon_admin_post(&$a) +{ + $key = ((x($_POST, 'key')) ? trim($_POST['key']) : ''); + Config::set('fromgplus', 'key', $key); + info(t('Settings updated.'). EOL); } function fromgplus_cron($a,$b) { diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php index 0171f7c29..fa72c2a87 100644 --- a/geocoordinates/geocoordinates.php +++ b/geocoordinates/geocoordinates.php @@ -5,21 +5,21 @@ * Version: 0.1 * Author: Michael Vogel */ - +use Friendica\Core\Addon; use Friendica\Core\Cache; use Friendica\Core\Config; function geocoordinates_install() { - register_hook('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); - register_hook('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); + Addon::registerHook('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); + Addon::registerHook('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); } function geocoordinates_uninstall() { - unregister_hook('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); - unregister_hook('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); + Addon::unregisterHook('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); + Addon::unregisterHook('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); } function geocoordinates_resolve_item(&$item) @@ -81,24 +81,24 @@ function geocoordinates_post_hook($a, &$item) geocoordinates_resolve_item($item); } -function geocoordinates_plugin_admin(&$a, &$o) +function geocoordinates_addon_admin(&$a, &$o) { $t = get_markup_template("admin.tpl", "addon/geocoordinates/"); $o = replace_macros($t, [ '$submit' => t('Save Settings'), - '$api_key' => ['api_key', t('API Key'), Config::get('geocoordinates', 'api_key' ), ''], - '$language' => ['language', t('Language code (IETF format)'), Config::get('geocoordinates', 'language' ), ''], + '$api_key' => ['api_key', t('API Key'), Config::get('geocoordinates', 'api_key'), ''], + '$language' => ['language', t('Language code (IETF format)'), Config::get('geocoordinates', 'language'), ''], ]); } -function geocoordinates_plugin_admin_post(&$a) +function geocoordinates_addon_admin_post(&$a) { - $api_key = ((x($_POST,'api_key')) ? notags(trim($_POST['api_key'])) : ''); - Config::set('geocoordinates','api_key',$api_key); + $api_key = ((x($_POST, 'api_key')) ? notags(trim($_POST['api_key'])) : ''); + Config::set('geocoordinates', 'api_key', $api_key); - $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); - Config::set('geocoordinates','language',$language); + $language = ((x($_POST, 'language')) ? notags(trim($_POST['language'])) : ''); + Config::set('geocoordinates', 'language', $language); info(t('Settings updated.'). EOL); } diff --git a/geonames/geonames.php b/geonames/geonames.php index 71e05c8b6..45d8fde57 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -12,14 +12,14 @@ * $a->config['geonames']['username'] = 'your_username'; * Also visit http://geonames.org/manageaccount and enable access to the free web services * - * When plugin is installed, the system calls the plugin + * When addon is installed, the system calls the addon * name_install() function, located in 'addon/name/name.php', * where 'name' is the name of the addon. * If the addon is removed from the configuration list, the * system will call the name_uninstall() function. * */ - +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; @@ -27,23 +27,23 @@ function geonames_install() { /** * - * Our plugin will attach in three places. + * Our addon will attach in three places. * The first is just prior to storing a local post. * */ - register_hook('post_local', 'addon/geonames/geonames.php', 'geonames_post_hook'); + Addon::registerHook('post_local', 'addon/geonames/geonames.php', 'geonames_post_hook'); /** * - * Then we'll attach into the plugin settings page, and also the + * Then we'll attach into the addon settings page, and also the * settings post hook so that we can create and update * user preferences. * */ - register_hook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_plugin_admin'); - register_hook('plugin_settings_post', 'addon/geonames/geonames.php', 'geonames_plugin_admin_post'); + Addon::registerHook('addon_settings', 'addon/geonames/geonames.php', 'geonames_addon_admin'); + Addon::registerHook('addon_settings_post', 'addon/geonames/geonames.php', 'geonames_addon_admin_post'); logger("installed geonames"); } @@ -59,9 +59,9 @@ function geonames_uninstall() { * */ - unregister_hook('post_local', 'addon/geonames/geonames.php', 'geonames_post_hook'); - unregister_hook('plugin_settings', 'addon/geonames/geonames.php', 'geonames_plugin_admin'); - unregister_hook('plugin_settings_post', 'addon/geonames/geonames.php', 'geonames_plugin_admin_post'); + Addon::unregisterHook('post_local', 'addon/geonames/geonames.php', 'geonames_post_hook'); + Addon::unregisterHook('addon_settings', 'addon/geonames/geonames.php', 'geonames_addon_admin'); + Addon::unregisterHook('addon_settings_post', 'addon/geonames/geonames.php', 'geonames_addon_admin_post'); logger("removed geonames"); @@ -76,7 +76,7 @@ function geonames_post_hook($a, &$item) { * An item was posted on the local system. * We are going to look for specific items: * - A status post by a profile owner - * - The profile owner must have allowed our plugin + * - The profile owner must have allowed our addon * */ @@ -137,7 +137,7 @@ function geonames_post_hook($a, &$item) { * */ -function geonames_plugin_admin_post($a,$post) { +function geonames_addon_admin_post($a,$post) { if(! local_user() || (! x($_POST,'geonames-submit'))) return; PConfig::set(local_user(),'geonames','enable',intval($_POST['geonames'])); @@ -148,14 +148,14 @@ function geonames_plugin_admin_post($a,$post) { /** * - * Called from the Plugin Setting form. + * Called from the Addon Setting form. * Add our own settings info to the page. * */ -function geonames_plugin_admin(&$a,&$s) { +function geonames_addon_admin(&$a,&$s) { if(! local_user()) return; @@ -180,7 +180,7 @@ function geonames_plugin_admin(&$a,&$s) { $s .= '
'; $s .= '

' . t('Geonames Settings') . '

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/geonames/lang/C/messages.po b/geonames/lang/C/messages.po index 49210658a..81c239d2b 100644 --- a/geonames/lang/C/messages.po +++ b/geonames/lang/C/messages.po @@ -26,7 +26,7 @@ msgid "Geonames Settings" msgstr "" #: geonames.php:181 -msgid "Enable Geonames Plugin" +msgid "Enable Geonames Addon" msgstr "" #: geonames.php:187 diff --git a/geonames/lang/ca/strings.php b/geonames/lang/ca/strings.php index 058ef8e5d..259e81f4e 100644 --- a/geonames/lang/ca/strings.php +++ b/geonames/lang/ca/strings.php @@ -2,5 +2,5 @@ $a->strings["Geonames settings updated."] = "Actualitzada la configuració de Geonames."; $a->strings["Geonames Settings"] = "Configuració de Geonames"; -$a->strings["Enable Geonames Plugin"] = "Habilitar Plugin de Geonames"; +$a->strings["Enable Geonames Addon"] = "Habilitar Addon de Geonames"; $a->strings["Submit"] = "Enviar"; diff --git a/geonames/lang/cs/messages.po b/geonames/lang/cs/messages.po index d88aef60b..98d8f14f4 100644 --- a/geonames/lang/cs/messages.po +++ b/geonames/lang/cs/messages.po @@ -28,7 +28,7 @@ msgid "Geonames Settings" msgstr "Nastavení Geonames" #: geonames.php:181 -msgid "Enable Geonames Plugin" +msgid "Enable Geonames Addon" msgstr "Povolit Geonames rozšíření" #: geonames.php:187 diff --git a/geonames/lang/cs/strings.php b/geonames/lang/cs/strings.php index 134a6a77c..dfd52e6c0 100644 --- a/geonames/lang/cs/strings.php +++ b/geonames/lang/cs/strings.php @@ -7,5 +7,5 @@ function string_plural_select_cs($n){ ; $a->strings["Geonames settings updated."] = "Geonames nastavení aktualizováno."; $a->strings["Geonames Settings"] = "Nastavení Geonames"; -$a->strings["Enable Geonames Plugin"] = "Povolit Geonames rozšíření"; +$a->strings["Enable Geonames Addon"] = "Povolit Geonames rozšíření"; $a->strings["Submit"] = "Odeslat"; diff --git a/geonames/lang/de/messages.po b/geonames/lang/de/messages.po index 7629b1b5e..fdc3ed632 100644 --- a/geonames/lang/de/messages.po +++ b/geonames/lang/de/messages.po @@ -29,8 +29,8 @@ msgid "Geonames Settings" msgstr "Geonames Einstellungen" #: geonames.php:181 -msgid "Enable Geonames Plugin" -msgstr "Geonames Plugin aktivieren" +msgid "Enable Geonames Addon" +msgstr "Geonames Addon aktivieren" #: geonames.php:187 msgid "Submit" diff --git a/geonames/lang/de/strings.php b/geonames/lang/de/strings.php index cf1838fb0..26f2246e6 100644 --- a/geonames/lang/de/strings.php +++ b/geonames/lang/de/strings.php @@ -7,5 +7,5 @@ function string_plural_select_de($n){ ; $a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert"; $a->strings["Geonames Settings"] = "Geonames Einstellungen"; -$a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren"; +$a->strings["Enable Geonames Addon"] = "Geonames Addon aktivieren"; $a->strings["Submit"] = "Senden"; diff --git a/geonames/lang/eo/strings.php b/geonames/lang/eo/strings.php index a6127e684..65cd16a3b 100644 --- a/geonames/lang/eo/strings.php +++ b/geonames/lang/eo/strings.php @@ -2,5 +2,5 @@ $a->strings["Geonames settings updated."] = "Ĝidatigis la Geonames agordojn."; $a->strings["Geonames Settings"] = "Geonames Agordoj"; -$a->strings["Enable Geonames Plugin"] = "Ŝalti la Geonames Kromprogramon"; +$a->strings["Enable Geonames Addon"] = "Ŝalti la Geonames Kromprogramon"; $a->strings["Submit"] = "Sendi"; diff --git a/geonames/lang/es/messages.po b/geonames/lang/es/messages.po index f372d7925..84de85aae 100644 --- a/geonames/lang/es/messages.po +++ b/geonames/lang/es/messages.po @@ -28,8 +28,8 @@ msgid "Geonames Settings" msgstr "Ajustes de Geonombres" #: geonames.php:181 -msgid "Enable Geonames Plugin" -msgstr "Habilitar Plugin de Geonombres" +msgid "Enable Geonames Addon" +msgstr "Habilitar Addon de Geonombres" #: geonames.php:187 msgid "Submit" diff --git a/geonames/lang/es/strings.php b/geonames/lang/es/strings.php index d9a85aa16..d2cb635d7 100644 --- a/geonames/lang/es/strings.php +++ b/geonames/lang/es/strings.php @@ -7,5 +7,5 @@ function string_plural_select_es($n){ ; $a->strings["Geonames settings updated."] = "Ajustes de geonombres actualizados."; $a->strings["Geonames Settings"] = "Ajustes de Geonombres"; -$a->strings["Enable Geonames Plugin"] = "Habilitar Plugin de Geonombres"; +$a->strings["Enable Geonames Addon"] = "Habilitar Addon de Geonombres"; $a->strings["Submit"] = "Enviar"; diff --git a/geonames/lang/fr/strings.php b/geonames/lang/fr/strings.php index 6428cb38b..10d6631eb 100644 --- a/geonames/lang/fr/strings.php +++ b/geonames/lang/fr/strings.php @@ -2,5 +2,5 @@ $a->strings["Geonames settings updated."] = "Réglages Geonames sauvés."; $a->strings["Geonames Settings"] = "Réglages Geonames"; -$a->strings["Enable Geonames Plugin"] = "Activer Geonames"; +$a->strings["Enable Geonames Addon"] = "Activer Geonames"; $a->strings["Submit"] = "Envoyer"; diff --git a/geonames/lang/is/strings.php b/geonames/lang/is/strings.php index ac64f2bab..436d31167 100644 --- a/geonames/lang/is/strings.php +++ b/geonames/lang/is/strings.php @@ -2,5 +2,5 @@ $a->strings["Geonames settings updated."] = ""; $a->strings["Geonames Settings"] = ""; -$a->strings["Enable Geonames Plugin"] = ""; +$a->strings["Enable Geonames Addon"] = ""; $a->strings["Submit"] = "Senda inn"; diff --git a/geonames/lang/it/messages.po b/geonames/lang/it/messages.po index 8164d7a24..94f4c2693 100644 --- a/geonames/lang/it/messages.po +++ b/geonames/lang/it/messages.po @@ -28,8 +28,8 @@ msgid "Geonames Settings" msgstr "Impostazioni Geonames" #: geonames.php:181 -msgid "Enable Geonames Plugin" -msgstr "Abilita plugin Geonames" +msgid "Enable Geonames Addon" +msgstr "Abilita addon Geonames" #: geonames.php:187 msgid "Submit" diff --git a/geonames/lang/it/strings.php b/geonames/lang/it/strings.php index 8ecc98c22..c50e83455 100644 --- a/geonames/lang/it/strings.php +++ b/geonames/lang/it/strings.php @@ -7,5 +7,5 @@ function string_plural_select_it($n){ ; $a->strings["Geonames settings updated."] = "Impostazioni di Geonames aggiornate."; $a->strings["Geonames Settings"] = "Impostazioni Geonames"; -$a->strings["Enable Geonames Plugin"] = "Abilita plugin Geonames"; +$a->strings["Enable Geonames Addon"] = "Abilita addon Geonames"; $a->strings["Submit"] = "Invia"; diff --git a/geonames/lang/nb-no/strings.php b/geonames/lang/nb-no/strings.php index b3fea872a..4a7b5f09f 100644 --- a/geonames/lang/nb-no/strings.php +++ b/geonames/lang/nb-no/strings.php @@ -2,5 +2,5 @@ $a->strings["Geonames settings updated."] = ""; $a->strings["Geonames Settings"] = ""; -$a->strings["Enable Geonames Plugin"] = ""; +$a->strings["Enable Geonames Addon"] = ""; $a->strings["Submit"] = "Lagre"; diff --git a/geonames/lang/pl/strings.php b/geonames/lang/pl/strings.php index ff15d74fe..08a3633c6 100644 --- a/geonames/lang/pl/strings.php +++ b/geonames/lang/pl/strings.php @@ -2,5 +2,5 @@ $a->strings["Geonames settings updated."] = ""; $a->strings["Geonames Settings"] = "ustawienia Geonames"; -$a->strings["Enable Geonames Plugin"] = ""; +$a->strings["Enable Geonames Addon"] = ""; $a->strings["Submit"] = "Potwierdź"; diff --git a/geonames/lang/pt-br/strings.php b/geonames/lang/pt-br/strings.php index c0cf0b538..d302d1fe3 100644 --- a/geonames/lang/pt-br/strings.php +++ b/geonames/lang/pt-br/strings.php @@ -2,5 +2,5 @@ $a->strings["Geonames settings updated."] = "Configurações Geonames atualizadas."; $a->strings["Geonames Settings"] = "Configurações Geonames"; -$a->strings["Enable Geonames Plugin"] = "Plugin Geonames Habilitado"; +$a->strings["Enable Geonames Addon"] = "Addon Geonames Habilitado"; $a->strings["Submit"] = "Enviar"; diff --git a/geonames/lang/ro/messages.po b/geonames/lang/ro/messages.po index 673f4fdfd..973c9446f 100644 --- a/geonames/lang/ro/messages.po +++ b/geonames/lang/ro/messages.po @@ -28,7 +28,7 @@ msgid "Geonames Settings" msgstr "Configurări Geonume" #: geonames.php:181 -msgid "Enable Geonames Plugin" +msgid "Enable Geonames Addon" msgstr "Permite Modul Geonume" #: geonames.php:187 diff --git a/geonames/lang/ro/strings.php b/geonames/lang/ro/strings.php index 6b25f12f3..b62585527 100644 --- a/geonames/lang/ro/strings.php +++ b/geonames/lang/ro/strings.php @@ -7,5 +7,5 @@ function string_plural_select_ro($n){ ; $a->strings["Geonames settings updated."] = "Configurări Geonume actualizate."; $a->strings["Geonames Settings"] = "Configurări Geonume"; -$a->strings["Enable Geonames Plugin"] = "Permite Modul Geonume"; +$a->strings["Enable Geonames Addon"] = "Permite Modul Geonume"; $a->strings["Submit"] = "Trimite"; diff --git a/geonames/lang/ru/messages.po b/geonames/lang/ru/messages.po index d8deda8c1..a639310bc 100644 --- a/geonames/lang/ru/messages.po +++ b/geonames/lang/ru/messages.po @@ -28,7 +28,7 @@ msgid "Geonames Settings" msgstr "Настройки Geonames" #: geonames.php:181 -msgid "Enable Geonames Plugin" +msgid "Enable Geonames Addon" msgstr "Включить плагин Geonames" #: geonames.php:187 diff --git a/geonames/lang/ru/strings.php b/geonames/lang/ru/strings.php index 2af0233ca..658dd72a8 100644 --- a/geonames/lang/ru/strings.php +++ b/geonames/lang/ru/strings.php @@ -7,5 +7,5 @@ function string_plural_select_ru($n){ ; $a->strings["Geonames settings updated."] = "Настройки Geonames обновлены."; $a->strings["Geonames Settings"] = "Настройки Geonames"; -$a->strings["Enable Geonames Plugin"] = "Включить плагин Geonames"; +$a->strings["Enable Geonames Addon"] = "Включить плагин Geonames"; $a->strings["Submit"] = "Добавить"; diff --git a/geonames/lang/zh-cn/strings.php b/geonames/lang/zh-cn/strings.php index 2f72f8c00..89e3fd943 100644 --- a/geonames/lang/zh-cn/strings.php +++ b/geonames/lang/zh-cn/strings.php @@ -2,5 +2,5 @@ $a->strings["Geonames settings updated."] = "Geonames设置更新了。"; $a->strings["Geonames Settings"] = "Geonames设置"; -$a->strings["Enable Geonames Plugin"] = "使Geonames插件能用"; +$a->strings["Enable Geonames Addon"] = "使Geonames插件能用"; $a->strings["Submit"] = "提交"; diff --git a/gnot/gnot.php b/gnot/gnot.php index bbdf9d80e..38fb3069a 100644 --- a/gnot/gnot.php +++ b/gnot/gnot.php @@ -7,14 +7,14 @@ * * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function gnot_install() { - register_hook('plugin_settings', 'addon/gnot/gnot.php', 'gnot_settings'); - register_hook('plugin_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post'); - register_hook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail'); + Addon::registerHook('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings'); + Addon::registerHook('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post'); + Addon::registerHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail'); logger("installed gnot"); } @@ -22,9 +22,9 @@ function gnot_install() { function gnot_uninstall() { - unregister_hook('plugin_settings', 'addon/gnot/gnot.php', 'gnot_settings'); - unregister_hook('plugin_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post'); - unregister_hook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail'); + Addon::unregisterHook('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post'); + Addon::unregisterHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail'); logger("removed gnot"); @@ -52,7 +52,7 @@ function gnot_settings_post($a,$post) { /** * - * Called from the Plugin Setting form. + * Called from the Addon Setting form. * Add our own settings info to the page. * */ @@ -80,7 +80,7 @@ function gnot_settings(&$a,&$s) { $s .= '

' . t('Gnot Settings') . '

'; $s .= '
'; $s .= '
' . t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") . '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/gnot/lang/C/messages.po b/gnot/lang/C/messages.po index 86f2268c1..230d2364b 100644 --- a/gnot/lang/C/messages.po +++ b/gnot/lang/C/messages.po @@ -32,7 +32,7 @@ msgid "" msgstr "" #: gnot.php:82 -msgid "Enable this plugin/addon?" +msgid "Enable this addon?" msgstr "" #: gnot.php:88 diff --git a/gnot/lang/ca/strings.php b/gnot/lang/ca/strings.php index 809a152df..e65ec9365 100644 --- a/gnot/lang/ca/strings.php +++ b/gnot/lang/ca/strings.php @@ -3,6 +3,6 @@ $a->strings["Gnot settings updated."] = "Configuració de Gnot actualitzada"; $a->strings["Gnot Settings"] = "Configuració de Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permet crear fils de les notificacions de comentaris de correu electrònic a Gmail i anonimat de la línia d'assumpte."; -$a->strings["Enable this plugin/addon?"] = "Activar aquest plugin/aplicació?"; +$a->strings["Enable this addon?"] = "Activar aquest addon/aplicació?"; $a->strings["Submit"] = "Enviar"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica: Notifica] Conversació comentada #%d"; diff --git a/gnot/lang/cs/messages.po b/gnot/lang/cs/messages.po index 3db9fa475..1f9f4244a 100644 --- a/gnot/lang/cs/messages.po +++ b/gnot/lang/cs/messages.po @@ -34,8 +34,8 @@ msgid "" msgstr "Umožnit řetězení emailových komentářových notifikací na Gmailu a anonymizací řádky předmětu." #: gnot.php:82 -msgid "Enable this plugin/addon?" -msgstr "Povolit tento plugin/rozšíření?" +msgid "Enable this addon?" +msgstr "Povolit tento addon/rozšíření?" #: gnot.php:88 msgid "Submit" diff --git a/gnot/lang/cs/strings.php b/gnot/lang/cs/strings.php index 596817d1e..90648e5e5 100644 --- a/gnot/lang/cs/strings.php +++ b/gnot/lang/cs/strings.php @@ -8,6 +8,6 @@ function string_plural_select_cs($n){ $a->strings["Gnot settings updated."] = "Nastavení Gnot aktualizováno."; $a->strings["Gnot Settings"] = "Nastavení Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Umožnit řetězení emailových komentářových notifikací na Gmailu a anonymizací řádky předmětu."; -$a->strings["Enable this plugin/addon?"] = "Povolit tento plugin/rozšíření?"; +$a->strings["Enable this addon?"] = "Povolit tento addon/rozšíření?"; $a->strings["Submit"] = "Odeslat"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Upozornění] Komentář ke konverzaci #%d"; diff --git a/gnot/lang/de/messages.po b/gnot/lang/de/messages.po index 3a72154d0..747f1853e 100644 --- a/gnot/lang/de/messages.po +++ b/gnot/lang/de/messages.po @@ -35,8 +35,8 @@ msgid "" msgstr "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff" #: gnot.php:82 -msgid "Enable this plugin/addon?" -msgstr "Dieses Plugin/Addon aktivieren?" +msgid "Enable this addon?" +msgstr "Dieses Addon aktivieren?" #: gnot.php:88 msgid "Submit" diff --git a/gnot/lang/de/strings.php b/gnot/lang/de/strings.php index 03832f71a..b798a21b9 100644 --- a/gnot/lang/de/strings.php +++ b/gnot/lang/de/strings.php @@ -8,6 +8,6 @@ function string_plural_select_de($n){ $a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert."; $a->strings["Gnot Settings"] = "Gnot Einstellungen"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff"; -$a->strings["Enable this plugin/addon?"] = "Dieses Plugin/Addon aktivieren?"; +$a->strings["Enable this addon?"] = "Dieses Addon aktivieren?"; $a->strings["Submit"] = "Senden"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica-Benachrichtigung] Kommentar zum Beitrag #%d"; diff --git a/gnot/lang/eo/strings.php b/gnot/lang/eo/strings.php index 89379e9aa..cfd3c53cc 100644 --- a/gnot/lang/eo/strings.php +++ b/gnot/lang/eo/strings.php @@ -3,6 +3,6 @@ $a->strings["Gnot settings updated."] = "Ĝisdatigis Gnot agordojn."; $a->strings["Gnot Settings"] = "Agordoj por Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permesas la ĉenadon de retpoŝtaj atentigoj pri komentoj ĉe Gmail kan anonimigado de la temlinio."; -$a->strings["Enable this plugin/addon?"] = "Ŝalti tiun kromprogramon?"; +$a->strings["Enable this addon?"] = "Ŝalti tiun kromprogramon?"; $a->strings["Submit"] = "Sendi"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Atentigo] Komento pri konversacio #%d"; diff --git a/gnot/lang/es/messages.po b/gnot/lang/es/messages.po index b96abe642..6e4b85690 100644 --- a/gnot/lang/es/messages.po +++ b/gnot/lang/es/messages.po @@ -34,8 +34,8 @@ msgid "" msgstr "Permite limpiar las notificaciones de comentario de email en Gmail y anonimizar la línea del tema." #: gnot.php:82 -msgid "Enable this plugin/addon?" -msgstr "¿Habilitar este plugin/addon?" +msgid "Enable this addon?" +msgstr "¿Habilitar este addon?" #: gnot.php:88 msgid "Submit" diff --git a/gnot/lang/es/strings.php b/gnot/lang/es/strings.php index 1f114cdb9..2f9e7a8d4 100644 --- a/gnot/lang/es/strings.php +++ b/gnot/lang/es/strings.php @@ -8,6 +8,6 @@ function string_plural_select_es($n){ $a->strings["Gnot settings updated."] = "Ajustes de Gnot actualizados."; $a->strings["Gnot Settings"] = "Ajustes de Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite limpiar las notificaciones de comentario de email en Gmail y anonimizar la línea del tema."; -$a->strings["Enable this plugin/addon?"] = "¿Habilitar este plugin/addon?"; +$a->strings["Enable this addon?"] = "¿Habilitar este addon?"; $a->strings["Submit"] = "Enviar"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Comentar en conversación #%d"; diff --git a/gnot/lang/fr/strings.php b/gnot/lang/fr/strings.php index 7018f6c3f..32caf46ba 100644 --- a/gnot/lang/fr/strings.php +++ b/gnot/lang/fr/strings.php @@ -3,6 +3,6 @@ $a->strings["Gnot settings updated."] = "Réglages Gnot sauvés."; $a->strings["Gnot Settings"] = "Réglages Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Autorise l'arborescence des notifications de commentaires sur GMail, et rend la ligne 'Sujet' anonyme."; -$a->strings["Enable this plugin/addon?"] = "Activer cette extension?"; +$a->strings["Enable this addon?"] = "Activer cette extension?"; $a->strings["Submit"] = "Envoyer"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notification] Commentaire sur la conversation #%d"; diff --git a/gnot/lang/is/strings.php b/gnot/lang/is/strings.php index c75a1c42c..ae183568a 100644 --- a/gnot/lang/is/strings.php +++ b/gnot/lang/is/strings.php @@ -3,6 +3,6 @@ $a->strings["Gnot settings updated."] = ""; $a->strings["Gnot Settings"] = ""; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = ""; -$a->strings["Enable this plugin/addon?"] = ""; +$a->strings["Enable this addon?"] = ""; $a->strings["Submit"] = "Senda inn"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = ""; diff --git a/gnot/lang/it/messages.po b/gnot/lang/it/messages.po index 45649f78d..e8ea90055 100644 --- a/gnot/lang/it/messages.po +++ b/gnot/lang/it/messages.po @@ -34,8 +34,8 @@ msgid "" msgstr "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l'oggetto" #: gnot.php:82 -msgid "Enable this plugin/addon?" -msgstr "Abilita questo plugin?" +msgid "Enable this addon?" +msgstr "Abilita questo addon?" #: gnot.php:88 msgid "Submit" diff --git a/gnot/lang/it/strings.php b/gnot/lang/it/strings.php index 0c8ef482c..78c368cac 100644 --- a/gnot/lang/it/strings.php +++ b/gnot/lang/it/strings.php @@ -8,6 +8,6 @@ function string_plural_select_it($n){ $a->strings["Gnot settings updated."] = "Impostazioni di \"Gnot\" aggiornate."; $a->strings["Gnot Settings"] = "Impostazioni Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l'oggetto"; -$a->strings["Enable this plugin/addon?"] = "Abilita questo plugin?"; +$a->strings["Enable this addon?"] = "Abilita questo addon?"; $a->strings["Submit"] = "Invia"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notifica] Commento alla conversazione n° %d"; diff --git a/gnot/lang/nb-no/strings.php b/gnot/lang/nb-no/strings.php index d53d82969..4d260d6bb 100644 --- a/gnot/lang/nb-no/strings.php +++ b/gnot/lang/nb-no/strings.php @@ -3,6 +3,6 @@ $a->strings["Gnot settings updated."] = ""; $a->strings["Gnot Settings"] = ""; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = ""; -$a->strings["Enable this plugin/addon?"] = ""; +$a->strings["Enable this addon?"] = ""; $a->strings["Submit"] = "Lagre"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = ""; diff --git a/gnot/lang/pl/strings.php b/gnot/lang/pl/strings.php index 64d9ef8b3..fb58666ef 100644 --- a/gnot/lang/pl/strings.php +++ b/gnot/lang/pl/strings.php @@ -3,6 +3,6 @@ $a->strings["Gnot settings updated."] = ""; $a->strings["Gnot Settings"] = ""; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = ""; -$a->strings["Enable this plugin/addon?"] = "Umożliwić tego plugina/wtyczkę?"; +$a->strings["Enable this addon?"] = "Umożliwić tego addona/wtyczkę?"; $a->strings["Submit"] = "Potwierdź"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = ""; diff --git a/gnot/lang/pt-br/strings.php b/gnot/lang/pt-br/strings.php index 5a0791546..92c97c4b3 100644 --- a/gnot/lang/pt-br/strings.php +++ b/gnot/lang/pt-br/strings.php @@ -3,6 +3,6 @@ $a->strings["Gnot settings updated."] = "As configurações do Gnot foram atualizadas."; $a->strings["Gnot Settings"] = "Configurações do Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite o encadeamento das notificações por e-mail de comentário no GMail, tornando a a linha de assunto anônima."; -$a->strings["Enable this plugin/addon?"] = "Habilitar este plugin/complemento?"; +$a->strings["Enable this addon?"] = "Habilitar este addon/complemento?"; $a->strings["Submit"] = "Enviar"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Comentário na conversa #%d"; diff --git a/gnot/lang/ro/messages.po b/gnot/lang/ro/messages.po index 807f2977b..34de34f8e 100644 --- a/gnot/lang/ro/messages.po +++ b/gnot/lang/ro/messages.po @@ -34,7 +34,7 @@ msgid "" msgstr "Permite înlănțuirea notificărilor prin email a comentariilor, în Gmail și anonimizarea subiectului." #: gnot.php:82 -msgid "Enable this plugin/addon?" +msgid "Enable this addon?" msgstr "Activați acest modul/supliment?" #: gnot.php:88 diff --git a/gnot/lang/ro/strings.php b/gnot/lang/ro/strings.php index 764be84e0..a3641f4e5 100644 --- a/gnot/lang/ro/strings.php +++ b/gnot/lang/ro/strings.php @@ -8,6 +8,6 @@ function string_plural_select_ro($n){ $a->strings["Gnot settings updated."] = "Configurările Gnot au fost actualizate."; $a->strings["Gnot Settings"] = "Configurări Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite înlănțuirea notificărilor prin email a comentariilor, în Gmail și anonimizarea subiectului."; -$a->strings["Enable this plugin/addon?"] = "Activați acest modul/supliment?"; +$a->strings["Enable this addon?"] = "Activați acest modul/supliment?"; $a->strings["Submit"] = "Trimite"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notificare] Comentariu la conversația # %d"; diff --git a/gnot/lang/ru/messages.po b/gnot/lang/ru/messages.po index ff2dc4601..9e63af419 100644 --- a/gnot/lang/ru/messages.po +++ b/gnot/lang/ru/messages.po @@ -34,7 +34,7 @@ msgid "" msgstr "Разрешить нитевание уведомлений о комментариях на Gmail и анонимизировать поле \"Тема\"." #: gnot.php:82 -msgid "Enable this plugin/addon?" +msgid "Enable this addon?" msgstr "Включить этот плагин/аддон?" #: gnot.php:88 diff --git a/gnot/lang/ru/strings.php b/gnot/lang/ru/strings.php index 45510f700..53d6583b2 100644 --- a/gnot/lang/ru/strings.php +++ b/gnot/lang/ru/strings.php @@ -8,6 +8,6 @@ function string_plural_select_ru($n){ $a->strings["Gnot settings updated."] = "Настройки Gnot обновлены."; $a->strings["Gnot Settings"] = "Настройки Gnot"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Разрешить нитевание уведомлений о комментариях на Gmail и анонимизировать поле \"Тема\"."; -$a->strings["Enable this plugin/addon?"] = "Включить этот плагин/аддон?"; +$a->strings["Enable this addon?"] = "Включить этот плагин/аддон?"; $a->strings["Submit"] = "Добавить"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Комментарий в теме #%d"; diff --git a/gnot/lang/zh-cn/strings.php b/gnot/lang/zh-cn/strings.php index ddb0d85da..3f7ba8f91 100644 --- a/gnot/lang/zh-cn/strings.php +++ b/gnot/lang/zh-cn/strings.php @@ -3,6 +3,6 @@ $a->strings["Gnot settings updated."] = "Gnot设置更新了。"; $a->strings["Gnot Settings"] = "Gnot设置"; $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "允许邮件评论通知在Gmail和匿名话题行。"; -$a->strings["Enable this plugin/addon?"] = "使这个插件／加件可用？"; +$a->strings["Enable this addon?"] = "使这个插件／加件可用？"; $a->strings["Submit"] = "提交"; $a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify]评论在交流#%d"; diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php index f5b573ac5..e294c8e0e 100644 --- a/googlemaps/googlemaps.php +++ b/googlemaps/googlemaps.php @@ -6,19 +6,19 @@ * Author: Michael Vogel * */ - +use Friendica\Core\Addon; use Friendica\Core\Cache; function googlemaps_install() { - register_hook('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location'); + Addon::registerHook('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location'); logger("installed googlemaps"); } function googlemaps_uninstall() { - unregister_hook('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location'); + Addon::unregisterHook('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location'); logger("removed googlemaps"); } diff --git a/gravatar/README.md b/gravatar/README.md index ff209b0e0..0145570b7 100644 --- a/gravatar/README.md +++ b/gravatar/README.md @@ -1,4 +1,4 @@ -# Gravatar Plugin +# Gravatar Addon by [Klaus Weidenbach](http://friendica.dszdw.net/profile/klaus) This addon allows you to look up an avatar image for new users and contacts at [Gravatar](http://www.gravatar.com). This will be used if there have not been found any other avatar images yet for example through OpenID. diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index e38fb6136..840b361b4 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -1,27 +1,27 @@ */ - +use Friendica\Core\Addon; use Friendica\Core\Config; /** - * Installs the plugin hook + * Installs the addon hook */ function gravatar_install() { - register_hook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup'); + Addon::registerHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup'); logger("registered gravatar in avatar_lookup hook"); } /** - * Removes the plugin hook + * Removes the addon hook */ function gravatar_uninstall() { - unregister_hook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup'); + Addon::unregisterHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup'); logger("unregistered gravatar in avatar_lookup hook"); } @@ -56,7 +56,7 @@ function gravatar_lookup($a, &$b) { /** * Display admin settings for this addon */ -function gravatar_plugin_admin (&$a, &$o) { +function gravatar_addon_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/gravatar/" ); $default_avatar = Config::get('gravatar', 'default_img'); @@ -103,7 +103,7 @@ function gravatar_plugin_admin (&$a, &$o) { /** * Save admin settings */ -function gravatar_plugin_admin_post (&$a) { +function gravatar_addon_admin_post (&$a) { check_form_security_token('gravatarsave'); $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon'); diff --git a/group_text/group_text.php b/group_text/group_text.php index febb87a7a..d5163e739 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -4,16 +4,14 @@ * Description: Disable images in group edit menu * Version: 1.0 * Author: Thomas Willingham - * - * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function group_text_install() { - register_hook('plugin_settings', 'addon/group_text/group_text.php', 'group_text_settings'); - register_hook('plugin_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post'); + Addon::registerHook('addon_settings', 'addon/group_text/group_text.php', 'group_text_settings'); + Addon::registerHook('addon_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post'); logger("installed group_text"); } @@ -21,8 +19,8 @@ function group_text_install() { function group_text_uninstall() { - unregister_hook('plugin_settings', 'addon/group_text/group_text.php', 'group_text_settings'); - unregister_hook('plugin_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post'); + Addon::unregisterHook('addon_settings', 'addon/group_text/group_text.php', 'group_text_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post'); logger("removed group_text"); @@ -50,7 +48,7 @@ function group_text_settings_post($a,$post) { /** * - * Called from the Plugin Setting form. + * Called from the Addon Setting form. * Add our own settings info to the page. * */ diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 8a457df37..40cc5250c 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -11,19 +11,20 @@ require_once 'include/items.php'; require_once 'include/text.php'; use Friendica\App; +use Friendica\Core\Addon; use Friendica\Core\PConfig; use Friendica\Database\DBM; function ifttt_install() { - register_hook('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings'); - register_hook('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post'); + Addon::registerHook('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings'); + Addon::registerHook('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post'); } function ifttt_uninstall() { - unregister_hook('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings'); - unregister_hook('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post'); + Addon::unregisterHook('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post'); } function ifttt_module() diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index ccd45fcaf..6df040fe8 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -1,5 +1,4 @@ */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function ijpost_install() { - register_hook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); - register_hook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); - register_hook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); - register_hook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); - register_hook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); + Addon::registerHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); + Addon::registerHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); + Addon::registerHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); + Addon::registerHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); + Addon::registerHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); } function ijpost_uninstall() { - unregister_hook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); - unregister_hook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); - unregister_hook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); - unregister_hook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); - unregister_hook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); + Addon::unregisterHook('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); + Addon::unregisterHook('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); } @@ -76,7 +75,7 @@ function ijpost_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/ijpost/lang/C/messages.po b/ijpost/lang/C/messages.po index 4f62c23ae..33e9c31aa 100644 --- a/ijpost/lang/C/messages.po +++ b/ijpost/lang/C/messages.po @@ -26,7 +26,7 @@ msgid "InsaneJournal Post Settings" msgstr "" #: ijpost.php:72 -msgid "Enable InsaneJournal Post Plugin" +msgid "Enable InsaneJournal Post Addon" msgstr "" #: ijpost.php:77 diff --git a/ijpost/lang/ca/strings.php b/ijpost/lang/ca/strings.php index b53826151..a1f796d6f 100644 --- a/ijpost/lang/ca/strings.php +++ b/ijpost/lang/ca/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Insanejournal"] = "Enviament a Insanejournal"; $a->strings["InsaneJournal Post Settings"] = "Ajustos d'Enviament a Insanejournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Habilita el Plugin d'Enviaments a Insanejournal"; +$a->strings["Enable InsaneJournal Post Addon"] = "Habilita el Addon d'Enviaments a Insanejournal"; $a->strings["InsaneJournal username"] = "Nom d'usuari de Insanejournal"; $a->strings["InsaneJournal password"] = "Contrasenya de Insanejournal"; $a->strings["Post to InsaneJournal by default"] = "Enviar per defecte a Insanejournal"; diff --git a/ijpost/lang/cs/messages.po b/ijpost/lang/cs/messages.po index 491112fb6..dd273de41 100644 --- a/ijpost/lang/cs/messages.po +++ b/ijpost/lang/cs/messages.po @@ -28,8 +28,8 @@ msgid "InsaneJournal Post Settings" msgstr "Nastavení příspěvků pro InsaneJournal" #: ijpost.php:72 -msgid "Enable InsaneJournal Post Plugin" -msgstr "Povolit Insanejournal plugin" +msgid "Enable InsaneJournal Post Addon" +msgstr "Povolit Insanejournal addon" #: ijpost.php:77 msgid "InsaneJournal username" diff --git a/ijpost/lang/cs/strings.php b/ijpost/lang/cs/strings.php index 157e6a8e7..4f4fec366 100644 --- a/ijpost/lang/cs/strings.php +++ b/ijpost/lang/cs/strings.php @@ -7,7 +7,7 @@ function string_plural_select_cs($n){ ; $a->strings["Post to Insanejournal"] = "Odeslat na Insanejournal"; $a->strings["InsaneJournal Post Settings"] = "Nastavení příspěvků pro InsaneJournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Povolit Insanejournal plugin"; +$a->strings["Enable InsaneJournal Post Addon"] = "Povolit Insanejournal addon"; $a->strings["InsaneJournal username"] = "Insanejournal uživatelské jméno"; $a->strings["InsaneJournal password"] = "Insanejournal heslo"; $a->strings["Post to InsaneJournal by default"] = "Defaultně zasílat příspěvky na InsaneJournal"; diff --git a/ijpost/lang/de/messages.po b/ijpost/lang/de/messages.po index 6d3897ebe..35101521d 100644 --- a/ijpost/lang/de/messages.po +++ b/ijpost/lang/de/messages.po @@ -29,8 +29,8 @@ msgid "InsaneJournal Post Settings" msgstr "InsaneJournal Beitrags-Einstellungen" #: ijpost.php:72 -msgid "Enable InsaneJournal Post Plugin" -msgstr "InsaneJournal Plugin aktivieren" +msgid "Enable InsaneJournal Post Addon" +msgstr "InsaneJournal Addon aktivieren" #: ijpost.php:77 msgid "InsaneJournal username" diff --git a/ijpost/lang/de/strings.php b/ijpost/lang/de/strings.php index e256daecb..3b8dbb6d8 100644 --- a/ijpost/lang/de/strings.php +++ b/ijpost/lang/de/strings.php @@ -7,7 +7,7 @@ function string_plural_select_de($n){ ; $a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten."; $a->strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen"; -$a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren"; +$a->strings["Enable InsaneJournal Post Addon"] = "InsaneJournal Addon aktivieren"; $a->strings["InsaneJournal username"] = "InsaneJournal Benutzername"; $a->strings["InsaneJournal password"] = "InsaneJournal Passwort"; $a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten."; diff --git a/ijpost/lang/eo/strings.php b/ijpost/lang/eo/strings.php index 116988871..bab5fc08b 100644 --- a/ijpost/lang/eo/strings.php +++ b/ijpost/lang/eo/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Insanejournal"] = "Afiŝi al Insanejournal"; $a->strings["InsaneJournal Post Settings"] = "Agordoj pri Insaenejournal Afiŝoj"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Ŝalti la InsaneJournal afiŝo kromprogramon."; +$a->strings["Enable InsaneJournal Post Addon"] = "Ŝalti la InsaneJournal afiŝo kromprogramon."; $a->strings["InsaneJournal username"] = "Salutnomo ĉe InsaneJournal"; $a->strings["InsaneJournal password"] = "Pasvorto ĉe InsaneJournal"; $a->strings["Post to InsaneJournal by default"] = "Defaŭlte afiŝi ĉe InsaneJournal"; diff --git a/ijpost/lang/es/messages.po b/ijpost/lang/es/messages.po index c4d5c06bf..7aa4e1a8c 100644 --- a/ijpost/lang/es/messages.po +++ b/ijpost/lang/es/messages.po @@ -28,8 +28,8 @@ msgid "InsaneJournal Post Settings" msgstr "Ajustes de Entrada de InsaneJournal" #: ijpost.php:72 -msgid "Enable InsaneJournal Post Plugin" -msgstr "Habilitar el Plugin de Entrada InsaneJournal" +msgid "Enable InsaneJournal Post Addon" +msgstr "Habilitar el Addon de Entrada InsaneJournal" #: ijpost.php:77 msgid "InsaneJournal username" diff --git a/ijpost/lang/es/strings.php b/ijpost/lang/es/strings.php index db51f3722..76c9e5f94 100644 --- a/ijpost/lang/es/strings.php +++ b/ijpost/lang/es/strings.php @@ -7,7 +7,7 @@ function string_plural_select_es($n){ ; $a->strings["Post to Insanejournal"] = "Publicar en Insanejournal"; $a->strings["InsaneJournal Post Settings"] = "Ajustes de Entrada de InsaneJournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Habilitar el Plugin de Entrada InsaneJournal"; +$a->strings["Enable InsaneJournal Post Addon"] = "Habilitar el Addon de Entrada InsaneJournal"; $a->strings["InsaneJournal username"] = "Nombre de usuario InsaneJournal"; $a->strings["InsaneJournal password"] = "Contraseña de InsaneJournal"; $a->strings["Post to InsaneJournal by default"] = "Publicar en InsaneJournal por defecto"; diff --git a/ijpost/lang/fr/strings.php b/ijpost/lang/fr/strings.php index 7db58ccf9..398e3c623 100644 --- a/ijpost/lang/fr/strings.php +++ b/ijpost/lang/fr/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Insanejournal"] = "Publier vers InsaneJournal"; $a->strings["InsaneJournal Post Settings"] = "Réglages InsaneJournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Activer le connecteur InsaneJournal"; +$a->strings["Enable InsaneJournal Post Addon"] = "Activer le connecteur InsaneJournal"; $a->strings["InsaneJournal username"] = "Utilisateur InsaneJournal"; $a->strings["InsaneJournal password"] = "Mot de passe InsaneJournal"; $a->strings["Post to InsaneJournal by default"] = "Publier sur InsaneJournal par défaut"; diff --git a/ijpost/lang/is/strings.php b/ijpost/lang/is/strings.php index b79f347ef..3dffb3207 100644 --- a/ijpost/lang/is/strings.php +++ b/ijpost/lang/is/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Insanejournal"] = ""; $a->strings["InsaneJournal Post Settings"] = ""; -$a->strings["Enable InsaneJournal Post Plugin"] = ""; +$a->strings["Enable InsaneJournal Post Addon"] = ""; $a->strings["InsaneJournal username"] = ""; $a->strings["InsaneJournal password"] = ""; $a->strings["Post to InsaneJournal by default"] = ""; diff --git a/ijpost/lang/it/messages.po b/ijpost/lang/it/messages.po index aba068467..79578b34b 100644 --- a/ijpost/lang/it/messages.po +++ b/ijpost/lang/it/messages.po @@ -28,8 +28,8 @@ msgid "InsaneJournal Post Settings" msgstr "Impostazioni post InsaneJournal" #: ijpost.php:72 -msgid "Enable InsaneJournal Post Plugin" -msgstr "Abilita il plugin di invio a InsaneJournal" +msgid "Enable InsaneJournal Post Addon" +msgstr "Abilita iladdondi invio a InsaneJournal" #: ijpost.php:77 msgid "InsaneJournal username" diff --git a/ijpost/lang/it/strings.php b/ijpost/lang/it/strings.php index 73e8bed46..2f26bb932 100644 --- a/ijpost/lang/it/strings.php +++ b/ijpost/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to Insanejournal"] = "Invia a InsaneJournal"; $a->strings["InsaneJournal Post Settings"] = "Impostazioni post InsaneJournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Abilita il plugin di invio a InsaneJournal"; +$a->strings["Enable InsaneJournal Post Addon"] = "Abilita il addon di invio a InsaneJournal"; $a->strings["InsaneJournal username"] = "Nome utente InsaneJournal"; $a->strings["InsaneJournal password"] = "Password InsaneJournal"; $a->strings["Post to InsaneJournal by default"] = "Invia sempre a InsaneJournal"; diff --git a/ijpost/lang/nb-no/strings.php b/ijpost/lang/nb-no/strings.php index 2eaa62e35..4b616bcd8 100644 --- a/ijpost/lang/nb-no/strings.php +++ b/ijpost/lang/nb-no/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Insanejournal"] = ""; $a->strings["InsaneJournal Post Settings"] = ""; -$a->strings["Enable InsaneJournal Post Plugin"] = ""; +$a->strings["Enable InsaneJournal Post Addon"] = ""; $a->strings["InsaneJournal username"] = ""; $a->strings["InsaneJournal password"] = ""; $a->strings["Post to InsaneJournal by default"] = ""; diff --git a/ijpost/lang/pl/strings.php b/ijpost/lang/pl/strings.php index 5b6ec6743..e3f180595 100644 --- a/ijpost/lang/pl/strings.php +++ b/ijpost/lang/pl/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Insanejournal"] = "Opublikuj na Insanejournal"; $a->strings["InsaneJournal Post Settings"] = ""; -$a->strings["Enable InsaneJournal Post Plugin"] = ""; +$a->strings["Enable InsaneJournal Post Addon"] = ""; $a->strings["InsaneJournal username"] = ""; $a->strings["InsaneJournal password"] = ""; $a->strings["Post to InsaneJournal by default"] = ""; diff --git a/ijpost/lang/pt-br/messages.po b/ijpost/lang/pt-br/messages.po index 40f4f6dfe..b3f799bd8 100644 --- a/ijpost/lang/pt-br/messages.po +++ b/ijpost/lang/pt-br/messages.po @@ -28,7 +28,7 @@ msgid "InsaneJournal Post Settings" msgstr "Configurações de publicação no InsaneJournal" #: ijpost.php:72 -msgid "Enable InsaneJournal Post Plugin" +msgid "Enable InsaneJournal Post Addon" msgstr "Habilitar plug-in para publicar no InsaneJournal" #: ijpost.php:77 diff --git a/ijpost/lang/pt-br/strings.php b/ijpost/lang/pt-br/strings.php index b48f4dece..fbc1f2840 100644 --- a/ijpost/lang/pt-br/strings.php +++ b/ijpost/lang/pt-br/strings.php @@ -7,7 +7,7 @@ function string_plural_select_pt_br($n){ ; $a->strings["Post to Insanejournal"] = "Publicar no Insanejournal"; $a->strings["InsaneJournal Post Settings"] = "Configurações de publicação no InsaneJournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Habilitar plug-in para publicar no InsaneJournal"; +$a->strings["Enable InsaneJournal Post Addon"] = "Habilitar plug-in para publicar no InsaneJournal"; $a->strings["InsaneJournal username"] = "Nome de usuário no InsaneJournal"; $a->strings["InsaneJournal password"] = "Senha do InsaneJournal"; $a->strings["Post to InsaneJournal by default"] = "Publicar no InsaneJournal por padrão"; diff --git a/ijpost/lang/ro/messages.po b/ijpost/lang/ro/messages.po index 5743743a3..c37bed7ea 100644 --- a/ijpost/lang/ro/messages.po +++ b/ijpost/lang/ro/messages.po @@ -28,7 +28,7 @@ msgid "InsaneJournal Post Settings" msgstr "Configurări Postări Insaneournal" #: ijpost.php:72 -msgid "Enable InsaneJournal Post Plugin" +msgid "Enable InsaneJournal Post Addon" msgstr "Activare Modul Postare InsaneJournal" #: ijpost.php:77 diff --git a/ijpost/lang/ro/strings.php b/ijpost/lang/ro/strings.php index a42334608..35d64ea6c 100644 --- a/ijpost/lang/ro/strings.php +++ b/ijpost/lang/ro/strings.php @@ -7,7 +7,7 @@ function string_plural_select_ro($n){ ; $a->strings["Post to Insanejournal"] = "Postare pe Insanejournal"; $a->strings["InsaneJournal Post Settings"] = "Configurări Postări Insaneournal"; -$a->strings["Enable InsaneJournal Post Plugin"] = "Activare Modul Postare InsaneJournal"; +$a->strings["Enable InsaneJournal Post Addon"] = "Activare Modul Postare InsaneJournal"; $a->strings["InsaneJournal username"] = "Utilizator InsaneJournal "; $a->strings["InsaneJournal password"] = "Parolă InsaneJournal "; $a->strings["Post to InsaneJournal by default"] = "Postați implicit pe InsaneJournal "; diff --git a/ijpost/lang/ru/strings.php b/ijpost/lang/ru/strings.php index 0109f8a60..dc869896c 100644 --- a/ijpost/lang/ru/strings.php +++ b/ijpost/lang/ru/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Insanejournal"] = ""; $a->strings["InsaneJournal Post Settings"] = ""; -$a->strings["Enable InsaneJournal Post Plugin"] = "Включить InsaneJournal плагин сообщений"; +$a->strings["Enable InsaneJournal Post Addon"] = "Включить InsaneJournal плагин сообщений"; $a->strings["InsaneJournal username"] = ""; $a->strings["InsaneJournal password"] = ""; $a->strings["Post to InsaneJournal by default"] = ""; diff --git a/ijpost/lang/zh-cn/strings.php b/ijpost/lang/zh-cn/strings.php index f2a047123..273451d76 100644 --- a/ijpost/lang/zh-cn/strings.php +++ b/ijpost/lang/zh-cn/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Insanejournal"] = "转播到Insanejournal"; $a->strings["InsaneJournal Post Settings"] = "Insanejournal转播设置"; -$a->strings["Enable InsaneJournal Post Plugin"] = "使InsaneJournal转播插件可用"; +$a->strings["Enable InsaneJournal Post Addon"] = "使InsaneJournal转播插件可用"; $a->strings["InsaneJournal username"] = "InsaneJournal用户名"; $a->strings["InsaneJournal password"] = "InsaneJournal密码"; $a->strings["Post to InsaneJournal by default"] = "默认地转播到InsaneJournal"; diff --git a/impressum/README.md b/impressum/README.md index cf420ba10..963a085e2 100644 --- a/impressum/README.md +++ b/impressum/README.md @@ -1,4 +1,4 @@ -Impressum Plugin for Friendica +Impressum Addon for Friendica ============================== * Author: Tobias Diekershoff @@ -7,7 +7,7 @@ Impressum Plugin for Friendica About ----- -This plugin adds an Impressum (contact) block to the /friendica page with +This addon adds an Impressum (contact) block to the /friendica page with informations about the page operator/owner and how to contact you in case of any questions. @@ -16,7 +16,7 @@ normal friendica postings.. Configuration ------------- -Simply fill in the fields in the impressium settings page in the plugins +Simply fill in the fields in the impressium settings page in the addons area of your admin panel. For email adresses the "@" symbol will be obfuscated in the source of the page to make in harder for harvesting tools. diff --git a/impressum/impressum.php b/impressum/impressum.php index 75103dd1e..df508868d 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -1,7 +1,7 @@ * License: 3-clause BSD license @@ -10,18 +10,19 @@ require_once('include/bbcode.php'); require_once('mod/proxy.php'); +use Friendica\Core\Addon; use Friendica\Core\Config; function impressum_install() { - register_hook('about_hook', 'addon/impressum/impressum.php', 'impressum_show'); - register_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer'); - logger("installed impressum plugin"); + Addon::registerHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show'); + Addon::registerHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer'); + logger("installed impressum Addon"); } function impressum_uninstall() { - unregister_hook('about_hook', 'addon/impressum/impressum.php', 'impressum_show'); - unregister_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer'); - logger("uninstalled impressum plugin"); + Addon::unregisterHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show'); + Addon::unregisterHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer'); + logger("uninstalled impressum Addon"); } function impressum_module() { @@ -73,7 +74,7 @@ function impressum_show($a,&$b) { } } -function impressum_plugin_admin_post (&$a) { +function impressum_addon_admin_post (&$a) { $owner = ((x($_POST, 'owner')) ? notags(trim($_POST['owner'])) : ''); $ownerprofile = ((x($_POST, 'ownerprofile')) ? notags(trim($_POST['ownerprofile'])) : ''); $postal = ((x($_POST, 'postal')) ? (trim($_POST['postal'])) : ''); @@ -88,7 +89,7 @@ function impressum_plugin_admin_post (&$a) { Config::set('impressum','footer_text',strip_tags($footer_text)); info( t('Settings updated.'). EOL ); } -function impressum_plugin_admin (&$a, &$o) { +function impressum_addon_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/impressum/" ); $o = replace_macros($t, [ '$submit' => t('Save Settings'), diff --git a/impressum/lang/de/messages.po b/impressum/lang/de/messages.po index 1a73058ae..11d4a5128 100644 --- a/impressum/lang/de/messages.po +++ b/impressum/lang/de/messages.po @@ -41,7 +41,7 @@ msgid "" "The impressum addon needs to be configured!
Please add at least the " "owner variable to your config file. For other variables please " "refer to the README file of the addon." -msgstr "Das Impressums-Plugin muss noch konfiguriert werden.
Bitte gebe mindestens den Betreiber in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert." +msgstr "Das Impressums-Addon muss noch konfiguriert werden.
Bitte gebe mindestens den Betreiber in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert." #: impressum.php:78 msgid "Settings updated." diff --git a/impressum/lang/de/strings.php b/impressum/lang/de/strings.php index 66acf0973..0cf1a4aea 100644 --- a/impressum/lang/de/strings.php +++ b/impressum/lang/de/strings.php @@ -9,7 +9,7 @@ $a->strings["Impressum"] = "Impressum"; $a->strings["Site Owner"] = "Betreiber der Seite"; $a->strings["Email Address"] = "Email Adresse"; $a->strings["Postal Address"] = "Postalische Anschrift"; -$a->strings["The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "Das Impressums-Plugin muss noch konfiguriert werden.
Bitte gebe mindestens den Betreiber in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert."; +$a->strings["The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "Das Impressums-Addon muss noch konfiguriert werden.
Bitte gebe mindestens den Betreiber in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert."; $a->strings["Settings updated."] = "Einstellungen aktualisiert."; $a->strings["Submit"] = "Senden"; $a->strings["The page operators name."] = "Name des Server-Administrators"; diff --git a/impressum/lang/it/messages.po b/impressum/lang/it/messages.po index ae430ef41..5fafbbcaa 100644 --- a/impressum/lang/it/messages.po +++ b/impressum/lang/it/messages.po @@ -40,7 +40,7 @@ msgid "" "The impressum addon needs to be configured!
Please add at least the " "owner variable to your config file. For other variables please " "refer to the README file of the addon." -msgstr "Il plugin Colophon deve essere configurato!
Aggiungi almeno il Proprietario del sito." +msgstr "IladdonColophon deve essere configurato!
Aggiungi almeno il Proprietario del sito." #: impressum.php:78 msgid "Settings updated." diff --git a/impressum/lang/it/strings.php b/impressum/lang/it/strings.php index 25f3b1bea..ce51610f9 100644 --- a/impressum/lang/it/strings.php +++ b/impressum/lang/it/strings.php @@ -9,7 +9,7 @@ $a->strings["Impressum"] = "Colophon"; $a->strings["Site Owner"] = "Proprietario del sito"; $a->strings["Email Address"] = "Indirizzo email"; $a->strings["Postal Address"] = "Indirizzo"; -$a->strings["The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "Il plugin Colophon deve essere configurato!
Aggiungi almeno il Proprietario del sito."; +$a->strings["The impressum addon needs to be configured!
Please add at least the owner variable to your config file. For other variables please refer to the README file of the addon."] = "Il addon Colophon deve essere configurato!
Aggiungi almeno il Proprietario del sito."; $a->strings["Settings updated."] = "Impostazioni aggiornate."; $a->strings["Submit"] = "Invia"; $a->strings["The page operators name."] = "Nome del gestore della pagina."; diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php index 5e46b3b7b..cdadf030c 100644 --- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php +++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php @@ -5,13 +5,14 @@ * Version: 1.0 * Author: Thomas Willingham */ +use Friendica\Core\Addon; function infiniteimprobabilitydrive_install() { -register_hook('app_menu', 'addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php', 'infiniteimprobabilitydrive_app_menu'); +Addon::registerHook('app_menu', 'addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php', 'infiniteimprobabilitydrive_app_menu'); } function infiniteimprobabilitydrive_uninstall() { -unregister_hook('app_menu', 'addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php', 'infiniteimprobabilitydrive_app_menu'); +Addon::unregisterHook('app_menu', 'addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php', 'infiniteimprobabilitydrive_app_menu'); } diff --git a/irc/irc.php b/irc/irc.php index cfede034d..288f65ca8 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -1,24 +1,24 @@ * Author: Tobias Diekershoff */ - +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; function irc_install() { - register_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu'); - register_hook('plugin_settings', 'addon/irc/irc.php', 'irc_addon_settings'); - register_hook('plugin_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post'); + Addon::registerHook('app_menu', 'addon/irc/irc.php', 'irc_app_menu'); + Addon::registerHook('addon_settings', 'addon/irc/irc.php', 'irc_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post'); } function irc_uninstall() { - unregister_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu'); - unregister_hook('plugin_settings', 'addon/irc/irc.php', 'irc_addon_settings'); + Addon::unregisterHook('app_menu', 'addon/irc/irc.php', 'irc_app_menu'); + Addon::unregisterHook('addon_settings', 'addon/irc/irc.php', 'irc_addon_settings'); } @@ -120,7 +120,7 @@ return $o; } -function irc_plugin_admin_post (&$a) { +function irc_addon_admin_post (&$a) { if(! is_site_admin()) return; @@ -131,7 +131,7 @@ function irc_plugin_admin_post (&$a) { info( t('IRC settings saved.') . EOL); } } -function irc_plugin_admin (&$a, &$o) { +function irc_addon_admin (&$a, &$o) { $sitechats = Config::get('irc','sitechats'); /* popular channels */ $autochans = Config::get('irc','autochans'); /* auto connect chans */ $t = get_markup_template( "admin.tpl", "addon/irc/" ); diff --git a/jappixmini/README b/jappixmini/README index f21649be7..0343d060b 100644 --- a/jappixmini/README +++ b/jappixmini/README @@ -1,10 +1,10 @@ -Jappix Mini Plugin +Jappix Mini Addon ================== This quick-and-dirty addon allows you to add a Jabber-based, Facebook-like chat to Friendica. It uses Jappix Mini. -It is necessary to use a BOSH host - so to use this plugin, each users need to +It is necessary to use a BOSH host - so to use this addon, each users need to know the address of a BOSH host that works with his account. The BOSH server of the Jappix project (https://bind.jappix.com/) is not locked to a specific XMPP provider, but keep in mind that only personal usage is approved according to diff --git a/jappixmini/jappix/js/adhoc.js b/jappixmini/jappix/js/adhoc.js index d4e3bf4c2..499d709f3 100644 --- a/jappixmini/jappix/js/adhoc.js +++ b/jappixmini/jappix/js/adhoc.js @@ -78,7 +78,7 @@ function serverAdHoc(server) { dataForm(server, 'command', '', '', 'adhoc'); } -// Plugin launcher +// Addon launcher function launchAdHoc() { // Click event $('#adhoc .bottom .finish').click(closeAdHoc); diff --git a/jappixmini/jappix/js/anonymous.js b/jappixmini/jappix/js/anonymous.js index 88eaa7dc3..af4ecb596 100644 --- a/jappixmini/jappix/js/anonymous.js +++ b/jappixmini/jappix/js/anonymous.js @@ -110,7 +110,7 @@ function anonymousLogin(server) { } } -// Plugin launcher +// Addon launcher function launchAnonymous() { logThis('Anonymous mode detected, connecting...', 3); @@ -127,5 +127,5 @@ function launchAnonymous() { anonymousLogin(HOST_ANONYMOUS); } -// Launch this plugin! +// Launch this addon! $(document).ready(launchAnonymous); diff --git a/jappixmini/jappix/js/archives.js b/jappixmini/jappix/js/archives.js index 387a379fa..e6a08029d 100644 --- a/jappixmini/jappix/js/archives.js +++ b/jappixmini/jappix/js/archives.js @@ -393,7 +393,7 @@ function updateArchives() { getListArchives(xid, date); } -// Plugin launcher +// Addon launcher function launchArchives() { // Current date var current_date = explodeThis('T', getXMPPTime(), 0); diff --git a/jappixmini/jappix/js/connection.js b/jappixmini/jappix/js/connection.js index 85a718c5f..afd1f6e8b 100644 --- a/jappixmini/jappix/js/connection.js +++ b/jappixmini/jappix/js/connection.js @@ -489,7 +489,7 @@ function getEverything() { getStorage(NS_ROSTERNOTES); } -// Plugin launcher +// Addon launcher function launchConnection() { // Logouts when Jappix is closed $(window).bind('beforeunload', terminate); @@ -522,5 +522,5 @@ function launchConnection() { } } -// Launch this plugin! +// Launch this addon! $(document).ready(launchConnection); diff --git a/jappixmini/jappix/js/directory.js b/jappixmini/jappix/js/directory.js index ebe1a5707..d1f69492e 100644 --- a/jappixmini/jappix/js/directory.js +++ b/jappixmini/jappix/js/directory.js @@ -66,7 +66,7 @@ function startDirectory() { return false; } -// Plugin launcher +// Addon launcher function launchDirectory() { // Click event $('#directory .bottom .finish').click(closeDirectory); diff --git a/jappixmini/jappix/js/discovery.js b/jappixmini/jappix/js/discovery.js index 867037b2c..f4bc0d426 100644 --- a/jappixmini/jappix/js/discovery.js +++ b/jappixmini/jappix/js/discovery.js @@ -148,7 +148,7 @@ function cleanDiscovery() { $('#discovery .wait, #discovery .disco-category').hide(); } -// Plugin launcher +// Addon launcher function launchDiscovery() { // Click event $('#discovery .bottom .finish').click(closeDiscovery); diff --git a/jappixmini/jappix/js/favorites.js b/jappixmini/jappix/js/favorites.js index 69a042e84..0b4f1cb0e 100644 --- a/jappixmini/jappix/js/favorites.js +++ b/jappixmini/jappix/js/favorites.js @@ -473,7 +473,7 @@ function loadFavorites() { $('#favorites .fedit-head-select').html(favorites_popup); } -// Plugin launcher +// Addon launcher function launchFavorites() { var path = '#favorites .'; diff --git a/jappixmini/jappix/js/home.js b/jappixmini/jappix/js/home.js index 5322501d3..fdaba56b9 100644 --- a/jappixmini/jappix/js/home.js +++ b/jappixmini/jappix/js/home.js @@ -288,7 +288,7 @@ function registerForm() { return false; } -// Plugin launcher +// Addon launcher function launchHome() { // Define the vars var home = '#home '; @@ -367,5 +367,5 @@ function launchHome() { logThis('Welcome to Jappix! Happy coding in developer mode!'); } -// Launch this plugin! +// Launch this addon! $(document).ready(launchHome); diff --git a/jappixmini/jappix/js/inbox.js b/jappixmini/jappix/js/inbox.js index 9f54cb93a..2fe32730c 100644 --- a/jappixmini/jappix/js/inbox.js +++ b/jappixmini/jappix/js/inbox.js @@ -613,7 +613,7 @@ function handleInboxAttach(responseXML) { $('#inbox .wait').hide(); } -// Plugin launcher +// Addon launcher function launchInbox() { // Define the pats var inbox = '#inbox .'; diff --git a/jappixmini/jappix/js/integratebox.js b/jappixmini/jappix/js/integratebox.js index 214b3d725..6d33df131 100644 --- a/jappixmini/jappix/js/integratebox.js +++ b/jappixmini/jappix/js/integratebox.js @@ -316,13 +316,13 @@ function filterIntegrateBox(data) { return string; } -// Plugin launcher +// Addon launcher function launchIntegratebox() { // Click event $('#integratebox .bottom .finish.close').click(closeIntegrateBox); } -// Plugin keyup event +// Addon keyup event $(document).keyup(function(e) { // Previous item? if((exists('#integratebox .bottom .finish.previous:not(.disabled)')) && (e.keyCode == 37)) { diff --git a/jappixmini/jappix/js/interface.js b/jappixmini/jappix/js/interface.js index e4a0db52e..5fe6593bc 100644 --- a/jappixmini/jappix/js/interface.js +++ b/jappixmini/jappix/js/interface.js @@ -376,11 +376,11 @@ function inputFocus() { }); } -// Plugin launcher +// Addon launcher function launchInterface() { // Focus on the first visible input $(window).focus(inputFocus); } -// Launch this plugin! +// Launch this addon! $(document).ready(launchInterface); diff --git a/jappixmini/jappix/js/jquery.js b/jappixmini/jappix/js/jquery.js index a4f114586..7b0be75f8 100644 --- a/jappixmini/jappix/js/jquery.js +++ b/jappixmini/jappix/js/jquery.js @@ -1403,7 +1403,7 @@ jQuery.fn.extend({ }); }, - // Based off of the plugin by Clint Helfers, with permission. + // Based off of the addon by Clint Helfers, with permission. // http://blindsignals.com/index.php/2009/07/jquery-delay/ delay: function( time, type ) { time = jQuery.fx ? jQuery.fx.speeds[time] || time : time; diff --git a/jappixmini/jappix/js/jquery.placeholder.js b/jappixmini/jappix/js/jquery.placeholder.js index 834bda64b..d9162f0fa 100644 --- a/jappixmini/jappix/js/jquery.placeholder.js +++ b/jappixmini/jappix/js/jquery.placeholder.js @@ -64,7 +64,7 @@ }); - // plugin code + // addon code $.fn.placeholder = function(opts) { opts = $.extend({},$.placeholder.settings, opts); diff --git a/jappixmini/jappix/js/me.js b/jappixmini/jappix/js/me.js index 5720df341..bc3038057 100644 --- a/jappixmini/jappix/js/me.js +++ b/jappixmini/jappix/js/me.js @@ -51,7 +51,7 @@ function closeMe() { return false; } -// Plugin launcher +// Addon launcher function launchMe() { // Click events $('#me .content a.go').click(function() { diff --git a/jappixmini/jappix/js/microblog.js b/jappixmini/jappix/js/microblog.js index ceff07ab0..5d489081a 100644 --- a/jappixmini/jappix/js/microblog.js +++ b/jappixmini/jappix/js/microblog.js @@ -1430,7 +1430,7 @@ function fromInfosMicroblog(xid, hash) { getMicroblog(xid, hash); } -// Plugin launcher +// Addon launcher function launchMicroblog() { // Keyboard event $('#channel .top input[name=microblog_body]').keyup(function(e) { diff --git a/jappixmini/jappix/js/mini.js b/jappixmini/jappix/js/mini.js index 0bfb80870..112fbb4c7 100644 --- a/jappixmini/jappix/js/mini.js +++ b/jappixmini/jappix/js/mini.js @@ -1543,7 +1543,7 @@ function adaptRosterMini() { jQuery('#jappix_mini div.jm_roster div.jm_buddies').css('max-height', height); } -// Plugin launcher +// Addon launcher function launchMini(autoconnect, show_pane, domain, user, password) { // Save infos to reconnect MINI_DOMAIN = domain; diff --git a/jappixmini/jappix/js/mucadmin.js b/jappixmini/jappix/js/mucadmin.js index 3bee965b1..ca2e89d1f 100644 --- a/jappixmini/jappix/js/mucadmin.js +++ b/jappixmini/jappix/js/mucadmin.js @@ -361,7 +361,7 @@ function saveMucAdmin() { return closeMucAdmin(); } -// Plugin launcher +// Addon launcher function launchMucAdmin() { // Click events $('#mucadmin .bottom .finish').click(function() { diff --git a/jappixmini/jappix/js/music.js b/jappixmini/jappix/js/music.js index f367a2b6e..af86a060c 100644 --- a/jappixmini/jappix/js/music.js +++ b/jappixmini/jappix/js/music.js @@ -244,7 +244,7 @@ function addMusic(id, title, artist, source, duration, uri, mime, type) { return false; } -// Plugin launcher +// Addon launcher function launchMusic() { // When music search string submitted $('.music-content input').keyup(function(e) { diff --git a/jappixmini/jappix/js/notification.js b/jappixmini/jappix/js/notification.js index c0f6c12cd..603d37ad6 100644 --- a/jappixmini/jappix/js/notification.js +++ b/jappixmini/jappix/js/notification.js @@ -412,7 +412,7 @@ function adaptNotifications() { $('.notifications-content .tools-content-subitem').css('max-height', max_height); } -// Plugin launcher +// Addon launcher function launchNotifications() { // Adapt the notifications height adaptNotifications(); diff --git a/jappixmini/jappix/js/options.js b/jappixmini/jappix/js/options.js index 0463af4d3..8f1ea1901 100644 --- a/jappixmini/jappix/js/options.js +++ b/jappixmini/jappix/js/options.js @@ -534,7 +534,7 @@ function loadOptions() { $('#integratemedias').attr('checked', true); } -// Plugin launcher +// Addon launcher function launchOptions() { // Click events $('#options .tab a').click(function() { diff --git a/jappixmini/jappix/js/pep.js b/jappixmini/jappix/js/pep.js index 04f9f1567..2a3ee1ac7 100644 --- a/jappixmini/jappix/js/pep.js +++ b/jappixmini/jappix/js/pep.js @@ -652,7 +652,7 @@ function displayAllPEP(xid) { displayPEP(xid, 'geoloc'); } -// Plugin launcher +// Addon launcher function launchPEP() { // Apply empty values to the PEP database setDB('mood-value', 1, ''); diff --git a/jappixmini/jappix/js/presence.js b/jappixmini/jappix/js/presence.js index 0834209c4..ef5c1c67b 100644 --- a/jappixmini/jappix/js/presence.js +++ b/jappixmini/jappix/js/presence.js @@ -973,7 +973,7 @@ function getUserStatus() { return $('#presence-status').val(); } -// Plugin launcher +// Addon launcher function launchPresence() { // Click event for user presence show $('#my-infos .f-presence a.picker').click(function() { diff --git a/jappixmini/jappix/js/privacy.js b/jappixmini/jappix/js/privacy.js index 01675f7f2..d9cd46b61 100644 --- a/jappixmini/jappix/js/privacy.js +++ b/jappixmini/jappix/js/privacy.js @@ -645,7 +645,7 @@ function enableFormPrivacy(rank) { $('#privacy .privacy-' + rank + ' input, #privacy .privacy-' + rank + ' select').removeAttr('disabled'); } -// Plugin launcher +// Addon launcher function launchPrivacy() { // Click events $('#privacy .bottom .finish').click(closePrivacy); diff --git a/jappixmini/jappix/js/roster.js b/jappixmini/jappix/js/roster.js index 99389a775..4dca501c7 100644 --- a/jappixmini/jappix/js/roster.js +++ b/jappixmini/jappix/js/roster.js @@ -708,7 +708,7 @@ function getGateways() { // Define a global var for buddy list all buddies displayed var BLIST_ALL = false; -// Plugin launcher +// Addon launcher function launchRoster() { // Filtering tool var iFilter = $('#buddy-list .filter input'); diff --git a/jappixmini/jappix/js/rosterx.js b/jappixmini/jappix/js/rosterx.js index 30f0854ca..5cfe11800 100644 --- a/jappixmini/jappix/js/rosterx.js +++ b/jappixmini/jappix/js/rosterx.js @@ -166,7 +166,7 @@ function saveRosterX() { closeRosterX(); } -// Plugin launcher +// Addon launcher function launchRosterX() { // Click events $('#rosterx .bottom .finish').click(function() { diff --git a/jappixmini/jappix/js/talk.js b/jappixmini/jappix/js/talk.js index 7e1320e9f..529de6c7b 100644 --- a/jappixmini/jappix/js/talk.js +++ b/jappixmini/jappix/js/talk.js @@ -13,7 +13,7 @@ Last revision: 06/05/11 // Creates the talkpage events function eventsTalkPage() { - // Launch all associated plugins + // Launch all associated addons launchMicroblog(); launchRoster(); launchPresence(); diff --git a/jappixmini/jappix/js/userinfos.js b/jappixmini/jappix/js/userinfos.js index 35a58fe56..885f3163b 100644 --- a/jappixmini/jappix/js/userinfos.js +++ b/jappixmini/jappix/js/userinfos.js @@ -406,7 +406,7 @@ function getUserInfos(hash, xid, nick, type) { presenceFunnel(xid, hash); } -// Plugin launcher +// Addon launcher function launchUserInfos() { // Click events $('#userinfos .tab a').click(function() { diff --git a/jappixmini/jappix/js/vcard.js b/jappixmini/jappix/js/vcard.js index 6e0fa09a3..f61ca990c 100644 --- a/jappixmini/jappix/js/vcard.js +++ b/jappixmini/jappix/js/vcard.js @@ -566,7 +566,7 @@ function sendVCard() { return false; } -// Plugin launcher +// Addon launcher function launchVCard() { // Focus on the first input $(document).oneTime(10, function() { diff --git a/jappixmini/jappix/js/welcome.js b/jappixmini/jappix/js/welcome.js index 4faf5bd1d..ff1933026 100644 --- a/jappixmini/jappix/js/welcome.js +++ b/jappixmini/jappix/js/welcome.js @@ -269,7 +269,7 @@ function nextWelcome() { return false; } -// Plugin launcher +// Addon launcher function launchWelcome() { // Click events $('#welcome .tab a').click(function() { diff --git a/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po b/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po index c8cc999bc..697e7f2f1 100644 --- a/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "" msgid "The folder is writable, you can continue!" msgstr "" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "" msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po b/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po index 5d7e06d31..6f4a73391 100644 --- a/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "Jappix трябва да може да вписва данни в таз msgid "The folder is writable, you can continue!" msgstr "В тази папка/директория може да се записва, можете да продължите!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "Jappix ви позволява да управлявате и менажирате вашата конфигурация, да инсталирате нови разширения (плъгини) или да потърсите за обновления на програмата (ъпдейти). Затова трябва да създадете администраторска потребителска сметка (акаунт), за да можете да имате достъп до мениджъра с настройките на Jappix." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po b/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po index a1a627224..9063b52de 100644 --- a/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po @@ -1038,8 +1038,8 @@ msgstr "Jappix musí mít oprávnění zapisovat do tohoto adresáře pro vytvo msgid "The folder is writable, you can continue!" msgstr "Do adresáře je povolen zápis, můžete pokračovat!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." -msgstr "Jappix vám úmožňuje spravovat vaší konfiguraci, instalovat pluginy nebo vyhledávat aktualizace. Proto je nutné si vytvořit účet administrátora ke vstupu do Správy Jappix." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." +msgstr "Jappix vám úmožňuje spravovat vaší konfiguraci, instalovat addony nebo vyhledávat aktualizace. Proto je nutné si vytvořit účet administrátora ke vstupu do Správy Jappix." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." msgstr "Když je Jappix nainstalován, stačí kliknout na odkaz Správce na výchozí stránce pro vstup do Správy. " diff --git a/jappixmini/jappix/lang/de/LC_MESSAGES/main.po b/jappixmini/jappix/lang/de/LC_MESSAGES/main.po index 75dba8f4d..352e9674c 100644 --- a/jappixmini/jappix/lang/de/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/de/LC_MESSAGES/main.po @@ -1038,8 +1038,8 @@ msgstr "Jappix muss Schreibberechtigungen in diesem Ordner haben um sein Unteror msgid "The folder is writable, you can continue!" msgstr "Der Ordner ist schreibbar, du kannst weitermachen!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." -msgstr "Jappix bietet dir die Möglichkeit, deine Konfiguration einzustellen, neue Plugins zu installieren oder nach Updates zu suchen. Deshalb musst Du ein Admin-Account anlegen um auf die Verwaltung zugreifen zu können." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." +msgstr "Jappix bietet dir die Möglichkeit, deine Konfiguration einzustellen, neue Addons zu installieren oder nach Updates zu suchen. Deshalb musst Du ein Admin-Account anlegen um auf die Verwaltung zugreifen zu können." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." msgstr "Wenn Jappix installiert ist, klicke einfach auf den Manager-Link auf der Homepage um darauf zuzugreifen." diff --git a/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot b/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot index 42b5b2c0e..108bb18a7 100644 --- a/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot +++ b/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot @@ -1132,7 +1132,7 @@ msgstr "" msgid "The folder is writable, you can continue!" msgstr "" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "" msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po b/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po index 346aa5e41..8926bdaed 100644 --- a/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "Jappix devas esti kapabla skribi en ĉi tiu teko krei ĝia sub-adresaroj msgid "The folder is writable, you can continue!" msgstr "La dosierujo estas skribebla, vi povas daŭri!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "Jappix ebligas vin administri vian konfiguron, instali novajn kromaĵojn aŭ serĉi ĝisdatigojn. Tio estas kial vi devas krei administrantan konton por aliri la manaĝeron." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/es/LC_MESSAGES/main.po b/jappixmini/jappix/lang/es/LC_MESSAGES/main.po index b9a571411..9716a39e2 100644 --- a/jappixmini/jappix/lang/es/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/es/LC_MESSAGES/main.po @@ -1038,8 +1038,8 @@ msgstr "Jappix debe ser capaz de escribir en esta carpeta para crear sus sub-dir msgid "The folder is writable, you can continue!" msgstr "La carpeta es escribible, ¡puedes continuar!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." -msgstr "Jappix te ofrece la posibilidad de gestionar tu configuración, instalar nuevos plugins y buscar actualizaciones. Por eso tienes que crear una cuenta de administración para acceder al gerente." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." +msgstr "Jappix te ofrece la posibilidad de gestionar tu configuración, instalar nuevos addons y buscar actualizaciones. Por eso tienes que crear una cuenta de administración para acceder al gerente." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." msgstr "Cuando Jappix esté instalado, basta con hacer clic en el enlace de gerente en la página principal para acceder." diff --git a/jappixmini/jappix/lang/et/LC_MESSAGES/main.po b/jappixmini/jappix/lang/et/LC_MESSAGES/main.po index f91ace4cc..b48715a92 100644 --- a/jappixmini/jappix/lang/et/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/et/LC_MESSAGES/main.po @@ -1038,8 +1038,8 @@ msgstr "Jappixil peab olema siia ja alamkataloogidesse kirjutusõigus. Kui see p msgid "The folder is writable, you can continue!" msgstr "Kataloogil on kirjutusõigused, Te võite jätkata!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." -msgstr "Jappix pakub võimalust hallata oma konfiguratsiooni, installida uusi pluginaid või otsida uuendusi. Sellepärast peate te tegema administraatori konto, et haldus lehele ligi pääseda." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." +msgstr "Jappix pakub võimalust hallata oma konfiguratsiooni, installida uusi addonaid või otsida uuendusi. Sellepärast peate te tegema administraatori konto, et haldus lehele ligi pääseda." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." msgstr "Kui Jappix on paigaldatud siis lihtsalt vajutage Haldaja lingile avalehel, et sellele ligi pääseda." diff --git a/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po b/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po index b6771020a..ed3782ca9 100644 --- a/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "" msgid "The folder is writable, you can continue!" msgstr "پوشه قابل ویرایش است. می‌توانید ادامه دهید!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "" msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po b/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po index 38cf556bc..9ae141d30 100644 --- a/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "Jappix doit pouvoir écrire dans ce dossier pour y créer ses sous-répe msgid "The folder is writable, you can continue!" msgstr "Le dossier peut être écrit, vous pouvez continuer !" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "Jappix vous offre la possibilité de gérer votre configuration, installer des nouveaux modules et rechercher des mises à jour. C'est pourquoi vous devez créer un compte administrateur pour accéder au gestionnaire." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po b/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po index 89e515776..1ab5c9591 100644 --- a/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "A Jappix-nak tudnia kell írni ebbe a mappába, hogy létre tudjon hozni msgid "The folder is writable, you can continue!" msgstr "A mappa írható, már folytathatod!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "Jappix felajánlja a lehetőséget, hogy menedzseld a konfigurációd, telepíts új kiegészítőket, vagy keress frissítéseket. Ezért kell létrehoznod egy adminisztrátori fiókot, hogy hozzáférj ezekhez a beállításokhoz." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/id/LC_MESSAGES/main.po b/jappixmini/jappix/lang/id/LC_MESSAGES/main.po index 5c7f5ae56..189a3c948 100644 --- a/jappixmini/jappix/lang/id/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/id/LC_MESSAGES/main.po @@ -1038,8 +1038,8 @@ msgstr "Jappix harus mampu menulis dalam folder ini untuk membuat sub-direktori. msgid "The folder is writable, you can continue!" msgstr "Folder dapat ditulis, anda dapat melanjutkan!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." -msgstr "Jappix menawarkan kemungkinan untuk mengelola konfigurasi anda, menginstal plugin baru atau mencari update. Itulah mengapa anda harus membuat account administrator untuk mengakses manajer." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." +msgstr "Jappix menawarkan kemungkinan untuk mengelola konfigurasi anda, menginstal addon baru atau mencari update. Itulah mengapa anda harus membuat account administrator untuk mengakses manajer." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." msgstr "Ketika Jappix akan diinstal, cukup klik pada link manajer di halaman rumah untuk mengaksesnya." diff --git a/jappixmini/jappix/lang/it/LC_MESSAGES/main.po b/jappixmini/jappix/lang/it/LC_MESSAGES/main.po index 092cc8fb5..a1726a54d 100644 --- a/jappixmini/jappix/lang/it/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/it/LC_MESSAGES/main.po @@ -1038,8 +1038,8 @@ msgstr "Jappix deve avere le autorizzazioni adeguate per scrivere in questa cart msgid "The folder is writable, you can continue!" msgstr "La directory è scrivibile, puoi continuare!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." -msgstr "Jappix ti offre la possibilità controllare la configurazione di Jappix, installare nuove plugins e cercare aggiornamenti. Ecco perchè devi creare un account amministrativo per accedere all'Amministrazione." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." +msgstr "Jappix ti offre la possibilità controllare la configurazione di Jappix, installare nuove addons e cercare aggiornamenti. Ecco perchè devi creare un account amministrativo per accedere all'Amministrazione." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." msgstr "Quando Jappix sarà installato, semplicemente clicca sul link “Amministrazione” nella home page per accedervi." diff --git a/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po b/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po index bc1751f45..b296135f4 100644 --- a/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "サブフォルダを書き込む権限が必要です。%1sに権限を msgid "The folder is writable, you can continue!" msgstr "フォルダは書き込み可能です。続けてください。" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "Jappixは、設定ファイル、新しいプラグイン、アップデートを提供できます。管理者権限でのアクセスが必要です。" msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po b/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po index e85c315cf..9ce3a8564 100644 --- a/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "" msgid "The folder is writable, you can continue!" msgstr "" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "" msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po b/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po index 1f2d62870..f74d43616 100644 --- a/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "" msgid "The folder is writable, you can continue!" msgstr "" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "" msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po b/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po index 58bdb62fc..f0fa0316b 100644 --- a/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po @@ -1038,8 +1038,8 @@ msgstr "Jappix musi mieć możliwość zapisu w tym folderze aby móc stworzyć msgid "The folder is writable, you can continue!" msgstr "Można zapisywać w folderze, możesz kontynuować!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." -msgstr "Jappix oferuje Ci możliwość zarządzania konfiguracją, instalacji nowych pluginów lub sprawdzania aktualizacji. To właśnie dlatego musisz stworzyć konto administratora." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." +msgstr "Jappix oferuje Ci możliwość zarządzania konfiguracją, instalacji nowych addonów lub sprawdzania aktualizacji. To właśnie dlatego musisz stworzyć konto administratora." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." msgstr "Kiedy Jappix będzie już zainstalowany, kliknij w link Menedżer na stronie głównej." diff --git a/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po b/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po index deef5ba81..3541dda44 100644 --- a/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po @@ -1038,8 +1038,8 @@ msgstr "Jappix precisa permissão para escrita nessa pasta. Se não, você preci msgid "The folder is writable, you can continue!" msgstr "Esta pasta possui permissão de escrita, pode continuar!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." -msgstr "Jappix oferece a você a possibilidade de gerenciar suas configurações, instalar novos plugins ou procurar por atulizações. Por isso você deve criar um usuário de administração para acessar o gerenciador." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." +msgstr "Jappix oferece a você a possibilidade de gerenciar suas configurações, instalar novos addons ou procurar por atulizações. Por isso você deve criar um usuário de administração para acessar o gerenciador." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." msgstr "Quando o Jappix for instalado, clique no link do gerenciador, em sua página inicial, para acessá-lo." diff --git a/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po b/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po index 88b4a2d08..8ca7f6503 100644 --- a/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "Jappix должен иметь возможность записыват msgid "The folder is writable, you can continue!" msgstr "Папка доступна для записи, можно продолжать!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "Jabbix позволяет вам управлять конфигурацией, устанавливать новые плагины или проверять обновления. Для доступа к панели управления требуется создать учетную запись администратора." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po b/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po index d9c24be29..846e639b7 100644 --- a/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po @@ -1038,8 +1038,8 @@ msgstr "Jappix musí mať právo zapisovať v tejto zložke pre vytvorenie svoji msgid "The folder is writable, you can continue!" msgstr "Do zložky je možné zapisovať, môžete pokračovať!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." -msgstr "Jappix vám ponúka možnosť spravovať vaše konfiguráciu, inštalovať nové pluginy alebo vyhľadať aktualizácie. Preto si musíte vytvoriť administračný účet pre prístup k Správcovi." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." +msgstr "Jappix vám ponúka možnosť spravovať vaše konfiguráciu, inštalovať nové addony alebo vyhľadať aktualizácie. Preto si musíte vytvoriť administračný účet pre prístup k Správcovi." msgid "When Jappix will be installed, just click on the manager link on the home page to access it." msgstr "Po nainštalovaní Jappix, stačí kliknúť na odkaz Správca na domovskej stránke pre prístup." diff --git a/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po b/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po index d7910185d..255b86f51 100644 --- a/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "" msgid "The folder is writable, you can continue!" msgstr "Mappen är skrivbar -- du kan nu fortsätta!" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "" msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po b/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po index e5a39e0b1..79e8f2ba7 100644 --- a/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "" msgid "The folder is writable, you can continue!" msgstr "" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "" msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po b/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po index 6ae04497b..33c1f821e 100644 --- a/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po +++ b/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po @@ -1038,7 +1038,7 @@ msgstr "" msgid "The folder is writable, you can continue!" msgstr "資料夾可寫入，你可以繼續！" -msgid "Jappix offers you the possibility to manage your configuration, install new plugins or search for updates. That's why you must create an administrator account to access the manager." +msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager." msgstr "" msgid "When Jappix will be installed, just click on the manager link on the home page to access it." diff --git a/jappixmini/jappix/php/install.php b/jappixmini/jappix/php/install.php index ae0ff70d3..9cce27136 100644 --- a/jappixmini/jappix/php/install.php +++ b/jappixmini/jappix/php/install.php @@ -163,7 +163,7 @@ else else if($step == 3) { ?> -

+

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index f42155fc8..dc40840ab 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -63,22 +63,23 @@ */ use Friendica\App; +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Model\User; function jappixmini_install() { - register_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings'); - register_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post'); + Addon::registerHook('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings'); + Addon::registerHook('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post'); - register_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script'); - register_hook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login'); + Addon::registerHook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script'); + Addon::registerHook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login'); - register_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron'); + Addon::registerHook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron'); // Jappix source download as required by AGPL - register_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source'); + Addon::registerHook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source'); // set standard configuration $info_text = Config::get("jappixmini", "infotext"); @@ -103,18 +104,18 @@ function jappixmini_install() function jappixmini_uninstall() { - unregister_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings'); - unregister_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post'); + Addon::unregisterHook('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post'); - unregister_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script'); - unregister_hook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login'); + Addon::unregisterHook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script'); + Addon::unregisterHook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login'); - unregister_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron'); + Addon::unregisterHook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron'); - unregister_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source'); + Addon::unregisterHook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source'); } -function jappixmini_plugin_admin(App $a, &$o) +function jappixmini_addon_admin(App $a, &$o) { // display instructions and warnings on addon settings page for admin if (!file_exists("addon/jappixmini.tgz")) { @@ -158,7 +159,7 @@ function jappixmini_plugin_admin(App $a, &$o) $o .= ''; } -function jappixmini_plugin_admin_post(App $a) +function jappixmini_addon_admin_post(App $a) { // set info text $submit = $_REQUEST['jappixmini-admin-settings']; @@ -229,7 +230,7 @@ function jappixmini_init() } - // do not return an address if user deactivated plugin + // do not return an address if user deactivated addon $activated = PConfig::get($uid, 'jappixmini', 'activate'); if (!$activated) { killme(); diff --git a/jappixmini/lang/it/messages.po b/jappixmini/lang/it/messages.po index 7e4eb1f6f..5633930f2 100644 --- a/jappixmini/lang/it/messages.po +++ b/jappixmini/lang/it/messages.po @@ -21,11 +21,11 @@ msgstr "" #: jappixmini.php:266 msgid "Jappix Mini addon settings" -msgstr "Impostazioni plugin Jappix Mini" +msgstr "ImpostazioniaddonJappix Mini" #: jappixmini.php:268 msgid "Activate addon" -msgstr "Abilita plugin" +msgstr "Abilita addon" #: jappixmini.php:271 msgid "" diff --git a/jappixmini/lang/it/strings.php b/jappixmini/lang/it/strings.php index 51f6b7949..892e1c724 100644 --- a/jappixmini/lang/it/strings.php +++ b/jappixmini/lang/it/strings.php @@ -5,8 +5,8 @@ function string_plural_select_it($n){ return ($n != 1);; }} ; -$a->strings["Jappix Mini addon settings"] = "Impostazioni plugin Jappix Mini"; -$a->strings["Activate addon"] = "Abilita plugin"; +$a->strings["Jappix Mini addon settings"] = "Impostazioni addon Jappix Mini"; +$a->strings["Activate addon"] = "Abilita addon"; $a->strings["Do not insert the Jappixmini Chat-Widget into the webinterface"] = "Non inserire Jappixmini nell'intrerfaccia web"; $a->strings["Jabber username"] = "Nome utente Jabber"; $a->strings["Jabber server"] = "Server Jabber"; diff --git a/js_upload/file-uploader/readme.md b/js_upload/file-uploader/readme.md index c107bf122..4c30eaa65 100644 --- a/js_upload/file-uploader/readme.md +++ b/js_upload/file-uploader/readme.md @@ -1,6 +1,6 @@ [donation_link]: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=3PMY37SL9L888&lc=US&item_name=JavaScript%20file%20uploader¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted -This plugin uses XHR for uploading multiple files with progress-bar in FF3.6+, Safari4+, +This addon uses XHR for uploading multiple files with progress-bar in FF3.6+, Safari4+, Chrome and falls back to hidden iframe based upload in other browsers, providing good user experience everywhere. @@ -17,13 +17,13 @@ providing good user experience everywhere. * tested in IE7,8; Firefox 3,3.6,4; Safari4,5; Chrome; Opera10.60; ### License ### -This plugin is open sourced under GNU GPL 2 or later. +This addon is open sourced under GNU GPL 2 or later. If this license doesn't suit you mail me at andrew (at) valums.com. -Please [donate][donation_link] if you are willing to support the further development of file upload plugin. +Please [donate][donation_link] if you are willing to support the further development of file upload addon. ### Known Issues ### -Plugin breaks back button functionality in Opera. +Addon breaks back button functionality in Opera. ### Getting started ### The fileuploader.js contains two classes that are meant to be used directly. diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php index cc3778cd8..15393e8c5 100644 --- a/js_upload/js_upload.php +++ b/js_upload/js_upload.php @@ -15,23 +15,23 @@ * Module Author: Chris Case * */ - +use Friendica\Core\Addon; use Friendica\Core\Config; function js_upload_install() { - register_hook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); - register_hook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); - register_hook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); - register_hook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); + Addon::registerHook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); + Addon::registerHook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); + Addon::registerHook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); + Addon::registerHook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); } function js_upload_uninstall() { - unregister_hook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); - unregister_hook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); - unregister_hook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); - unregister_hook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); + Addon::unregisterHook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); + Addon::unregisterHook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); + Addon::unregisterHook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); + Addon::unregisterHook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); } diff --git a/krynn/krynn.php b/krynn/krynn.php index 17e7d2b48..6d47bc5f3 100644 --- a/krynn/krynn.php +++ b/krynn/krynn.php @@ -9,30 +9,30 @@ * *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function krynn_install() { /** * - * Our demo plugin will attach in three places. + * Our demo addon will attach in three places. * The first is just prior to storing a local post. * */ - register_hook('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook'); + Addon::registerHook('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook'); /** * - * Then we'll attach into the plugin settings page, and also the + * Then we'll attach into the addon settings page, and also the * settings post hook so that we can create and update * user preferences. * */ - register_hook('plugin_settings', 'addon/krynn/krynn.php', 'krynn_settings'); - register_hook('plugin_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post'); + Addon::registerHook('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings'); + Addon::registerHook('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post'); logger("installed krynn"); } @@ -48,9 +48,9 @@ function krynn_uninstall() { * */ - unregister_hook('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook'); - unregister_hook('plugin_settings', 'addon/krynn/krynn.php', 'krynn_settings'); - unregister_hook('plugin_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post'); + Addon::unregisterHook('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook'); + Addon::unregisterHook('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post'); logger("removed krynn"); @@ -65,7 +65,7 @@ function krynn_post_hook($a, &$item) { * An item was posted on the local system. * We are going to look for specific items: * - A status post by a profile owner - * - The profile owner must have allowed our plugin + * - The profile owner must have allowed our addon * */ @@ -126,7 +126,7 @@ function krynn_settings_post($a,$post) { /** * - * Called from the Plugin Setting form. + * Called from the addon Setting form. * Add our own settings info to the page. * */ @@ -162,7 +162,7 @@ function krynn_settings(&$a,&$s) { $s .= '
'; $s .= '

' . t('Krynn Settings') . '

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; /* provide a submit button */ diff --git a/krynn/lang/C/messages.po b/krynn/lang/C/messages.po index 0831b915a..63255c9f3 100644 --- a/krynn/lang/C/messages.po +++ b/krynn/lang/C/messages.po @@ -22,7 +22,7 @@ msgid "Krynn Settings" msgstr "" #: krynn.php:152 -msgid "Enable Krynn Plugin" +msgid "Enable Krynn Addon" msgstr "" #: krynn.php:158 diff --git a/krynn/lang/ca/strings.php b/krynn/lang/ca/strings.php index ec7bf8034..d5e09e7e7 100644 --- a/krynn/lang/ca/strings.php +++ b/krynn/lang/ca/strings.php @@ -1,5 +1,5 @@ strings["Krynn Settings"] = "Ajustos de Krynn"; -$a->strings["Enable Krynn Plugin"] = "Activa Plugin de Krynn"; +$a->strings["Enable Krynn Addon"] = "Activa Addon de Krynn"; $a->strings["Submit"] = "Enviar"; diff --git a/krynn/lang/cs/messages.po b/krynn/lang/cs/messages.po index 69e803e3b..abb6d5158 100644 --- a/krynn/lang/cs/messages.po +++ b/krynn/lang/cs/messages.po @@ -24,8 +24,8 @@ msgid "Krynn Settings" msgstr "Krynn Nastavení" #: krynn.php:152 -msgid "Enable Krynn Plugin" -msgstr "Povolit Krynn plugin" +msgid "Enable Krynn Addon" +msgstr "Povolit Krynn addon" #: krynn.php:158 msgid "Submit" diff --git a/krynn/lang/cs/strings.php b/krynn/lang/cs/strings.php index e725ffc3e..76de5f7fe 100644 --- a/krynn/lang/cs/strings.php +++ b/krynn/lang/cs/strings.php @@ -6,5 +6,5 @@ function string_plural_select_cs($n){ }} ; $a->strings["Krynn Settings"] = "Krynn Nastavení"; -$a->strings["Enable Krynn Plugin"] = "Povolit Krynn plugin"; +$a->strings["Enable Krynn Addon"] = "Povolit Krynn addon"; $a->strings["Submit"] = "Odeslat"; diff --git a/krynn/lang/de/messages.po b/krynn/lang/de/messages.po index 12dceb311..7d3e6bbd4 100644 --- a/krynn/lang/de/messages.po +++ b/krynn/lang/de/messages.po @@ -25,8 +25,8 @@ msgid "Krynn Settings" msgstr "Planeten Einstellungen" #: Krynn.php:152 -msgid "Enable Krynn Plugin" -msgstr "Planeten-Plugin aktivieren" +msgid "Enable Krynn Addon" +msgstr "Planeten-Addon aktivieren" #: Krynn.php:158 msgid "Submit" diff --git a/krynn/lang/de/strings.php b/krynn/lang/de/strings.php index 74b5e9f92..d8a54083a 100644 --- a/krynn/lang/de/strings.php +++ b/krynn/lang/de/strings.php @@ -6,5 +6,5 @@ function string_plural_select_de($n){ }} ; $a->strings["Krynn Settings"] = "Krynn Einstellungen"; -$a->strings["Enable Krynn Plugin"] = "Krynn-Plugin aktivieren"; +$a->strings["Enable Krynn Addon"] = "Krynn-Addon aktivieren"; $a->strings["Submit"] = "Senden"; diff --git a/krynn/lang/eo/strings.php b/krynn/lang/eo/strings.php index 8b8dd24af..eae023458 100644 --- a/krynn/lang/eo/strings.php +++ b/krynn/lang/eo/strings.php @@ -1,5 +1,5 @@ strings["Krynn Settings"] = "Agordo pri Krynn"; -$a->strings["Enable Krynn Plugin"] = "Ŝalti la Krynn kromprogamon"; +$a->strings["Enable Krynn Addon"] = "Ŝalti la Krynn kromprogamon"; $a->strings["Submit"] = "Sendi"; diff --git a/krynn/lang/es/messages.po b/krynn/lang/es/messages.po index e2015a379..a8690ef1e 100644 --- a/krynn/lang/es/messages.po +++ b/krynn/lang/es/messages.po @@ -24,8 +24,8 @@ msgid "Krynn Settings" msgstr "Ajustes de Krynn" #: krynn.php:152 -msgid "Enable Krynn Plugin" -msgstr "Habilitar Plugin de Krynn" +msgid "Enable Krynn Addon" +msgstr "Habilitar Addon de Krynn" #: krynn.php:158 msgid "Submit" diff --git a/krynn/lang/es/strings.php b/krynn/lang/es/strings.php index 77df4d4e6..6bb39518b 100644 --- a/krynn/lang/es/strings.php +++ b/krynn/lang/es/strings.php @@ -6,5 +6,5 @@ function string_plural_select_es($n){ }} ; $a->strings["Krynn Settings"] = "Ajustes de Krynn"; -$a->strings["Enable Krynn Plugin"] = "Habilitar Plugin de Krynn"; +$a->strings["Enable Krynn Addon"] = "Habilitar Addon de Krynn"; $a->strings["Submit"] = "Enviar"; diff --git a/krynn/lang/fr/strings.php b/krynn/lang/fr/strings.php index 601f95021..bcd3430bb 100644 --- a/krynn/lang/fr/strings.php +++ b/krynn/lang/fr/strings.php @@ -1,5 +1,5 @@ strings["Krynn Settings"] = "Réglages des Krynn"; -$a->strings["Enable Krynn Plugin"] = "Activer Krynn"; +$a->strings["Enable Krynn Addon"] = "Activer Krynn"; $a->strings["Submit"] = "Envoyer"; diff --git a/krynn/lang/is/strings.php b/krynn/lang/is/strings.php index 976a601e6..11fd5b57a 100644 --- a/krynn/lang/is/strings.php +++ b/krynn/lang/is/strings.php @@ -1,5 +1,5 @@ strings["Krynn Settings"] = ""; -$a->strings["Enable Krynn Plugin"] = ""; +$a->strings["Enable Krynn Addon"] = ""; $a->strings["Submit"] = "Senda inn"; diff --git a/krynn/lang/it/messages.po b/krynn/lang/it/messages.po index 507fac544..4d70b47bf 100644 --- a/krynn/lang/it/messages.po +++ b/krynn/lang/it/messages.po @@ -24,8 +24,8 @@ msgid "Krynn Settings" msgstr "Impostazioni Krynn" #: krynn.php:152 -msgid "Enable Krynn Plugin" -msgstr "Abilita plugin Krynn" +msgid "Enable Krynn Addon" +msgstr "AbilitaaddonKrynn" #: krynn.php:158 msgid "Submit" diff --git a/krynn/lang/it/strings.php b/krynn/lang/it/strings.php index 7c9f5f114..753fe7a7f 100644 --- a/krynn/lang/it/strings.php +++ b/krynn/lang/it/strings.php @@ -6,5 +6,5 @@ function string_plural_select_it($n){ }} ; $a->strings["Krynn Settings"] = "Impostazioni Krynn"; -$a->strings["Enable Krynn Plugin"] = "Abilita plugin Krynn"; +$a->strings["Enable Krynn Addon"] = "Abilita addon Krynn"; $a->strings["Submit"] = "Invia"; diff --git a/krynn/lang/nb-no/strings.php b/krynn/lang/nb-no/strings.php index 06ad32cb5..29bffb9a0 100644 --- a/krynn/lang/nb-no/strings.php +++ b/krynn/lang/nb-no/strings.php @@ -1,5 +1,5 @@ strings["Krynn Settings"] = ""; -$a->strings["Enable Krynn Plugin"] = ""; +$a->strings["Enable Krynn Addon"] = ""; $a->strings["Submit"] = "Lagre"; diff --git a/krynn/lang/pl/strings.php b/krynn/lang/pl/strings.php index 239001b17..d77ed6c1f 100644 --- a/krynn/lang/pl/strings.php +++ b/krynn/lang/pl/strings.php @@ -1,5 +1,5 @@ strings["Krynn Settings"] = ""; -$a->strings["Enable Krynn Plugin"] = ""; +$a->strings["Enable Krynn Addon"] = ""; $a->strings["Submit"] = "Potwierdź"; diff --git a/krynn/lang/pt-br/strings.php b/krynn/lang/pt-br/strings.php index a3b2d663a..0b882a715 100644 --- a/krynn/lang/pt-br/strings.php +++ b/krynn/lang/pt-br/strings.php @@ -1,5 +1,5 @@ strings["Krynn Settings"] = "Configuração dos Krynn"; -$a->strings["Enable Krynn Plugin"] = "Habilita configuração dos Krynn"; +$a->strings["Enable Krynn Addon"] = "Habilita configuração dos Krynn"; $a->strings["Submit"] = "Enviar"; diff --git a/krynn/lang/ro/messages.po b/krynn/lang/ro/messages.po index 2e629e1ce..8f9453155 100644 --- a/krynn/lang/ro/messages.po +++ b/krynn/lang/ro/messages.po @@ -24,7 +24,7 @@ msgid "Krynn Settings" msgstr "Configurări Krynn" #: krynn.php:152 -msgid "Enable Krynn Plugin" +msgid "Enable Krynn Addon" msgstr "Activare Modul Krynn" #: krynn.php:158 diff --git a/krynn/lang/ro/strings.php b/krynn/lang/ro/strings.php index 88a84ee89..f6c6f53d2 100644 --- a/krynn/lang/ro/strings.php +++ b/krynn/lang/ro/strings.php @@ -6,5 +6,5 @@ function string_plural_select_ro($n){ }} ; $a->strings["Krynn Settings"] = "Configurări Krynn"; -$a->strings["Enable Krynn Plugin"] = "Activare Modul Krynn"; +$a->strings["Enable Krynn Addon"] = "Activare Modul Krynn"; $a->strings["Submit"] = "Trimite"; diff --git a/krynn/lang/ru/strings.php b/krynn/lang/ru/strings.php index 8fd1069bf..88ba67198 100644 --- a/krynn/lang/ru/strings.php +++ b/krynn/lang/ru/strings.php @@ -1,5 +1,5 @@ strings["Krynn Settings"] = ""; -$a->strings["Enable Krynn Plugin"] = ""; +$a->strings["Enable Krynn Addon"] = ""; $a->strings["Submit"] = "Подтвердить"; diff --git a/krynn/lang/zh-cn/strings.php b/krynn/lang/zh-cn/strings.php index dcbfbeb73..5564f1f44 100644 --- a/krynn/lang/zh-cn/strings.php +++ b/krynn/lang/zh-cn/strings.php @@ -1,5 +1,5 @@ strings["Krynn Settings"] = "行星设置"; -$a->strings["Enable Krynn Plugin"] = "使行星插件可用"; +$a->strings["Enable Krynn Addon"] = "使行星插件可用"; $a->strings["Submit"] = "提交"; diff --git a/langfilter/lang/it/messages.po b/langfilter/lang/it/messages.po index 6eded71fa..e446717ad 100644 --- a/langfilter/lang/it/messages.po +++ b/langfilter/lang/it/messages.po @@ -30,7 +30,7 @@ msgid "" "match any language spoken by you (see below) the posting will be collapsed. " "Remember detecting the language is not perfect, especially with short " "postings." -msgstr "Questo plugin prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti." +msgstr "Questo addon prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti." #: langfilter.php:46 msgid "Use the language filter" diff --git a/langfilter/lang/it/strings.php b/langfilter/lang/it/strings.php index ecb7b8d31..b94ab8125 100644 --- a/langfilter/lang/it/strings.php +++ b/langfilter/lang/it/strings.php @@ -6,7 +6,7 @@ function string_plural_select_it($n){ }} ; $a->strings["Language Filter"] = "Filtro Lingua"; -$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Questo plugin prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti."; +$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Questo addon prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue da te parlata (vedi sotto), il messaggio verrà nascosto. Ricorda che la rilevazione della lingua non è perfetta, specie con i messaggi corti."; $a->strings["Use the language filter"] = "Usa il filtro lingua"; $a->strings["I speak"] = "Parlo"; $a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista di abbreviazioni (codici iso2) per le lingue che parli, separate da virgola. Per esempio \"it,de\""; diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index e8e909754..e569ed37d 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -9,6 +9,7 @@ */ use Friendica\App; +use Friendica\Core\Addon; use Friendica\Core\PConfig; /* Define the hooks we want to use @@ -18,16 +19,16 @@ use Friendica\Core\PConfig; function langfilter_install() { - register_hook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body', 10); - register_hook('plugin_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings'); - register_hook('plugin_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post'); + Addon::registerHook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body', 10); + Addon::registerHook('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post'); } function langfilter_uninstall() { - unregister_hook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body'); - unregister_hook('plugin_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings'); - unregister_hook('plugin_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post'); + Addon::unregisterHook('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body'); + Addon::unregisterHook('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post'); } /* The settings diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index f6cb42b61..d06874b7c 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -52,17 +52,18 @@ * * ...etc. */ +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Model\User; function ldapauth_install() { - register_hook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate'); + Addon::registerHook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate'); } function ldapauth_uninstall() { - unregister_hook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate'); + Addon::unregisterHook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate'); } function ldapauth_hook_authenticate($a, &$b) diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php index 91d358349..f5cee1170 100644 --- a/leistungsschutzrecht/leistungsschutzrecht.php +++ b/leistungsschutzrecht/leistungsschutzrecht.php @@ -5,20 +5,20 @@ * Version: 0.1 * Author: Michael Vogel */ - +use Friendica\Core\Addon; use Friendica\Core\Config; function leistungsschutzrecht_install() { - register_hook('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron'); - register_hook('getsiteinfo', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); - register_hook('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); + Addon::registerHook('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron'); + Addon::registerHook('getsiteinfo', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); + Addon::registerHook('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); } function leistungsschutzrecht_uninstall() { - unregister_hook('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron'); - unregister_hook('getsiteinfo', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); - unregister_hook('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); + Addon::unregisterHook('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron'); + Addon::unregisterHook('getsiteinfo', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); + Addon::unregisterHook('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); } function leistungsschutzrecht_getsiteinfo($a, &$siteinfo) { diff --git a/libertree/lang/C/messages.po b/libertree/lang/C/messages.po index fa31c8823..ec61f8475 100644 --- a/libertree/lang/C/messages.po +++ b/libertree/lang/C/messages.po @@ -26,7 +26,7 @@ msgid "libertree Post Settings" msgstr "" #: libertree.php:69 -msgid "Enable Libertree Post Plugin" +msgid "Enable Libertree Post Addon" msgstr "" #: libertree.php:74 diff --git a/libertree/lang/ca/strings.php b/libertree/lang/ca/strings.php index 28c6b31a0..02c7d22c3 100644 --- a/libertree/lang/ca/strings.php +++ b/libertree/lang/ca/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to libertree"] = "Enviament a libertree"; $a->strings["libertree Post Settings"] = "Ajustos d'enviaments a libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Activa el plugin d'enviaments a libertree"; +$a->strings["Enable Libertree Post Addon"] = "Activa el addon d'enviaments a libertree"; $a->strings["Libertree API token"] = "Libertree API token"; $a->strings["Libertree site URL"] = "lloc URL libertree"; $a->strings["Post to Libertree by default"] = "Enviar a libertree per defecte"; diff --git a/libertree/lang/cs/messages.po b/libertree/lang/cs/messages.po index d9473ab0b..b97b17ede 100644 --- a/libertree/lang/cs/messages.po +++ b/libertree/lang/cs/messages.po @@ -28,7 +28,7 @@ msgid "libertree Post Settings" msgstr "libertree nastavení příspěvků" #: libertree.php:69 -msgid "Enable Libertree Post Plugin" +msgid "Enable Libertree Post Addon" msgstr "Povolit Libertree Post rozšíření" #: libertree.php:74 diff --git a/libertree/lang/cs/strings.php b/libertree/lang/cs/strings.php index 97618321a..57ad0ff13 100644 --- a/libertree/lang/cs/strings.php +++ b/libertree/lang/cs/strings.php @@ -7,7 +7,7 @@ function string_plural_select_cs($n){ ; $a->strings["Post to libertree"] = "Poslat na libertree"; $a->strings["libertree Post Settings"] = "libertree nastavení příspěvků"; -$a->strings["Enable Libertree Post Plugin"] = "Povolit Libertree Post rozšíření"; +$a->strings["Enable Libertree Post Addon"] = "Povolit Libertree Post rozšíření"; $a->strings["Libertree API token"] = "Libertree API token"; $a->strings["Libertree site URL"] = "URL adresa Libertree "; $a->strings["Post to Libertree by default"] = "Defaultně poslat na Libertree"; diff --git a/libertree/lang/de/messages.po b/libertree/lang/de/messages.po index 7c3d3f1a3..970d22ddb 100644 --- a/libertree/lang/de/messages.po +++ b/libertree/lang/de/messages.po @@ -29,8 +29,8 @@ msgid "libertree Post Settings" msgstr "libertree Post Einstellungen" #: libertree.php:69 -msgid "Enable Libertree Post Plugin" -msgstr "Libertree Post Plugin aktivieren" +msgid "Enable Libertree Post Addon" +msgstr "Libertree Post Addon aktivieren" #: libertree.php:74 msgid "Libertree API token" diff --git a/libertree/lang/de/strings.php b/libertree/lang/de/strings.php index 27d40815c..c6867705c 100644 --- a/libertree/lang/de/strings.php +++ b/libertree/lang/de/strings.php @@ -7,7 +7,7 @@ function string_plural_select_de($n){ ; $a->strings["Post to libertree"] = "bei libertree veröffentlichen"; $a->strings["libertree Post Settings"] = "libertree Post Einstellungen"; -$a->strings["Enable Libertree Post Plugin"] = "Libertree Post Plugin aktivieren"; +$a->strings["Enable Libertree Post Addon"] = "Libertree Post Addon aktivieren"; $a->strings["Libertree API token"] = "Libertree API Token"; $a->strings["Libertree site URL"] = "Libertree URL"; $a->strings["Post to Libertree by default"] = "Standardmäßig bei libertree veröffentlichen"; diff --git a/libertree/lang/eo/strings.php b/libertree/lang/eo/strings.php index 11b8496cd..674972d0e 100644 --- a/libertree/lang/eo/strings.php +++ b/libertree/lang/eo/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to libertree"] = "Afiŝi al libertree"; $a->strings["libertree Post Settings"] = "Agordoj por Afiŝoj ĉe libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Aktivigi Kromprogramon por Afiŝoj ĉe libertree"; +$a->strings["Enable Libertree Post Addon"] = "Aktivigi Kromprogramon por Afiŝoj ĉe libertree"; $a->strings["Libertree API token"] = "Libertree API ĵetono"; $a->strings["Libertree site URL"] = "URL adreso de libertree retejo:"; $a->strings["Post to Libertree by default"] = "Defaŭlte afiŝi ĉe Libertree"; diff --git a/libertree/lang/es/messages.po b/libertree/lang/es/messages.po index 8fcc8a8d0..d60057658 100644 --- a/libertree/lang/es/messages.po +++ b/libertree/lang/es/messages.po @@ -28,8 +28,8 @@ msgid "libertree Post Settings" msgstr "Ajustes de Publicación de Libertree" #: libertree.php:69 -msgid "Enable Libertree Post Plugin" -msgstr "Habilitar Plugin de publicación de Libertree" +msgid "Enable Libertree Post Addon" +msgstr "Habilitar Addon de publicación de Libertree" #: libertree.php:74 msgid "Libertree API token" diff --git a/libertree/lang/es/strings.php b/libertree/lang/es/strings.php index 0be7bbca7..8a8dbf1f9 100644 --- a/libertree/lang/es/strings.php +++ b/libertree/lang/es/strings.php @@ -7,7 +7,7 @@ function string_plural_select_es($n){ ; $a->strings["Post to libertree"] = "Publicar en Libertree"; $a->strings["libertree Post Settings"] = "Ajustes de Publicación de Libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Habilitar Plugin de publicación de Libertree"; +$a->strings["Enable Libertree Post Addon"] = "Habilitar Addon de publicación de Libertree"; $a->strings["Libertree API token"] = "Símbolo de API de Libertree"; $a->strings["Libertree site URL"] = "URL de la página de Libertree"; $a->strings["Post to Libertree by default"] = "Publicar en Libertree por defecto"; diff --git a/libertree/lang/fr/messages.po b/libertree/lang/fr/messages.po index ce956cf1a..6deb7b4e8 100644 --- a/libertree/lang/fr/messages.po +++ b/libertree/lang/fr/messages.po @@ -28,8 +28,8 @@ msgid "libertree Post Settings" msgstr "Réglages des messages sur libertree" #: libertree.php:69 -msgid "Enable Libertree Post Plugin" -msgstr "Activer le plugin de publication sur libertree" +msgid "Enable Libertree Post Addon" +msgstr "Activer leaddonde publication sur libertree" #: libertree.php:74 msgid "Libertree API token" diff --git a/libertree/lang/fr/strings.php b/libertree/lang/fr/strings.php index 8f7770164..1e2279143 100644 --- a/libertree/lang/fr/strings.php +++ b/libertree/lang/fr/strings.php @@ -7,7 +7,7 @@ function string_plural_select_fr($n){ ; $a->strings["Post to libertree"] = "Publier sur libertree"; $a->strings["libertree Post Settings"] = "Réglages des messages sur libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Activer le plugin de publication sur libertree"; +$a->strings["Enable Libertree Post Addon"] = "Activer le addon de publication sur libertree"; $a->strings["Libertree API token"] = "Clé de l'API libertree"; $a->strings["Libertree site URL"] = "URL du site libertree"; $a->strings["Post to Libertree by default"] = "Publier sur libertree par défaut"; diff --git a/libertree/lang/is/strings.php b/libertree/lang/is/strings.php index 7d5e7f37b..6256e21c0 100644 --- a/libertree/lang/is/strings.php +++ b/libertree/lang/is/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to libertree"] = ""; $a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; +$a->strings["Enable Libertree Post Addon"] = ""; $a->strings["Libertree API token"] = ""; $a->strings["Libertree site URL"] = ""; $a->strings["Post to Libertree by default"] = ""; diff --git a/libertree/lang/it/messages.po b/libertree/lang/it/messages.po index 25bd37ff6..358956883 100644 --- a/libertree/lang/it/messages.po +++ b/libertree/lang/it/messages.po @@ -28,8 +28,8 @@ msgid "libertree Post Settings" msgstr "Impostazioni di invio a Libertree" #: libertree.php:69 -msgid "Enable Libertree Post Plugin" -msgstr "Abilita il plugin di invio a Libertree" +msgid "Enable Libertree Post Addon" +msgstr "Abilita iladdondi invio a Libertree" #: libertree.php:74 msgid "Libertree API token" diff --git a/libertree/lang/it/strings.php b/libertree/lang/it/strings.php index beef73dae..ca0b50fac 100644 --- a/libertree/lang/it/strings.php +++ b/libertree/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to libertree"] = "Invia a Libertree"; $a->strings["libertree Post Settings"] = "Impostazioni di invio a Libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Abilita il plugin di invio a Libertree"; +$a->strings["Enable Libertree Post Addon"] = "Abilita il addon di invio a Libertree"; $a->strings["Libertree API token"] = "Token API Libertree"; $a->strings["Libertree site URL"] = "Indirizzo sito Libertree"; $a->strings["Post to Libertree by default"] = "Invia sempre a Libertree"; diff --git a/libertree/lang/nb-no/strings.php b/libertree/lang/nb-no/strings.php index 679aefe18..1600c269d 100644 --- a/libertree/lang/nb-no/strings.php +++ b/libertree/lang/nb-no/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to libertree"] = ""; $a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; +$a->strings["Enable Libertree Post Addon"] = ""; $a->strings["Libertree API token"] = ""; $a->strings["Libertree site URL"] = ""; $a->strings["Post to Libertree by default"] = ""; diff --git a/libertree/lang/pl/strings.php b/libertree/lang/pl/strings.php index 217757f2b..5f2122486 100644 --- a/libertree/lang/pl/strings.php +++ b/libertree/lang/pl/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to libertree"] = ""; $a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; +$a->strings["Enable Libertree Post Addon"] = ""; $a->strings["Libertree API token"] = ""; $a->strings["Libertree site URL"] = ""; $a->strings["Post to Libertree by default"] = ""; diff --git a/libertree/lang/pt-br/messages.po b/libertree/lang/pt-br/messages.po index 4df816bb0..d6554ff62 100644 --- a/libertree/lang/pt-br/messages.po +++ b/libertree/lang/pt-br/messages.po @@ -28,7 +28,7 @@ msgid "libertree Post Settings" msgstr "Configurações de publicação do Libertree" #: libertree.php:69 -msgid "Enable Libertree Post Plugin" +msgid "Enable Libertree Post Addon" msgstr "Habilitar plug-in para publicar no Libertree" #: libertree.php:74 diff --git a/libertree/lang/pt-br/strings.php b/libertree/lang/pt-br/strings.php index 9c7506980..d55aee610 100644 --- a/libertree/lang/pt-br/strings.php +++ b/libertree/lang/pt-br/strings.php @@ -7,7 +7,7 @@ function string_plural_select_pt_br($n){ ; $a->strings["Post to libertree"] = "Publicar no Libertree"; $a->strings["libertree Post Settings"] = "Configurações de publicação do Libertree"; -$a->strings["Enable Libertree Post Plugin"] = "Habilitar plug-in para publicar no Libertree"; +$a->strings["Enable Libertree Post Addon"] = "Habilitar plug-in para publicar no Libertree"; $a->strings["Libertree API token"] = ""; $a->strings["Libertree site URL"] = ""; $a->strings["Post to Libertree by default"] = "Publicar no Libertree por padrão"; diff --git a/libertree/lang/ro/messages.po b/libertree/lang/ro/messages.po index 4690e7c15..bd99286a6 100644 --- a/libertree/lang/ro/messages.po +++ b/libertree/lang/ro/messages.po @@ -28,7 +28,7 @@ msgid "libertree Post Settings" msgstr "Configurări Postări libertree " #: libertree.php:69 -msgid "Enable Libertree Post Plugin" +msgid "Enable Libertree Post Addon" msgstr "Activare Modul Postare Libertree" #: libertree.php:74 diff --git a/libertree/lang/ro/strings.php b/libertree/lang/ro/strings.php index 3136a26b0..efa612ed5 100644 --- a/libertree/lang/ro/strings.php +++ b/libertree/lang/ro/strings.php @@ -7,7 +7,7 @@ function string_plural_select_ro($n){ ; $a->strings["Post to libertree"] = "Postați pe libertree"; $a->strings["libertree Post Settings"] = "Configurări Postări libertree "; -$a->strings["Enable Libertree Post Plugin"] = "Activare Modul Postare Libertree"; +$a->strings["Enable Libertree Post Addon"] = "Activare Modul Postare Libertree"; $a->strings["Libertree API token"] = "Token API Libertree"; $a->strings["Libertree site URL"] = "URL site Libertree"; $a->strings["Post to Libertree by default"] = "Postați implicit pe Libertree"; diff --git a/libertree/lang/ru/strings.php b/libertree/lang/ru/strings.php index c6101b705..9d1522a4a 100644 --- a/libertree/lang/ru/strings.php +++ b/libertree/lang/ru/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to libertree"] = ""; $a->strings["libertree Post Settings"] = ""; -$a->strings["Enable Libertree Post Plugin"] = ""; +$a->strings["Enable Libertree Post Addon"] = ""; $a->strings["Libertree API token"] = ""; $a->strings["Libertree site URL"] = ""; $a->strings["Post to Libertree by default"] = ""; diff --git a/libertree/lang/zh-cn/strings.php b/libertree/lang/zh-cn/strings.php index 2122014c0..c3d1f6a10 100644 --- a/libertree/lang/zh-cn/strings.php +++ b/libertree/lang/zh-cn/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to libertree"] = "转播到libertree"; $a->strings["libertree Post Settings"] = "libertree转播设置"; -$a->strings["Enable Libertree Post Plugin"] = "使Libertree转播插件可用"; +$a->strings["Enable Libertree Post Addon"] = "使Libertree转播插件可用"; $a->strings["Libertree API token"] = "Libertree API令牌"; $a->strings["Libertree site URL"] = "Libertree网站URL"; $a->strings["Post to Libertree by default"] = "默认地转播到Libertree"; diff --git a/libertree/libertree.php b/libertree/libertree.php index 0b9f839b7..0dd6e38ad 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -6,23 +6,23 @@ * Version: 1.0 * Author: Tony Baldwin */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function libertree_install() { - register_hook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local'); - register_hook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send'); - register_hook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets'); - register_hook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings'); - register_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post'); + Addon::registerHook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local'); + Addon::registerHook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send'); + Addon::registerHook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets'); + Addon::registerHook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings'); + Addon::registerHook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post'); } function libertree_uninstall() { - unregister_hook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local'); - unregister_hook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send'); - unregister_hook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets'); - unregister_hook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings'); - unregister_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post'); + Addon::unregisterHook('post_local', 'addon/libertree/libertree.php', 'libertree_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send'); + Addon::unregisterHook('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post'); } @@ -74,7 +74,7 @@ function libertree_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/libravatar/README.md b/libravatar/README.md index 16fbd85a2..07ac2a798 100644 --- a/libravatar/README.md +++ b/libravatar/README.md @@ -1,4 +1,4 @@ -# Libravatar Plugin +# Libravatar Addon by [Klaus Weidenbach](http://friendica.dszdw.net/profile/klaus) This addon allows you to look up an avatar image for new users and contacts at [Libravatar](http://www.libravatar.com). It will be used if there have not been found any other avatar images yet for example through OpenID. @@ -6,7 +6,7 @@ This addon allows you to look up an avatar image for new users and contacts at [ Libravatar is a free and open replacement for Gravatar. It is a service where people can store an avatar image for their email-addresses. These avatar images can get looked up for example in comment functions, profile pages, etc. on other sites. There exists a central installation at [www.libravatar.com](http://www.libravatar.com), but you can also host it on your own server. If no avatar was found Libravatar will look up at Gravatar as a fallback. There is no rating available, as it is on Gravatar, so all avatar lookups are g-rated. (Suitable for all audiences.) -PHP >= 5.3 is required for this plugin! +PHP >= 5.3 is required for this addon! You can not use the Libravatar and Gravatar addon at the same time. You need to choose one. If you need other ratings than g you better stay with Gravatar, otherwise it is safe to use Libravatar, because it will fall back to Gravatar if nothing was found at Libravatar. diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index 891b0b472..bba5a8819 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -1,15 +1,15 @@ = 5.3) + * Description: If there is no avatar image for a new user or contact this addon will look for one at Libravatar. Please disable Gravatar addon if you use this one. (requires PHP >= 5.3) * Version: 1.1 * Author: Klaus Weidenbach */ - +use Friendica\Core\Addon; use Friendica\Core\Config; /** - * Installs the plugin hook + * Installs the addon hook */ function libravatar_install() { if (! version_compare(PHP_VERSION, '5.3.0', '>=')) { @@ -17,16 +17,16 @@ function libravatar_install() { // avoid registering the hook return false; } - register_hook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); + Addon::registerHook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); logger("registered libravatar in avatar_lookup hook"); } /** - * Removes the plugin hook + * Removes the addon hook */ function libravatar_uninstall() { - unregister_hook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); + Addon::unregisterHook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); logger("unregistered libravatar in avatar_lookup hook"); } @@ -61,7 +61,7 @@ function libravatar_lookup($a, &$b) { /** * Display admin settings for this addon */ -function libravatar_plugin_admin (&$a, &$o) { +function libravatar_addon_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/libravatar" ); $default_avatar = Config::get('libravatar', 'default_img'); @@ -106,7 +106,7 @@ function libravatar_plugin_admin (&$a, &$o) { /** * Save admin settings */ -function libravatar_plugin_admin_post (&$a) { +function libravatar_addon_admin_post (&$a) { check_form_security_token('libravatarrsave'); $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon'); diff --git a/ljpost/lang/C/messages.po b/ljpost/lang/C/messages.po index 6c506e053..9baae18eb 100644 --- a/ljpost/lang/C/messages.po +++ b/ljpost/lang/C/messages.po @@ -26,7 +26,7 @@ msgid "LiveJournal Post Settings" msgstr "" #: ljpost.php:72 -msgid "Enable LiveJournal Post Plugin" +msgid "Enable LiveJournal Post Addon" msgstr "" #: ljpost.php:77 diff --git a/ljpost/lang/ca/strings.php b/ljpost/lang/ca/strings.php index 04053fa20..ec370df8e 100644 --- a/ljpost/lang/ca/strings.php +++ b/ljpost/lang/ca/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to LiveJournal"] = "Missatge a Livejournal"; $a->strings["LiveJournal Post Settings"] = "Configuració d'enviaments a Livejournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Habilitat el plugin d'enviaments a Livejournal"; +$a->strings["Enable LiveJournal Post Addon"] = "Habilitat el addon d'enviaments a Livejournal"; $a->strings["LiveJournal username"] = "Nom d'usuari a Livejournal"; $a->strings["LiveJournal password"] = "Contrasenya a Livejournal"; $a->strings["Post to LiveJournal by default"] = "Enviar per defecte a Livejournal"; diff --git a/ljpost/lang/cs/messages.po b/ljpost/lang/cs/messages.po index 78abd5272..74a88433a 100644 --- a/ljpost/lang/cs/messages.po +++ b/ljpost/lang/cs/messages.po @@ -28,8 +28,8 @@ msgid "LiveJournal Post Settings" msgstr "Nastavení LiveJournal Post" #: ljpost.php:72 -msgid "Enable LiveJournal Post Plugin" -msgstr "Povolit LiveJournal Post plugin" +msgid "Enable LiveJournal Post Addon" +msgstr "Povolit LiveJournal Post addon" #: ljpost.php:77 msgid "LiveJournal username" diff --git a/ljpost/lang/cs/strings.php b/ljpost/lang/cs/strings.php index f1dad443a..d2c833d97 100644 --- a/ljpost/lang/cs/strings.php +++ b/ljpost/lang/cs/strings.php @@ -7,7 +7,7 @@ function string_plural_select_cs($n){ ; $a->strings["Post to LiveJournal"] = "Poslat na LiveJournal"; $a->strings["LiveJournal Post Settings"] = "Nastavení LiveJournal Post"; -$a->strings["Enable LiveJournal Post Plugin"] = "Povolit LiveJournal Post plugin"; +$a->strings["Enable LiveJournal Post Addon"] = "Povolit LiveJournal Post addon"; $a->strings["LiveJournal username"] = "LiveJournal uživatelské jméno"; $a->strings["LiveJournal password"] = "LiveJournal heslo"; $a->strings["Post to LiveJournal by default"] = "Defaultně umístit na LiveJournal"; diff --git a/ljpost/lang/de/messages.po b/ljpost/lang/de/messages.po index 62cd8afc9..4d915c0d3 100644 --- a/ljpost/lang/de/messages.po +++ b/ljpost/lang/de/messages.po @@ -29,8 +29,8 @@ msgid "LiveJournal Post Settings" msgstr "LiveJournal Veröffentlichungs-Einstellungen" #: ljpost.php:72 -msgid "Enable LiveJournal Post Plugin" -msgstr "LiveJournal Post Plugin aktivieren" +msgid "Enable LiveJournal Post Addon" +msgstr "LiveJournal Post Addon aktivieren" #: ljpost.php:77 msgid "LiveJournal username" diff --git a/ljpost/lang/de/strings.php b/ljpost/lang/de/strings.php index 862b57798..e6b9c8481 100644 --- a/ljpost/lang/de/strings.php +++ b/ljpost/lang/de/strings.php @@ -7,7 +7,7 @@ function string_plural_select_de($n){ ; $a->strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen."; $a->strings["LiveJournal Post Settings"] = "LiveJournal Veröffentlichungs-Einstellungen"; -$a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivieren"; +$a->strings["Enable LiveJournal Post Addon"] = "LiveJournal Post Addon aktivieren"; $a->strings["LiveJournal username"] = "LiveJournal Benutzername"; $a->strings["LiveJournal password"] = "LiveJournal Passwort"; $a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen"; diff --git a/ljpost/lang/eo/strings.php b/ljpost/lang/eo/strings.php index b606e6a66..1bd09a6f9 100644 --- a/ljpost/lang/eo/strings.php +++ b/ljpost/lang/eo/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to LiveJournal"] = "Afiŝi ĉe LiveJournal"; $a->strings["LiveJournal Post Settings"] = "Agordoj pri afiŝoj ĉe LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Ŝalti la LiveJournal-afiŝo kromprogramon."; +$a->strings["Enable LiveJournal Post Addon"] = "Ŝalti la LiveJournal-afiŝo kromprogramon."; $a->strings["LiveJournal username"] = "LiveJournal Salutnomo"; $a->strings["LiveJournal password"] = "LiveJournal pasvorto"; $a->strings["Post to LiveJournal by default"] = "Defaŭlte afiŝi al LiveJournal"; diff --git a/ljpost/lang/es/messages.po b/ljpost/lang/es/messages.po index 16efa134f..f94e20bbd 100644 --- a/ljpost/lang/es/messages.po +++ b/ljpost/lang/es/messages.po @@ -28,8 +28,8 @@ msgid "LiveJournal Post Settings" msgstr "Ajustes de publicación de LiveJournal" #: ljpost.php:72 -msgid "Enable LiveJournal Post Plugin" -msgstr "Habilitar Plugin de publicción de LiveJournal" +msgid "Enable LiveJournal Post Addon" +msgstr "Habilitar Addon de publicción de LiveJournal" #: ljpost.php:77 msgid "LiveJournal username" diff --git a/ljpost/lang/es/strings.php b/ljpost/lang/es/strings.php index 89e117fbc..10092765f 100644 --- a/ljpost/lang/es/strings.php +++ b/ljpost/lang/es/strings.php @@ -7,7 +7,7 @@ function string_plural_select_es($n){ ; $a->strings["Post to LiveJournal"] = "Publicar en LiveJournal"; $a->strings["LiveJournal Post Settings"] = "Ajustes de publicación de LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Habilitar Plugin de publicción de LiveJournal"; +$a->strings["Enable LiveJournal Post Addon"] = "Habilitar Addon de publicción de LiveJournal"; $a->strings["LiveJournal username"] = "Nombre de usuario de LiveJournal"; $a->strings["LiveJournal password"] = "Contraseña de LiveJournal"; $a->strings["Post to LiveJournal by default"] = "Publicar en LiveJournal por defecto"; diff --git a/ljpost/lang/fr/strings.php b/ljpost/lang/fr/strings.php index 615f929a4..85407d571 100644 --- a/ljpost/lang/fr/strings.php +++ b/ljpost/lang/fr/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to LiveJournal"] = "Poster vers LiveJournal"; $a->strings["LiveJournal Post Settings"] = "Réglages LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Activer \"Poster vers LiveJournal\""; +$a->strings["Enable LiveJournal Post Addon"] = "Activer \"Poster vers LiveJournal\""; $a->strings["LiveJournal username"] = "Nom d'utilisateur LiveJournal"; $a->strings["LiveJournal password"] = "Mot de passe"; $a->strings["Post to LiveJournal by default"] = "Poster vers LiveJournal par défaut"; diff --git a/ljpost/lang/is/strings.php b/ljpost/lang/is/strings.php index 5edfc631c..164dc4413 100644 --- a/ljpost/lang/is/strings.php +++ b/ljpost/lang/is/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to LiveJournal"] = ""; $a->strings["LiveJournal Post Settings"] = ""; -$a->strings["Enable LiveJournal Post Plugin"] = ""; +$a->strings["Enable LiveJournal Post Addon"] = ""; $a->strings["LiveJournal username"] = ""; $a->strings["LiveJournal password"] = ""; $a->strings["Post to LiveJournal by default"] = ""; diff --git a/ljpost/lang/it/messages.po b/ljpost/lang/it/messages.po index 23b345bb9..fb6f3493f 100644 --- a/ljpost/lang/it/messages.po +++ b/ljpost/lang/it/messages.po @@ -28,8 +28,8 @@ msgid "LiveJournal Post Settings" msgstr "Impostazioni invio a LiveJournal" #: ljpost.php:72 -msgid "Enable LiveJournal Post Plugin" -msgstr "Abilita il plugin di invio a LiveJournal" +msgid "Enable LiveJournal Post Addon" +msgstr "Abilita il addon di invio a LiveJournal" #: ljpost.php:77 msgid "LiveJournal username" diff --git a/ljpost/lang/it/strings.php b/ljpost/lang/it/strings.php index 538b0ef88..041d4077d 100644 --- a/ljpost/lang/it/strings.php +++ b/ljpost/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to LiveJournal"] = "Invia a LiveJournal"; $a->strings["LiveJournal Post Settings"] = "Impostazioni invio a LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Abilita il plugin di invio a LiveJournal"; +$a->strings["Enable LiveJournal Post Addon"] = "Abilita il addon di invio a LiveJournal"; $a->strings["LiveJournal username"] = "Nome utente LiveJournal"; $a->strings["LiveJournal password"] = "Password LiveJournal"; $a->strings["Post to LiveJournal by default"] = "Invia sempre a LiveJournal"; diff --git a/ljpost/lang/nb-no/strings.php b/ljpost/lang/nb-no/strings.php index c4e045625..0ea53bd39 100644 --- a/ljpost/lang/nb-no/strings.php +++ b/ljpost/lang/nb-no/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to LiveJournal"] = ""; $a->strings["LiveJournal Post Settings"] = ""; -$a->strings["Enable LiveJournal Post Plugin"] = ""; +$a->strings["Enable LiveJournal Post Addon"] = ""; $a->strings["LiveJournal username"] = ""; $a->strings["LiveJournal password"] = ""; $a->strings["Post to LiveJournal by default"] = ""; diff --git a/ljpost/lang/pl/strings.php b/ljpost/lang/pl/strings.php index 3497dc2ca..a96826eea 100644 --- a/ljpost/lang/pl/strings.php +++ b/ljpost/lang/pl/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to LiveJournal"] = "Post do LiveJournal"; $a->strings["LiveJournal Post Settings"] = "Ustawienia postów do LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = ""; +$a->strings["Enable LiveJournal Post Addon"] = ""; $a->strings["LiveJournal username"] = "Nazwa użytkownika do LiveJournal"; $a->strings["LiveJournal password"] = "Hasło do LiveJournal"; $a->strings["Post to LiveJournal by default"] = "automatycznie publikuj na LiveJournal"; diff --git a/ljpost/lang/pt-br/messages.po b/ljpost/lang/pt-br/messages.po index 3ed7117f3..832a647de 100644 --- a/ljpost/lang/pt-br/messages.po +++ b/ljpost/lang/pt-br/messages.po @@ -28,7 +28,7 @@ msgid "LiveJournal Post Settings" msgstr "Configurações de publicação no LiveJournal" #: ljpost.php:72 -msgid "Enable LiveJournal Post Plugin" +msgid "Enable LiveJournal Post Addon" msgstr "Habilitar plug-in para publicar no LiveJournal" #: ljpost.php:77 diff --git a/ljpost/lang/pt-br/strings.php b/ljpost/lang/pt-br/strings.php index 0792861be..ddc091a40 100644 --- a/ljpost/lang/pt-br/strings.php +++ b/ljpost/lang/pt-br/strings.php @@ -7,7 +7,7 @@ function string_plural_select_pt_br($n){ ; $a->strings["Post to LiveJournal"] = "Publicar no LiveJournal"; $a->strings["LiveJournal Post Settings"] = "Configurações de publicação no LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Habilitar plug-in para publicar no LiveJournal"; +$a->strings["Enable LiveJournal Post Addon"] = "Habilitar plug-in para publicar no LiveJournal"; $a->strings["LiveJournal username"] = "Nome de usuário no LiveJournal"; $a->strings["LiveJournal password"] = "Senha do LiveJournal"; $a->strings["Post to LiveJournal by default"] = "Publicar no LiveJournal por padrão"; diff --git a/ljpost/lang/ro/messages.po b/ljpost/lang/ro/messages.po index 2393930af..546e49bb7 100644 --- a/ljpost/lang/ro/messages.po +++ b/ljpost/lang/ro/messages.po @@ -28,7 +28,7 @@ msgid "LiveJournal Post Settings" msgstr "Configurări Postări LiveJournal" #: ljpost.php:72 -msgid "Enable LiveJournal Post Plugin" +msgid "Enable LiveJournal Post Addon" msgstr "Activare Modul Postare LiveJournal" #: ljpost.php:77 diff --git a/ljpost/lang/ro/strings.php b/ljpost/lang/ro/strings.php index 4bc21cc4f..b65c77549 100644 --- a/ljpost/lang/ro/strings.php +++ b/ljpost/lang/ro/strings.php @@ -7,7 +7,7 @@ function string_plural_select_ro($n){ ; $a->strings["Post to LiveJournal"] = "Postați pe LiveJournal"; $a->strings["LiveJournal Post Settings"] = "Configurări Postări LiveJournal"; -$a->strings["Enable LiveJournal Post Plugin"] = "Activare Modul Postare LiveJournal"; +$a->strings["Enable LiveJournal Post Addon"] = "Activare Modul Postare LiveJournal"; $a->strings["LiveJournal username"] = "Utilizator LiveJournal"; $a->strings["LiveJournal password"] = "Parolă LiveJournal "; $a->strings["Post to LiveJournal by default"] = "Postați implicit pe LiveJournal"; diff --git a/ljpost/lang/ru/strings.php b/ljpost/lang/ru/strings.php index 8e8474379..89a241cd2 100644 --- a/ljpost/lang/ru/strings.php +++ b/ljpost/lang/ru/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to LiveJournal"] = ""; $a->strings["LiveJournal Post Settings"] = ""; -$a->strings["Enable LiveJournal Post Plugin"] = "Включить LiveJournal плагин сообщений"; +$a->strings["Enable LiveJournal Post Addon"] = "Включить LiveJournal плагин сообщений"; $a->strings["LiveJournal username"] = ""; $a->strings["LiveJournal password"] = ""; $a->strings["Post to LiveJournal by default"] = ""; diff --git a/ljpost/lang/zh-cn/strings.php b/ljpost/lang/zh-cn/strings.php index f34b63659..579eac21d 100644 --- a/ljpost/lang/zh-cn/strings.php +++ b/ljpost/lang/zh-cn/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to LiveJournal"] = "转播到LiveJournal"; $a->strings["LiveJournal Post Settings"] = "LiveJournal转播设置"; -$a->strings["Enable LiveJournal Post Plugin"] = "使Livejournal转播插件可用"; +$a->strings["Enable LiveJournal Post Addon"] = "使Livejournal转播插件可用"; $a->strings["LiveJournal username"] = "LiveJournal用户名"; $a->strings["LiveJournal password"] = "LiveJournal密码"; $a->strings["Post to LiveJournal by default"] = "默认地转播到LiveJournal"; diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index 1d5703e15..7843d6f39 100644 --- a/ljpost/ljpost.php +++ b/ljpost/ljpost.php @@ -1,5 +1,4 @@ */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function ljpost_install() { - register_hook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local'); - register_hook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send'); - register_hook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets'); - register_hook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings'); - register_hook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post'); + Addon::registerHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local'); + Addon::registerHook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send'); + Addon::registerHook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets'); + Addon::registerHook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings'); + Addon::registerHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post'); } function ljpost_uninstall() { - unregister_hook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local'); - unregister_hook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send'); - unregister_hook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets'); - unregister_hook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings'); - unregister_hook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post'); + Addon::unregisterHook('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send'); + Addon::unregisterHook('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post'); } @@ -71,7 +70,7 @@ function ljpost_settings(&$a,&$s) { $s .= '
'; $s .= '

' . t('LiveJournal Post Settings') . '

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/mahjongg/mahjongg.php b/mahjongg/mahjongg.php index 977c693d7..3567792b4 100644 --- a/mahjongg/mahjongg.php +++ b/mahjongg/mahjongg.php @@ -6,14 +6,14 @@ * Version: 1.0 * Author: Holger Froese */ - +use Friendica\Core\Addon; function mahjongg_install() { - register_hook('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu'); + Addon::registerHook('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu'); } function mahjongg_uninstall() { - unregister_hook('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu'); + Addon::unregisterHook('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu'); } diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 673643659..d40fdb7a7 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -5,17 +5,17 @@ * Version: 1.1 * Author: Matthew Exon */ - +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Database\DBM; function mailstream_install() { - register_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings'); - register_hook('plugin_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings_post'); - register_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - register_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - register_hook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); + Addon::registerHook('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post'); + Addon::registerHook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + Addon::registerHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + Addon::registerHook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); if (Config::get('mailstream', 'dbversion') == '0.1') { q('ALTER TABLE `mailstream_item` DROP INDEX `uid`'); @@ -52,21 +52,21 @@ function mailstream_install() { } function mailstream_uninstall() { - unregister_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings'); - unregister_hook('plugin_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings_post'); - unregister_hook('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); - unregister_hook('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); - unregister_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); - unregister_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); - unregister_hook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - unregister_hook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - unregister_hook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); - unregister_hook('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail'); + Addon::unregisterHook('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post'); + Addon::unregisterHook('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); + Addon::unregisterHook('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); + Addon::unregisterHook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); + Addon::unregisterHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); + Addon::unregisterHook('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + Addon::unregisterHook('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); + Addon::unregisterHook('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); + Addon::unregisterHook('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail'); } function mailstream_module() {} -function mailstream_plugin_admin(&$a,&$o) { +function mailstream_addon_admin(&$a,&$o) { $frommail = Config::get('mailstream', 'frommail'); $template = get_markup_template('admin.tpl', 'addon/mailstream/'); $config = ['frommail', @@ -78,7 +78,7 @@ function mailstream_plugin_admin(&$a,&$o) { '$submit' => t('Save Settings')]); } -function mailstream_plugin_admin_post ($a) { +function mailstream_addon_admin_post ($a) { if (x($_POST, 'frommail')) { Config::set('mailstream', 'frommail', $_POST['frommail']); } @@ -266,7 +266,7 @@ function mailstream_send($a, $message_id, $item, $user) { } $mail = new PHPmailer; try { - $mail->XMailer = 'Friendica Mailstream Plugin'; + $mail->XMailer = 'Friendica Mailstream Addon'; $mail->SetFrom($frommail, mailstream_sender($item)); $mail->AddAddress($address, $user['username']); $mail->MessageID = $message_id; @@ -346,7 +346,7 @@ function mailstream_cron($a, $b) { mailstream_tidy(); } -function mailstream_plugin_settings(&$a,&$s) { +function mailstream_addon_settings(&$a,&$s) { $enabled = PConfig::get(local_user(), 'mailstream', 'enabled'); $address = PConfig::get(local_user(), 'mailstream', 'address'); $nolikes = PConfig::get(local_user(), 'mailstream', 'nolikes'); @@ -376,7 +376,7 @@ function mailstream_plugin_settings(&$a,&$s) { '$submit' => t('Save Settings')]); } -function mailstream_plugin_settings_post($a,$post) { +function mailstream_addon_settings_post($a,$post) { if ($_POST['mailstream_address'] != "") { PConfig::set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']); } diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php index 8ff13f110..c2611e860 100644 --- a/mailstream/phpmailer/class.phpmailer.php +++ b/mailstream/phpmailer/class.phpmailer.php @@ -176,7 +176,7 @@ class PHPMailer public $UseSendmailOptions = true; /** - * Path to PHPMailer plugins. + * Path to PHPMailer addons. * Useful if the SMTP class is not in the PHP include path. * @var string * @deprecated Should not be needed now there is an autoloader. diff --git a/mathjax/lang/it/messages.po b/mathjax/lang/it/messages.po index 826737335..f44812c34 100644 --- a/mathjax/lang/it/messages.po +++ b/mathjax/lang/it/messages.po @@ -28,7 +28,7 @@ msgid "" "The MathJax addon renders mathematical formulae written using the LaTeX " "syntax surrounded by the usual $$ or an eqnarray block in the postings of " "your wall,network tab and private mail." -msgstr "Il plugin \"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati." +msgstr "Iladdon\"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati." #: mathjax.php:38 msgid "Use the MathJax renderer" diff --git a/mathjax/lang/it/strings.php b/mathjax/lang/it/strings.php index 1481d731d..a1aa5b2b0 100644 --- a/mathjax/lang/it/strings.php +++ b/mathjax/lang/it/strings.php @@ -6,7 +6,7 @@ function string_plural_select_it($n){ }} ; $a->strings["Settings"] = "Impostazioni"; -$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Il plugin \"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati."; +$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Il addon \"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati."; $a->strings["Use the MathJax renderer"] = "Usa il render MathJax"; $a->strings["Submit"] = "Invia"; $a->strings["Settings updated."] = "Impostazioni aggiornate."; diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index 2a7bc89c2..8308651ff 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -7,20 +7,20 @@ * Author: Tobias Diekershoff * License: 3-clause BSD license */ - +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; function mathjax_install() { - register_hook('page_header', 'addon/mathjax/mathjax.php', 'mathjax_page_header'); - register_hook('plugin_settings', 'addon/mathjax/mathjax.php', 'mathjax_settings'); - register_hook('plugin_settings_post', 'addon/mathjax/mathjax.php', 'mathjax_settings_post'); - logger('installed js_math plugin'); + Addon::registerHook('page_header', 'addon/mathjax/mathjax.php', 'mathjax_page_header'); + Addon::registerHook('addon_settings', 'addon/mathjax/mathjax.php', 'mathjax_settings'); + Addon::registerHook('addon_settings_post', 'addon/mathjax/mathjax.php', 'mathjax_settings_post'); + logger('installed js_math addon'); } function mathjax_uninstall() { - unregister_hook('page_header', 'addon/mathjax/mathjax.php', 'mathjax_page_header'); - unregister_hook('plugin_settings', 'addon/mathjax/mathjax.php', 'mathjax_settings'); - unregister_hook('plugin_settings_post', 'addon/mathjax/mathjax.php', 'mathjax_settings_post'); + Addon::unregisterHook('page_header', 'addon/mathjax/mathjax.php', 'mathjax_page_header'); + Addon::unregisterHook('addon_settings', 'addon/mathjax/mathjax.php', 'mathjax_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/mathjax/mathjax.php', 'mathjax_settings_post'); } function mathjax_settings_post ($a, $post) { if (! local_user()) @@ -68,12 +68,12 @@ function mathjax_page_header($a, &$b) { } } } -function mathjax_plugin_admin_post (&$a) { +function mathjax_addon_admin_post (&$a) { $baseurl = ((x($_POST, 'baseurl')) ? trim($_POST['baseurl']) : 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'); Config::set('mathjax','baseurl',$baseurl); info( t('Settings updated.'). EOL); } -function mathjax_plugin_admin (&$a, &$o) { +function mathjax_addon_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/mathjax/" ); if (Config::get('mathjax','baseurl','') == '') { Config::set('mathjax','baseurl','http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'); diff --git a/membersince/membersince.php b/membersince/membersince.php index c995c54bf..14669e35e 100644 --- a/membersince/membersince.php +++ b/membersince/membersince.php @@ -1,20 +1,30 @@ - * + * */ +use Friendica\Core\Addon; -require_once('include/datetime.php'); +require_once 'include/datetime.php'; -function membersince_install(){ register_hook('profile_advanced','addon/membersince/membersince.php','membersince_display'); } +function membersince_install() +{ + Addon::registerHook('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display'); +} -function membersince_uninstall(){ unregister_hook('profile_advanced','addon/membersince/membersince.php','membersince_display'); } +function membersince_uninstall() +{ + Addon::unregisterHook('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display'); +} -function membersince_display(&$a,&$b) { -$b = preg_replace('/<\/dl>/',"\n\n\n
\n
" . t('Member since:') . "
\n
" . datetime_convert('UTC',date_default_timezone_get(),$a->profile['register_date']) . "
\n
" ,$b, 1); -//$b = str_replace('
' . "\n" . '
',sprintf( t(' - Member since: %s') . EOL, datetime_convert('UTC',date_default_timezone_get(),$a->profile['register_date'])) . '
' . "\n" . '
',$b); -} \ No newline at end of file +function membersince_display(&$a, &$b) +{ + // Works in Vier + $b = preg_replace('/<\/dl>/', "\n\n\n
\n
" . t('Member since:') . "
\n
" . datetime_convert('UTC', date_default_timezone_get(), $a->profile['register_date']) . "
\n
", $b, 1); + + // Trying for Frio + //$b = preg_replace('/<\/div>/', "
" . t('Member since:') . "
" . datetime_convert('UTC', date_default_timezone_get(), $a->profile['register_date']) . "
", $b, 1); +} diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php index d22ec3aaf..b8a170a1b 100644 --- a/morechoice/morechoice.php +++ b/morechoice/morechoice.php @@ -7,24 +7,24 @@ * - who takes no responsibility for any additional content which may appear herein * */ - +use Friendica\Core\Addon; function morechoice_install() { - register_hook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector'); - register_hook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector'); - register_hook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector'); + Addon::registerHook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector'); + Addon::registerHook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector'); + Addon::registerHook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector'); } function morechoice_uninstall() { - unregister_hook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector'); - unregister_hook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector'); - unregister_hook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector'); + Addon::unregisterHook('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector'); + Addon::unregisterHook('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector'); + Addon::unregisterHook('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector'); // We need to leave this here for a while, because we now have a situation where people can end up with an orphaned hook. - unregister_hook('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs'); + Addon::unregisterHook('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs'); } diff --git a/morepokes/morepokes.php b/morepokes/morepokes.php index 9fd1a43e8..946a486ac 100644 --- a/morepokes/morepokes.php +++ b/morepokes/morepokes.php @@ -6,13 +6,14 @@ * Author: Thomas Willingham * */ +use Friendica\Core\Addon; function morepokes_install() { - register_hook('poke_verbs', 'addon/morepokes/morepokes.php', 'morepokes_poke_verbs'); + Addon::registerHook('poke_verbs', 'addon/morepokes/morepokes.php', 'morepokes_poke_verbs'); } function morepokes_uninstall() { - unregister_hook('poke_verbs', 'addon/morepokes/morepokes.php', 'morepokes_poke_verbs'); + Addon::unregisterHook('poke_verbs', 'addon/morepokes/morepokes.php', 'morepokes_poke_verbs'); } function morepokes_poke_verbs($a,&$b) { diff --git a/namethingy/namethingy.php b/namethingy/namethingy.php index 0ccf106c0..b5faf9fd2 100644 --- a/namethingy/namethingy.php +++ b/namethingy/namethingy.php @@ -1,5 +1,4 @@ */ - +use Friendica\Core\Addon; function namethingy_install() { - register_hook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu'); + Addon::registerHook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu'); } function namethingy_uninstall() { - unregister_hook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu'); + Addon::unregisterHook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu'); } diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php index 41e4e0d59..516a472e9 100644 --- a/newmemberwidget/newmemberwidget.php +++ b/newmemberwidget/newmemberwidget.php @@ -9,14 +9,15 @@ require_once('include/bbcode.php'); +use Friendica\Core\Addon; use Friendica\Core\Config; function newmemberwidget_install () { - register_hook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init'); + Addon::registerHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init'); logger('newmemberwidget installed'); } function newmemberwidget_uninstall () { - unregister_hook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init'); + Addon::unregisterHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init'); } function newmemberwidget_network_mod_init ( $a, $b) { @@ -36,7 +37,7 @@ function newmemberwidget_network_mod_init ( $a, $b) { } } -function newmemberwidget_plugin_admin_post( &$a ) { +function newmemberwidget_addon_admin_post( &$a ) { $ft = ((x($_POST, 'freetext')) ? trim($_POST['freetext']) : ""); $lsn = ((x($_POST, 'localsupportname')) ? notags(trim($_POST['localsupportname'])) : ""); $gs = intval($_POST['linkglobalsupport']); @@ -47,7 +48,7 @@ function newmemberwidget_plugin_admin_post( &$a ) { Config::set ( 'newmemberwidget', 'localsupport', trim($lsn)); } -function newmemberwidget_plugin_admin(&$a, &$o){ +function newmemberwidget_addon_admin(&$a, &$o){ $t = get_markup_template('admin.tpl','addon/newmemberwidget'); $o = replace_macros($t, [ '$submit' => t('Save Settings'), diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index a667f6a68..cdaa1815c 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -21,7 +21,7 @@ function notifyall_uninstall() { function notifyall_module() {} -function notifyall_plugin_admin(&$a, &$o) { +function notifyall_addon_admin(&$a, &$o) { $o = '
    ' . t('Send email to all members') . '
'; diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php index dcf969354..a1acd72cb 100644 --- a/notimeline/notimeline.php +++ b/notimeline/notimeline.php @@ -7,20 +7,20 @@ * * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function notimeline_install() { - register_hook('plugin_settings', 'addon/notimeline/notimeline.php', 'notimeline_settings'); - register_hook('plugin_settings_post', 'addon/notimeline/notimeline.php', 'notimeline_settings_post'); + Addon::registerHook('addon_settings', 'addon/notimeline/notimeline.php', 'notimeline_settings'); + Addon::registerHook('addon_settings_post', 'addon/notimeline/notimeline.php', 'notimeline_settings_post'); } function notimeline_uninstall() { - unregister_hook('plugin_settings', 'addon/notimeline/notimeline.php', 'notimeline_settings'); - unregister_hook('plugin_settings_post', 'addon/notimeline/notimeline.php', 'notimeline_settings_post'); + Addon::unregisterHook('addon_settings', 'addon/notimeline/notimeline.php', 'notimeline_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/notimeline/notimeline.php', 'notimeline_settings_post'); } diff --git a/nsfw/README b/nsfw/README index 624fb7031..e4a8b9d31 100644 --- a/nsfw/README +++ b/nsfw/README @@ -6,7 +6,7 @@ Scans the message content for the string 'nsfw' (case insensitive) and if found replaces the content with a "click to open/close" link, default is closed. -If you click on the 'Not safe for work' plugin under +If you click on the 'Not safe for work' addon under /settings/addon a text field appears, where you can extend the list of search terms. The terms must be seperated by commas. diff --git a/nsfw/lang/C/messages.po b/nsfw/lang/C/messages.po index 34ad6565f..0fd1035cb 100644 --- a/nsfw/lang/C/messages.po +++ b/nsfw/lang/C/messages.po @@ -23,7 +23,7 @@ msgstr "" #: nsfw.php:80 msgid "" -"This plugin looks in posts for the words/text you specify below, and " +"This addon looks in posts for the words/text you specify below, and " "collapses any content containing those keywords so it is not displayed at " "inappropriate times, such as sexual innuendo that may be improper in a work " "setting. It is polite and recommended to tag any content containing nudity " diff --git a/nsfw/lang/ca/strings.php b/nsfw/lang/ca/strings.php index 36607e47e..349ffefd9 100644 --- a/nsfw/lang/ca/strings.php +++ b/nsfw/lang/ca/strings.php @@ -1,7 +1,7 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Ajustos, Not Safe For Work (Filtre de Contingut de Propòsit General)"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Aquest plugin es veu en enviaments amb les paraules/text que s'especifiquen a continuació , i amagarà qualsevol contingut que contingui les paraules clau de manera que no apareguin en moments inapropiats, com ara insinuacions sexuals que poden ser inadequades en un entorn de treball. És de bona educació i es recomana etiquetar qualsevol contingut que contingui nus amb #NSFW. Aquest filtre també es pot fer coincidir amb qualsevol paraula/text que especifiqueu, i per tant pot ser utilitzat com un filtre general de contingut."; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Aquest addon es veu en enviaments amb les paraules/text que s'especifiquen a continuació , i amagarà qualsevol contingut que contingui les paraules clau de manera que no apareguin en moments inapropiats, com ara insinuacions sexuals que poden ser inadequades en un entorn de treball. És de bona educació i es recomana etiquetar qualsevol contingut que contingui nus amb #NSFW. Aquest filtre també es pot fer coincidir amb qualsevol paraula/text que especifiqueu, i per tant pot ser utilitzat com un filtre general de contingut."; $a->strings["Enable Content filter"] = "Activat el filtre de Contingut"; $a->strings["Comma separated list of keywords to hide"] = "Llista separada per comes de paraules clau per ocultar"; $a->strings["Submit"] = "Enviar"; diff --git a/nsfw/lang/cs/messages.po b/nsfw/lang/cs/messages.po index da5142ba4..61d367c4d 100644 --- a/nsfw/lang/cs/messages.po +++ b/nsfw/lang/cs/messages.po @@ -25,13 +25,13 @@ msgstr "Not Safe For Work (General Purpose Content Filter) nastavení" #: nsfw.php:80 msgid "" -"This plugin looks in posts for the words/text you specify below, and " +"This addon looks in posts for the words/text you specify below, and " "collapses any content containing those keywords so it is not displayed at " "inappropriate times, such as sexual innuendo that may be improper in a work " "setting. It is polite and recommended to tag any content containing nudity " "with #NSFW. This filter can also match any other word/text you specify, and" " can thereby be used as a general purpose content filter." -msgstr "Tento plugin hledá v příspěvcích slova zadáná níže a skryje jakýkoliv obsah, který tyto slova obsahuje v prostředích, kde to není vhodné. Je slušné a doporučené jakékoliv příspěvky s mahotou označit s #NSFW. Tento filtr může také vyhledávat jakékoliv Vámi specifikované slovní spojení, takže může být využit jako obecný kontextový filtr." +msgstr "Tento addon hledá v příspěvcích slova zadáná níže a skryje jakýkoliv obsah, který tyto slova obsahuje v prostředích, kde to není vhodné. Je slušné a doporučené jakékoliv příspěvky s mahotou označit s #NSFW. Tento filtr může také vyhledávat jakékoliv Vámi specifikované slovní spojení, takže může být využit jako obecný kontextový filtr." #: nsfw.php:81 msgid "Enable Content filter" diff --git a/nsfw/lang/cs/strings.php b/nsfw/lang/cs/strings.php index 973144958..fd07368bd 100644 --- a/nsfw/lang/cs/strings.php +++ b/nsfw/lang/cs/strings.php @@ -6,7 +6,7 @@ function string_plural_select_cs($n){ }} ; $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe For Work (General Purpose Content Filter) nastavení"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tento plugin hledá v příspěvcích slova zadáná níže a skryje jakýkoliv obsah, který tyto slova obsahuje v prostředích, kde to není vhodné. Je slušné a doporučené jakékoliv příspěvky s mahotou označit s #NSFW. Tento filtr může také vyhledávat jakékoliv Vámi specifikované slovní spojení, takže může být využit jako obecný kontextový filtr."; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tento addon hledá v příspěvcích slova zadáná níže a skryje jakýkoliv obsah, který tyto slova obsahuje v prostředích, kde to není vhodné. Je slušné a doporučené jakékoliv příspěvky s mahotou označit s #NSFW. Tento filtr může také vyhledávat jakékoliv Vámi specifikované slovní spojení, takže může být využit jako obecný kontextový filtr."; $a->strings["Enable Content filter"] = "Povolit Kontextový filtr"; $a->strings["Comma separated list of keywords to hide"] = "Čárkou oddělený seznam klíčových slov ke skrytí"; $a->strings["Submit"] = "Odeslat"; diff --git a/nsfw/lang/de/messages.po b/nsfw/lang/de/messages.po index 1355f8aba..192c33cf1 100644 --- a/nsfw/lang/de/messages.po +++ b/nsfw/lang/de/messages.po @@ -26,13 +26,13 @@ msgstr "Not Safe for Work (Filter für ungewollte Inhalte) Einstellungen:" #: nsfw.php:80 msgid "" -"This plugin looks in posts for the words/text you specify below, and " +"This addon looks in posts for the words/text you specify below, and " "collapses any content containing those keywords so it is not displayed at " "inappropriate times, such as sexual innuendo that may be improper in a work " "setting. It is polite and recommended to tag any content containing nudity " "with #NSFW. This filter can also match any other word/text you specify, and" " can thereby be used as a general purpose content filter." -msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden." +msgstr "Dieses Addon sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden." #: nsfw.php:81 msgid "Enable Content filter" diff --git a/nsfw/lang/de/strings.php b/nsfw/lang/de/strings.php index 36e258fab..a313c5059 100644 --- a/nsfw/lang/de/strings.php +++ b/nsfw/lang/de/strings.php @@ -6,7 +6,7 @@ function string_plural_select_de($n){ }} ; $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (Filter für ungewollte Inhalte) Einstellungen:"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Addon sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."; $a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter"; $a->strings["Comma separated list of keywords to hide"] = "Durch Kommata getrennte Liste von Schlüsselwörtern die verborgen werden sollen"; $a->strings["Submit"] = "Senden"; diff --git a/nsfw/lang/eo/strings.php b/nsfw/lang/eo/strings.php index d3f39d082..13da052ae 100644 --- a/nsfw/lang/eo/strings.php +++ b/nsfw/lang/eo/strings.php @@ -1,7 +1,7 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe For Work (ĝenerala filtrilo por enhavoj) agordoj"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tiu kromprogramo serĉas la malsupre agordatajn vortojn en afiŝoj kaj malvidebligis ilin se ili enhavas iun vorton. Tiel, afiŝoj ne montriĝis kiuj enhavas maladekvatan enhavon, ekzemple seksumaj aferoj, kiuj ne estas adekvata, ekzemple en la laborejo. En la reto, oni kutime markas tiajn afiŝojn #NSFW - Not Safe For Work - ne adekvata por la laborejo. La filtrilo ankaŭ serĉas ĉiujn vortojn kiujn vi agordas kaj tial funkcias kiel ĝenerala filtrilo."; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tiu kromprogramo serĉas la malsupre agordatajn vortojn en afiŝoj kaj malvidebligis ilin se ili enhavas iun vorton. Tiel, afiŝoj ne montriĝis kiuj enhavas maladekvatan enhavon, ekzemple seksumaj aferoj, kiuj ne estas adekvata, ekzemple en la laborejo. En la reto, oni kutime markas tiajn afiŝojn #NSFW - Not Safe For Work - ne adekvata por la laborejo. La filtrilo ankaŭ serĉas ĉiujn vortojn kiujn vi agordas kaj tial funkcias kiel ĝenerala filtrilo."; $a->strings["Enable Content filter"] = "Ŝalti la filtrilo por la enhavo"; $a->strings["Comma separated list of keywords to hide"] = "Perkome disigita listo da kaŝontaj ŝlosilvortoj"; $a->strings["Submit"] = "Sendi"; diff --git a/nsfw/lang/es/messages.po b/nsfw/lang/es/messages.po index 45659825b..2950395f2 100644 --- a/nsfw/lang/es/messages.po +++ b/nsfw/lang/es/messages.po @@ -25,13 +25,13 @@ msgstr "Configuración \"No apto para trabajar\" (Filtro genérico de contenido) #: nsfw.php:80 msgid "" -"This plugin looks in posts for the words/text you specify below, and " +"This addon looks in posts for the words/text you specify below, and " "collapses any content containing those keywords so it is not displayed at " "inappropriate times, such as sexual innuendo that may be improper in a work " "setting. It is polite and recommended to tag any content containing nudity " "with #NSFW. This filter can also match any other word/text you specify, and" " can thereby be used as a general purpose content filter." -msgstr "Este plugin se fija por el contenido del texto y colapsa todo tema o respuesta que contiene las palabras establecidas. Como tales pueden ser contenido sexual o de otra índole que no conviene desplegar en el trabajo o ambientes correspondientes. Es de buena educación y recomendado de identificar todo tipo de contenido explicito con #NSFW. Este filtro además puede ser usado con cualquier palabra a especificar y por lo tanto ser usado como un filtro generico de contenido." +msgstr "Este addon se fija por el contenido del texto y colapsa todo tema o respuesta que contiene las palabras establecidas. Como tales pueden ser contenido sexual o de otra índole que no conviene desplegar en el trabajo o ambientes correspondientes. Es de buena educación y recomendado de identificar todo tipo de contenido explicito con #NSFW. Este filtro además puede ser usado con cualquier palabra a especificar y por lo tanto ser usado como un filtro generico de contenido." #: nsfw.php:81 msgid "Enable Content filter" diff --git a/nsfw/lang/es/strings.php b/nsfw/lang/es/strings.php index 54fb2688f..75d3211df 100644 --- a/nsfw/lang/es/strings.php +++ b/nsfw/lang/es/strings.php @@ -6,7 +6,7 @@ function string_plural_select_es($n){ }} ; $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configuración \"No apto para trabajar\" (Filtro genérico de contenido)"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Este plugin se fija por el contenido del texto y colapsa todo tema o respuesta que contiene las palabras establecidas. Como tales pueden ser contenido sexual o de otra índole que no conviene desplegar en el trabajo o ambientes correspondientes. Es de buena educación y recomendado de identificar todo tipo de contenido explicito con #NSFW. Este filtro además puede ser usado con cualquier palabra a especificar y por lo tanto ser usado como un filtro generico de contenido."; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Este addon se fija por el contenido del texto y colapsa todo tema o respuesta que contiene las palabras establecidas. Como tales pueden ser contenido sexual o de otra índole que no conviene desplegar en el trabajo o ambientes correspondientes. Es de buena educación y recomendado de identificar todo tipo de contenido explicito con #NSFW. Este filtro además puede ser usado con cualquier palabra a especificar y por lo tanto ser usado como un filtro generico de contenido."; $a->strings["Enable Content filter"] = "Habilitar filtro de contenido"; $a->strings["Comma separated list of keywords to hide"] = "Lista de palabras claves separadas por coma para colapsar el contenido correspondiente."; $a->strings["Submit"] = "Enviar"; diff --git a/nsfw/lang/fr/strings.php b/nsfw/lang/fr/strings.php index 1bfbfdfa9..09086f48c 100644 --- a/nsfw/lang/fr/strings.php +++ b/nsfw/lang/fr/strings.php @@ -1,7 +1,7 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Réglages de \"NSFW\" (filtrage de contenu)"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Cette extension va parcourir les publications à la recherche des mots (ou phrases) que vous spécifierez ci-dessous, et repliera automatiquement tout contenu qui les contiendrait, afin de ne pas risquer de les afficher à un moment inopportun. Comme par exemple des messages à caractère sexuel dans un contexte professionnel. Il est globalement considéré comme correct et poli de \"tagguer\" toute publication contenant de la nudité avec #NSFW (Not Safe For Work - pas pour le boulot). Ce filtre peut également fonctionner pour tout autre texte que vous spécifierez, et pourra ainsi être utilisé comme filtre de contenu générique."; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Cette extension va parcourir les publications à la recherche des mots (ou phrases) que vous spécifierez ci-dessous, et repliera automatiquement tout contenu qui les contiendrait, afin de ne pas risquer de les afficher à un moment inopportun. Comme par exemple des messages à caractère sexuel dans un contexte professionnel. Il est globalement considéré comme correct et poli de \"tagguer\" toute publication contenant de la nudité avec #NSFW (Not Safe For Work - pas pour le boulot). Ce filtre peut également fonctionner pour tout autre texte que vous spécifierez, et pourra ainsi être utilisé comme filtre de contenu générique."; $a->strings["Enable Content filter"] = "Activer le filtrage de contenu"; $a->strings["Comma separated list of keywords to hide"] = "Liste de mots-clés - séparés par des virgules - à cacher"; $a->strings["Submit"] = "Envoyer"; diff --git a/nsfw/lang/is/strings.php b/nsfw/lang/is/strings.php index f4bcb8246..534f19c24 100644 --- a/nsfw/lang/is/strings.php +++ b/nsfw/lang/is/strings.php @@ -1,7 +1,7 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; $a->strings["Enable Content filter"] = ""; $a->strings["Comma separated list of keywords to hide"] = ""; $a->strings["Submit"] = "Senda inn"; diff --git a/nsfw/lang/it/messages.po b/nsfw/lang/it/messages.po index 934a3cae1..37b257404 100644 --- a/nsfw/lang/it/messages.po +++ b/nsfw/lang/it/messages.po @@ -25,13 +25,13 @@ msgstr "Impostazioni per NSWF (Filtro Contenuti Generico)" #: nsfw.php:80 msgid "" -"This plugin looks in posts for the words/text you specify below, and " +"This addon looks in posts for the words/text you specify below, and " "collapses any content containing those keywords so it is not displayed at " "inappropriate times, such as sexual innuendo that may be improper in a work " "setting. It is polite and recommended to tag any content containing nudity " "with #NSFW. This filter can also match any other word/text you specify, and" " can thereby be used as a general purpose content filter." -msgstr "Questo plugin cerca nei messagi le parole/testo che inserisci qui sotto, e collassa i messaggi che li contengono, per non mostrare contenuto inappropriato nel momento sbagliato, come contenuto a sfondo sessuale che può essere inappropriato in un ambiente di lavoro. E' educato (e consigliato) taggare i messaggi che contengono nudità con #NSFW (Not Safe For Work: Non Sicuro Per il Lavoro). Questo filtro può cercare anche qualsiasi parola che inserisci, quindi può essere usato come filtro di contenuti generico." +msgstr "Questo addon cerca nei messagi le parole/testo che inserisci qui sotto, e collassa i messaggi che li contengono, per non mostrare contenuto inappropriato nel momento sbagliato, come contenuto a sfondo sessuale che può essere inappropriato in un ambiente di lavoro. E' educato (e consigliato) taggare i messaggi che contengono nudità con #NSFW (Not Safe For Work: Non Sicuro Per il Lavoro). Questo filtro può cercare anche qualsiasi parola che inserisci, quindi può essere usato come filtro di contenuti generico." #: nsfw.php:81 msgid "Enable Content filter" diff --git a/nsfw/lang/it/strings.php b/nsfw/lang/it/strings.php index 36f7d9729..fc8ec54d1 100644 --- a/nsfw/lang/it/strings.php +++ b/nsfw/lang/it/strings.php @@ -6,7 +6,7 @@ function string_plural_select_it($n){ }} ; $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Impostazioni per NSWF (Filtro Contenuti Generico)"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Questo plugin cerca nei messagi le parole/testo che inserisci qui sotto, e collassa i messaggi che li contengono, per non mostrare contenuto inappropriato nel momento sbagliato, come contenuto a sfondo sessuale che può essere inappropriato in un ambiente di lavoro. E' educato (e consigliato) taggare i messaggi che contengono nudità con #NSFW (Not Safe For Work: Non Sicuro Per il Lavoro). Questo filtro può cercare anche qualsiasi parola che inserisci, quindi può essere usato come filtro di contenuti generico."; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Questo addon cerca nei messagi le parole/testo che inserisci qui sotto, e collassa i messaggi che li contengono, per non mostrare contenuto inappropriato nel momento sbagliato, come contenuto a sfondo sessuale che può essere inappropriato in un ambiente di lavoro. E' educato (e consigliato) taggare i messaggi che contengono nudità con #NSFW (Not Safe For Work: Non Sicuro Per il Lavoro). Questo filtro può cercare anche qualsiasi parola che inserisci, quindi può essere usato come filtro di contenuti generico."; $a->strings["Enable Content filter"] = "Abilita il Filtro Contenuti"; $a->strings["Comma separated list of keywords to hide"] = "Elenco separato da virgole di parole da nascondere"; $a->strings["Submit"] = "Invia"; diff --git a/nsfw/lang/nb-no/strings.php b/nsfw/lang/nb-no/strings.php index 7836003f2..5274da911 100644 --- a/nsfw/lang/nb-no/strings.php +++ b/nsfw/lang/nb-no/strings.php @@ -1,7 +1,7 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; $a->strings["Enable Content filter"] = ""; $a->strings["Comma separated list of keywords to hide"] = ""; $a->strings["Submit"] = "Lagre"; diff --git a/nsfw/lang/pl/strings.php b/nsfw/lang/pl/strings.php index b99d9ec2d..ea2189ca3 100644 --- a/nsfw/lang/pl/strings.php +++ b/nsfw/lang/pl/strings.php @@ -1,7 +1,7 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; $a->strings["Enable Content filter"] = ""; $a->strings["Comma separated list of keywords to hide"] = ""; $a->strings["Submit"] = "Potwierdź"; diff --git a/nsfw/lang/pt-br/messages.po b/nsfw/lang/pt-br/messages.po index 013c8b485..10435354e 100644 --- a/nsfw/lang/pt-br/messages.po +++ b/nsfw/lang/pt-br/messages.po @@ -25,7 +25,7 @@ msgstr "" #: nsfw.php:80 msgid "" -"This plugin looks in posts for the words/text you specify below, and " +"This addon looks in posts for the words/text you specify below, and " "collapses any content containing those keywords so it is not displayed at " "inappropriate times, such as sexual innuendo that may be improper in a work " "setting. It is polite and recommended to tag any content containing nudity " diff --git a/nsfw/lang/pt-br/strings.php b/nsfw/lang/pt-br/strings.php index 6c1b15d98..21a814923 100644 --- a/nsfw/lang/pt-br/strings.php +++ b/nsfw/lang/pt-br/strings.php @@ -6,7 +6,7 @@ function string_plural_select_pt_br($n){ }} ; $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; $a->strings["Enable Content filter"] = "Habilitar filtro de conteúdo"; $a->strings["Comma separated list of keywords to hide"] = ""; $a->strings["Submit"] = "Enviar"; diff --git a/nsfw/lang/ro/messages.po b/nsfw/lang/ro/messages.po index 503813c49..06d97e3f7 100644 --- a/nsfw/lang/ro/messages.po +++ b/nsfw/lang/ro/messages.po @@ -25,7 +25,7 @@ msgstr "Nesigur Pentru Lucru (Filtrare de Conținut pentru Uz General )" #: nsfw.php:80 msgid "" -"This plugin looks in posts for the words/text you specify below, and " +"This addon looks in posts for the words/text you specify below, and " "collapses any content containing those keywords so it is not displayed at " "inappropriate times, such as sexual innuendo that may be improper in a work " "setting. It is polite and recommended to tag any content containing nudity " diff --git a/nsfw/lang/ro/strings.php b/nsfw/lang/ro/strings.php index 28f71d2c9..f03f490f8 100644 --- a/nsfw/lang/ro/strings.php +++ b/nsfw/lang/ro/strings.php @@ -6,7 +6,7 @@ function string_plural_select_ro($n){ }} ; $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Nesigur Pentru Lucru (Filtrare de Conținut pentru Uz General )"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Acest modul verifică în postări, cuvintele/textele pe care le specificați mai jos, și cenzurează orice conținut cu aceste cuvinte cheie, astfel încât să nu se afișeze în momentele necorespunzătoare, precum aluziile sexuale ce pot fi necorespunzătoare într-un mediu de lucru. Este politicos și recomandat să etichetați orice conținut cu nuditate, folosind eticheta #NSFW. Acest filtru poate de asemenea, potrivi orice alt cuvânt/text specificat, şi poate fi folosit astfel și ca filtru de conținut cu scop general."; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Acest modul verifică în postări, cuvintele/textele pe care le specificați mai jos, și cenzurează orice conținut cu aceste cuvinte cheie, astfel încât să nu se afișeze în momentele necorespunzătoare, precum aluziile sexuale ce pot fi necorespunzătoare într-un mediu de lucru. Este politicos și recomandat să etichetați orice conținut cu nuditate, folosind eticheta #NSFW. Acest filtru poate de asemenea, potrivi orice alt cuvânt/text specificat, şi poate fi folosit astfel și ca filtru de conținut cu scop general."; $a->strings["Enable Content filter"] = "Activare filtru de Conținut"; $a->strings["Comma separated list of keywords to hide"] = "Lista cu separator prin virgulă a cuvintelor cheie, ce vor declanșa ascunderea"; $a->strings["Submit"] = "Trimite"; diff --git a/nsfw/lang/ru/strings.php b/nsfw/lang/ru/strings.php index 2ccb5ad14..7e821ed88 100644 --- a/nsfw/lang/ru/strings.php +++ b/nsfw/lang/ru/strings.php @@ -1,7 +1,7 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; $a->strings["Enable Content filter"] = "Включить фильтр содержимого"; $a->strings["Comma separated list of keywords to hide"] = "ключевые слова, которые скрыть (список через запятую)"; $a->strings["Submit"] = "Подтвердить"; diff --git a/nsfw/lang/zh-cn/strings.php b/nsfw/lang/zh-cn/strings.php index 0669361a8..44e9cc575 100644 --- a/nsfw/lang/zh-cn/strings.php +++ b/nsfw/lang/zh-cn/strings.php @@ -1,7 +1,7 @@ strings["Not Safe For Work (General Purpose Content Filter) settings"] = "工作不安全（通用内容过滤）设置"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "这个插件找您下面输入的词在所有的文章里，和把包括那些词的内容隐藏，省得不妥当的时候表示，比如性的影射在办公室里。是礼貌和建议的把什么包括裸体的内容跟#NSFW标签。这个过滤也会符合设么别的您输入的词，从而能当通用内容过滤有用的。"; +$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "这个插件找您下面输入的词在所有的文章里，和把包括那些词的内容隐藏，省得不妥当的时候表示，比如性的影射在办公室里。是礼貌和建议的把什么包括裸体的内容跟#NSFW标签。这个过滤也会符合设么别的您输入的词，从而能当通用内容过滤有用的。"; $a->strings["Enable Content filter"] = "使内容过滤可用"; $a->strings["Comma separated list of keywords to hide"] = "逗号分隔单词要隐藏"; $a->strings["Submit"] = "提交"; diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 6592738de..e43f0b51c 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -1,6 +1,4 @@ * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function nsfw_install() { - register_hook('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body', 10); - register_hook('plugin_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings'); - register_hook('plugin_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post'); + Addon::registerHook('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body', 10); + Addon::registerHook('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post'); } function nsfw_uninstall() { - unregister_hook('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body'); - unregister_hook('plugin_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings'); - unregister_hook('plugin_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post'); + Addon::unregisterHook('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body'); + Addon::unregisterHook('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post'); } @@ -85,7 +83,7 @@ function nsfw_addon_settings(&$a,&$s) { $s .= ''; $s .= '
'; - $s .= '

' . t ('This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter.') . '

'; + $s .= '

' . t ('This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter.') . '

'; $s .= ''; $s .= ''; $s .= '
'; diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php index 98295bfbb..5d6575c44 100644 --- a/numfriends/numfriends.php +++ b/numfriends/numfriends.php @@ -4,16 +4,14 @@ * Description: Change number of contacts shown of profile sidebar * Version: 1.0 * Author: Mike Macgirvin - * - * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function numfriends_install() { - register_hook('plugin_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings'); - register_hook('plugin_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post'); + Addon::registerHook('addon_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings'); + Addon::registerHook('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post'); logger("installed numfriends"); } @@ -21,15 +19,13 @@ function numfriends_install() { function numfriends_uninstall() { - unregister_hook('plugin_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings'); - unregister_hook('plugin_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post'); + Addon::unregisterHook('addon_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post'); logger("removed numfriends"); } - - /** * * Callback from the settings post function. @@ -38,7 +34,6 @@ function numfriends_uninstall() { * and if so set our configuration setting for this person. * */ - function numfriends_settings_post($a,$post) { if(! local_user() || (! x($_POST,'numfriends-submit'))) return; @@ -50,13 +45,10 @@ function numfriends_settings_post($a,$post) { /** * - * Called from the Plugin Setting form. + * Called from the Addon Setting form. * Add our own settings info to the page. * */ - - - function numfriends_settings(&$a, &$s) { if (! local_user()) { diff --git a/openstreetmap/README b/openstreetmap/README index beac3a218..93f231c64 100644 --- a/openstreetmap/README +++ b/openstreetmap/README @@ -1,4 +1,4 @@ - ____ OpenStreetMap Plugin ____ + ____ OpenStreetMap Addon ____ by Mike Macgirvin Klaus Weidenbach @@ -6,7 +6,7 @@ This addon allows you to use OpenStreetMap for displaying locations. ___ Requirements ___ -To use this plugin you need a tile Server that provides the maps. +To use this addon you need a tile Server that provides the maps. OpenStreetMap data is free for everyone to use. Their tile servers are not. Please take a look at their "Tile Usage Policy": http://wiki.openstreetmap.org/wiki/Tile_usage_policy @@ -19,9 +19,9 @@ ___ Configuration ___ If you for any reason prefer to use a configuration file instead of the admin panels, please refer to the Alternative Configuration below. -Activate the plugin from your admin panel. +Activate the addon from your admin panel. -You can now add a Tile Server and default zoom level in the plugin settings +You can now add a Tile Server and default zoom level in the addon settings page of your admin panel. The Time Server URL points to the tile server you want to use. Use the full URL, diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index ae9cb4802..29ada9246 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -8,27 +8,27 @@ * Author: Klaus Weidenbach * */ - +use Friendica\Core\Addon; use Friendica\Core\Cache; use Friendica\Core\Config; function openstreetmap_install() { - register_hook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location'); - register_hook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map'); - register_hook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map'); - register_hook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader'); + Addon::registerHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location'); + Addon::registerHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map'); + Addon::registerHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map'); + Addon::registerHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader'); logger("installed openstreetmap"); } function openstreetmap_uninstall() { - unregister_hook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location'); - unregister_hook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map'); - unregister_hook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map'); - unregister_hook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader'); + Addon::unregisterHook('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location'); + Addon::unregisterHook('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map'); + Addon::unregisterHook('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map'); + Addon::unregisterHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader'); logger("removed openstreetmap"); } @@ -163,7 +163,7 @@ function openstreetmap_generate_map(&$a, &$b) } -function openstreetmap_plugin_admin(&$a, &$o) +function openstreetmap_addon_admin(&$a, &$o) { $t = get_markup_template("admin.tpl", "addon/openstreetmap/"); $tmsserver = Config::get('openstreetmap', 'tmsserver'); @@ -192,7 +192,7 @@ function openstreetmap_plugin_admin(&$a, &$o) ]); } -function openstreetmap_plugin_admin_post(&$a) +function openstreetmap_addon_admin_post(&$a) { $urltms = ((x($_POST, 'tmsserver')) ? notags(trim($_POST['tmsserver'])) : ''); $urlnom = ((x($_POST, 'nomserver')) ? notags(trim($_POST['nomserver'])) : ''); diff --git a/pageheader/README b/pageheader/README index d3fbf9eab..c5d0fa3d9 100644 --- a/pageheader/README +++ b/pageheader/README @@ -2,7 +2,7 @@ Page Header For server admins only. Displays a text message for system announcements' -The message is entered in the admin account at settings, Plugin settings. +The message is entered in the admin account at settings, Addon settings. If you want to use HTML in the pageheader, create a file called pageheader.html in the document root of your friendica instance and add the html there. \ No newline at end of file diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php index 977bee4ed..96ad36301 100644 --- a/pageheader/pageheader.php +++ b/pageheader/pageheader.php @@ -1,6 +1,4 @@ * */ - +use Friendica\Core\Addon; use Friendica\Core\Config; function pageheader_install() { - register_hook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); - register_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings'); - register_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post'); + Addon::registerHook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); + Addon::registerHook('addon_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post'); } function pageheader_uninstall() { - unregister_hook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); - unregister_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings'); - unregister_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post'); + Addon::unregisterHook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); + Addon::unregisterHook('addon_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post'); // hook moved, uninstall the old one if still there. - unregister_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); + Addon::unregisterHook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); } diff --git a/piwik/README.md b/piwik/README.md index 0ac2ff72b..37ece2f0b 100644 --- a/piwik/README.md +++ b/piwik/README.md @@ -1,4 +1,4 @@ -Piwik Plugin +Piwik Addon ============ by Tobias Diekershoff and Klaus Weidenbach @@ -9,7 +9,7 @@ tool Piwik into the Friendica pages. Requirements ------------ -To use this plugin you need a [piwik](http://piwik.org/) installation. +To use this addon you need a [piwik](http://piwik.org/) installation. Where to find ------------- diff --git a/piwik/piwik.php b/piwik/piwik.php index 8253f4a7a..326b931f5 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -1,13 +1,13 @@ * Author: Klaus Weidenbach */ -/* Piwik Analytics Plugin for Friendica +/* Piwik Analytics Addon for Friendica * * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net @@ -29,25 +29,25 @@ * about http/https but beware to put the trailing / at the end of your * setting. */ - +use Friendica\Core\Addon; use Friendica\Core\Config; function piwik_install() { - register_hook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics'); + Addon::registerHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics'); - logger("installed piwik plugin"); + logger("installed piwik addon"); } function piwik_uninstall() { - unregister_hook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics'); + Addon::unregisterHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics'); - logger("uninstalled piwik plugin"); + logger("uninstalled piwik addon"); } function piwik_analytics($a,&$b) { /* - * styling of every HTML block added by this plugin is done in the + * styling of every HTML block added by this addon is done in the * associated CSS file. We just have to tell Friendica to get it * into the page header. */ @@ -85,7 +85,7 @@ function piwik_analytics($a,&$b) { $b .= "
"; } } -function piwik_plugin_admin (&$a, &$o) { +function piwik_addon_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/piwik/" ); $o = replace_macros( $t, [ '$submit' => t('Save Settings'), @@ -95,7 +95,7 @@ function piwik_plugin_admin (&$a, &$o) { '$async' => ['async', t('Asynchronous tracking'), Config::get('piwik','async' ), ''], ]); } -function piwik_plugin_admin_post (&$a) { +function piwik_addon_admin_post (&$a) { $url = ((x($_POST, 'baseurl')) ? notags(trim($_POST['baseurl'])) : ''); $id = ((x($_POST, 'siteid')) ? trim($_POST['siteid']) : ''); $optout = ((x($_POST, 'optout')) ? trim($_POST['optout']) : ''); diff --git a/planets/lang/C/messages.po b/planets/lang/C/messages.po index 843752a1d..f0773cc27 100644 --- a/planets/lang/C/messages.po +++ b/planets/lang/C/messages.po @@ -22,7 +22,7 @@ msgid "Planets Settings" msgstr "" #: planets.php:152 -msgid "Enable Planets Plugin" +msgid "Enable Planets Addon" msgstr "" #: planets.php:158 diff --git a/planets/lang/ca/strings.php b/planets/lang/ca/strings.php index 79fdd6be2..625dcab92 100644 --- a/planets/lang/ca/strings.php +++ b/planets/lang/ca/strings.php @@ -1,5 +1,5 @@ strings["Planets Settings"] = "Ajustos de Planet"; -$a->strings["Enable Planets Plugin"] = "Activa Plugin de Planet"; +$a->strings["Enable Planets Addon"] = "Activa Addon de Planet"; $a->strings["Submit"] = "Enviar"; diff --git a/planets/lang/cs/messages.po b/planets/lang/cs/messages.po index c47ff06cd..ac2b9c749 100644 --- a/planets/lang/cs/messages.po +++ b/planets/lang/cs/messages.po @@ -24,8 +24,8 @@ msgid "Planets Settings" msgstr "Planets Nastavení" #: planets.php:152 -msgid "Enable Planets Plugin" -msgstr "Povolit Planets plugin" +msgid "Enable Planets Addon" +msgstr "Povolit Planets addon" #: planets.php:158 msgid "Submit" diff --git a/planets/lang/cs/strings.php b/planets/lang/cs/strings.php index 268f31921..c4c0524df 100644 --- a/planets/lang/cs/strings.php +++ b/planets/lang/cs/strings.php @@ -6,5 +6,5 @@ function string_plural_select_cs($n){ }} ; $a->strings["Planets Settings"] = "Planets Nastavení"; -$a->strings["Enable Planets Plugin"] = "Povolit Planets plugin"; +$a->strings["Enable Planets Addon"] = "Povolit Planets addon"; $a->strings["Submit"] = "Odeslat"; diff --git a/planets/lang/de/messages.po b/planets/lang/de/messages.po index 42788d569..89f4d07ab 100644 --- a/planets/lang/de/messages.po +++ b/planets/lang/de/messages.po @@ -25,8 +25,8 @@ msgid "Planets Settings" msgstr "Planeten Einstellungen" #: planets.php:152 -msgid "Enable Planets Plugin" -msgstr "Planeten-Plugin aktivieren" +msgid "Enable Planets Addon" +msgstr "Planeten-Addon aktivieren" #: planets.php:158 msgid "Submit" diff --git a/planets/lang/de/strings.php b/planets/lang/de/strings.php index ab513fac2..653d025b9 100644 --- a/planets/lang/de/strings.php +++ b/planets/lang/de/strings.php @@ -6,5 +6,5 @@ function string_plural_select_de($n){ }} ; $a->strings["Planets Settings"] = "Planeten Einstellungen"; -$a->strings["Enable Planets Plugin"] = "Planeten-Plugin aktivieren"; +$a->strings["Enable Planets Addon"] = "Planeten-Addon aktivieren"; $a->strings["Submit"] = "Senden"; diff --git a/planets/lang/eo/strings.php b/planets/lang/eo/strings.php index 2f9ff97cd..c6b6d4130 100644 --- a/planets/lang/eo/strings.php +++ b/planets/lang/eo/strings.php @@ -1,5 +1,5 @@ strings["Planets Settings"] = "Agordo pri Planets"; -$a->strings["Enable Planets Plugin"] = "Ŝalti la Planets kromprogamon"; +$a->strings["Enable Planets Addon"] = "Ŝalti la Planets kromprogamon"; $a->strings["Submit"] = "Sendi"; diff --git a/planets/lang/es/messages.po b/planets/lang/es/messages.po index 294da0821..b1e336591 100644 --- a/planets/lang/es/messages.po +++ b/planets/lang/es/messages.po @@ -24,8 +24,8 @@ msgid "Planets Settings" msgstr "Ajustes de Planets" #: planets.php:152 -msgid "Enable Planets Plugin" -msgstr "Habilite el plugin Planets" +msgid "Enable Planets Addon" +msgstr "Habilite eladdonPlanets" #: planets.php:158 msgid "Submit" diff --git a/planets/lang/es/strings.php b/planets/lang/es/strings.php index 8c7ef65d1..2fd5ed903 100644 --- a/planets/lang/es/strings.php +++ b/planets/lang/es/strings.php @@ -6,5 +6,5 @@ function string_plural_select_es($n){ }} ; $a->strings["Planets Settings"] = "Ajustes de Planets"; -$a->strings["Enable Planets Plugin"] = "Habilite el plugin Planets"; +$a->strings["Enable Planets Addon"] = "Habilite el addon Planets"; $a->strings["Submit"] = "Enviar"; diff --git a/planets/lang/fr/strings.php b/planets/lang/fr/strings.php index 505d24c34..b4524f102 100644 --- a/planets/lang/fr/strings.php +++ b/planets/lang/fr/strings.php @@ -1,5 +1,5 @@ strings["Planets Settings"] = "Réglages des Planets"; -$a->strings["Enable Planets Plugin"] = "Activer Planets"; +$a->strings["Enable Planets Addon"] = "Activer Planets"; $a->strings["Submit"] = "Envoyer"; diff --git a/planets/lang/is/strings.php b/planets/lang/is/strings.php index d59b838f2..82f8b728a 100644 --- a/planets/lang/is/strings.php +++ b/planets/lang/is/strings.php @@ -1,5 +1,5 @@ strings["Planets Settings"] = ""; -$a->strings["Enable Planets Plugin"] = ""; +$a->strings["Enable Planets Addon"] = ""; $a->strings["Submit"] = "Senda inn"; diff --git a/planets/lang/it/messages.po b/planets/lang/it/messages.po index 4cb0b6941..26c8e03df 100644 --- a/planets/lang/it/messages.po +++ b/planets/lang/it/messages.po @@ -24,8 +24,8 @@ msgid "Planets Settings" msgstr "Impostazioni \"Pianeti\"" #: planets.php:152 -msgid "Enable Planets Plugin" -msgstr "Abilita il plugin \"Pianeti\"" +msgid "Enable Planets Addon" +msgstr "Abilita il addon\"Pianeti\"" #: planets.php:158 msgid "Submit" diff --git a/planets/lang/it/strings.php b/planets/lang/it/strings.php index 1cfa66e69..c568fb366 100644 --- a/planets/lang/it/strings.php +++ b/planets/lang/it/strings.php @@ -6,5 +6,5 @@ function string_plural_select_it($n){ }} ; $a->strings["Planets Settings"] = "Impostazioni \"Pianeti\""; -$a->strings["Enable Planets Plugin"] = "Abilita il plugin \"Pianeti\""; +$a->strings["Enable Planets Addon"] = "Abilita il addon \"Pianeti\""; $a->strings["Submit"] = "Invia"; diff --git a/planets/lang/nb-no/strings.php b/planets/lang/nb-no/strings.php index 628eb2aef..7d8fbe48b 100644 --- a/planets/lang/nb-no/strings.php +++ b/planets/lang/nb-no/strings.php @@ -1,5 +1,5 @@ strings["Planets Settings"] = ""; -$a->strings["Enable Planets Plugin"] = ""; +$a->strings["Enable Planets Addon"] = ""; $a->strings["Submit"] = "Lagre"; diff --git a/planets/lang/pl/strings.php b/planets/lang/pl/strings.php index 971200460..0e05c0a47 100644 --- a/planets/lang/pl/strings.php +++ b/planets/lang/pl/strings.php @@ -1,5 +1,5 @@ strings["Planets Settings"] = ""; -$a->strings["Enable Planets Plugin"] = ""; +$a->strings["Enable Planets Addon"] = ""; $a->strings["Submit"] = "Potwierdź"; diff --git a/planets/lang/pt-br/strings.php b/planets/lang/pt-br/strings.php index 5cb179c5d..6f3b8f10e 100644 --- a/planets/lang/pt-br/strings.php +++ b/planets/lang/pt-br/strings.php @@ -1,5 +1,5 @@ strings["Planets Settings"] = "Configuração dos planetas"; -$a->strings["Enable Planets Plugin"] = "Habilita configuração dos planetas"; +$a->strings["Enable Planets Addon"] = "Habilita configuração dos planetas"; $a->strings["Submit"] = "Enviar"; diff --git a/planets/lang/ro/messages.po b/planets/lang/ro/messages.po index 67932a8b4..b94394aeb 100644 --- a/planets/lang/ro/messages.po +++ b/planets/lang/ro/messages.po @@ -24,7 +24,7 @@ msgid "Planets Settings" msgstr "Configurări Planets" #: planets.php:152 -msgid "Enable Planets Plugin" +msgid "Enable Planets Addon" msgstr "Activare Modul Planets" #: planets.php:158 diff --git a/planets/lang/ro/strings.php b/planets/lang/ro/strings.php index 93736aad8..19a2e3dee 100644 --- a/planets/lang/ro/strings.php +++ b/planets/lang/ro/strings.php @@ -6,5 +6,5 @@ function string_plural_select_ro($n){ }} ; $a->strings["Planets Settings"] = "Configurări Planets"; -$a->strings["Enable Planets Plugin"] = "Activare Modul Planets"; +$a->strings["Enable Planets Addon"] = "Activare Modul Planets"; $a->strings["Submit"] = "Trimite"; diff --git a/planets/lang/ru/strings.php b/planets/lang/ru/strings.php index 1902b826f..b84e2bbca 100644 --- a/planets/lang/ru/strings.php +++ b/planets/lang/ru/strings.php @@ -1,5 +1,5 @@ strings["Planets Settings"] = ""; -$a->strings["Enable Planets Plugin"] = ""; +$a->strings["Enable Planets Addon"] = ""; $a->strings["Submit"] = "Подтвердить"; diff --git a/planets/lang/zh-cn/strings.php b/planets/lang/zh-cn/strings.php index ac066c776..68de35c6c 100644 --- a/planets/lang/zh-cn/strings.php +++ b/planets/lang/zh-cn/strings.php @@ -1,5 +1,5 @@ strings["Planets Settings"] = "行星设置"; -$a->strings["Enable Planets Plugin"] = "使行星插件可用"; +$a->strings["Enable Planets Addon"] = "使行星插件可用"; $a->strings["Submit"] = "提交"; diff --git a/planets/planets.php b/planets/planets.php index 0d88e21dc..04fb72ca7 100644 --- a/planets/planets.php +++ b/planets/planets.php @@ -1,35 +1,35 @@ * Author: Tony Baldwin */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function planets_install() { /** * - * Our demo plugin will attach in three places. + * Our demo addon will attach in three places. * The first is just prior to storing a local post. * */ - register_hook('post_local', 'addon/planets/planets.php', 'planets_post_hook'); + Addon::registerHook('post_local', 'addon/planets/planets.php', 'planets_post_hook'); /** * - * Then we'll attach into the plugin settings page, and also the + * Then we'll attach into the addon settings page, and also the * settings post hook so that we can create and update * user preferences. * */ - register_hook('plugin_settings', 'addon/planets/planets.php', 'planets_settings'); - register_hook('plugin_settings_post', 'addon/planets/planets.php', 'planets_settings_post'); + Addon::registerHook('addon_settings', 'addon/planets/planets.php', 'planets_settings'); + Addon::registerHook('addon_settings_post', 'addon/planets/planets.php', 'planets_settings_post'); logger("installed planets"); } @@ -45,9 +45,9 @@ function planets_uninstall() { * */ - unregister_hook('post_local', 'addon/planets/planets.php', 'planets_post_hook'); - unregister_hook('plugin_settings', 'addon/planets/planets.php', 'planets_settings'); - unregister_hook('plugin_settings_post', 'addon/planets/planets.php', 'planets_settings_post'); + Addon::unregisterHook('post_local', 'addon/planets/planets.php', 'planets_post_hook'); + Addon::unregisterHook('addon_settings', 'addon/planets/planets.php', 'planets_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/planets/planets.php', 'planets_settings_post'); logger("removed planets"); @@ -62,7 +62,7 @@ function planets_post_hook($a, &$item) { * An item was posted on the local system. * We are going to look for specific items: * - A status post by a profile owner - * - The profile owner must have allowed our plugin + * - The profile owner must have allowed our addon * */ @@ -123,7 +123,7 @@ function planets_settings_post($a,$post) { /** * - * Called from the Plugin Setting form. + * Called from the Addon Setting form. * Add our own settings info to the page. * */ @@ -158,7 +158,7 @@ function planets_settings(&$a,&$s) { $s .= '
'; $s .= '

' . t('Planets Settings') . '

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/pledgie/pledgie.php b/pledgie/pledgie.php index 6183c76df..2b75268ba 100644 --- a/pledgie/pledgie.php +++ b/pledgie/pledgie.php @@ -7,19 +7,19 @@ * Hauke Altmann * */ - +use Friendica\Core\Addon; use Friendica\Core\Config; function pledgie_install() { - register_hook('page_end', 'addon/pledgie/pledgie.php', 'pledgie_active'); - register_hook('plugin_settings', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings'); - register_hook('plugin_settings_post', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings_post'); + Addon::registerHook('page_end', 'addon/pledgie/pledgie.php', 'pledgie_active'); + Addon::registerHook('addon_settings', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings_post'); } function pledgie_uninstall() { - unregister_hook('page_end', 'addon/pledgie/pledgie.php', 'pledgie_active'); - unregister_hook('plugin_settings', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings'); - unregister_hook('plugin_settings_post', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings_post'); + Addon::unregisterHook('page_end', 'addon/pledgie/pledgie.php', 'pledgie_active'); + Addon::unregisterHook('addon_settings', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/pledgie/pledgie.php', 'pledgie_addon_settings_post'); } function pledgie_addon_settings(&$a,&$s) { diff --git a/public_server/README.md b/public_server/README.md index d323ff0f3..b1fb49df0 100644 --- a/public_server/README.md +++ b/public_server/README.md @@ -2,10 +2,10 @@ Public Server ============= -Public Server is a Friendica plugin which implements automatic account & post expiration so that a site may be used as a public +Public Server is a Friendica addon which implements automatic account & post expiration so that a site may be used as a public test bed with reduced data retention. -This is a modified version of the testdrive plugin, DO NOT ACTIVATE AT THE SAME TIME AS THE TESTDRIVE PLUGIN. +This is a modified version of the testdrive addon, DO NOT ACTIVATE AT THE SAME TIME AS THE TESTDRIVE ADDON. //When an account is created on the site, it is given a hard expiration date of $a->config['public_server']['expiredays'] = 30; @@ -19,7 +19,7 @@ This is a modified version of the testdrive plugin, DO NOT ACTIVATE AT THE SAME $a->config['public_server']['flagposts'] = 90; $a->config['public_server']['flagpostsexpire'] = 146; -Set these in your .htconfig.php file. By default nothing is defined in case the plugin is activated accidentally. +Set these in your .htconfig.php file. By default nothing is defined in case the addon is activated accidentally. They can be ommitted or set to 0 to disable each option. The default values are those used by friendica.eu, change these as desired. diff --git a/public_server/public_server.php b/public_server/public_server.php index 0ea029b3c..2c0965681 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -1,31 +1,30 @@ */ - +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Model\User; function public_server_install() { - register_hook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account'); - register_hook('cron', 'addon/public_server/public_server.php', 'public_server_cron'); - register_hook('enotify','addon/public_server/public_server.php', 'public_server_enotify'); - register_hook('logged_in', 'addon/public_server/public_server.php', 'public_server_login'); + Addon::registerHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account'); + Addon::registerHook('cron', 'addon/public_server/public_server.php', 'public_server_cron'); + Addon::registerHook('enotify','addon/public_server/public_server.php', 'public_server_enotify'); + Addon::registerHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login'); } function public_server_uninstall() { - unregister_hook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account'); - unregister_hook('cron', 'addon/public_server/public_server.php', 'public_server_cron'); - unregister_hook('enotify','addon/public_server/public_server.php', 'public_server_enotify'); - unregister_hook('logged_in', 'addon/public_server/public_server.php', 'public_server_login'); + Addon::unregisterHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account'); + Addon::unregisterHook('cron', 'addon/public_server/public_server.php', 'public_server_cron'); + Addon::unregisterHook('enotify','addon/public_server/public_server.php', 'public_server_enotify'); + Addon::unregisterHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login'); } function public_server_register_account($a,$b) { @@ -142,8 +141,8 @@ function public_server_login($a,$b) { ); } -function public_server_plugin_admin_post ( &$a ) { - check_form_security_token_redirectOnErr('/admin/plugins/publicserver', 'publicserver'); +function public_server_addon_admin_post ( &$a ) { + check_form_security_token_redirectOnErr('/admin/addons/publicserver', 'publicserver'); $expiredays = (( x($_POST, 'expiredays') ) ? notags(trim($_POST['expiredays'] )) : ''); $expireposts = (( x($_POST, 'expireposts') ) ? notags(trim($_POST['expireposts'] )) : ''); $nologin = (( x($_POST, 'nologin') ) ? notags(trim($_POST['nologin'] )) : ''); @@ -158,7 +157,7 @@ function public_server_plugin_admin_post ( &$a ) { Config::set( 'public_server','flagpostsexpire',$flagpostsexpire ); info( t('Settings saved').EOL ); } -function public_server_plugin_admin ( &$a, &$o) { +function public_server_addon_admin ( &$a, &$o) { $token = get_form_security_token("publicserver"); $t = get_markup_template( "admin.tpl", "addon/public_server"); $o = replace_macros($t, [ diff --git a/pumpio/lang/C/messages.po b/pumpio/lang/C/messages.po index 84ce856f4..a35f0410a 100644 --- a/pumpio/lang/C/messages.po +++ b/pumpio/lang/C/messages.po @@ -59,7 +59,7 @@ msgid "Import the remote timeline" msgstr "" #: pumpio.php:255 -msgid "Enable pump.io Post Plugin" +msgid "Enable pump.io Post Addon" msgstr "" #: pumpio.php:260 diff --git a/pumpio/lang/cs/messages.po b/pumpio/lang/cs/messages.po index 157699e37..f5f9f35ce 100644 --- a/pumpio/lang/cs/messages.po +++ b/pumpio/lang/cs/messages.po @@ -61,8 +61,8 @@ msgid "Import the remote timeline" msgstr "Importovat vzdálenou časovou osu" #: pumpio.php:255 -msgid "Enable pump.io Post Plugin" -msgstr "Aktivovat pump.io Post Plugin" +msgid "Enable pump.io Post Addon" +msgstr "Aktivovat pump.io Post Addon" #: pumpio.php:260 msgid "Post to pump.io by default" diff --git a/pumpio/lang/cs/strings.php b/pumpio/lang/cs/strings.php index 6af0c8137..e5bc749dd 100644 --- a/pumpio/lang/cs/strings.php +++ b/pumpio/lang/cs/strings.php @@ -15,7 +15,7 @@ $a->strings["pump.io username (without the servername)"] = "uživatelské jméno $a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "jméno serveru pump.io (bez \"http://\" nebo \"https://\" )"; $a->strings["Authenticate your pump.io connection"] = "Přihlásit ke spojení na pump.io"; $a->strings["Import the remote timeline"] = "Importovat vzdálenou časovou osu"; -$a->strings["Enable pump.io Post Plugin"] = "Aktivovat pump.io Post Plugin"; +$a->strings["Enable pump.io Post Addon"] = "Aktivovat pump.io Post Addon"; $a->strings["Post to pump.io by default"] = "Defaultní umístění na pump.oi "; $a->strings["Should posts be public?"] = "Mají být příspěvky veřejné?"; $a->strings["Mirror all public posts"] = "Zrcadlit všechny veřejné příspěvky"; diff --git a/pumpio/lang/de/messages.po b/pumpio/lang/de/messages.po index 4a85f7931..acfb87fad 100644 --- a/pumpio/lang/de/messages.po +++ b/pumpio/lang/de/messages.po @@ -61,8 +61,8 @@ msgid "Import the remote timeline" msgstr "Importiere die entfernte Zeitleiste" #: pumpio.php:255 -msgid "Enable pump.io Post Plugin" -msgstr "Pump.io-Post-Plugin aktivieren" +msgid "Enable pump.io Post Addon" +msgstr "Pump.io-Post-Addon aktivieren" #: pumpio.php:260 msgid "Post to pump.io by default" diff --git a/pumpio/lang/de/strings.php b/pumpio/lang/de/strings.php index 91c1735c0..4f2c8c88a 100644 --- a/pumpio/lang/de/strings.php +++ b/pumpio/lang/de/strings.php @@ -15,7 +15,7 @@ $a->strings["pump.io username (without the servername)"] = " Pump.io Nutzername $a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = " Pump.io Servername (ohne \"http://\" oder \"https://\" )"; $a->strings["Authenticate your pump.io connection"] = "Authentifiziere deine Pump.io Verbindung"; $a->strings["Import the remote timeline"] = "Importiere die entfernte Zeitleiste"; -$a->strings["Enable pump.io Post Plugin"] = "Pump.io-Post-Plugin aktivieren"; +$a->strings["Enable pump.io Post Addon"] = "Pump.io-Post-Addon aktivieren"; $a->strings["Post to pump.io by default"] = "Standardmäßig bei Pump.io veröffentlichen"; $a->strings["Should posts be public?"] = "Sollen Nachrichten öffentlich sein ?"; $a->strings["Mirror all public posts"] = "Spiegle alle öffentlichen Nachrichten"; diff --git a/pumpio/lang/es/messages.po b/pumpio/lang/es/messages.po index dd3816264..869819969 100644 --- a/pumpio/lang/es/messages.po +++ b/pumpio/lang/es/messages.po @@ -61,8 +61,8 @@ msgid "Import the remote timeline" msgstr "Importar la línea de tiempo remota" #: pumpio.php:255 -msgid "Enable pump.io Post Plugin" -msgstr "Habilitar Plugin de publicación de Pump.io" +msgid "Enable pump.io Post Addon" +msgstr "Habilitar Addon de publicación de Pump.io" #: pumpio.php:260 msgid "Post to pump.io by default" diff --git a/pumpio/lang/es/strings.php b/pumpio/lang/es/strings.php index 8f0a8bfb3..df9630b22 100644 --- a/pumpio/lang/es/strings.php +++ b/pumpio/lang/es/strings.php @@ -15,7 +15,7 @@ $a->strings["pump.io username (without the servername)"] = "Nombre de usuario de $a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "Nombre de servidor de Pump.io (sin \"http://\" o \"https://\" )"; $a->strings["Authenticate your pump.io connection"] = "Autenticar su conexión de Pump.io"; $a->strings["Import the remote timeline"] = "Importar la línea de tiempo remota"; -$a->strings["Enable pump.io Post Plugin"] = "Habilitar Plugin de publicación de Pump.io"; +$a->strings["Enable pump.io Post Addon"] = "Habilitar Addon de publicación de Pump.io"; $a->strings["Post to pump.io by default"] = "Publicar en Pump.io por defecto"; $a->strings["Should posts be public?"] = "¿Deberían de ser públicas las entradas?"; $a->strings["Mirror all public posts"] = "Reflejar todas las entradas públicas"; diff --git a/pumpio/lang/fr/messages.po b/pumpio/lang/fr/messages.po index 9258d6198..28c5891f0 100644 --- a/pumpio/lang/fr/messages.po +++ b/pumpio/lang/fr/messages.po @@ -62,7 +62,7 @@ msgid "Import the remote timeline" msgstr "Importer la timeline distante" #: pumpio.php:255 -msgid "Enable pump.io Post Plugin" +msgid "Enable pump.io Post Addon" msgstr "" #: pumpio.php:260 diff --git a/pumpio/lang/fr/strings.php b/pumpio/lang/fr/strings.php index 3f9331737..3e69c2728 100644 --- a/pumpio/lang/fr/strings.php +++ b/pumpio/lang/fr/strings.php @@ -15,7 +15,7 @@ $a->strings["pump.io username (without the servername)"] = "Nom d'utilisateur pu $a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = ""; $a->strings["Authenticate your pump.io connection"] = ""; $a->strings["Import the remote timeline"] = "Importer la timeline distante"; -$a->strings["Enable pump.io Post Plugin"] = ""; +$a->strings["Enable pump.io Post Addon"] = ""; $a->strings["Post to pump.io by default"] = "Publier sur pump.io par défaut"; $a->strings["Should posts be public?"] = "Les messages devraient être publiques ?"; $a->strings["Mirror all public posts"] = ""; diff --git a/pumpio/lang/it/messages.po b/pumpio/lang/it/messages.po index 3529a0808..9e98acfd8 100644 --- a/pumpio/lang/it/messages.po +++ b/pumpio/lang/it/messages.po @@ -61,8 +61,8 @@ msgid "Import the remote timeline" msgstr "Importa la timeline remota" #: pumpio.php:255 -msgid "Enable pump.io Post Plugin" -msgstr "Abilita il plugin di invio ad pump.io" +msgid "Enable pump.io Post Addon" +msgstr "Abilita iladdondi invio ad pump.io" #: pumpio.php:260 msgid "Post to pump.io by default" diff --git a/pumpio/lang/it/strings.php b/pumpio/lang/it/strings.php index 3a26670a4..087a188ae 100644 --- a/pumpio/lang/it/strings.php +++ b/pumpio/lang/it/strings.php @@ -15,7 +15,7 @@ $a->strings["pump.io username (without the servername)"] = "nome utente pump.io $a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "nome del server pump.io (senza \"http://\" o \"https://\")"; $a->strings["Authenticate your pump.io connection"] = "Autentica la tua connessione pump.io"; $a->strings["Import the remote timeline"] = "Importa la timeline remota"; -$a->strings["Enable pump.io Post Plugin"] = "Abilita il plugin di invio ad pump.io"; +$a->strings["Enable pump.io Post Addon"] = "Abilita il addon di invio ad pump.io"; $a->strings["Post to pump.io by default"] = "Invia sempre a pump.io"; $a->strings["Should posts be public?"] = "I messaggi devono essere pubblici?"; $a->strings["Mirror all public posts"] = "Clona tutti i messaggi pubblici"; diff --git a/pumpio/lang/pt-br/messages.po b/pumpio/lang/pt-br/messages.po index 8f02e0403..bceaa2fee 100644 --- a/pumpio/lang/pt-br/messages.po +++ b/pumpio/lang/pt-br/messages.po @@ -61,7 +61,7 @@ msgid "Import the remote timeline" msgstr "Importar a linha do tempo remota" #: pumpio.php:255 -msgid "Enable pump.io Post Plugin" +msgid "Enable pump.io Post Addon" msgstr "Habilitar plug-in para publicar no Pump.io" #: pumpio.php:260 diff --git a/pumpio/lang/pt-br/strings.php b/pumpio/lang/pt-br/strings.php index 56890a66f..e93516b46 100644 --- a/pumpio/lang/pt-br/strings.php +++ b/pumpio/lang/pt-br/strings.php @@ -15,7 +15,7 @@ $a->strings["pump.io username (without the servername)"] = "Nome de usuário no $a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = ""; $a->strings["Authenticate your pump.io connection"] = ""; $a->strings["Import the remote timeline"] = "Importar a linha do tempo remota"; -$a->strings["Enable pump.io Post Plugin"] = "Habilitar plug-in para publicar no Pump.io"; +$a->strings["Enable pump.io Post Addon"] = "Habilitar plug-in para publicar no Pump.io"; $a->strings["Post to pump.io by default"] = "Publicar no Pump.io por padrão"; $a->strings["Should posts be public?"] = ""; $a->strings["Mirror all public posts"] = ""; diff --git a/pumpio/lang/ro/messages.po b/pumpio/lang/ro/messages.po index ae3f945bb..7ac8ef7fa 100644 --- a/pumpio/lang/ro/messages.po +++ b/pumpio/lang/ro/messages.po @@ -60,7 +60,7 @@ msgid "Import the remote timeline" msgstr "Importare cronologie la distanță" #: pumpio.php:255 -msgid "Enable pump.io Post Plugin" +msgid "Enable pump.io Post Addon" msgstr "Activare Modul Postare pump.io" #: pumpio.php:260 diff --git a/pumpio/lang/ro/strings.php b/pumpio/lang/ro/strings.php index bd8bf5f1b..b0ee9a25c 100644 --- a/pumpio/lang/ro/strings.php +++ b/pumpio/lang/ro/strings.php @@ -15,7 +15,7 @@ $a->strings["pump.io username (without the servername)"] = "Utilizator pump.io ( $a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "Nume server pump.io (fără \"http://\" ori \"https://\" )"; $a->strings["Authenticate your pump.io connection"] = "Autentificați-vă conectarea la pump.io"; $a->strings["Import the remote timeline"] = "Importare cronologie la distanță"; -$a->strings["Enable pump.io Post Plugin"] = "Activare Modul Postare pump.io"; +$a->strings["Enable pump.io Post Addon"] = "Activare Modul Postare pump.io"; $a->strings["Post to pump.io by default"] = "Postați implicit pe pump.io"; $a->strings["Should posts be public?"] = "Postările ar trebui sa fie publice?"; $a->strings["Mirror all public posts"] = "Reproducere pentru toate postările publice"; diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 6aaa05655..be4db5faf 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -5,6 +5,7 @@ * Version: 0.2 * Author: Michael Vogel */ +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\Worker; @@ -22,25 +23,25 @@ require_once "mod/share.php"; define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes function pumpio_install() { - register_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - register_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - register_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - register_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); - register_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); + Addon::registerHook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); + Addon::registerHook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); + Addon::registerHook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); + Addon::registerHook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); + Addon::registerHook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); + Addon::registerHook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); + Addon::registerHook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); + Addon::registerHook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); } function pumpio_uninstall() { - unregister_hook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - unregister_hook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - unregister_hook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - unregister_hook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); - unregister_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); + Addon::unregisterHook('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); + Addon::unregisterHook('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); + Addon::unregisterHook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); + Addon::unregisterHook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook'); + Addon::unregisterHook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); } function pumpio_module() {} @@ -275,7 +276,7 @@ function pumpio_settings(&$a,&$s) { $s .= '
'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index f4b951843..447f8abf1 100644 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -9,7 +9,7 @@ * * Provides a set of text "snippets" which can be inserted into a comment window by clicking on them. * First enable the addon in the system admin panel. - * Then each person can tailor their choice of words in Settings->Plugin Settings in the Qcomment + * Then each person can tailor their choice of words in Settings->Addon Settings in the Qcomment * pane. Initially no qcomments are provided, but on viewing the settings page, a default set of * of words is suggested. These can be accepted (click Submit) or edited first. Each text line represents * a different qcomment. @@ -19,19 +19,19 @@ * them to open the comment window fully and insert the qcomment. Then "Submit" will submit it. * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function qcomment_install() { - register_hook('plugin_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings'); - register_hook('plugin_settings_post', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings_post'); + Addon::registerHook('addon_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings_post'); } function qcomment_uninstall() { - unregister_hook('plugin_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings'); - unregister_hook('plugin_settings_post', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings_post'); + Addon::unregisterHook('addon_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings_post'); } diff --git a/randplace/lang/C/messages.po b/randplace/lang/C/messages.po index 3494eafd4..3d2ed587b 100644 --- a/randplace/lang/C/messages.po +++ b/randplace/lang/C/messages.po @@ -22,7 +22,7 @@ msgid "Randplace Settings" msgstr "" #: randplace.php:171 -msgid "Enable Randplace Plugin" +msgid "Enable Randplace Addon" msgstr "" #: randplace.php:177 diff --git a/randplace/lang/ca/strings.php b/randplace/lang/ca/strings.php index 4e2fe7637..120fab8cc 100644 --- a/randplace/lang/ca/strings.php +++ b/randplace/lang/ca/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "Configuració de Randplace"; -$a->strings["Enable Randplace Plugin"] = "Habilitar el Plugin de Randplace"; +$a->strings["Enable Randplace Addon"] = "Habilitar el Addon de Randplace"; $a->strings["Submit"] = "Enviar"; diff --git a/randplace/lang/cs/messages.po b/randplace/lang/cs/messages.po index 6cc09f7d0..09032861c 100644 --- a/randplace/lang/cs/messages.po +++ b/randplace/lang/cs/messages.po @@ -24,8 +24,8 @@ msgid "Randplace Settings" msgstr "Randplace Nastavení" #: randplace.php:171 -msgid "Enable Randplace Plugin" -msgstr "Povolit Randplace Plugin" +msgid "Enable Randplace Addon" +msgstr "Povolit Randplace Addon" #: randplace.php:177 msgid "Save Settings" diff --git a/randplace/lang/cs/strings.php b/randplace/lang/cs/strings.php index dae496fc2..a5a72e9ef 100644 --- a/randplace/lang/cs/strings.php +++ b/randplace/lang/cs/strings.php @@ -6,5 +6,5 @@ function string_plural_select_cs($n){ }} ; $a->strings["Randplace Settings"] = "Randplace Nastavení"; -$a->strings["Enable Randplace Plugin"] = "Povolit Randplace Plugin"; +$a->strings["Enable Randplace Addon"] = "Povolit Randplace Addon"; $a->strings["Save Settings"] = "Uložit Nastavení"; diff --git a/randplace/lang/de/messages.po b/randplace/lang/de/messages.po index 8735e20d0..c575242fd 100644 --- a/randplace/lang/de/messages.po +++ b/randplace/lang/de/messages.po @@ -24,8 +24,8 @@ msgid "Randplace Settings" msgstr "Randplace-Einstellungen" #: randplace.php:171 -msgid "Enable Randplace Plugin" -msgstr "Randplace-Plugin aktivieren" +msgid "Enable Randplace Addon" +msgstr "Randplace-Addon aktivieren" #: randplace.php:177 msgid "Save Settings" diff --git a/randplace/lang/de/strings.php b/randplace/lang/de/strings.php index 29bec8582..5a5b69f32 100644 --- a/randplace/lang/de/strings.php +++ b/randplace/lang/de/strings.php @@ -6,5 +6,5 @@ function string_plural_select_de($n){ }} ; $a->strings["Randplace Settings"] = "Randplace-Einstellungen"; -$a->strings["Enable Randplace Plugin"] = "Randplace-Plugin aktivieren"; +$a->strings["Enable Randplace Addon"] = "Randplace-Addon aktivieren"; $a->strings["Save Settings"] = "Einstellungen speichern"; diff --git a/randplace/lang/eo/strings.php b/randplace/lang/eo/strings.php index 455020930..38e6ebfa3 100644 --- a/randplace/lang/eo/strings.php +++ b/randplace/lang/eo/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "Randplace agordoj."; -$a->strings["Enable Randplace Plugin"] = "Aktivigi la Randplace kromprogramon."; +$a->strings["Enable Randplace Addon"] = "Aktivigi la Randplace kromprogramon."; $a->strings["Submit"] = "Sendi"; diff --git a/randplace/lang/es/messages.po b/randplace/lang/es/messages.po index 0b63aa17b..7f0a1047a 100644 --- a/randplace/lang/es/messages.po +++ b/randplace/lang/es/messages.po @@ -24,8 +24,8 @@ msgid "Randplace Settings" msgstr "Ajustes de Randplace" #: randplace.php:171 -msgid "Enable Randplace Plugin" -msgstr "Habilitar el Plugin de Randplace" +msgid "Enable Randplace Addon" +msgstr "Habilitar el Addon de Randplace" #: randplace.php:177 msgid "Submit" diff --git a/randplace/lang/es/strings.php b/randplace/lang/es/strings.php index 716845ac6..b196c6b89 100644 --- a/randplace/lang/es/strings.php +++ b/randplace/lang/es/strings.php @@ -6,5 +6,5 @@ function string_plural_select_es($n){ }} ; $a->strings["Randplace Settings"] = "Ajustes de Randplace"; -$a->strings["Enable Randplace Plugin"] = "Habilitar el Plugin de Randplace"; +$a->strings["Enable Randplace Addon"] = "Habilitar el Addon de Randplace"; $a->strings["Submit"] = "Enviar"; diff --git a/randplace/lang/fr/strings.php b/randplace/lang/fr/strings.php index f85b1cbae..f9d354b4d 100644 --- a/randplace/lang/fr/strings.php +++ b/randplace/lang/fr/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "Réglages de Randplace"; -$a->strings["Enable Randplace Plugin"] = "Activer l'extension Randplace"; +$a->strings["Enable Randplace Addon"] = "Activer l'extension Randplace"; $a->strings["Submit"] = "Envoyer"; diff --git a/randplace/lang/is/strings.php b/randplace/lang/is/strings.php index 924285d47..85e49238b 100644 --- a/randplace/lang/is/strings.php +++ b/randplace/lang/is/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "Stilla Randplace"; -$a->strings["Enable Randplace Plugin"] = "Kveikja á Randplace einingu"; +$a->strings["Enable Randplace Addon"] = "Kveikja á Randplace einingu"; $a->strings["Submit"] = "Senda inn"; diff --git a/randplace/lang/it/messages.po b/randplace/lang/it/messages.po index d2fa89032..0b54be4c2 100644 --- a/randplace/lang/it/messages.po +++ b/randplace/lang/it/messages.po @@ -24,8 +24,8 @@ msgid "Randplace Settings" msgstr "Impostazioni \"Posizione casuale\"" #: randplace.php:171 -msgid "Enable Randplace Plugin" -msgstr "Abilita il plugin \"Posizione casuale\"" +msgid "Enable Randplace Addon" +msgstr "Abilita il addon \"Posizione casuale\"" #: randplace.php:177 msgid "Submit" diff --git a/randplace/lang/it/strings.php b/randplace/lang/it/strings.php index 08e17fa78..97dfe38ae 100644 --- a/randplace/lang/it/strings.php +++ b/randplace/lang/it/strings.php @@ -6,5 +6,5 @@ function string_plural_select_it($n){ }} ; $a->strings["Randplace Settings"] = "Impostazioni \"Posizione casuale\""; -$a->strings["Enable Randplace Plugin"] = "Abilita il plugin \"Posizione casuale\""; +$a->strings["Enable Randplace Addon"] = "Abilita il addon \"Posizione casuale\""; $a->strings["Submit"] = "Invia"; diff --git a/randplace/lang/nb-no/strings.php b/randplace/lang/nb-no/strings.php index 16518f390..0675219c7 100644 --- a/randplace/lang/nb-no/strings.php +++ b/randplace/lang/nb-no/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "Tilfeldig plassering"; -$a->strings["Enable Randplace Plugin"] = "Aktiver Tilfeldig plassering-tillegget"; +$a->strings["Enable Randplace Addon"] = "Aktiver Tilfeldig plassering-tillegget"; $a->strings["Submit"] = "Lagre"; diff --git a/randplace/lang/pl/strings.php b/randplace/lang/pl/strings.php index 3f1b2f9fd..4166face2 100644 --- a/randplace/lang/pl/strings.php +++ b/randplace/lang/pl/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "Ustawienia Randplace"; -$a->strings["Enable Randplace Plugin"] = "Włącz Randplace Plugin"; +$a->strings["Enable Randplace Addon"] = "Włącz Randplace Addon"; $a->strings["Submit"] = "Potwierdź"; diff --git a/randplace/lang/pt-br/strings.php b/randplace/lang/pt-br/strings.php index 1f010b423..b41c865d4 100644 --- a/randplace/lang/pt-br/strings.php +++ b/randplace/lang/pt-br/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "Configurações do Randplace"; -$a->strings["Enable Randplace Plugin"] = "Habilitar o plugin Randplace"; +$a->strings["Enable Randplace Addon"] = "Habilitar o addon Randplace"; $a->strings["Submit"] = "Enviar"; diff --git a/randplace/lang/ro/messages.po b/randplace/lang/ro/messages.po index 1138665f6..f900373fb 100644 --- a/randplace/lang/ro/messages.po +++ b/randplace/lang/ro/messages.po @@ -23,7 +23,7 @@ msgid "Randplace Settings" msgstr "Configurări Randplace" #: randplace.php:171 -msgid "Enable Randplace Plugin" +msgid "Enable Randplace Addon" msgstr "Activare Modul Randplace" #: randplace.php:177 diff --git a/randplace/lang/ro/strings.php b/randplace/lang/ro/strings.php index 9ef0274ff..81607079b 100644 --- a/randplace/lang/ro/strings.php +++ b/randplace/lang/ro/strings.php @@ -6,5 +6,5 @@ function string_plural_select_ro($n){ }} ; $a->strings["Randplace Settings"] = "Configurări Randplace"; -$a->strings["Enable Randplace Plugin"] = "Activare Modul Randplace"; +$a->strings["Enable Randplace Addon"] = "Activare Modul Randplace"; $a->strings["Save Settings"] = "Salvare Configurări"; diff --git a/randplace/lang/ru/strings.php b/randplace/lang/ru/strings.php index 482c4ed09..46733dc68 100644 --- a/randplace/lang/ru/strings.php +++ b/randplace/lang/ru/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "Настройки Случайного места"; -$a->strings["Enable Randplace Plugin"] = "Включить Randplace плагин"; +$a->strings["Enable Randplace Addon"] = "Включить Randplace плагин"; $a->strings["Submit"] = "Подтвердить"; diff --git a/randplace/lang/sv/strings.php b/randplace/lang/sv/strings.php index eec3a7bd6..c47a51cae 100644 --- a/randplace/lang/sv/strings.php +++ b/randplace/lang/sv/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "Randplace Settings"; -$a->strings["Enable Randplace Plugin"] = "Enable Randplace Plugin"; +$a->strings["Enable Randplace Addon"] = "Enable Randplace Addon"; $a->strings["Submit"] = "Spara"; diff --git a/randplace/lang/zh-cn/strings.php b/randplace/lang/zh-cn/strings.php index 5b96f0867..2b9b82e39 100644 --- a/randplace/lang/zh-cn/strings.php +++ b/randplace/lang/zh-cn/strings.php @@ -1,5 +1,5 @@ strings["Randplace Settings"] = "随意下设置"; -$a->strings["Enable Randplace Plugin"] = "使随意下插件能用"; +$a->strings["Enable Randplace Addon"] = "使随意下插件能用"; $a->strings["Submit"] = "提交"; diff --git a/randplace/randplace.php b/randplace/randplace.php index b696bed2e..96e549a67 100644 --- a/randplace/randplace.php +++ b/randplace/randplace.php @@ -1,7 +1,7 @@ * @@ -11,37 +11,37 @@ * Addons are registered with the system through the admin * panel. * - * When registration is detected, the system calls the plugin + * When registration is detected, the system calls the addon * name_install() function, located in 'addon/name/name.php', * where 'name' is the name of the addon. * If the addon is removed from the configuration list, the * system will call the name_uninstall() function. * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function randplace_install() { /** * - * Our demo plugin will attach in three places. + * Our demo addon will attach in three places. * The first is just prior to storing a local post. * */ - register_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + Addon::registerHook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); /** * - * Then we'll attach into the plugin settings page, and also the + * Then we'll attach into the addon settings page, and also the * settings post hook so that we can create and update * user preferences. * */ - register_hook('plugin_settings', 'addon/randplace/randplace.php', 'randplace_settings'); - register_hook('plugin_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + Addon::registerHook('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + Addon::registerHook('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); logger("installed randplace"); } @@ -57,9 +57,9 @@ function randplace_uninstall() { * */ - unregister_hook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); - unregister_hook('plugin_settings', 'addon/randplace/randplace.php', 'randplace_settings'); - unregister_hook('plugin_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); + Addon::unregisterHook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); + Addon::unregisterHook('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); logger("removed randplace"); @@ -74,7 +74,7 @@ function randplace_post_hook($a, &$item) { * An item was posted on the local system. * We are going to look for specific items: * - A status post by a profile owner - * - The profile owner must have allowed our plugin + * - The profile owner must have allowed our addon * */ @@ -142,7 +142,7 @@ function randplace_settings_post($a,$post) { /** * - * Called from the Plugin Setting form. + * Called from the Addon Setting form. * Add our own settings info to the page. * */ @@ -169,7 +169,7 @@ function randplace_settings(&$a,&$s) { $s .= '
'; $s .= '

' . t('Randplace Settings') . '

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/remote_permissions/README.md b/remote_permissions/README.md index b9e385825..33e106ce2 100644 --- a/remote_permissions/README.md +++ b/remote_permissions/README.md @@ -1,8 +1,8 @@ -The Remote Permissions plugin enables recipients of private posts to see who else has received the post. This can be beneficial on community servers where people may want to modify the way they speak depending on who can see their comments to the post. +The Remote Permissions addon enables recipients of private posts to see who else has received the post. This can be beneficial on community servers where people may want to modify the way they speak depending on who can see their comments to the post. -Note that since Friendica is federated, the local hub may have posts that originated elsewhere. In that case, the plugin has no way of knowing all the recipients of the post, and it must settle for finding out who else can see it on the local hub. +Note that since Friendica is federated, the local hub may have posts that originated elsewhere. In that case, the addon has no way of knowing all the recipients of the post, and it must settle for finding out who else can see it on the local hub. -The hub admin can specify one of two behaviors for this plugin: +The hub admin can specify one of two behaviors for this addon: * **Global:** every private post on the local hub will show all recipients (or at least the ones it can discover) of the post to any other users on the local hub * **Individual:** only private posts from those users on the local hub who "opt-in" will show the post recipients. None of the private posts that originated elsewhere will show even partial lists of post recipients diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index c7e51286e..408316e69 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -6,20 +6,20 @@ * Author: Zach * */ - +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; function remote_permissions_install() { - register_hook('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content'); - register_hook('plugin_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings'); - register_hook('plugin_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post'); + Addon::registerHook('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content'); + Addon::registerHook('addon_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings'); + Addon::registerHook('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post'); } function remote_permissions_uninstall() { - unregister_hook('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content'); - unregister_hook('plugin_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings'); - unregister_hook('plugin_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post'); + Addon::unregisterHook('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content'); + Addon::unregisterHook('addon_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post'); } function remote_permissions_settings(&$a,&$o) { @@ -192,7 +192,7 @@ function remote_permissions_content($a, $item_copy) { return; } -function remote_permissions_plugin_admin(&$a, &$o){ +function remote_permissions_addon_admin(&$a, &$o){ $t = get_markup_template( "admin.tpl", "addon/remote_permissions/" ); $o = replace_macros($t, [ '$submit' => t('Save Settings'), @@ -201,7 +201,7 @@ function remote_permissions_plugin_admin(&$a, &$o){ ]); } -function remote_permissions_plugin_admin_post(&$a){ +function remote_permissions_addon_admin_post(&$a){ $choice = ((x($_POST,'remotepermschoice')) ? notags(trim($_POST['remotepermschoice'])) : ''); Config::set('remote_perms','global',($choice == 1 ? 1 : 0)); info( t('Settings updated.'). EOL ); diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 1a2a962f4..0789f5461 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -1,6 +1,4 @@ * */ - +use Friendica\Core\Addon; use Friendica\Core\Config; function rendertime_install() { - register_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end'); + Addon::registerHook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end'); } function rendertime_uninstall() { - unregister_hook('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1'); - unregister_hook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end'); + Addon::unregisterHook('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1'); + Addon::unregisterHook('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end'); } function rendertime_init_1(&$a) { diff --git a/securemail/securemail.php b/securemail/securemail.php index 68fc24ff8..e62b60767 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -7,6 +7,7 @@ */ use Friendica\App; +use Friendica\Core\Addon; use Friendica\Core\PConfig; use Friendica\Util\Emailer; @@ -23,19 +24,19 @@ require_once 'openpgp_crypt_symmetric.php'; function securemail_install() { - register_hook('plugin_settings', 'addon/securemail/securemail.php', 'securemail_settings'); - register_hook('plugin_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post'); + Addon::registerHook('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings'); + Addon::registerHook('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post'); - register_hook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare'); + Addon::registerHook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare'); logger('installed securemail'); } function securemail_uninstall() { - unregister_hook('plugin_settings', 'addon/securemail/securemail.php', 'securemail_settings'); - unregister_hook('plugin_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post'); + Addon::unregisterHook('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post'); - unregister_hook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare'); + Addon::unregisterHook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare'); logger('removed securemail'); } @@ -43,7 +44,7 @@ function securemail_uninstall() { /** * @brief Build user settings form * - * @link https://github.com/friendica/friendica/blob/develop/doc/Plugins.md#plugin_settings 'plugin_settings' hook + * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook * * @param App $a App instance * @param string $s output html @@ -72,7 +73,7 @@ function securemail_settings(App &$a, &$s){ /** * @brief Handle data from user settings form * - * @link https://github.com/friendica/friendica/blob/develop/doc/Plugins.md#plugin_settings_post 'plugin_settings_post' hook + * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook * * @param App $a App instance * @param array $b hook data @@ -137,7 +138,7 @@ function securemail_settings_post(App &$a, array &$b){ /** * @brief Encrypt notification emails text * - * @link https://github.com/friendica/friendica/blob/develop/doc/Plugins.md#emailer_send_prepare 'emailer_send_prepare' hook + * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook * * @param App $a App instance * @param array $b hook data diff --git a/showmore/showmore.php b/showmore/showmore.php index 9bddab633..f6e5028c6 100644 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -7,19 +7,19 @@ * based upon NSFW from Mike Macgirvin * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function showmore_install() { - register_hook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body'); - register_hook('plugin_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings'); - register_hook('plugin_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post'); + Addon::registerHook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body'); + Addon::registerHook('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post'); } function showmore_uninstall() { - unregister_hook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body'); - unregister_hook('plugin_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings'); - unregister_hook('plugin_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post'); + Addon::unregisterHook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body'); + Addon::unregisterHook('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post'); } function showmore_addon_settings(&$a,&$s) { 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 fb4bce132..475663800 100644 --- a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php +++ b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php @@ -6,17 +6,14 @@ * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) * All smileys from sites offering them as Public Domain */ - -/** - -*/ +use Friendica\Core\Addon; function smiley_pack_es_install() { - register_hook('smilie', 'addon/smiley_pack_es/smiley_pack_es.php', 'smiley_pack_smilies_es'); + Addon::registerHook('smilie', 'addon/smiley_pack_es/smiley_pack_es.php', 'smiley_pack_smilies_es'); } function smiley_pack_es_uninstall() { - unregister_hook('smilie', 'addon/smiley_pack_es/smiley_pack_es.php', 'smiley_pack_smilies'); + Addon::unregisterHook('smilie', 'addon/smiley_pack_es/smiley_pack_es.php', 'smiley_pack_smilies'); } 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 3ae70879c..282c0dde0 100644 --- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php +++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php @@ -8,13 +8,14 @@ * * */ +use Friendica\Core\Addon; function smiley_pack_fr_install() { - register_hook('smilie', 'addon/smiley_pack_fr/smiley_pack_fr.php', 'smiley_pack_fr_smilies'); + Addon::registerHook('smilie', 'addon/smiley_pack_fr/smiley_pack_fr.php', 'smiley_pack_fr_smilies'); } function smiley_pack_fr_uninstall() { - unregister_hook('smilie', 'addon/smiley_pack_fr/smiley_pack_fr.php', 'smiley_pack_fr_smilies'); + Addon::unregisterHook('smilie', 'addon/smiley_pack_fr/smiley_pack_fr.php', 'smiley_pack_fr_smilies'); } diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php index 4d49b7c02..ea3490ebb 100644 --- a/smiley_pack/smiley_pack.php +++ b/smiley_pack/smiley_pack.php @@ -7,16 +7,14 @@ * All smileys from sites offering them as Public Domain */ -/** - -*/ +use Friendica\Core\Addon; function smiley_pack_install() { - register_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies'); + Addon::registerHook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies'); } function smiley_pack_uninstall() { - unregister_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies'); + Addon::unregisterHook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies'); } diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php index d922a6b14..4aea34d87 100644 --- a/smileybutton/smileybutton.php +++ b/smileybutton/smileybutton.php @@ -5,11 +5,11 @@ * Version: 0.2 * Author: Johannes Schwab */ - +use Friendica\Core\Addon; function smileybutton_install() { //Register hooks - register_hook('jot_tool', 'addon/smileybutton/smileybutton.php', 'show_button'); + Addon::registerHook('jot_tool', 'addon/smileybutton/smileybutton.php', 'show_button'); logger("installed smileybutton"); } @@ -17,7 +17,7 @@ function smileybutton_install() { function smileybutton_uninstall() { //Delet registered hooks - unregister_hook('jot_tool', 'addon/smileybutton/smileybutton.php', 'show_button'); + Addon::unregisterHook('jot_tool', 'addon/smileybutton/smileybutton.php', 'show_button'); logger("removed smileybutton"); } diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php index 82b30a980..bb673f23d 100644 --- a/smilies_adult/smilies_adult.php +++ b/smilies_adult/smilies_adult.php @@ -8,13 +8,14 @@ * This is a template for how to extend the "smily" code. * */ +use Friendica\Core\Addon; function smilies_adult_install() { - register_hook('smilie', 'addon/smilies_adult/smilies_adult.php', 'smilies_adult_smilies'); + Addon::registerHook('smilie', 'addon/smilies_adult/smilies_adult.php', 'smilies_adult_smilies'); } function smilies_adult_uninstall() { - unregister_hook('smilie', 'addon/smilies_adult/smilies_adult.php', 'smilies_adult_smilies'); + Addon::unregisterHook('smilie', 'addon/smilies_adult/smilies_adult.php', 'smilies_adult_smilies'); } diff --git a/sniper/sniper.php b/sniper/sniper.php index 59812cba0..ffebedb30 100644 --- a/sniper/sniper.php +++ b/sniper/sniper.php @@ -1,7 +1,7 @@ */ - +use Friendica\Core\Addon; function sniper_install() { - register_hook('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu'); + Addon::registerHook('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu'); } function sniper_uninstall() { - unregister_hook('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu'); + Addon::unregisterHook('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu'); } diff --git a/startpage/startpage.php b/startpage/startpage.php index b0ee04cb7..872fb234d 100644 --- a/startpage/startpage.php +++ b/startpage/startpage.php @@ -6,20 +6,20 @@ * Author: Mike Macgirvin * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function startpage_install() { - register_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init'); - register_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings'); - register_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post'); + Addon::registerHook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init'); + Addon::registerHook('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings'); + Addon::registerHook('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post'); } function startpage_uninstall() { - unregister_hook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init'); - unregister_hook('plugin_settings', 'addon/startpage/startpage.php', 'startpage_settings'); - unregister_hook('plugin_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post'); + Addon::unregisterHook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init'); + Addon::unregisterHook('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post'); } @@ -54,7 +54,7 @@ function startpage_settings_post($a,$post) { /** * - * Called from the Plugin Setting form. + * Called from the Addon Setting form. * Add our own settings info to the page. * */ diff --git a/statusnet/README.md b/statusnet/README.md index 5042e413e..0f246750d 100644 --- a/statusnet/README.md +++ b/statusnet/README.md @@ -12,7 +12,7 @@ Requirements Due to the distributed nature of the GNU Social network, each user who wishes to forward public messages to a GNU Social account has to get the OAuth credentials for themselves, which makes this addon a little bit more user unfriendly than -the Twitter Plugin is. Nothing too geeky though! +the Twitter Addon is. Nothing too geeky though! The inclusion of a shorturl for the original posting in cases when the message was longer than the maximal allowed notice length requires it, that you have @@ -57,9 +57,9 @@ During the registration of the OAuth client remember the following: After the required credentials for the application are stored in the configuration you have to actually connect your friendica account with GNU Social. To do so follow the Sign in with GNU Social button, allow the access -and copy the security code into the plugin configuration. Friendica will then +and copy the security code into the addon configuration. Friendica will then try to acquire the final OAuth credentials from the API, if successful the -plugin settings will allow you to select to post your public messages to your +addon settings will allow you to select to post your public messages to your GNU Social account. License diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 9158052a5..3d7083893 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -47,6 +47,7 @@ require_once 'include/enotify.php'; use Friendica\App; use Friendica\Content\OEmbed; +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Model\GContact; @@ -145,32 +146,32 @@ class StatusNetOAuth extends TwitterOAuth function statusnet_install() { // we need some hooks, for the configuration and for sending tweets - register_hook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); - register_hook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); - register_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); - register_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local'); - register_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets'); - register_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron'); - register_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body'); - register_hook('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification'); + Addon::registerHook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); + Addon::registerHook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); + Addon::registerHook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); + Addon::registerHook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local'); + Addon::registerHook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets'); + Addon::registerHook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron'); + Addon::registerHook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body'); + Addon::registerHook('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification'); logger("installed GNU Social"); } function statusnet_uninstall() { - unregister_hook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); - unregister_hook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); - unregister_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); - unregister_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local'); - unregister_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets'); - unregister_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron'); - unregister_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body'); - unregister_hook('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification'); + Addon::unregisterHook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); + Addon::unregisterHook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); + Addon::unregisterHook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local'); + Addon::unregisterHook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets'); + Addon::unregisterHook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron'); + Addon::unregisterHook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body'); + Addon::unregisterHook('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification'); // old setting - remove only - unregister_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); - unregister_hook('plugin_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); - unregister_hook('plugin_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); + Addon::unregisterHook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); + Addon::unregisterHook('addon_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); } function statusnet_check_item_notification(App $a, &$notification_data) @@ -706,7 +707,7 @@ function statusnet_post_hook(App $a, &$b) } } -function statusnet_plugin_admin_post(App $a) +function statusnet_addon_admin_post(App $a) { $sites = []; @@ -738,7 +739,7 @@ function statusnet_plugin_admin_post(App $a) $sites = Config::set('statusnet', 'sites', $sites); } -function statusnet_plugin_admin(App $a, &$o) +function statusnet_addon_admin(App $a, &$o) { $sites = Config::get('statusnet', 'sites'); $sitesform = []; diff --git a/superblock/superblock.php b/superblock/superblock.php index c33c699db..b6d19de45 100644 --- a/superblock/superblock.php +++ b/superblock/superblock.php @@ -8,27 +8,27 @@ * Author: Mike Macgirvin * */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function superblock_install() { - register_hook('plugin_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings'); - register_hook('plugin_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post'); - register_hook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start'); - register_hook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu'); - register_hook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store'); + Addon::registerHook('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings'); + Addon::registerHook('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post'); + Addon::registerHook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start'); + Addon::registerHook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu'); + Addon::registerHook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store'); } function superblock_uninstall() { - unregister_hook('plugin_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings'); - unregister_hook('plugin_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post'); - unregister_hook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start'); - unregister_hook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu'); - unregister_hook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store'); + Addon::unregisterHook('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post'); + Addon::unregisterHook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start'); + Addon::unregisterHook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu'); + Addon::unregisterHook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store'); } diff --git a/testdrive/README.md b/testdrive/README.md index 3d735dea9..edc63ed57 100644 --- a/testdrive/README.md +++ b/testdrive/README.md @@ -2,7 +2,7 @@ TestDrive ========= -Testdrive is a Friendica plugin which implements automatic account expiration so that a site may be used as a public +Testdrive is a Friendica addon which implements automatic account expiration so that a site may be used as a public test bed. When an account is created on the site, it is given a hard expiration date of @@ -11,11 +11,11 @@ When an account is created on the site, it is given a hard expiration date of $a->config['testdrive']['expiredays'] = 30; Set this in your .htconfig.php file to allow a 30 day test drive period. By default no expiration period is defined -in case the plugin is activated accidentally. +in case the addon is activated accidentally. -There is no opportunity to extend an expired account using this plugin. Expiration is final. Other plugins may be created -which charge for service and extend the expiration as long as a balance is maintained. This plugin is purely for creating +There is no opportunity to extend an expired account using this addon. Expiration is final. Other addons may be created +which charge for service and extend the expiration as long as a balance is maintained. This addon is purely for creating a limited use test site. An email warning will be sent out approximately five days before the expiration occurs. Once it occurs logins and many diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index 6203f3cdf..f28d8d55f 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -2,31 +2,31 @@ /** * Name: testdrive - * Description: Sample Friendica plugin/addon for creating a test drive Friendica site with automatic account expiration. + * Description: Sample Friendica addon for creating a test drive Friendica site with automatic account expiration. * Version: 1.0 * Author: Mike Macgirvin */ - +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Model\User; function testdrive_install() { - register_hook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account'); - register_hook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron'); - register_hook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify'); - register_hook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update'); + Addon::registerHook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account'); + Addon::registerHook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron'); + Addon::registerHook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify'); + Addon::registerHook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update'); } function testdrive_uninstall() { - unregister_hook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account'); - unregister_hook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron'); - unregister_hook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify'); - unregister_hook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update'); + Addon::unregisterHook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account'); + Addon::unregisterHook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron'); + Addon::unregisterHook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify'); + Addon::unregisterHook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update'); } diff --git a/tictac/tictac.php b/tictac/tictac.php index 997378417..f928fd5e0 100644 --- a/tictac/tictac.php +++ b/tictac/tictac.php @@ -5,14 +5,14 @@ * Version: 1.0 * Author: Mike Macgirvin */ - +use Friendica\Core\Addon; function tictac_install() { - register_hook('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu'); + Addon::registerHook('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu'); } function tictac_uninstall() { - unregister_hook('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu'); + Addon::unregisterHook('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu'); } diff --git a/tumblr/README.md b/tumblr/README.md index fb20dac28..57ca145a0 100644 --- a/tumblr/README.md +++ b/tumblr/README.md @@ -4,7 +4,7 @@ Installation [Register](http://www.tumblr.com/oauth/apps) an application and use (your server name)/addon/tumblr/callback.php as callback URL -After the registration please enter the values for "Consumer Key" and "Consumer Secret" in the [administration](admin/plugins/tumblr). +After the registration please enter the values for "Consumer Key" and "Consumer Secret" in the [administration](admin/addons/tumblr). Notice ------ diff --git a/tumblr/lang/C/messages.po b/tumblr/lang/C/messages.po index b826c0303..d2e4a909c 100644 --- a/tumblr/lang/C/messages.po +++ b/tumblr/lang/C/messages.po @@ -42,7 +42,7 @@ msgid "(Re-)Authenticate your tumblr page" msgstr "" #: tumblr.php:192 -msgid "Enable Tumblr Post Plugin" +msgid "Enable Tumblr Post Addon" msgstr "" #: tumblr.php:197 diff --git a/tumblr/lang/ca/strings.php b/tumblr/lang/ca/strings.php index b1766618d..9ded80d22 100644 --- a/tumblr/lang/ca/strings.php +++ b/tumblr/lang/ca/strings.php @@ -6,7 +6,7 @@ $a->strings["return to the connector page"] = ""; $a->strings["Post to Tumblr"] = "Publica-ho al Tumblr"; $a->strings["Tumblr Post Settings"] = "Configuració d'Enviaments de Tumblr"; $a->strings["(Re-)Authenticate your tumblr page"] = ""; -$a->strings["Enable Tumblr Post Plugin"] = "Habilita el plugin de enviaments de Tumblr"; +$a->strings["Enable Tumblr Post Addon"] = "Habilita el addon de enviaments de Tumblr"; $a->strings["Post to Tumblr by default"] = "Enviar a Tumblr per defecte"; $a->strings["Post to page:"] = ""; $a->strings["You are not authenticated to tumblr"] = ""; diff --git a/tumblr/lang/cs/messages.po b/tumblr/lang/cs/messages.po index 83d24f701..a084ca659 100644 --- a/tumblr/lang/cs/messages.po +++ b/tumblr/lang/cs/messages.po @@ -44,7 +44,7 @@ msgid "(Re-)Authenticate your tumblr page" msgstr "(Znovu) přihlásit k Vaší tumblr stránce" #: tumblr.php:198 -msgid "Enable Tumblr Post Plugin" +msgid "Enable Tumblr Post Addon" msgstr "Povolit rozšíření Tumbir" #: tumblr.php:203 diff --git a/tumblr/lang/cs/strings.php b/tumblr/lang/cs/strings.php index 436731884..8a8741d23 100644 --- a/tumblr/lang/cs/strings.php +++ b/tumblr/lang/cs/strings.php @@ -11,7 +11,7 @@ $a->strings["return to the connector page"] = "návrat ke stránce konektor"; $a->strings["Post to Tumblr"] = "Příspěvek na Tumbir"; $a->strings["Tumblr Export"] = "Tumbir export"; $a->strings["(Re-)Authenticate your tumblr page"] = "(Znovu) přihlásit k Vaší tumblr stránce"; -$a->strings["Enable Tumblr Post Plugin"] = "Povolit rozšíření Tumbir"; +$a->strings["Enable Tumblr Post Addon"] = "Povolit rozšíření Tumbir"; $a->strings["Post to Tumblr by default"] = "Standardně posílat příspěvky na Tumbir"; $a->strings["Post to page:"] = "Příspěvek ke stránce:"; $a->strings["You are not authenticated to tumblr"] = "Nyní nejste přihlášen k tumblr."; diff --git a/tumblr/lang/de/messages.po b/tumblr/lang/de/messages.po index d40400020..aa3c16cf7 100644 --- a/tumblr/lang/de/messages.po +++ b/tumblr/lang/de/messages.po @@ -44,8 +44,8 @@ msgid "(Re-)Authenticate your tumblr page" msgstr "(Re-)Authentifizierung deiner tumblr Seite" #: tumblr.php:192 -msgid "Enable Tumblr Post Plugin" -msgstr "Tumblr-Post-Plugin aktivieren" +msgid "Enable Tumblr Post Addon" +msgstr "Tumblr-Post-Addon aktivieren" #: tumblr.php:197 msgid "Post to Tumblr by default" diff --git a/tumblr/lang/de/strings.php b/tumblr/lang/de/strings.php index 9ba399870..87fd5c504 100644 --- a/tumblr/lang/de/strings.php +++ b/tumblr/lang/de/strings.php @@ -11,7 +11,7 @@ $a->strings["return to the connector page"] = "zurück zur Connector Seite"; $a->strings["Post to Tumblr"] = "Auf Tumblr veröffentlichen"; $a->strings["Tumblr Post Settings"] = "Tumblr-Beitragseinstellungen"; $a->strings["(Re-)Authenticate your tumblr page"] = "(Re-)Authentifizierung deiner tumblr Seite"; -$a->strings["Enable Tumblr Post Plugin"] = "Tumblr-Post-Plugin aktivieren"; +$a->strings["Enable Tumblr Post Addon"] = "Tumblr-Post-Addon aktivieren"; $a->strings["Post to Tumblr by default"] = "Standardmäßig bei Tumblr veröffentlichen"; $a->strings["Post to page:"] = "Auf tumblr veröffentlichen"; $a->strings["You are not authenticated to tumblr"] = "Du bist gegenüber tumblr nicht authentifiziert"; diff --git a/tumblr/lang/eo/strings.php b/tumblr/lang/eo/strings.php index 375ea292f..12caadbf8 100644 --- a/tumblr/lang/eo/strings.php +++ b/tumblr/lang/eo/strings.php @@ -3,6 +3,6 @@ $a->strings["Permission denied."] = "Malpermesita."; $a->strings["Post to Tumblr"] = "Afiŝi al Tumblr"; $a->strings["Tumblr Post Settings"] = "Agordoj pri afiŝoj ĉe Tumblr"; -$a->strings["Enable Tumblr Post Plugin"] = "Ŝalti la kromprogramon por Tumblr afiŝoj"; +$a->strings["Enable Tumblr Post Addon"] = "Ŝalti la kromprogramon por Tumblr afiŝoj"; $a->strings["Post to Tumblr by default"] = "Defaŭlte afiŝi ĉe Tumblr"; $a->strings["Submit"] = "Sendi"; diff --git a/tumblr/lang/es/messages.po b/tumblr/lang/es/messages.po index 2f2eb4313..5993bd538 100644 --- a/tumblr/lang/es/messages.po +++ b/tumblr/lang/es/messages.po @@ -44,8 +44,8 @@ msgid "(Re-)Authenticate your tumblr page" msgstr "(Re-)autenticar su página de tumblr" #: tumblr.php:192 -msgid "Enable Tumblr Post Plugin" -msgstr "Habilite el plugin Tumblr Post" +msgid "Enable Tumblr Post Addon" +msgstr "Habilite el addon Tumblr Post" #: tumblr.php:197 msgid "Post to Tumblr by default" diff --git a/tumblr/lang/es/strings.php b/tumblr/lang/es/strings.php index 3a6e5ce99..12d3d2d2a 100644 --- a/tumblr/lang/es/strings.php +++ b/tumblr/lang/es/strings.php @@ -11,7 +11,7 @@ $a->strings["return to the connector page"] = "Vuelva a la página del conector" $a->strings["Post to Tumblr"] = "Publicar en Tumblr"; $a->strings["Tumblr Post Settings"] = "Ajustes de publicación de Tumblr"; $a->strings["(Re-)Authenticate your tumblr page"] = "(Re-)autenticar su página de tumblr"; -$a->strings["Enable Tumblr Post Plugin"] = "Habilite el plugin Tumblr Post"; +$a->strings["Enable Tumblr Post Addon"] = "Habilite el addon Tumblr Post"; $a->strings["Post to Tumblr by default"] = "Publique en Tumblr por defecto"; $a->strings["Post to page:"] = "Publicar en página:"; $a->strings["You are not authenticated to tumblr"] = "No está autenticado en tumblr"; diff --git a/tumblr/lang/fr/strings.php b/tumblr/lang/fr/strings.php index e23f85f72..c4d50431d 100644 --- a/tumblr/lang/fr/strings.php +++ b/tumblr/lang/fr/strings.php @@ -3,6 +3,6 @@ $a->strings["Permission denied."] = "Permission refusée."; $a->strings["Post to Tumblr"] = "Publier sur Tumblr"; $a->strings["Tumblr Post Settings"] = "Réglages de Tumblr"; -$a->strings["Enable Tumblr Post Plugin"] = "Activer l'extension Tumblr"; +$a->strings["Enable Tumblr Post Addon"] = "Activer l'extension Tumblr"; $a->strings["Post to Tumblr by default"] = "Publier sur Tumblr par défaut"; $a->strings["Submit"] = "Envoyer"; diff --git a/tumblr/lang/is/strings.php b/tumblr/lang/is/strings.php index cdd3d8362..a477e8a6e 100644 --- a/tumblr/lang/is/strings.php +++ b/tumblr/lang/is/strings.php @@ -3,6 +3,6 @@ $a->strings["Permission denied."] = "Heimild ekki veitt."; $a->strings["Post to Tumblr"] = "Senda fæslu til Tumblr"; $a->strings["Tumblr Post Settings"] = "Tumblr færslu stillingar"; -$a->strings["Enable Tumblr Post Plugin"] = "Leyfa Tumblr færslu viðbót"; +$a->strings["Enable Tumblr Post Addon"] = "Leyfa Tumblr færslu viðbót"; $a->strings["Post to Tumblr by default"] = "Senda færslu á Tumblr sjálfvirkt"; $a->strings["Submit"] = "Senda inn"; diff --git a/tumblr/lang/it/messages.po b/tumblr/lang/it/messages.po index 11d5752af..581d2d78e 100644 --- a/tumblr/lang/it/messages.po +++ b/tumblr/lang/it/messages.po @@ -44,8 +44,8 @@ msgid "(Re-)Authenticate your tumblr page" msgstr "(Ri)Autenticati con la tua pagina Tumblr" #: tumblr.php:192 -msgid "Enable Tumblr Post Plugin" -msgstr "Abilita Plugin Tumblr" +msgid "Enable Tumblr Post Addon" +msgstr "Abilita Addon Tumblr" #: tumblr.php:197 msgid "Post to Tumblr by default" diff --git a/tumblr/lang/it/strings.php b/tumblr/lang/it/strings.php index 2c49b0f13..bda333896 100644 --- a/tumblr/lang/it/strings.php +++ b/tumblr/lang/it/strings.php @@ -11,7 +11,7 @@ $a->strings["return to the connector page"] = "ritorna alla pagina del connettor $a->strings["Post to Tumblr"] = "Invia a Tumblr"; $a->strings["Tumblr Post Settings"] = "Impostazioni di invio a Tumblr"; $a->strings["(Re-)Authenticate your tumblr page"] = "(Ri)Autenticati con la tua pagina Tumblr"; -$a->strings["Enable Tumblr Post Plugin"] = "Abilita Plugin Tumblr"; +$a->strings["Enable Tumblr Post Addon"] = "Abilita Addon Tumblr"; $a->strings["Post to Tumblr by default"] = "Invia sempre a Tumblr"; $a->strings["Post to page:"] = "Invia alla pagina:"; $a->strings["You are not authenticated to tumblr"] = "Non sei autenticato su Tumblr"; diff --git a/tumblr/lang/nb-no/strings.php b/tumblr/lang/nb-no/strings.php index 733128540..024c55171 100644 --- a/tumblr/lang/nb-no/strings.php +++ b/tumblr/lang/nb-no/strings.php @@ -3,6 +3,6 @@ $a->strings["Permission denied."] = "Ingen tilgang."; $a->strings["Post to Tumblr"] = ""; $a->strings["Tumblr Post Settings"] = ""; -$a->strings["Enable Tumblr Post Plugin"] = ""; +$a->strings["Enable Tumblr Post Addon"] = ""; $a->strings["Post to Tumblr by default"] = ""; $a->strings["Submit"] = "Lagre"; diff --git a/tumblr/lang/pl/strings.php b/tumblr/lang/pl/strings.php index 819c7c205..b01dddb65 100644 --- a/tumblr/lang/pl/strings.php +++ b/tumblr/lang/pl/strings.php @@ -6,7 +6,7 @@ $a->strings["return to the connector page"] = ""; $a->strings["Post to Tumblr"] = "Opublikuj na Tumblrze"; $a->strings["Tumblr Post Settings"] = "Ustawienia postu Tumblr"; $a->strings["(Re-)Authenticate your tumblr page"] = ""; -$a->strings["Enable Tumblr Post Plugin"] = "Zezwól na wtyczkę postu Tumblr"; +$a->strings["Enable Tumblr Post Addon"] = "Zezwól na wtyczkę postu Tumblr"; $a->strings["Post to Tumblr by default"] = "Post do Tumblr przez standard"; $a->strings["Post to page:"] = "Napisz na stronę:"; $a->strings["You are not authenticated to tumblr"] = ""; diff --git a/tumblr/lang/pt-br/messages.po b/tumblr/lang/pt-br/messages.po index 6c80433ea..a0de33adf 100644 --- a/tumblr/lang/pt-br/messages.po +++ b/tumblr/lang/pt-br/messages.po @@ -44,7 +44,7 @@ msgid "(Re-)Authenticate your tumblr page" msgstr "(Re)autenticar sua página no Tumblr" #: tumblr.php:192 -msgid "Enable Tumblr Post Plugin" +msgid "Enable Tumblr Post Addon" msgstr "Habilitar plug-in para publicar no Tumblr" #: tumblr.php:197 diff --git a/tumblr/lang/pt-br/strings.php b/tumblr/lang/pt-br/strings.php index e800cd710..f77c85f20 100644 --- a/tumblr/lang/pt-br/strings.php +++ b/tumblr/lang/pt-br/strings.php @@ -11,7 +11,7 @@ $a->strings["return to the connector page"] = "voltar à página de conectores"; $a->strings["Post to Tumblr"] = "Publicar no Tumblr"; $a->strings["Tumblr Post Settings"] = "Configurações de publicação no Tumblr"; $a->strings["(Re-)Authenticate your tumblr page"] = "(Re)autenticar sua página no Tumblr"; -$a->strings["Enable Tumblr Post Plugin"] = "Habilitar plug-in para publicar no Tumblr"; +$a->strings["Enable Tumblr Post Addon"] = "Habilitar plug-in para publicar no Tumblr"; $a->strings["Post to Tumblr by default"] = "Publicar no Tumblr por padrão"; $a->strings["Post to page:"] = "Publicar na página:"; $a->strings["You are not authenticated to tumblr"] = "Você não se autenticou no Tumblr"; diff --git a/tumblr/lang/ro/messages.po b/tumblr/lang/ro/messages.po index 46748edd9..4f3fba64a 100644 --- a/tumblr/lang/ro/messages.po +++ b/tumblr/lang/ro/messages.po @@ -43,7 +43,7 @@ msgid "(Re-)Authenticate your tumblr page" msgstr "(Re- )Autentificare pagină tumblr " #: tumblr.php:198 -msgid "Enable Tumblr Post Plugin" +msgid "Enable Tumblr Post Addon" msgstr "Activare Modul Postare pe Tumblr " #: tumblr.php:203 diff --git a/tumblr/lang/ro/strings.php b/tumblr/lang/ro/strings.php index 7262ca4ca..60f96432f 100644 --- a/tumblr/lang/ro/strings.php +++ b/tumblr/lang/ro/strings.php @@ -11,7 +11,7 @@ $a->strings["return to the connector page"] = "revenire la pagina de conectare"; $a->strings["Post to Tumblr"] = "Postați pe Tumblr"; $a->strings["Tumblr Export"] = "Export Tumblr"; $a->strings["(Re-)Authenticate your tumblr page"] = "(Re- )Autentificare pagină tumblr "; -$a->strings["Enable Tumblr Post Plugin"] = "Activare Modul Postare pe Tumblr "; +$a->strings["Enable Tumblr Post Addon"] = "Activare Modul Postare pe Tumblr "; $a->strings["Post to Tumblr by default"] = "Postați implicit pe Tumblr"; $a->strings["Post to page:"] = "Postare pe pagina:"; $a->strings["You are not authenticated to tumblr"] = "Nu sunteți autentificat pe tumblr."; diff --git a/tumblr/lang/ru/strings.php b/tumblr/lang/ru/strings.php index 21d772450..cccb32c3e 100644 --- a/tumblr/lang/ru/strings.php +++ b/tumblr/lang/ru/strings.php @@ -3,6 +3,6 @@ $a->strings["Permission denied."] = "Нет разрешения."; $a->strings["Post to Tumblr"] = "Написать в Tumblr"; $a->strings["Tumblr Post Settings"] = "Tumblr Настройки сообщения"; -$a->strings["Enable Tumblr Post Plugin"] = "Включить Tumblr плагин сообщений"; +$a->strings["Enable Tumblr Post Addon"] = "Включить Tumblr плагин сообщений"; $a->strings["Post to Tumblr by default"] = "Сообщение Tumblr по умолчанию"; $a->strings["Submit"] = "Подтвердить"; diff --git a/tumblr/lang/zh-cn/strings.php b/tumblr/lang/zh-cn/strings.php index 0956e13ec..da62cdba0 100644 --- a/tumblr/lang/zh-cn/strings.php +++ b/tumblr/lang/zh-cn/strings.php @@ -6,7 +6,7 @@ $a->strings["return to the connector page"] = "会连接器页"; $a->strings["Post to Tumblr"] = "发送到Tumblr"; $a->strings["Tumblr Post Settings"] = "Tumblr发送设置"; $a->strings["(Re-)Authenticate your tumblr page"] = "再认证您的tumblr页"; -$a->strings["Enable Tumblr Post Plugin"] = "使Tumblr发送插件能够"; +$a->strings["Enable Tumblr Post Addon"] = "使Tumblr发送插件能够"; $a->strings["Post to Tumblr by default"] = "默认地给Tumblr发送"; $a->strings["Post to page:"] = "放在页："; $a->strings["You are not authenticated to tumblr"] = "tumblr没证明您是真的"; diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index a056bd09f..ff218d0a7 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -11,23 +11,24 @@ require_once('library/OAuth1.php'); require_once('addon/tumblr/tumblroauth/tumblroauth.php'); +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; function tumblr_install() { - register_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local'); - register_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send'); - register_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets'); - register_hook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings'); - register_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); + Addon::registerHook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local'); + Addon::registerHook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send'); + Addon::registerHook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets'); + Addon::registerHook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings'); + Addon::registerHook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); } function tumblr_uninstall() { - unregister_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local'); - unregister_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send'); - unregister_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets'); - unregister_hook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings'); - unregister_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); + Addon::unregisterHook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send'); + Addon::unregisterHook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); } function tumblr_module() {} @@ -57,7 +58,7 @@ function tumblr_content(&$a) { return $o; } -function tumblr_plugin_admin(&$a, &$o){ +function tumblr_addon_admin(&$a, &$o){ $t = get_markup_template( "admin.tpl", "addon/tumblr/" ); $o = replace_macros($t, [ @@ -68,7 +69,7 @@ function tumblr_plugin_admin(&$a, &$o){ ]); } -function tumblr_plugin_admin_post(&$a){ +function tumblr_addon_admin_post(&$a){ $consumer_key = ((x($_POST,'consumer_key')) ? notags(trim($_POST['consumer_key'])) : ''); $consumer_secret = ((x($_POST,'consumer_secret')) ? notags(trim($_POST['consumer_secret'])): ''); Config::set('tumblr','consumer_key',$consumer_key); @@ -217,7 +218,7 @@ function tumblr_settings(&$a,&$s) { $s .= '
'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/twitter/README.md b/twitter/README.md index edfc81385..7936f894e 100644 --- a/twitter/README.md +++ b/twitter/README.md @@ -1,4 +1,4 @@ -Twitter Plugin +Twitter Addon ============== Main authors Tobias Diekershoff and Michael Vogel. @@ -12,9 +12,9 @@ The addon can also mirror a users Tweets into the ~friendica wall. Installation ------------ -To use this plugin you have to register an [application](https://apps.twitter.com/) for your friendica instance on Twitter. Please leave the field "Callback URL" empty. +To use this addon you have to register an [application](https://apps.twitter.com/) for your friendica instance on Twitter. Please leave the field "Callback URL" empty. -After the registration please enter the values for "Consumer Key" and "Consumer Secret" in the [administration](admin/plugins/twitter). +After the registration please enter the values for "Consumer Key" and "Consumer Secret" in the [administration](admin/addons/twitter). Where to find ------------- diff --git a/twitter/lang/C/messages.po b/twitter/lang/C/messages.po index fa058ba46..95c071415 100644 --- a/twitter/lang/C/messages.po +++ b/twitter/lang/C/messages.po @@ -37,7 +37,7 @@ msgstr "" #: twitter.php:183 msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " +"At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " "button below to get a PIN from Twitter which you have to copy into the input " "box below and submit the form. Only your public posts will " diff --git a/twitter/lang/ca/strings.php b/twitter/lang/ca/strings.php index 203c9a1f2..bc53d4c80 100644 --- a/twitter/lang/ca/strings.php +++ b/twitter/lang/ca/strings.php @@ -4,7 +4,7 @@ $a->strings["Post to Twitter"] = "Publica-ho al Twitter"; $a->strings["Twitter settings updated."] = "La configuració de Twitter actualitzada."; $a->strings["Twitter Posting Settings"] = "Configuració d'Enviaments per a Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No s'ha pogut emparellar cap clau \"consumer key\" per a Twitter. Si us plau, poseu-vos en contacte amb l'administrador del lloc."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En aquesta instància Friendica el plugin Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges públics es publicaran a Twitter."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En aquesta instància Friendica el addon Twitter va ser habilitat, però encara no ha connectat el compte al seu compte de Twitter. Per a això feu clic al botó de sota per obtenir un PIN de Twitter que ha de copiar a la casella de sota i enviar el formulari. Només els missatges públics es publicaran a Twitter."; $a->strings["Log in with Twitter"] = "Accedeixi com en Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Copieu el codi PIN de Twitter aquí"; $a->strings["Submit"] = "Enviar"; diff --git a/twitter/lang/cs/messages.po b/twitter/lang/cs/messages.po index f893d7314..5e35bae67 100644 --- a/twitter/lang/cs/messages.po +++ b/twitter/lang/cs/messages.po @@ -39,12 +39,12 @@ msgstr "Nenalezen žádný spotřebitelský páru klíčů pro Twitter. Obraťte #: twitter.php:264 msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " +"At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" " be posted to Twitter." -msgstr "Na této Friendica instanci je sice povolen Twitter plugin, ale vy jste si ještě nenastavili svůj Twitter účet. Svůj účet si můžete nastavit kliknutím na tlačítko níže k získání PINu z Vašeho Twitteru, který si zkopírujte do níže uvedeného vstupního pole a odešlete formulář. Pouze vaše veřejné příspěvky budou zaslány na Twitter." +msgstr "Na této Friendica instanci je sice povolen Twitter addon, ale vy jste si ještě nenastavili svůj Twitter účet. Svůj účet si můžete nastavit kliknutím na tlačítko níže k získání PINu z Vašeho Twitteru, který si zkopírujte do níže uvedeného vstupního pole a odešlete formulář. Pouze vaše veřejné příspěvky budou zaslány na Twitter." #: twitter.php:265 msgid "Log in with Twitter" diff --git a/twitter/lang/cs/strings.php b/twitter/lang/cs/strings.php index 8de4b1300..6561b6b81 100644 --- a/twitter/lang/cs/strings.php +++ b/twitter/lang/cs/strings.php @@ -9,7 +9,7 @@ $a->strings["Post to Twitter"] = "Poslat příspěvek na Twitter"; $a->strings["Twitter settings updated."] = "Nastavení Twitteru aktualizováno."; $a->strings["Twitter Import/Export/Mirror"] = "Twitter Import/Export/Zrcadlení"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nenalezen žádný spotřebitelský páru klíčů pro Twitter. Obraťte se na administrátora webu."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Na této Friendica instanci je sice povolen Twitter plugin, ale vy jste si ještě nenastavili svůj Twitter účet. Svůj účet si můžete nastavit kliknutím na tlačítko níže k získání PINu z Vašeho Twitteru, který si zkopírujte do níže uvedeného vstupního pole a odešlete formulář. Pouze vaše veřejné příspěvky budou zaslány na Twitter."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Na této Friendica instanci je sice povolen Twitter addon, ale vy jste si ještě nenastavili svůj Twitter účet. Svůj účet si můžete nastavit kliknutím na tlačítko níže k získání PINu z Vašeho Twitteru, který si zkopírujte do níže uvedeného vstupního pole a odešlete formulář. Pouze vaše veřejné příspěvky budou zaslány na Twitter."; $a->strings["Log in with Twitter"] = "Přihlásit se s Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Zkopírujte sem PIN z Twitteru"; $a->strings["Save Settings"] = "Uložit Nastavení"; diff --git a/twitter/lang/de/messages.po b/twitter/lang/de/messages.po index 5ec80d641..b17031a72 100644 --- a/twitter/lang/de/messages.po +++ b/twitter/lang/de/messages.po @@ -39,12 +39,12 @@ msgstr "Kein Consumer Schlüsselpaar für Twitter gefunden. Bitte wende dich an #: twitter.php:264 msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " +"At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" " be posted to Twitter." -msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht." +msgstr "Auf diesem Friendica-Server wurde das Twitter-Addon aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht." #: twitter.php:265 msgid "Log in with Twitter" diff --git a/twitter/lang/de/strings.php b/twitter/lang/de/strings.php index 997bf55f8..69083a2b9 100644 --- a/twitter/lang/de/strings.php +++ b/twitter/lang/de/strings.php @@ -9,7 +9,7 @@ $a->strings["Post to Twitter"] = "An Twitter senden"; $a->strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert."; $a->strings["Twitter Import/Export/Mirror"] = "Twitter Import/Export/Spiegeln"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Addon aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur öffentliche Beiträge werden bei Twitter veröffentlicht."; $a->strings["Log in with Twitter"] = "bei Twitter anmelden"; $a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her"; $a->strings["Save Settings"] = "Einstellungen speichern"; diff --git a/twitter/lang/eo/strings.php b/twitter/lang/eo/strings.php index cce714e79..0dbedd82c 100644 --- a/twitter/lang/eo/strings.php +++ b/twitter/lang/eo/strings.php @@ -4,7 +4,7 @@ $a->strings["Post to Twitter"] = "Afiŝi ĉe Twitter"; $a->strings["Twitter settings updated."] = "Ĝisdatigis Twitter agordojn."; $a->strings["Twitter Posting Settings"] = "Agordoj por afiŝi ĉe Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ne trovis klientajn ŝlosilojn por Twitter. Bonvolu kontakti vian retejan administranton."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Je ĉi tiu Friendica retejo, la Twitter kromprogramo jam estas ŝaltita, sed via konto anokoraŭ ne estas konektita kun via Twitter konto. Por fari tion, klaku la supran butonon por atingi nombrokodon de Twitter, kion vi kopiu en la supran eniga ĉelo, kaj sendu la formularon. Nur viaj publikaj afiŝoj estas plusendota al Twitter. "; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Je ĉi tiu Friendica retejo, la Twitter kromprogramo jam estas ŝaltita, sed via konto anokoraŭ ne estas konektita kun via Twitter konto. Por fari tion, klaku la supran butonon por atingi nombrokodon de Twitter, kion vi kopiu en la supran eniga ĉelo, kaj sendu la formularon. Nur viaj publikaj afiŝoj estas plusendota al Twitter. "; $a->strings["Log in with Twitter"] = "Ensaluti kun Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Alglui la PIN de Twitter ĉi tie"; $a->strings["Submit"] = "Sendi"; diff --git a/twitter/lang/es/messages.po b/twitter/lang/es/messages.po index 6cb699489..739ac523f 100644 --- a/twitter/lang/es/messages.po +++ b/twitter/lang/es/messages.po @@ -39,12 +39,12 @@ msgstr "No hay par de claves para encuentro de Twitter." #: twitter.php:183 msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " +"At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" " be posted to Twitter." -msgstr "En esta petición de Friendica el plugin de Twitter estaba activo pero usted no ha conectado aún su cuenta con la cuenta de Twitter. Para hacerlo click en el botón de abajo para obtener un PIN desde Twitter que tiene que copiar en la caja de texto de abajo y enviar el formulario. Sólo sus entradas públicas serán posteadas en Twitter" +msgstr "En esta petición de Friendica el addon de Twitter estaba activo pero usted no ha conectado aún su cuenta con la cuenta de Twitter. Para hacerlo click en el botón de abajo para obtener un PIN desde Twitter que tiene que copiar en la caja de texto de abajo y enviar el formulario. Sólo sus entradas públicas serán posteadas en Twitter" #: twitter.php:184 msgid "Log in with Twitter" diff --git a/twitter/lang/es/strings.php b/twitter/lang/es/strings.php index c1168e4a0..812e646be 100644 --- a/twitter/lang/es/strings.php +++ b/twitter/lang/es/strings.php @@ -9,7 +9,7 @@ $a->strings["Post to Twitter"] = "Entrada para Twitter"; $a->strings["Twitter settings updated."] = "Ajustes de Twitter actualizados."; $a->strings["Twitter Posting Settings"] = "Ajustes de publicación de Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No hay par de claves para encuentro de Twitter."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En esta petición de Friendica el plugin de Twitter estaba activo pero usted no ha conectado aún su cuenta con la cuenta de Twitter. Para hacerlo click en el botón de abajo para obtener un PIN desde Twitter que tiene que copiar en la caja de texto de abajo y enviar el formulario. Sólo sus entradas públicas serán posteadas en Twitter"; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "En esta petición de Friendica el addon de Twitter estaba activo pero usted no ha conectado aún su cuenta con la cuenta de Twitter. Para hacerlo click en el botón de abajo para obtener un PIN desde Twitter que tiene que copiar en la caja de texto de abajo y enviar el formulario. Sólo sus entradas públicas serán posteadas en Twitter"; $a->strings["Log in with Twitter"] = "Iniciar sesión con Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Copie el PIN de Twitter aquí"; $a->strings["Submit"] = "Enviar"; diff --git a/twitter/lang/fr/messages.po b/twitter/lang/fr/messages.po index abddb85f8..6b898264d 100644 --- a/twitter/lang/fr/messages.po +++ b/twitter/lang/fr/messages.po @@ -40,7 +40,7 @@ msgstr "" #: twitter.php:183 msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " +"At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" diff --git a/twitter/lang/fr/strings.php b/twitter/lang/fr/strings.php index de9e80a06..d79c5cf96 100644 --- a/twitter/lang/fr/strings.php +++ b/twitter/lang/fr/strings.php @@ -9,7 +9,7 @@ $a->strings["Post to Twitter"] = "Publier sur Twitter"; $a->strings["Twitter settings updated."] = "Paramètres Twitter mis à jour."; $a->strings["Twitter Posting Settings"] = "Paramètres Twitter de publication"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = ""; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; $a->strings["Log in with Twitter"] = "Se connecter avec Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Copier le PIN de Twitter ici"; $a->strings["Submit"] = "Soumettre"; diff --git a/twitter/lang/is/strings.php b/twitter/lang/is/strings.php index edd7809b0..66d1836d5 100644 --- a/twitter/lang/is/strings.php +++ b/twitter/lang/is/strings.php @@ -4,7 +4,7 @@ $a->strings["Post to Twitter"] = "Senda færslu á Twitter"; $a->strings["Twitter settings updated."] = "Stillingar Twitter uppfærðar."; $a->strings["Twitter Posting Settings"] = "Twitter færslu stillingar"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ekkert notenda lykils par fyrir Twitter fundið. Hafðu samband við kerfisstjórann."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; $a->strings["Log in with Twitter"] = "Innskrá með Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Afrita PIN frá Twitter hingað"; $a->strings["Submit"] = "Senda inn"; diff --git a/twitter/lang/it/messages.po b/twitter/lang/it/messages.po index ef14b5bb0..75f71963f 100644 --- a/twitter/lang/it/messages.po +++ b/twitter/lang/it/messages.po @@ -39,12 +39,12 @@ msgstr "Nessuna coppia di chiavi per Twitter trovata. Contatta l'amministratore #: twitter.php:183 msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " +"At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" " be posted to Twitter." -msgstr "Il plugin Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post pubblici saranno inviati a Twitter." +msgstr "Il addon Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post pubblici saranno inviati a Twitter." #: twitter.php:184 msgid "Log in with Twitter" diff --git a/twitter/lang/it/strings.php b/twitter/lang/it/strings.php index 446c7de20..c41dc5474 100644 --- a/twitter/lang/it/strings.php +++ b/twitter/lang/it/strings.php @@ -9,7 +9,7 @@ $a->strings["Post to Twitter"] = "Invia a Twitter"; $a->strings["Twitter settings updated."] = "Impostazioni di Twitter aggiornate."; $a->strings["Twitter Posting Settings"] = "Impostazioni di invio a Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nessuna coppia di chiavi per Twitter trovata. Contatta l'amministratore del sito."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Il plugin Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post pubblici saranno inviati a Twitter."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Il addon Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post pubblici saranno inviati a Twitter."; $a->strings["Log in with Twitter"] = "Accedi con Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Copia il PIN da Twitter qui"; $a->strings["Submit"] = "Invia"; diff --git a/twitter/lang/nb-no/strings.php b/twitter/lang/nb-no/strings.php index 00a0f111a..6330249cc 100644 --- a/twitter/lang/nb-no/strings.php +++ b/twitter/lang/nb-no/strings.php @@ -4,7 +4,7 @@ $a->strings["Post to Twitter"] = "Post til Twitter"; $a->strings["Twitter settings updated."] = "Twitter-innstilinger oppdatert."; $a->strings["Twitter Posting Settings"] = "Innstillinger for posting til Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Ingen \"consumer key pair\" for Twitter funnet. Vennligst kontakt stedets administrator."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Ved denne Friendica-forekomsten er Twitter-tillegget aktivert, men du har ennå ikke tilkoblet din konto til din Twitter-konto. For å gjøre det, klikk på knappen nedenfor for å få en PIN-kode fra Twitter som du må kopiere inn i feltet nedenfor og sende inn skjemaet. Bare dine offentlige innlegg vil bli lagt inn på Twitter. "; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Ved denne Friendica-forekomsten er Twitter-tillegget aktivert, men du har ennå ikke tilkoblet din konto til din Twitter-konto. For å gjøre det, klikk på knappen nedenfor for å få en PIN-kode fra Twitter som du må kopiere inn i feltet nedenfor og sende inn skjemaet. Bare dine offentlige innlegg vil bli lagt inn på Twitter. "; $a->strings["Log in with Twitter"] = "Logg inn via Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Kopier PIN-kode fra Twitter hit"; $a->strings["Submit"] = "Lagre"; diff --git a/twitter/lang/pl/strings.php b/twitter/lang/pl/strings.php index 54d3acae7..3afb15068 100644 --- a/twitter/lang/pl/strings.php +++ b/twitter/lang/pl/strings.php @@ -4,7 +4,7 @@ $a->strings["Post to Twitter"] = "Post na Twitter"; $a->strings["Twitter settings updated."] = "Zaktualizowano ustawienia Twittera."; $a->strings["Twitter Posting Settings"] = "Ustawienia wpisów z Twittera"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nie znaleziono pary dla Twittera. Proszę skontaktować się z admininstratorem strony."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = ""; $a->strings["Log in with Twitter"] = "Zaloguj się przez Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Skopiuj tutaj PIN z Twittera"; $a->strings["Submit"] = "Potwierdź"; diff --git a/twitter/lang/pt-br/messages.po b/twitter/lang/pt-br/messages.po index df121428b..56630fecf 100644 --- a/twitter/lang/pt-br/messages.po +++ b/twitter/lang/pt-br/messages.po @@ -39,7 +39,7 @@ msgstr "Não foi encontrado nenhum par de \"consumer keys\" para o Twitter. Por #: twitter.php:183 msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " +"At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" diff --git a/twitter/lang/pt-br/strings.php b/twitter/lang/pt-br/strings.php index edc4b9162..698b761e2 100644 --- a/twitter/lang/pt-br/strings.php +++ b/twitter/lang/pt-br/strings.php @@ -9,7 +9,7 @@ $a->strings["Post to Twitter"] = "Publicar no Twitter"; $a->strings["Twitter settings updated."] = "As configurações do Twitter foram atualizadas."; $a->strings["Twitter Posting Settings"] = "Configurações de publicação no Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Não foi encontrado nenhum par de \"consumer keys\" para o Twitter. Por favor, entre em contato com a administração do site."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "O plug-in do Twitter está habilitado nesta instância do Friendica, mas você ainda não conectou sua conta aqui à sua conta no Twitter. Para fazer isso, clique no botão abaixo. Você vai receber um código de verificação do Twitter. Copie-o para o campo abaixo e envie o formulário. Apenas os seus posts públicos serão publicados no Twitter."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "O plug-in do Twitter está habilitado nesta instância do Friendica, mas você ainda não conectou sua conta aqui à sua conta no Twitter. Para fazer isso, clique no botão abaixo. Você vai receber um código de verificação do Twitter. Copie-o para o campo abaixo e envie o formulário. Apenas os seus posts públicos serão publicados no Twitter."; $a->strings["Log in with Twitter"] = "Entrar com o Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Cole o código de verificação do Twitter aqui"; $a->strings["Submit"] = "Enviar"; diff --git a/twitter/lang/ro/messages.po b/twitter/lang/ro/messages.po index 27e0d553d..46407c733 100644 --- a/twitter/lang/ro/messages.po +++ b/twitter/lang/ro/messages.po @@ -38,7 +38,7 @@ msgstr "Nici o pereche de chei de utilizator pentru Twitter nu a fost găsită. #: twitter.php:264 msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " +"At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" diff --git a/twitter/lang/ro/strings.php b/twitter/lang/ro/strings.php index d941d0019..36a36e8c5 100644 --- a/twitter/lang/ro/strings.php +++ b/twitter/lang/ro/strings.php @@ -9,7 +9,7 @@ $a->strings["Post to Twitter"] = "Postați pe Twitter"; $a->strings["Twitter settings updated."] = "Configurările Twitter au fost actualizate."; $a->strings["Twitter Import/Export/Mirror"] = "Import/Export/Clonare Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nici o pereche de chei de utilizator pentru Twitter nu a fost găsită. Vă rugăm să vă contactați administratorul de site."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Pe această sesiune Friendica, modulul Twitter era activat, dar încă nu v-ați conectat contul la profilul dvs. Twitter. Pentru aceasta apăsați pe butonul de mai jos pentru a obține un PIN de pe Twitter pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dumneavoastră publice vor fi postate pe Twitter."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Pe această sesiune Friendica, modulul Twitter era activat, dar încă nu v-ați conectat contul la profilul dvs. Twitter. Pentru aceasta apăsați pe butonul de mai jos pentru a obține un PIN de pe Twitter pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dumneavoastră publice vor fi postate pe Twitter."; $a->strings["Log in with Twitter"] = "Autentificare prin Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Copiați aici PIN-ul de la Twitter"; $a->strings["Save Settings"] = "Salvare Configurări"; diff --git a/twitter/lang/ru/messages.po b/twitter/lang/ru/messages.po index 9418282a6..911b2e083 100644 --- a/twitter/lang/ru/messages.po +++ b/twitter/lang/ru/messages.po @@ -39,7 +39,7 @@ msgstr "Не найдено пары потребительских ключей #: twitter.php:183 msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " +"At this Friendica instance the Twitter addon was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" diff --git a/twitter/lang/ru/strings.php b/twitter/lang/ru/strings.php index c2210cbbb..39e61e4ec 100644 --- a/twitter/lang/ru/strings.php +++ b/twitter/lang/ru/strings.php @@ -9,7 +9,7 @@ $a->strings["Post to Twitter"] = "Отправить в Twitter"; $a->strings["Twitter settings updated."] = "Настройки Twitter обновлены."; $a->strings["Twitter Posting Settings"] = "Настройка отправки сообщений в Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Не найдено пары потребительских ключей для Twitter. Пожалуйста, обратитесь к администратору сайта."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Чтобы подключиться к Twitter аккаунту, нажмите на кнопку ниже, чтобы получить код безопасности от Twitter, который нужно скопировать в поле ввода ниже, и отправить форму. Только ваши публичные сообщения будут отправляться на Twitter."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Чтобы подключиться к Twitter аккаунту, нажмите на кнопку ниже, чтобы получить код безопасности от Twitter, который нужно скопировать в поле ввода ниже, и отправить форму. Только ваши публичные сообщения будут отправляться на Twitter."; $a->strings["Log in with Twitter"] = "Войдите через Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Скопируйте PIN с Twitter сюда"; $a->strings["Submit"] = "Подтвердить"; diff --git a/twitter/lang/sv/strings.php b/twitter/lang/sv/strings.php index 02cb3fdd9..3f9d77c8c 100644 --- a/twitter/lang/sv/strings.php +++ b/twitter/lang/sv/strings.php @@ -3,7 +3,7 @@ $a->strings["Post to Twitter"] = "Lägg in på Twitter"; $a->strings["Twitter Posting Settings"] = "Inställningar för inlägg på Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No consumer key pair for Twitter found. Please contact your site administrator."; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."; $a->strings["Copy the PIN from Twitter here"] = "Ange PIN-koden från Twitter här"; $a->strings["Submit"] = "Spara"; $a->strings["Currently connected to: "] = "Ansluten till: "; diff --git a/twitter/lang/zh-cn/strings.php b/twitter/lang/zh-cn/strings.php index 9f8f7058b..402534c1e 100644 --- a/twitter/lang/zh-cn/strings.php +++ b/twitter/lang/zh-cn/strings.php @@ -4,7 +4,7 @@ $a->strings["Post to Twitter"] = "发送到在Twitter"; $a->strings["Twitter settings updated."] = "Twitter设置更新了。"; $a->strings["Twitter Posting Settings"] = "Twitter发送设置"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "找不到Twitter的消费钥匙双。请联系您的网页行政人员。"; -$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的公开文章被发送到Twitter。"; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的公开文章被发送到Twitter。"; $a->strings["Log in with Twitter"] = "用Twitter登记"; $a->strings["Copy the PIN from Twitter here"] = "复制Twitter密码这儿"; $a->strings["Submit"] = "提交"; diff --git a/twitter/twitter.php b/twitter/twitter.php index 807445b6d..a33415d8c 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -33,7 +33,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ -/* Twitter Plugin for Friendica +/* Twitter Addon for Friendica * * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net @@ -41,7 +41,7 @@ * License:3-clause BSD license * * Configuration: - * To use this plugin you need a OAuth Consumer key pair (key & secret) + * To use this addon you need a OAuth Consumer key pair (key & secret) * you can get it from Twitter at https://twitter.com/apps * * Register your Friendica site as "Client" application with "Read & Write" access @@ -53,15 +53,16 @@ * $a->config['twitter']['consumerkey'] = 'your consumer_key here'; * $a->config['twitter']['consumersecret'] = 'your consumer_secret here'; * - * To activate the plugin itself add it to the $a->config['system']['addon'] + * To activate the addon itself add it to the $a->config['system']['addon'] * setting. After this, your user can configure their Twitter account settings - * from "Settings -> Plugin Settings". + * from "Settings -> Addon Settings". * * Requirements: PHP5, curl [Slinky library] */ use Friendica\App; use Friendica\Content\OEmbed; +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\Worker; @@ -78,38 +79,38 @@ define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes function twitter_install() { // we need some hooks, for the configuration and for sending tweets - register_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings'); - register_hook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); - register_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local'); - register_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook'); - register_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets'); - register_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron'); - register_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook'); - register_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow'); - register_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire'); - register_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body'); - register_hook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification'); + Addon::registerHook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings'); + Addon::registerHook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); + Addon::registerHook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local'); + Addon::registerHook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook'); + Addon::registerHook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets'); + Addon::registerHook('cron', 'addon/twitter/twitter.php', 'twitter_cron'); + Addon::registerHook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook'); + Addon::registerHook('follow', 'addon/twitter/twitter.php', 'twitter_follow'); + Addon::registerHook('expire', 'addon/twitter/twitter.php', 'twitter_expire'); + Addon::registerHook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body'); + Addon::registerHook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification'); logger("installed twitter"); } function twitter_uninstall() { - unregister_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings'); - unregister_hook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); - unregister_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local'); - unregister_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook'); - unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets'); - unregister_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron'); - unregister_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook'); - unregister_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow'); - unregister_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire'); - unregister_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body'); - unregister_hook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification'); + Addon::unregisterHook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); + Addon::unregisterHook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook'); + Addon::unregisterHook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets'); + Addon::unregisterHook('cron', 'addon/twitter/twitter.php', 'twitter_cron'); + Addon::unregisterHook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook'); + Addon::unregisterHook('follow', 'addon/twitter/twitter.php', 'twitter_follow'); + Addon::unregisterHook('expire', 'addon/twitter/twitter.php', 'twitter_expire'); + Addon::unregisterHook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body'); + Addon::unregisterHook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification'); // old setting - remove only - unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook'); - unregister_hook('plugin_settings', 'addon/twitter/twitter.php', 'twitter_settings'); - unregister_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); + Addon::unregisterHook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook'); + Addon::unregisterHook('addon_settings', 'addon/twitter/twitter.php', 'twitter_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); } function twitter_check_item_notification(App $a, &$notification_data) @@ -300,7 +301,7 @@ function twitter_settings(App $a, &$s) /* * * * make some nice form */ - $s .= '

' . t('At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.') . '

'; + $s .= '

' . t('At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.') . '

'; $s .= '' . t('Log in with Twitter') . ''; $s .= '
'; $s .= ''; @@ -640,7 +641,7 @@ function twitter_post_hook(App $a, &$b) } } -function twitter_plugin_admin_post(App $a) +function twitter_addon_admin_post(App $a) { $consumerkey = x($_POST, 'consumerkey') ? notags(trim($_POST['consumerkey'])) : ''; $consumersecret = x($_POST, 'consumersecret') ? notags(trim($_POST['consumersecret'])) : ''; @@ -649,7 +650,7 @@ function twitter_plugin_admin_post(App $a) info(t('Settings updated.') . EOL); } -function twitter_plugin_admin(App $a, &$o) +function twitter_addon_admin(App $a, &$o) { $t = get_markup_template("admin.tpl", "addon/twitter/"); diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php index 85077c456..faa553cc1 100644 --- a/unicode_smilies/unicode_smilies.php +++ b/unicode_smilies/unicode_smilies.php @@ -5,15 +5,15 @@ * Version: 1.0 * Author: Michael Vogel */ - +use Friendica\Core\Addon; use Friendica\Content\Smilies; function unicode_smilies_install() { - register_hook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies'); + Addon::registerHook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies'); } function unicode_smilies_uninstall() { - unregister_hook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies'); + Addon::unregisterHook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies'); } function unicode_smilies_smilies(&$a,&$b) { diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php index 623ed89d8..cf1b33a7e 100644 --- a/viewsrc/viewsrc.php +++ b/viewsrc/viewsrc.php @@ -1,6 +1,4 @@ * */ +use Friendica\Core\Addon; function viewsrc_install() { - register_hook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu'); - register_hook('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end'); + Addon::registerHook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu'); + Addon::registerHook('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end'); } function viewsrc_uninstall() { - unregister_hook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu'); - unregister_hook('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end'); + Addon::unregisterHook('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu'); + Addon::unregisterHook('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end'); } diff --git a/webrtc/README.md b/webrtc/README.md index 4f6c55cac..2b5c9ed00 100644 --- a/webrtc/README.md +++ b/webrtc/README.md @@ -1,8 +1,8 @@ -WebRTC Plugin +WebRTC Addon ============= This is a quick and dirty addon to add a [webrtc][1] website as an app. As webrtc -advances so rapidly there is s a chance this plugin will be obsolete. Webrtc is +advances so rapidly there is s a chance this addon will be obsolete. Webrtc is a new video and audio conferencing tool that is browser to browser communication, no need to download specific software for just conferencing. There are many different webrtc instances and because of the technology it is @@ -10,7 +10,7 @@ really a person 2 person communication, using the server to only signal who wants to talk to who, the actual transfer of the audio and video is directly between the participants. -If you would like to try this plugin please download one of the following +If you would like to try this addon please download one of the following either Chrome/Chromium 25 or higher or Firefox 21 or higher. Then test it by visiting a known webrtc instance (i.e. [live.mayfirst.org](https://live.mayfirst.org)) create a room, you should be asked to share your camera and microphone (firefox will let diff --git a/webrtc/lang/it/messages.po b/webrtc/lang/it/messages.po index ae800a32d..31610b50e 100644 --- a/webrtc/lang/it/messages.po +++ b/webrtc/lang/it/messages.po @@ -56,4 +56,4 @@ msgstr "WebRTC è un sistema di conferenza audio/video che funziona con Firefox msgid "" "Please contact your friendica admin and send a reminder to configure the " "WebRTC addon." -msgstr "Contatta il tuo amministratore Friendica e ricordagli di configurare il plugin WebRTC." +msgstr "Contatta il tuo amministratore Friendica e ricordagli di configurare il addonWebRTC." diff --git a/webrtc/lang/it/strings.php b/webrtc/lang/it/strings.php index 7eb1f2f4f..cb86cd3a2 100644 --- a/webrtc/lang/it/strings.php +++ b/webrtc/lang/it/strings.php @@ -12,4 +12,4 @@ $a->strings["Page your users will create a WebRTC chat room on. For example you $a->strings["Settings updated."] = "Impostazioni aggiornate."; $a->strings["Video Chat"] = "Chat Video"; $a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC è un sistema di conferenza audio/video che funziona con Firefox (dalla versione 21) e Chrome/Chromium (dalla versione 25).\nCrea semplicemente una nuova stanza e invia il link alla persona con cui vuoi parlare."; -$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Contatta il tuo amministratore Friendica e ricordagli di configurare il plugin WebRTC."; +$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Contatta il tuo amministratore Friendica e ricordagli di configurare il addon WebRTC."; diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php index 1588847df..a71bac2af 100644 --- a/webrtc/webrtc.php +++ b/webrtc/webrtc.php @@ -6,15 +6,15 @@ * Author: Stephen Mahood * Author: Tobias Diekershoff */ - +use Friendica\Core\Addon; use Friendica\Core\Config; function webrtc_install() { - register_hook('app_menu', 'addon/webrtc/webrtc.php', 'webrtc_app_menu'); + Addon::registerHook('app_menu', 'addon/webrtc/webrtc.php', 'webrtc_app_menu'); } function webrtc_uninstall() { - unregister_hook('app_menu', 'addon/webrtc/webrtc.php', 'webrtc_app_menu'); + Addon::unregisterHook('app_menu', 'addon/webrtc/webrtc.php', 'webrtc_app_menu'); } @@ -22,14 +22,14 @@ function webrtc_app_menu($a,&$b) { $b['app_menu'][] = '
' . t('WebRTC Videochat') . '
'; } -function webrtc_plugin_admin (&$a, &$o) { +function webrtc_addon_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/webrtc/" ); $o = replace_macros( $t, [ '$submit' => t('Save Settings'), '$webrtcurl' => ['webrtcurl', t('WebRTC Base URL'), Config::get('webrtc','webrtcurl' ), t('Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .')], ]); } -function webrtc_plugin_admin_post (&$a) { +function webrtc_addon_admin_post (&$a) { $url = ((x($_POST, 'webrtcurl')) ? notags(trim($_POST['webrtcurl'])) : ''); Config::set('webrtc', 'webrtcurl', $url); info( t('Settings updated.'). EOL); diff --git a/widgets/lang/C/messages.po b/widgets/lang/C/messages.po index c903d2bf8..79a7a4028 100644 --- a/widgets/lang/C/messages.po +++ b/widgets/lang/C/messages.po @@ -49,7 +49,7 @@ msgid "Widgets available" msgstr "" #: widgets.php:124 -msgid "Plugin Settings" +msgid "Addon Settings" msgstr "" #: widget_friendheader.php:40 diff --git a/widgets/lang/ca/strings.php b/widgets/lang/ca/strings.php index db19a10b8..fb4bd4721 100644 --- a/widgets/lang/ca/strings.php +++ b/widgets/lang/ca/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Connectar en Friendica"; $a->strings["Generate new key"] = "Generar nova clau"; $a->strings["Widgets key"] = "Ginys clau"; $a->strings["Widgets available"] = "Ginys disponibles"; -$a->strings["Plugin Settings"] = "Ajustos de Plugin"; +$a->strings["Addon Settings"] = "Ajustos de Addon"; $a->strings["Get added to this list!"] = "S'afegeixen a aquesta llista!"; diff --git a/widgets/lang/cs/strings.php b/widgets/lang/cs/strings.php index 68c4f81fa..e6da406d7 100644 --- a/widgets/lang/cs/strings.php +++ b/widgets/lang/cs/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Připojit na Friendica!"; $a->strings["Generate new key"] = "Generovat nové klíče"; $a->strings["Widgets key"] = "Widgety klíč"; $a->strings["Widgets available"] = "Widgety k dispozici"; -$a->strings["Plugin Settings"] = "Nastavení doplňku"; +$a->strings["Addon Settings"] = "Nastavení doplňku"; $a->strings["Get added to this list!"] = "Nechte se přidat do tohoto listu!"; diff --git a/widgets/lang/de/strings.php b/widgets/lang/de/strings.php index 3137f02db..86e42c688 100644 --- a/widgets/lang/de/strings.php +++ b/widgets/lang/de/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "In Friendica verbinden!"; $a->strings["Generate new key"] = "Neuen Schlüssel erstellen"; $a->strings["Widgets key"] = "Widgets Schlüssel"; $a->strings["Widgets available"] = "Verfügbare Widgets"; -$a->strings["Plugin Settings"] = "Plugin-Einstellungen"; +$a->strings["Addon Settings"] = "Addon-Einstellungen"; $a->strings["Get added to this list!"] = "Werde Mitglied dieser Liste"; diff --git a/widgets/lang/eo/strings.php b/widgets/lang/eo/strings.php index 5a599474c..7585a6bb4 100644 --- a/widgets/lang/eo/strings.php +++ b/widgets/lang/eo/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Konekti ĉe Friendica!"; $a->strings["Generate new key"] = "Generi novan ĉifroŝlosilon"; $a->strings["Widgets key"] = "Ŝlosilo por fenestraĵoj"; $a->strings["Widgets available"] = "Disponeblaj fenestraĵoj"; -$a->strings["Plugin Settings"] = "Kromprogramoagordoj"; +$a->strings["Addon Settings"] = "Kromprogramoagordoj"; $a->strings["Get added to this list!"] = "Iĝu membro de ĉi tiu listo!"; diff --git a/widgets/lang/es/strings.php b/widgets/lang/es/strings.php index 181ae8e02..736ae769a 100644 --- a/widgets/lang/es/strings.php +++ b/widgets/lang/es/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "¡Conéctate en Friendica!"; $a->strings["Generate new key"] = "Generar clave nueva"; $a->strings["Widgets key"] = "Clave de aplicaciones"; $a->strings["Widgets available"] = "Aplicaciones disponibles"; -$a->strings["Plugin Settings"] = "Configuración de los módulos"; +$a->strings["Addon Settings"] = "Configuración de los módulos"; $a->strings["Get added to this list!"] = "¡Añadido a la lista!"; diff --git a/widgets/lang/fr/strings.php b/widgets/lang/fr/strings.php index b3b6108df..2a3000e32 100644 --- a/widgets/lang/fr/strings.php +++ b/widgets/lang/fr/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Se connecter sur Friendica!"; $a->strings["Generate new key"] = "Générer une nouvelle clé"; $a->strings["Widgets key"] = "Clé des widgets"; $a->strings["Widgets available"] = "Widgets disponibles"; -$a->strings["Plugin Settings"] = "Extensions"; +$a->strings["Addon Settings"] = "Extensions"; $a->strings["Get added to this list!"] = "Ajoutez-vous à cette liste!"; diff --git a/widgets/lang/is/strings.php b/widgets/lang/is/strings.php index 9892b5f4d..7867762d2 100644 --- a/widgets/lang/is/strings.php +++ b/widgets/lang/is/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Tengist á Friendica!"; $a->strings["Generate new key"] = "Búa til nýjan lykil"; $a->strings["Widgets key"] = "Lykill smáforrits "; $a->strings["Widgets available"] = "Smáforrit til"; -$a->strings["Plugin Settings"] = "Eininga stillingar"; +$a->strings["Addon Settings"] = "Eininga stillingar"; $a->strings["Get added to this list!"] = "Láta bæta þér við þennan lista!"; diff --git a/widgets/lang/it/strings.php b/widgets/lang/it/strings.php index d713d8ce0..277f1f865 100644 --- a/widgets/lang/it/strings.php +++ b/widgets/lang/it/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Connettiti su Friendica!"; $a->strings["Generate new key"] = "Genera una nuova chiave"; $a->strings["Widgets key"] = "Chiave Widget"; $a->strings["Widgets available"] = "Widget disponibili"; -$a->strings["Plugin Settings"] = "Impostazioni plugin"; +$a->strings["Addon Settings"] = "Impostazioni addon"; $a->strings["Get added to this list!"] = "Aggiungiti a questa lista!"; diff --git a/widgets/lang/nb-no/strings.php b/widgets/lang/nb-no/strings.php index 7774c639b..cdcf3f433 100644 --- a/widgets/lang/nb-no/strings.php +++ b/widgets/lang/nb-no/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = ""; $a->strings["Generate new key"] = "Lag ny nøkkel"; $a->strings["Widgets key"] = "Nøkkel til småprogrammer"; $a->strings["Widgets available"] = "Småprogrammer er tilgjengelige"; -$a->strings["Plugin Settings"] = "Tilleggsinnstillinger"; +$a->strings["Addon Settings"] = "Tilleggsinnstillinger"; $a->strings["Get added to this list!"] = ""; diff --git a/widgets/lang/pl/strings.php b/widgets/lang/pl/strings.php index 967b998be..b36b2cf5f 100644 --- a/widgets/lang/pl/strings.php +++ b/widgets/lang/pl/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Połączono z Friendica!"; $a->strings["Generate new key"] = "Stwórz nowy klucz"; $a->strings["Widgets key"] = ""; $a->strings["Widgets available"] = "Widgety są dostępne"; -$a->strings["Plugin Settings"] = "Ustawienia wtyczki"; +$a->strings["Addon Settings"] = "Ustawienia wtyczki"; $a->strings["Get added to this list!"] = "Zostań dodany do listy!"; diff --git a/widgets/lang/pt-br/strings.php b/widgets/lang/pt-br/strings.php index 965c39eb3..934ffea31 100644 --- a/widgets/lang/pt-br/strings.php +++ b/widgets/lang/pt-br/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Conecte no Friendica!"; $a->strings["Generate new key"] = "Gerar nova chave"; $a->strings["Widgets key"] = "Chave de widgets"; $a->strings["Widgets available"] = "Widgets disponíveis"; -$a->strings["Plugin Settings"] = "Configurações do plugin"; +$a->strings["Addon Settings"] = "Configurações do addon"; $a->strings["Get added to this list!"] = ""; diff --git a/widgets/lang/ru/strings.php b/widgets/lang/ru/strings.php index 3c455eb3b..8d8cf250f 100644 --- a/widgets/lang/ru/strings.php +++ b/widgets/lang/ru/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "Подключены к Friendica!"; $a->strings["Generate new key"] = "Сгенерировать новый ключ"; $a->strings["Widgets key"] = "Ключ виджетов"; $a->strings["Widgets available"] = "Виджеты доступны"; -$a->strings["Plugin Settings"] = "Настройки плагина"; +$a->strings["Addon Settings"] = "Настройки плагина"; $a->strings["Get added to this list!"] = ""; diff --git a/widgets/lang/sv/strings.php b/widgets/lang/sv/strings.php index 0d27628b6..6b34aac18 100644 --- a/widgets/lang/sv/strings.php +++ b/widgets/lang/sv/strings.php @@ -1,3 +1,3 @@ strings["Plugin Settings"] = "Inställningar för insticksprogram"; +$a->strings["Addon Settings"] = "Inställningar för insticksprogram"; diff --git a/widgets/lang/zh-cn/strings.php b/widgets/lang/zh-cn/strings.php index 11f1a96e1..df8fc4943 100644 --- a/widgets/lang/zh-cn/strings.php +++ b/widgets/lang/zh-cn/strings.php @@ -6,5 +6,5 @@ $a->strings["Connect on Friendica!"] = "连接在Friendica！"; $a->strings["Generate new key"] = "造成新钥匙"; $a->strings["Widgets key"] = "小窗口钥匙"; $a->strings["Widgets available"] = "可用的小窗口"; -$a->strings["Plugin Settings"] = "插件设置"; +$a->strings["Addon Settings"] = "插件设置"; $a->strings["Get added to this list!"] = "被在这个单子加入！"; diff --git a/widgets/widgets.php b/widgets/widgets.php index 502278a27..9867b884a 100644 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -5,17 +5,17 @@ * Version: 1.0 * Author: Fabio Comuni */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function widgets_install() { - register_hook('plugin_settings', 'addon/widgets/widgets.php', 'widgets_settings'); - register_hook('plugin_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post'); + Addon::registerHook('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings'); + Addon::registerHook('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post'); logger("installed widgets"); } function widgets_uninstall() { - unregister_hook('plugin_settings', 'addon/widgets/widgets.php', 'widgets_settings'); - unregister_hook('plugin_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post'); + Addon::unregisterHook('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post'); } @@ -122,7 +122,7 @@ function widgets_content(&$a) { if (isset($_GET['p']) && local_user()==$conf['uid'] ) { $o .= ""; $o .= "

Preview Widget

"; - $o .= ''. t("Plugin Settings") .''; + $o .= ''. t("Addon Settings") .''; $o .= "

".call_user_func($a->argv[1].'_widget_name')."

"; $o .= call_user_func($a->argv[1].'_widget_help'); diff --git a/windowsphonepush/lang/C/messages.po b/windowsphonepush/lang/C/messages.po index b6a10a743..8643694aa 100644 --- a/windowsphonepush/lang/C/messages.po +++ b/windowsphonepush/lang/C/messages.po @@ -26,7 +26,7 @@ msgid "WindowsPhonePush Settings" msgstr "" #: windowsphonepush.php:117 -msgid "Enable WindowsPhonePush Plugin" +msgid "Enable WindowsPhonePush Addon" msgstr "" #: windowsphonepush.php:122 diff --git a/windowsphonepush/lang/de/messages.po b/windowsphonepush/lang/de/messages.po index 672ab3f22..58bf87cff 100644 --- a/windowsphonepush/lang/de/messages.po +++ b/windowsphonepush/lang/de/messages.po @@ -28,8 +28,8 @@ msgid "WindowsPhonePush Settings" msgstr "WindowsPhonePush Einstellungen" #: windowsphonepush.php:117 -msgid "Enable WindowsPhonePush Plugin" -msgstr "Aktiviere WindowsPhonePush Plugin" +msgid "Enable WindowsPhonePush Addon" +msgstr "Aktiviere WindowsPhonePush Addon" #: windowsphonepush.php:122 msgid "Push text of new item" diff --git a/windowsphonepush/lang/de/strings.php b/windowsphonepush/lang/de/strings.php index 5dbbafc2f..e03a0bd73 100644 --- a/windowsphonepush/lang/de/strings.php +++ b/windowsphonepush/lang/de/strings.php @@ -7,6 +7,6 @@ function string_plural_select_de($n){ ; $a->strings["WindowsPhonePush settings updated."] = "WindowsPhonePush Einstellungen aktualisiert."; $a->strings["WindowsPhonePush Settings"] = "WindowsPhonePush Einstellungen"; -$a->strings["Enable WindowsPhonePush Plugin"] = "Aktiviere WindowsPhonePush Plugin"; +$a->strings["Enable WindowsPhonePush Addon"] = "Aktiviere WindowsPhonePush Addon"; $a->strings["Push text of new item"] = "Text senden"; $a->strings["Save Settings"] = "Einstellungen speichern"; diff --git a/windowsphonepush/lang/es/messages.po b/windowsphonepush/lang/es/messages.po index 7d561c218..52d8e8076 100644 --- a/windowsphonepush/lang/es/messages.po +++ b/windowsphonepush/lang/es/messages.po @@ -28,8 +28,8 @@ msgid "WindowsPhonePush Settings" msgstr "Ajustes de WindowsPhonePush" #: windowsphonepush.php:117 -msgid "Enable WindowsPhonePush Plugin" -msgstr "Habilitar Plugin de WindowsPhonePush" +msgid "Enable WindowsPhonePush Addon" +msgstr "Habilitar Addon de WindowsPhonePush" #: windowsphonepush.php:122 msgid "Push text of new item" diff --git a/windowsphonepush/lang/es/strings.php b/windowsphonepush/lang/es/strings.php index 22a5c4c5c..b1a1bd37a 100644 --- a/windowsphonepush/lang/es/strings.php +++ b/windowsphonepush/lang/es/strings.php @@ -7,6 +7,6 @@ function string_plural_select_es($n){ ; $a->strings["WindowsPhonePush settings updated."] = "Ajustes de WindowsPhonePush actualizados."; $a->strings["WindowsPhonePush Settings"] = "Ajustes de WindowsPhonePush"; -$a->strings["Enable WindowsPhonePush Plugin"] = "Habilitar Plugin de WindowsPhonePush"; +$a->strings["Enable WindowsPhonePush Addon"] = "Habilitar Addon de WindowsPhonePush"; $a->strings["Push text of new item"] = "Empujar texto de nuevo objeto"; $a->strings["Save Settings"] = "Guardar Ajustes"; diff --git a/windowsphonepush/lang/fr/messages.po b/windowsphonepush/lang/fr/messages.po index 612f4d6cf..b1b9a65ce 100644 --- a/windowsphonepush/lang/fr/messages.po +++ b/windowsphonepush/lang/fr/messages.po @@ -28,7 +28,7 @@ msgid "WindowsPhonePush Settings" msgstr "Paramètres WindowsPhonePush" #: windowsphonepush.php:117 -msgid "Enable WindowsPhonePush Plugin" +msgid "Enable WindowsPhonePush Addon" msgstr "Activer le greffon WindowsPhonePush" #: windowsphonepush.php:122 diff --git a/windowsphonepush/lang/fr/strings.php b/windowsphonepush/lang/fr/strings.php index 8edca6fc3..bff0edb39 100644 --- a/windowsphonepush/lang/fr/strings.php +++ b/windowsphonepush/lang/fr/strings.php @@ -7,6 +7,6 @@ function string_plural_select_fr($n){ ; $a->strings["WindowsPhonePush settings updated."] = "Paramètres WindowsPhonePush mis à jour"; $a->strings["WindowsPhonePush Settings"] = "Paramètres WindowsPhonePush"; -$a->strings["Enable WindowsPhonePush Plugin"] = "Activer le greffon WindowsPhonePush"; +$a->strings["Enable WindowsPhonePush Addon"] = "Activer le greffon WindowsPhonePush"; $a->strings["Push text of new item"] = "Pousse le texte du nouvel élément"; $a->strings["Save Settings"] = "Sauvegarde des paramètres"; diff --git a/windowsphonepush/lang/it/messages.po b/windowsphonepush/lang/it/messages.po index be085107f..d51b5732c 100644 --- a/windowsphonepush/lang/it/messages.po +++ b/windowsphonepush/lang/it/messages.po @@ -28,8 +28,8 @@ msgid "WindowsPhonePush Settings" msgstr "Impostazioni WindowsPhonePush" #: windowsphonepush.php:117 -msgid "Enable WindowsPhonePush Plugin" -msgstr "Abilita plugin WindowsPhonePush" +msgid "Enable WindowsPhonePush Addon" +msgstr "Abilita addon WindowsPhonePush" #: windowsphonepush.php:122 msgid "Push text of new item" diff --git a/windowsphonepush/lang/it/strings.php b/windowsphonepush/lang/it/strings.php index a472a7c13..ca76a09d2 100644 --- a/windowsphonepush/lang/it/strings.php +++ b/windowsphonepush/lang/it/strings.php @@ -7,6 +7,6 @@ function string_plural_select_it($n){ ; $a->strings["WindowsPhonePush settings updated."] = "Impostazioni WindowsPhonePush aggiornate."; $a->strings["WindowsPhonePush Settings"] = "Impostazioni WindowsPhonePush"; -$a->strings["Enable WindowsPhonePush Plugin"] = "Abilita plugin WindowsPhonePush"; +$a->strings["Enable WindowsPhonePush Addon"] = "Abilita addon WindowsPhonePush"; $a->strings["Push text of new item"] = "Notifica il testo dei nuovi elementi"; $a->strings["Save Settings"] = "Salva Impostazioni"; diff --git a/windowsphonepush/lang/ro/messages.po b/windowsphonepush/lang/ro/messages.po index 3b55d4a43..cbef36dad 100644 --- a/windowsphonepush/lang/ro/messages.po +++ b/windowsphonepush/lang/ro/messages.po @@ -28,8 +28,8 @@ msgid "WindowsPhonePush Settings" msgstr "Configurare WindowsPhonePush" #: windowsphonepush.php:117 -msgid "Enable WindowsPhonePush Plugin" -msgstr "Activare Plugin WindowsPhonePush" +msgid "Enable WindowsPhonePush Addon" +msgstr "Activare Addon WindowsPhonePush" #: windowsphonepush.php:122 msgid "Push text of new item" diff --git a/windowsphonepush/lang/ro/strings.php b/windowsphonepush/lang/ro/strings.php index 1c29eaba6..819ef6fe5 100644 --- a/windowsphonepush/lang/ro/strings.php +++ b/windowsphonepush/lang/ro/strings.php @@ -7,6 +7,6 @@ function string_plural_select_ro($n){ ; $a->strings["WindowsPhonePush settings updated."] = "Configurări WindowsPhonePush actualizate."; $a->strings["WindowsPhonePush Settings"] = "Configurare WindowsPhonePush"; -$a->strings["Enable WindowsPhonePush Plugin"] = "Activare Plugin WindowsPhonePush"; +$a->strings["Enable WindowsPhonePush Addon"] = "Activare Addon WindowsPhonePush"; $a->strings["Push text of new item"] = "Tastează textul noului element"; $a->strings["Save Settings"] = "Salvare Configurări"; diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php index 66b23a7cc..861bb7afa 100644 --- a/windowsphonepush/windowsphonepush.php +++ b/windowsphonepush/windowsphonepush.php @@ -10,7 +10,7 @@ * Pre-requisite: Windows Phone mobile device (at least WP 7.0) * Friendica mobile app on Windows Phone * - * When plugin is installed, the system calls the plugin + * When addon is installed, the system calls the addon * name_install() function, located in 'addon/name/name.php', * where 'name' is the name of the addon. * If the addon is removed from the configuration list, the @@ -26,24 +26,25 @@ * count only unseen elements which are not type=activity (likes and dislikes not seen as new elements) */ use Friendica\App; +use Friendica\Core\Addon; use Friendica\Core\PConfig; use Friendica\Model\User; function windowsphonepush_install() { - /* Our plugin will attach in three places. + /* Our addon will attach in three places. * The first is within cron - so the push notifications will be * sent every 10 minutes (or whatever is set in crontab). */ - register_hook('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron'); + Addon::registerHook('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron'); - /* Then we'll attach into the plugin settings page, and also the + /* Then we'll attach into the addon settings page, and also the * settings post hook so that we can create and update - * user preferences. User shall be able to activate the plugin and + * user preferences. User shall be able to activate the addon and * define whether he allows pushing first characters of item text */ - register_hook('plugin_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings'); - register_hook('plugin_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post'); + Addon::registerHook('addon_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings'); + Addon::registerHook('addon_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post'); logger("installed windowsphonepush"); } @@ -53,9 +54,9 @@ function windowsphonepush_uninstall() /* uninstall unregisters any hooks created with register_hook * during install. Don't delete data in table `pconfig`. */ - unregister_hook('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron'); - unregister_hook('plugin_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings'); - unregister_hook('plugin_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post'); + Addon::unregisterHook('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron'); + Addon::unregisterHook('addon_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post'); logger("removed windowsphonepush"); } @@ -88,7 +89,7 @@ function windowsphonepush_settings_post($a, $post) info(t('WindowsPhonePush settings updated.') . EOL); } -/* Called from the Plugin Setting form. +/* Called from the Addon Setting form. * Add our own settings info to the page. */ function windowsphonepush_settings(&$a, &$s) @@ -114,7 +115,7 @@ function windowsphonepush_settings(&$a, &$s) $s .= '

' . t('WindowsPhonePush Settings') . '

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; @@ -135,12 +136,12 @@ function windowsphonepush_settings(&$a, &$s) return; } -/* Cron function used to regularly check all users on the server with active windowsphonepushplugin and send +/* Cron function used to regularly check all users on the server with active windowsphonepushaddon and send * notifications to the Microsoft servers and consequently to the Windows Phone device */ function windowsphonepush_cron() { - // retrieve all UID's for which the plugin windowsphonepush is enabled and loop through every user + // retrieve all UID's for which the addon windowsphonepush is enabled and loop through every user $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'windowsphonepush' AND `k` = 'enable' AND `v` = 1"); if (count($r)) { foreach ($r as $rr) { @@ -151,7 +152,7 @@ function windowsphonepush_cron() // pushing only possible if device_url (the URI on Microsoft server) is available or not "NA" (which will be sent // by app if user has switched the server setting in app - sending blank not possible as this would return an update error) if (( $device_url == "" ) || ( $device_url == "NA" )) { - // no Device-URL for the user availabe, but plugin is enabled --> write info to Logger + // no Device-URL for the user availabe, but addon is enabled --> write info to Logger logger("WARN: windowsphonepush is enable for user " . $rr['uid'] . ", but no Device-URL is specified for the user."); } else { // retrieve the number of unseen items and the id of the latest one (if there are more than @@ -392,7 +393,7 @@ function windowsphonepush_updatesettings() return "Not Authenticated"; } - // no updating if user hasn't enabled the plugin + // no updating if user hasn't enabled the addon $enable = PConfig::get(local_user(), 'windowsphonepush', 'enable'); if (!$enable) { return "Plug-in not enabled"; @@ -433,7 +434,7 @@ function windowsphonepush_updatecounterunseen() return "Not Authenticated"; } - // no updating if user hasn't enabled the plugin + // no updating if user hasn't enabled the addon $enable = PConfig::get(local_user(), 'windowsphonepush', 'enable'); if (!$enable) { return "Plug-in not enabled"; diff --git a/wppost/lang/C/messages.po b/wppost/lang/C/messages.po index 27baa9606..92bc721d4 100644 --- a/wppost/lang/C/messages.po +++ b/wppost/lang/C/messages.po @@ -26,7 +26,7 @@ msgid "Wordpress Export" msgstr "" #: wppost.php:87 -msgid "Enable WordPress Post Plugin" +msgid "Enable WordPress Post Addon" msgstr "" #: wppost.php:92 diff --git a/wppost/lang/ca/strings.php b/wppost/lang/ca/strings.php index 2856b55c3..fb8f7d65c 100644 --- a/wppost/lang/ca/strings.php +++ b/wppost/lang/ca/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Wordpress"] = "Publica-ho al Wordpress"; $a->strings["WordPress Post Settings"] = "Configuració d'enviaments a WordPress"; -$a->strings["Enable WordPress Post Plugin"] = "Habilitar Configuració d'Enviaments a WordPress"; +$a->strings["Enable WordPress Post Addon"] = "Habilitar Configuració d'Enviaments a WordPress"; $a->strings["WordPress username"] = "Nom d'usuari de WordPress"; $a->strings["WordPress password"] = "Contrasenya de WordPress"; $a->strings["WordPress API URL"] = "WordPress API URL"; diff --git a/wppost/lang/cs/messages.po b/wppost/lang/cs/messages.po index 992a95db2..d2571365a 100644 --- a/wppost/lang/cs/messages.po +++ b/wppost/lang/cs/messages.po @@ -28,7 +28,7 @@ msgid "Wordpress Export" msgstr "Wordpress Export" #: wppost.php:86 -msgid "Enable WordPress Post Plugin" +msgid "Enable WordPress Post Addon" msgstr "Povolit rozšíření na WordPress" #: wppost.php:91 diff --git a/wppost/lang/cs/strings.php b/wppost/lang/cs/strings.php index 00352ce7a..457834224 100644 --- a/wppost/lang/cs/strings.php +++ b/wppost/lang/cs/strings.php @@ -7,7 +7,7 @@ function string_plural_select_cs($n){ ; $a->strings["Post to Wordpress"] = "Příspěvky do WordPress"; $a->strings["Wordpress Export"] = "Wordpress Export"; -$a->strings["Enable WordPress Post Plugin"] = "Povolit rozšíření na WordPress"; +$a->strings["Enable WordPress Post Addon"] = "Povolit rozšíření na WordPress"; $a->strings["WordPress username"] = "WordPress uživatelské jméno"; $a->strings["WordPress password"] = "WordPress heslo"; $a->strings["WordPress API URL"] = "URL adresa API WordPress"; diff --git a/wppost/lang/de/messages.po b/wppost/lang/de/messages.po index 57dde23f2..eb10db400 100644 --- a/wppost/lang/de/messages.po +++ b/wppost/lang/de/messages.po @@ -30,8 +30,8 @@ msgid "Wordpress Export" msgstr "Wordpress Export" #: wppost.php:87 -msgid "Enable WordPress Post Plugin" -msgstr "WordPress Plugin aktivieren" +msgid "Enable WordPress Post Addon" +msgstr "WordPress Addon aktivieren" #: wppost.php:92 msgid "WordPress username" diff --git a/wppost/lang/de/strings.php b/wppost/lang/de/strings.php index 9cdc292a9..57ae6afeb 100644 --- a/wppost/lang/de/strings.php +++ b/wppost/lang/de/strings.php @@ -7,7 +7,7 @@ function string_plural_select_de($n){ ; $a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen"; $a->strings["Wordpress Export"] = "Wordpress Export"; -$a->strings["Enable WordPress Post Plugin"] = "WordPress Plugin aktivieren"; +$a->strings["Enable WordPress Post Addon"] = "WordPress Addon aktivieren"; $a->strings["WordPress username"] = "WordPress-Benutzername"; $a->strings["WordPress password"] = "WordPress-Passwort"; $a->strings["WordPress API URL"] = "WordPress-API-URL"; diff --git a/wppost/lang/eo/strings.php b/wppost/lang/eo/strings.php index 7c786666d..04130d736 100644 --- a/wppost/lang/eo/strings.php +++ b/wppost/lang/eo/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Wordpress"] = "Afiŝi al Wordpress"; $a->strings["WordPress Post Settings"] = "Agordoj por WordPress afiŝojn"; -$a->strings["Enable WordPress Post Plugin"] = "Ŝalti la Wordpress-afiŝo kromprogramon"; +$a->strings["Enable WordPress Post Addon"] = "Ŝalti la Wordpress-afiŝo kromprogramon"; $a->strings["WordPress username"] = "WordPress salutnomo"; $a->strings["WordPress password"] = "WordPress pasvorto"; $a->strings["WordPress API URL"] = "Wordpress API URL adreso"; diff --git a/wppost/lang/es/messages.po b/wppost/lang/es/messages.po index baac8034b..0c555a7fd 100644 --- a/wppost/lang/es/messages.po +++ b/wppost/lang/es/messages.po @@ -28,8 +28,8 @@ msgid "Wordpress Export" msgstr "Exportar a Wordpress" #: wppost.php:87 -msgid "Enable WordPress Post Plugin" -msgstr "Habilitar Plugin de publicación de WordPress" +msgid "Enable WordPress Post Addon" +msgstr "Habilitar Addon de publicación de WordPress" #: wppost.php:92 msgid "WordPress username" diff --git a/wppost/lang/es/strings.php b/wppost/lang/es/strings.php index 137533118..fab68021a 100644 --- a/wppost/lang/es/strings.php +++ b/wppost/lang/es/strings.php @@ -7,7 +7,7 @@ function string_plural_select_es($n){ ; $a->strings["Post to Wordpress"] = "Publicar en Wordpress"; $a->strings["Wordpress Export"] = "Exportar a Wordpress"; -$a->strings["Enable WordPress Post Plugin"] = "Habilitar Plugin de publicación de WordPress"; +$a->strings["Enable WordPress Post Addon"] = "Habilitar Addon de publicación de WordPress"; $a->strings["WordPress username"] = "Nombre de usuario de WordPress"; $a->strings["WordPress password"] = "Contraseña de WordPress"; $a->strings["WordPress API URL"] = "URL de API de WordPress"; diff --git a/wppost/lang/fr/strings.php b/wppost/lang/fr/strings.php index 9cd4456fe..ed5113976 100644 --- a/wppost/lang/fr/strings.php +++ b/wppost/lang/fr/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Wordpress"] = "Poster sur WordPress"; $a->strings["WordPress Post Settings"] = "Réglages WordPress"; -$a->strings["Enable WordPress Post Plugin"] = "Activer l'extension WordPress"; +$a->strings["Enable WordPress Post Addon"] = "Activer l'extension WordPress"; $a->strings["WordPress username"] = "Utilisateur WordPress"; $a->strings["WordPress password"] = "Mot de passe WordPress"; $a->strings["WordPress API URL"] = "URL de l'API WordPress"; diff --git a/wppost/lang/is/strings.php b/wppost/lang/is/strings.php index 0b7f3fe7f..bca63d568 100644 --- a/wppost/lang/is/strings.php +++ b/wppost/lang/is/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Wordpress"] = "Senda færslu á Wordpress"; $a->strings["WordPress Post Settings"] = "Wordpress Post stillingar"; -$a->strings["Enable WordPress Post Plugin"] = "Kveikja á WordPress Post viðbót"; +$a->strings["Enable WordPress Post Addon"] = "Kveikja á WordPress Post viðbót"; $a->strings["WordPress username"] = "Wordpress aðgangsorð"; $a->strings["WordPress password"] = "Wordpress aðgagnsorð"; $a->strings["WordPress API URL"] = "Slóð á Wordpress API"; diff --git a/wppost/lang/it/messages.po b/wppost/lang/it/messages.po index 2369d955d..00bed78af 100644 --- a/wppost/lang/it/messages.po +++ b/wppost/lang/it/messages.po @@ -28,8 +28,8 @@ msgid "Wordpress Export" msgstr "" #: wppost.php:87 -msgid "Enable WordPress Post Plugin" -msgstr "Abilita il plugin di invio a Wordpress" +msgid "Enable WordPress Post Addon" +msgstr "Abilita il addon di invio a Wordpress" #: wppost.php:92 msgid "WordPress username" diff --git a/wppost/lang/it/strings.php b/wppost/lang/it/strings.php index 3f616900e..8df1bd08e 100644 --- a/wppost/lang/it/strings.php +++ b/wppost/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ ; $a->strings["Post to Wordpress"] = "Invia a Wordpress"; $a->strings["Wordpress Export"] = ""; -$a->strings["Enable WordPress Post Plugin"] = "Abilita il plugin di invio a Wordpress"; +$a->strings["Enable WordPress Post Addon"] = "Abilita il addon di invio a Wordpress"; $a->strings["WordPress username"] = "Nome utente Wordpress"; $a->strings["WordPress password"] = "Password Wordpress"; $a->strings["WordPress API URL"] = "Indirizzo API Wordpress"; diff --git a/wppost/lang/nb-no/strings.php b/wppost/lang/nb-no/strings.php index 5c840e673..3d125aa67 100644 --- a/wppost/lang/nb-no/strings.php +++ b/wppost/lang/nb-no/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Wordpress"] = ""; $a->strings["WordPress Post Settings"] = ""; -$a->strings["Enable WordPress Post Plugin"] = ""; +$a->strings["Enable WordPress Post Addon"] = ""; $a->strings["WordPress username"] = ""; $a->strings["WordPress password"] = ""; $a->strings["WordPress API URL"] = ""; diff --git a/wppost/lang/pl/strings.php b/wppost/lang/pl/strings.php index 201ead1d4..ab2df6a71 100644 --- a/wppost/lang/pl/strings.php +++ b/wppost/lang/pl/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Wordpress"] = "Opublikuj na Wordpress"; $a->strings["WordPress Post Settings"] = "Ustawienia wpisów WorldPress"; -$a->strings["Enable WordPress Post Plugin"] = "Włącz plugin wpisów WorldPress"; +$a->strings["Enable WordPress Post Addon"] = "Włącz addon wpisów WorldPress"; $a->strings["WordPress username"] = "nazwa użytkownika WordPress"; $a->strings["WordPress password"] = "hasło WordPress"; $a->strings["WordPress API URL"] = "WordPress API URL"; diff --git a/wppost/lang/pt-br/messages.po b/wppost/lang/pt-br/messages.po index 3d2ad0ffd..b011d0c2e 100644 --- a/wppost/lang/pt-br/messages.po +++ b/wppost/lang/pt-br/messages.po @@ -28,7 +28,7 @@ msgid "WordPress Post Settings" msgstr "Configurações de publicação no WordPress" #: wppost.php:78 -msgid "Enable WordPress Post Plugin" +msgid "Enable WordPress Post Addon" msgstr "Habilitar plug-in para publicar no WordPress" #: wppost.php:83 diff --git a/wppost/lang/pt-br/strings.php b/wppost/lang/pt-br/strings.php index dbb6eb1f2..fc59fcb38 100644 --- a/wppost/lang/pt-br/strings.php +++ b/wppost/lang/pt-br/strings.php @@ -7,7 +7,7 @@ function string_plural_select_pt_br($n){ ; $a->strings["Post to Wordpress"] = "Publicar no Wordpress"; $a->strings["WordPress Post Settings"] = "Configurações de publicação no WordPress"; -$a->strings["Enable WordPress Post Plugin"] = "Habilitar plug-in para publicar no WordPress"; +$a->strings["Enable WordPress Post Addon"] = "Habilitar plug-in para publicar no WordPress"; $a->strings["WordPress username"] = "Nome de usuário no WordPress"; $a->strings["WordPress password"] = "Senha do WordPress"; $a->strings["WordPress API URL"] = ""; diff --git a/wppost/lang/ro/messages.po b/wppost/lang/ro/messages.po index d329836d1..a239bcb58 100644 --- a/wppost/lang/ro/messages.po +++ b/wppost/lang/ro/messages.po @@ -27,7 +27,7 @@ msgid "Wordpress Export" msgstr "Export pe Wordpress" #: wppost.php:86 -msgid "Enable WordPress Post Plugin" +msgid "Enable WordPress Post Addon" msgstr "Activare Modul Postare pe Wordpress" #: wppost.php:91 diff --git a/wppost/lang/ro/strings.php b/wppost/lang/ro/strings.php index 86835bc39..fcd0efa43 100644 --- a/wppost/lang/ro/strings.php +++ b/wppost/lang/ro/strings.php @@ -7,7 +7,7 @@ function string_plural_select_ro($n){ ; $a->strings["Post to Wordpress"] = "Postați pe Wordpress"; $a->strings["Wordpress Export"] = "Export pe Wordpress"; -$a->strings["Enable WordPress Post Plugin"] = "Activare Modul Postare pe Wordpress"; +$a->strings["Enable WordPress Post Addon"] = "Activare Modul Postare pe Wordpress"; $a->strings["WordPress username"] = "Utilizator WordPress "; $a->strings["WordPress password"] = "Parolă WordPress "; $a->strings["WordPress API URL"] = "URL Cheie API WordPress"; diff --git a/wppost/lang/ru/strings.php b/wppost/lang/ru/strings.php index f193addc7..5eefa6390 100644 --- a/wppost/lang/ru/strings.php +++ b/wppost/lang/ru/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Wordpress"] = "Сообщение для Wordpress"; $a->strings["WordPress Post Settings"] = "Настройки сообщений для Wordpress"; -$a->strings["Enable WordPress Post Plugin"] = "Включить WordPress плагин сообщений"; +$a->strings["Enable WordPress Post Addon"] = "Включить WordPress плагин сообщений"; $a->strings["WordPress username"] = "WordPress Имя пользователя"; $a->strings["WordPress password"] = "WordPress паролъ"; $a->strings["WordPress API URL"] = "WordPress API URL"; diff --git a/wppost/lang/zh-cn/strings.php b/wppost/lang/zh-cn/strings.php index 74db63063..9ac233fd7 100644 --- a/wppost/lang/zh-cn/strings.php +++ b/wppost/lang/zh-cn/strings.php @@ -2,7 +2,7 @@ $a->strings["Post to Wordpress"] = "发送到Wordpress"; $a->strings["WordPress Post Settings"] = "Wordpress发送设置"; -$a->strings["Enable WordPress Post Plugin"] = "使Wordpress发送插件可用"; +$a->strings["Enable WordPress Post Addon"] = "使Wordpress发送插件可用"; $a->strings["WordPress username"] = "Wordpress用户名"; $a->strings["WordPress password"] = "Wordpress密码"; $a->strings["WordPress API URL"] = "WordPress API URL"; diff --git a/wppost/wppost.php b/wppost/wppost.php index 22032c90a..af371af11 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -6,28 +6,28 @@ * Version: 1.1 * Author: Mike Macgirvin */ - +use Friendica\Core\Addon; use Friendica\Core\PConfig; function wppost_install() { - register_hook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local'); - register_hook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send'); - register_hook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets'); - register_hook('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings'); - register_hook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post'); + Addon::registerHook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local'); + Addon::registerHook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send'); + Addon::registerHook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets'); + Addon::registerHook('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings'); + Addon::registerHook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post'); } function wppost_uninstall() { - unregister_hook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local'); - unregister_hook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send'); - unregister_hook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets'); - unregister_hook('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings'); - unregister_hook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post'); + Addon::unregisterHook('post_local', 'addon/wppost/wppost.php', 'wppost_post_local'); + Addon::unregisterHook('notifier_normal', 'addon/wppost/wppost.php', 'wppost_send'); + Addon::unregisterHook('jot_networks', 'addon/wppost/wppost.php', 'wppost_jot_nets'); + Addon::unregisterHook('connector_settings', 'addon/wppost/wppost.php', 'wppost_settings'); + Addon::unregisterHook('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post'); // obsolete - remove - unregister_hook('post_local_end', 'addon/wppost/wppost.php', 'wppost_send'); - unregister_hook('plugin_settings', 'addon/wppost/wppost.php', 'wppost_settings'); - unregister_hook('plugin_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post'); + Addon::unregisterHook('post_local_end', 'addon/wppost/wppost.php', 'wppost_send'); + Addon::unregisterHook('addon_settings', 'addon/wppost/wppost.php', 'wppost_settings'); + Addon::unregisterHook('addon_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post'); } @@ -86,7 +86,7 @@ function wppost_settings(&$a,&$s) { $s .= '

'. t('Wordpress Export').'

'; $s .= ''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; diff --git a/xmpp/converse/README.rst b/xmpp/converse/README.rst index f0a5b9913..96b61a761 100644 --- a/xmpp/converse/README.rst +++ b/xmpp/converse/README.rst @@ -55,7 +55,7 @@ Integration into other frameworks `django-conversejs `_ is an app that makes it easer to integrate *Converse.js* into Django. `django-xmpp `_ adds XMPP chat integration with converse.js by letting Ejabberd authenticate against your Django site. * `Roundcube `_: - `roundcube-converse.js-xmpp-plugin `_ is a plugin for Roundcube Webmail. + `roundcube-converse.js-xmpp-plugin `_ is an addon for Roundcube Webmail. * `Wordpress `_: `ConverseJS `_ * `Patternslib `_: diff --git a/xmpp/converse/builds/converse.min.js b/xmpp/converse/builds/converse.min.js index 7efcf9609..7ac83109c 100644 --- a/xmpp/converse/builds/converse.min.js +++ b/xmpp/converse/builds/converse.min.js @@ -2,8 +2,8 @@ * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/jrburke/almond for details - */ - + */ + /*! * jQuery JavaScript Library v1.11.0 * http://jquery.com/ @@ -16,8 +16,8 @@ * http://jquery.org/license * * Date: 2014-01-23T21:02Z - */ - + */ + /*! * Sizzle CSS Selector Engine v1.10.16 * http://sizzlejs.com/ @@ -27,49 +27,49 @@ * http://jquery.org/license * * Date: 2014-01-13 - */ - -// Underscore.js 1.8.3 -// http://underscorejs.org -// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors -// Underscore may be freely distributed under the MIT license. - + */ + +// Underscore.js 1.8.3 +// http://underscorejs.org +// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors +// Underscore may be freely distributed under the MIT license. + /** * @license RequireJS text 2.0.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved. * Available via the MIT or new BSD license. * see: http://github.com/requirejs/text for details - */ - -// RequireJS UnderscoreJS template plugin -// http://github.com/jfparadis/requirejs-tpl -// -// An alternative to http://github.com/ZeeAgency/requirejs-tpl -// -// Using UnderscoreJS micro-templates at http://underscorejs.org/#template -// Using and RequireJS text.js at http://requirejs.org/docs/api.html#text -// @author JF Paradis -// @version 0.0.2 -// -// Released under the MIT license -// -// Usage: -// require(['backbone', 'tpl!mytemplate'], function (Backbone, mytemplate) { -// return Backbone.View.extend({ -// initialize: function(){ -// this.render(); -// }, -// render: function(){ -// this.$el.html(mytemplate({message: 'hello'})); -// }); -// }); -// -// Configuration: (optional) -// require.config({ -// tpl: { -// extension: '.tpl' // default = '.html' -// } -// }); - + */ + +// RequireJS UnderscoreJS template addon +// http://github.com/jfparadis/requirejs-tpl +// +// An alternative to http://github.com/ZeeAgency/requirejs-tpl +// +// Using UnderscoreJS micro-templates at http://underscorejs.org/#template +// Using and RequireJS text.js at http://requirejs.org/docs/api.html#text +// @author JF Paradis +// @version 0.0.2 +// +// Released under the MIT license +// +// Usage: +// require(['backbone', 'tpl!mytemplate'], function (Backbone, mytemplate) { +// return Backbone.View.extend({ +// initialize: function(){ +// this.render(); +// }, +// render: function(){ +// this.$el.html(mytemplate({message: 'hello'})); +// }); +// }); +// +// Configuration: (optional) +// require.config({ +// tpl: { +// extension: '.tpl' // default = '.html' +// } +// }); + /* jed.js v0.5.0beta @@ -91,10 +91,10 @@ Many thanks to Joshua I. Miller - unrtst@cpan.org - who wrote gettext.js back in 2008. I was able to vet a lot of my ideas against his. I also made sure Jed passed against his tests in order to offer easy upgrades -- jsgettext.berlios.de -*/ - -// Underscore 1.3.0 was used to port and is licensed - +*/ + +// Underscore 1.3.0 was used to port and is licensed + /** sprintf() for JavaScript 0.7-beta1 http://www.diveintojavascript.com/projects/javascript-sprintf @@ -123,8 +123,8 @@ in order to offer easy upgrades -- jsgettext.berlios.de ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - + */ + /*! * jQuery Browser Plugin 0.0.8 * https://github.com/gabceb/jquery-browser-plugin @@ -138,22 +138,22 @@ in order to offer easy upgrades -- jsgettext.berlios.de * Released under the MIT license * * Date: 05-07-2015 - */ - + */ + /* CryptoJS v3.1.2 code.google.com/p/crypto-js (c) 2009-2013 by Jeff Mott. All rights reserved. code.google.com/p/crypto-js/wiki/License -*/ - +*/ + /*! * EventEmitter v4.2.3 - git.io/ee * Oliver Caldwell * MIT license * @preserve - */ - + */ + /*! otr.js v0.2.12 - 2014-04-15 @@ -163,14 +163,14 @@ code.google.com/p/crypto-js/wiki/License This file is concatenated for the browser. Please see: https://github.com/arlolra/otr -*/ - -//! moment.js -//! version : 2.10.6 -//! authors : Tim Wood, Iskren Chernev, Moment.js contributors -//! license : MIT -//! momentjs.com - +*/ + +//! moment.js +//! version : 2.10.6 +//! authors : Tim Wood, Iskren Chernev, Moment.js contributors +//! license : MIT +//! momentjs.com + /* * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined * in FIPS PUB 180-1 @@ -178,8 +178,8 @@ code.google.com/p/crypto-js/wiki/License * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet * Distributed under the BSD License * See http://pajhome.org.uk/crypt/md5 for details. - */ - + */ + /* * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message * Digest Algorithm, as defined in RFC 1321. @@ -187,51 +187,51 @@ code.google.com/p/crypto-js/wiki/License * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet * Distributed under the BSD License * See http://pajhome.org.uk/crypt/md5 for more info. - */ - + */ + /* This program is distributed under the terms of the MIT license. Please see the LICENSE file for details. Copyright 2006-2008, OGG, LLC -*/ - +*/ + /* Copyright 2010, François de Metz -*/ - +*/ + /* * Based on Ping Strophejs plugins (https://github.com/metajack/strophejs-plugins/tree/master/ping) -* This plugin is distributed under the terms of the MIT licence. +* This addon is distributed under the terms of the MIT licence. * Please see the LICENCE file for details. * * Copyright (c) Markus Kohlhase, 2010 * Refactored by Pavel Lang, 2011 -*/ - -// (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors -// Backbone may be freely distributed under the MIT license. -// For all details and documentation: -// http://backbonejs.org - +*/ + +// (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors +// Backbone may be freely distributed under the MIT license. +// For all details and documentation: +// http://backbonejs.org + /*! * Backbone.Overview * * Copyright (c) 2014, JC Brand * Licensed under the Mozilla Public License (MPL) - */ - + */ + /*! * typeahead.js 0.10.5 * https://github.com/twitter/typeahead.js * Copyright 2013-2014 Twitter, Inc. and other contributors; Licensed MIT - */ - -// Converse.js (A browser based XMPP chat client) -// http://conversejs.org -// -// Copyright (c) 2012-2015, Jan-Carel Brand -// Licensed under the Mozilla Public License (MPLv2) -// - + */ + +// Converse.js (A browser based XMPP chat client) +// http://conversejs.org +// +// Copyright (c) 2012-2015, Jan-Carel Brand +// Licensed under the Mozilla Public License (MPLv2) +// + var requirejs,require,define;(function(e){function h(e,t){return f.call(e,t)}function p(e,t){var n,r,i,s,o,a,f,l,h,p,d,v=t&&t.split("/"),m=u.map,g=m&&m["*"]||{};if(e&&e.charAt(0)===".")if(t){e=e.split("/"),o=e.length-1,u.nodeIdCompat&&c.test(e[o])&&(e[o]=e[o].replace(c,"")),e=v.slice(0,v.length-1).concat(e);for(h=0;h0&&(e.splice(h-1,2),h-=2)}}e=e.join("/")}else e.indexOf("./")===0&&(e=e.substring(2));if((v||g)&&m){n=e.split("/");for(h=n.length;h>0;h-=1){r=n.slice(0,h).join("/");if(v)for(p=v.length;p>0;p-=1){i=m[v.slice(0,p).join("/")];if(i){i=i[r];if(i){s=i,a=h;break}}}if(s)break;!f&&g&&g[r]&&(f=g[r],l=h)}!s&&f&&(s=f,a=l),s&&(n.splice(0,a,s),e=n.join("/"))}return e}function d(t,r){return function(){var i=l.call(arguments,0);return typeof i[0]!="string"&&i.length===1&&i.push(null),n.apply(e,i.concat([t,r]))}}function v(e){return function(t){return p(t,e)}}function m(e){return function(t){s[e]=t}}function g(n){if(h(o,n)){var r=o[n];delete o[n],a[n]=!0,t.apply(e,r)}if(!h(s,n)&&!h(a,n))throw new Error("No "+n);return s[n]}function y(e){var t,n=e?e.indexOf("!"):-1;return n>-1&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function b(e){return function(){return u&&u.config&&u.config[e]||{}}}var t,n,r,i,s={},o={},u={},a={},f=Object.prototype.hasOwnProperty,l=[].slice,c=/\.js$/;r=function(e,t){var n,r=y(e),i=r[0];return e=r[1],i&&(i=p(i,t),n=g(i)),i?n&&n.normalize?e=n.normalize(e,v(t)):e=p(e,t):(e=p(e,t),r=y(e),i=r[0],e=r[1],i&&(n=g(i))),{f:i?i+"!"+e:e,n:e,pr:i,p:n}},i={require:function(e){return d(e)},exports:function(e){var t=s[e];return typeof t!="undefined"?t:s[e]={}},module:function(e){return{id:e,uri:"",exports:s[e],config:b(e)}}},t=function(t,n,u,f){var l,c,p,v,y,b=[],w=typeof u,E;f=f||t;if(w==="undefined"||w==="function"){n=!n.length&&u.length?["require","exports","module"]:n;for(y=0;y0&&t-1 in e}function x(e,t,n){if(p.isFunction(t))return p.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return p.grep(e,function(e){return e===t!==n});if(typeof t=="string"){if(S.test(t))return p.filter(t,e,n);t=p.filter(t,e)}return p.grep(e,function(e){return p.inArray(e,t)>=0!==n})}function O(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function D(e){var t=_[e]={};return p.each(e.match(M)||[],function(e,n){t[n]=!0}),t}function H(){N.addEventListener?(N.removeEventListener("DOMContentLoaded",B,!1),e.removeEventListener("load",B,!1)):(N.detachEvent("onreadystatechange",B),e.detachEvent("onload",B))}function B(){if(N.addEventListener||event.type==="load"||N.readyState==="complete")H(),p.ready()}function R(e,t,n){if(n===undefined&&e.nodeType===1){var r="data-"+t.replace(q,"-$1").toLowerCase();n=e.getAttribute(r);if(typeof n=="string"){try{n=n==="true"?!0:n==="false"?!1:n==="null"?null:+n+""===n?+n:I.test(n)?p.parseJSON(n):n}catch(i){}p.data(e,t,n)}else n=undefined}return n}function U(e){var t;for(t in e){if(t==="data"&&p.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function z(e,t,r,i){if(!p.acceptData(e))return;var s,o,u=p.expando,a=e.nodeType,f=a?p.cache:e,l=a?e[u]:e[u]&&u;if((!l||!f[l]||!i&&!f[l].data)&&r===undefined&&typeof t=="string")return;l||(a?l=e[u]=n.pop()||p.guid++:l=u),f[l]||(f[l]=a?{}:{toJSON:p.noop});if(typeof t=="object"||typeof t=="function")i?f[l]=p.extend(f[l],t):f[l].data=p.extend(f[l].data,t);return o=f[l],i||(o.data||(o.data={}),o=o.data),r!==undefined&&(o[p.camelCase(t)]=r),typeof t=="string"?(s=o[t],s==null&&(s=o[p.camelCase(t)])):s=o,s}function W(e,t,n){if(!p.acceptData(e))return;var r,i,s=e.nodeType,o=s?p.cache:e,u=s?e[p.expando]:p.expando;if(!o[u])return;if(t){r=n?o[u]:o[u].data;if(r){p.isArray(t)?t=t.concat(p.map(t,p.camelCase)):t in r?t=[t]:(t=p.camelCase(t),t in r?t=[t]:t=t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!U(r):!p.isEmptyObject(r))return}}if(!n){delete o[u].data;if(!U(o[u]))return}s?p.cleanData([e],!0):c.deleteExpando||o!=o.window?delete o[u]:o[u]=null}function tt(){return!0}function nt(){return!1}function rt(){try{return N.activeElement}catch(e){}}function it(e){var t=st.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Et(e,t){var n,r,i=0,s=typeof e.getElementsByTagName!==j?e.getElementsByTagName(t||"*"):typeof e.querySelectorAll!==j?e.querySelectorAll(t||"*"):undefined;if(!s)for(s=[],n=e.childNodes||e;(r=n[i])!=null;i++)!t||p.nodeName(r,t)?s.push(r):p.merge(s,Et(r,t));return t===undefined||t&&p.nodeName(e,t)?p.merge([e],s):s}function St(e){K.test(e.type)&&(e.defaultChecked=e.checked)}function xt(e,t){return p.nodeName(e,"table")&&p.nodeName(t.nodeType!==11?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Tt(e){return e.type=(p.find.attr(e,"type")!==null)+"/"+e.type,e}function Nt(e){var t=mt.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Ct(e,t){var n,r=0;for(;(n=e[r])!=null;r++)p._data(n,"globalEval",!t||p._data(t[r],"globalEval"))}function kt(e,t){if(t.nodeType!==1||!p.hasData(e))return;var n,r,i,s=p._data(e),o=p._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r")).appendTo(t.documentElement),t=(At[0].contentWindow||At[0].contentDocument).document,t.write(),t.close(),n=Mt(e,t),At.detach();Ot[e]=n}return n}function Ft(e,t){return{get:function(){var n=e();if(n==null)return;if(n){delete this.get;return}return(this.get=t).apply(this,arguments)}}}function $t(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Vt.length;while(i--){t=Vt[i]+n;if(t in e)return t}return r}function Jt(e,t){var n,r,i,s=[],o=0,u=e.length;for(;o=0&&n=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||p.type(e)!=="object"||e.nodeType||p.isWindow(e))return!1;try{if(e.constructor&&!f.call(e,"constructor")&&!f.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(c.ownLast)for(t in e)return f.call(e,t);for(t in e);return t===undefined||f.call(e,t)},type:function(e){return e==null?e+"":typeof e=="object"||typeof e=="function"?u[a.call(e)]||"object":typeof e},globalEval:function(t){t&&p.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(v,"ms-").replace(m,g)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,s=e.length,o=y(e);if(n)if(o)for(;ir.cacheLength&&delete t[e.shift()],t[n+" "]=i}var e=[];return t}function st(e){return e[y]=!0,e}function ot(e){var t=c.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ut(e,t){var n=e.split("|"),i=e.length;while(i--)r.attrHandle[n[i]]=t}function at(e,t){var n=t&&e,r=n&&e.nodeType===1&&t.nodeType===1&&(~t.sourceIndex||k)-(~e.sourceIndex||k);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function ct(e){return st(function(t){return t=+t,st(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ht(e){return e&&typeof e.getElementsByTagName!==C&&e}function pt(){}function dt(e,t){var n,i,s,o,u,a,f,l=x[e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=r.preFilter;while(u){if(!n||(i=U.exec(u)))i&&(u=u.slice(i[0].length)||u),a.push(s=[]);n=!1;if(i=z.exec(u))n=i.shift(),s.push({value:n,type:i[0].replace(R," ")}),u=u.slice(n.length);for(o in r.filter)(i=$[o].exec(u))&&(!f[o]||(i=f[o](i)))&&(n=i.shift(),s.push({value:n,type:o,matches:i}),u=u.slice(n.length));if(!n)break}return t?u.length:u?rt.error(e):x(e,a).slice(0)}function vt(e){var t=0,n=e.length,r="";for(;t1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function yt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1&&(s[f]=!(o[f]=c))}}else g=yt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):_.apply(o,g)})}function wt(e){var t,n,i,s=e.length,o=r.relative[e[0].type],a=o||r.relative[" "],f=o?1:0,l=mt(function(e){return e===t},a,!0),c=mt(function(e){return P.call(t,e)>-1},a,!0),h=[function(e,n,r){return!o&&(r||n!==u)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];for(;f1&>(h),f>1&&vt(e.slice(0,f-1).concat({value:e[f-2].type===" "?"*":""})).replace(R,"$1"),n,f0,i=e.length>0,s=function(s,o,a,f,l){var h,p,d,v=0,m="0",g=s&&[],y=[],b=u,E=s||i&&r.find.TAG("*",l),S=w+=b==null?1:Math.random()||.1,x=E.length;l&&(u=o!==c&&o);for(;m!==x&&(h=E[m])!=null;m++){if(i&&h){p=0;while(d=e[p++])if(d(h,o,a)){f.push(h);break}l&&(w=S)}n&&((h=!d&&h)&&v--,s&&g.push(h))}v+=m;if(n&&m!==v){p=0;while(d=t[p++])d(g,y,o,a);if(s){if(v>0)while(m--)!g[m]&&!y[m]&&(y[m]=O.call(f));y=yt(y)}_.apply(f,y),l&&!s&&y.length>0&&v+t.length>1&&rt.uniqueSort(f)}return l&&(w=S,u=b),g};return n?st(s):s}function St(e,t,n){var r=0,i=t.length;for(;r2&&(f=a[0]).type==="ID"&&n.getById&&t.nodeType===9&&p&&r.relative[a[1].type]){t=(r.find.ID(f.matches[0].replace(et,tt),t)||[])[0];if(!t)return i;e=e.slice(a.shift().value.length)}u=$.needsContext.test(e)?0:a.length;while(u--){f=a[u];if(r.relative[l=f.type])break;if(c=r.find[l])if(s=c(f.matches[0].replace(et,tt),Y.test(a[0].type)&&ht(t.parentNode)||t)){a.splice(u,1),e=s.length&&vt(a);if(!e)return _.apply(i,s),i;break}}}return o(e,h)(s,t,!p,i,Y.test(e)&&ht(t.parentNode)||t),i}var t,n,r,i,s,o,u,a,f,l,c,h,p,d,v,m,g,y="sizzle"+ -(new Date),b=e.document,w=0,E=0,S=it(),x=it(),T=it(),N=function(e,t){return e===t&&(f=!0),0},C=typeof undefined,k=1<<31,L={}.hasOwnProperty,A=[],O=A.pop,M=A.push,_=A.push,D=A.slice,P=A.indexOf||function(e){var t=0,n=this.length;for(;t+~]|"+B+")"+B+"*"),W=new RegExp("="+B+"*([^\\]'\"]*?)"+B+"*\\]","g"),X=new RegExp(q),V=new RegExp("^"+F+"$"),$={ID:new RegExp("^#("+j+")"),CLASS:new RegExp("^\\.("+j+")"),TAG:new RegExp("^("+j.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+B+"*(even|odd|(([+-]|)(\\d*)n|)"+B+"*(?:([+-]|)"+B+"*(\\d+)|))"+B+"*\\)|)","i"),bool:new RegExp("^(?:"+H+")$","i"),needsContext:new RegExp("^"+B+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+B+"*((?:-\\d)?\\d*)"+B+"*\\)|)(?=[^-]|$)","i")},J=/^(?:input|select|textarea|button)$/i,K=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,G=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Y=/[+~]/,Z=/'|\\/g,et=new RegExp("\\\\([\\da-f]{1,6}"+B+"?|("+B+")|.)","ig"),tt=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,r&1023|56320)};try{_.apply(A=D.call(b.childNodes),b.childNodes),A[b.childNodes.length].nodeType}catch(nt){_={apply:A.length?function(e,t){M.apply(e,D.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}n=rt.support={},s=rt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},l=rt.setDocument=function(e){var t,i=e?e.ownerDocument||e:b,o=i.defaultView;if(i===c||i.nodeType!==9||!i.documentElement)return c;c=i,h=i.documentElement,p=!s(i),o&&o!==o.top&&(o.addEventListener?o.addEventListener("unload",function(){l()},!1):o.attachEvent&&o.attachEvent("onunload",function(){l()})),n.attributes=ot(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ot(function(e){return e.appendChild(i.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(i.getElementsByClassName)&&ot(function(e){return e.innerHTML="
",e.firstChild.className="i",e.getElementsByClassName("i").length===2}),n.getById=ot(function(e){return h.appendChild(e).id=y,!i.getElementsByName||!i.getElementsByName(y).length}),n.getById?(r.find.ID=function(e,t){if(typeof t.getElementById!==C&&p){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},r.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(delete r.find.ID,r.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==C&&e.getAttributeNode("id");return n&&n.value===t}}),r.find.TAG=n.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!==C)return t.getElementsByTagName(e)}:function(e,t){var n,r=[],i=0,s=t.getElementsByTagName(e);if(e==="*"){while(n=s[i++])n.nodeType===1&&r.push(n);return r}return s},r.find.CLASS=n.getElementsByClassName&&function(e,t){if(typeof t.getElementsByClassName!==C&&p)return t.getElementsByClassName(e)},v=[],d=[];if(n.qsa=Q.test(i.querySelectorAll))ot(function(e){e.innerHTML="",e.querySelectorAll("[t^='']").length&&d.push("[*^$]="+B+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||d.push("\\["+B+"*(?:value|"+H+")"),e.querySelectorAll(":checked").length||d.push(":checked")}),ot(function(e){var t=i.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&d.push("name"+B+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||d.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),d.push(",.*:")});return(n.matchesSelector=Q.test(m=h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ot(function(e){n.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),v.push("!=",q)}),d=d.length&&new RegExp(d.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),g=t||Q.test(h.contains)?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!r&&r.nodeType===1&&!!(n.contains?n.contains(r):e.compareDocumentPosition&&e.compareDocumentPosition(r)&16)}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},N=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r?r:(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,r&1||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===i||e.ownerDocument===b&&g(b,e)?-1:t===i||t.ownerDocument===b&&g(b,t)?1:a?P.call(a,e)-P.call(a,t):0:r&4?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,s=e.parentNode,o=t.parentNode,u=[e],l=[t];if(!s||!o)return e===i?-1:t===i?1:s?-1:o?1:a?P.call(a,e)-P.call(a,t):0;if(s===o)return at(e,t);n=e;while(n=n.parentNode)u.unshift(n);n=t;while(n=n.parentNode)l.unshift(n);while(u[r]===l[r])r++;return r?at(u[r],l[r]):u[r]===b?-1:l[r]===b?1:0},i},rt.matches=function(e,t){return rt(e,null,null,t)},rt.matchesSelector=function(e,t){(e.ownerDocument||e)!==c&&l(e),t=t.replace(W,"='$1']");if(n.matchesSelector&&p&&(!v||!v.test(t))&&(!d||!d.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&e.document.nodeType!==11)return r}catch(i){}return rt(t,c,null,[e]).length>0},rt.contains=function(e,t){return(e.ownerDocument||e)!==c&&l(e),g(e,t)},rt.attr=function(e,t){(e.ownerDocument||e)!==c&&l(e);var i=r.attrHandle[t.toLowerCase()],s=i&&L.call(r.attrHandle,t.toLowerCase())?i(e,t,!p):undefined;return s!==undefined?s:n.attributes||!p?e.getAttribute(t):(s=e.getAttributeNode(t))&&s.specified?s.value:null},rt.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},rt.uniqueSort=function(e){var t,r=[],i=0,s=0;f=!n.detectDuplicates,a=!n.sortStable&&e.slice(0),e.sort(N);if(f){while(t=e[s++])t===e[s]&&(i=r.push(s));while(i--)e.splice(r[i],1)}return a=null,e},i=rt.getText=function(e){var t,n="",r=0,s=e.nodeType;if(!s)while(t=e[r++])n+=i(t);else if(s===1||s===9||s===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(s===3||s===4)return e.nodeValue;return n},r=rt.selectors={cacheLength:50,createPseudo:st,match:$,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1].slice(0,3)==="nth"?(e[3]||rt.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*(e[3]==="even"||e[3]==="odd")),e[5]=+(e[7]+e[8]||e[3]==="odd")):e[3]&&rt.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return $.CHILD.test(e[0])?null:(e[3]&&e[4]!==undefined?e[2]=e[4]:n&&X.test(n)&&(t=dt(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(et,tt).toLowerCase();return e==="*"?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=S[e+" "];return t||(t=new RegExp("(^|"+B+")"+e+"("+B+"|$)"))&&S(e,function(e){return t.test(typeof e.className=="string"&&e.className||typeof e.getAttribute!==C&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=rt.attr(r,e);return i==null?t==="!=":t?(i+="",t==="="?i===n:t==="!="?i!==n:t==="^="?n&&i.indexOf(n)===0:t==="*="?n&&i.indexOf(n)>-1:t==="$="?n&&i.slice(-n.length)===n:t==="~="?(" "+i+" ").indexOf(n)>-1:t==="|="?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var s=e.slice(0,3)!=="nth",o=e.slice(-4)!=="last",u=t==="of-type";return r===1&&i===0?function(e){return!!e.parentNode}:function(t,n,a){var f,l,c,h,p,d,v=s!==o?"nextSibling":"previousSibling",m=t.parentNode,g=u&&t.nodeName.toLowerCase(),b=!a&&!u;if(m){if(s){while(v){c=t;while(c=c[v])if(u?c.nodeName.toLowerCase()===g:c.nodeType===1)return!1;d=v=e==="only"&&!d&&"nextSibling"}return!0}d=[o?m.firstChild:m.lastChild];if(o&&b){l=m[y]||(m[y]={}),f=l[e]||[],p=f[0]===w&&f[1],h=f[0]===w&&f[2],c=p&&m.childNodes[p];while(c=++p&&c&&c[v]||(h=p=0)||d.pop())if(c.nodeType===1&&++h&&c===t){l[e]=[w,p,h];break}}else if(b&&(f=(t[y]||(t[y]={}))[e])&&f[0]===w)h=f[1];else while(c=++p&&c&&c[v]||(h=p=0)||d.pop())if((u?c.nodeName.toLowerCase()===g:c.nodeType===1)&&++h){b&&((c[y]||(c[y]={}))[e]=[w,h]);if(c===t)break}return h-=i,h===r||h%r===0&&h/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||rt.error("unsupported pseudo: "+e);return i[y]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?st(function(e,n){var r,s=i(e,t),o=s.length;while(o--)r=P.call(e,s[o]),e[r]=!(n[r]=s[o])}):function(e){return i(e,0,n)}):i}},pseudos:{not:st(function(e){var t=[],n=[],r=o(e.replace(R,"$1"));return r[y]?st(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:st(function(e){return function(t){return rt(e,t).length>0}}),contains:st(function(e){return function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:st(function(e){return V.test(e||"")||rt.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=p?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||n.indexOf(e+"-")===0;while((t=t.parentNode)&&t.nodeType===1);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===c.activeElement&&(!c.hasFocus||c.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return K.test(e.nodeName)},input:function(e){return J.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},text:function(e){var t;return e.nodeName.toLowerCase()==="input"&&e.type==="text"&&((t=e.getAttribute("type"))==null||t.toLowerCase()==="text")},first:ct(function(){return[0]}),last:ct(function(e,t){return[t-1]}),eq:ct(function(e,t,n){return[n<0?n+t:n]}),even:ct(function(e,t){var n=0;for(;n=0;)e.push(r);return e}),gt:ct(function(e,t,n){var r=n<0?n+t:n;for(;++r(?:<\/\1>|)$/,S=/^.[^:#\[\.,]*$/;p.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),t.length===1&&r.nodeType===1?p.find.matchesSelector(r,e)?[r]:[]:p.find.matches(e,p.grep(t,function(e){return e.nodeType===1}))},p.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if(typeof e!="string")return this.pushStack(p(e).filter(function(){for(t=0;t1?p.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(x(this,e||[],!1))},not:function(e){return this.pushStack(x(this,e||[],!0))},is:function(e){return!!x(this,typeof e=="string"&&w.test(e)?p(e):e||[],!1).length}});var T,N=e.document,C=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=p.fn.init=function(e,t){var n,r;if(!e)return this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?n=[null,e,null]:n=C.exec(e);if(n&&(n[1]||!t)){if(n[1]){t=t instanceof p?t[0]:t,p.merge(this,p.parseHTML(n[1],t&&t.nodeType?t.ownerDocument||t:N,!0));if(E.test(n[1])&&p.isPlainObject(t))for(n in t)p.isFunction(this[n])?this[n](t[n]):this.attr(n,t[n]);return this}r=N.getElementById(n[2]);if(r&&r.parentNode){if(r.id!==n[2])return T.find(e);this.length=1,this[0]=r}return this.context=N,this.selector=e,this}return!t||t.jquery?(t||T).find(e):this.constructor(t).find(e)}return e.nodeType?(this.context=this[0]=e,this.length=1,this):p.isFunction(e)?typeof T.ready!="undefined"?T.ready(e):e(p):(e.selector!==undefined&&(this.selector=e.selector,this.context=e.context),p.makeArray(e,this))};k.prototype=p.fn,T=p(N);var L=/^(?:parents|prev(?:Until|All))/,A={children:!0,contents:!0,next:!0,prev:!0};p.extend({dir:function(e,t,n){var r=[],i=e[t];while(i&&i.nodeType!==9&&(n===undefined||i.nodeType!==1||!p(i).is(n)))i.nodeType===1&&r.push(i),i=i[t];return r},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}}),p.fn.extend({has:function(e){var t,n=p(e,this),r=n.length;return this.filter(function(){for(t=0;t-1:n.nodeType===1&&p.find.matchesSelector(n,e))){s.push(n);break}return this.pushStack(s.length>1?p.unique(s):s)},index:function(e){return e?typeof e=="string"?p.inArray(this[0],p(e)):p.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(p.unique(p.merge(this.get(),p(e,t))))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),p.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return p.dir(e,"parentNode")},parentsUntil:function(e,t,n){return p.dir(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return p.dir(e,"nextSibling")},prevAll:function(e){return p.dir(e,"previousSibling")},nextUntil:function(e,t,n){return p.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return p.dir(e,"previousSibling",n)},siblings:function(e){return p.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return p.sibling(e.firstChild)},contents:function(e){return p.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:p.merge([],e.childNodes)}},function(e,t){p.fn[e]=function(n,r){var i=p.map(this,t,n);return e.slice(-5)!=="Until"&&(r=n),r&&typeof r=="string"&&(i=p.filter(r,i)),this.length>1&&(A[e]||(i=p.unique(i)),L.test(e)&&(i=i.reverse())),this.pushStack(i)}});var M=/\S+/g,_={};p.Callbacks=function(e){e=typeof e=="string"?_[e]||D(e):p.extend({},e);var t,n,r,i,s,o,u=[],a=!e.once&&[],f=function(c){n=e.memory&&c,r=!0,s=o||0,o=0,i=u.length,t=!0;for(;u&&s-1)u.splice(r,1),t&&(r<=i&&i--,r<=s&&s--)}),this},has:function(e){return e?p.inArray(e,u)>-1:!!u&&!!u.length},empty:function(){return u=[],i=0,this},disable:function(){return u=a=n=undefined,this},disabled:function(){return!u},lock:function(){return a=undefined,n||l.disable(),this},locked:function(){return!a},fireWith:function(e,n){return u&&(!r||a)&&(n=n||[],n=[e,n.slice?n.slice():n],t?a.push(n):f(n)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l},p.extend({Deferred:function(e){var t=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return p.Deferred(function(n){p.each(t,function(t,s){var o=p.isFunction(e[t])&&e[t];i[s[1]](function(){var e=o&&o.apply(this,arguments);e&&p.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s[0]+"With"](this===r?n.promise():this,o?[e]:arguments)})}),e=null}).promise()},promise:function(e){return e!=null?p.extend(e,r):r}},i={};return r.pipe=r.then,p.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=function(){return i[s[0]+"With"](this===i?r:this,arguments),this},i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=r.call(arguments),i=n.length,s=i!==1||e&&p.isFunction(e.promise)?i:0,o=s===1?e:p.Deferred(),u=function(e,t,n){return function(i){t[e]=this,n[e]=arguments.length>1?r.call(arguments):i,n===a?o.notifyWith(t,n):--s||o.resolveWith(t,n)}},a,f,l;if(i>1){a=new Array(i),f=new Array(i),l=new Array(i);for(;t0)return;P.resolveWith(N,[p]),p.fn.trigger&&p(N).trigger("ready").off("ready")}}),p.ready.promise=function(t){if(!P){P=p.Deferred();if(N.readyState==="complete")setTimeout(p.ready);else if(N.addEventListener)N.addEventListener("DOMContentLoaded",B,!1),e.addEventListener("load",B,!1);else{N.attachEvent("onreadystatechange",B),e.attachEvent("onload",B);var n=!1;try{n=e.frameElement==null&&N.documentElement}catch(r){}n&&n.doScroll&&function i(){if(!p.isReady){try{n.doScroll("left")}catch(e){return setTimeout(i,50)}H(),p.ready()}}()}}return P.promise(t)};var j=typeof undefined,F;for(F in p(c))break;c.ownLast=F!=="0",c.inlineBlockNeedsLayout=!1,p(function(){var e,t,n=N.getElementsByTagName("body")[0];if(!n)return;e=N.createElement("div"),e.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",t=N.createElement("div"),n.appendChild(e).appendChild(t);if(typeof t.style.zoom!==j){t.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1";if(c.inlineBlockNeedsLayout=t.offsetWidth===3)n.style.zoom=1}n.removeChild(e),e=t=null}),function(){var e=N.createElement("div");if(c.deleteExpando==null){c.deleteExpando=!0;try{delete e.test}catch(t){c.deleteExpando=!1}}e=null}(),p.acceptData=function(e){var t=p.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return n!==1&&n!==9?!1:!t||t!==!0&&e.getAttribute("classid")===t};var I=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,q=/([A-Z])/g;p.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?p.cache[e[p.expando]]:e[p.expando],!!e&&!U(e)},data:function(e,t,n){return z(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return z(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)}}),p.fn.extend({data:function(e,t){var n,r,i,s=this[0],o=s&&s.attributes;if(e===undefined){if(this.length){i=p.data(s);if(s.nodeType===1&&!p._data(s,"parsedAttrs")){n=o.length;while(n--)r=o[n].name,r.indexOf("data-")===0&&(r=p.camelCase(r.slice(5)),R(s,r,i[r]));p._data(s,"parsedAttrs",!0)}}return i}return typeof e=="object"?this.each(function(){p.data(this,e)}):arguments.length>1?this.each(function(){p.data(this,e,t)}):s?R(s,e,p.data(s,e)):undefined},removeData:function(e){return this.each(function(){p.removeData(this,e)})}}),p.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=p._data(e,t),n&&(!r||p.isArray(n)?r=p._data(e,t,p.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=p.queue(e,t),r=n.length,i=n.shift(),s=p._queueHooks(e,t),o=function(){p.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return p._data(e,n)||p._data(e,n,{empty:p.Callbacks("once memory").add(function(){p._removeData(e,t+"queue"),p._removeData(e,n)})})}}),p.fn.extend({queue:function(e,t){var n=2;return typeof e!="string"&&(t=e,e="fx",n--),arguments.length
a",c.leadingWhitespace=t.firstChild.nodeType===3,c.tbody=!t.getElementsByTagName("tbody").length,c.htmlSerialize=!!t.getElementsByTagName("link").length,c.html5Clone=N.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",n.type="checkbox",n.checked=!0,e.appendChild(n),c.appendChecked=n.checked,t.innerHTML="",c.noCloneChecked=!!t.cloneNode(!0).lastChild.defaultValue,e.appendChild(t),t.innerHTML="",c.checkClone=t.cloneNode(!0).cloneNode(!0).lastChild.checked,c.noCloneEvent=!0,t.attachEvent&&(t.attachEvent("onclick",function(){c.noCloneEvent=!1}),t.cloneNode(!0).click());if(c.deleteExpando==null){c.deleteExpando=!0;try{delete t.test}catch(r){c.deleteExpando=!1}}e=t=n=null})(),function(){var t,n,r=N.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(c[t+"Bubbles"]=n in e)||(r.setAttribute(n,"t"),c[t+"Bubbles"]=r.attributes[n].expando===!1);r=null}();var Q=/^(?:input|select|textarea)$/i,G=/^key/,Y=/^(?:mouse|contextmenu)|click/,Z=/^(?:focusinfocus|focusoutblur)$/,et=/^([^.]*)(?:\.(.+)|)$/;p.event={global:{},add:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,d,v,m,g=p._data(e);if(!g)return;n.handler&&(a=n,n=a.handler,i=a.selector),n.guid||(n.guid=p.guid++),(o=g.events)||(o=g.events={}),(l=g.handle)||(l=g.handle=function(e){return typeof p===j||!!e&&p.event.triggered===e.type?undefined:p.event.dispatch.apply(l.elem,arguments)},l.elem=e),t=(t||"").match(M)||[""],u=t.length;while(u--){s=et.exec(t[u])||[],d=m=s[1],v=(s[2]||"").split(".").sort();if(!d)continue;f=p.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=p.event.special[d]||{},c=p.extend({type:d,origType:m,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&p.expr.match.needsContext.test(i),namespace:v.join(".")},a);if(!(h=o[d])){h=o[d]=[],h.delegateCount=0;if(!f.setup||f.setup.call(e,r,v,l)===!1)e.addEventListener?e.addEventListener(d,l,!1):e.attachEvent&&e.attachEvent("on"+d,l)}f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?h.splice(h.delegateCount++,0,c):h.push(c),p.event.global[d]=!0}e=null},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,d,v,m,g=p.hasData(e)&&p._data(e);if(!g||!(l=g.events))return;t=(t||"").match(M)||[""],f=t.length;while(f--){u=et.exec(t[f])||[],d=m=u[1],v=(u[2]||"").split(".").sort();if(!d){for(d in l)p.event.remove(e,d+t[f],n,r,!0);continue}c=p.event.special[d]||{},d=(r?c.delegateType:c.bindType)||d,h=l[d]||[],u=u[2]&&new RegExp("(^|\\.)"+v.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=s=h.length;while(s--)o=h[s],(i||m===o.origType)&&(!n||n.guid===o.guid)&&(!u||u.test(o.namespace))&&(!r||r===o.selector||r==="**"&&o.selector)&&(h.splice(s,1),o.selector&&h.delegateCount--,c.remove&&c.remove.call(e,o));a&&!h.length&&((!c.teardown||c.teardown.call(e,v,g.handle)===!1)&&p.removeEvent(e,d,g.handle),delete l[d])}p.isEmptyObject(l)&&(delete g.handle,p._removeData(e,"events"))},trigger:function(t,n,r,i){var s,o,u,a,l,c,h,d=[r||N],v=f.call(t,"type")?t.type:t,m=f.call(t,"namespace")?t.namespace.split("."):[];u=c=r=r||N;if(r.nodeType===3||r.nodeType===8)return;if(Z.test(v+p.event.triggered))return;v.indexOf(".")>=0&&(m=v.split("."),v=m.shift(),m.sort()),o=v.indexOf(":")<0&&"on"+v,t=t[p.expando]?t:new p.Event(v,typeof t=="object"&&t),t.isTrigger=i?2:3,t.namespace=m.join("."),t.namespace_re=t.namespace?new RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=undefined,t.target||(t.target=r),n=n==null?[t]:p.makeArray(n,[t]),l=p.event.special[v]||{};if(!i&&l.trigger&&l.trigger.apply(r,n)===!1)return;if(!i&&!l.noBubble&&!p.isWindow(r)){a=l.delegateType||v,Z.test(a+v)||(u=u.parentNode);for(;u;u=u.parentNode)d.push(u),c=u;c===(r.ownerDocument||N)&&d.push(c.defaultView||c.parentWindow||e)}h=0;while((u=d[h++])&&!t.isPropagationStopped())t.type=h>1?a:l.bindType||v,s=(p._data(u,"events")||{})[t.type]&&p._data(u,"handle"),s&&s.apply(u,n),s=o&&u[o],s&&s.apply&&p.acceptData(u)&&(t.result=s.apply(u,n),t.result===!1&&t.preventDefault());t.type=v;if(!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&p.acceptData(r)&&o&&r[v]&&!p.isWindow(r)){c=r[o],c&&(r[o]=null),p.event.triggered=v;try{r[v]()}catch(g){}p.event.triggered=undefined,c&&(r[o]=c)}return t.result},dispatch:function(e){e=p.event.fix(e);var t,n,i,s,o,u=[],a=r.call(arguments),f=(p._data(this,"events")||{})[e.type]||[],l=p.event.special[e.type]||{};a[0]=e,e.delegateTarget=this;if(l.preDispatch&&l.preDispatch.call(this,e)===!1)return;u=p.event.handlers.call(this,e,f),t=0;while((s=u[t++])&&!e.isPropagationStopped()){e.currentTarget=s.elem,o=0;while((i=s.handlers[o++])&&!e.isImmediatePropagationStopped())if(!e.namespace_re||e.namespace_re.test(i.namespace))e.handleObj=i,e.data=i.data,n=((p.event.special[i.origType]||{}).handle||i.handler).apply(s.elem,a),n!==undefined&&(e.result=n)===!1&&(e.preventDefault(),e.stopPropagation())}return l.postDispatch&&l.postDispatch.call(this,e),e.result},handlers:function(e,t){var n,r,i,s,o=[],u=t.delegateCount,a=e.target;if(u&&a.nodeType&&(!e.button||e.type!=="click"))for(;a!=this;a=a.parentNode||this)if(a.nodeType===1&&(a.disabled!==!0||e.type!=="click")){i=[];for(s=0;s=0:p.find(n,this,null,[a]).length),i[n]&&i.push(r);i.length&&o.push({elem:a,handlers:i})}return u]","i"),at=/^\s+/,ft=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,lt=/<([\w:]+)/,ct=/\s*$/g,yt={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:c.htmlSerialize?[0,"",""]:[1,"X
","
"]},bt=it(N),wt=bt.appendChild(N.createElement("div"));yt.optgroup=yt.option,yt.tbody=yt.tfoot=yt.colgroup=yt.caption=yt.thead,yt.th=yt.td,p.extend({clone:function(e,t,n){var r,i,s,o,u,a=p.contains(e.ownerDocument,e);c.html5Clone||p.isXMLDoc(e)||!ut.test("<"+e.nodeName+">")?s=e.cloneNode(!0):(wt.innerHTML=e.outerHTML,wt.removeChild(s=wt.firstChild));if((!c.noCloneEvent||!c.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!p.isXMLDoc(e)){r=Et(s),u=Et(e);for(o=0;(i=u[o])!=null;++o)r[o]&&Lt(i,r[o])}if(t)if(n){u=u||Et(e),r=r||Et(s);for(o=0;(i=u[o])!=null;o++)kt(i,r[o])}else kt(e,s);return r=Et(s,"script"),r.length>0&&Ct(r,!a&&Et(e,"script")),r=u=i=null,s},buildFragment:function(e,t,n,r){var i,s,o,u,a,f,l,h=e.length,d=it(t),v=[],m=0;for(;m")+l[2],i=l[0];while(i--)u=u.lastChild;!c.leadingWhitespace&&at.test(s)&&v.push(t.createTextNode(at.exec(s)[0]));if(!c.tbody){s=a==="table"&&!ct.test(s)?u.firstChild:l[1]===""&&!ct.test(s)?u:0,i=s&&s.childNodes.length;while(i--)p.nodeName(f=s.childNodes[i],"tbody")&&!f.childNodes.length&&s.removeChild(f)}p.merge(v,u.childNodes),u.textContent="";while(u.firstChild)u.removeChild(u.firstChild);u=d.lastChild}}u&&d.removeChild(u),c.appendChecked||p.grep(Et(v,"input"),St),m=0;while(s=v[m++]){if(r&&p.inArray(s,r)!==-1)continue;o=p.contains(s.ownerDocument,s),u=Et(d.appendChild(s),"script"),o&&Ct(u);if(n){i=0;while(s=u[i++])vt.test(s.type||"")&&n.push(s)}}return u=null,d},cleanData:function(e,t){var r,i,s,o,u=0,a=p.expando,f=p.cache,l=c.deleteExpando,h=p.event.special;for(;(r=e[u])!=null;u++)if(t||p.acceptData(r)){s=r[a],o=s&&f[s];if(o){if(o.events)for(i in o.events)h[i]?p.event.remove(r,i):p.removeEvent(r,i,o.handle);f[s]&&(delete f[s],l?delete r[a]:typeof r.removeAttribute!==j?r.removeAttribute(a):r[a]=null,n.push(s))}}}}),p.fn.extend({text:function(e){return J(this,function(e){return e===undefined?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||N).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=xt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=xt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?p.filter(e,this):this,i=0;for(;(n=r[i])!=null;i++)!t&&n.nodeType===1&&p.cleanData(Et(n)),n.parentNode&&(t&&p.contains(n.ownerDocument,n)&&Ct(Et(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&p.cleanData(Et(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&p.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return p.clone(this,e,t)})},html:function(e){return J(this,function(e){var t=this[0]||{},n=0,r=this.length;if(e===undefined)return t.nodeType===1?t.innerHTML.replace(ot,""):undefined;if(typeof e=="string"&&!pt.test(e)&&(c.htmlSerialize||!ut.test(e))&&(c.leadingWhitespace||!at.test(e))&&!yt[(lt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(ft,"<$1>");try{for(;n1&&typeof v=="string"&&!c.checkClone&&dt.test(v))return this.each(function(n){var r=h.eq(n);m&&(e[0]=v.call(this,n,r.html())),r.domManip(e,t)});if(l){a=p.buildFragment(e,this[0].ownerDocument,!1,this),n=a.firstChild,a.childNodes.length===1&&(a=n);if(n){o=p.map(Et(a,"script"),Tt),s=o.length;for(;f
a",e=n.getElementsByTagName("a")[0],e.style.cssText="float:left;opacity:.5",c.opacity=/^0.5/.test(e.style.opacity),c.cssFloat=!!e.style.cssFloat,n.style.backgroundClip="content-box",n.cloneNode(!0).style.backgroundClip="",c.clearCloneStyle=n.style.backgroundClip==="content-box",e=n=null,c.shrinkWrapBlocks=function(){var e,n,i,s;if(t==null){e=N.getElementsByTagName("body")[0];if(!e)return;s="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",n=N.createElement("div"),i=N.createElement("div"),e.appendChild(n).appendChild(i),t=!1,typeof i.style.zoom!==j&&(i.style.cssText=r+";width:1px;padding:1px;zoom:1",i.innerHTML="
",i.firstChild.style.width="5px",t=i.offsetWidth!==3),e.removeChild(n),e=n=i=null}return t}})();var Dt=/^margin/,Pt=new RegExp("^("+X+")(?!px)[a-z%]+$","i"),Ht,Bt,jt=/^(top|right|bottom|left)$/;e.getComputedStyle?(Ht=function(e){return e.ownerDocument.defaultView.getComputedStyle(e,null)},Bt=function(e,t,n){var r,i,s,o,u=e.style;return n=n||Ht(e),o=n?n.getPropertyValue(t)||n[t]:undefined,n&&(o===""&&!p.contains(e.ownerDocument,e)&&(o=p.style(e,t)),Pt.test(o)&&Dt.test(t)&&(r=u.width,i=u.minWidth,s=u.maxWidth,u.minWidth=u.maxWidth=u.width=o,o=n.width,u.width=r,u.minWidth=i,u.maxWidth=s)),o===undefined?o:o+""}):N.documentElement.currentStyle&&(Ht=function(e){return e.currentStyle},Bt=function(e,t,n){var r,i,s,o,u=e.style;return n=n||Ht(e),o=n?n[t]:undefined,o==null&&u&&u[t]&&(o=u[t]),Pt.test(o)&&!jt.test(t)&&(r=u.left,i=e.runtimeStyle,s=i&&i.left,s&&(i.left=e.currentStyle.left),u.left=t==="fontSize"?"1em":o,o=u.pixelLeft+"px",u.left=r,s&&(i.left=s)),o===undefined?o:o+""||"auto"}),function(){function l(){var t,n,u=N.getElementsByTagName("body")[0];if(!u)return;t=N.createElement("div"),n=N.createElement("div"),t.style.cssText=a,u.appendChild(t).appendChild(n),n.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",p.swap(u,u.style.zoom!=null?{zoom:1}:{},function(){r=n.offsetWidth===4}),i=!0,s=!1,o=!0,e.getComputedStyle&&(s=(e.getComputedStyle(n,null)||{}).top!=="1%",i=(e.getComputedStyle(n,null)||{width:"4px"}).width==="4px"),u.removeChild(t),n=u=null}var t,n,r,i,s,o,u=N.createElement("div"),a="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",f="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";u.innerHTML="
a",t=u.getElementsByTagName("a")[0],t.style.cssText="float:left;opacity:.5",c.opacity=/^0.5/.test(t.style.opacity),c.cssFloat=!!t.style.cssFloat,u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",c.clearCloneStyle=u.style.backgroundClip==="content-box",t=u=null,p.extend(c,{reliableHiddenOffsets:function(){if(n!=null)return n;var e,t,r,i=N.createElement("div"),s=N.getElementsByTagName("body")[0];if(!s)return;return i.setAttribute("className","t"),i.innerHTML="
a",e=N.createElement("div"),e.style.cssText=a,s.appendChild(e).appendChild(i),i.innerHTML="
t
",t=i.getElementsByTagName("td"),t[0].style.cssText="padding:0;margin:0;border:0;display:none",r=t[0].offsetHeight===0,t[0].style.display="",t[1].style.display="none",n=r&&t[0].offsetHeight===0,s.removeChild(e),i=s=null,n},boxSizing:function(){return r==null&&l(),r},boxSizingReliable:function(){return i==null&&l(),i},pixelPosition:function(){return s==null&&l(),s},reliableMarginRight:function(){var t,n,r,i;if(o==null&&e.getComputedStyle){t=N.getElementsByTagName("body")[0];if(!t)return;n=N.createElement("div"),r=N.createElement("div"),n.style.cssText=a,t.appendChild(n).appendChild(r),i=r.appendChild(N.createElement("div")),i.style.cssText=r.style.cssText=f,i.style.marginRight=i.style.width="0",r.style.width="1px",o=!parseFloat((e.getComputedStyle(i,null)||{}).marginRight),t.removeChild(n)}return o}})}(),p.swap=function(e,t,n,r){var i,s,o={};for(s in t)o[s]=e.style[s],e.style[s]=t[s];i=n.apply(e,r||[]);for(s in t)e.style[s]=o[s];return i};var It=/alpha\([^)]*\)/i,qt=/opacity\s*=\s*([^)]*)/,Rt=/^(none|table(?!-c[ea]).+)/,Ut=new RegExp("^("+X+")(.*)$","i"),zt=new RegExp("^([+-])=("+X+")","i"),Wt={position:"absolute",visibility:"hidden",display:"block"},Xt={letterSpacing:0,fontWeight:400},Vt=["Webkit","O","Moz","ms"];p.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Bt(e,"opacity");return n===""?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":c.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var i,s,o,u=p.camelCase(t),a=e.style;t=p.cssProps[u]||(p.cssProps[u]=$t(a,u)),o=p.cssHooks[t]||p.cssHooks[u];if(n===undefined)return o&&"get"in o&&(i=o.get(e,!1,r))!==undefined?i:a[t];s=typeof n,s==="string"&&(i=zt.exec(n))&&(n=(i[1]+1)*i[2]+parseFloat(p.css(e,t)),s="number");if(n==null||n!==n)return;s==="number"&&!p.cssNumber[u]&&(n+="px"),!c.clearCloneStyle&&n===""&&t.indexOf("background")===0&&(a[t]="inherit");if(!o||!("set"in o)||(n=o.set(e,n,r))!==undefined)try{a[t]="",a[t]=n}catch(f){}},css:function(e,t,n,r){var i,s,o,u=p.camelCase(t);return t=p.cssProps[u]||(p.cssProps[u]=$t(e.style,u)),o=p.cssHooks[t]||p.cssHooks[u],o&&"get"in o&&(s=o.get(e,!0,n)),s===undefined&&(s=Bt(e,t,r)),s==="normal"&&t in Xt&&(s=Xt[t]),n===""||n?(i=parseFloat(s),n===!0||p.isNumeric(i)?i||0:s):s}}),p.each(["height","width"],function(e,t){p.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&Rt.test(p.css(e,"display"))?p.swap(e,Wt,function(){return Gt(e,t,r)}):Gt(e,t,r)},set:function(e,n,r){var i=r&&Ht(e);return Kt(e,n,r?Qt(e,t,r,c.boxSizing()&&p.css(e,"boxSizing",!1,i)==="border-box",i):0)}}}),c.opacity||(p.cssHooks.opacity={get:function(e,t){return qt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=p.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if((t>=1||t==="")&&p.trim(s.replace(It,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(t===""||r&&!r.filter)return}n.filter=It.test(s)?s.replace(It,i):s+" "+i}}),p.cssHooks.marginRight=Ft(c.reliableMarginRight,function(e,t){if(t)return p.swap(e,{display:"inline-block"},Bt,[e,"marginRight"])}),p.each({margin:"",padding:"",border:"Width"},function(e,t){p.cssHooks[e+t]={expand:function(n){var r=0,i={},s=typeof n=="string"?n.split(" "):[n];for(;r<4;r++)i[e+V[r]+t]=s[r]||s[r-2]||s[0];return i}},Dt.test(e)||(p.cssHooks[e+t].set=Kt)}),p.fn.extend({css:function(e,t){return J(this,function(e,t,n){var r,i,s={},o=0;if(p.isArray(t)){r=Ht(e),i=t.length;for(;o1)},show:function(){return Jt(this,!0)},hide:function(){return Jt(this)},toggle:function(e){return typeof e=="boolean"?e?this.show():this.hide():this.each(function(){$(this)?p(this).show():p(this).hide()})}}),p.Tween=Yt,Yt.prototype={constructor:Yt,init:function(e,t,n,r,i,s){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=s||(p.cssNumber[n]?"":"px")},cur:function(){var e=Yt.propHooks[this.prop];return e&&e.get?e.get(this):Yt.propHooks._default.get(this)},run:function(e){var t,n=Yt.propHooks[this.prop];return this.options.duration?this.pos=t=p.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Yt.propHooks._default.set(this),this}},Yt.prototype.init.prototype=Yt.prototype,Yt.propHooks={_default:{get:function(e){var t;return e.elem[e.prop]==null||!!e.elem.style&&e.elem.style[e.prop]!=null?(t=p.css(e.elem,e.prop,""),!t||t==="auto"?0:t):e.elem[e.prop]},set:function(e){p.fx.step[e.prop]?p.fx.step[e.prop](e):e.elem.style&&(e.elem.style[p.cssProps[e.prop]]!=null||p.cssHooks[e.prop])?p.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Yt.propHooks.scrollTop=Yt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},p.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},p.fx=Yt.prototype.init,p.fx.step={};var Zt,en,tn=/^(?:toggle|show|hide)$/,nn=new RegExp("^(?:([+-])=|)("+X+")([a-z%]*)$","i"),rn=/queueHooks$/,sn=[ln],on={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=nn.exec(t),s=i&&i[3]||(p.cssNumber[e]?"":"px"),o=(p.cssNumber[e]||s!=="px"&&+r)&&nn.exec(p.css(n.elem,e)),u=1,a=20;if(o&&o[3]!==s){s=s||o[3],i=i||[],o=+r||1;do u=u||".5",o/=u,p.style(n.elem,e,o+s);while(u!==(u=n.cur()/r)&&u!==1&&--a)}return i&&(o=n.start=+o||+r||0,n.unit=s,n.end=i[1]?o+(i[1]+1)*i[2]:+i[2]),n}]};p.Animation=p.extend(hn,{tweener:function(e,t){p.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r
a",e=i.getElementsByTagName("a")[0],n=N.createElement("select"),r=n.appendChild(N.createElement("option")),t=i.getElementsByTagName("input")[0],e.style.cssText="top:1px",c.getSetAttribute=i.className!=="t",c.style=/top/.test(e.getAttribute("style")),c.hrefNormalized=e.getAttribute("href")==="/a",c.checkOn=!!t.value,c.optSelected=r.selected,c.enctype=!!N.createElement("form").enctype,n.disabled=!0,c.optDisabled=!r.disabled,t=N.createElement("input"),t.setAttribute("value",""),c.input=t.getAttribute("value")==="",t.value="t",t.setAttribute("type","radio"),c.radioValue=t.value==="t",e=t=n=r=i=null}();var pn=/\r/g;p.fn.extend({val:function(e){var t,n,r,i=this[0];if(!arguments.length){if(i)return t=p.valHooks[i.type]||p.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&(n=t.get(i,"value"))!==undefined?n:(n=i.value,typeof n=="string"?n.replace(pn,""):n==null?"":n);return}return r=p.isFunction(e),this.each(function(n){var i;if(this.nodeType!==1)return;r?i=e.call(this,n,p(this).val()):i=e,i==null?i="":typeof i=="number"?i+="":p.isArray(i)&&(i=p.map(i,function(e){return e==null?"":e+""})),t=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!t||!("set"in t)||t.set(this,i,"value")===undefined)this.value=i})}}),p.extend({valHooks:{option:{get:function(e){var t=p.find.attr(e,"value");return t!=null?t:p.text(e)}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0)try{r.selected=n=!0}catch(u){r.scrollHeight}else r.selected=!1}return n||(e.selectedIndex=-1),i}}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]={set:function(e,t){if(p.isArray(t))return e.checked=p.inArray(p(e).val(),t)>=0}},c.checkOn||(p.valHooks[this].get=function(e){return e.getAttribute("value")===null?"on":e.value})});var dn,vn,mn=p.expr.attrHandle,gn=/^(?:checked|selected)$/i,yn=c.getSetAttribute,bn=c.input;p.fn.extend({attr:function(e,t){return J(this,p.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){p.removeAttr(this,e)})}}),p.extend({attr:function(e,t,n){var r,i,s=e.nodeType;if(!e||s===3||s===8||s===2)return;if(typeof e.getAttribute===j)return p.prop(e,t,n);if(s!==1||!p.isXMLDoc(e))t=t.toLowerCase(),r=p.attrHooks[t]||(p.expr.match.bool.test(t)?vn:dn);if(n===undefined)return r&&"get"in r&&(i=r.get(e,t))!==null?i:(i=p.find.attr(e,t),i==null?undefined:i);if(n!==null)return r&&"set"in r&&(i=r.set(e,n,t))!==undefined?i:(e.setAttribute(t,n+""),n);p.removeAttr(e,t)},removeAttr:function(e,t){var n,r,i=0,s=t&&t.match(M);if(s&&e.nodeType===1)while(n=s[i++])r=p.propFix[n]||n,p.expr.match.bool.test(n)?bn&&yn||!gn.test(n)?e[r]=!1:e[p.camelCase("default-"+n)]=e[r]=!1:p.attr(e,n,""),e.removeAttribute(yn?n:r)},attrHooks:{type:{set:function(e,t){if(!c.radioValue&&t==="radio"&&p.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}}}),vn={set:function(e,t,n){return t===!1?p.removeAttr(e,n):bn&&yn||!gn.test(n)?e.setAttribute(!yn&&p.propFix[n]||n,n):e[p.camelCase("default-"+n)]=e[n]=!0,n}},p.each(p.expr.match.bool.source.match(/\w+/g),function(e,t){var n=mn[t]||p.find.attr;mn[t]=bn&&yn||!gn.test(t)?function(e,t,r){var i,s;return r||(s=mn[t],mn[t]=i,i=n(e,t,r)!=null?t.toLowerCase():null,mn[t]=s),i}:function(e,t,n){if(!n)return e[p.camelCase("default-"+t)]?t.toLowerCase():null}});if(!bn||!yn)p.attrHooks.value={set:function(e,t,n){if(!p.nodeName(e,"input"))return dn&&dn.set(e,t,n);e.defaultValue=t}};yn||(dn={set:function(e,t,n){var r=e.getAttributeNode(n);r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="";if(n==="value"||t===e.getAttribute(n))return t}},mn.id=mn.name=mn.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&r.value!==""?r.value:null},p.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:dn.set},p.attrHooks.contenteditable={set:function(e,t,n){dn.set(e,t===""?!1:t,n)}},p.each(["width","height"],function(e,t){p.attrHooks[t]={set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}}})),c.style||(p.attrHooks.style={get:function(e){return e.style.cssText||undefined},set:function(e,t){return e.style.cssText=t+""}});var wn=/^(?:input|select|textarea|button|object)$/i,En=/^(?:a|area)$/i;p.fn.extend({prop:function(e,t){return J(this,p.prop,e,t,arguments.length>1)},removeProp:function(e){return e=p.propFix[e]||e,this.each(function(){try{this[e]=undefined,delete this[e]}catch(t){}})}}),p.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(e,t,n){var r,i,s,o=e.nodeType;if(!e||o===3||o===8||o===2)return;return s=o!==1||!p.isXMLDoc(e),s&&(t=p.propFix[t]||t,i=p.propHooks[t]),n!==undefined?i&&"set"in i&&(r=i.set(e,n,t))!==undefined?r:e[t]=n:i&&"get"in i&&(r=i.get(e,t))!==null?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=p.find.attr(e,"tabindex");return t?parseInt(t,10):wn.test(e.nodeName)||En.test(e.nodeName)&&e.href?0:-1}}}}),c.hrefNormalized||p.each(["href","src"],function(e,t){p.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),c.optSelected||(p.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),p.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){p.propFix[this.toLowerCase()]=this}),c.enctype||(p.propFix.enctype="encoding");var Sn=/[\t\r\n\f]/g;p.fn.extend({addClass:function(e){var t,n,r,i,s,o,u=0,a=this.length,f=typeof e=="string"&&e;if(p.isFunction(e))return this.each(function(t){p(this).addClass(e.call(this,t,this.className))});if(f){t=(e||"").match(M)||[];for(;u=0)r=r.replace(" "+i+" "," ");o=e?p.trim(r):"",n.className!==o&&(n.className=o)}}}return this},toggleClass:function(e,t){var n=typeof e;return typeof t=="boolean"&&n==="string"?t?this.addClass(e):this.removeClass(e):p.isFunction(e)?this.each(function(n){p(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var t,r=0,i=p(this),s=e.match(M)||[];while(t=s[r++])i.hasClass(t)?i.removeClass(t):i.addClass(t)}else if(n===j||n==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||e===!1?"":p._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0)return!0;return!1}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){p.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),p.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)}});var xn=p.now(),Tn=/\?/,Nn=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;p.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=p.trim(t+"");return i&&!p.trim(i.replace(Nn,function(e,t,i,s){return n&&t&&(r=0),r===0?e:(n=i||t,r+=!s-!i,"")}))?Function("return "+i)():p.error("Invalid JSON: "+t)},p.parseXML=function(t){var n,r;if(!t||typeof t!="string")return null;try{e.DOMParser?(r=new DOMParser,n=r.parseFromString(t,"text/xml")):(n=new ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=undefined}return(!n||!n.documentElement||n.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+t),n};var Cn,kn,Ln=/#.*$/,An=/([?&])_=[^&]*/,On=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,Mn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,_n=/^(?:GET|HEAD)$/,Dn=/^\/\//,Pn=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hn={},Bn={},jn="*/".concat("*");try{kn=location.href}catch(Fn){kn=N.createElement("a"),kn.href="",kn=kn.href}Cn=Pn.exec(kn.toLowerCase())||[],p.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:kn,type:"GET",isLocal:Mn.test(Cn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":jn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Rn(Rn(e,p.ajaxSettings),t):Rn(p.ajaxSettings,e)},ajaxPrefilter:In(Hn),ajaxTransport:In(Bn),ajax:function(e,t){function x(e,t,n,r){var f,g,y,w,S,x=t;if(b===2)return;b=2,o&&clearTimeout(o),a=undefined,s=r||"",E.readyState=e>0?4:0,f=e>=200&&e<300||e===304,n&&(w=Un(l,E,n)),w=zn(l,w,E,f);if(f)l.ifModified&&(S=E.getResponseHeader("Last-Modified"),S&&(p.lastModified[i]=S),S=E.getResponseHeader("etag"),S&&(p.etag[i]=S)),e===204||l.type==="HEAD"?x="nocontent":e===304?x="notmodified":(x=w.state,g=w.data,y=w.error,f=!y);else{y=x;if(e||!x)x="error",e<0&&(e=0)}E.status=e,E.statusText=(t||x)+"",f?d.resolveWith(c,[g,x,E]):d.rejectWith(c,[E,x,y]),E.statusCode(m),m=undefined,u&&h.trigger(f?"ajaxSuccess":"ajaxError",[E,l,f?g:y]),v.fireWith(c,[E,x]),u&&(h.trigger("ajaxComplete",[E,l]),--p.active||p.event.trigger("ajaxStop"))}typeof e=="object"&&(t=e,e=undefined),t=t||{};var n,r,i,s,o,u,a,f,l=p.ajaxSetup({},t),c=l.context||l,h=l.context&&(c.nodeType||c.jquery)?p(c):p.event,d=p.Deferred(),v=p.Callbacks("once memory"),m=l.statusCode||{},g={},y={},b=0,w="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(b===2){if(!f){f={};while(t=On.exec(s))f[t[1].toLowerCase()]=t[2]}t=f[e.toLowerCase()]}return t==null?null:t},getAllResponseHeaders:function(){return b===2?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=y[n]=y[n]||e,g[e]=t),this},overrideMimeType:function(e){return b||(l.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)m[t]=[m[t],e[t]];else E.always(e[E.status]);return this},abort:function(e){var t=e||w;return a&&a.abort(t),x(0,t),this}};d.promise(E).complete=v.add,E.success=E.done,E.error=E.fail,l.url=((e||l.url||kn)+"").replace(Ln,"").replace(Dn,Cn[1]+"//"),l.type=t.method||t.type||l.method||l.type,l.dataTypes=p.trim(l.dataType||"*").toLowerCase().match(M)||[""],l.crossDomain==null&&(n=Pn.exec(l.url.toLowerCase()),l.crossDomain=!(!n||n[1]===Cn[1]&&n[2]===Cn[2]&&(n[3]||(n[1]==="http:"?"80":"443"))===(Cn[3]||(Cn[1]==="http:"?"80":"443")))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),qn(Hn,l,t,E);if(b===2)return E;u=l.global,u&&p.active++===0&&p.event.trigger("ajaxStart"),l.type=l.type.toUpperCase(),l.hasContent=!_n.test(l.type),i=l.url,l.hasContent||(l.data&&(i=l.url+=(Tn.test(i)?"&":"?")+l.data,delete l.data),l.cache===!1&&(l.url=An.test(i)?i.replace(An,"$1_="+xn++):i+(Tn.test(i)?"&":"?")+"_="+xn++)),l.ifModified&&(p.lastModified[i]&&E.setRequestHeader("If-Modified-Since",p.lastModified[i]),p.etag[i]&&E.setRequestHeader("If-None-Match",p.etag[i])),(l.data&&l.hasContent&&l.contentType!==!1||t.contentType)&&E.setRequestHeader("Content-Type",l.contentType),E.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+jn+"; q=0.01":""):l.accepts["*"]);for(r in l.headers)E.setRequestHeader(r,l.headers[r]);if(!l.beforeSend||l.beforeSend.call(c,E,l)!==!1&&b!==2){w="abort";for(r in{success:1,error:1,complete:1})E[r](l[r]);a=qn(Bn,l,t,E);if(!a)x(-1,"No Transport");else{E.readyState=1,u&&h.trigger("ajaxSend",[E,l]),l.async&&l.timeout>0&&(o=setTimeout(function(){E.abort("timeout")},l.timeout));try{b=1,a.send(g,x)}catch(S){if(!(b<2))throw S;x(-1,S)}}return E}return E.abort()},getJSON:function(e,t,n){return p.get(e,t,n,"json")},getScript:function(e,t){return p.get(e,undefined,t,"script")}}),p.each(["get","post"],function(e,t){p[t]=function(e,n,r,i){return p.isFunction(n)&&(i=i||r,r=n,n=undefined),p.ajax({url:e,type:t,dataType:i,data:n,success:r})}}),p.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){p.fn[t]=function(e){return this.on(t,e)}}),p._evalUrl=function(e){return p.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},p.fn.extend({wrapAll:function(e){if(p.isFunction(e))return this.each(function(t){p(this).wrapAll(e.call(this,t))});if(this[0]){var t=p(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return p.isFunction(e)?this.each(function(t){p(this).wrapInner(e.call(this,t))}):this.each(function(){var t=p(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=p.isFunction(e);return this.each(function(n){p(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()}}),p.expr.filters.hidden=function(e){return e.offsetWidth<=0&&e.offsetHeight<=0||!c.reliableHiddenOffsets()&&(e.style&&e.style.display||p.css(e,"display"))==="none"},p.expr.filters.visible=function(e){return!p.expr.filters.hidden(e)};var Wn=/%20/g,Xn=/\[\]$/,Vn=/\r?\n/g,$n=/^(?:submit|button|image|reset|file)$/i,Jn=/^(?:input|select|textarea|keygen)/i;p.param=function(e,t){var n,r=[],i=function(e,t){t=p.isFunction(t)?t():t==null?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};t===undefined&&(t=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(e)||e.jquery&&!p.isPlainObject(e))p.each(e,function(){i(this.name,this.value)});else for(n in e)Kn(n,e[n],t,i);return r.join("&").replace(Wn,"+")},p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=p.prop(this,"elements");return e?p.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!p(this).is(":disabled")&&Jn.test(this.nodeName)&&!$n.test(e)&&(this.checked||!K.test(e))}).map(function(e,t){var n=p(this).val();return n==null?null:p.isArray(n)?p.map(n,function(e){return{name:t.name,value:e.replace(Vn,"\r\n")}}):{name:t.name,value:n.replace(Vn,"\r\n")}}).get()}}),p.ajaxSettings.xhr=e.ActiveXObject!==undefined?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zn()||er()}:Zn;var Qn=0,Gn={},Yn=p.ajaxSettings.xhr();e.ActiveXObject&&p(e).on("unload",function(){for(var e in Gn)Gn[e](undefined,!0)}),c.cors=!!Yn&&"withCredentials"in Yn,Yn=c.ajax=!!Yn,Yn&&p.ajaxTransport(function(e){if(!e.crossDomain||c.cors){var t;return{send:function(n,r){var i,s=e.xhr(),o=++Qn;s.open(e.type,e.url,e.async,e.username,e.password);if(e.xhrFields)for(i in e.xhrFields)s[i]=e.xhrFields[i];e.mimeType&&s.overrideMimeType&&s.overrideMimeType(e.mimeType),!e.crossDomain&&!n["X-Requested-With"]&&(n["X-Requested-With"]="XMLHttpRequest");for(i in n)n[i]!==undefined&&s.setRequestHeader(i,n[i]+"");s.send(e.hasContent&&e.data||null),t=function(n,i){var u,a,f;if(t&&(i||s.readyState===4)){delete Gn[o],t=undefined,s.onreadystatechange=p.noop;if(i)s.readyState!==4&&s.abort();else{f={},u=s.status,typeof s.responseText=="string"&&(f.text=s.responseText);try{a=s.statusText}catch(l){a=""}!u&&e.isLocal&&!e.crossDomain?u=f.text?200:404:u===1223&&(u=204)}}f&&r(u,a,f,s.getAllResponseHeaders())},e.async?s.readyState===4?setTimeout(t):s.onreadystatechange=Gn[o]=t:t()},abort:function(){t&&t(undefined,!0)}}}}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return p.globalEval(e),e}}}),p.ajaxPrefilter("script",function(e){e.cache===undefined&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),p.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=N.head||p("head")[0]||N.documentElement;return{send:function(r,i){t=N.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){if(n||!t.readyState||/loaded|complete/.test(t.readyState))t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success")},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(undefined,!0)}}}});var tr=[],nr=/(=)\?(?=&|$)|\?\?/;p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=tr.pop()||p.expando+"_"+xn++;return this[e]=!0,e}}),p.ajaxPrefilter("json jsonp",function(t,n,r){var i,s,o,u=t.jsonp!==!1&&(nr.test(t.url)?"url":typeof t.data=="string"&&!(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&nr.test(t.data)&&"data");if(u||t.dataTypes[0]==="jsonp")return i=t.jsonpCallback=p.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,u?t[u]=t[u].replace(nr,"$1"+i):t.jsonp!==!1&&(t.url+=(Tn.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return o||p.error(i+" was not called"),o[0]},t.dataTypes[0]="json",s=e[i],e[i]=function(){o=arguments},r.always(function(){e[i]=s,t[i]&&(t.jsonpCallback=n.jsonpCallback,tr.push(i)),o&&p.isFunction(s)&&s(o[0]),o=s=undefined}),"script"}),p.parseHTML=function(e,t,n){if(!e||typeof e!="string")return null;typeof t=="boolean"&&(n=t,t=!1),t=t||N;var r=E.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=p.buildFragment([e],t,i),i&&i.length&&p(i).remove(),p.merge([],r.childNodes))};var rr=p.fn.load;p.fn.load=function(e,t,n){if(typeof e!="string"&&rr)return rr.apply(this,arguments);var r,i,s,o=this,u=e.indexOf(" ");return u>=0&&(r=e.slice(u,e.length),e=e.slice(0,u)),p.isFunction(t)?(n=t,t=undefined):t&&typeof t=="object"&&(s="POST"),o.length>0&&p.ajax({url:e,type:s,dataType:"html",data:t}).done(function(e){i=arguments,o.html(r?p("
").append(p.parseHTML(e)).find(r):e)}).complete(n&&function(e,t){o.each(n,i||[e.responseText,t,e])}),this},p.expr.filters.animated=function(e){return p.grep(p.timers,function(t){return e===t.elem}).length};var ir=e.document.documentElement;p.offset={setOffset:function(e,t,n){var r,i,s,o,u,a,f,l=p.css(e,"position"),c=p(e),h={};l==="static"&&(e.style.position="relative"),u=c.offset(),s=p.css(e,"top"),a=p.css(e,"left"),f=(l==="absolute"||l==="fixed")&&p.inArray("auto",[s,a])>-1,f?(r=c.position(),o=r.top,i=r.left):(o=parseFloat(s)||0,i=parseFloat(a)||0),p.isFunction(t)&&(t=t.call(e,n,u)),t.top!=null&&(h.top=t.top-u.top+o),t.left!=null&&(h.left=t.left-u.left+i),"using"in t?t.using.call(e,h):c.css(h)}},p.fn.extend({offset:function(e){if(arguments.length)return e===undefined?this:this.each(function(t){p.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],s=i&&i.ownerDocument;if(!s)return;return t=s.documentElement,p.contains(t,i)?(typeof i.getBoundingClientRect!==j&&(r=i.getBoundingClientRect()),n=sr(s),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(!this[0])return;var e,t,n={top:0,left:0},r=this[0];return p.css(r,"position")==="fixed"?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),p.nodeName(e[0],"html")||(n=e.offset()),n.top+=p.css(e[0],"borderTopWidth",!0),n.left+=p.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-p.css(r,"marginTop",!0),left:t.left-n.left-p.css(r,"marginLeft",!0)}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||ir;while(e&&!p.nodeName(e,"html")&&p.css(e,"position")==="static")e=e.offsetParent;return e||ir})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);p.fn[e]=function(r){return J(this,function(e,r,i){var s=sr(e);if(i===undefined)return s?t in s?s[t]:s.document.documentElement[r]:e[r];s?s.scrollTo(n?p(s).scrollLeft():i,n?i:p(s).scrollTop()):e[r]=i},e,r,arguments.length,null)}}),p.each(["top","left"],function(e,t){p.cssHooks[t]=Ft(c.pixelPosition,function(e,n){if(n)return n=Bt(e,t),Pt.test(n)?p(e).position()[t]+"px":n})}),p.each({Height:"height",Width:"width"},function(e,t){p.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){p.fn[r]=function(r,i){var s=arguments.length&&(n||typeof r!="boolean"),o=n||(r===!0||i===!0?"margin":"border");return J(this,function(t,n,r){var i;return p.isWindow(t)?t.document.documentElement["client"+e]:t.nodeType===9?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):r===undefined?p.css(t,n,o):p.style(t,n,r,o)},t,s?r:undefined,s,null)}})}),p.fn.size=function(){return this.length},p.fn.andSelf=p.fn.addBack,typeof define=="function"&&define.amd&&define("jquery",[],function(){return p});var or=e.jQuery,ur=e.$;return p.noConflict=function(t){return e.$===p&&(e.$=ur),t&&e.jQuery===p&&(e.jQuery=or),p},typeof t===j&&(e.jQuery=e.$=p),p}),define("jquery-private",["jquery"],function(e){return e.noConflict(!0)}),function(){function x(e){function t(t,n,r,i,s,o){for(;s>=0&&s0?0:u-1;return arguments.length<3&&(i=n[o?o[a]:a],a+=e),t(n,r,i,o,a,u)}}function C(e){return function(t,n,r){n=m(n,r);var i=E(t),s=e>0?0:i-1;for(;s>=0&&s0?u=s>=0?s:Math.max(s+a,u):a=s>=0?Math.min(s+1,a):s+a+1;else if(n&&s&&a)return s=n(r,i),r[s]===i?s:-1;if(i!==i)return s=t(o.call(r,u,a),d.isNaN),s>=0?s+u:-1;for(s=e>0?u:a-1;s>=0&&s=0&&t<=w};d.each=d.forEach=function(e,t,n){t=v(t,n);var r,i;if(S(e))for(r=0,i=e.length;r=0},d.invoke=function(e,t){var n=o.call(arguments,2),r=d.isFunction(t);return d.map(e,function(e){var i=r?t:e[t];return i==null?i:i.apply(e,n)})},d.pluck=function(e,t){return d.map(e,d.property(t))},d.where=function(e,t){return d.filter(e,d.matcher(t))},d.findWhere=function(e,t){return d.find(e,d.matcher(t))},d.max=function(e,t,n){var r=-Infinity,i=-Infinity,s,o;if(t==null&&e!=null){e=S(e)?e:d.values(e);for(var u=0,a=e.length;ur&&(r=s)}else t=m(t,n),d.each(e,function(e,n,s){o=t(e,n,s);if(o>i||o===-Infinity&&r===-Infinity)r=e,i=o});return r},d.min=function(e,t,n){var r=Infinity,i=Infinity,s,o;if(t==null&&e!=null){e=S(e)?e:d.values(e);for(var u=0,a=e.length;ur||n===void 0)return 1;if(nt?(o&&(clearTimeout(o),o=null),u=f,s=e.apply(r,i),o||(r=i=null)):!o&&n.trailing!==!1&&(o=setTimeout(a,l)),s}},d.debounce=function(e,t,n){var r,i,s,o,u,a=function(){var f=d.now()-o;f=0?r=setTimeout(a,t-f):(r=null,n||(u=e.apply(s,i),r||(s=i=null)))};return function(){s=this,i=arguments,o=d.now();var f=n&&!r;return r||(r=setTimeout(a,t)),f&&(u=e.apply(s,i),s=i=null),u}},d.wrap=function(e,t){return d.partial(t,e)},d.negate=function(e){return function(){return!e.apply(this,arguments)}},d.compose=function(){var e=arguments,t=e.length-1;return function(){var n=t,r=e[t].apply(this,arguments);while(n--)r=e[n].call(this,r);return r}},d.after=function(e,t){return function(){if(--e<1)return t.apply(this,arguments)}},d.before=function(e,t){var n;return function(){return--e>0&&(n=t.apply(this,arguments)),e<=1&&(t=null),n}},d.once=d.partial(d.before,2);var A=!{toString:null}.propertyIsEnumerable("toString"),O=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"];d.keys=function(e){if(!d.isObject(e))return[];if(l)return l(e);var t=[];for(var n in e)d.has(e,n)&&t.push(n);return A&&M(e,t),t},d.allKeys=function(e){if(!d.isObject(e))return[];var t=[];for(var n in e)t.push(n);return A&&M(e,t),t},d.values=function(e){var t=d.keys(e),n=t.length,r=Array(n);for(var i=0;i":">",'"':""","'":"'","`":"`"},P=d.invert(D),H=function(e){var t=function(t){return e[t]},n="(?:"+d.keys(e).join("|")+")",r=RegExp(n),i=RegExp(n,"g");return function(e){return e=e==null?"":""+e,r.test(e)?e.replace(i,t):e}};d.escape=H(D),d.unescape=H(P),d.result=function(e,t,n){var r=e==null?void 0:e[t];return r===void 0&&(r=n),d.isFunction(r)?r.call(e):r};var B=0;d.uniqueId=function(e){var t=++B+"";return e?e+t:t},d.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var j=/(.)^/,F={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},I=/\\|'|\r|\n|\u2028|\u2029/g,q=function(e){return"\\"+F[e]};d.template=function(e,t,n){!t&&n&&(t=n),t=d.defaults({},t,d.templateSettings);var r=RegExp([(t.escape||j).source,(t.interpolate||j).source,(t.evaluate||j).source].join("|")+"|$","g"),i=0,s="__p+='";e.replace(r,function(t,n,r,o,u){return s+=e.slice(i,u).replace(I,q),i=u+t.length,n?s+="'+\n((__t=("+n+"))==null?'':_.escape(__t))+\n'":r?s+="'+\n((__t=("+r+"))==null?'':__t)+\n'":o&&(s+="';\n"+o+"\n__p+='"),t}),s+="';\n",t.variable||(s="with(obj||{}){\n"+s+"}\n"),s="var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};\n"+s+"return __p;\n";try{var o=new Function(t.variable||"obj","_",s)}catch(u){throw u.source=s,u}var a=function(e){return o.call(this,e,d)},f=t.variable||"obj";return a.source="function("+f+"){\n"+s+"}",a},d.chain=function(e){var t=d(e);return t._chain=!0,t};var R=function(e,t){return e._chain?d(t).chain():t};d.mixin=function(e){d.each(d.functions(e),function(t){var n=d[t]=e[t];d.prototype[t]=function(){var e=[this._wrapped];return s.apply(e,arguments),R(this,n.apply(d,e))}})},d.mixin(d),d.each(["pop","push","reverse","shift","sort","splice","unshift"],function(e){var t=n[e];d.prototype[e]=function(){var n=this._wrapped;return t.apply(n,arguments),(e==="shift"||e==="splice")&&n.length===0&&delete n[0],R(this,n)}}),d.each(["concat","join","slice"],function(e){var t=n[e];d.prototype[e]=function(){return R(this,t.apply(this._wrapped,arguments))}}),d.prototype.value=function(){return this._wrapped},d.prototype.valueOf=d.prototype.toJSON=d.prototype.value,d.prototype.toString=function(){return""+this._wrapped},typeof define=="function"&&define.amd&&define("underscore",[],function(){return d})}.call(this),String.prototype.endsWith||(String.prototype.endsWith=function(e,t){var n=this.toString();if(t===undefined||t>n.length)t=n.length;t-=e.length;var r=n.indexOf(e,t);return r!==-1&&r===t}),String.prototype.splitOnce=function(e){var t=this.split(e);return[t.shift(),t.join(e)]},String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")}),define("polyfill",function(){}),define("text",["module"],function(e){"use strict";var t,n,r,i,s,o=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"],u=/^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im,a=/]*>\s*([\s\S]+)\s*<\/body>/im,f=typeof location!="undefined"&&location.href,l=f&&location.protocol&&location.protocol.replace(/\:/,""),c=f&&location.hostname,h=f&&(location.port||undefined),p={},d=e.config&&e.config()||{};t={version:"2.0.14",strip:function(e){if(e){e=e.replace(u,"");var t=e.match(a);t&&(e=t[1])}else e="";return e},jsEscape:function(e){return e.replace(/(['\\])/g,"\\$1").replace(/[\f]/g,"\\f").replace(/[\b]/g,"\\b").replace(/[\n]/g,"\\n").replace(/[\t]/g,"\\t").replace(/[\r]/g,"\\r").replace(/[\u2028]/g,"\\u2028").replace(/[\u2029]/g,"\\u2029")},createXhr:d.createXhr||function(){var e,t,n;if(typeof XMLHttpRequest!="undefined")return new XMLHttpRequest;if(typeof ActiveXObject!="undefined")for(t=0;t<3;t+=1){n=o[t];try{e=new ActiveXObject(n)}catch(r){}if(e){o=[n];break}}return e},parseName:function(e){var t,n,r,i=!1,s=e.lastIndexOf("."),o=e.indexOf("./")===0||e.indexOf("../")===0;return s!==-1&&(!o||s>1)?(t=e.substring(0,s),n=e.substring(s+1)):t=e,r=n||t,s=r.indexOf("!"),s!==-1&&(i=r.substring(s+1)==="strip",r=r.substring(0,s),n?n=r:t=r),{moduleName:t,ext:n,strip:i}},xdRegExp:/^((\w+)\:)?\/\/([^\/\\]+)/,useXhr:function(e,n,r,i){var s,o,u,a=t.xdRegExp.exec(e);return a?(s=a[2],o=a[3],o=o.split(":"),u=o[1],o=o[0],(!s||s===n)&&(!o||o.toLowerCase()===r.toLowerCase())&&(!u&&!o||u===i)):!0},finishLoad:function(e,n,r,i){r=n?t.strip(r):r,d.isBuild&&(p[e]=r),i(r)},load:function(e,n,r,i){if(i&&i.isBuild&&!i.inlineText){r();return}d.isBuild=i&&i.isBuild;var s=t.parseName(e),o=s.moduleName+(s.ext?"."+s.ext:""),u=n.toUrl(o),a=d.useXhr||t.useXhr;if(u.indexOf("empty:")===0){r();return}!f||a(u,l,c,h)?t.get(u,function(n){t.finishLoad(e,s.strip,n,r)},function(e){r.error&&r.error(e)}):n([o],function(e){t.finishLoad(s.moduleName+"."+s.ext,s.strip,e,r)})},write:function(e,n,r,i){if(p.hasOwnProperty(n)){var s=t.jsEscape(p[n]);r.asModule(e+"!"+n,"define(function () { return '"+s+"';});\n")}},writeFile:function(e,n,r,i,s){var o=t.parseName(n),u=o.ext?"."+o.ext:"",a=o.moduleName+u,f=r.toUrl(o.moduleName+u)+".js";t.load(a,r,function(n){var r=function(e){return i(f,e)};r.asModule=function(e,t){return i.asModule(e,f,t)},t.write(e,a,r,s)},s)}};if(d.env==="node"||!d.env&&typeof process!="undefined"&&process.versions&&!!process.versions.node&&!process.versions["node-webkit"]&&!process.versions["atom-shell"])n=require.nodeRequire("fs"),t.get=function(e,t,r){try{var i=n.readFileSync(e,"utf8");i[0]===""&&(i=i.substring(1)),t(i)}catch(s){r&&r(s)}};else if(d.env==="xhr"||!d.env&&t.createXhr())t.get=function(e,n,r,i){var s=t.createXhr(),o;s.open("GET",e,!0);if(i)for(o in i)i.hasOwnProperty(o)&&s.setRequestHeader(o.toLowerCase(),i[o]);d.onXhr&&d.onXhr(s,e),s.onreadystatechange=function(t){var i,o;s.readyState===4&&(i=s.status||0,i>399&&i<600?(o=new Error(e+" HTTP status: "+i),o.xhr=s,r&&r(o)):n(s.responseText),d.onXhrComplete&&d.onXhrComplete(s,e))},s.send(null)};else if(d.env==="rhino"||!d.env&&typeof Packages!="undefined"&&typeof java!="undefined")t.get=function(e,t){var n,r,i="utf-8",s=new java.io.File(e),o=java.lang.System.getProperty("line.separator"),u=new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(s),i)),a="";try{n=new java.lang.StringBuffer,r=u.readLine(),r&&r.length()&&r.charAt(0)===65279&&(r=r.substring(1)),r!==null&&n.append(r);while((r=u.readLine())!==null)n.append(o),n.append(r);a=String(n.toString())}finally{u.close()}t(a)};else if(d.env==="xpconnect"||!d.env&&typeof Components!="undefined"&&Components.classes&&Components.interfaces)r=Components.classes,i=Components.interfaces,Components.utils["import"]("resource://gre/modules/FileUtils.jsm"),s="@mozilla.org/windows-registry-key;1"in r,t.get=function(e,t){var n,o,u,a={};s&&(e=e.replace(/\//g,"\\")),u=new FileUtils.File(e);try{n=r["@mozilla.org/network/file-input-stream;1"].createInstance(i.nsIFileInputStream),n.init(u,1,0,!1),o=r["@mozilla.org/intl/converter-input-stream;1"].createInstance(i.nsIConverterInputStream),o.init(n,"utf-8",n.available(),i.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER),o.readString(n.available(),a),o.close(),n.close(),t(a.value)}catch(f){throw new Error((u&&u.path||"")+": "+f)}};return t}),define("tpl",["text","underscore"],function(e,t){"use strict";var n={},r="define('{pluginName}!{moduleName}', function () { return {source}; });\n";return{version:"0.0.2",load:function(r,i,s,o){o.tpl&&o.tpl.templateSettings&&(t.templateSettings=o.tpl.templateSettings);if(n[r])s(n[r]);else{var u=o.tpl&&o.tpl.extension||".html",a=o.tpl&&o.tpl.path||"";e.load(a+r+u,i,function(e){n[r]=t.template(e),s(n[r])},o)}},write:function(e,t,i){var s=n[t],o=s&&s.source;o&&i.asModule(e+"!"+t,r.replace("{pluginName}",e).replace("{moduleName}",t).replace("{source}",o))}}}),define("tpl!action",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='
\n '+((__t=time)==null?"":__t)+" **"+((__t=username)==null?"":__t)+' \n '+((__t=message)==null?"":__t)+"\n
\n";return __p}}),define("tpl!add_contact_dropdown",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='
\n \n \n
\n';return __p}}),define("tpl!add_contact_form",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='
  • \n
    \n \n \n
    \n
    • \n";return __p}}),define("tpl!change_status_message",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='
    \n
    \n \n \n \n \n
    \n
    \n';return __p}}),define("tpl!chat_status",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='
    \n \n '+((__t=status_message)==null?"":__t)+'\n \n \n
    \n';return __p}}),define("tpl!chatarea",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='
    \n
    \n
    \n ',show_toolbar&&(__p+='\n
      \n '),__p+='\n \n";return __p}}),define("tpl!form_username",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+="",label&&(__p+="\n\n"),__p+='\n
      \n '+((__t=domain)==null?"":__t)+"\n
      \n";return __p}}),define("tpl!group_header",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+=''+((__t=label_group)==null?"":__t)+"\n";return __p}}),define("tpl!info",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='
      '+((__t=message)==null?"":__t)+"
      \n";return __p}}),define("tpl!login_panel",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='\n ',auto_login&&(__p+='\n