From 55026b7402be3beedc9f8ae3e5f416636e7d0823 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Mon, 7 Sep 2015 15:06:10 +0200
Subject: [PATCH] update to movim 0.9b-20150907

---
 README.md                                   |  4 ++--
 TODO                                        |  1 +
 scripts/remove                              |  2 +-
 sources/app/models/config/Config.php        |  2 +-
 sources/app/views/page.tpl                  |  4 ++--
 sources/app/widgets/Blog/blog.tpl           |  2 +-
 sources/app/widgets/Group/Group.php         |  8 ++------
 sources/app/widgets/Group/_group_header.tpl |  2 +-
 sources/app/widgets/Group/_group_posts.tpl  | 18 +++++++++++-------
 sources/app/widgets/Groups/groups.js        |  2 +-
 sources/app/widgets/Login/login.js          |  2 +-
 sources/app/widgets/Notifs/notifs.css       |  3 ++-
 sources/app/widgets/Post/_post.tpl          |  2 +-
 sources/themes/material/css/list.css        |  1 +
 sources/themes/material/css/style.css       | 21 ++++++++++++++-------
 15 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index d48f89a..f860318 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,12 @@ Warning: BETA.
 
 You need a valid SSL certificate to use Movim, auto-signed is not allowed.
 
-Current Movim version : 0.9 git2015-09-03
+Current Movim version : 0.9 git2015-09-07
 
 **Changelog**
 
 0.9b 2015-0
