tweet_live: comparison web/lib/Zend/Service/SlideShare.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Service
 * @subpackage SlideShare
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: SlideShare.php 25283 2013-03-09 10:07:13Z frosch $
+* @version    $Id$
 */
 /**
 * Zend_Http_Client
 */
 /**
 * Zend_Service_SlideShare_SlideShow
 */
 require_once 'Zend/Service/SlideShare/SlideShow.php';
+/** Zend_Xml_Security */
+require_once 'Zend/Xml/Security.php';
 /**
 * The Zend_Service_SlideShare component is used to interface with the
 * slideshare.net web server to retrieve slide shows hosted on the web site for
 * display or other processing.
 *
 * @category   Zend
 * @package    Zend_Service
 * @subpackage SlideShare
 * @throws     Zend_Service_SlideShare_Exception
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Service_SlideShare
 {
 /**
 * @var Zend_Cache_Core
 */
 protected $_cacheobject;
 /**
-* Sets the Zend_Http_Client object to use in requests. If not provided a default will
+* Sets the Zend_Http_Client object to use in requests. If not provided a
-* be used.
+* default will be used.
 *
 * @param Zend_Http_Client $client The HTTP client instance to use
 * @return Zend_Service_SlideShare
 */
 public function setHttpClient(Zend_Http_Client $client)
 $this->_httpclient = $client;
 return $this;
 }
 /**
-* Returns the instance of the Zend_Http_Client which will be used. Creates an instance
+* Returns the instance of the Zend_Http_Client which will be used. Creates
-* of Zend_Http_Client if no previous client was set.
+* an instance of Zend_Http_Client if no previous client was set.
 *
 * @return Zend_Http_Client The HTTP client which will be used
 */
 public function getHttpClient()
 {
 $this->_cacheobject = $cacheobject;
 return $this;
 }
 /**
-* Gets the Zend_Cache object which will be used to cache API queries. If no cache object
+* Gets the Zend_Cache object which will be used to cache API queries. If no
-* was previously set the the default will be used (Filesystem caching in /tmp with a life
+* cache object was previously set the the default will be used (Filesystem
-* time of 43200 seconds)
+* caching in /tmp with a life time of 43200 seconds)
 *
 * @return Zend_Cache_Core The object used in caching
 */
 public function getCacheObject()
 {
 if (!($this->_cacheobject instanceof Zend_Cache_Core)) {
 $cache = Zend_Cache::factory(
 'Core',
 'File',
 array(
 'lifetime'                => 43200,
 'automatic_serialization' => true
 ),
 array('cache_dir' => '/tmp')
 );
 $this->setCacheObject($cache);
 }
 /**
 * Uploads the specified Slide show the the server
 *
-* @param Zend_Service_SlideShare_SlideShow $ss            The slide show object representing the slide show to upload
+* @param Zend_Service_SlideShare_SlideShow $ss The slide show
-* @param boolean                           $makeSrcPublic Determines if the the slide show's source file is public or not upon upload
+*                                              object representing the
-* @return Zend_Service_SlideShare_SlideShow The passed Slide show object, with the new assigned ID provided
+*                                              slide show to upload
+* @param boolean $makeSrcPublic                Determines if the slide
+*                                              show's source file is public
+*                                              or not upon upload
+* @return Zend_Service_SlideShare_SlideShow The passed Slide show object,
+*                                           with the new assigned ID
+*                                           provided
 * @throws Zend_Service_SlideShare_Exception
 */
 public function uploadSlideShow(
 Zend_Service_SlideShare_SlideShow $ss, $makeSrcPublic = true
 )
 throw new Zend_Service_SlideShare_Exception(
 "Service Request Failed: {$e->getMessage()}", 0, $e
 );
 }
