friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-12 03:18:48 +00:00
Code Issues Releases Wiki Activity

Move PConfig::get() to DI::pConfig()->get()

Browse source
This commit is contained in:
nupplaPhil 2020-01-18 16:50:56 +01:00
parent 2a35176588
commit ea3a9052d8
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
42 changed files with 414 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

52
jappixmini/jappixmini.php
View file

@ -237,15 +237,15 @@ function jappixmini_init()
}
// 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,9 +269,9 @@ 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");
@ -280,18 +280,18 @@ function jappixmini_settings(App $a, &$s)
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"';
@ -445,13 +445,13 @@ 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;
}
@ -485,8 +485,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,20 +496,20 @@ function jappixmini_script(App $a)
DI::page()['htmlhead'] .= '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/jappixmini/lib.js"></script>' . "\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
@ -619,7 +619,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 +642,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;
}