hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 03:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php
This commit is contained in:
Romain Neutron
2014-02-28 19:37:54 +01:00
parent 1497b6413a 871b19c407
commit c641ab7841
10 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/Bridge/Api/Dailymotion.php
View File

@@ -425,7 +425,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
return $this->get_container_from_id(self::CONTAINER_TYPE_PLAYLIST, $container_id);
break;
default:
throw new Bridge_Exception_ContainerUnknown('Unknown element ' . $destination);
throw new Bridge_Exception_ContainerUnknown('Unknown element ' . $container);
break;
}
break;
@@ -570,8 +570,8 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
{
switch ($record->get_type()) {
case self::ELEMENT_TYPE_VIDEO :
$url_file = $this->_api->uploadFileWithToken($record->get_hd_file()->getRealPath(), $this->oauth_token);
$options = array_merge(['url' => $url_file], $options);
$url_file = $this->_api->sendFile($record->get_hd_file()->getRealPath(), $this->oauth_token);
$options = array_merge(array('url' => $url_file), $options);
$video = $this->_api->call('POST /me/videos', $options, $this->oauth_token);
return $video["id"];

2
lib/classes/Bridge/Api/Flickr.php
View File

@@ -193,7 +193,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
throw new Bridge_Exception_ApiConnectorRequestFailed('Unable to retrieve photoset infos for ' . $object);
$xml = $response->getXml();
$primary_photo = $this->get_element_from_id((string) $xml['primary'], self::ELEMENT_TYPE_PHOTO);
$primary_photo = $this->get_element_from_id((string) $xml->photo['id'], self::ELEMENT_TYPE_PHOTO);
return new Bridge_Api_Flickr_Container($xml, $this->get_user_id(), $object, $primary_photo->get_thumbnail());
break;

1
lib/classes/Bridge/Api/Interface.php
View File

@@ -9,6 +9,7 @@
* file that was distributed with this source code.
*/
use Symfony\Component\Routing\Generator\UrlGenerator;
use Symfony\Component\HttpFoundation\Request;
interface Bridge_Api_Interface