remove format field

stefansl · Aug 5, 2015 · bd96dad · bd96dad
1 parent 6164741
commit bd96dad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 32 deletions.
diff --git a/classes/NewsPodcasts.php b/classes/NewsPodcasts.php
@@ -114,20 +114,7 @@ protected function generateFiles( $arrFeed )
             return;
         }
 
-        switch ( $arrFeed['format'] ) {
-            case 'rss':
-                $strType = 'generateRss';
-                break;
-
-            case 'atom':
-                $strType = 'generateAtom';
-                break;
-
-            case 'itunes':
-                $strType = 'generateItunes';
-                break;
-        }
-
+        $strType = 'generateItunes';
 
         $strLink = $arrFeed['feedBase'] ?: \Environment::get( 'base' );
         $strFile = $arrFeed['feedName'];
@@ -143,16 +130,15 @@ protected function generateFiles( $arrFeed )
         $objFeed->published   = $arrFeed['tstamp'];
 
         //Add Feed Image
-        if ( $arrFeed['format'] == 'itunes' ) {
-            $objFile = \FilesModel::findByUuid( $arrFeed['image'] );
 
-            if ( $objFile !== null ) {
-                $objFeed->imageUrl = \Environment::get( 'base' ) . $objFile->path;
-            }
+        $objFile = \FilesModel::findByUuid( $arrFeed['image'] );
 
+        if ( $objFile !== null ) {
+            $objFeed->imageUrl = \Environment::get( 'base' ) . $objFile->path;
         }
 
 
+
         // Get the items
         if ( $arrFeed['maxItems'] > 0 ) {
             $objPodcasts = \NewsModel::findPublishedByPids( $arrArchives, null, $arrFeed['maxItems'], null, array( 'column' => 'addPodcast', 'value' => 1 ) );

diff --git a/dca/tl_news_podcasts_feed.php b/dca/tl_news_podcasts_feed.php
@@ -98,7 +98,7 @@
     // Palettes
     'palettes' => array
     (
-        'default'                     => '{title_legend},title,alias,language,format;{description_legend},description,category;{author_legend},owner,email,image,author,copyright;{archives_legend},archives;{config_legend},maxItems,feedBase'
+        'default'                     => '{title_legend},title,alias,language;{description_legend},description,category;{author_legend},owner,email,image,author,copyright;{archives_legend},archives;{config_legend},maxItems,feedBase'
     ),
 
     // Fields
@@ -144,18 +144,6 @@
             'eval'                    => array('mandatory'=>true, 'maxlength'=>32, 'tl_class'=>'w50'),
             'sql'                     => "varchar(32) NOT NULL default ''"
         ),
-        'format' => array
-        (
-            'label'                   => &$GLOBALS['TL_LANG']['tl_news_podcasts_feed']['format'],
-            'default'                 => 'text',
-            'exclude'                 => true,
-            'filter'                  => true,
-            'inputType'               => 'select',
-            //'options_callback'        => array('tl_news_podcasts_feed', 'getRssType'),
-            'options'				  => array('itunes'),
-            'eval'                    => array('submitOnChange'=>true, 'tl_class'=>'w50'),
-            'sql'                     => "varchar(32) NOT NULL default ''"
-        ),
         'subtitle' => array
         (
             'label'                   => &$GLOBALS['TL_LANG']['tl_news_podcasts_feed']['subtitle'],