Merge branch '3.6-rc'

This commit is contained in:
Tobias Diekershoff 2018-03-23 08:00:37 +01:00
commit 39dd3dffe0
733 changed files with 10943 additions and 8237 deletions

View file

@ -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

View file

@ -78,7 +78,7 @@ function serverAdHoc(server) {
dataForm(server, 'command', '', '', 'adhoc');
}
// Plugin launcher
// Addon launcher
function launchAdHoc() {
// Click event
$('#adhoc .bottom .finish').click(closeAdHoc);

View file

@ -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);

View file

@ -393,7 +393,7 @@ function updateArchives() {
getListArchives(xid, date);
}
// Plugin launcher
// Addon launcher
function launchArchives() {
// Current date
var current_date = explodeThis('T', getXMPPTime(), 0);

View file

@ -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);

View file

@ -66,7 +66,7 @@ function startDirectory() {
return false;
}
// Plugin launcher
// Addon launcher
function launchDirectory() {
// Click event
$('#directory .bottom .finish').click(closeDirectory);

View file

@ -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);

View file

@ -473,7 +473,7 @@ function loadFavorites() {
$('#favorites .fedit-head-select').html(favorites_popup);
}
// Plugin launcher
// Addon launcher
function launchFavorites() {
var path = '#favorites .';

View file

@ -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);

View file

@ -613,7 +613,7 @@ function handleInboxAttach(responseXML) {
$('#inbox .wait').hide();
}
// Plugin launcher
// Addon launcher
function launchInbox() {
// Define the pats
var inbox = '#inbox .';

View file

@ -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)) {

View file

@ -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);

View file

@ -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;

View file

