Merge remote-tracking branch 'origin/prod/v0.9.8.3' into stable/v0.9.9

src/Muzich/CoreBundle/Command/MineTagsDataCommand.php

@@ -101,6 +101,7 @@ class MineTagsDataCommand extends ContainerAwareCommand
   
   protected function mineDiffusions()
   {
+    $this->output->writeln('<info>Retriving users ...</info>');
     $users = $this->getUsersToProceed(User::DATA_DIFF_UPDATED);
     $this->output->writeln('<info>Diffusions: '.count($users).' utilisateurs</info>');
     $this->progress->start($this->output, count($users));

src/Muzich/CoreBundle/Mining/Tag/TagData.php

@@ -13,9 +13,14 @@ class TagData extends Base
         return array();
     }
     
-   if (count($tags_ordereds = $user_tags->getElementFavoriteTags()))
-     return $tags_ordereds;
-   
+    if ($user_tags)
+    {
+      if (count($tags_ordereds = $user_tags->getElementFavoriteTags()))
+      {
+        return $tags_ordereds;
+      }
+    }
+    
    return array();
   }
   
@@ -25,10 +30,14 @@ class TagData extends Base
         return array();
     }
     
-   if (count($tags_ordereds = $user_tags->getElementDiffusionTags()))
-     return $tags_ordereds;
-   
-   return array();
+    if ($user_tags)
+    {
+      if (count($tags_ordereds = $user_tags->getElementDiffusionTags()))
+      {
+        return $tags_ordereds;
+      }
+    }
+    return array();
   }
   
   protected function getUserTagsTags(User $user, $field)

src/Muzich/CoreBundle/Resources/public/css/main.css

@@ -2542,10 +2542,6 @@ div.social_buttons ul li
   float:left;
 }
 
