Evolution #205: Gestion d'URL HTTPS

src/Muzich/CoreBundle/ElementFactory/Site/DeezercomFactory.php

@@ -13,8 +13,7 @@ class DeezercomFactory extends BaseFactory
 {
   public function getEmbedCode()
   {
-    $url = str_replace('www.', '', $this->element->getUrl());
-    $data = str_replace('http://deezer.com', '', $url);
+    $data = $this->getCleanedUrl();
         
     $embed = null;
     $element_id = null;
@@ -75,6 +74,4 @@ class DeezercomFactory extends BaseFactory
     return $url;
   }
   
-}
-
-?>
+}

src/Muzich/CoreBundle/ElementFactory/Site/JamendocomFactory.php

@@ -13,8 +13,7 @@ class JamendocomFactory extends BaseFactory
 {
   public function getEmbedCode()
   {
-    $url = str_replace('www.', '', $this->element->getUrl());
-    $data = str_replace('http://jamendo.com', '', $url);
+    $data = $this->getCleanedUrl();
     
     $embed_url = null;
     // http://www.jamendo.com/fr/album/30661
@@ -117,30 +116,8 @@ class JamendocomFactory extends BaseFactory
      * api.jamendo.com/get2/album/id/track/json/?id=
      * 
      */
-    
-
-    
-    
-//    if (isset($result->errors))
-//    {
-//      if (count($result->errors))
-//      {
-//        return null;
-//      }
-//    }
-//    
-//    $getjsonurl = $result->location;
-//    $ch = curl_init($getjsonurl);
-//    curl_setopt_array($ch, $options);
-//    $result = json_decode(curl_exec($ch));
-//    
-//    $url = $result->artwork_url;
-    
-    
+     
     return $url;
   }
   
-  //http://api.jamendo.com/get2/name+url/album/json/?id=116
 }
-
-?>

src/Muzich/CoreBundle/ElementFactory/Site/SoundcloudcomFactory.php

@@ -16,7 +16,7 @@ class SoundcloudcomFactory extends BaseFactory
   public function getEmbedCode()
   {
     $url = str_replace('www.', '', $this->element->getUrl());
-    $data = str_replace('http://soundcloud.com', '', $url);
+    $data = $this->getCleanedUrl();
     $embed_url = null;
     
     // http://soundcloud.com/matas/sets/library-project
@@ -91,6 +91,4 @@ class SoundcloudcomFactory extends BaseFactory
     $url = $result->artwork_url;
     return $url;
   }
-}
-
-?>
+}

src/Muzich/CoreBundle/ElementFactory/Site/YoutubeFactory.php

@@ -46,6 +46,4 @@ class YoutubeFactory extends BaseFactory
     
     return $url;
   }
-}
-
-?>
+}

src/Muzich/CoreBundle/ElementFactory/Site/YoutubecomFactory.php

@@ -55,5 +55,3 @@ class YoutubecomFactory extends BaseFactory
     return $url;
   }
 }
-
-?>

src/Muzich/CoreBundle/ElementFactory/Site/base/BaseFactory.php

@@ -40,7 +40,9 @@ class BaseFactory implements FactoryInterface
   protected function getCleanedUrl()
   {
     $url = str_replace('www.', '', $this->element->getUrl());
-    return str_replace('http://'.$this->element->getType(), '', $url);
+    $url = str_replace('http://'.$this->element->getType(), '', $url);
+    $url = str_replace('https://'.$this->element->getType(), '', $url);
+    return $url;
   }
   
   public function getThumbnailUrl()