element->getSubform('preferences_danger') ?>
diff --git a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml
index 4ee3ff7f0..594468474 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml
@@ -1,112 +1,30 @@
-
-
- element->getElement('UploadToSoundcloudOption') ?>
- element->getElement('UploadToSoundcloudOption')->getLabel() ?>
-
- element->getElement('UploadToSoundcloudOption')->hasErrors()) : ?>
-
- element->getElement('UploadToSoundcloudOption')->getMessages() as $error): ?>
-
-
-
-
-
- element->getElement('SoundCloudDownloadbleOption') ?>
- element->getElement('SoundCloudDownloadbleOption')->getLabel() ?>
-
- element->getElement('SoundCloudDownloadbleOption')->hasErrors()) : ?>
-
- element->getElement('SoundCloudDownloadbleOption')->getMessages() as $error): ?>
-
-
-
-
- element->getElement('SoundCloudUser')->getLabel() ?>
-
-
-
- element->getElement('SoundCloudUser') ?>
- element->getElement('SoundCloudUser')->hasErrors()) : ?>
-
- element->getElement('SoundCloudUser')->getMessages() as $error): ?>
-
-
-
-
- element->getElement('SoundCloudPassword')->getLabel() ?>
-
-
-
- element->getElement('SoundCloudPassword') ?>
- element->getElement('SoundCloudPassword')->hasErrors()) : ?>
-
- element->getElement('SoundCloudPassword')->getMessages() as $error): ?>
-
-
-
-
- element->getElement('SoundCloudTags')->getLabel() ?>
-
-
- element->getElement('SoundCloudTags') ?>
- element->getElement('SoundCloudTags')->hasErrors()) : ?>
-
- element->getElement('SoundCloudTags')->getMessages() as $error): ?>
-
-
-
-
- element->getElement('SoundCloudGenre')->getLabel() ?>
-
-
- element->getElement('SoundCloudGenre') ?>
- element->getElement('SoundCloudGenre')->hasErrors()) : ?>
-
- element->getElement('SoundCloudGenre')->getMessages() as $error): ?>
-
-
-
-
- element->getElement('SoundCloudTrackType')->getLabel() ?>
-
-
- element->getElement('SoundCloudTrackType') ?>
- element->getElement('SoundCloudTrackType')->hasErrors()) : ?>
-
- element->getElement('SoundCloudTrackType')->getMessages() as $error): ?>
-
-
-
-
- element->getElement('SoundCloudLicense')->getLabel() ?>
-
-
- element->getElement('SoundCloudLicense') ?>
- element->getElement('SoundCloudLicense')->hasErrors()) : ?>
-
- element->getElement('SoundCloudLicense')->getMessages() as $error): ?>
-
-
-
+
+element->getElement('SoundCloudTrackType')->getLabel() ?>
+
+
+element->getElement('SoundCloudTrackType') ?>
+element->getElement('SoundCloudTrackType')->hasErrors()) : ?>
+
+element->getElement('SoundCloudTrackType')->getMessages() as $error): ?>
+
+
+
+
+
+
+ hasAccessToken()) {
+ echo $this->element->getElement('SoundCloudDisconnect')->render();
+ } else {
+ echo $this->element->getElement('SoundCloudConnect')->render();
+ }
+ ?>
+
+ element->getElement('SoundCloudLicense')->render() ?>
+
+ element->getElement('SoundCloudSharing')->render() ?>
diff --git a/airtime_mvc/build/build.properties b/airtime_mvc/build/build.properties
index ee5a5f8fa..556862bb1 100644
--- a/airtime_mvc/build/build.properties
+++ b/airtime_mvc/build/build.properties
@@ -1,6 +1,6 @@
#Note: project.home is automatically generated by the propel-install script.
#Any manual changes to this value will be overwritten.
-project.home = /home/sourcefabric/dev/Airtime-SaaS/Airtime/airtime_mvc
+project.home = /home/sourcefabric/dev/Airtime/airtime_mvc
project.build = ${project.home}/build
#Database driver
diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml
index ece788ea7..03bad21cb 100644
--- a/airtime_mvc/build/schema.xml
+++ b/airtime_mvc/build/schema.xml
@@ -531,4 +531,14 @@
+
diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql
index 392539496..3d7aaf39a 100644
--- a/airtime_mvc/build/sql/schema.sql
+++ b/airtime_mvc/build/sql/schema.sql
@@ -670,6 +670,22 @@ CREATE TABLE "cc_playout_history_template_field"
PRIMARY KEY ("id")
);
+-----------------------------------------------------------------------
+-- third_party_track_references
+-----------------------------------------------------------------------
+
+DROP TABLE IF EXISTS "third_party_track_references" CASCADE;
+
+CREATE TABLE "third_party_track_references"
+(
+ "id" serial NOT NULL,
+ "service" VARCHAR(512) NOT NULL,
+ "foreign_id" INTEGER NOT NULL,
+ "file_id" INTEGER NOT NULL,
+ "status" VARCHAR(256) NOT NULL,
+ PRIMARY KEY ("id")
+);
+
ALTER TABLE "cc_files" ADD CONSTRAINT "cc_files_owner_fkey"
FOREIGN KEY ("owner_id")
REFERENCES "cc_subjs" ("id");
@@ -831,3 +847,8 @@ ALTER TABLE "cc_playout_history_template_field" ADD CONSTRAINT "cc_playout_histo
FOREIGN KEY ("template_id")
REFERENCES "cc_playout_history_template" ("id")
ON DELETE CASCADE;
+
+ALTER TABLE "third_party_track_references" ADD CONSTRAINT "track_reference_fkey"
+ FOREIGN KEY ("file_id")
+ REFERENCES "cc_playout_history_template" ("id")
+ ON DELETE CASCADE;
diff --git a/airtime_mvc/library/soundcloud-api/README.md b/airtime_mvc/library/soundcloud-api/README.md
deleted file mode 100644
index 68df3a21a..000000000
--- a/airtime_mvc/library/soundcloud-api/README.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# SoundCloud PHP API Wrapper
-
-## Introduction
-
-A wrapper for the SoundCloud API written in PHP with support for authentication using [OAuth 2.0](http://oauth.net/2/).
-
-The wrapper got a real overhaul with version 2.0. The current version was written with [PEAR](http://pear.php.net/) in mind and can easily by distributed as a PEAR package.
-
-## Getting started
-
-Check out the [getting started](https://github.com/mptre/php-soundcloud/wiki/OAuth-2) wiki entry for further reference on how to get started. Also make sure to check out the [demo application](https://github.com/mptre/ci-soundcloud) for some example code.
-
-
-## Examples
-
-The wrapper includes convenient methods used to perform HTTP requests on behalf of the authenticated user. Below you'll find a few quick examples.
-
-Ofcourse you need to handle the authentication first before being able to request and modify protect resources as demonstrated below. Therefor I refer to the [demo application](https://github.com/mptre/ci-soundcloud) which got some example code on how to handle authentication.
-
-### GET
-
-
try {
- $response = json_decode($soundcloud->get('me'), true);
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
- exit($e->getMessage());
-}
-
-### POST
-
-
$comment = <<<EOH
-<comment>
- <body>Yeah!</body>
-</comment>
-EOH;
-
-try {
- $response = json_decode(
- $soundcloud->post(
- 'tracks/1/comments',
- $comment,
- array(CURLOPT_HTTPHEADER => array('Content-Type: application/xml'))
- ),
- true
- );
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
- exit($e->getMessage());
-}
-
-### PUT
-
-
$track = <<<EOH
-<track>
- <downloadable>true</downloadable>
-</track>
-EOH;
-
-try {
- $response = json_decode(
- $soundcloud->put(
- 'tracks/1',
- $track,
- array(CURLOPT_HTTPHEADER => array('Content-Type: application/xml'))
- ),
- true
- );
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
- exit($e->getMessage());
-}
-
-### DELETE
-
-
try {
- $response = json_decode($soundcloud->delete('tracks/1'), true);
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
- exit($e->getMessage());
-}
-
-### DOWNLOAD TRACK
-
-
try {
- $track = $soundcloud->download(1337);
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
- exit($e->getMessage());
-}
-
-// do something clever with $track. Save to file perhaps?
-
-## Feedback and questions
-
-Found a bug or missing a feature? Don't hesitate to create a new issue here on GitHub. Or contact me [directly](https://github.com/mptre).
-
-Also make sure to check out the official [documentation](https://github.com/soundcloud/api/wiki/) and the join [Google Group](https://groups.google.com/group/soundcloudapi?pli=1) in order to stay updated.
-
-## License
-
-Copyright (c) 2011 Anton Lindqvist
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/airtime_mvc/library/soundcloud-api/Services/Soundcloud.php b/airtime_mvc/library/soundcloud-api/Services/Soundcloud.php
deleted file mode 100644
index 9eba8eade..000000000
--- a/airtime_mvc/library/soundcloud-api/Services/Soundcloud.php
+++ /dev/null
@@ -1,737 +0,0 @@
-
- * @copyright 2010 Anton Lindqvist
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link http://github.com/mptre/php-soundcloud
- */
-class Services_Soundcloud {
-
- /**
- * Custom cURL option.
- *
- * @access public
- *
- * @var integer
- */
- const CURLOPT_OAUTH_TOKEN = 173;
-
- /**
- * Access token returned by the service provider after a successful authentication.
- *
- * @access private
- *
- * @var string
- */
- private $_accessToken;
-
- /**
- * Version of the API to use.
- *
- * @access private
- *
- * @var integer
- */
- private static $_apiVersion = 1;
-
- /**
- * Supported audio MIME types.
- *
- * @access private
- *
- * @var array
- */
- private static $_audioMimeTypes = array(
- 'aac' => 'video/mp4',
- 'aiff' => 'audio/x-aiff',
- 'flac' => 'audio/flac',
- 'mp3' => 'audio/mpeg',
- 'ogg' => 'audio/ogg',
- 'wav' => 'audio/x-wav'
- );
-
- /**
- * OAuth client id.
- *
- * @access private
- *
- * @var string
- */
- private $_clientId;
-
- /**
- * OAuth client secret.
- *
- * @access private
- *
- * @var string
- */
- private $_clientSecret;
-
- /**
- * Development mode.
- *
- * @access private
- *
- * @var boolean
- */
- private $_development;
-
- /**
- * Available API domains.
- *
- * @access private
- *
- * @var array
- */
- private static $_domains = array(
- 'development' => 'sandbox-soundcloud.com',
- 'production' => 'soundcloud.com'
- );
-
- /**
- * HTTP response body from the last request.
- *
- * @access private
- *
- * @var string
- */
- private $_lastHttpResponseBody;
-
- /**
- * HTTP response code from the last request.
- *
- * @access private
- *
- * @var integer
- */
- private $_lastHttpResponseCode;
-
- /**
- * HTTP response headers from last request.
- *
- * @access private
- *
- * @var array
- */
- private $_lastHttpResponseHeaders;
-
- /**
- * OAuth paths.
- *
- * @access private
- *
- * @var array
- */
- private static $_paths = array(
- 'authorize' => 'connect',
- 'access_token' => 'oauth2/token',
- );
-
- /**
- * OAuth redirect uri.
- *
- * @access private
- *
- * @var string
- */
- private $_redirectUri;
-
- /**
- * API response format MIME type.
- *
- * @access private
- *
- * @var string
- */
- private $_requestFormat;
-
- /**
- * Available response formats.
- *
- * @access private
- *
- * @var array
- */
- private static $_responseFormats = array(
- '*' => '*/*',
- 'json' => 'application/json',
- 'xml' => 'application/xml'
- );
-
- /**
- * HTTP user agent.
- *
- * @access private
- *
- * @var string
- */
- private static $_userAgent = 'PHP-SoundCloud';
-
- /**
- * Class version.
- *
- * @var string
- */
- public $version;
-
- /**
- * Constructor.
- *
- * @param string $clientId OAuth client id
- * @param string $clientSecret OAuth client secret
- * @param string $redirectUri OAuth redirect uri
- * @param boolean $development Sandbox mode
- *
- * @throws Services_Soundcloud_Missing_Client_Id_Exception when missing client id
- * @return void
- */
- function __construct($clientId, $clientSecret, $redirectUri = null, $development = false) {
- if (empty($clientId)) {
- throw new Services_Soundcloud_Missing_Client_Id_Exception();
- }
-
- $this->_clientId = $clientId;
- $this->_clientSecret = $clientSecret;
- $this->_redirectUri = $redirectUri;
- $this->_development = $development;
- $this->_responseFormat = self::$_responseFormats['json'];
- $this->version = Services_Soundcloud_Version::get();
- }
-
- /**
- * Get authorization URL.
- *
- * @param array $params Optional query string parameters
- *
- * @return string
- * @see Soundcloud::_buildUrl()
- */
- function getAuthorizeUrl($params = array()) {
- $defaultParams = array(
- 'client_id' => $this->_clientId,
- 'redirect_uri' => $this->_redirectUri,
- 'response_type' => 'code'
- );
- $params = array_merge($defaultParams, $params);
-
- return $this->_buildUrl(self::$_paths['authorize'], $params, false);
- }
-
- /**
- * Get access token URL.
- *
- * @param array $params Optional query string parameters
- *
- * @return string
- * @see Soundcloud::_buildUrl()
- */
- function getAccessTokenUrl($params = array()) {
- return $this->_buildUrl(self::$_paths['access_token'], $params, false);
- }
-
- /**
- * Retrieve access token.
- *
- * @param string $code OAuth code returned from the service provider
- * @param array $postData Optional post data
- * @param array $curlOptions Optional cURL options
- *
- * @return mixed
- * @see Soundcloud::_getAccessToken()
- */
- function accessToken($code, $postData = array(), $curlOptions = array()) {
- $defaultPostData = array(
- 'code' => $code,
- 'client_id' => $this->_clientId,
- 'client_secret' => $this->_clientSecret,
- 'redirect_uri' => $this->_redirectUri,
- 'grant_type' => 'authorization_code'
- );
- $postData = array_merge($defaultPostData, $postData);
-
- return $this->_getAccessToken($postData, $curlOptions);
- }
-
- /**
- * Retrieve access token.
- *
- * @param string $username
- * @param string $password
- * @param array $postData Optional post data
- * @param array $curlOptions Optional cURL options
- *
- * @return mixed
- * @see Soundcloud::_getAccessToken()
- */
- function accessTokenResourceOwner($username, $password, $postData = array(), $curlOptions = array()) {
- $defaultPostData = array(
- 'client_id' => $this->_clientId,
- 'client_secret' => $this->_clientSecret,
- 'grant_type' => 'password',
- 'username' => $username,
- 'password' => $password
- );
- $postData = array_merge($defaultPostData, $postData);
-
- return $this->_getAccessToken($postData, $curlOptions);
- }
-
- /**
- * Refresh access token.
- *
- * @param string $refreshToken
- * @param array $postData Optional post data
- * @param array $curlOptions Optional cURL options
- *
- * @return mixed
- * @see Soundcloud::_getAccessToken()
- */
- function accessTokenRefresh($refreshToken, $postData = array(), $curlOptions = array()) {
- $defaultPostData = array(
- 'refresh_token' => $refreshToken,
- 'client_id' => $this->_clientId,
- 'client_secret' => $this->_clientSecret,
- 'redirect_uri' => $this->_redirectUri,
- 'grant_type' => 'refresh_token'
- );
- $postData = array_merge($defaultPostData, $postData);
-
- return $this->_getAccessToken($postData, $curlOptions);
- }
-
- /**
- * Get access token.
- *
- * @return mixed
- */
- function getAccessToken() {
- return $this->_accessToken;
- }
-
- /**
- * Get API version.
- *
- * @return integer
- */
- function getApiVersion() {
- return self::$_apiVersion;
- }
-
- /**
- * Get the corresponding MIME type for a given file extension.
- *
- * @param string $extension
- *
- * @return string
- * @throws Services_Soundcloud_Unsupported_Audio_Format_Exception if the format is unsupported
- */
- function getAudioMimeType($extension) {
- if (array_key_exists($extension, self::$_audioMimeTypes)) {
- return self::$_audioMimeTypes[$extension];
- } else {
- throw new Services_Soundcloud_Unsupported_Audio_Format_Exception();
- }
- }
-
- /**
- * Get development mode.
- *
- * @return boolean
- */
- function getDevelopment() {
- return $this->_development;
- }
-
- /**
- * Get HTTP response header.
- *
- * @param string $header Name of the header
- *
- * @return mixed
- */
- function getHttpHeader($header) {
- if (is_array($this->_lastHttpResponseHeaders)
- && array_key_exists($header, $this->_lastHttpResponseHeaders)
- ) {
- return $this->_lastHttpResponseHeaders[$header];
- } else {
- return false;
- }
- }
-
- /**
- * Get redirect uri.
- *
- * @return mixed
- */
- function getRedirectUri() {
- return $this->_redirectUri;
- }
-
- /**
- * Get response format.
- *
- * @return string
- */
- function getResponseFormat() {
- return $this->_responseFormat;
- }
-
- /**
- * Set access token.
- *
- * @param string $accessToken
- *
- * @return object
- */
- function setAccessToken($accessToken) {
- $this->_accessToken = $accessToken;
-
- return $this;
- }
-
- /**
- * Set redirect uri.
- *
- * @param string $redirectUri
- *
- * @return object
- */
- function setRedirectUri($redirectUri) {
- $this->_redirectUri = $redirectUri;
-
- return $this;
- }
-
- /**
- * Set response format.
- *
- * @param string $format Could either be xml or json
- *
- * @throws Services_Soundcloud_Unsupported_Response_Format_Exception if the given response format isn't supported
- * @return object
- */
- function setResponseFormat($format) {
- if (array_key_exists($format, self::$_responseFormats)) {
- $this->_responseFormat = self::$_responseFormats[$format];
- } else {
- throw new Services_Soundcloud_Unsupported_Response_Format_Exception();
- }
-
- return $this;
- }
-
- /**
- * Set development mode.
- *
- * @param boolean $development
- *
- * @return object
- */
- function setDevelopment($development) {
- $this->_development = $development;
-
- return $this;
- }
-
- /**
- * Send a GET HTTP request.
- *
- * @param string $path URI to request
- * @param array $params Optional query string parameters
- * @param array $curlOptions Optional cURL options
- *
- * @return mixed
- * @see Soundcloud::_request()
- */
- function get($path, $params = array(), $curlOptions = array()) {
- $url = $this->_buildUrl($path, $params);
-
- return $this->_request($url, $curlOptions);
- }
-
- /**
- * Send a POST HTTP request.
- *
- * @param string $path URI to request
- * @param array $postData Optional post data
- * @param array $curlOptions Optional cURL options
- *
- * @return mixed
- * @see Soundcloud::_request()
- */
- function post($path, $postData = array(), $curlOptions = array()) {
- $url = $this->_buildUrl($path);
- $options = array(CURLOPT_POST => true, CURLOPT_POSTFIELDS => $postData);
- $options += $curlOptions;
-
- return $this->_request($url, $options);
- }
-
- /**
- * Send a PUT HTTP request.
- *
- * @param string $path URI to request
- * @param array $postData Optional post data
- * @param array $curlOptions Optional cURL options
- *
- * @return mixed
- * @see Soundcloud::_request()
- */
- function put($path, $postData, $curlOptions = array()) {
- $url = $this->_buildUrl($path);
- $options = array(
- CURLOPT_CUSTOMREQUEST => 'PUT',
- CURLOPT_POSTFIELDS => $postData
- );
- $options += $curlOptions;
-
- return $this->_request($url, $options);
- }
-
- /**
- * Send a DELETE HTTP request.
- *
- * @param string $path URI to request
- * @param array $params Optional query string parameters
- * @param array $curlOptions Optional cURL options
- *
- * @return mixed
- * @see Soundcloud::_request()
- */
- function delete($path, $params = array(), $curlOptions = array()) {
- $url = $this->_buildUrl($path, $params);
- $options = array(CURLOPT_CUSTOMREQUEST => 'DELETE');
- $options += $curlOptions;
-
- return $this->_request($url, $options);
- }
-
- /**
- * Download track.
- *
- * @param integer $trackId
- * @param array Optional query string parameters
- * @param array $curlOptions Optional cURL options
- *
- * @return mixed
- * @see Soundcloud::_request()
- */
- function download($trackId, $params = array(), $curlOptions = array()) {
- $lastResponseFormat = array_pop(
- preg_split('/\//', $this->getResponseFormat())
- );
- $defaultParams = array('oauth_token' => $this->getAccessToken());
- $defaultCurlOptions = array(
- CURLOPT_FOLLOWLOCATION => true,
- self::CURLOPT_OAUTH_TOKEN => false
- );
- $url = $this->_buildUrl(
- 'tracks/' . $trackId . '/download',
- array_merge($defaultParams, $params)
- );
- $options = $defaultCurlOptions + $curlOptions;
-
- $this->setResponseFormat('*');
-
- $response = $this->_request($url, $options);
-
- // rollback to the previously defined response format.
- $this->setResponseFormat($lastResponseFormat);
-
- return $response;
- }
-
- /**
- * Construct default HTTP headers including response format and authorization.
- *
- * @param boolean Include access token or not
- *
- * @return array $headers
- */
- protected function _buildDefaultHeaders($includeAccessToken = true) {
- $headers = array();
-
- if ($this->_responseFormat) {
- array_push($headers, 'Accept: ' . $this->_responseFormat);
- }
-
- if ($includeAccessToken && $this->_accessToken) {
- array_push($headers, 'Authorization: OAuth ' . $this->_accessToken);
- }
-
- return $headers;
- }
-
- /**
- * Construct a URL.
- *
- * @param string $path Relative or absolute URI
- * @param array $params Optional query string parameters
- * @param boolean $includeVersion Include API version
- *
- * @return string $url
- */
- protected function _buildUrl($path, $params = null, $includeVersion = true) {
- if (preg_match('/^https?\:\/\//', $path)) {
- $url = $path;
- } else {
- $url = 'https://';
- $url .= (!preg_match('/connect/', $path)) ? 'api.' : '';
- $url .= ($this->_development)
- ? self::$_domains['development']
- : self::$_domains['production'];
- $url .= '/';
- $url .= ($includeVersion) ? 'v' . self::$_apiVersion . '/' : '';
- $url .= $path;
- }
-
- $url .= (count($params)) ? '?' . http_build_query($params) : '';
-
- return $url;
- }
-
- /**
- * Retrieve access token.
- *
- * @param array $postData Post data
- * @param array $curlOptions Optional cURL options
- *
- * @return mixed
- */
- protected function _getAccessToken($postData, $curlOptions = array()) {
- $options = array(CURLOPT_POST => true, CURLOPT_POSTFIELDS => $postData);
- $options += $curlOptions;
- $response = json_decode(
- $this->_request($this->getAccessTokenUrl(), $options),
- true
- );
-
- if (array_key_exists('access_token', $response)) {
- $this->_accessToken = $response['access_token'];
-
- return $response;
- } else {
- return false;
- }
- }
-
- /**
- * Get HTTP user agent.
- *
- * @access protected
- *
- * @return string
- */
- protected function _getUserAgent() {
- return self::$_userAgent . '/' . $this->version;
- }
-
- /**
- * Parse HTTP response headers.
- *
- * @param string $headers
- *
- * @return array
- */
- protected function _parseHttpHeaders($headers) {
- $headers = preg_split('/\n/', trim($headers));
- $parsedHeaders = array();
-
- foreach ($headers as $header) {
- if (!preg_match('/\:\s/', $header)) {
- continue;
- }
-
- list($key, $val) = preg_split('/\:\s/', $header, 2);
- $key = str_replace('-', '_', strtolower($key));
- $val = trim($val);
-
- $parsedHeaders[$key] = $val;
- }
-
- return $parsedHeaders;
- }
-
- /**
- * Validates HTTP response code.
- *
- * @access protected
- *
- * @return boolean
- */
- protected function _validResponseCode($code) {
- return (bool)preg_match('/^20[0-9]{1}$/', $code);
- }
-
- /**
- * Performs the actual HTTP request using curl. Can be overwritten by extending classes.
- *
- * @access protected
- *
- * @param string $url
- * @param array $curlOptions Optional cURL options
- *
- * @throws Services_Soundcloud_Invalid_Http_Response_Code_Exception if the response code isn't valid
- * @return mixed
- */
- protected function _request($url, $curlOptions = array()) {
- $ch = curl_init();
- $options = array(
- CURLOPT_URL => $url,
- CURLOPT_HEADER => true,
- CURLOPT_RETURNTRANSFER => true,
- CURLOPT_USERAGENT => $this->_getUserAgent()
- );
- $options += $curlOptions;
-
- if (array_key_exists(self::CURLOPT_OAUTH_TOKEN, $options)) {
- $includeAccessToken = $options[self::CURLOPT_OAUTH_TOKEN];
- unset($options[self::CURLOPT_OAUTH_TOKEN]);
- } else {
- $includeAccessToken = true;
- }
-
- if (array_key_exists(CURLOPT_HTTPHEADER, $options)) {
- $options[CURLOPT_HTTPHEADER] = array_merge(
- $this->_buildDefaultHeaders(),
- $curlOptions[CURLOPT_HTTPHEADER]
- );
- } else {
- $options[CURLOPT_HTTPHEADER] = $this->_buildDefaultHeaders($includeAccessToken);
- }
-
- curl_setopt_array($ch, $options);
-
- $data = curl_exec($ch);
- $info = curl_getinfo($ch);
-
- curl_close($ch);
-
- $this->_lastHttpResponseHeaders = $this->_parseHttpHeaders(
- substr($data, 0, $info['header_size'])
- );
- $this->_lastHttpResponseBody = substr($data, $info['header_size']);
- $this->_lastHttpResponseCode = $info['http_code'];
-
- if ($this->_validResponseCode($this->_lastHttpResponseCode)) {
- return $this->_lastHttpResponseBody;
- } else {
- throw new Services_Soundcloud_Invalid_Http_Response_Code_Exception(
- null,
- 0,
- $this->_lastHttpResponseBody,
- $this->_lastHttpResponseCode
- );
- }
- }
-
-}
diff --git a/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Exception.php b/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Exception.php
deleted file mode 100644
index 76e3370ad..000000000
--- a/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Exception.php
+++ /dev/null
@@ -1,146 +0,0 @@
-
- * @copyright 2010 Anton Lindqvist
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link http://github.com/mptre/php-soundcloud
- */
-class Services_Soundcloud_Missing_Client_Id_Exception extends Exception {
-
- /**
- * Default message.
- *
- * @access protected
- *
- * @var string
- */
- protected $message = 'All requests must include a consumer key. Referred to as client_id in OAuth2.';
-
-}
-
-/**
- * Soundcloud invalid HTTP response code exception.
- *
- * @category Services
- * @package Services_Soundcloud
- * @author Anton Lindqvist
- * @copyright 2010 Anton Lindqvist
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link http://github.com/mptre/php-soundcloud
- */
-class Services_Soundcloud_Invalid_Http_Response_Code_Exception extends Exception {
-
- /**
- * HTTP response body.
- *
- * @access protected
- *
- * @var string
- */
- protected $httpBody;
-
- /**
- * HTTP response code.
- *
- * @access protected
- *
- * @var integer
- */
- protected $httpCode;
-
- /**
- * Default message.
- *
- * @access protected
- *
- * @var string
- */
- protected $message = 'The requested URL responded with HTTP code %d.';
-
- /**
- * Constructor.
- *
- * @param string $message
- * @param string $code
- * @param string $httpBody
- * @param integer $httpCode
- *
- * @return void
- */
- function __construct($message = null, $code = 0, $httpBody = null, $httpCode = 0) {
- $this->httpBody = $httpBody;
- $this->httpCode = $httpCode;
- $message = sprintf($this->message, $httpCode);
-
- parent::__construct($message, $code);
- }
-
- /**
- * Get HTTP response body.
- *
- * @return mixed
- */
- function getHttpBody() {
- return $this->httpBody;
- }
-
- /**
- * Get HTTP response code.
- *
- * @return mixed
- */
- function getHttpCode() {
- return $this->httpCode;
- }
-
-}
-
-/**
- * Soundcloud unsupported response format exception.
- *
- * @category Services
- * @package Services_Soundcloud
- * @author Anton Lindqvist
- * @copyright 2010 Anton Lindqvist
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link http://github.com/mptre/php-soundcloud
- */
-class Services_Soundcloud_Unsupported_Response_Format_Exception extends Exception {
-
- /**
- * Default message.
- *
- * @access protected
- *
- * @var string
- */
- protected $message = 'The given response format is unsupported.';
-
-}
-
-/**
- * Soundcloud unsupported audio format exception.
- *
- * @category Services
- * @package Services_Soundcloud
- * @author Anton Lindqvist
- * @copyright 2010 Anton Lindqvist
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link http://github.com/mptre/php-soundcloud
- */
-class Services_Soundcloud_Unsupported_Audio_Format_Exception extends Exception {
-
- /**
- * Default message.
- *
- * @access protected
- *
- * @var string
- */
- protected $message = 'The given audio format is unsupported.';
-
-}
diff --git a/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Version.php b/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Version.php
deleted file mode 100644
index 6ee964a23..000000000
--- a/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Version.php
+++ /dev/null
@@ -1,22 +0,0 @@
-
- * @copyright 2010 Anton Lindqvist
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link http://github.com/mptre/php-soundcloud
- */
-class Services_Soundcloud_Version {
-
- const MAJOR = 2;
- const MINOR = 1;
- const PATCH = 1;
-
- public static function get() {
- return implode('.', array(self::MAJOR, self::MINOR, self::PATCH));
- }
-
-}
diff --git a/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test.php b/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test.php
deleted file mode 100644
index cfc3e9c4a..000000000
--- a/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test.php
+++ /dev/null
@@ -1,310 +0,0 @@
-soundcloud = new Services_Soundcloud_Expose(
- '1337',
- '1337',
- 'http://soundcloud.local/callback'
- );
- }
-
- function tearDown() {
- $this->soundcloud = null;
- }
-
- function testVersionFormat() {
- $this->assertRegExp(
- '/^[0-9]+\.[0-9]+\.[0-9]+$/',
- Services_Soundcloud_Version::get()
- );
- }
-
- function testGetUserAgent() {
- $this->assertRegExp(
- '/^PHP\-SoundCloud\/[0-9]+\.[0-9]+\.[0-9]+$/',
- $this->soundcloud->getUserAgent()
- );
- }
-
- function testApiVersion() {
- $this->assertEquals(1, $this->soundcloud->getApiVersion());
- }
-
- function testGetAudioMimeTypes() {
- $supportedExtensions = array(
- 'aac' => 'video/mp4',
- 'aiff' => 'audio/x-aiff',
- 'flac' => 'audio/flac',
- 'mp3' => 'audio/mpeg',
- 'ogg' => 'audio/ogg',
- 'wav' => 'audio/x-wav'
- );
- $unsupportedExtensions = array('gif', 'html', 'jpg', 'mp4', 'xml', 'xspf');
-
- foreach ($supportedExtensions as $extension => $mimeType) {
- $this->assertEquals(
- $mimeType,
- $this->soundcloud->getAudioMimeType($extension)
- );
- }
-
- foreach ($unsupportedExtensions as $extension => $mimeType) {
- $this->setExpectedException('Services_Soundcloud_Unsupported_Audio_Format_Exception');
-
- $this->soundcloud->getAudioMimeType($extension);
- }
- }
-
- function testGetAuthorizeUrl() {
- $this->assertEquals(
- 'https://soundcloud.com/connect?client_id=1337&redirect_uri=http%3A%2F%2Fsoundcloud.local%2Fcallback&response_type=code',
- $this->soundcloud->getAuthorizeUrl()
- );
- }
-
- function testGetAuthorizeUrlWithCustomQueryParameters() {
- $this->assertEquals(
- 'https://soundcloud.com/connect?client_id=1337&redirect_uri=http%3A%2F%2Fsoundcloud.local%2Fcallback&response_type=code&foo=bar',
- $this->soundcloud->getAuthorizeUrl(array('foo' => 'bar'))
- );
-
- $this->assertEquals(
- 'https://soundcloud.com/connect?client_id=1337&redirect_uri=http%3A%2F%2Fsoundcloud.local%2Fcallback&response_type=code&foo=bar&bar=foo',
- $this->soundcloud->getAuthorizeUrl(array('foo' => 'bar', 'bar' => 'foo'))
- );
- }
-
- function testGetAccessTokenUrl() {
- $this->assertEquals(
- 'https://api.soundcloud.com/oauth2/token',
- $this->soundcloud->getAccessTokenUrl()
- );
- }
-
- function testSetAccessToken() {
- $this->soundcloud->setAccessToken('1337');
-
- $this->assertEquals('1337', $this->soundcloud->getAccessToken());
- }
-
- function testSetDevelopment() {
- $this->soundcloud->setDevelopment(true);
-
- $this->assertTrue($this->soundcloud->getDevelopment());
- }
-
- function testSetRedirectUri() {
- $this->soundcloud->setRedirectUri('http://soundcloud.local/callback');
-
- $this->assertEquals(
- 'http://soundcloud.local/callback',
- $this->soundcloud->getRedirectUri()
- );
- }
-
- function testDefaultResponseFormat() {
- $this->assertEquals(
- 'application/json',
- $this->soundcloud->getResponseFormat()
- );
- }
-
- function testSetResponseFormatHtml() {
- $this->setExpectedException('Services_Soundcloud_Unsupported_Response_Format_Exception');
-
- $this->soundcloud->setResponseFormat('html');
- }
-
- function testSetResponseFormatAll() {
- $this->soundcloud->setResponseFormat('*');
-
- $this->assertEquals(
- '*/*',
- $this->soundcloud->getResponseFormat()
- );
- }
-
- function testSetResponseFormatJson() {
- $this->soundcloud->setResponseFormat('json');
-
- $this->assertEquals(
- 'application/json',
- $this->soundcloud->getResponseFormat()
- );
- }
-
- function testSetResponseFormatXml() {
- $this->soundcloud->setResponseFormat('xml');
-
- $this->assertEquals(
- 'application/xml',
- $this->soundcloud->getResponseFormat()
- );
- }
-
- function testResponseCodeSuccess() {
- $this->assertTrue($this->soundcloud->validResponseCode(200));
- }
-
- function testResponseCodeRedirect() {
- $this->assertFalse($this->soundcloud->validResponseCode(301));
- }
-
- function testResponseCodeClientError() {
- $this->assertFalse($this->soundcloud->validResponseCode(400));
- }
-
- function testResponseCodeServerError() {
- $this->assertFalse($this->soundcloud->validResponseCode(500));
- }
-
- function testBuildDefaultHeaders() {
- $this->assertEquals(
- array('Accept: application/json'),
- $this->soundcloud->buildDefaultHeaders()
- );
- }
-
- function testBuildDefaultHeadersWithAccessToken() {
- $this->soundcloud->setAccessToken('1337');
-
- $this->assertEquals(
- array('Accept: application/json', 'Authorization: OAuth 1337'),
- $this->soundcloud->buildDefaultHeaders()
- );
- }
-
- function testBuildUrl() {
- $this->assertEquals(
- 'https://api.soundcloud.com/v1/me',
- $this->soundcloud->buildUrl('me')
- );
- }
-
- function testBuildUrlWithQueryParameters() {
- $this->assertEquals(
- 'https://api.soundcloud.com/v1/tracks?q=rofl+dubstep',
- $this->soundcloud->buildUrl(
- 'tracks',
- array('q' => 'rofl dubstep')
- )
- );
-
- $this->assertEquals(
- 'https://api.soundcloud.com/v1/tracks?q=rofl+dubstep&filter=public',
- $this->soundcloud->buildUrl(
- 'tracks',
- array('q' => 'rofl dubstep', 'filter' => 'public')
- )
- );
- }
-
- function testBuildUrlWithDevelopmentDomain() {
- $this->soundcloud->setDevelopment(true);
-
- $this->assertEquals(
- 'https://api.sandbox-soundcloud.com/v1/me',
- $this->soundcloud->buildUrl('me')
- );
- }
-
- function testBuildUrlWithoutApiVersion() {
- $this->assertEquals(
- 'https://api.soundcloud.com/me',
- $this->soundcloud->buildUrl('me', null, false)
- );
- }
-
- function testBuildUrlWithAbsoluteUrl() {
- $this->assertEquals(
- 'https://api.soundcloud.com/me',
- $this->soundcloud->buildUrl('https://api.soundcloud.com/me')
- );
- }
-
- /**
- * @dataProvider dataProviderHttpHeaders
- */
- function testParseHttpHeaders($rawHeaders, $expectedHeaders) {
- $parsedHeaders = $this->soundcloud->parseHttpHeaders($rawHeaders);
-
- foreach ($parsedHeaders as $key => $val) {
- $this->assertEquals($val, $expectedHeaders[$key]);
- }
- }
-
- function testSoundcloudMissingConsumerKeyException() {
- $this->setExpectedException('Services_Soundcloud_Missing_Client_Id_Exception');
-
- $soundcloud = new Services_Soundcloud('', '');
- }
-
- function testSoundcloudInvalidHttpResponseCodeException() {
- $this->setExpectedException('Services_Soundcloud_Invalid_Http_Response_Code_Exception');
-
- $this->soundcloud->get('me');
- }
-
- /**
- * @dataProvider dataProviderSoundcloudInvalidHttpResponseCode
- */
- function testSoundcloudInvalidHttpResponseCode($expectedHeaders) {
- try {
- $this->soundcloud->get('me');
- } catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
- $this->assertEquals(
- '{"error":"401 - Unauthorized"}',
- $e->getHttpBody()
- );
-
- $this->assertEquals(401, $e->getHttpCode());
-
- foreach ($expectedHeaders as $key => $val) {
- $this->assertEquals(
- $val,
- $this->soundcloud->getHttpHeader($key)
- );
- }
- }
- }
-
- static function dataProviderHttpHeaders() {
- $rawHeaders = << 'Wed, 17 Nov 2010 15:39:52 GMT',
- 'cache_control' => 'public',
- 'content_type' => 'text/html; charset=utf-8',
- 'content_encoding' => 'gzip',
- 'server' => 'foobar',
- 'content_length' => '1337'
- );
-
- return array(array($rawHeaders, $expectedHeaders));
- }
-
- static function dataProviderSoundcloudInvalidHttpResponseCode() {
- $expectedHeaders = array(
- 'server' => 'nginx',
- 'content_type' => 'application/json; charset=utf-8',
- 'connection' => 'keep-alive',
- 'cache_control' => 'no-cache',
- 'content_length' => '30'
- );
-
- return array(array($expectedHeaders));
- }
-
-}
diff --git a/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test_Helper.php b/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test_Helper.php
deleted file mode 100644
index 2959d0813..000000000
--- a/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test_Helper.php
+++ /dev/null
@@ -1,94 +0,0 @@
-
- * @copyright 2010 Anton Lindqvist
- * @license http://www.opensource.org/licenses/mit-license.php MIT
- * @link http://github.com/mptre/php-soundcloud
- */
-class Services_Soundcloud_Expose extends Services_Soundcloud {
-
- /**
- * Class constructor. See parent constructor for further reference.
- *
- * @param string $clientId Application client id
- * @param string $clientSecret Application client secret
- * @param string $redirectUri Application redirect uri
- * @param boolean $development Sandbox mode
- *
- * @return void
- * @see Soundcloud
- */
- function __construct($clientId, $clientSecret, $redirectUri = null, $development = false) {
- parent::__construct($clientId, $clientSecret, $redirectUri, $development);
- }
-
- /**
- * Construct default http headers including response format and authorization.
- *
- * @return array
- * @see Soundcloud::_buildDefaultHeaders()
- */
- function buildDefaultHeaders() {
- return $this->_buildDefaultHeaders();
- }
-
- /**
- * Construct a url.
- *
- * @param string $path Relative or absolute uri
- * @param array $params Optional query string parameters
- * @param boolean $includeVersion Include the api version
- *
- * @return string
- * @see Soundcloud::_buildUrl()
- */
- function buildUrl($path, $params = null, $includeVersion = true) {
- return $this->_buildUrl($path, $params, $includeVersion);
- }
-
- /**
- * Get http user agent.
- *
- * @return string
- * @see Soundcloud::_getUserAgent()
- */
- function getUserAgent() {
- return $this->_getUserAgent();
- }
-
- /**
- * Parse HTTP response headers.
- *
- * @param string $headers
- *
- * @return array
- * @see Soundcloud::_parseHttpHeaders()
- */
- function parseHttpHeaders($headers) {
- return $this->_parseHttpHeaders($headers);
- }
-
- /**
- * Validates http response code.
- *
- * @return boolean
- * @see Soundcloud::_validResponseCode()
- */
- function validResponseCode($code) {
- return $this->_validResponseCode($code);
- }
-
-}
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index dae2d916e..445e36b5a 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -612,17 +612,6 @@ var AIRTIME = (function(AIRTIME) {
},
"fnRowCallback": AIRTIME.library.fnRowCallback,
"fnCreatedRow": function( nRow, aData, iDataIndex ) {
- //add soundcloud icon
- if (aData.soundcloud_id !== undefined) {
- if (aData.soundcloud_id === "-2") {
- $(nRow).find("td.library_title").append('
", {
"class": "small-icon " + headerIcon
diff --git a/composer.json b/composer.json
index 6d92538de..03adc292a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,7 @@
"require": {
"propel/propel1": "1.7.0-stable",
"aws/aws-sdk-php": "2.7.9",
- "raven/raven": "0.8.x-dev"
+ "raven/raven": "0.8.x-dev",
+ "ise/php-soundcloud": "3.0.1"
}
}
diff --git a/composer.lock b/composer.lock
index 17d9b1085..c819c7f39 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "30ad5215f679ce0ab55c7210b21a3b32",
+ "hash": "e731a5b93a15b54d4c22e26f33dc1aaa",
"packages": [
{
"name": "aws/aws-sdk-php",
@@ -165,6 +165,54 @@
],
"time": "2014-08-11 04:32:36"
},
+ {
+ "name": "ise/php-soundcloud",
+ "version": "3.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/internalsystemerror/php-soundcloud.git",
+ "reference": "ac3ff2dce2a6e6d34636c58e66fd316d722c31df"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/internalsystemerror/php-soundcloud/zipball/ac3ff2dce2a6e6d34636c58e66fd316d722c31df",
+ "reference": "ac3ff2dce2a6e6d34636c58e66fd316d722c31df",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "Soundcloud\\": "src/",
+ "SoundcloudTest\\": "tests/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Anton Lindqvist",
+ "email": "anton@qvister.se",
+ "homepage": "http://qvister.se/",
+ "role": "developer"
+ },
+ {
+ "name": "Gary Lockett",
+ "email": "ise@garylockett.com",
+ "homepage": "http://www.garylockett.com/"
+ }
+ ],
+ "description": "API Wrapper for SoundCloud written in PHP with support for authentication using OAuth 2.0 by Anton Lindqvist (mptre), composer support added by Gary Lockett (ise)",
+ "homepage": "https://github.com/internalsystemerror/php-soundcloud",
+ "keywords": [
+ "soundcloud"
+ ],
+ "time": "2014-02-03 15:49:00"
+ },
{
"name": "phing/phing",
"version": "2.9.1",
diff --git a/utils/soundcloud-uploader b/utils/soundcloud-uploader
deleted file mode 100755
index 5eab52b23..000000000
--- a/utils/soundcloud-uploader
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#-------------------------------------------------------------------------------
-# Copyright (c) 2011 Sourcefabric O.P.S.
-#
-# This file is part of the Airtime project.
-# http://airtime.sourcefabric.org/
-#
-# Airtime is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Airtime is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Airtime; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#-------------------------------------------------------------------------------
-#-------------------------------------------------------------------------------
-# This script upload files to soundcloud
-#
-# Absolute path to this script
-SCRIPT=`readlink -f $0`
-# Absolute directory this script is in
-SCRIPTPATH=`dirname $SCRIPT`
-
-invokePwd=$PWD
-cd $SCRIPTPATH
-
-php -q soundcloud-uploader.php "$@" > /dev/null 2>&1 || exit 1
\ No newline at end of file
diff --git a/utils/soundcloud-uploader.php b/utils/soundcloud-uploader.php
deleted file mode 100644
index 0e1245945..000000000
--- a/utils/soundcloud-uploader.php
+++ /dev/null
@@ -1,61 +0,0 @@
-setSoundCloudFileId(SOUNDCLOUD_PROGRESS);
-$file->uploadToSoundCloud();
-