Merge branch 'saas-dev' into saas-dev-facebook-radio

airtime_mvc/application/configs/ACL.php

@@ -35,13 +35,18 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
       ->add(new Zend_Acl_Resource('downgrade'))
       ->add(new Zend_Acl_Resource('rest:media'))
       ->add(new Zend_Acl_Resource('rest:show-image'))
+      ->add(new Zend_Acl_Resource('rest:podcast'))
+      ->add(new Zend_Acl_Resource('rest:podcast-episodes'))
+      ->add(new Zend_Acl_Resource('podcast'))
       ->add(new Zend_Acl_Resource('billing'))
       ->add(new Zend_Acl_Resource('thank-you'))
       ->add(new Zend_Acl_Resource('provisioning'))
       ->add(new Zend_Acl_Resource('player'))
+      ->add(new Zend_Acl_Resource('render'))
       ->add(new Zend_Acl_Resource('soundcloud'))
       ->add(new Zend_Acl_Resource('embeddablewidgets'))
-      ->add(new Zend_Acl_Resource('setup'));
+      ->add(new Zend_Acl_Resource('setup'))
+      ->add(new Zend_Acl_Resource('feeds'));
 
 /** Creating permissions */
 $ccAcl->allow('G', 'index')
@@ -50,6 +55,7 @@ $ccAcl->allow('G', 'index')
       ->allow('G', 'error')
       ->allow('G', 'user', 'edit-user')
       ->allow('G', 'showbuilder')
+      ->allow('G', 'render')
       ->allow('G', 'api')
       ->allow('G', 'schedule')
       ->allow('G', 'dashboard')
@@ -61,11 +67,17 @@ $ccAcl->allow('G', 'index')
       ->allow('G', 'downgrade')
       ->allow('G', 'rest:show-image', 'get')
       ->allow('G', 'rest:media', 'get')
+      ->allow('G', 'rest:podcast', 'get')
+      ->allow('G', 'rest:podcast-episodes', 'get')
       ->allow('G', 'setup')
       ->allow('G', 'embeddablewidgets')
+      ->allow('G', 'feeds')
       ->allow('H', 'soundcloud')
       ->allow('H', 'rest:show-image')
       ->allow('H', 'rest:media')
+      ->allow('H', 'rest:podcast')
+      ->allow('H', 'rest:podcast-episodes')
+      ->allow('H', 'podcast')
       ->allow('H', 'preference', 'is-import-in-progress')
       ->allow('H', 'usersettings')
       ->allow('H', 'plupload')

airtime_mvc/application/configs/classmap-airtime-conf.php

