Changeset 463

Timestamp:

06/23/10 17:08:34 (20 months ago)

Author:

aarkerio

Message:

Update users

Location:

trunk

Files:

• controllers/podcasts_controller.php (modified) (4 diffs)
• views/layouts/rss/rss.ctp (modified) (1 diff)
• views/podcasts/index.ctp (deleted)
• views/podcasts/rss.ctp (modified) (3 diffs)
• views/podcasts/view.ctp (added)

trunk/controllers/podcasts_controller.php

@@ -29 +29 @@
  * @var array
  */
- public $components = array('RequestHandler');
+ public $components = array('RequestHandler', 'Blog');
 
 /**
@@ -39 +39 @@
  {
    parent::beforeFilter();
-   $this->Auth->allow(array('display', 'vote'));
+   $this->Auth->allow(array('all', 'view', 'rss'));
  }
 
@@ -49 +49 @@
  public function view($username, $podcast_id)
  {   
-   $this->layout    = $this->blog->layout($username);
-   $this->set('blog', $this->blog->blog($user_id));
-   $params = array(
-                   'conditions' => array('Podcast.id'=>$podcast_id, 'Podcast.status'=>1),
-                   'fields'     => array('id', 'title', 'description', 'created', 'filename', 'length', 'size', 'duration')
-                   );        
+  $this->layout    = 'blog';
+  $this->Blog->setUserId($username);   # set blog sidebars
+  $user_id = $this->Blog->getUserId();
+  $params = array(
+                 'conditions' => array('Podcast.id'=>$podcast_id, 'Podcast.status'=>1),
+                 'fields'     => array('id', 'title', 'description', 'created', 'filename', 'length')
+                   );
    $this->set('data', $this->Podcast->find('first', $params));
   }
 
 /**
- * 
+ * View all podcast
  * @access public
  * @var array
@@ -90 +91 @@
                   'contain'    => False,
                   'fields'     => array('User.id', 'User.username','User.name','User.email', 'User.avatar'));
-  $User = $this->Podcast->User->find('first', $params);
+  $user = $this->Podcast->User->find('first', $params);
   
-  $this->set('User', $User);
-  $params = array('conditions' => array('Podcast.status'=>1, 'Podcast.user_id'=>$User['User']['id']),
+  $this->set('user', $user);
+  $params = array('conditions' => array('Podcast.status'=>1, 'Podcast.user_id'=>$user['User']['id']),
                   'fields'     => array('Podcast.id', 'Podcast.title', 'Podcast.filename', 'Podcast.description', 'Podcast.created', 'Podcast.duration', 
                                         'Podcast.title', 'Podcast.length'),

trunk/views/layouts/rss/rss.ctp

@@ -13 +13 @@
 endif;
 $channel = $this->Rss->channel(array(), $channelData, $content_for_layout);
+#die(debug($channel));
 echo $this->Rss->document($documentData,$channel);
+
+#echo  $content_for_layout;
 # ? >  EOF

trunk/views/podcasts/rss.ctp

@@ -1 +1 @@
 <?php
-# die(debug($podcasts));
+#die(debug($user));
 # You should import Sanitize
 App::import('Sanitize');
 
 $this->set('documentData', array(
-                                 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/'));
+                               'xmlns:pod' => 'http://sw.deri.org/2005/07/podcast#',
+                               'xmlns:dc'  => 'http://purl.org/dc/elements/1.1/'));
 
 $this->set('channelData', array(
@@ -14 +15 @@
 foreach ($podcasts as $pod):
     $postTime = strtotime($pod['Podcast']['created']);
-    $postLink = array(
-                      'controller' => 'podcasts',
-                      'action'     => 'view',
-                      'year'       => date('Y', $postTime),
-                      'month'      => date('m', $postTime),
-                      'day'        => date('d', $postTime),
-                      $pod['Podcast']['id']);
+    $postLink = array('controller' => 'podcasts', 'action' => 'view', $user['User']['username'].'/'.$pod['Podcast']['id']);
     # This is the part where we clean the body text for output as the description 
     # of the rss item, this needs to have only text to make sure the feed validates
-    $bodyText = preg_replace('=\(.*?\)=is', '', $pod['Podcast']['description']);
-    $bodyText = $this->Text->stripLinks($bodyText);
-    $bodyText = Sanitize::stripAll($bodyText);
-    $bodyText = $this->Text->truncate($bodyText, 400, '...', True, True);
+    $bodyText = str_replace('nbsp', ' ', $pod['Podcast']['description']);
+    #$bodyText = preg_replace('=\(.*?\)=is', '', $bodyText);
+    #$bodyText = $this->Text->stripLinks($bodyText);
+    #$bodyText = Sanitize::stripAll($bodyText);
+    #$bodyText = $this->Text->truncate($bodyText, 400, '...', True, True);
  
     echo $this->Rss->item(array(), array(
@@ -33 +29 @@
                                     'guid'        => array('url' => $postLink, 'isPermaLink' => True),
                                     'description' => $bodyText,
-                                    'dc:creator'  => 'username',
+                                    'dc:creator'  => $user['User']['username'],
                                     'pubDate'     => $pod['Podcast']['created']));
 endforeach;