*/
use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
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");
+ $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");
}
}
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)
}
// 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 .= "<p><strong>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.</strong></p>";
}
// 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 .= '<label for="jappixmini-proxy">Activate BOSH proxy</label>';
$o .= ' <input id="jappixmini-proxy" type="checkbox" name="jappixmini-proxy" value="1"' . $bosh_proxy . ' /><br />';
// bosh address
- $bosh_address = Config::get("jappixmini", "bosh_address");
+ $bosh_address = DI::config()->get("jappixmini", "bosh_address");
$o .= '<p><label for="jappixmini-address">Adress of the default BOSH proxy. If enabled it overrides the user settings:</label><br />';
$o .= '<input id="jappixmini-address" type="text" name="jappixmini-address" value="' . $bosh_address . '" /></p>';
// default server address
- $default_server = Config::get("jappixmini", "default_server");
+ $default_server = DI::config()->get("jappixmini", "default_server");
$o .= '<p><label for="jappixmini-server">Adress of the default jabber server:</label><br />';
$o .= '<input id="jappixmini-server" type="text" name="jappixmini-server" value="' . $default_server . '" /></p>';
// 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 .= '<label for="jappixmini-user">Set the default username to the nickname:</label>';
$o .= ' <input id="jappixmini-user" type="checkbox" name="jappixmini-defaultuser" value="1"' . $default_user . ' /><br />';
// info text field
- $info_text = Config::get("jappixmini", "infotext");
+ $info_text = DI::config()->get("jappixmini", "infotext");
$o .= '<p><label for="jappixmini-infotext">Info text to help users with configuration (important if you want to provide your own BOSH host!):</label><br />';
$o .= '<textarea id="jappixmini-infotext" name="jappixmini-infotext" rows="5" cols="50">' . htmlentities($info_text) . '</textarea></p>';
$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);
}
}
// 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;
- $decrypt_func = openssl_public_decrypt;
+ $encrypt_func = 'openssl_public_encrypt';
+ $decrypt_func = 'openssl_public_decrypt';
$key = $r[0]["pubkey"];
} 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;
+ $encrypt_func = 'openssl_private_encrypt';
+ $decrypt_func = 'openssl_private_decrypt';
$key = $r[0]["prvkey"];
} else {
- killme();
+ exit();
}
$uid = $r[0]["uid"];
$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 = "";
$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");
+ $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", "<br />", $info_text);
if (!$activate) {
// load scripts if not yet activated so that password can be saved
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&g=mini.xml"></script>' . "\r\n";
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
+ DI::page()['htmlhead'] .= '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/jappixmini/jappix/php/get.php?t=js&g=mini.xml"></script>' . "\r\n";
+ DI::page()['htmlhead'] .= '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/jappixmini/jappix/php/get.php?t=js&f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+ DI::page()['htmlhead'] .= '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/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 .= '<h3>' . DI::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 .= '<h3>' . DI::l10n()->t('Jappix Mini') . '</h3>';
$s .= '</span>';
- $s .= '<label for="jappixmini-activate">' . L10n::t('Activate addon') . '</label>';
+ $s .= '<label for="jappixmini-activate">' . DI::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 .= '<label for"jappixmini-dont-insertchat">' . DI::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 .= '<label for="jappixmini-username">' . DI::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 .= '<label for="jappixmini-server">' . DI::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 .= '<label for="jappixmini-bosh">' . DI::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">' . L10n::t('Jabber password') . '</label>';
+ $s .= '<label for="jappixmini-password">' . DI::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 .= '<label for="jappixmini-encrypt">' . DI::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 .= '<label for="jappixmini-friendica-password">' . DI::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 .= '<label for="jappixmini-autoapprove">' . DI::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 .= '<label for="jappixmini-autosubscribe">' . DI::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 .= '<label for="jappixmini-purge">' . DI::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 .= '<input type="submit" name="jappixmini-submit" value="' . DI::l10n()->t('Save Settings') . '" />';
+ $s .= ' <input type="button" value="' . DI::l10n()->t('Add contact') . '" onclick="jappixmini_addon_subscribe();" />';
$s .= '</div>';
- $a->page['htmlhead'] .= "<script type=\"text/javascript\">
+ DI::page()['htmlhead'] .= "<script type=\"text/javascript\">
function jappixmini_set_password() {
encrypt = document.getElementById('jappixmini-encrypt').checked;
password = document.getElementById('jappixmini-password');
$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) {
return;
}
- if (defaults($_GET, "mode", '') == "minimal") {
+ if (($_GET['mode'] ?? '') == 'minimal') {
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;
}
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&g=mini.xml"></script>' . "\r\n";
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
+ DI::page()['htmlhead'] .= '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/jappixmini/jappix/php/get.php?t=js&g=mini.xml"></script>' . "\r\n";
+ DI::page()['htmlhead'] .= '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/jappixmini/jappix/php/get.php?t=js&f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+ 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
- $use_proxy = Config::get('jappixmini', 'bosh_proxy');
+ $use_proxy = DI::config()->get('jappixmini', 'bosh_proxy');
if ($use_proxy) {
- $proxy = $a->getBaseURL() . '/addon/jappixmini/proxy.php';
+ $proxy = DI::baseUrl()->get() . '/addon/jappixmini/proxy.php';
} else {
$proxy = "";
}
// 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 = "{}";
}
// add javascript to start Jappix Mini
- $a->page['htmlhead'] .= "<script type=\"text/javascript\">
+ DI::page()['htmlhead'] .= "<script type=\"text/javascript\">
jQuery(document).ready(function() {
jappixmini_addon_start('$server', '$username', '$proxy', '$bosh', $encrypt, '$password', $nickname, $contacts_json, '$contacts_hash', $autoapprove, $autosubscribe, $groupchats);
});
{
// create client secret on login to be able to encrypt jabber passwords
// for setDB and str_sha1, needed by jappixmini_addon_set_client_secret
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&f=datastore.js~jsjac.js"></script>' . "\r\n";
+ DI::page()['htmlhead'] .= '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/jappixmini/jappix/php/get.php?t=js&f=datastore.js~jsjac.js"></script>' . "\r\n";
// for jappixmini_addon_set_client_secret
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+ DI::page()['htmlhead'] .= '<script type="text/javascript" src="' . DI::baseUrl()->get() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
// save hash of password
$o = str_replace("<form ", "<form onsubmit=\"jappixmini_addon_set_client_secret(this.elements['id_password'].value);return true;\" ", $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'");
$dfrn_id = $contact_row["dfrn-id"];
if ($dfrn_id) {
$key = $contact_row["pubkey"];
- $encrypt_func = openssl_public_encrypt;
- $decrypt_func = openssl_public_decrypt;
+ $encrypt_func = 'openssl_public_encrypt';
+ $decrypt_func = 'openssl_public_decrypt';
$role = "prv";
} else {
$dfrn_id = $contact_row["issued-id"];
$key = $contact_row["prvkey"];
- $encrypt_func = openssl_private_encrypt;
- $decrypt_func = openssl_private_decrypt;
+ $encrypt_func = 'openssl_private_encrypt';
+ $decrypt_func = 'openssl_private_decrypt';
$role = "pub";
}
// 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"
$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;
}
// parse answer
$answer = json_decode($answer_json);
- if ($answer->status != "ok") {
+ if (empty($answer->status) || ($answer->status != "ok")) {
throw new Exception();
}
}
// save address
- PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address");
+ DI::pConfig()->set($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address");
}
}
}
{
// Jappix Mini source download link on About page
$b .= '<h1>Jappix Mini</h1>';
- $b .= '<p>This site uses the jappixmini addon, which includes Jappix Mini by the <a href="' . $a->getBaseURL() . '/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="' . $a->getBaseURL() . '/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
- $b .= '<p>You can download the <a href="' .
$a->getBaseURL() . '/addon/jappixmini.tgz">source code of the addon</a>. The rest of Friendica is distributed under compatible licenses and can be retrieved from <a href="https://github.com/friendica/friendica">https://github.com/friendica/friendica</a> and <a href="https://github.com/friendica/friendica-addons">https://github.com/friendica/friendica-addons</a></p>';
+ $b .= '<p>This site uses the jappixmini addon, which includes Jappix Mini by the <a href="' . DI::baseUrl()->get() . '/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="' . DI::baseUrl()->get() . '/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
+ $b .= '<p>You can download the <a href="' .
DI::baseUrl()->get() . '/addon/jappixmini.tgz">source code of the addon</a>. The rest of Friendica is distributed under compatible licenses and can be retrieved from <a href="https://github.com/friendica/friendica">https://github.com/friendica/friendica</a> and <a href="https://github.com/friendica/friendica-addons">https://github.com/friendica/friendica-addons</a></p>';
}
https://reisub.nsupdate.info/git / friendica-addons.git / .git / blobdiff