diff --git a/library/Class/NoticeHtml.php b/library/Class/NoticeHtml.php
index 6e312a80151786bf435cc881c74b98f2dc3cd505..7aa64955501328809bd3db4f2829f42a5a509bca 100644
--- a/library/Class/NoticeHtml.php
+++ b/library/Class/NoticeHtml.php
@@ -589,7 +589,6 @@ class Class_NoticeHtml {
if($notice["asin"])
{
$id_div=$notice["asin"]."_".$volume."_".$plage;
- $player=$morceau["url_ecoute"];
$js_video="chercher_videos('".$id_div."','".addslashes($notice["auteur"])."','".addslashes($morceau["titre"])."')";
$img_video=sprintf('<img src="%s" border="0" onclick="%s" style="cursor:pointer" title="%s" alt="%s" />',
URL_IMG.'bouton/voir_video.gif',
@@ -602,7 +601,6 @@ class Class_NoticeHtml {
$this->_translate->_("Replier"),
$this->_translate->_("Replier"));
- //$img_ecoute='<img src="'.URL_IMG.'bouton/ecouter.gif" border="0" onclick="afficher_media(\''.$id_div.'\',\''.$player.'\',\'real_audio\')" style="cursor:pointer" title="Ecouter un extrait">';
}
// autres
else
@@ -619,7 +617,7 @@ class Class_NoticeHtml {
"afficher_media('".$id_div."','close','')",
$this->_translate->_("Replier"),
$this->_translate->_("Replier"));
- if($morceau["url_ecoute"])
+ if (isset($morceau["url_ecoute"]))
{
$id_morceau="morceau_".$plage;
$img_ecoute='<div id="'.$id_morceau.'">';
diff --git a/library/Class/WebService/Abstract.php b/library/Class/WebService/Abstract.php
index 0f10da141ebfdac6cfaaac007e411340f561e8e9..b36229b3d025b7efdf3c8c6674e034557e4b13ee 100644
--- a/library/Class/WebService/Abstract.php
+++ b/library/Class/WebService/Abstract.php
@@ -35,5 +35,4 @@ abstract class Class_WebService_Abstract {
}
}
-?>
-
+?>
\ No newline at end of file
diff --git a/library/Class/WebService/AmazonSonores.php b/library/Class/WebService/AmazonSonores.php
index 3157112546faea6eb2e3068384d71267e333bbf4..76c2120af5d48c7ad61e2d7dda6b688a7348c09e 100644
--- a/library/Class/WebService/AmazonSonores.php
+++ b/library/Class/WebService/AmazonSonores.php
@@ -79,7 +79,6 @@ class Class_WebService_AmazonSonores extends Class_WebService_Amazon
{
$piste++;
$ret["morceaux"][$volume][$piste]["titre"]=$this->xml->get_value($node_piste);
- //$ret["morceaux"][$volume][$piste]["url_ecoute"]=$this->get_url_ecoute($ret["asin"],$volume,$piste);
$node_piste=$this->xml->get_sibling($node_piste);
}
$disc=$this->xml->get_sibling($disc);
@@ -115,16 +114,6 @@ class Class_WebService_AmazonSonores extends Class_WebService_Amazon
else return false;
}
-//------------------------------------------------------------------------------------------------------
-// Rend l'url pour ecouter les morceaux (OBSOLETE)
-//------------------------------------------------------------------------------------------------------
- function get_url_ecoute($asin,$volume,$track)
- {
- //$volume=str_repeat("0",3-strlen($volume)).$volume;
- //$track=str_repeat("0",3-strlen($track)).$track;
- //$url="http://www.amazon.fr/gp/music/clipserve/".$asin.$volume.$track."/1/ref=mu_sam_ra".$volume."_".$track;
- return false;
- }
//------------------------------------------------------------------------------------------------------
// Formatte et rend l'argument ean pour la requete
diff --git a/library/Class/WebService/Lastfm.php b/library/Class/WebService/Lastfm.php
index 921845fa16e6855236d5af526fb40c36f5030304..4a2a8de54cbc08569b51daa929cc3a36e00b64c5 100644
--- a/library/Class/WebService/Lastfm.php
+++ b/library/Class/WebService/Lastfm.php
@@ -110,8 +110,7 @@ class Class_WebService_Lastfm extends Class_WebService_Abstract {
$pos=strPos($data,">",$pos)+1;
$posfin=strPos($data,"</td>",$pos);
$lig=trim(substr($data,$pos,($posfin-$pos)));
- if(strlen($lig)>10)$url_ecoute=true;
- else $url_ecoute="";
+
// Morceau
$pos=strPos($data,'subjectCell',$pos);
if(!$pos) break;
@@ -122,14 +121,6 @@ class Class_WebService_Lastfm extends Class_WebService_Abstract {
$piste++;
$track=trim(str_replace('">', '', substr($lig,($pos+1))));
$album["morceaux"][$volume][$piste]["titre"]=strip_tags(str_replace('</a>','',$track));
- // Calcul url ecoute
- if($url_ecoute == true)
- {
- $track=str_replace(" ","+",$album["morceaux"][$volume][$piste]["titre"]);
- $auteur=str_replace(" ","+",$auteur);
- $rep=urlencode("'");
- //$album["morceaux"][$volume][$piste]["url_ecoute"]=str_replace("'",$rep,$track . ";" .$auteur);
- }
$data=substr($data,$posfin);
}
$album["nb_resultats"]=$piste;
@@ -271,4 +262,6 @@ class Class_WebService_Lastfm extends Class_WebService_Abstract {
if($value<1) return false;
return true;
}
-}
\ No newline at end of file
+}
+
+?>
\ No newline at end of file
diff --git a/library/Class/Xml.php b/library/Class/Xml.php
index 5d218fc834ed6d5f2a5d1ea9c3b9ba69b8862f6f..4b82730e966c2e7fc1aefec60709a3f5a7bb1fe3 100644
--- a/library/Class/Xml.php
+++ b/library/Class/Xml.php
@@ -198,4 +198,6 @@ class Class_Xml {
and $this->valeurs[$test]["level"]== $this->valeurs[$node]["level"])
return true;
}
-}
\ No newline at end of file
+}
+
+?>
\ No newline at end of file
diff --git a/tests/library/Class/WebService/LastfmTest.php b/tests/library/Class/WebService/LastfmTest.php
index 4633fe22fb270dd1be118901226a49f7c4494c5d..b7e2a9b454a54921a0ed00e38fae6131289a0a0c 100644
--- a/tests/library/Class/WebService/LastfmTest.php
+++ b/tests/library/Class/WebService/LastfmTest.php
@@ -74,13 +74,6 @@ class LastfmFixParserErrorTest extends LastfmParserTestCase {
}
- /** @test */
- public function firstMorceauUrlShouldBeLaChapelleDeGuillaumeTell() {
- $this->assertEquals('No.+1.+La+chapelle+de+Guillaume+Tell+(The+Chapel+of+William+Tell);Franz+Liszt',
- $this->_album['morceaux'][1][1]['url_ecoute']);
- }
-
-
/** @test */
public function lastMorceauShouldHaveTitleSursumCorda() {
$this->assertEquals('No. 7. Sursum corda (Lift up Your Hearts)',
@@ -118,13 +111,6 @@ class LastfmParserTest extends LastfmParserTestCase {
}
- /** @test */
- public function fourthMorceauUrlShouldBeSonnet47() {
- $this->assertEquals('No.+4.+Sonetto+47+del+Petrarca+(Sonnet+47+of+Petrarch);Franz+Liszt',
- $this->_album['morceaux'][1][4]['url_ecoute']);
- }
-
-
/** @test */
public function lastMorceauShouldHaveTitleTarantella() {
$this->assertEquals('III. Tarantella',
diff --git a/tests/library/ZendAfi/View/Helper/AudioJSPlayerTest.php b/tests/library/ZendAfi/View/Helper/AudioJSPlayerTest.php
index 34792706c814750e63876c1afa3d0ca0e787b322..14f46a31c65628b07cb672a59caad41d751c294a 100644
--- a/tests/library/ZendAfi/View/Helper/AudioJSPlayerTest.php
+++ b/tests/library/ZendAfi/View/Helper/AudioJSPlayerTest.php
@@ -34,7 +34,7 @@ class ZendAfi_View_Helper_AudioJsPlayerTest extends PHPUnit_Framework_TestCase {
/** @test */
public function scriptLoaderShouldContainsAudioJS() {
- $this->assertContains('<script src="'.BASE_URL.'/public/admin/js/audiojs/audiojs/audiomin.js?',
+ $this->assertContains('<script src="'.BASE_URL.'/public/admin/js/audiojs/audiojs/audio.min.js?',
Class_ScriptLoader::getInstance()->html());
}