From a6b322b178e49af012b0b38a2d15bd551e552221 Mon Sep 17 00:00:00 2001
From: src386 <utman002@src386.org>
Date: Thu, 17 Mar 2016 13:44:43 +0100
Subject: [PATCH] update to movim upstream

---
 sources/app/assets/js/movim_electron.js       | 13 +++++
 sources/app/helpers/StringHelper.php          | 50 ++++---------------
 sources/app/models/message/Message.php        |  4 +-
 .../widgets/AccountNext/_accountnext_oob.tpl  |  5 +-
 .../app/widgets/Contact/_contact_explore.tpl  |  2 +-
 .../app/widgets/Contact/_contact_public.tpl   | 13 +++--
 sources/app/widgets/Post/Post.php             |  1 +
 sources/system/Picture.php                    | 12 +++--
 sources/system/controllers/BaseController.php |  1 +
 9 files changed, 46 insertions(+), 55 deletions(-)
 create mode 100644 sources/app/assets/js/movim_electron.js

diff --git a/sources/app/assets/js/movim_electron.js b/sources/app/assets/js/movim_electron.js
new file mode 100644
index 0000000..f5c03d1
--- /dev/null
+++ b/sources/app/assets/js/movim_electron.js
@@ -0,0 +1,13 @@
+/**
+ * @brief Open the URLs in the default browser
+ */
+if(typeof require !== 'undefined') {
+    document.addEventListener('click', function(event) {
+        if(event.target.target == '_blank'
+        || (event.target.hostname != null && event.target.hostname != BASE_HOST)) {
+            event.preventDefault();
+            var shell = require('electron').shell;
+            shell.openExternal(event.target.href);
+        }
+    });
+}
diff --git a/sources/app/helpers/StringHelper.php b/sources/app/helpers/StringHelper.php
index 1ea7f95..5e039a4 100644
--- a/sources/app/helpers/StringHelper.php
+++ b/sources/app/helpers/StringHelper.php
@@ -98,46 +98,6 @@ function addHFR($string) {
 function prepareString($string, $large = false, $preview = false) {
     $string = addUrls($string, $preview);
 
-    // We remove all the style attributes
-    /*$string = preg_replace_callback(
-        '/(<[^>]+) style=".*?"/i', function($match) {
-            return $match[1];
-        }, $string
-    );
-
-    // Twitter hashtags
-    $string = preg_replace_callback(
-        "/ #[a-zA-Z0-9_-]{3,}/", function ($match) { return ' <a class="twitter hastag" href="http://twitter.com/search?q='.  urlencode(trim($match[0])).  '&src=hash" target="_blank">'.  trim($match[0]).  '</a>'; }, ' ' . $string);
-    $string = preg_replace_callback(
-        "/ @[a-zA-Z0-9_-]{3,}/", function ($match) {
-            return
-                ' <a class="twitter at" href="http://twitter.com/'.
-                    trim($match[0]).
-                    '" target="_blank">'.
-                    trim($match[0]).
-                '</a>';
-      }, ' ' . $string
-    );
-
-    //remove all scripts
-    $string = preg_replace_callback(
-            '#<[/]?script[^>]*>#is', function ($match) {
-                return '';
-            }, ' ' . $string
-    );
-    //remove all iframe
-    $string = preg_replace_callback(
-            '#<[/]?iframe[^>]*>#is', function ($match) {
-                return '';
-            }, ' ' . $string
-    );
-    //remove all iframe
-    $string = preg_replace_callback(
-            '#<[/]?ss[^>]*>#is', function ($match) {
-                return '';
-            }, ' ' . $string
-    );*/
-
     // We add some smileys...
     $emoji = MovimEmoji::getInstance();
     $string = $emoji->replace($string, $large);
@@ -157,6 +117,16 @@ function fixSelfClosing($string) {
         , $string);
 }
 
+/**
+ * @desc Escape the unescaped ampersand
+ */
+function escapeAmpersands($string) {
+    return preg_replace(
+        '/&[^; ]{0,6}.?/e',
+        "((substr('\\0',-1) == ';') ? '\\0' : '&amp;'.substr('\\0',1))",
+        $string);
+}
+
 /**
  * Remove the content, body and html tags
  */
diff --git a/sources/app/models/message/Message.php b/sources/app/models/message/Message.php
index 881947f..81e92c9 100644
--- a/sources/app/models/message/Message.php
+++ b/sources/app/models/message/Message.php
@@ -98,8 +98,10 @@ class Message extends Model {
 
             $images = (bool)($this->type == 'chat');
 
+            \movim_log((string)$stanza->html->body);
+
             if($stanza->html) {
-                $xhtml = new \SimpleXMLElement('<body xmlns="http://www.w3.org/1999/xhtml">'.(string)$stanza->html->body.'</body>');
+                $xhtml = new \SimpleXMLElement('<body xmlns="http://www.w3.org/1999/xhtml">'.escapeAmpersands((string)$stanza->html->body).'</body>');
                 $xhtml->registerXPathNamespace('xhtml', 'http://www.w3.org/1999/xhtml');
                 $img = $xhtml->xpath('//xhtml:img/@src')[0];
                 if($img) {
diff --git a/sources/app/widgets/AccountNext/_accountnext_oob.tpl b/sources/app/widgets/AccountNext/_accountnext_oob.tpl
index 225e262..380c71c 100644
--- a/sources/app/widgets/AccountNext/_accountnext_oob.tpl
+++ b/sources/app/widgets/AccountNext/_accountnext_oob.tpl
@@ -1,8 +1,9 @@
-<ul id="obb" class="thick">
+<ul id="obb" class="list thick">
     <li class="condensed">
-        <span class="icon bubble color blue">
+        <span class="primary icon bubble color blue">
             <i class="zmdi zmdi-chevron-right"></i>
         </span>
+        <p></p>
         <p>
             {$c->__('oob.about')}
         </p>
diff --git a/sources/app/widgets/Contact/_contact_explore.tpl b/sources/app/widgets/Contact/_contact_explore.tpl
index d55d2ba..b985a87 100644
--- a/sources/app/widgets/Contact/_contact_explore.tpl
+++ b/sources/app/widgets/Contact/_contact_explore.tpl
@@ -1,6 +1,6 @@
 <br />
 <h2>{$c->__('explore.explore')}</h2>
 
-<ul id="public_list" class="list flex card shadow active middle">
+<ul id="public_list" class="list flex card shadow active">
     {$users}
 </ul>
diff --git a/sources/app/widgets/Contact/_contact_public.tpl b/sources/app/widgets/Contact/_contact_public.tpl
index 885a2b5..a6f3a95 100644
--- a/sources/app/widgets/Contact/_contact_public.tpl
+++ b/sources/app/widgets/Contact/_contact_public.tpl
@@ -1,24 +1,23 @@
 {loop="$users"}
     <li class="block" style="background-image: url();" onclick="Contact_ajaxGetContact('{$value->jid}', {if="$page"}{$page}{else}0{/if});">
-        {$url = $value->getPhoto('s')}
+        {$url = $value->getPhoto('l')}
         {if="$url"}
-            <span class="primary icon bubble">
-                <img src="{$url}">
+            <span class="primary icon thumb" style="background-image: url({$url});">
             </span>
         {else}
-            <span class="primary icon bubble color {$value->jid|stringToColor}">
+            <span class="primary icon thumb color {$value->jid|stringToColor}">
                 <i class="zmdi zmdi-account"></i>
             </span>
         {/if}
 
         <p class="normal">
+            {$value->getTrueName()}
             {if="$value->getAge()"}
-                <span class="info">{$c->__('age.years', $value->getAge())}</span>
+                <span class="second">{$c->__('age.years', $value->getAge())}</span>
             {/if}
             {if="$value->getGender()"}
-                <span class="info">{$value->getGender()}</span>
+                <span class="second">{$value->getGender()}</span>
             {/if}
-            {$value->getTrueName()}
         </p>
 
         {if="$value->description != ''"}
diff --git a/sources/app/widgets/Post/Post.php b/sources/app/widgets/Post/Post.php
index 0ee5b90..28dbeea 100644
--- a/sources/app/widgets/Post/Post.php
+++ b/sources/app/widgets/Post/Post.php
@@ -174,6 +174,7 @@ class Post extends WidgetBase
         $view->assign('top', $cd->getTop(6));
         $view->assign('blogs', $nd->getLastBlogPublic(0, 6));
         $view->assign('posts', $nd->getLastPublished(0, 4));
+        $view->assign('jid', $this->user->getLogin());
 
         return $view->draw('_post_empty', true);
     }
diff --git a/sources/system/Picture.php b/sources/system/Picture.php
index c514249..5724eca 100644
--- a/sources/system/Picture.php
+++ b/sources/system/Picture.php
@@ -131,8 +131,10 @@ class Picture {
                 if($im != false) {
                     $im->setImageFormat($format);
 
-                    $im->setImageBackgroundColor('#ffffff');
-                    $im = $im->flattenImages();
+                    if($format == 'jpeg') {
+                        $im->setImageBackgroundColor('#ffffff');
+                        $im = $im->flattenImages();
+                    }
 
                     $im->setImageCompressionQuality(95);
                     $im->setInterlaceScheme(Imagick::INTERLACE_PLANE);
@@ -160,8 +162,10 @@ class Picture {
         $im->readImageBlob($this->_bin);
         $im->setImageFormat($format);
 
-        $im->setImageBackgroundColor('#ffffff');
-        $im = $im->flattenImages();
+        if($format == 'jpeg') {
+            $im->setImageBackgroundColor('#ffffff');
+            $im = $im->flattenImages();
+        }
 
         $geo = $im->getImageGeometry();
 
diff --git a/sources/system/controllers/BaseController.php b/sources/system/controllers/BaseController.php
index ea87875..91adb3d 100644
--- a/sources/system/controllers/BaseController.php
+++ b/sources/system/controllers/BaseController.php
@@ -60,6 +60,7 @@ class BaseController {
         $this->page->addScript('movim_hash.js');
         $this->page->addScript('movim_utils.js');
         $this->page->addScript('movim_base.js');
+        $this->page->addScript('movim_electron.js');
 
         if(!$this->public) {
             $this->page->addScript('movim_tpl.js');