X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=jappixmini%2Fjappixmini.php;h=904991534efa35a065e96f8394f8c5354f9b8267;hb=c3e93f1ed9a487f823bcc75ddd43024334c25bfc;hp=4c3ebcc47f1b364064dee3ad210f3d6234b341f0;hpb=fb7f2b1122c19eae058482ac4c86cf0d9f55d082;p=friendica-addons.git diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 4c3ebcc4..90499153 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -1,14 +1,19 @@ * */ +// +// Copyright 2012 "Leberwurscht" +// +// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING). +// + /* Problem: @@ -58,6 +63,9 @@ json({"status":"ok", "encrypted_address":"%s"}) */ +use Friendica\Core\Config; +use Friendica\Core\PConfig; + function jappixmini_install() { register_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings'); register_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post'); @@ -71,16 +79,20 @@ register_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron'); register_hook('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", +$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 = get_config("jappixmini", "bosh_proxy"); -if ($bosh_proxy==="") set_config("jappixmini", "bosh_proxy", 1); +$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"); } @@ -99,43 +111,38 @@ unregister_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_dow function jappixmini_plugin_admin(&$a, &$o) { // display instructions and warnings on addon settings page for admin - if (!file_exists("addon/jappixmini/jappix")) { - $o .= '

You need to install the Jappix application (see README).

'; - } - else if (file_exists("addon/jappixmini/jappix/index.php")) { - // try to delete automatically - try { - unlink("addon/jappixmini/jappix/index.php"); - } - catch (Exception $e) {} - - // warn admin if this is not possible - if (file_exists("addon/jappixmini/jappix/index.php")) - $o .= '

You must delete addon/jappixmini/jappix/index.php (see README).

'; - else { - info("Deleted addon/jappixmini/jappix/index.php automatically."); - $o .= '

Jappix is installed.

'; - } - } - else if (!file_exists("addon/jappixmini/jappix.zip")) { - $o .= '

The source archive jappix.zip does not exist. This is probably a violation of the Jappix License (see README).

'; - } - else { - $o .= '

Jappix is installed.

'; + if (!file_exists("addon/jappixmini.tgz")) { + $o .= '

The source archive jappixmini.tgz does not exist. This is probably a violation of the Jappix License (AGPL).

'; } // warn if cron job has not yet been executed - $cron_run = get_config("jappixmini", "last_cron_execution"); + $cron_run = 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(get_config("jappixmini", "bosh_proxy")); + $bosh_proxy = intval(Config::get("jappixmini", "bosh_proxy")); $bosh_proxy = intval($bosh_proxy) ? ' checked="checked"' : ''; $o .= ''; $o .= '
'; + // bosh address + $bosh_address = Config::get("jappixmini", "bosh_address"); + $o .= '


'; + $o .= '

'; + + // default server address + $default_server = Config::get("jappixmini", "default_server"); + $o .= '


'; + $o .= '

'; + + // default user name to friendica nickname + $default_user = intval(Config::get("jappixmini", "default_user")); + $default_user = intval($default_user) ? ' checked="checked"' : ''; + $o .= ''; + $o .= '
'; + // info text field - $info_text = get_config("jappixmini", "infotext"); + $info_text = Config::get("jappixmini", "infotext"); $o .= '


'; $o .= '

