Changeset 814

Timestamp:

10/13/08 14:43:46 (7 weeks ago)

Author:

aarkerio

Message:

Udate RSS

Location:

trunk/app

Files:

• controllers/entries_controller.php (modified) (1 diff)
• controllers/news_controller.php (modified) (2 diffs)
• controllers/podcasts_controller.php (modified) (3 diffs)
• views/entries/rss/rss.ctp (modified) (1 diff)
• views/layouts/rss/default.ctp (modified) (1 diff)
• views/podcasts/rss/rss.ctp (modified) (2 diffs)

trunk/app/controllers/entries_controller.php

@@ -81 +81 @@
   $channelData = array('title' => 'eduBlog Recent Writing | '. $username,
                'link'  => array('controller' => 'entries', 'action' => 'view', $username),
-               'url'   => array('controller' => 'entries', 'action' => 'view', $username),
                'description' => $username . ' eduBlog Recent on Karamelo',
                'language' => 'es-mx'

trunk/app/controllers/news_controller.php

@@ -16 +16 @@
  public $name = 'News';
  public $helpers          = array('Ajax', 'Fck', 'News', 'Time', 'Gags');  
- public $components       = array('Portal');
+ public $components       = array('Portal', 'RequestHandler');
  public $paginate = array('limit' => 8, 'page' => 1, 'order' => array('News.id' => 'DESC'));
   
@@ -68 +68 @@
    $channelData = array('title'       => 'Karamelo eLearning Portal ',
                 'link'        => array('controller' => 'news', 'action' => 'display'),
-                'url'         => array('controller' => 'news', 'action' => 'display'),
                 'description' => 'Latest news on Karamelo',
                 'language'    => 'en-us'
                );
        
-   $conditions = array("News.status"=>1);
-       
-   $fields     = array("News.id", "News.title", "News.body", "News.created", "News.theme_id", "News.user_id");
-       
-   $order      = "News.id DESC";
+   $conditions = array('News.status'=>1);
+       
+   $fields     = array('News.id', 'News.title', 'News.body', 'News.created', 'News.theme_id', 'News.user_id');
+       
+   $order      = 'News.id DESC';
       
    $limit      = 15;

trunk/app/controllers/podcasts_controller.php

@@ -64 +64 @@
  public function rss($username) 
  { 
-   $channelData = array('title'          => $username.' Podcasts',
+   $this->pageTitle = $username .' Podcasts';
+   // blogger data
+   $User = $this->Podcast->User->find(array('username'=>$username), array('id', 'username','name','email', 'name_blog', 'avatar'));
+ 
+   $channelData  = array('title'         => $username.' Podcasts',
                 'link'           => array('controller' => 'blog', 'action' => $username),
-                'url'            => array('controller' => 'blog', 'action' => $username),
-                'description'    => 'Audio from edublog',
+                'description'    => 'Audio from '. $username .' edublog',
+                        'itunes:summary' => 'Audio from '. $username .' edublog',
                 'language'       => 'en-us',
             'copyright'      => 'Chipotle Software, 2008',
+                        'generator'      => 'Karamelo Platform',
                         'managingEditor' => 'podcasts@chipotle-software.com',
-            'itunes:owner'   => array('itunes:email'=> 'manuel@mononeurona.org')
+            'itunes:owner'   => $username,
+            'itunes:image'   => '/images/avatars/'.$User['User']['avatar'],
+                        'itunes:author'  =>  $User['User']['name']
                );
        
    $this->Podcast->User->unbindAll();
-    
-   $User = $this->Podcast->User->find(array('username'=>$username), array('id', 'username', 'email', 'name_blog', 'avatar'));
-    
-    $conditions = array("status"=>1, "user_id"=>$User['User']['id']);
-    
-    $fields     = array("Podcast.id", "Podcast.title", "Podcast.filename", "Podcast.description", "Podcast.keywords", "Podcast.created", "Podcast.duration", "Podcast.title", "Podcast.length", "Podcast.subject_id", "Subject.title");
-    
-    $order = "Podcast.created DESC";
-
-    $limit = 12;
-
-    $this->set('User', $User);
-
-    $podcasts = $this->Podcast->findAll($conditions, $fields, $order, $limit);
-
-    $this->set(compact('channelData', 'podcasts'));
+   $conditions = array('status'=>1, 'user_id'=>$User['User']['id']);
+   $fields     = array('Podcast.id', 'Podcast.title', 'Podcast.filename', 'Podcast.description', 'Podcast.keywords', 'Podcast.created', 'Podcast.duration', 'Podcast.title', 'Podcast.length', 'Podcast.subject_id', 'Subject.title');
+   $order = 'Podcast.created DESC';
+   $limit = 12;
+   $podcasts = $this->Podcast->findAll($conditions, $fields, $order, $limit);
+   $this->set(compact('channelData', 'podcasts'));
  }
    
@@ -101 +98 @@
     $this->pageTitle = 'Podcast';
         
-    $conditions = array("Podcast.id"=>$podcast_id, "Podcast.status"=>1);
+    $conditions = array('Podcast.id'=>$podcast_id, 'Podcast.status'=>1);
         
     $fields     = array("id", "title", "description", "created", "filename", "length", "duration");
@@ -107 +104 @@
     $this->set('data', $this->Podcast->find($conditions, $fields));
  }
+
  public function  funny()
  { //eastern egg

trunk/app/views/entries/rss/rss.ctp

@@ -5 +5 @@
              'link' => array('controller'=>'entries', 'action' => 'view', $item['User']['username'], $item['Entry']['id']),
          'guid' => array('controller'=> 'entries','action' => 'view', $item['User']['username'], $item['Entry']['id']),
-           'description' => strip_tags($item['Entry']['body']),
-           'pubDate' => $item['Entry']['created']
+          'description' => strip_tags($item['Entry']['body']),
+          'pubDate' => $item['Entry']['created']
            );
 }

trunk/app/views/layouts/rss/default.ctp

@@ -1 +1 @@
 <?php
 echo $rss->header();
-$channel = $rss->channel(array(), $channelData, $items);
+ $channel = $rss->channel(array(), $channelData, $items);
 echo $rss->document(array(), $channel);
 ?>

trunk/app/views/podcasts/rss/rss.ctp

@@ -4 +4 @@
  return array(
       'title' => $item['Podcast']['title'],
-      'link' => array('controller'=> 'podcasts', 'action' => 'display', $item['User']['id']),
-      'guid' => array('controller'=> 'files', 'action' => 'podcasts', $item['Podcast']['filename']),
+      'guid' => '/files/podcasts/'. $item['Podcast']['filename'],
+      'enclosure' => array('url'=>'/files/podcasts/'. $item['Podcast']['filename'], 'length'=> $item['Podcast']['length']),
       'description' => strip_tags($item['Podcast']['description']),
       'pubDate' => $item['Podcast']['created'],
@@ -11 +11 @@
       'itunes:summary' => strip_tags($item['Podcast']['description'])   
      );
-}
-
+} 
+$rss->addNs('itunes');
 $this->set('items', $rss->items($podcasts, 'rss_transform'));
 ?>