X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=jappixmini%2Fjappixmini.php;h=66f9ff614ca68e2da559d559ecdab03e69dff3af;hb=48fecb9a40d0a1bac959f239be1d937edd5b7f09;hp=28e238db65c440a3935d33fb4138bf366878653f;hpb=fdda495f1869f71c963c05f81ea7e9440f149076;p=friendica-addons.git
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 28e238db..66f9ff61 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -63,28 +63,28 @@
*/
use Friendica\App;
-use Friendica\Core\Addon;
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;
use Friendica\Model\User;
use Friendica\Util\Network;
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');
+ Hook::register('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+ Hook::register('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
- Addon::registerHook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
- Addon::registerHook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
+ Hook::register('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+ Hook::register('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
- Addon::registerHook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+ Hook::register('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
// Jappix source download as required by AGPL
- Addon::registerHook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+ Hook::register('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
// set standard configuration
$info_text = Config::get("jappixmini", "infotext");
@@ -109,15 +109,15 @@ function jappixmini_install()
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');
+ Hook::unregister('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+ Hook::unregister('addon_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');
+ Hook::unregister('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+ Hook::unregister('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
- Addon::unregisterHook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+ Hook::unregister('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
- Addon::unregisterHook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+ Hook::unregister('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
}
function jappixmini_addon_admin(App $a, &$o)
@@ -193,14 +193,14 @@ function jappixmini_init()
// of local users
$dfrn_id = $_REQUEST["dfrn_id"];
if (!$dfrn_id) {
- killme();
+ exit();
}
$role = $_REQUEST["role"];
if ($role == "pub") {
$r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
if (!count($r)) {
- killme();
+ exit();
}
$encrypt_func = 'openssl_public_encrypt';
@@ -209,14 +209,14 @@ function jappixmini_init()
} else if ($role == "prv") {
$r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
if (!count($r)) {
- killme();
+ exit();
}
$encrypt_func = 'openssl_private_encrypt';
$decrypt_func = 'openssl_private_decrypt';
$key = $r[0]["prvkey"];
} else {
- killme();
+ exit();
}
$uid = $r[0]["uid"];
@@ -230,21 +230,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) {
- killme();
+ 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 = "";
@@ -259,38 +259,38 @@ function jappixmini_init()
$answer_json = json_encode($answer);
echo $answer_json;
- killme();
+ exit();
} catch (Exception $e) {
- killme();
+ exit();
}
}
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");
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"';
@@ -324,69 +324,69 @@ function jappixmini_settings(App $a, &$s)
if (!$activate) {
// load scripts if not yet activated so that password can be saved
- $a->page['htmlhead'] .= '' . "\r\n";
- $a->page['htmlhead'] .= '' . "\r\n";
+ DI::page()['htmlhead'] .= '' . "\r\n";
+ DI::page()['htmlhead'] .= '' . "\r\n";
- $a->page['htmlhead'] .= '' . "\r\n";
+ DI::page()['htmlhead'] .= '' . "\r\n";
}
$s .= '';
- $s .= '' . L10n::t('Jappix Mini') . '
';
+ $s .= '' . DI::l10n()->t('Jappix Mini') . '
';
$s .= '';
$s .= '