- Fix encoding error in Chat + Feed + WidgetCommon

system/Widget/WidgetCommon.php

@@ -286,7 +286,7 @@ class WidgetCommon extends WidgetBase {
             $p->setTo($to)
               ->setFrom($this->user->getLogin())
               ->setParentId($id)
-              ->setContent(htmlentities(rawurldecode($content)))
+              ->setContent(htmlspecialchars(rawurldecode($content)))
               ->request();
         }
     }

system/Widget/widgets/Chat/Chat.php

@@ -75,7 +75,8 @@ class Chat extends WidgetBase
                                             'jid' => $jid));
         $contact = Contact::run_query($query);
 
-        $contact = $contact[0];
+        if($contact)
+            $contact = $contact[0];
         
         if($contact->getData('chaton') == 0) {
             RPC::call('movim_prepend',
@@ -211,7 +212,7 @@ class Chat extends WidgetBase
         $this->onMessage($m);
              
 		// We decode URL codes to send the correct message to the XMPP server
-        moxl\message($to, rawurldecode($message));
+        moxl\message($to, htmlspecialchars(rawurldecode($message)));
     }
     
 	/**

system/Widget/widgets/ContactSummary/ContactSummary.php

@@ -48,8 +48,6 @@ class ContactSummary extends WidgetBase
     }
 
     function ajaxRemoveContact($jid) {
-        //$this->xmpp->removeContact($jid
-        
 		if(checkJid($jid)) {            
             $r = new moxl\RosterRemoveItem();
             $r->setTo($jid)

system/Widget/widgets/Feed/Feed.php

@@ -109,7 +109,7 @@ class Feed extends WidgetCommon {
             $p = new moxl\MicroblogPostPublish();
             $p->setTo($this->user->getLogin())
               ->setId($id)
-              ->setContent(htmlentities(rawurldecode($content)))
+              ->setContent(htmlspecialchars(rawurldecode($content)))
               ->request();
         }
     }

system/Widget/widgets/Login/Login.php

@@ -171,7 +171,7 @@ class Login extends WidgetBase {
                     'rid' => 1,
                     'sid' => 0,
                     'id'  => 0,
-                    'url' => 'http://'.$serverconfig['defBoshHost'].':'.$serverconfig['defBoshPort'].'/'.$serverconfig['defBoshSuffix'],
+                    'url' => 'http://'.$serverconfig['defBoshHost'].':'.$serverconfig['defBoshPort'].'/'.$serverconfig['defBoshSuffix'].'/',
                     'port'=> 5222,
                     'host'=> $host,
                     'domain' => $domain,

system/Widget/widgets/Notifs/Notifs.php

@@ -85,6 +85,10 @@ class Notifs extends WidgetBase
 			$p = new moxl\PresenceSubscribed();
             $p->setTo($jid)
               ->request();
+              
+			/*$p = new moxl\PresenceSubscribe();
+            $p->setTo($jid)
+              ->request();*/
 		} else {
 			throw new MovimException("Incorrect JID `$jid'");
 		}