-- Update to Movim 0.9 git2015-09-03
+- Update to Movim 0.9 git2015-09-07
 - Add notes in README about public pods & whitelisting
 - script/install now check if path is empty.
 - script/remove now delete /etc/php/fpm/pool.d/movim.conf (fix #8).
diff --git a/TODO b/TODO
index e440893..767b061 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
 - Check if Yes and yes are both working
 - Sysvinit script syslog
 - Log to /var/log/movim/
+- Movim must start AFTER mysql
diff --git a/scripts/remove b/scripts/remove
index 1316f16..f83ff09 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -19,7 +19,7 @@ sudo userdel movim
 sudo rm -rf /var/www/movim
 domain=$(sudo yunohost app setting movim domain)
 sudo rm -f /etc/nginx/conf.d/$domain.d/movim.conf
-udo rm etc/php5/fpm/pool.d/movim.conf
+sudo rm etc/php5/fpm/pool.d/movim.conf
 
 # Restarting services
 sudo service nginx reload
diff --git a/sources/app/models/config/Config.php b/sources/app/models/config/Config.php
index a6d647b..e4c514a 100644
--- a/sources/app/models/config/Config.php
+++ b/sources/app/models/config/Config.php
@@ -31,7 +31,7 @@ class Config extends Model {
             "loglevel" :
                 {"type":"string", "size":16, "mandatory":true  },
             "timezone" :
-                {"type":"string", "size":16, "mandatory":true  },
+                {"type":"string", "size":32, "mandatory":true  },
             "xmppwhitelist" :
                 {"type":"text" },
             "info" :
diff --git a/sources/app/views/page.tpl b/sources/app/views/page.tpl
index 34e897c..f11aaac 100644
--- a/sources/app/views/page.tpl
+++ b/sources/app/views/page.tpl
@@ -11,8 +11,8 @@
     <meta name="theme-color" content="#1C1D5B" />
 
     <link rel="shortcut icon" href="<?php $this->linkFile('img/favicon.ico');?>" />
-    <link rel="stylesheet" href="<?php echo BASE_URI; ?>app/assets/js/leaflet.css" />
-    <script src="<?php echo BASE_URI; ?>app/assets/js/leaflet.js"></script>
+    <!--<link rel="stylesheet" href="<?php echo BASE_URI; ?>app/assets/js/leaflet.css" />
+    <script src="<?php echo BASE_URI; ?>app/assets/js/leaflet.js"></script>-->
     <script src="<?php echo BASE_URI; ?>app/assets/js/favico.js"></script>
 
     <!-- OTR -->
diff --git a/sources/app/widgets/Blog/blog.tpl b/sources/app/widgets/Blog/blog.tpl
index 1f1c42f..0027338 100644
--- a/sources/app/widgets/Blog/blog.tpl
+++ b/sources/app/widgets/Blog/blog.tpl
@@ -103,7 +103,7 @@
                 <ul class="middle divided spaced">
                     {if="isset($attachements.links)"}
                         {loop="$attachements.links"}
-                            {if="substr($value.href, 0, 5) != 'xmpp:'"}
+                            {if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
                                 <li>
                                     <span class="icon">
                                         <img src="http://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/>
diff --git a/sources/app/widgets/Group/Group.php b/sources/app/widgets/Group/Group.php
index 24da6e0..ceccc87 100644
--- a/sources/app/widgets/Group/Group.php
+++ b/sources/app/widgets/Group/Group.php
@@ -196,10 +196,6 @@ class Group extends WidgetBase
         $view->assign('node', $node);
         $html .= $view->draw('_group_publish', true);
 
-        $header = $this->prepareHeader($server, $node);
-
-        Header::fill($header);
-
         RPC::call('MovimTpl.fill', '#group_widget.'.stringToUri($server.'_'.$node), $html);
         RPC::call('Group.enableVideos');
     }
@@ -282,14 +278,14 @@ class Group extends WidgetBase
           ->request();
     }
 
-    function ajaxGetSubscriptions($server, $node)
+    function ajaxGetSubscriptions($server, $node, $notify = true)
     {
         if(!$this->validateServerNode($server, $node)) return;
 
         $r = new GetSubscriptions;
         $r->setTo($server)
           ->setNode($node)
-          ->setSync()
+          ->setNotify($notify)
           ->request();
     }
 
diff --git a/sources/app/widgets/Group/_group_header.tpl b/sources/app/widgets/Group/_group_header.tpl
index 769fbbc..51c9ecf 100644
--- a/sources/app/widgets/Group/_group_header.tpl
+++ b/sources/app/widgets/Group/_group_header.tpl
@@ -54,7 +54,7 @@
             <li onclick="Group_ajaxGetConfig('{$item->server}', '{$item->node}')">
                 <span>{$c->__('group.configuration')}</span>
             </li>
-            <li onclick="Group_ajaxGetSubscriptions('{$item->server}', '{$item->node}')">
+            <li onclick="Group_ajaxGetSubscriptions('{$item->server}', '{$item->node}', true)">
                 <span>{$c->__('group.subscriptions')}</span>
             </li>
             <li onclick="Group_ajaxDelete('{$item->server}', '{$item->node}')">
diff --git a/sources/app/widgets/Group/_group_posts.tpl b/sources/app/widgets/Group/_group_posts.tpl
index 2d06c97..9bcc04d 100644
--- a/sources/app/widgets/Group/_group_posts.tpl
+++ b/sources/app/widgets/Group/_group_posts.tpl
@@ -20,11 +20,13 @@
                         <span class="icon bubble color {$value->node|stringToColor}">{$value->node|firstLetterCapitalize}</span>
                     {/if}
                     <h2>
-                        {if="$value->title != null"}
-                            {$value->title}
-                        {else}
-                            {$c->__('post.default_title')}
-                        {/if}
+                        <a href="{$c->route('news', $value->nodeid)}">
+                            {if="$value->title != null"}
+                                {$value->title}
+                            {else}
+                                {$c->__('post.default_title')}
+                            {/if}
+                        </a>
                     </h2>
                     <p>
                         {if="$value->getContact()->getTrueName() != ''"}
@@ -47,7 +49,7 @@
             <ul class="thin">
                 {if="isset($attachements.links)"}
                     {loop="$attachements.links"}
-                        {if="substr($value.href, 0, 5) != 'xmpp:'"}
+                        {if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
                         <li>
                             <span class="icon small"><img src="http://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/></span>
                             <a href="{$value.href}" class="alternate" target="_blank">
@@ -110,7 +112,9 @@
                         {/if}
                         <span class="info">{$value->published|strtotime|prepareDate}</span>
                         <span>
-                            {$value->getContact()->getTrueName()}
+                            <a href="{$c->route('contact', $value->getContact()->jid)}">
+                                {$value->getContact()->getTrueName()}
+                            </a>
                         </span>
                         <p class="all">
                             {$value->content}
diff --git a/sources/app/widgets/Groups/groups.js b/sources/app/widgets/Groups/groups.js
index 1cda0c9..89011b3 100644
--- a/sources/app/widgets/Groups/groups.js
+++ b/sources/app/widgets/Groups/groups.js
@@ -10,7 +10,7 @@ var Groups = {
                 Group_ajaxGetItems(this.dataset.server, this.dataset.node);
                 Group_ajaxGetMetadata(this.dataset.server, this.dataset.node);
                 Group_ajaxGetAffiliations(this.dataset.server, this.dataset.node);
-                //Group_ajaxGetSubscriptions(this.dataset.server, this.dataset.node);
+                Group_ajaxGetSubscriptions(this.dataset.server, this.dataset.node, false);
                 Groups.reset(items);
                 movim_add_class(this, 'active');
             }
diff --git a/sources/app/widgets/Login/login.js b/sources/app/widgets/Login/login.js
index 73ccd14..c6c12fa 100644
--- a/sources/app/widgets/Login/login.js
+++ b/sources/app/widgets/Login/login.js
@@ -23,7 +23,7 @@ var Login = {
             Login.rememberSession(localStorage.username);
 
             // A fallback security
-            setTimeout("MovimWebsocket.unregister()", 7000);
+            setTimeout("MovimWebsocket.unregister()", 20000);
         }
     },
     
diff --git a/sources/app/widgets/Notifs/notifs.css b/sources/app/widgets/Notifs/notifs.css
index 871047c..1da2e70 100644
--- a/sources/app/widgets/Notifs/notifs.css
+++ b/sources/app/widgets/Notifs/notifs.css
@@ -8,7 +8,7 @@
     margin-right: 0.5em;
     border-radius: 1em;
 }
