X-Git-Url: http://git.dj3c1t.com/?a=blobdiff_plain;f=app%2Fcontrollers%2Fsources%2Fwaveforms.php;h=884d9c1f5bdf0e451cbc90285009a326515654b8;hb=0b1ecd8b7536944d54d74ffc836982de3654d98b;hp=eadba064b9f4dd1357246422d517c158627db054;hpb=80964d99dd2b63fda9276903d72537091e04ba17;p=mw_sourceml diff --git a/app/controllers/sources/waveforms.php b/app/controllers/sources/waveforms.php index eadba06..884d9c1 100644 --- a/app/controllers/sources/waveforms.php +++ b/app/controllers/sources/waveforms.php @@ -40,14 +40,14 @@ */ - function validate(){ + public function validate(){ if(PHP_SAPI != "cli"){ return "utilisation en ligne de commande uniquement"; } return true; } - function make(){ + public function make(){ $env = $this->env(); $data = $env->data(); $id_source = $_GET[$env->param("id")]; @@ -72,7 +72,8 @@ "ogg" => false, "mp3" => false ); - foreach($source["documents"] as $document){ + $source_documents = $source["reference"] ? $source["reference"]["documents"] : $source["documents"]; + foreach($source_documents as $document){ $file_name = false; if(substr(urldecode($document["url"]), 0, strlen($base_url)) == $base_url){ $file_name = $document_root.substr(urldecode($document["url"]), strlen($base_url)); @@ -122,7 +123,7 @@ } } - function make_all(){ + public function make_all(){ $env = $this->env(); $data = $env->data(); $base_url = $_GET[$env->param("from")]; @@ -147,7 +148,8 @@ "ogg" => false, "mp3" => false ); - foreach($source["documents"] as $document){ + $source_documents = $source["reference"] ? $source["reference"]["documents"] : $source["documents"]; + foreach($source_documents as $document){ $file_name = false; if(substr(urldecode($document["url"]), 0, strlen($base_url)) == $base_url){ $file_name = $document_root.substr(urldecode($document["url"]), strlen($base_url)); @@ -199,5 +201,3 @@ } } - -?> \ No newline at end of file