-div.social_buttons ul li.googleplus {
-    margin-left: -25px;
-}
-
 a.button.toplist:visited
 {
   color: white;

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -3414,9 +3414,10 @@ var facebook_like_rendereds_autoplay = new Array();
 
 function refresh_social_buttons(autoplay)
 {
-  proceed_facebook_like_buttons(autoplay);
-  gapi.plusone.go();
-  twttr.widgets.load();
+  // On n'utilise plus ca
+//  proceed_facebook_like_buttons(autoplay);
+//  gapi.plusone.go();
+//  twttr.widgets.load();
 }
 
 function proceed_facebook_like_buttons(autoplay)

src/Muzich/CoreBundle/Resources/public/js/player/SoundCloudPlayer.js

@@ -3,7 +3,16 @@ function SoundCloudPlayer(ref_id, object_for_player, finish_callback, autoplay)
   autoplay = typeof autoplay !== 'undefined' ? autoplay : false;
   var _autoplay = autoplay;
   var _iframe_id = '';
-  var _ref_id = ref_id;
+  
+  if (typeof(ref_id) == 'string')
+  {
+    var _ref_id = ref_id.replace('http://', 'https://');
+  }
+  else
+  {
+    var _ref_id = ref_id
+  }
+  
   var _object_for_player = object_for_player;
   var _player = null;
   var _sounds_count = 0;
@@ -30,13 +39,13 @@ function SoundCloudPlayer(ref_id, object_for_player, finish_callback, autoplay)
     _iframe_id = 'soundcloud_player_'+new Date().getTime();
     if (!_autoplay)
     {
-      _object_for_player.html('<iframe id="'+_iframe_id+'" src="http://w.soundcloud.com/player/?url='
+      _object_for_player.html('<iframe id="'+_iframe_id+'" src="https://w.soundcloud.com/player/?url='
             +_ref_id+'&show_artwork=false&auto_play=true" width="100%" '
             +'height="350" scrolling="no" frameborder="no"></iframe>');
     }
     else
     {
-      $('#autoplay_player_soundcloud').append('<iframe id="'+_iframe_id+'" src="http://w.soundcloud.com/player/?url='
+      $('#autoplay_player_soundcloud').append('<iframe id="'+_iframe_id+'" src="https://w.soundcloud.com/player/?url='
         +_ref_id+'&show_artwork=false&auto_play=true" width="100%" '
         +'height="350" scrolling="no" frameborder="no"></iframe>');
     }

src/Muzich/CoreBundle/Resources/public/js/player/YoutubePlayer.js

@@ -86,7 +86,14 @@ function YoutubePlayer(ref_id, object_for_player, finish_callback)
     {
       if(typeof(_yt_player.stopVideo)!=='undefined')
       {
-        _yt_player.stopVideo();
+        try
+        {
+          _yt_player.stopVideo();
+        }
+        catch (e)
+        {
+          
+        }
       }
     }
   }

src/Muzich/CoreBundle/Resources/views/Layout/head_js.html.twig

@@ -2,7 +2,6 @@
   {% set userecho = true %}
 {% endif %}
 
-
 <script type="text/javascript" src="//apis.google.com/js/plusone.js">
   {parsetags: 'explicit'}
 </script>
@@ -11,7 +10,6 @@
 
 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
 
-
 {% javascripts
   'js/jquery-1.8.2.prod.js'
   'js/jquery-ui-1.10.1.custom.min.js'
@@ -55,35 +53,6 @@
   });
 </script>
 
-{% if userecho %}
-  <script type='text/javascript'>
-
-    var _ues = {
-    host:'muzich.userecho.com',
-    forum:'17651',
-    lang:'fr',
-    tab_corner_radius:5,
-    tab_font_size:20,
-    tab_image_hash:'Vm9zIHJldG91cnM%3D',
-    tab_chat_hash:'Y2hhdA%3D%3D',
-    tab_alignment:'right',
-    tab_text_color:'#000000',
-    tab_text_shadow_color:'#66666655',
-    tab_bg_color:'#F4F4F4',
-    tab_hover_color:'#D5D5D5'
-    };
-
-  $(document).ready(function(){  
-  (function() {
-      var _ue = document.createElement('script'); _ue.type = 'text/javascript'; _ue.async = true;
-      _ue.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'cdn.userecho.com/js/widget-1.4.gz.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(_ue, s);
-    })();
-  });
-
-  </script>
-{% endif %}
-
 <script type="text/javascript">
   {% if app.user %}
     visitor = false;

src/Muzich/CoreBundle/Resources/views/SearchElement/element.html.twig

@@ -412,34 +412,26 @@
       
       {% endif %}
       
-      {% if display_social_buttons and app.environment == 'prod' %}
+      {% if display_social_buttons %}
+        {% set permalink = 'https:' ~ url('element_show_one', {
+          'element_id' : element.id,
+          'element_slug' : element.slug
+        }, true) %}
+       {% set element_title = 'Muzich - ' ~ element.name %}
+
         <div class="social_buttons">
           <ul>
             <li class="facebook">
-              {{ facebookButton( {
-                'locale': 'fr_FR', 
-                'url': 'http:' ~ url('element_show_one', {
-                  'element_id' : element.id,
-                  'element_slug' : element.slug
-                }, true) })
-              }}
+               <a target="_blank" title="Facebook" href="https://www.facebook.com/sharer.php?u={{ permalink }}&t={{ element_title }}" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=500,width=700');return false;"><img src="{{ asset('/img/1387489343_facebook_square.png') }}" alt="Facebook" /></a>
             </li>
             <li class="twitter">
-              {{ twitterButton( {
-                'locale': 'fr_FR', 
-                'url': 'http:' ~ url('element_show_one', {
-                  'element_id' : element.id
-                }, true) }) 
-              }}
+              <a target="_blank" title="Twitter" href="https://twitter.com/share?url={{ permalink }}&text={{ element_title }}&via=Muzich_Official" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=400,width=700');return false;"><img src="{{ asset('/img/1387489330_twitter_square.png') }}" alt="Twitter" /></a>
             </li>
             <li class="googleplus">
-              {{ googlePlusButton( {
-                'locale': 'fr_FR', 'url': 
-                'http:' ~ url('element_show_one', {
-                  'element_id' : element.id,
-                  'element_slug' : element.slug
-                }, true) }) 
-              }}
+               <a target="_blank" title="Google +" href="https://plus.google.com/share?url={{ permalink }}&hl=fr" rel="nofollow" onclick="javascript:window.open(this.href, '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=450,width=650');return false;"><img src="{{ asset('/img/1387489316_google_square.png') }}" alt="Google Plus" /></a>
+            </li>
+            <li class="mail">
+               <a target="_blank" title="Envoyer par mail" href="mailto:?subject={{ element_title }}&body={{ permalink }}" rel="nofollow"><img src="{{ asset('/img/1387489139_aiga_mail.png') }}" alt="email" /></a>
             </li>
           </ul>
         </div>

src/Muzich/CoreBundle/Resources/views/layout.html.twig

@@ -57,24 +57,26 @@
     
   </div>
     
-    {% if  app.environment == 'prod' %} 
-      <!-- Piwik -->
-      <script type="text/javascript"> 
-        var _paq = _paq || [];
-        _paq.push(['trackPageView']);
-        _paq.push(['enableLinkTracking']);
-        (function() {
-          //var u=(("https:" == document.location.protocol) ? "https" : "http") + "://analytics.muzi.ch//"; # pas de certif sur analytics.muzi.ch pour le moment
-          var u=(("https:" == document.location.protocol) ? "http" : "http") + "://analytics.muzi.ch//";
-          _paq.push(['setTrackerUrl', u+'piwik.php']);
-          _paq.push(['setSiteId', 1]);
-          var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
-          g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-        })();
-      
-      </script>
-      <noscript><p><img src="http://analytics.muzi.ch/piwik.php?idsite=1" style="border:0" alt="" /></p></noscript>
-      <!-- End Piwik Code -->
+    {% if not app.request.secure %}
+      {% if  app.environment == 'prod' %} 
+        <!-- Piwik -->
+        <script type="text/javascript"> 
+          var _paq = _paq || [];
+          _paq.push(['trackPageView']);
+          _paq.push(['enableLinkTracking']);
+          (function() {
+            //var u=(("https:" == document.location.protocol) ? "https" : "http") + "://analytics.muzi.ch//"; # pas de certif sur analytics.muzi.ch pour le moment
+            var u=(("https:" == document.location.protocol) ? "https" : "http") + "://analytics.muzi.ch//";
+            _paq.push(['setTrackerUrl', u+'piwik.php']);
+            _paq.push(['setSiteId', 1]);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
+            g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+          })();
+
+        </script>
+        <noscript><p><img src="https://analytics.muzi.ch/piwik.php?idsite=1" style="border:0" alt="" /></p></noscript>
+        <!-- End Piwik Code -->
+      {% endif %}
     {% endif %}
   </body>
 </html>

src/Muzich/CoreBundle/Resources/views/layout_iframe.html.twig

@@ -3,7 +3,7 @@
   <head>
     <title>Muzi.ch - {% block title %}{% endblock %}</title>
     {% include 'MuzichCoreBundle:Layout:head.html.twig' with {
-      'userecho' : false
+      'userecho' : true
     } %}
     {% block css %}{% endblock %}
     {% block js %}{% endblock %}

web/app_dev.php

@@ -1,5 +1,5 @@
 <?php
-
+die();
 use Symfony\Component\HttpFoundation\Request;
 
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line
@@ -14,7 +14,7 @@ if (isset($_SERVER['HTTP_CLIENT_IP'])
         '127.0.0.1',
         '::1',
     ))
