jappixmini: don't tell addresses to other servers if plugin deactivated

[friendica-addons.git] / jappixmini / jappixmini.php

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 3e16a6ab77be00d9943bd3ea672a240df9677c9d..b68114d1d2296020643f7286cedd772491b88e51 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -149,6 +149,10 @@ function jappixmini_init(&$a) {
        } catch (Exception $e) {
        }
 
+       // do not return an address if user deactivated plugin
+       $activated = get_pconfig($uid, 'jappixmini', 'activate');
+       if (!$activated) killme();
+
        // return the requested Jabber address
        try {
                $username = get_pconfig($uid, 'jappixmini', 'username');
@@ -209,6 +213,7 @@ function jappixmini_settings(&$a, &$s) {
     }
 
     $s .= '<div class="settings-block">';
+
     $s .= '<h3>Jappix Mini addon settings</h3>';
     $s .= '<div>';
     $s .= '<label for="jappixmini-activate">Activate addon</label>';
@@ -253,6 +258,8 @@ function jappixmini_settings(&$a, &$s) {
     $s .= ' <input type="button" value="Add contact" onclick="jappixmini_addon_subscribe();" />';
     $s .= '</div>';
 
+    $s .= '</div>';
+
     $a->page['htmlhead'] .= "<script type=\"text/javascript\">
         function jappixmini_set_password() {
             encrypt = document.getElementById('jappixmini-encrypt').checked;
@@ -260,8 +267,11 @@ function jappixmini_settings(&$a, &$s) {
             clear_password = document.getElementById('jappixmini-clear-password');
             if (encrypt) {
                 friendica_password = document.getElementById('jappixmini-friendica-password');
-                jappixmini_addon_set_client_secret(friendica_password.value);
-                password.value = jappixmini_addon_encrypt_password(clear_password.value);
+
+                if (friendica_password) {
+                    jappixmini_addon_set_client_secret(friendica_password.value);
+                    password.value = jappixmini_addon_encrypt_password(clear_password.value);
+                }
             }
             else {
                 password.value = clear_password.value;