X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=jappixmini%2Fjappixmini.php;h=904991534efa35a065e96f8394f8c5354f9b8267;hb=c3e93f1ed9a487f823bcc75ddd43024334c25bfc;hp=adbea67551c90a6cf583e5e5d26a89fdc045494e;hpb=bc637287335bc1341de2f52769312e0a074e3501;p=friendica-addons.git

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index adbea675..90499153 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -63,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');
@@ -76,20 +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 = get_config("jappixmini", "version");
-if ($addon_version==="") set_config("jappixmini", "version", "1");
+$addon_version = Config::get("jappixmini", "version");
+if ($addon_version==="") Config::set("jappixmini", "version", "1");
 }
 
 
@@ -113,33 +116,33 @@ function jappixmini_plugin_admin(&$a, &$o) {
 	}
 
 	// 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 .= "<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 />';
 
 	// 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>';
 
 	// 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>';
 
 	// 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 />';
 
 	// 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>';
 
@@ -156,11 +159,11 @@ function jappixmini_plugin_admin_post(&$a) {
 		$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);
 	}
 }
 
@@ -206,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 = "";
@@ -241,38 +244,38 @@ function jappixmini_init(&$a) {
 function jappixmini_settings(&$a, &$s) {
     // addon settings for a user
 
-    $activate = get_pconfig(local_user(),'jappixmini','activate');
+    $activate = PConfig::get(local_user(),'jappixmini','activate');
     $activate = intval($activate) ? ' checked="checked"' : '';
-    $dontinsertchat = get_pconfig(local_user(),'jappixmini','dontinsertchat');
+    $dontinsertchat = PConfig::get(local_user(),'jappixmini','dontinsertchat');
     $insertchat = !(intval($dontinsertchat) ? ' checked="checked"' : '');
 
-    $defaultbosh = get_config("jappixmini", "bosh_address");
+    $defaultbosh = Config::get("jappixmini", "bosh_address");
 
     if ($defaultbosh != "")
-	set_pconfig(local_user(),'jappixmini','bosh', $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"';
 
     if ($server == "")
-	$server = get_config("jappixmini", "default_server");
+	$server = Config::get("jappixmini", "default_server");
 
-    if (($username == "") and get_config("jappixmini", "default_user"))
+    if (($username == "") && Config::get("jappixmini", "default_user"))
 	$username = $a->user["nickname"];
 
-    $info_text = get_config("jappixmini", "infotext");
+    $info_text = Config::get("jappixmini", "infotext");
     $info_text = htmlentities($info_text);
     $info_text = str_replace("\n", "<br />", $info_text);
 
@@ -294,10 +297,14 @@ function jappixmini_settings(&$a, &$s) {
         $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\r\n";
     }
 
-    $s .= '<div class="settings-block">';
+    $s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
+    $s .= '<h3>'.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>'.t('Jappix Mini').'</h3>';
+    $s .= '</span>';
 
-    $s .= '<h3>'.t('Jappix Mini addon settings').'</h3>';
-    $s .= '<div>';
     $s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>';
     $s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"'.$activate.' />';
     $s .= '<br />';
@@ -311,7 +318,7 @@ function jappixmini_settings(&$a, &$s) {
     $s .= ' <input id="jappixmini-server" type="text" name="jappixmini-server" value="'.$server.'" />';
     $s .= '<br />';
 
-    if (defaultbosh == "") {
+    if ($defaultbosh == "") {
 	$s .= '<label for="jappixmini-bosh">'.t('Jabber BOSH host').'</label>';
 	$s .= ' <input id="jappixmini-bosh" type="text" name="jappixmini-bosh" value="'.$bosh.'" />';
 	$s .= '<br />';
@@ -340,9 +347,8 @@ function jappixmini_settings(&$a, &$s) {
     $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="' . t('Submit') . '" />';
+    $s .= '<input type="submit" name="jappixmini-submit" value="' . t('Save Settings') . '" />';
     $s .= ' <input type="button" value="'.t('Add contact').'" onclick="jappixmini_addon_subscribe();" />';
-    $s .= '</div>';
 
     $s .= '</div>';
 
@@ -406,22 +412,22 @@ 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','dontinsertchat',intval($b['jappixmini-dont-insertchat']));
-		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) {
@@ -436,33 +442,36 @@ function jappixmini_script(&$a,&$s) {
 
     if(! local_user()) return;
 
-    $activate = get_pconfig(local_user(),'jappixmini','activate');
-    $dontinsertchat = get_pconfig(local_user(), 'jappixmini','dontinsertchat');
-    if (!$activate or $dontinsertchat) 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&amp;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&amp;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 = 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';
     }
@@ -482,7 +491,8 @@ function jappixmini_script(&$a,&$s) {
 		dbesc($dfrn_id),
 		dbesc($dfrn_id)
 	);
-	$name = $r[0]["name"];
+	if (count($r))
+		$name = $r[0]["name"];
 
         $value = $row['v'];
         $pos = strpos($value, ":");
@@ -498,7 +508,11 @@ function jappixmini_script(&$a,&$s) {
     // get nickname
     $r = q("SELECT `username` FROM `user` WHERE `uid`=$uid");
     $nickname = json_encode($r[0]["username"]);
-    $groupchats = get_config('jappixmini','groupchats');
+    $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\">
@@ -526,7 +540,7 @@ 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);
+	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'");
@@ -539,7 +553,8 @@ function jappixmini_cron(&$a, $d) {
 		$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;
@@ -559,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"
@@ -578,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;
@@ -616,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");
 		}
 	}
 }