'; @@ -149,8 +156,14 @@ function jappixmini_plugin_admin_post(&$a) { if ($submit) { $info_text = $_REQUEST['jappixmini-infotext']; $bosh_proxy = intval($_REQUEST['jappixmini-proxy']); - set_config("jappixmini", "infotext", $info_text); - set_config("jappixmini", "bosh_proxy", $bosh_proxy); + $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); } } @@ -159,8 +172,6 @@ function jappixmini_init(&$a) { // module page where other Friendica sites can submit Jabber addresses to and also can query Jabber addresses // of local users - if (!file_exists("addon/jappixmini/jappix")) killme(); - $dfrn_id = $_REQUEST["dfrn_id"]; if (!$dfrn_id) killme(); @@ -198,18 +209,18 @@ function jappixmini_init(&$a) { $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 plugin - $activated = get_pconfig($uid, 'jappixmini', 'activate'); + $activated = PConfig::get($uid, 'jappixmini', 'activate'); if (!$activated) killme(); // 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 = ""; @@ -233,30 +244,51 @@ function jappixmini_init(&$a) { function jappixmini_settings(&$a, &$s) { // addon settings for a user - if (!file_exists("addon/jappixmini/jappix")) return; - - $activate = get_pconfig(local_user(),'jappixmini','activate'); + $activate = PConfig::get(local_user(),'jappixmini','activate'); $activate = intval($activate) ? ' checked="checked"' : ''; + $dontinsertchat = 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); - $username = get_pconfig(local_user(),'jappixmini','username'); + $username = PConfig::get(local_user(),'jappixmini','username'); $username = htmlentities($username); - $server = get_pconfig(local_user(),'jappixmini','server'); + $server = PConfig::get(local_user(),'jappixmini','server'); $server = htmlentities($server); - $bosh = get_pconfig(local_user(),'jappixmini','bosh'); + $bosh = PConfig::get(local_user(),'jappixmini','bosh'); $bosh = htmlentities($bosh); - $password = get_pconfig(local_user(),'jappixmini','password'); - $autosubscribe = get_pconfig(local_user(),'jappixmini','autosubscribe'); + $password = PConfig::get(local_user(),'jappixmini','password'); + $autosubscribe = PConfig::get(local_user(),'jappixmini','autosubscribe'); $autosubscribe = intval($autosubscribe) ? ' checked="checked"' : ''; - $autoapprove = get_pconfig(local_user(),'jappixmini','autoapprove'); + $autoapprove = PConfig::get(local_user(),'jappixmini','autoapprove'); $autoapprove = intval($autoapprove) ? ' checked="checked"' : ''; - $encrypt = intval(get_pconfig(local_user(),'jappixmini','encrypt')); + $encrypt = intval(PConfig::get(local_user(),'jappixmini','encrypt')); $encrypt_checked = $encrypt ? ' checked="checked"' : ''; $encrypt_disabled = $encrypt ? '' : ' disabled="disabled"'; - $info_text = get_config("jappixmini", "infotext"); + if ($server == "") + $server = Config::get("jappixmini", "default_server"); + + if (($username == "") && Config::get("jappixmini", "default_user")) + $username = $a->user["nickname"]; + + $info_text = Config::get("jappixmini", "infotext"); $info_text = htmlentities($info_text); $info_text = str_replace("\n", "
", $info_text); + // count contacts + $r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%'", local_user()); + if (count($r)) $contact_cnt = $r[0]["cnt"]; + else $contact_cnt = 0; + + // count jabber addresses + $r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%' AND `v` LIKE '%%@%%'", local_user()); + if (count($r)) $address_cnt = $r[0]["cnt"]; + else $address_cnt = 0; + if (!$activate) { // load scripts if not yet activated so that password can be saved $a->page['htmlhead'] .= ''."\r\n"; @@ -265,48 +297,58 @@ function jappixmini_settings(&$a, &$s) { $a->page['htmlhead'] .= ''."\r\n"; } - $s .= '
'; + $s .= ''; + $s .= '

'.t('Jappix Mini').'