-
+/*
 #notifs_widget.groupshown li:not(:first-child){
     display: none;
 }
@@ -24,3 +24,4 @@
     content: "\f2c0";
     display: inline-block;
 }
+*/
diff --git a/sources/app/widgets/Post/_post.tpl b/sources/app/widgets/Post/_post.tpl
index 03e45f6..666d6ae 100644
--- a/sources/app/widgets/Post/_post.tpl
+++ b/sources/app/widgets/Post/_post.tpl
@@ -68,7 +68,7 @@
         <ul class="middle divided spaced">
             {if="isset($attachements.links)"}
                 {loop="$attachements.links"}
-                    {if="substr($value.href, 0, 5) != 'xmpp:'"}
+                    {if="substr($value.href, 0, 5) != 'xmpp:' && filter_var($value.href, FILTER_VALIDATE_URL)"}
                         <li>
                             <span class="icon">
                                 <img src="http://icons.duckduckgo.com/ip2/{$value.url.host}.ico"/>
diff --git a/sources/themes/material/css/list.css b/sources/themes/material/css/list.css
index 834c764..6396130 100644
--- a/sources/themes/material/css/list.css
+++ b/sources/themes/material/css/list.css
@@ -13,6 +13,7 @@ ul li {
 }
 
 ul > a {
+    max-width: 100%;
     display: block;
 }
 
diff --git a/sources/themes/material/css/style.css b/sources/themes/material/css/style.css
index ee701c0..58049e8 100644
--- a/sources/themes/material/css/style.css
+++ b/sources/themes/material/css/style.css
@@ -152,11 +152,13 @@ body > nav.active {
     width: 45rem;
 }
 
-body > div.dialog:not(:empty) ~ main,
-body > div.dialog:not(:empty) ~ nav,
-body > nav.active + main {
-    opacity: 0.5;
-    pointer-events: none;
+@media screen and (min-width: 1024px) {
+    body > div.dialog:not(:empty) ~ main,
+    body > div.dialog:not(:empty) ~ nav,
+    body > nav.active + main {
+        opacity: 0.5;
+        pointer-events: none;
+    }
 }
 
 body > nav li { /* Little hack for the navbar */
@@ -227,6 +229,7 @@ main {
     background-color: white;
     -webkit-transition: opacity 0.3s ease-in-out;
     transition: opacity 0.3s ease-in-out;
+    transform: translateZ(0);
 }
 
 nav + main {
@@ -708,6 +711,7 @@ main section > div:first-child:nth-last-child(2) ~ div .actions.fixed > div:last
     width: 40rem;
     pointer-events: none;
     transition: opacity 0.2s ease, bottom 0.4s ease;
+    transform: translateX(0);
 }
 
 .snackbar p,
@@ -877,6 +881,7 @@ dl dd {
 .spinner:before,
 .spinner:after {
     transition: top .3s ease-in-out;
+    transform: translateX(0);
     content: '';
     position: absolute;
     left: calc(50% - 3.5rem);
@@ -890,8 +895,8 @@ dl dd {
 }
 
 .spinner.on:before {
-    animation: spinner 1s linear infinite;
-    -webkit-animation: spinner 1s linear infinite;
+    animation: 1s spinner infinite linear;
+    -webkit-animation: 1s spinner 1s infinite linear;
 }
 
 .spinner:before {
@@ -916,10 +921,12 @@ dl dd {
 }
 
 @keyframes spinner {
+    from { transform: rotate(0deg); }
     to {transform: rotate(360deg);}
 }
 
 @-webkit-keyframes spinner {
+    from { transform: rotate(0deg); }
     to {-webkit-transform: rotate(360deg);}
 }