<?php
/**
-* Name: jappixmini
-* Description: Provides a Facebook-like chat using Jappix Mini
-* Version: 1.0.1
-* Author: leberwurscht <leberwurscht@hoegners.de>
-*
-*/
-
+ * Name: jappixmini
+ * Description: Provides a Facebook-like chat using Jappix Mini
+ * Version: 1.0.1
+ * Author: leberwurscht <leberwurscht@hoegners.de>
+ *
+ */
//
// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
//
/*
-Problem:
-* jabber password should not be stored on server
-* jabber password should not be sent between server and browser as soon as the user is logged in
-* jabber password should not be reconstructible from communication between server and browser as soon as the user is logged in
+ Problem:
+ * jabber password should not be stored on server
+ * jabber password should not be sent between server and browser as soon as the user is logged in
+ * jabber password should not be reconstructible from communication between server and browser as soon as the user is logged in
-Solution:
-Only store an encrypted version of the jabber password on the server. The encryption key is only available to the browser
-and not to the server (at least as soon as the user is logged in). It can be stored using the jappix setDB function.
+ Solution:
+ Only store an encrypted version of the jabber password on the server. The encryption key is only available to the browser
+ and not to the server (at least as soon as the user is logged in). It can be stored using the jappix setDB function.
-This encryption key could be the friendica password, but then this password would be stored in the browser in cleartext.
-It is better to use a hash of the password.
-The server should not be able to reconstruct the password, so we can't take the same hash the server stores. But we can
- use hash("some_prefix"+password). This will however not work with OpenID logins, for this type of login the password must
-be queried manually.
+ This encryption key could be the friendica password, but then this password would be stored in the browser in cleartext.
+ It is better to use a hash of the password.
+ The server should not be able to reconstruct the password, so we can't take the same hash the server stores. But we can
+ use hash("some_prefix"+password). This will however not work with OpenID logins, for this type of login the password must
+ be queried manually.
-Problem:
-How to discover the jabber addresses of the friendica contacts?
+ Problem:
+ How to discover the jabber addresses of the friendica contacts?
-Solution:
-Each Friendica site with this addon provides a /jappixmini/ module page. We go through our contacts and retrieve
-this information every week using a cron hook.
+ Solution:
+ Each Friendica site with this addon provides a /jappixmini/ module page. We go through our contacts and retrieve
+ this information every week using a cron hook.
-Problem:
-We do not want to make the jabber address public.
+ Problem:
+ We do not want to make the jabber address public.
-Solution:
-When two friendica users connect using DFRN, the relation gets a DFRN ID and a keypair is generated.
-Using this keypair, we can provide the jabber address only to contacts:
+ Solution:
+ When two friendica users connect using DFRN, the relation gets a DFRN ID and a keypair is generated.
+ Using this keypair, we can provide the jabber address only to contacts:
-Alice:
+ Alice:
signed_address = openssl_*_encrypt(alice_jabber_address)
-send signed_address to Bob, who does
+ send signed_address to Bob, who does
trusted_address = openssl_*_decrypt(signed_address)
save trusted_address
encrypted_address = openssl_*_encrypt(bob_jabber_address)
-reply with encrypted_address to Alice, who does
+ reply with encrypted_address to Alice, who does
decrypted_address = openssl_*_decrypt(encrypted_address)
save decrypted_address
-Interface for this:
-GET /jappixmini/?role=%s&signed_address=%s&dfrn_id=%s
+ Interface for this:
+ GET /jappixmini/?role=%s&signed_address=%s&dfrn_id=%s
+
+ Response:
+ json({"status":"ok", "encrypted_address":"%s"})
-Response:
-json({"status":"ok", "encrypted_address":"%s"})
+ */
use Friendica\App;
use Friendica\Core\Addon;
// 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");
-if (!$info_text) set_config("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 = get_config("jappixmini", "bosh_proxy");
-if ($bosh_proxy==="") set_config("jappixmini", "bosh_proxy", "1");
-
-// set addon version so that safe updates are possible later
-$addon_version = get_config("jappixmini", "version");
-if ($addon_version==="") set_config("jappixmini", "version", "1");
+ // set standard configuration
+ $info_text = Config::get("jappixmini", "infotext");
+ if (!$info_text)
+ set_confConfig::setig("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");
+ if ($bosh_proxy === "") {
+ Config::set("jappixmini", "bosh_proxy", "1");
+ }
+
+ // set addon version so that safe updates are possible later
+ $addon_version = Config::get("jappixmini", "version");
+ if ($addon_version === "") {
+ Config::set("jappixmini", "version", "1");
+ }
}
function jappixmini_uninstall()
function jappixmini_addon_admin(App $a, &$o)
{
// display instructions and warnings on addon settings page for admin
-
if (!file_exists("addon/jappixmini.tgz")) {
$o .= '<p><strong style="color:#fff;background-color:#f00">The source archive jappixmini.tgz does not exist. This is probably a violation of the Jappix License (AGPL).</strong></p>';
}
// warn if cron job has not yet been executed
- $cron_run = get_config("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>";
+ $cron_run = 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(get_config("jappixmini", "bosh_proxy"));
+ $bosh_proxy = intval(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 />';
+ $o .= ' <input id="jappixmini-proxy" type="checkbox" name="jappixmini-proxy" value="1"' . $bosh_proxy . ' /><br />';
// bosh address
- $bosh_address = get_config("jappixmini", "bosh_address");
+ $bosh_address = 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>';
+ $o .= '<input id="jappixmini-address" type="text" name="jappixmini-address" value="' . $bosh_address . '" /></p>';
// default server address
- $default_server = get_config("jappixmini", "default_server");
+ $default_server = 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>';
+ $o .= '<input id="jappixmini-server" type="text" name="jappixmini-server" value="' . $default_server . '" /></p>';
// default user name to friendica nickname
- $default_user = intval(get_config("jappixmini", "default_user"));
+ $default_user = intval(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 />';
+ $o .= ' <input id="jappixmini-user" type="checkbox" name="jappixmini-defaultuser" value="1"' . $default_user . ' /><br />';
// info text field
- $info_text = get_config("jappixmini", "infotext");
+ $info_text = 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>';
+ $o .= '<textarea id="jappixmini-infotext" name="jappixmini-infotext" rows="5" cols="50">' . htmlentities($info_text) . '</textarea></p>';
// submit button
$o .= '<input type="submit" name="jappixmini-admin-settings" value="OK" />';
$default_user = intval($_REQUEST['jappixmini-defaultuser']);
$bosh_address = $_REQUEST['jappixmini-address'];
$default_server = $_REQUEST['jappixmini-server'];
- set_config("jappixmini", "infotext", $info_text);
- set_config("jappixmini", "bosh_proxy", $bosh_proxy);
- set_config("jappixmini", "bosh_address", $bosh_address);
- set_config("jappixmini", "default_server", $default_server);
- set_config("jappixmini", "default_user", $default_user);
+ 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);
}
}
-function jappixmini_module() {}
-function jappixmini_init(&$a) {
- // module page where other Friendica sites can submit Jabber addresses to and also can query Jabber addresses
- // of local users
+function jappixmini_module()
+{
+
+}
+function jappixmini_init()
+{
+ // module page where other Friendica sites can submit Jabber addresses to and also can query Jabber addresses
+ // of local users
$dfrn_id = $_REQUEST["dfrn_id"];
- if (!$dfrn_id) killme();
+ if (!$dfrn_id) {
+ killme();
+ }
$role = $_REQUEST["role"];
- if ($role=="pub") {
- $r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1",
- dbesc($dfrn_id)
- );
- if (!count($r)) killme();
+ if ($role == "pub") {
+ $r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1", dbesc($dfrn_id));
+ if (!count($r)) {
+ killme();
+ }
$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",
- dbesc($dfrn_id)
- );
- if (!count($r)) killme();
+ } else if ($role == "prv") {
+ $r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1", dbesc($dfrn_id));
+ if (!count($r)) {
+ killme();
+ }
$encrypt_func = openssl_private_encrypt;
$decrypt_func = openssl_private_decrypt;
$decrypt_func($signed_address, $trusted_address, $key);
$now = intval(time());
- set_pconfig($uid, "jappixmini", "id:$dfrn_id", "$now:$trusted_address");
+ PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$trusted_address");
} catch (Exception $e) {
+
}
// do not return an address if user deactivated addon
// return the requested Jabber address
try {
- $username = get_pconfig($uid, 'jappixmini', 'username');
- $server = get_pconfig($uid, 'jappixmini', 'server');
+ $username = PConfig::get($uid, 'jappixmini', 'username');
+ $server = PConfig::get($uid, 'jappixmini', 'server');
$address = "$username@$server";
$encrypted_address = "";
$encrypted_address_hex = bin2hex($encrypted_address);
- $answer = Array(
- "status"=>"ok",
- "encrypted_address"=>$encrypted_address_hex
- );
+ $answer = [
+ "status" => "ok",
+ "encrypted_address" => $encrypted_address_hex
+ ];
$answer_json = json_encode($answer);
echo $answer_json;
</script>";
}
-function jappixmini_settings_post(&$a,&$b) {
+function jappixmini_settings_post(App $a, &$b)
+{
// save addon settings for a user
-
- if(! local_user()) return;
+ if (!local_user()) {
+ return;
+ }
$uid = local_user();
- if($_POST['jappixmini-submit']) {
+ if ($_POST['jappixmini-submit']) {
$encrypt = intval($b['jappixmini-encrypt']);
if ($encrypt) {
// check that Jabber password was encrypted with correct Friendica password
$friendica_password = trim($b['jappixmini-friendica-password']);
- $encrypted = hash('whirlpool',$friendica_password);
- $r = q("SELECT * FROM `user` WHERE `uid`=$uid AND `password`='%s'",
- dbesc($encrypted)
- );
- if (!count($r)) {
+ if (!User::authenticate((int) $uid, $friendica_password)) {
info("Wrong friendica password!");
return;
}
$purge = intval($b['jappixmini-purge']);
$username = trim($b['jappixmini-username']);
- $old_username = get_pconfig($uid,'jappixmini','username');
- if ($username!=$old_username) $purge = 1;
+ $old_username = PConfig::get($uid, 'jappixmini', 'username');
+ if ($username != $old_username) {
+ $purge = 1;
+ }
$server = trim($b['jappixmini-server']);
- $old_server = get_pconfig($uid,'jappixmini','server');
- if ($server!=$old_server) $purge = 1;
-
- set_pconfig($uid,'jappixmini','username',$username);
- set_pconfig($uid,'jappixmini','server',$server);
- set_pconfig($uid,'jappixmini','bosh',trim($b['jappixmini-bosh']));
- set_pconfig($uid,'jappixmini','password',trim($b['jappixmini-encrypted-password']));
- set_pconfig($uid,'jappixmini','autosubscribe',intval($b['jappixmini-autosubscribe']));
- set_pconfig($uid,'jappixmini','autoapprove',intval($b['jappixmini-autoapprove']));
- set_pconfig($uid,'jappixmini','activate',intval($b['jappixmini-activate']));
- set_pconfig($uid,'jappixmini','dontinsertchat',intval($b['jappixmini-dont-insertchat']));
- set_pconfig($uid,'jappixmini','encrypt',$encrypt);
- info( 'Jappix Mini settings saved.' );
+ $old_server = 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);
+ info('Jappix Mini settings saved.');
if ($purge) {
q("DELETE FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
- info( 'List of addresses purged.' );
+ info('List of addresses purged.');
}
}
}
-function jappixmini_script(&$a,&$s) {
- // adds the script to the page header which starts Jappix Mini
+function jappixmini_script(App $a)
+{
+ // adds the script to the page header which starts Jappix Mini
+ if (!local_user()) {
+ return;
+ }
- if(! local_user()) return;
+ if ($_GET["mode"] == "minimal") {
+ return;
+ }
- if ($_GET["mode"] == "minimal")
- return;
+ $activate = PConfig::get(local_user(), 'jappixmini', 'activate');
+ $dontinsertchat = PConfig::get(local_user(), 'jappixmini', 'dontinsertchat');
+ if (!$activate || $dontinsertchat) {
+ return;
+ }
+
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&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&f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
- $activate = get_pconfig(local_user(),'jappixmini','activate');
- $dontinsertchat = get_pconfig(local_user(), 'jappixmini','dontinsertchat');
- if (!$activate || $dontinsertchat) return;
-
- $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&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&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";
-
- $username = get_pconfig(local_user(),'jappixmini','username');
- $username = str_replace("'", "\\'", $username);
- $server = get_pconfig(local_user(),'jappixmini','server');
- $server = str_replace("'", "\\'", $server);
- $bosh = get_pconfig(local_user(),'jappixmini','bosh');
- $bosh = str_replace("'", "\\'", $bosh);
- $encrypt = get_pconfig(local_user(),'jappixmini','encrypt');
- $encrypt = intval($encrypt);
- $password = get_pconfig(local_user(),'jappixmini','password');
- $password = str_replace("'", "\\'", $password);
-
- $autoapprove = get_pconfig(local_user(),'jappixmini','autoapprove');
- $autoapprove = intval($autoapprove);
- $autosubscribe = get_pconfig(local_user(),'jappixmini','autosubscribe');
- $autosubscribe = intval($autosubscribe);
-
- // set proxy if necessary
- $use_proxy = get_config('jappixmini','bosh_proxy');
- if ($use_proxy) {
- $proxy = $a->get_baseurl().'/addon/jappixmini/proxy.php';
- }
- else {
- $proxy = "";
- }
-
- // get a list of jabber accounts of the contacts
- $contacts = Array();
- $uid = local_user();
- $rows = q("SELECT * FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
- foreach ($rows as $row) {
- $key = $row['k'];
- $pos = strpos($key, ":");
- $dfrn_id = substr($key, $pos+1);
- $r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND (`dfrn-id`='%s' OR `issued-id`='%s')",
- dbesc($dfrn_id),
- dbesc($dfrn_id)
- );
- if (count($r))
- $name = $r[0]["name"];
-
- $value = $row['v'];
- $pos = strpos($value, ":");
- $address = substr($value, $pos+1);
- if (!$address) continue;
- if (!$name) $name = $address;
-
- $contacts[$address] = $name;
- }
- $contacts_json = json_encode($contacts);
- $contacts_hash = sha1($contacts_json);
-
- // get nickname
- $r = q("SELECT `username` FROM `user` WHERE `uid`=$uid");
- $nickname = json_encode($r[0]["username"]);
- $groupchats = get_config('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\">
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+
+ $username = PConfig::get(local_user(), 'jappixmini', 'username');
+ $username = str_replace("'", "\\'", $username);
+ $server = PConfig::get(local_user(), 'jappixmini', 'server');
+ $server = str_replace("'", "\\'", $server);
+ $bosh = PConfig::get(local_user(), 'jappixmini', 'bosh');
+ $bosh = str_replace("'", "\\'", $bosh);
+ $encrypt = PConfig::get(local_user(), 'jappixmini', 'encrypt');
+ $encrypt = intval($encrypt);
+ $password = PConfig::get(local_user(), 'jappixmini', 'password');
+ $password = str_replace("'", "\\'", $password);
+
+ $autoapprove = PConfig::get(local_user(), 'jappixmini', 'autoapprove');
+ $autoapprove = intval($autoapprove);
+ $autosubscribe = PConfig::get(local_user(), 'jappixmini', 'autosubscribe');
+ $autosubscribe = intval($autosubscribe);
+
+ // set proxy if necessary
+ $use_proxy = Config::get('jappixmini', 'bosh_proxy');
+ if ($use_proxy) {
+ $proxy = $a->get_baseurl() . '/addon/jappixmini/proxy.php';
+ } else {
+ $proxy = "";
+ }
+
+ // get a list of jabber accounts of the contacts
+ $contacts = [];
+ $uid = local_user();
+ $rows = q("SELECT * FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
+ foreach ($rows as $row) {
+ $key = $row['k'];
+ $pos = strpos($key, ":");
+ $dfrn_id = substr($key, $pos + 1);
+ $r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND (`dfrn-id`='%s' OR `issued-id`='%s')", dbesc($dfrn_id), dbesc($dfrn_id));
+ if (count($r))
+ $name = $r[0]["name"];
+
+ $value = $row['v'];
+ $pos = strpos($value, ":");
+ $address = substr($value, $pos + 1);
+ if (!$address) {
+ continue;
+ }
+ if (!$name) {
+ $name = $address;
+ }
+
+ $contacts[$address] = $name;
+ }
+ $contacts_json = json_encode($contacts);
+ $contacts_hash = sha1($contacts_json);
+
+ // get nickname
+ $r = q("SELECT `username` FROM `user` WHERE `uid`=$uid");
+ $nickname = json_encode($r[0]["username"]);
+ $groupchats = 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\">
jQuery(document).ready(function() {
jappixmini_addon_start('$server', '$username', '$proxy', '$bosh', $encrypt, '$password', $nickname, $contacts_json, '$contacts_hash', $autoapprove, $autosubscribe, $groupchats);
});
</script>";
- return;
+ return;
}
-function jappixmini_login(&$a, &$o) {
- // 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->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&f=datastore.js~jsjac.js"></script>'."\r\n";
+function jappixmini_login(App $a, &$o)
+{
+ // 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->get_baseurl() . '/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->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\r\n";
+ // for jappixmini_addon_set_client_secret
+ $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/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);
+ // 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(&$a, $d) {
+function jappixmini_cron(App $a, $d)
+{
// For autosubscribe/autoapprove, we need to maintain a list of jabber addresses of our contacts.
-
- set_config("jappixmini", "last_cron_execution", $d);
+ 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'");
- logger("jappixmini: Update list of contacts' jabber accounts for ".count($users)." users.");
+ logger("jappixmini: Update list of contacts' jabber accounts for " . count($users) . " users.");
- if(! count($users))
+ if (!count($users)) {
return;
+ }
foreach ($users as $row) {
$uid = $row["uid"];
intval($uid), dbesc(NETWORK_DFRN));
foreach ($contacts as $contact_row) {
$request = $contact_row["request"];
- if (!$request) continue;
+ if (!$request) {
+ continue;
+ }
$dfrn_id = $contact_row["dfrn-id"];
if ($dfrn_id) {
}
// check if jabber address already present
- $present = get_pconfig($uid, "jappixmini", "id:".$dfrn_id);
+ $present = PConfig::get($uid, "jappixmini", "id:" . $dfrn_id);
$now = intval(time());
if ($present) {
// $present has format "timestamp:jabber_address"
// do not re-retrieve jabber address if last retrieval
// is not older than a week
- if ($now-$timestamp<3600*24*7) continue;
+ if ($now - $timestamp < 3600 * 24 * 7) {
+ continue;
+ }
}
// construct base retrieval address
$pos = strpos($request, "/dfrn_request/");
- if ($pos===false) continue;
+ if ($pos === false) {
+ continue;
+ }
- $base = substr($request, 0, $pos)."/jappixmini?role=$role";
+ $base = substr($request, 0, $pos) . "/jappixmini?role=$role";
// construct own address
- $username = get_pconfig($uid, 'jappixmini', 'username');
- if (!$username) continue;
- $server = get_pconfig($uid, 'jappixmini', 'server');
- if (!$server) continue;
+ $username = PConfig::get($uid, 'jappixmini', 'username');
+ if (!$username) {
+ continue;
+ }
+ $server = PConfig::get($uid, 'jappixmini', 'server');
+ if (!$server) {
+ continue;
+ }
- $address = $username."@".$server;
+ $address = $username . "@" . $server;
// sign address
$signed_address = "";
// construct request url
$signed_address_hex = bin2hex($signed_address);
- $url = $base."&signed_address=$signed_address_hex&dfrn_id=".urlencode($dfrn_id);
+ $url = $base . "&signed_address=$signed_address_hex&dfrn_id=" . urlencode($dfrn_id);
try {
// send request
// parse answer
$answer = json_decode($answer_json);
- if ($answer->status != "ok") throw new Exception();
+ if ($answer->status != "ok") {
+ throw new Exception();
+ }
$encrypted_address_hex = $answer->encrypted_address;
- if (!$encrypted_address_hex) throw new Exception();
+ if (!$encrypted_address_hex) {
+ throw new Exception();
+ }
$encrypted_address = hex2bin($encrypted_address_hex);
- if (!$encrypted_address) throw new Exception();
+ if (!$encrypted_address) {
+ throw new Exception();
+ }
// decrypt address
$decrypted_address = "";
$decrypt_func($encrypted_address, $decrypted_address, $key);
- if (!$decrypted_address) throw new Exception();
+ if (!$decrypted_address) {
+ throw new Exception();
+ }
} catch (Exception $e) {
$decrypted_address = "";
}
// save address
- set_pconfig($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address");
+ PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address");
}
}
}
-function jappixmini_download_source(&$a,&$b) {
+function jappixmini_download_source(App $a, &$b)
+{
// 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->get_baseurl().'/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="'.$a->get_baseurl().'/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
- $b .= '<p>You can download the <a href="'
.$a->get_baseurl().'/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="' . $a->get_baseurl() . '/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="' . $a->get_baseurl() . '/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
+ $b .= '<p>You can download the <a href="'
. $a->get_baseurl() . '/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>';
}
projects / friendica-addons.git / blobdiff