Fixed bug with new Twitter policy. Added messages on share buttons

iCAPLyon1 · Feb 9, 2016 · b69e8f8 · b69e8f8
1 parent d24e7bc
commit b69e8f8
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 11 deletions.
diff --git a/Library/SocialShare/Networks/Facebook.php b/Library/SocialShare/Networks/Facebook.php
@@ -51,9 +51,14 @@ public function getShareLink($url, array $options = array())
     public function countShares($url)
     {
         $api_url = sprintf(self::API_URL, urlencode($url));
-        $data = json_decode(file_get_contents($api_url));
+        $data = null;
+        try{
+            $data = json_decode(file_get_contents($api_url));
+        } catch(\Exception $e) {
+            $data = null;
+        }
 
-        return isset($data[0]->share_count)?intval($data[0]->share_count):0;
+        return ($data !== null && isset($data[0]->share_count))?intval($data[0]->share_count):0;
     }
 
     /**

diff --git a/Library/SocialShare/Networks/LinkedIn.php b/Library/SocialShare/Networks/LinkedIn.php
@@ -54,9 +54,14 @@ public function getShareLink($url, array $options = array())
     public function countShares($url)
     {
         $api_url = sprintf(self::API_URL, urlencode($url));
-        $data = json_decode(file_get_contents($api_url));
+        $data = null;
+        try{
+            $data = json_decode(file_get_contents($api_url));
+        } catch(\Exception $e) {
+            $data = null;
+        }
 
-        return isset($data->count)?intval($data->count):0;
+        return ($data !== null && isset($data->count))?intval($data->count):0;
     }
 
     /**

diff --git a/Library/SocialShare/Networks/Twitter.php b/Library/SocialShare/Networks/Twitter.php
@@ -53,9 +53,14 @@ public function getShareLink($url, array $options = array())
     public function countShares($url)
     {
         $api_url = sprintf(self::API_URL, urlencode($url));
-        $data = json_decode(file_get_contents($api_url));
+        $data = null;
+        try{
+            $data = json_decode(file_get_contents($api_url));
+        } catch(\Exception $e) {
+            $data = null;
+        }
 
-        return isset($data->count)?intval($data->count):0;
+        return ($data !== null && isset($data->count))?intval($data->count):0;
     }
 
     /**

diff --git a/Resources/translations/icap_socialmedia.en.yml b/Resources/translations/icap_socialmedia.en.yml
@@ -21,4 +21,9 @@ load_next_notes: View more reminders
 load_next_likes: View more likes
 load_next_wall_items: View more items
 comments_are_public: Comments are public
-notes_are_private: Remiders are personal
+notes_are_private: Remiders are personal
+platform_share_message: Shares number on platform
+facebook_share_message: Shares on Facebook
+twitter_share_message: Shares on Twitter are not available due to its new policy
+google_share_message: Shares on Google+
+linkedin_share_message: Shares on LinkedIn
diff --git a/Resources/translations/icap_socialmedia.fr.yml b/Resources/translations/icap_socialmedia.fr.yml
@@ -21,4 +21,9 @@ load_next_notes: Voir les pense-bêtes suivants
 load_next_likes: Voir les suivants
 load_next_wall_items: Voir les éléments suivants
 comments_are_public: Tous les commentaires sont publics
-notes_are_private: Tous les pense-bêtes sont privés
+notes_are_private: Tous les pense-bêtes sont privés
+platform_share_message: Nombre de partages sur la plateforme
+facebook_share_message: Nombre de partages sur Facebook
+twitter_share_message: Nombre de partages sur Twitter indisponible à cause de la nouvelle politique du site de twitter
+google_share_message: Nombre de partages sur Google+
+linkedin_share_message: Nombre de partages sur LinkedIn
diff --git a/Resources/views/ShareAction/form.html.twig b/Resources/views/ShareAction/form.html.twig
@@ -7,9 +7,9 @@
         <div class="modal-body">
             <h4>{{ 'choose_share_network'|trans({}, 'icap_socialmedia') }}</h4>
             <div class="socialmedia-network-list text-center">
-                <a target="_blank" class="btn" style="font-weight:bold; background-color: #cccccc" href="{{ path("icap_socialmedia_share", {"resourceId":resourceNode.id}) }}"><span class="socialmedia-network-logo">cc</span><br/><span class="socialmedia-network-shares">{{ shares|smartCounter|raw }}</span></a>
+                <a target="_blank" class="btn" title="platform_share_message" style="font-weight:bold; background-color: #cccccc" href="{{ path("icap_socialmedia_share", {"resourceId":resourceNode.id}) }}"><span class="socialmedia-network-logo">cc</span><br/><span class="socialmedia-network-shares">{{ shares|smartCounter|raw }}</span></a>
                 {% for network in networks %}
-                <a target="_blank" class="btn" style="background-color: {{ network.color }}" href="{{ path("icap_socialmedia_share", {"resourceId":resourceNode.id, "network":network.name}) }}"><i class="socialmedia-network-logo fa fa-{{ network.iconClass }}"></i><br/><span class="socialmedia-network-shares">{{ network.countShares(resourceUrl)|smartCounter|raw }}</span></a>
+                <a target="_blank" class="btn" title="{{ (network.name~'_share_message')|trans({}, 'icap_socialmedia') }}" style="background-color: {{ network.color }}" href="{{ path("icap_socialmedia_share", {"resourceId":resourceNode.id, "network":network.name}) }}"><i class="socialmedia-network-logo fa fa-{{ network.iconClass }}"></i><br/><span class="socialmedia-network-shares">{{ network.countShares(resourceUrl)|smartCounter|raw }}</span></a>
                 {% endfor %}
             </div>
             <div class="text-center socialmedia-share-info">

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-dev-master
+v6.0.1