-) {
+&& false) {
     header('HTTP/1.0 403 Forbidden');
     exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
 }

web/bundles/muzichcore/css/main.css

@@ -2542,10 +2542,6 @@ div.social_buttons ul li
   float:left;
 }
 
-div.social_buttons ul li.googleplus {
-    margin-left: -25px;
-}
-
 a.button.toplist:visited
 {
   color: white;

web/bundles/muzichcore/js/muzich.js

@@ -3414,9 +3414,10 @@ var facebook_like_rendereds_autoplay = new Array();
 
 function refresh_social_buttons(autoplay)
 {
-  proceed_facebook_like_buttons(autoplay);
-  gapi.plusone.go();
-  twttr.widgets.load();
+  // On n'utilise plus ca
+//  proceed_facebook_like_buttons(autoplay);
+//  gapi.plusone.go();
+//  twttr.widgets.load();
 }
 
 function proceed_facebook_like_buttons(autoplay)

web/bundles/muzichcore/js/player/SoundCloudPlayer.js

@@ -3,7 +3,16 @@ function SoundCloudPlayer(ref_id, object_for_player, finish_callback, autoplay)
   autoplay = typeof autoplay !== 'undefined' ? autoplay : false;
   var _autoplay = autoplay;
   var _iframe_id = '';
-  var _ref_id = ref_id;
+  
+  if (typeof(ref_id) == 'string')
+  {
+    var _ref_id = ref_id.replace('http://', 'https://');
+  }
+  else
+  {
+    var _ref_id = ref_id
+  }
+  
   var _object_for_player = object_for_player;
   var _player = null;
   var _sounds_count = 0;
@@ -24,13 +33,13 @@ function SoundCloudPlayer(ref_id, object_for_player, finish_callback, autoplay)
     _iframe_id = 'soundcloud_player_'+new Date().getTime();
     if (!_autoplay)
     {
-      _object_for_player.html('<iframe id="'+_iframe_id+'" src="http://w.soundcloud.com/player/?url='
+      _object_for_player.html('<iframe id="'+_iframe_id+'" src="https://w.soundcloud.com/player/?url='
             +_ref_id+'&show_artwork=false&auto_play=true" width="100%" '
             +'height="350" scrolling="no" frameborder="no"></iframe>');
     }
     else
     {
-      $('#autoplay_player_soundcloud').append('<iframe id="'+_iframe_id+'" src="http://w.soundcloud.com/player/?url='
+      $('#autoplay_player_soundcloud').append('<iframe id="'+_iframe_id+'" src="https://w.soundcloud.com/player/?url='
         +_ref_id+'&show_artwork=false&auto_play=true" width="100%" '
         +'height="350" scrolling="no" frameborder="no"></iframe>');
     }

web/bundles/muzichcore/js/player/YoutubePlayer.js

@@ -78,7 +78,14 @@ function YoutubePlayer(ref_id, object_for_player, finish_callback)
     {
       if(typeof(_yt_player.stopVideo)!=='undefined')
       {
-        _yt_player.stopVideo();
+        try
+        {
+          _yt_player.stopVideo();
+        }
+        catch (e)
+        {
+          
+        }
       }
     }
   }