Merge pull request #312 from annando/1509-pumpio-sync

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

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 15cbb80c03815d2ed6709bd7c5606d9705299ea5..08d821128db7c34d3ce0507d2db4c40566ebf593 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -295,11 +295,11 @@ function jappixmini_settings(&$a, &$s) {
     }
 
     $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 addon settings').'</h3>';
+    $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 addon settings').'</h3>';
+    $s .= '<h3>'.t('Jappix Mini').'</h3>';
     $s .= '</span>';
 
     $s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>';
@@ -315,7 +315,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 />';
@@ -439,6 +439,9 @@ function jappixmini_script(&$a,&$s) {
 
     if(! local_user()) return;
 
+    if ($_GET["mode"] == "minimal")
+       return;
+
     $activate = get_pconfig(local_user(),'jappixmini','activate');
     $dontinsertchat = get_pconfig(local_user(), 'jappixmini','dontinsertchat');
     if (!$activate or $dontinsertchat) return;
@@ -485,7 +488,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, ":");