@ -64,7 +64,7 @@
});
// plugin code
// addon code
$.fn.placeholder = function(opts) {
opts = $.extend({},$.placeholder.settings, opts);

View file

@ -51,7 +51,7 @@ function closeMe() {
return false;
}
// Plugin launcher
// Addon launcher
function launchMe() {
// Click events
$('#me .content a.go').click(function() {

View file

@ -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) {

View file

@ -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;

View file

@ -361,7 +361,7 @@ function saveMucAdmin() {
return closeMucAdmin();
}
// Plugin launcher
// Addon launcher
function launchMucAdmin() {
// Click events
$('#mucadmin .bottom .finish').click(function() {

View file

@ -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) {

View file

@ -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();

View file

@ -534,7 +534,7 @@ function loadOptions() {
$('#integratemedias').attr('checked', true);
}
// Plugin launcher
// Addon launcher
function launchOptions() {
// Click events
$('#options .tab a').click(function() {

View file

@ -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, '');

View file

@ -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() {

View file

@ -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);

View file

@ -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');

View file

@ -166,7 +166,7 @@ function saveRosterX() {
closeRosterX();
}
// Plugin launcher
// Addon launcher
function launchRosterX() {
// Click events
$('#rosterx .bottom .finish').click(function() {

View file

@ -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();

View file

@ -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() {

View file

@ -566,7 +566,7 @@ function sendVCard() {
return false;
}
// Plugin launcher
// Addon launcher
function launchVCard() {
// Focus on the first input
$(document).oneTime(10, function() {

View file

@ -269,7 +269,7 @@ function nextWelcome() {
return false;
}
// Plugin launcher
// Addon launcher
function launchWelcome() {
// Click events
$('#welcome .tab a').click(function() {

View file

@ -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."

View file

@ -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."

View file

@ -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. "

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -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."

View file

@ -163,7 +163,7 @@ else
else if($step == 3) { ?>
<h3 class="account install-images"><?php _e("Administrator account"); ?></h3>
<p><?php _e("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."); ?></p>
<p><?php _e("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."); ?></p>
<p><?php _e("When Jappix will be installed, just click on the manager link on the home page to access it."); ?></p>

View file

@ -61,19 +61,26 @@ GET /jappixmini/?role=%s&signed_address=%s&dfrn_id=%s
Response:
json({"status":"ok", "encrypted_address":"%s"})
*/
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Model\User;
use Friendica\Util\Network;
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');
function jappixmini_install()
{
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');
// Jappix source download as required by AGPL
Addon::registerHook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
// set standard configuration
$info_text = get_config("jappixmini", "infotext");
@ -92,20 +99,21 @@ $addon_version = get_config("jappixmini", "version");
if ($addon_version==="") set_config("jappixmini", "version", "1");
}
function jappixmini_uninstall()
{
Addon::unregisterHook('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
Addon::unregisterHook('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
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('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
Addon::unregisterHook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
unregister_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
unregister_hook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
Addon::unregisterHook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
unregister_hook('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(&$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")) {
@ -147,7 +155,8 @@ function jappixmini_plugin_admin(&$a, &$o) {
$o .= '<input type="submit" name="jappixmini-admin-settings" value="OK" />';
}
function jappixmini_plugin_admin_post(&$a) {
function jappixmini_addon_admin_post(App $a)
{
// set info text
$submit = $_REQUEST['jappixmini-admin-settings'];
if ($submit) {
@ -210,9 +219,11 @@ function jappixmini_init(&$a) {
} catch (Exception $e) {
}
// do not return an address if user deactivated plugin
$activated = get_pconfig($uid, 'jappixmini', 'activate');
if (!$activated) killme();
// do not return an address if user deactivated addon
$activated = PConfig::get($uid, 'jappixmini', 'activate');
if (!$activated) {
killme();
}
// return the requested Jabber address
try {
@ -238,118 +249,128 @@ function jappixmini_init(&$a) {
}
}
function jappixmini_settings(&$a, &$s) {
// addon settings for a user
function jappixmini_settings(App $a, &$s)
{
// addon settings for a user
$activate = PConfig::get(local_user(), 'jappixmini', 'activate');
$activate = intval($activate) ? ' checked="checked"' : '';
$dontinsertchat = PConfig::get(local_user(), 'jappixmini', 'dontinsertchat');
$insertchat = !(intval($dontinsertchat) ? ' checked="checked"' : '');
$activate = get_pconfig(local_user(),'jappixmini','activate');
$activate = intval($activate) ? ' checked="checked"' : '';
$dontinsertchat = get_pconfig(local_user(),'jappixmini','dontinsertchat');
$insertchat = !(intval($dontinsertchat) ? ' checked="checked"' : '');
$defaultbosh = Config::get("jappixmini", "bosh_address");
$defaultbosh = get_config("jappixmini", "bosh_address");
if ($defaultbosh != "") {
PConfig::set(local_user(), 'jappixmini', 'bosh', $defaultbosh);
}
if ($defaultbosh != "")
set_pconfig(local_user(),'jappixmini','bosh', $defaultbosh);
$username = PConfig::get(local_user(), 'jappixmini', 'username');
$username = htmlentities($username);
$server = PConfig::get(local_user(), 'jappixmini', 'server');
$server = htmlentities($server);
$bosh = PConfig::get(local_user(), 'jappixmini', 'bosh');
$bosh = htmlentities($bosh);
$password = PConfig::get(local_user(), 'jappixmini', 'password');
$autosubscribe = PConfig::get(local_user(), 'jappixmini', 'autosubscribe');
$autosubscribe = intval($autosubscribe) ? ' checked="checked"' : '';
$autoapprove = PConfig::get(local_user(), 'jappixmini', 'autoapprove');
$autoapprove = intval($autoapprove) ? ' checked="checked"' : '';
$encrypt = intval(PConfig::get(local_user(), 'jappixmini', 'encrypt'));
$encrypt_checked = $encrypt ? ' checked="checked"' : '';
$encrypt_disabled = $encrypt ? '' : ' disabled="disabled"';
$username = get_pconfig(local_user(),'jappixmini','username');
$username = htmlentities($username);
$server = get_pconfig(local_user(),'jappixmini','server');
$server = htmlentities($server);
$bosh = get_pconfig(local_user(),'jappixmini','bosh');
$bosh = htmlentities($bosh);
$password = get_pconfig(local_user(),'jappixmini','password');
$autosubscribe = get_pconfig(local_user(),'jappixmini','autosubscribe');
$autosubscribe = intval($autosubscribe) ? ' checked="checked"' : '';
$autoapprove = get_pconfig(local_user(),'jappixmini','autoapprove');
$autoapprove = intval($autoapprove) ? ' checked="checked"' : '';
$encrypt = intval(get_pconfig(local_user(),'jappixmini','encrypt'));
$encrypt_checked = $encrypt ? ' checked="checked"' : '';
$encrypt_disabled = $encrypt ? '' : ' disabled="disabled"';
if ($server == "") {
$server = Config::get("jappixmini", "default_server");
}
if ($server == "")
$server = get_config("jappixmini", "default_server");
if (($username == "") && Config::get("jappixmini", "default_user")) {
$username = $a->user["nickname"];
}
if (($username == "") && get_config("jappixmini", "default_user"))
$username = $a->user["nickname"];
$info_text = Config::get("jappixmini", "infotext");
$info_text = htmlentities($info_text);
$info_text = str_replace("\n", "<br />", $info_text);
$info_text = get_config("jappixmini", "infotext");
$info_text = htmlentities($info_text);
$info_text = str_replace("\n", "<br />", $info_text);
// count contacts
$r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%'", local_user());
if (count($r)) {
$contact_cnt = $r[0]["cnt"];
} else {
$contact_cnt = 0;
}
// count contacts
$r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%'", local_user());
if (count($r)) $contact_cnt = $r[0]["cnt"];
else $contact_cnt = 0;
// count jabber addresses
$r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%' AND `v` LIKE '%%@%%'", local_user());
if (count($r)) {
$address_cnt = $r[0]["cnt"];
} else {
$address_cnt = 0;
}
// count jabber addresses
$r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%' AND `v` LIKE '%%@%%'", local_user());
if (count($r)) $address_cnt = $r[0]["cnt"];
else $address_cnt = 0;
if (!$activate) {
// load scripts if not yet activated so that password can be saved
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>' . "\r\n";
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
if (!$activate) {
// load scripts if not yet activated so that password can be saved
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>'."\r\n";
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>'."\r\n";
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
}
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\r\n";
}
$s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
$s .= '<h3>' . L10n::t('Jappix Mini') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_jappixmini_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
$s .= '<h3>' . L10n::t('Jappix Mini') . '</h3>';
$s .= '</span>';
$s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
$s .= '<h3>'.t('Jappix Mini').'</h3>';
$s .= '</span>';
$s .= '<div id="settings_jappixmini_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
$s .= '<h3>'.t('Jappix Mini').'</h3>';
$s .= '</span>';
$s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>';
$s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"'.$activate.' />';
$s .= '<br />';
$s .= '<label for"jappixmini-dont-insertchat">'.t('Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface').'</label>';
$s .= '<input id="jappixmini-dont-insertchat" type="checkbox" name="jappixmini-dont-insertchat" value="1"'.$insertchat.' />';
$s .= '<br />';
$s .= '<label for="jappixmini-username">'.t('Jabber username').'</label>';
$s .= ' <input id="jappixmini-username" type="text" name="jappixmini-username" value="'.$username.'" />';
$s .= '<br />';
$s .= '<label for="jappixmini-server">'.t('Jabber server').'</label>';
$s .= ' <input id="jappixmini-server" type="text" name="jappixmini-server" value="'.$server.'" />';
$s .= '<br />';
if ($defaultbosh == "") {
$s .= '<label for="jappixmini-bosh">'.t('Jabber BOSH host').'</label>';
$s .= ' <input id="jappixmini-bosh" type="text" name="jappixmini-bosh" value="'.$bosh.'" />';
$s .= '<label for="jappixmini-activate">' . L10n::t('Activate addon') . '</label>';
$s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"' . $activate . ' />';
$s .= '<br />';
$s .= '<label for"jappixmini-dont-insertchat">' . L10n::t('Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface') . '</label>';
$s .= '<input id="jappixmini-dont-insertchat" type="checkbox" name="jappixmini-dont-insertchat" value="1"' . $insertchat . ' />';
$s .= '<br />';
$s .= '<label for="jappixmini-username">' . L10n::t('Jabber username') . '</label>';
$s .= ' <input id="jappixmini-username" type="text" name="jappixmini-username" value="' . $username . '" />';
$s .= '<br />';
$s .= '<label for="jappixmini-server">' . L10n::t('Jabber server') . '</label>';
$s .= ' <input id="jappixmini-server" type="text" name="jappixmini-server" value="' . $server . '" />';
$s .= '<br />';
}
if ($defaultbosh == "") {
$s .= '<label for="jappixmini-bosh">' . L10n::t('Jabber BOSH host') . '</label>';
$s .= ' <input id="jappixmini-bosh" type="text" name="jappixmini-bosh" value="' . $bosh . '" />';
$s .= '<br />';
}
$s .= '<label for="jappixmini-password">'.t('Jabber password').'</label>';
$s .= ' <input type="hidden" id="jappixmini-password" name="jappixmini-encrypted-password" value="'.$password.'" />';
$s .= ' <input id="jappixmini-clear-password" type="password" value="" onchange="jappixmini_set_password();" />';
$s .= '<br />';
$onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();";
$s .= '<label for="jappixmini-encrypt">'.t('Encrypt Jabber password with Friendica password (recommended)').'</label>';
$s .= ' <input id="jappixmini-encrypt" type="checkbox" name="jappixmini-encrypt" onchange="'.$onchange.'" value="1"'.$encrypt_checked.' />';
$s .= '<br />';
$s .= '<label for="jappixmini-friendica-password">'.t('Friendica password').'</label>';
$s .= ' <input id="jappixmini-friendica-password" name="jappixmini-friendica-password" type="password" onchange="jappixmini_set_password();" value=""'.$encrypt_disabled.' />';
$s .= '<br />';
$s .= '<label for="jappixmini-autoapprove">'.t('Approve subscription requests from Friendica contacts automatically').'</label>';
$s .= ' <input id="jappixmini-autoapprove" type="checkbox" name="jappixmini-autoapprove" value="1"'.$autoapprove.' />';
$s .= '<br />';
$s .= '<label for="jappixmini-autosubscribe">'.t('Subscribe to Friendica contacts automatically').'</label>';
$s .= ' <input id="jappixmini-autosubscribe" type="checkbox" name="jappixmini-autosubscribe" value="1"'.$autosubscribe.' />';
$s .= '<br />';
$s .= '<label for="jappixmini-purge">'.t('Purge internal list of jabber addresses of contacts').'</label>';
$s .= ' <input id="jappixmini-purge" type="checkbox" name="jappixmini-purge" value="1" />';
$s .= '<br />';
if ($info_text) $s .= '<br />Configuration help:<p style="margin-left:2em;">'.$info_text.'</p>';
$s .= '<br />Status:<p style="margin-left:2em;">Addon knows '.$address_cnt.' Jabber addresses of '.$contact_cnt.' Friendica contacts (takes some time, usually 10 minutes, to update).</p>';
$s .= '<input type="submit" name="jappixmini-submit" value="' . t('Save Settings') . '" />';
$s .= ' <input type="button" value="'.t('Add contact').'" onclick="jappixmini_addon_subscribe();" />';
$s .= '<label for="jappixmini-password">' . L10n::t('Jabber password') . '</label>';
$s .= ' <input type="hidden" id="jappixmini-password" name="jappixmini-encrypted-password" value="' . $password . '" />';
$s .= ' <input id="jappixmini-clear-password" type="password" value="" onchange="jappixmini_set_password();" />';
$s .= '<br />';
$onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();";
$s .= '<label for="jappixmini-encrypt">' . L10n::t('Encrypt Jabber password with Friendica password (recommended)') . '</label>';
$s .= ' <input id="jappixmini-encrypt" type="checkbox" name="jappixmini-encrypt" onchange="' . $onchange . '" value="1"' . $encrypt_checked . ' />';
$s .= '<br />';
$s .= '<label for="jappixmini-friendica-password">' . L10n::t('Friendica password') . '</label>';
$s .= ' <input id="jappixmini-friendica-password" name="jappixmini-friendica-password" type="password" onchange="jappixmini_set_password();" value=""' . $encrypt_disabled . ' />';
$s .= '<br />';
$s .= '<label for="jappixmini-autoapprove">' . L10n::t('Approve subscription requests from Friendica contacts automatically') . '</label>';
$s .= ' <input id="jappixmini-autoapprove" type="checkbox" name="jappixmini-autoapprove" value="1"' . $autoapprove . ' />';
$s .= '<br />';
$s .= '<label for="jappixmini-autosubscribe">' . L10n::t('Subscribe to Friendica contacts automatically') . '</label>';
$s .= ' <input id="jappixmini-autosubscribe" type="checkbox" name="jappixmini-autosubscribe" value="1"' . $autosubscribe . ' />';
$s .= '<br />';
$s .= '<label for="jappixmini-purge">' . L10n::t('Purge internal list of jabber addresses of contacts') . '</label>';
$s .= ' <input id="jappixmini-purge" type="checkbox" name="jappixmini-purge" value="1" />';
$s .= '<br />';
if ($info_text) {
$s .= '<br />Configuration help:<p style="margin-left:2em;">' . $info_text . '</p>';
}
$s .= '<br />Status:<p style="margin-left:2em;">Addon knows ' . $address_cnt . ' Jabber addresses of ' . $contact_cnt . ' Friendica contacts (takes some time, usually 10 minutes, to update).</p>';
$s .= '<input type="submit" name="jappixmini-submit" value="' . L10n::t('Save Settings') . '" />';
$s .= ' <input type="button" value="' . L10n::t('Add contact') . '" onclick="jappixmini_addon_subscribe();" />';
$s .= '</div>';
$s .= '</div>';
$a->page['htmlhead'] .= "<script type=\"text/javascript\">
$a->page['htmlhead'] .= "<script type=\"text/javascript\">
function jappixmini_set_password() {
encrypt = document.getElementById('jappixmini-encrypt').checked;
password = document.getElementById('jappixmini-password');
@ -607,7 +628,7 @@ function jappixmini_cron(&$a, $d) {
try {
// send request
$answer_json = fetch_url($url);
$answer_json = Network::fetchUrl($url);
// parse answer
$answer = json_decode($answer_json);

View file

@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-27 05:01-0500\n"
"PO-Revision-Date: 2015-08-31 10:18+0000\n"
"PO-Revision-Date: 2017-09-20 06:08+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"