Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.8.2' of dev.sourcefabric.org:airtime into 1.8.2

This commit is contained in:
martin 2011-06-06 12:01:58 -04:00
parent d591858528 1f045c8c7b
commit ebf7dd0e0d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
airtime_mvc/application/models/Soundcloud.php
View File

@ -28,7 +28,7 @@ class ATSoundcloud {
return $token; return $token;
} }
public function uploadTrack($filepath, $filename, $description, $tags=array(), $release=null, $genre=null) public function uploadTrack($filepath, $filename, $description, $tags=array(), $release=null, $genre=null)
{ {
if($this->getToken()) if($this->getToken())
{ {
@ -47,7 +47,7 @@ class ATSoundcloud {
'track[tag_list]' => $tags, 'track[tag_list]' => $tags,
'track[description]' => $description, 'track[description]' => $description,
'track[downloadable]' => true, 'track[downloadable]' => true,
); );
if(isset($release)) { if(isset($release)) {
@ -61,13 +61,13 @@ class ATSoundcloud {
$track_data['track[release_month]'] = $release[1]; $track_data['track[release_month]'] = $release[1];
$track_data['track[release_day]'] = $release[2]; $track_data['track[release_day]'] = $release[2];
} }
if (isset($genre) && $genre != "") { if (isset($genre) && $genre != "") {
$track_data['track[genre]'] = $genre; $track_data['track[genre]'] = $genre;
} }
else { else {
$default_genre = Application_Model_Preference::GetSoundCloudTrackType(); $default_genre = Application_Model_Preference::GetSoundCloudGenre();
if ($genre != "") { if ($default_genre != "") {
$track_data['track[genre]'] = $default_genre; $track_data['track[genre]'] = $default_genre;
} }
} }
@ -88,7 +88,7 @@ class ATSoundcloud {
); );
return $response["id"]; return $response["id"];
} }
} }
} }