-$sxe = simplexml_load_string($response->getBody());
+$sxe = Zend_Xml_Security::scan($response->getBody());
 if ($sxe->getName() == "SlideShareServiceError") {
 $message = (string)$sxe->Message[0];
-list($code, $error_str) = explode(':', $message);
+list($code, $errorStr) = explode(':', $message);
 require_once 'Zend/Service/SlideShare/Exception.php';
-throw new Zend_Service_SlideShare_Exception(trim(
+throw new Zend_Service_SlideShare_Exception(
-$error_str
+trim($errorStr),
-), $code);
+$code
+);
 }
 if (!$sxe->getName() == "SlideShowUploaded") {
 require_once 'Zend/Service/SlideShare/Exception.php';
 throw new Zend_Service_SlideShare_Exception(
 }
 /**
 * Retrieves a slide show's information based on slide show ID
 *
-* @param int $ss_id The slide show ID
+* @param int $ssId The slide show ID
 * @return Zend_Service_SlideShare_SlideShow the Slideshow object
 * @throws Zend_Service_SlideShare_Exception
 */
-public function getSlideShow($ss_id)
+public function getSlideShow($ssId)
 {
 $timestamp = time();
 $params = array(
 'api_key'      => $this->getApiKey(),
 'ts'           => $timestamp,
 'hash'         => sha1($this->getSharedSecret() . $timestamp),
-'slideshow_id' => $ss_id
+'slideshow_id' => $ssId
 );
-$cache = $this->getCacheObject();
+$cache    = $this->getCacheObject();
+$cacheKey = md5("__zendslideshare_cache_$ssId");
-$cache_key = md5("__zendslideshare_cache_$ss_id");
+if (!$retval = $cache->load($cacheKey)) {
-if (!$retval = $cache->load($cache_key)) {
 $client = $this->getHttpClient();
 $client->setUri(self::SERVICE_GET_SHOW_URI);
 $client->setParameterPost($params);
 throw new Zend_Service_SlideShare_Exception(
 "Service Request Failed: {$e->getMessage()}", 0, $e
 );
 }
-$sxe = simplexml_load_string($response->getBody());
+$sxe = Zend_Xml_Security::scan($response->getBody());
 if ($sxe->getName() == "SlideShareServiceError") {
 $message = (string)$sxe->Message[0];
-list($code, $error_str) = explode(':', $message);
+list($code, $errorStr) = explode(':', $message);
 require_once 'Zend/Service/SlideShare/Exception.php';
-throw new Zend_Service_SlideShare_Exception(trim(
+throw new Zend_Service_SlideShare_Exception(
-$error_str
+trim($errorStr),
-), $code);
+$code
+);
 }
 if (!($sxe->getName() == 'Slideshow')) {
 require_once 'Zend/Service/SlideShare/Exception.php';
 throw new Zend_Service_SlideShare_Exception(
 'Unknown XML Repsonse Received'
 );
 }
 $retval = $this->_slideShowNodeToObject(clone $sxe);
-$cache->save($retval, $cache_key);
+$cache->save($retval, $cacheKey);
 }
 return $retval;
 }
 * @param int    $offset The offset of the list to start retrieving from
 * @param int    $limit  The maximum number of slide shows to retrieve
 * @return array An array of Zend_Service_SlideShare_SlideShow objects
 * @throws Zend_Service_SlideShare_Exception
 */
-protected function _getSlideShowsByType($key, $value, $offset = null, $limit = null)
+protected function _getSlideShowsByType(
+$key, $value, $offset = null, $limit = null
+)
 {
 $key = strtolower($key);
 switch ($key) {
 case 'username_for':
 );
 }
 $timestamp = time();
-$params = array('api_key' => $this->getApiKey(),
+$params = array(
-'ts' => $timestamp,
+'api_key' => $this->getApiKey(),
-'hash' => sha1($this->getSharedSecret().$timestamp),
+'ts'      => $timestamp,
-$key => $value);
+'hash'    => sha1($this->getSharedSecret() . $timestamp),
+$key      => $value
+);
 if ($offset !== null) {
 $params['offset'] = (int)$offset;
 }
 if ($limit !== null) {
 $params['limit'] = (int)$limit;
 }
-$cache = $this->getCacheObject();
+$cache    = $this->getCacheObject();
+$cacheKey = md5($key . $value . $offset . $limit);
-$cache_key = md5($key.$value.$offset.$limit);
+if (!$retval = $cache->load($cacheKey)) {
-if (!$retval = $cache->load($cache_key)) {
 $client = $this->getHttpClient();
 $client->setUri($queryUri);
 $client->setParameterPost($params);
 throw new Zend_Service_SlideShare_Exception(
 "Service Request Failed: {$e->getMessage()}", 0, $e
 );
 }
-$sxe = simplexml_load_string($response->getBody());
+$sxe = Zend_Xml_Security::scan($response->getBody());
 if ($sxe->getName() == "SlideShareServiceError") {
 $message = (string)$sxe->Message[0];
-list($code, $error_str) = explode(':', $message);
+list($code, $errorStr) = explode(':', $message);
 require_once 'Zend/Service/SlideShare/Exception.php';
 throw new Zend_Service_SlideShare_Exception(
-trim($error_str), $code
+trim($errorStr), $code
 );
 }
 if (!$sxe->getName() == $responseTag) {
 require_once 'Zend/Service/SlideShare/Exception.php';
 if ($node->getName() == 'Slideshow') {
 $retval[] = $this->_slideShowNodeToObject($node);
 }
 }
-$cache->save($retval, $cache_key);
+$cache->save($retval, $cacheKey);
 }
 return $retval;
 }
 /**
 * Converts a SimpleXMLElement object representing a response from the service
 * into a Zend_Service_SlideShare_SlideShow object
+*
+* @see http://www.slideshare.net/developers/documentation#get_slideshow
 *
 * @param SimpleXMLElement $node The input XML from the slideshare.net service
 * @return Zend_Service_SlideShare_SlideShow The resulting object
 * @throws Zend_Service_SlideShare_Exception
 */
 protected function _slideShowNodeToObject(SimpleXMLElement $node)
 {
-if($node->getName() == 'Slideshow') {
+if ($node->getName() == 'Slideshow') {
 $ss = new Zend_Service_SlideShare_SlideShow();
 $ss->setId((string)$node->ID);
 $ss->setDescription((string)$node->Description);
-$ss->setEmbedCode((string)$node->EmbedCode);
+$ss->setEmbedCode((string)$node->Embed);
 $ss->setNumViews((string)$node->Views);
-$ss->setPermaLink((string)$node->Permalink);
+$ss->setUrl((string)$node->URL);
 $ss->setStatus((string)$node->Status);
 $ss->setStatusDescription((string)$node->StatusDescription);
 foreach (explode(",", (string)$node->Tags) as $tag) {
 if (!in_array($tag, $ss->getTags())) {
 $ss->addTag($tag);
 }
 }
-$ss->setThumbnailUrl((string)$node->Thumbnail);
+$ss->setThumbnailUrl((string)$node->ThumbnailURL);
 $ss->setTitle((string)$node->Title);
 $ss->setLocation((string)$node->Location);
 $ss->setTranscript((string)$node->Transcript);
 return $ss;

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd