Merge pull request #430 from tobiasd/master

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

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 44b69a4e5843bcd43a2b26ef17a8dd2822474159..370d2c7b7e6a1d550db0fb7656a2488f10298e98 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -269,7 +269,7 @@ function jappixmini_settings(&$a, &$s) {
     if ($server == "")
        $server = get_config("jappixmini", "default_server");
 
-    if (($username == "") and get_config("jappixmini", "default_user"))
+    if (($username == "") && get_config("jappixmini", "default_user"))
        $username = $a->user["nickname"];
 
     $info_text = get_config("jappixmini", "infotext");
@@ -444,7 +444,7 @@ function jappixmini_script(&$a,&$s) {
 
     $activate = get_pconfig(local_user(),'jappixmini','activate');
     $dontinsertchat = get_pconfig(local_user(), 'jappixmini','dontinsertchat');
-    if (!$activate or $dontinsertchat) return;
+    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";