From 88279612efc1bd7cc341d9a3d0682b561d07fe0d Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Thu, 10 Sep 2015 09:23:03 +0200
Subject: [PATCH] update to movim 0.9-2015-09-10

---
 README.md                                |  4 ++--
 sources/app/models/contact/Contact.php   | 20 ++++++++++++++++++++
 sources/app/widgets/Contact/Contact.php  | 20 --------------------
 sources/app/widgets/Contact/_contact.tpl | 24 +++++++++++-------------
 sources/app/widgets/Roster/roster.tpl    |  6 +++---
 5 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index a16a1f8..316e4ef 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-07
+Current Movim version : 0.9 git2015-09-10
 
 **Changelog**
 
 0.9b 2015-0
-- Update to Movim 0.9 git2015-09-07
+- Update to Movim 0.9 git2015-09-10
 - 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/sources/app/models/contact/Contact.php b/sources/app/models/contact/Contact.php
index 0f83065..f27132c 100644
--- a/sources/app/models/contact/Contact.php
+++ b/sources/app/models/contact/Contact.php
@@ -389,6 +389,26 @@ class Contact extends Model {
         }
     }
 
+    function getAlbum()
+    {
+        $uri = str_replace(
+            ' ',
+            '%20',
+            'http://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key=80c1aa3abfa9e3d06f404a2e781e38f9&artist='.
+                $this->tuneartist.
+                '&album='.
+                $this->tunesource.
+                '&format=json'
+            );
+
+        $json = json_decode(requestURL($uri, 2));
+
+        if($json->album) {
+            $json->album->url = $json->album->image[2]->{'#text'};
+            return $json->album;
+        }
+    }
+
     function toRoster() {
         return array(
             'jid'        => $this->jid,
diff --git a/sources/app/widgets/Contact/Contact.php b/sources/app/widgets/Contact/Contact.php
index 392a3b5..35eac2c 100644
--- a/sources/app/widgets/Contact/Contact.php
+++ b/sources/app/widgets/Contact/Contact.php
@@ -271,26 +271,6 @@ class Contact extends WidgetBase
         }
     }
 
-    function getLastFM($contact)
-    {
-        $uri = str_replace(
-            ' ',
-            '%20',
-            'http://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key=80c1aa3abfa9e3d06f404a2e781e38f9&artist='.
-                $contact->tuneartist.
-                '&album='.
-                $contact->tunesource.
-                '&format=json'
-            );
-
-        $json = json_decode(requestURL($uri, 2));
-
-        $img = $json->album->image[2]->{'#text'};
-        $url = $json->album->url;
-
-        return array($img, $url);
-    }
-
     /**
      * @brief Validate the jid
      *
diff --git a/sources/app/widgets/Contact/_contact.tpl b/sources/app/widgets/Contact/_contact.tpl
index 277b663..04eb608 100644
--- a/sources/app/widgets/Contact/_contact.tpl
+++ b/sources/app/widgets/Contact/_contact.tpl
@@ -172,26 +172,25 @@
         </ul>
     {/if}
 
-    {if="$contact->tuneartist || $contact->tunetitle"}
+    {$album = $contact->getAlbum()}
+    {if="$album"}
     <ul class="flex">
         <li class="subheader block large">{$c->__('general.tune')}</li>
 
-        {$img_array = $c->getLastFM($contact)}
         <li class="
             block
             {if="$contact->tunetitle"}condensed{/if}
-            {if="isset($img_array[1]) && $img_array[1] != ''"} action{/if}
+            action
             ">
-            {if="isset($img_array[1]) && $img_array[1] != ''"}
-                <div class="action">
-                    <a href="{$img_array[1]}" target="_blank">
-                        <i class="zmdi zmdi-radio"></i>
-                    </a>
-                </div>
-            {/if}
+            
+            <div class="action">
+                <a href="{$album->url}" target="_blank">
+                    <i class="zmdi zmdi-radio"></i>
+                </a>
+            </div>
             <span class="icon bubble">
-                {if="isset($img_array[0]) && $img_array[0] != ''"}
-                    <img src="{$img_array[0]}"/>
+                {if="isset($album->url)"}
+                    <img src="{$album->url}"/>
                 {else}
                     <i class="zmdi zmdi-play-circle-fill"></i>
                 {/if}
@@ -204,7 +203,6 @@
                     {$contact->tunesource}
                 {/if}
             </span>
-
             {if="$contact->tunetitle"}
                 <p>{$contact->tunetitle}</p>
             {/if}
diff --git a/sources/app/widgets/Roster/roster.tpl b/sources/app/widgets/Roster/roster.tpl
index 58cf12d..dbaed56 100644
--- a/sources/app/widgets/Roster/roster.tpl
+++ b/sources/app/widgets/Roster/roster.tpl
@@ -31,18 +31,18 @@
                 <!--ng-class="rosterCtrl.getContactClient(myjid.ajiditems)"-- >-->
                 <div
                     class="action"
-                    ng-if="myjid.ajiditems.rosterview.tune != '' || myjid.ajiditems.rosterview.type != '' || myjid.ajiditems.rosterview.subscription != 'both'"
+                    ng-if="myjid.ajiditems.rosterview.tune || myjid.ajiditems.rosterview.type != '' || myjid.ajiditems.rosterview.subscription != 'both'"
                     ng-switch on="myjid.ajiditems.rosterview.type">
                     <i ng-switch-when="handheld" class="zmdi zmdi-smartphone"></i>
                     <i ng-switch-when="phone" class="zmdi zmdi-smartphone"></i>
                     <i ng-switch-when="web" class="zmdi zmdi-globe-alt"></i>
                     <i ng-switch-when="bot" class="zmdi zmdi-memory"></i>
-                    <i ng-if="myjid.ajiditems.rosterview.tune" class="zmdi zmdi-play-arrow"></i>
+                    <i ng-if="myjid.ajiditems.rosterview.tune" class="zmdi zmdi-play"></i>
                     <i ng-if="myjid.ajiditems.rosterview.subscription == 'to'" class="zmdi zmdi-arrow-in"></i>
                     <i ng-if="myjid.ajiditems.rosterview.subscription == 'from'" class="zmdi zmdi-arrow-out"></i>
                     <i ng-if="myjid.ajiditems.rosterview.subscription == 'none'" class="zmdi zmdi-do-not-disturb"></i>
                 </div>
-
+                
                 <span
                     ng-if="::myjid.ajiditems.rosterview.avatar != false"
                     class="icon bubble status {{myjid.ajiditems.rosterview.presencetxt}}"