@@ -106,6 +106,18 @@ return array (
   'BaseCloudFile' => 'airtime/om/BaseCloudFile.php',
   'BaseCloudFilePeer' => 'airtime/om/BaseCloudFilePeer.php',
   'BaseCloudFileQuery' => 'airtime/om/BaseCloudFileQuery.php',
+  'BaseImportedPodcast' => 'airtime/om/BaseImportedPodcast.php',
+  'BaseImportedPodcastPeer' => 'airtime/om/BaseImportedPodcastPeer.php',
+  'BaseImportedPodcastQuery' => 'airtime/om/BaseImportedPodcastQuery.php',
+  'BasePodcast' => 'airtime/om/BasePodcast.php',
+  'BasePodcastEpisodes' => 'airtime/om/BasePodcastEpisodes.php',
+  'BasePodcastEpisodesPeer' => 'airtime/om/BasePodcastEpisodesPeer.php',
+  'BasePodcastEpisodesQuery' => 'airtime/om/BasePodcastEpisodesQuery.php',
+  'BasePodcastPeer' => 'airtime/om/BasePodcastPeer.php',
+  'BasePodcastQuery' => 'airtime/om/BasePodcastQuery.php',
+  'BaseStationPodcast' => 'airtime/om/BaseStationPodcast.php',
+  'BaseStationPodcastPeer' => 'airtime/om/BaseStationPodcastPeer.php',
+  'BaseStationPodcastQuery' => 'airtime/om/BaseStationPodcastQuery.php',
   'BaseThirdPartyTrackReferences' => 'airtime/om/BaseThirdPartyTrackReferences.php',
   'BaseThirdPartyTrackReferencesPeer' => 'airtime/om/BaseThirdPartyTrackReferencesPeer.php',
   'BaseThirdPartyTrackReferencesQuery' => 'airtime/om/BaseThirdPartyTrackReferencesQuery.php',
@@ -249,6 +261,22 @@ return array (
   'CloudFilePeer' => 'airtime/CloudFilePeer.php',
   'CloudFileQuery' => 'airtime/CloudFileQuery.php',
   'CloudFileTableMap' => 'airtime/map/CloudFileTableMap.php',
+  'ImportedPodcast' => 'airtime/ImportedPodcast.php',
+  'ImportedPodcastPeer' => 'airtime/ImportedPodcastPeer.php',
+  'ImportedPodcastQuery' => 'airtime/ImportedPodcastQuery.php',
+  'ImportedPodcastTableMap' => 'airtime/map/ImportedPodcastTableMap.php',
+  'Podcast' => 'airtime/Podcast.php',
+  'PodcastEpisodes' => 'airtime/PodcastEpisodes.php',
+  'PodcastEpisodesPeer' => 'airtime/PodcastEpisodesPeer.php',
+  'PodcastEpisodesQuery' => 'airtime/PodcastEpisodesQuery.php',
+  'PodcastEpisodesTableMap' => 'airtime/map/PodcastEpisodesTableMap.php',
+  'PodcastPeer' => 'airtime/PodcastPeer.php',
+  'PodcastQuery' => 'airtime/PodcastQuery.php',
+  'PodcastTableMap' => 'airtime/map/PodcastTableMap.php',
+  'StationPodcast' => 'airtime/StationPodcast.php',
+  'StationPodcastPeer' => 'airtime/StationPodcastPeer.php',
+  'StationPodcastQuery' => 'airtime/StationPodcastQuery.php',
+  'StationPodcastTableMap' => 'airtime/map/StationPodcastTableMap.php',
   'ThirdPartyTrackReferences' => 'airtime/ThirdPartyTrackReferences.php',
   'ThirdPartyTrackReferencesPeer' => 'airtime/ThirdPartyTrackReferencesPeer.php',
   'ThirdPartyTrackReferencesQuery' => 'airtime/ThirdPartyTrackReferencesQuery.php',

airtime_mvc/application/configs/constants.php

@@ -32,7 +32,7 @@ define('AIRTIME_COPYRIGHT_DATE' , '2010-2015');
 define('AIRTIME_REST_VERSION'   , '1.1');
 define('AIRTIME_API_VERSION'    , '1.1');
 // XXX: it's important that we upgrade this every time we add an upgrade!
-define('AIRTIME_CODE_VERSION'   , '2.5.14');
+define('AIRTIME_CODE_VERSION'   , '2.5.16');
 
 // Defaults
 define('DEFAULT_LOGO_PLACEHOLDER', 1);
@@ -42,6 +42,7 @@ define('DEFAULT_MICROTIME_FORMAT', 'Y-m-d H:i:s.u');
 define('DEFAULT_ICECAST_PORT', 8000);
 define('DEFAULT_ICECAST_PASS', 'hackme');
 define('DEFAULT_SHOW_COLOR', '76aca5');
+define('DEFAULT_INTERVAL_FORMAT', 'H:i:s.u');
 
 // Metadata Keys for files
 define('MDATA_KEY_FILEPATH'    , 'filepath');
@@ -124,3 +125,13 @@ define('CELERY_FAILED_STATUS', 'FAILED');
 
 // Celery Services
 define('SOUNDCLOUD_SERVICE_NAME', 'soundcloud');
+define('PODCAST_SERVICE_NAME', 'podcast');
+
+// Publish Services
+define('STATION_PODCAST_SERVICE_NAME', 'station_podcast');
+
+// Podcast Types
+//define('STATION_PODCAST', 0);
+//define('IMPORTED_PODCAST', 1);
+
+define('ITUNES_XML_NAMESPACE_URL', 'http://www.itunes.com/dtds/podcast-1.0.dtd');

airtime_mvc/application/configs/navigation.php

@@ -8,6 +8,13 @@
 * the navigation container below.
 */
 $pages = array(
+    array(
+        'label' => "<i class='icon-music icon-white'></i>"._('My Podcast'),
+        'module'     => 'default',
+        'controller' => 'podcast',
+        'action'     => 'station',
+        'resource'   => 'podcast'
+    ),
     array(
         'label' => "<i class='icon-globe icon-white'></i>"._('Radio Page'),
         'uri' => '/',