X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=jappixmini%2Fjappixmini.php;h=ad4d4901432c38a70dc50ac5b4fb833864654362;hb=b5759d24ee8db7e558fb1214e01fd26c105f4391;hp=ad758167baccba1c14b1770229b2262949d895d7;hpb=2ca621a92a40fba62f8e9acf7eba3a47a5d2ed7b;p=friendica-addons.git
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index ad758167..ad4d4901 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -63,11 +63,8 @@
*/
use Friendica\App;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\DI;
@@ -88,23 +85,23 @@ function jappixmini_install()
Hook::register('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
// set standard configuration
- $info_text = Config::get("jappixmini", "infotext");
+ $info_text = DI::config()->get("jappixmini", "infotext");
if (!$info_text)
- Config::set("jappixmini", "infotext", "To get the chat working, you need to know a BOSH host which works with your Jabber account. " .
+ DI::config()->set("jappixmini", "infotext", "To get the chat working, you need to know a BOSH host which works with your Jabber account. " .
"An example of a BOSH server that works for all accounts is https://bind.jappix.com/, but keep " .
"in mind that the BOSH server can read along all chat messages. If you know that your Jabber " .
"server also provides an own BOSH server, it is much better to use this one!"
);
- $bosh_proxy = Config::get("jappixmini", "bosh_proxy");
+ $bosh_proxy = DI::config()->get("jappixmini", "bosh_proxy");
if ($bosh_proxy === "") {
- Config::set("jappixmini", "bosh_proxy", "1");
+ DI::config()->set("jappixmini", "bosh_proxy", "1");
}
// set addon version so that safe updates are possible later
- $addon_version = Config::get("jappixmini", "version");
+ $addon_version = DI::config()->get("jappixmini", "version");
if ($addon_version === "") {
- Config::set("jappixmini", "version", "1");
+ DI::config()->set("jappixmini", "version", "1");
}
}
@@ -129,35 +126,35 @@ function jappixmini_addon_admin(App $a, &$o)
}
// warn if cron job has not yet been executed
- $cron_run = Config::get("jappixmini", "last_cron_execution");
+ $cron_run = DI::config()->get("jappixmini", "last_cron_execution");
if (!$cron_run) {
$o .= "
Warning: The cron job has not yet been executed. If this message is still there after some time (usually 10 minutes), this means that autosubscribe and autoaccept will not work.
";
}
// bosh proxy
- $bosh_proxy = intval(Config::get("jappixmini", "bosh_proxy"));
+ $bosh_proxy = intval(DI::config()->get("jappixmini", "bosh_proxy"));
$bosh_proxy = intval($bosh_proxy) ? ' checked="checked"' : '';
$o .= 'Activate BOSH proxy ';
$o .= ' ';
// bosh address
- $bosh_address = Config::get("jappixmini", "bosh_address");
+ $bosh_address = DI::config()->get("jappixmini", "bosh_address");
$o .= 'Adress of the default BOSH proxy. If enabled it overrides the user settings: ';
$o .= '
';
// default server address
- $default_server = Config::get("jappixmini", "default_server");
+ $default_server = DI::config()->get("jappixmini", "default_server");
$o .= 'Adress of the default jabber server: ';
$o .= '
';
// default user name to friendica nickname
- $default_user = intval(Config::get("jappixmini", "default_user"));
+ $default_user = intval(DI::config()->get("jappixmini", "default_user"));
$default_user = intval($default_user) ? ' checked="checked"' : '';
$o .= 'Set the default username to the nickname: ';
$o .= ' ';
// info text field
- $info_text = Config::get("jappixmini", "infotext");
+ $info_text = DI::config()->get("jappixmini", "infotext");
$o .= 'Info text to help users with configuration (important if you want to provide your own BOSH host!): ';
$o .= '
';
@@ -175,11 +172,11 @@ function jappixmini_addon_admin_post(App $a)
$default_user = intval($_REQUEST['jappixmini-defaultuser']);
$bosh_address = $_REQUEST['jappixmini-address'];
$default_server = $_REQUEST['jappixmini-server'];
- Config::set("jappixmini", "infotext", $info_text);
- Config::set("jappixmini", "bosh_proxy", $bosh_proxy);
- Config::set("jappixmini", "bosh_address", $bosh_address);
- Config::set("jappixmini", "default_server", $default_server);
- Config::set("jappixmini", "default_user", $default_user);
+ DI::config()->set("jappixmini", "infotext", $info_text);
+ DI::config()->set("jappixmini", "bosh_proxy", $bosh_proxy);
+ DI::config()->set("jappixmini", "bosh_address", $bosh_address);
+ DI::config()->set("jappixmini", "default_server", $default_server);
+ DI::config()->set("jappixmini", "default_user", $default_user);
}
}
@@ -231,21 +228,21 @@ function jappixmini_init()
$decrypt_func($signed_address, $trusted_address, $key);
$now = intval(time());
- PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$trusted_address");
+ DI::pConfig()->set($uid, "jappixmini", "id:$dfrn_id", "$now:$trusted_address");
} catch (Exception $e) {
}
// do not return an address if user deactivated addon
- $activated = PConfig::get($uid, 'jappixmini', 'activate');
+ $activated = DI::pConfig()->get($uid, 'jappixmini', 'activate');
if (!$activated) {
exit();
}
// return the requested Jabber address
try {
- $username = PConfig::get($uid, 'jappixmini', 'username');
- $server = PConfig::get($uid, 'jappixmini', 'server');
+ $username = DI::pConfig()->get($uid, 'jappixmini', 'username');
+ $server = DI::pConfig()->get($uid, 'jappixmini', 'server');
$address = "$username@$server";
$encrypted_address = "";
@@ -269,41 +266,41 @@ function jappixmini_init()
function jappixmini_settings(App $a, &$s)
{
// addon settings for a user
- $activate = PConfig::get(local_user(), 'jappixmini', 'activate');
+ $activate = DI::pConfig()->get(local_user(), 'jappixmini', 'activate');
$activate = intval($activate) ? ' checked="checked"' : '';
- $dontinsertchat = PConfig::get(local_user(), 'jappixmini', 'dontinsertchat');
+ $dontinsertchat = DI::pConfig()->get(local_user(), 'jappixmini', 'dontinsertchat');
$insertchat = !(intval($dontinsertchat) ? ' checked="checked"' : '');
- $defaultbosh = Config::get("jappixmini", "bosh_address");
+ $defaultbosh = DI::config()->get("jappixmini", "bosh_address");
if ($defaultbosh != "") {
- PConfig::set(local_user(), 'jappixmini', 'bosh', $defaultbosh);
+ DI::pConfig()->set(local_user(), 'jappixmini', 'bosh', $defaultbosh);
}
- $username = PConfig::get(local_user(), 'jappixmini', 'username');
+ $username = DI::pConfig()->get(local_user(), 'jappixmini', 'username');
$username = htmlentities($username);
- $server = PConfig::get(local_user(), 'jappixmini', 'server');
+ $server = DI::pConfig()->get(local_user(), 'jappixmini', 'server');
$server = htmlentities($server);
- $bosh = PConfig::get(local_user(), 'jappixmini', 'bosh');
+ $bosh = DI::pConfig()->get(local_user(), 'jappixmini', 'bosh');
$bosh = htmlentities($bosh);
- $password = PConfig::get(local_user(), 'jappixmini', 'password');
- $autosubscribe = PConfig::get(local_user(), 'jappixmini', 'autosubscribe');
+ $password = DI::pConfig()->get(local_user(), 'jappixmini', 'password');
+ $autosubscribe = DI::pConfig()->get(local_user(), 'jappixmini', 'autosubscribe');
$autosubscribe = intval($autosubscribe) ? ' checked="checked"' : '';
- $autoapprove = PConfig::get(local_user(), 'jappixmini', 'autoapprove');
+ $autoapprove = DI::pConfig()->get(local_user(), 'jappixmini', 'autoapprove');
$autoapprove = intval($autoapprove) ? ' checked="checked"' : '';
- $encrypt = intval(PConfig::get(local_user(), 'jappixmini', 'encrypt'));
+ $encrypt = intval(DI::pConfig()->get(local_user(), 'jappixmini', 'encrypt'));
$encrypt_checked = $encrypt ? ' checked="checked"' : '';
$encrypt_disabled = $encrypt ? '' : ' disabled="disabled"';
if ($server == "") {
- $server = Config::get("jappixmini", "default_server");
+ $server = DI::config()->get("jappixmini", "default_server");
}
- if (($username == "") && Config::get("jappixmini", "default_user")) {
+ if (($username == "") && DI::config()->get("jappixmini", "default_user")) {
$username = $a->user["nickname"];
}
- $info_text = Config::get("jappixmini", "infotext");
+ $info_text = DI::config()->get("jappixmini", "infotext");
$info_text = htmlentities($info_text);
$info_text = str_replace("\n", " ", $info_text);
@@ -332,58 +329,58 @@ function jappixmini_settings(App $a, &$s)
}
$s .= '';
- $s .= '' . L10n::t('Jappix Mini') . ' ';
+ $s .= '' . DI::l10n()->t('Jappix Mini') . ' ';
$s .= ' ';
$s .= '';
$s .= '
';
- $s .= '' . L10n::t('Jappix Mini') . ' ';
+ $s .= '' . DI::l10n()->t('Jappix Mini') . ' ';
$s .= ' ';
- $s .= '
' . L10n::t('Activate addon') . ' ';
+ $s .= '
' . DI::l10n()->t('Activate addon') . ' ';
$s .= '
';
$s .= '
';
- $s .= '
' . L10n::t('Do not insert the Jappixmini Chat-Widget into the webinterface') . ' ';
+ $s .= '
' . DI::l10n()->t('Do not insert the Jappixmini Chat-Widget into the webinterface') . ' ';
$s .= '
';
$s .= '
';
- $s .= '
' . L10n::t('Jabber username') . ' ';
+ $s .= '
' . DI::l10n()->t('Jabber username') . ' ';
$s .= '
';
$s .= '
';
- $s .= '
' . L10n::t('Jabber server') . ' ';
+ $s .= '
' . DI::l10n()->t('Jabber server') . ' ';
$s .= '
';
$s .= '
';
if ($defaultbosh == "") {
- $s .= '
' . L10n::t('Jabber BOSH host') . ' ';
+ $s .= '
' . DI::l10n()->t('Jabber BOSH host') . ' ';
$s .= '
';
$s .= '
';
}
- $s .= '
' . L10n::t('Jabber password') . ' ';
+ $s .= '
' . DI::l10n()->t('Jabber password') . ' ';
$s .= '
';
$s .= '
';
$s .= '
';
$onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();";
- $s .= '
' . L10n::t('Encrypt Jabber password with Friendica password (recommended)') . ' ';
+ $s .= '
' . DI::l10n()->t('Encrypt Jabber password with Friendica password (recommended)') . ' ';
$s .= '
';
$s .= '
';
- $s .= '
' . L10n::t('Friendica password') . ' ';
+ $s .= '
' . DI::l10n()->t('Friendica password') . ' ';
$s .= '
';
$s .= '
';
- $s .= '
' . L10n::t('Approve subscription requests from Friendica contacts automatically') . ' ';
+ $s .= '
' . DI::l10n()->t('Approve subscription requests from Friendica contacts automatically') . ' ';
$s .= '
';
$s .= '
';
- $s .= '
' . L10n::t('Subscribe to Friendica contacts automatically') . ' ';
+ $s .= '
' . DI::l10n()->t('Subscribe to Friendica contacts automatically') . ' ';
$s .= '
';
$s .= '
';
- $s .= '
' . L10n::t('Purge internal list of jabber addresses of contacts') . ' ';
+ $s .= '
' . DI::l10n()->t('Purge internal list of jabber addresses of contacts') . ' ';
$s .= '
';
$s .= '
';
if ($info_text) {
$s .= '
Configuration help:
' . $info_text . '
';
}
$s .= '
Status:
Addon knows ' . $address_cnt . ' Jabber addresses of ' . $contact_cnt . ' Friendica contacts (takes some time, usually 10 minutes, to update).
';
- $s .= '
';
- $s .= '
';
+ $s .= '
';
+ $s .= '
';
$s .= '
';
@@ -445,26 +442,26 @@ function jappixmini_settings_post(App $a, &$b)
$purge = intval($b['jappixmini-purge']);
$username = trim($b['jappixmini-username']);
- $old_username = PConfig::get($uid, 'jappixmini', 'username');
+ $old_username = DI::pConfig()->get($uid, 'jappixmini', 'username');
if ($username != $old_username) {
$purge = 1;
}
$server = trim($b['jappixmini-server']);
- $old_server = PConfig::get($uid, 'jappixmini', 'server');
+ $old_server = DI::pConfig()->get($uid, 'jappixmini', 'server');
if ($server != $old_server) {
$purge = 1;
}
- PConfig::set($uid, 'jappixmini', 'username' , $username);
- PConfig::set($uid, 'jappixmini', 'server' , $server);
- PConfig::set($uid, 'jappixmini', 'bosh' , trim($b['jappixmini-bosh']));
- PConfig::set($uid, 'jappixmini', 'password' , trim($b['jappixmini-encrypted-password']));
- PConfig::set($uid, 'jappixmini', 'autosubscribe' , intval($b['jappixmini-autosubscribe']));
- PConfig::set($uid, 'jappixmini', 'autoapprove' , intval($b['jappixmini-autoapprove']));
- PConfig::set($uid, 'jappixmini', 'activate' , intval($b['jappixmini-activate']));
- PConfig::set($uid, 'jappixmini', 'dontinsertchat', intval($b['jappixmini-dont-insertchat']));
- PConfig::set($uid, 'jappixmini', 'encrypt' , $encrypt);
+ DI::pConfig()->set($uid, 'jappixmini', 'username' , $username);
+ DI::pConfig()->set($uid, 'jappixmini', 'server' , $server);
+ DI::pConfig()->set($uid, 'jappixmini', 'bosh' , trim($b['jappixmini-bosh']));
+ DI::pConfig()->set($uid, 'jappixmini', 'password' , trim($b['jappixmini-encrypted-password']));
+ DI::pConfig()->set($uid, 'jappixmini', 'autosubscribe' , intval($b['jappixmini-autosubscribe']));
+ DI::pConfig()->set($uid, 'jappixmini', 'autoapprove' , intval($b['jappixmini-autoapprove']));
+ DI::pConfig()->set($uid, 'jappixmini', 'activate' , intval($b['jappixmini-activate']));
+ DI::pConfig()->set($uid, 'jappixmini', 'dontinsertchat', intval($b['jappixmini-dont-insertchat']));
+ DI::pConfig()->set($uid, 'jappixmini', 'encrypt' , $encrypt);
info('Jappix Mini settings saved.');
if ($purge) {
@@ -485,8 +482,8 @@ function jappixmini_script(App $a)
return;
}
- $activate = PConfig::get(local_user(), 'jappixmini', 'activate');
- $dontinsertchat = PConfig::get(local_user(), 'jappixmini', 'dontinsertchat');
+ $activate = DI::pConfig()->get(local_user(), 'jappixmini', 'activate');
+ $dontinsertchat = DI::pConfig()->get(local_user(), 'jappixmini', 'dontinsertchat');
if (!$activate || $dontinsertchat) {
return;
}
@@ -496,24 +493,24 @@ function jappixmini_script(App $a)
DI::page()['htmlhead'] .= '' . "\r\n";
- $username = PConfig::get(local_user(), 'jappixmini', 'username');
+ $username = DI::pConfig()->get(local_user(), 'jappixmini', 'username');
$username = str_replace("'", "\\'", $username);
- $server = PConfig::get(local_user(), 'jappixmini', 'server');
+ $server = DI::pConfig()->get(local_user(), 'jappixmini', 'server');
$server = str_replace("'", "\\'", $server);
- $bosh = PConfig::get(local_user(), 'jappixmini', 'bosh');
+ $bosh = DI::pConfig()->get(local_user(), 'jappixmini', 'bosh');
$bosh = str_replace("'", "\\'", $bosh);
- $encrypt = PConfig::get(local_user(), 'jappixmini', 'encrypt');
+ $encrypt = DI::pConfig()->get(local_user(), 'jappixmini', 'encrypt');
$encrypt = intval($encrypt);
- $password = PConfig::get(local_user(), 'jappixmini', 'password');
+ $password = DI::pConfig()->get(local_user(), 'jappixmini', 'password');
$password = str_replace("'", "\\'", $password);
- $autoapprove = PConfig::get(local_user(), 'jappixmini', 'autoapprove');
+ $autoapprove = DI::pConfig()->get(local_user(), 'jappixmini', 'autoapprove');
$autoapprove = intval($autoapprove);
- $autosubscribe = PConfig::get(local_user(), 'jappixmini', 'autosubscribe');
+ $autosubscribe = DI::pConfig()->get(local_user(), 'jappixmini', 'autosubscribe');
$autosubscribe = intval($autosubscribe);
// set proxy if necessary
- $use_proxy = Config::get('jappixmini', 'bosh_proxy');
+ $use_proxy = DI::config()->get('jappixmini', 'bosh_proxy');
if ($use_proxy) {
$proxy = DI::baseUrl()->get() . '/addon/jappixmini/proxy.php';
} else {
@@ -550,7 +547,7 @@ function jappixmini_script(App $a)
// get nickname
$r = q("SELECT `username` FROM `user` WHERE `uid`=$uid");
$nickname = json_encode($r[0]["username"]);
- $groupchats = Config::get('jappixmini', 'groupchats');
+ $groupchats = DI::config()->get('jappixmini', 'groupchats');
//if $groupchats has no value jappix_addon_start will produce a syntax error
if (empty($groupchats)) {
$groupchats = "{}";
@@ -582,7 +579,7 @@ function jappixmini_login(App $a, &$o)
function jappixmini_cron(App $a, $d)
{
// For autosubscribe/autoapprove, we need to maintain a list of jabber addresses of our contacts.
- Config::set("jappixmini", "last_cron_execution", $d);
+ DI::config()->set("jappixmini", "last_cron_execution", $d);
// go through list of users with jabber enabled
$users = q("SELECT `uid` FROM `pconfig` WHERE `cat`='jappixmini' AND (`k`='autosubscribe' OR `k`='autoapprove') AND `v`='1'");
@@ -619,7 +616,7 @@ function jappixmini_cron(App $a, $d)
}
// check if jabber address already present
- $present = PConfig::get($uid, "jappixmini", "id:" . $dfrn_id);
+ $present = DI::pConfig()->get($uid, "jappixmini", "id:" . $dfrn_id);
$now = intval(time());
if ($present) {
// $present has format "timestamp:jabber_address"
@@ -642,11 +639,11 @@ function jappixmini_cron(App $a, $d)
$base = substr($request, 0, $pos) . "/jappixmini?role=$role";
// construct own address
- $username = PConfig::get($uid, 'jappixmini', 'username');
+ $username = DI::pConfig()->get($uid, 'jappixmini', 'username');
if (!$username) {
continue;
}
- $server = PConfig::get($uid, 'jappixmini', 'server');
+ $server = DI::pConfig()->get($uid, 'jappixmini', 'server');
if (!$server) {
continue;
}
@@ -692,7 +689,7 @@ function jappixmini_cron(App $a, $d)
}
// save address
- PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address");
+ DI::pConfig()->set($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address");
}
}
}