'; + $s .= ''; + $s .= ''; @@ -349,8 +391,6 @@ function jappixmini_settings(&$a, &$s) { function jappixmini_settings_post(&$a,&$b) { // save addon settings for a user - if (!file_exists("addon/jappixmini/jappix")) return; - if(! local_user()) return; $uid = local_user(); @@ -372,25 +412,26 @@ function jappixmini_settings_post(&$a,&$b) { $purge = intval($b['jappixmini-purge']); $username = trim($b['jappixmini-username']); - $old_username = get_pconfig($uid,'jappixmini','username'); + $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'); + $old_server = PConfig::get($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','encrypt',$encrypt); + 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%%'"); + q("DELETE FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'"); info( 'List of addresses purged.' ); } } @@ -399,35 +440,38 @@ function jappixmini_settings_post(&$a,&$b) { function jappixmini_script(&$a,&$s) { // adds the script to the page header which starts Jappix Mini - if (!file_exists("addon/jappixmini/jappix")) return; if(! local_user()) return; - $activate = get_pconfig(local_user(),'jappixmini','activate'); - if (!$activate) 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'] .= ''."\r\n"; $a->page['htmlhead'] .= ''."\r\n"; $a->page['htmlhead'] .= ''."\r\n"; - $username = get_pconfig(local_user(),'jappixmini','username'); + $username = PConfig::get(local_user(),'jappixmini','username'); $username = str_replace("'", "\\'", $username); - $server = get_pconfig(local_user(),'jappixmini','server'); + $server = PConfig::get(local_user(),'jappixmini','server'); $server = str_replace("'", "\\'", $server); - $bosh = get_pconfig(local_user(),'jappixmini','bosh'); + $bosh = PConfig::get(local_user(),'jappixmini','bosh'); $bosh = str_replace("'", "\\'", $bosh); - $encrypt = get_pconfig(local_user(),'jappixmini','encrypt'); + $encrypt = PConfig::get(local_user(),'jappixmini','encrypt'); $encrypt = intval($encrypt); - $password = get_pconfig(local_user(),'jappixmini','password'); + $password = PConfig::get(local_user(),'jappixmini','password'); $password = str_replace("'", "\\'", $password); - $autoapprove = get_pconfig(local_user(),'jappixmini','autoapprove'); + $autoapprove = PConfig::get(local_user(),'jappixmini','autoapprove'); $autoapprove = intval($autoapprove); - $autosubscribe = get_pconfig(local_user(),'jappixmini','autosubscribe'); + $autosubscribe = PConfig::get(local_user(),'jappixmini','autosubscribe'); $autosubscribe = intval($autosubscribe); // set proxy if necessary - $use_proxy = get_config('jappixmini','bosh_proxy'); + $use_proxy = Config::get('jappixmini','bosh_proxy'); if ($use_proxy) { $proxy = $a->get_baseurl().'/addon/jappixmini/proxy.php'; } @@ -438,16 +482,17 @@ function jappixmini_script(&$a,&$s) { // 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%%'"); + $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'", + $r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND (`dfrn-id`='%s' OR `issued-id`='%s')", dbesc($dfrn_id), dbesc($dfrn_id) ); - $name = $r[0]["name"]; + if (count($r)) + $name = $r[0]["name"]; $value = $row['v']; $pos = strpos($value, ":"); @@ -463,11 +508,16 @@ function jappixmini_script(&$a,&$s) { // 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'] .= ""; @@ -477,8 +527,6 @@ function jappixmini_script(&$a,&$s) { function jappixmini_login(&$a, &$o) { // create client secret on login to be able to encrypt jabber passwords - if (!file_exists("addon/jappixmini/jappix")) return; - // for setDB and str_sha1, needed by jappixmini_addon_set_client_secret $a->page['htmlhead'] .= ''."\r\n"; @@ -492,19 +540,21 @@ function jappixmini_login(&$a, &$o) { function jappixmini_cron(&$a, $d) { // For autosubscribe/autoapprove, we need to maintain a list of jabber addresses of our contacts. - set_config("jappixmini", "last_cron_execution", $d); - - if (!file_exists("addon/jappixmini/jappix")) return; + 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."); + if(! count($users)) + return; + foreach ($users as $row) { $uid = $row["uid"]; // for each user, go through list of contacts - $contacts = q("SELECT * FROM `contact` WHERE `uid`=%d AND ((LENGTH(`dfrn-id`) AND LENGTH(`pubkey`)) OR (LENGTH(`issued-id`) AND LENGTH(`prvkey`)))", intval($uid)); + $contacts = q("SELECT * FROM `contact` WHERE `uid`=%d AND ((LENGTH(`dfrn-id`) AND LENGTH(`pubkey`)) OR (LENGTH(`issued-id`) AND LENGTH(`prvkey`))) AND `network` = '%s'", + intval($uid), dbesc(NETWORK_DFRN)); foreach ($contacts as $contact_row) { $request = $contact_row["request"]; if (!$request) continue; @@ -524,7 +574,7 @@ function jappixmini_cron(&$a, $d) { } // 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" @@ -543,9 +593,9 @@ function jappixmini_cron(&$a, $d) { $base = substr($request, 0, $pos)."/jappixmini?role=$role"; // construct own address - $username = get_pconfig($uid, 'jappixmini', 'username'); + $username = PConfig::get($uid, 'jappixmini', 'username'); if (!$username) continue; - $server = get_pconfig($uid, 'jappixmini', 'server'); + $server = PConfig::get($uid, 'jappixmini', 'server'); if (!$server) continue; $address = $username."@".$server; @@ -581,7 +631,7 @@ function jappixmini_cron(&$a, $d) { } // save address - set_pconfig($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address"); + PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address"); } } } @@ -589,9 +639,7 @@ function jappixmini_cron(&$a, $d) { function jappixmini_download_source(&$a,&$b) { // Jappix Mini source download link on About page - if (!file_exists("addon/jappixmini/jappix")) return; - $b .= '

Jappix Mini

'; - $b .= '

This site uses Jappix Mini by the Jappix authors, which is distributed under the terms of the GNU Affero General Public License.

'; - $b .= '

You can download the source code.

'; + $b .= '

This site uses the jappixmini addon, which includes Jappix Mini by the Jappix authors and is distributed under the terms of the GNU Affero General Public License.

'; + $b .= '

You can download the source code of the addon. The rest of Friendica is distributed under compatible licenses and can be retrieved from https://github.com/friendica/friendica and https://github.com/friendica/friendica-addons

'; }