Changeset 247

Timestamp:

03/18/09 11:44:57 (3 years ago)

Author:

aarkerio

Message:

Update RSS

Location:

trunk

Files:

• config/core.php (modified) (1 diff)
• controllers/bookmarks_controller.php (modified) (2 diffs)
• views/bookmarks/add.ctp (deleted)
• views/bookmarks/admin_listing.ctp (modified) (1 diff)
• views/bookmarks/rss.ctp (deleted)
• views/layouts/portal.ctp (modified) (2 diffs)
• views/quicks/admin_listing.ctp (modified) (3 diffs)

trunk/config/core.php

@@ -15 +15 @@
  */
 
-        Configure::write('debug', 0);
+        Configure::write('debug', 1);
 /**
  * To configure CakePHP *not* to use mod_rewrite and to

trunk/controllers/bookmarks_controller.php

@@ -3 +3 @@
 *  Chipotle Software
 *  Manuel Montoya 2002-2009
-*  GPL manuel<at>mononeurona.org
+*  GPL manuel<arroba>mononeurona<punto>org
 */ 
 
-App::import('Model','User');
 App::import('Sanitize');
 
 class BookmarksController extends AppController {
     
- public $helpers       = array('Html', 'Javascript', 'Ajax', 'Form', 'User', 'Fck', 'Gags');
+ public $helpers       = array('Javascript', 'User', 'Fck', 'Gags');
     
- public $components    = array('Security');
+ public $components    = array('RequestHandler');
 
  public function beforeFilter() 
@@ -21 +20 @@
  }
 
- public function rss($username) 
- {   
-       $this->layout    = 'rss';
-       
-       $this->User = new User;
-       
-       $user_id =  $this->User->field('id', array("User.username"=>$username));
-       
-       $conditions = array("Bookmark.user_id"=>$user_id);
-       
-       $fields     = array("id", "name", "url", "created");
-       
-       $data = $this->Bookmark->findAll($conditions, $fields, "Bookmark.id DESC");
-       
-       $this->set('data', $data);
-       
-       $this->set('username', $username);
+
+ /**
+  * Create an rss feed of the 15 last uploaded uses the RSS component
+  *
+  */
+  public function feeder($username) 
+  {
+    $conditions  = array('User.username'=>trim($username));
+    $user_id     = $this->Bookmark->User->field('User.id', $conditions);
+    $channelData = array('title'       => $username . "'s Bookmarks",
+                                 'link'        => array('controller' => 'blog', 'action' => $username),
+                                 'description' => 'Hacktivismo',
+                                 'language'    => 'es-mx'
+                        );
+         
+    $conditions      = array('Bookmark.user_id'=>$user_id);
+    $fields          = array('Bookmark.id', 'Bookmark.name', 'Bookmark.url', 'Bookmark.created');
+    $order           = 'Bookmark.name ASC';
+    $limit           = 50;
+   
+    $bookmarks = $this->Bookmark->findAll($conditions, $fields, $order, $limit);
+    #die(debug($bookmarks));
+    $this->set(compact('channelData', 'bookmarks'));  
   }
 
-/*** 
-====  ADMIN SECTION    =====
-****/
+/*** ====  ADMIN SECTION    =====****/
 
 public function admin_add() 
 {
-     if (!empty($this->data["Bookmark"]))
-     {
+  if (!empty($this->data['Bookmark'])):
+      $this->data['Bookmark'] = Sanitize::clean($this->data['Bookmark']);         
+      $this->data['Bookmark']['user_id'] = (int) $this->Auth->user('id');
          
-         
-        Sanitize::clean($this->data); //Hopefully this is enough
-         
-         $this->data['Bookmark']['user_id'] = $this->Auth->user('id');
-         
-             if ( $this->Bookmark->save($this->data['Bookmark']))
-             { 
-            $this->msgFlash('An new bookmark has been added!','/admin/bookmarks/listing');
-            exit();
-         }
-       }
-  }
+          if ( $this->Bookmark->save($this->data['Bookmark'])):
+            $this->msgFlash('Bookmark saved','/admin/bookmarks/listing');
+      endif;
+  endif;
+ }
  
-  public function admin_listing()
-  {
-      $this->layout    = 'admin';
-      $this->pageTitle = 'Bookmarks';
+ public function admin_listing()
+ {
+   $this->layout    = 'admin';
+   $this->pageTitle = 'Bookmarks';
       
-      $conditions      = array("Bookmark.user_id" => $this->Auth->user('id'));
-      $fields          = array("Bookmark.id", "Bookmark.name", "Bookmark.url");
-      $order           = "Bookmark.name ASC";
-      
-      $this->set('data', $this->Bookmark->findAll($conditions, $fields, $order));
-   }
-   
-public function admin_edit($id=null)
-{
-    if (empty($this->data["Bookmark"]))
-    {
-        $this->layout        = 'admin';
-        
+   $conditions      = array('Bookmark.user_id' => $this->Auth->user('id'));
+   $fields          = array('Bookmark.id', 'Bookmark.name', 'Bookmark.url');
+   $order           = 'Bookmark.name ASC';   
+   $this->set('data', $this->Bookmark->findAll($conditions, $fields, $order));
+ }
+  
+ public function admin_edit($bookmark_id=null)
+ {
+    if (empty($this->data['Bookmark'])):
+        $this->layout        = 'admin';       
         $this->Bookmark->id  = $id;
         
-        $this->data          = $this->Bookmark->read();
-    }
-    else
-    {
-        
-        
-       Sanitize::clean($this->data);
-        
-        if ($this->Bookmark->save($this->data))
-        {
-           $this->msgFlash('The bookmark has been saved!','/admin/bookmarks/listing');
-            exit();
-        }
-    }
-}
+        $this->data          = $this->Bookmark->read(null, $bookmark_id);
+    else:
+        $this->data['Bookmark'] = Sanitize::clean($this->data['Bookmark']);      
+        if ($this->Bookmark->save($this->data)):
+           $this->msgFlash('Bookmark saved','/admin/bookmarks/listing');
+        endif;
+    endif;
+ }
 
- public function admin_delete($id)
+ public function admin_delete($bookmark_id)
  {
-                // deletes task from database
-                //die($this->data['Bookmark']['id']);
-                $this->Bookmark->del($id);
+   if ( $this->Bookmark->del($bookmark_id)):
                 $this->msgFlash('Bookmark has been deleted', '/admin/bookmarks/listing');
-                exit();
-  }
-  
+   endif;
+ }
 }
 ?>

trunk/views/bookmarks/admin_listing.ctp

@@ -3 +3 @@
  echo $html->getCrumbs(' / '); 
 
+ echo $html->div(null, $html->link($html->image('static/icon_rss.png', array('alt'=>'Subscribe bookmarks', 'title'=>'Subscribe bookmarks')), '/bookmarks/feeder/'.$session->read('Auth.User.username').'.rss', array(), false, false), array('style'=>'width:80px;float:right;')); 
+
  echo $html->div('title_section', $session->read('Auth.User.username'). "' Bookmarks");
 
-echo $html->para(null, $html->link($html->image('admin/new.gif', array('alt'=>'Add new bookmark', 'title'=>'Add new bookmark')), 
-'#', array('onclick'=>'hU()'), false, false)); 
+ echo $html->div(null, $html->link($html->image('admin/new.gif', array('alt'=>'Add new bookmark', 'title'=>'Add new bookmark')), 
+'#', array('onclick'=>'hU()'), false, false),  array('style'=>'width:80px;float:left;')); 
+
 ?>
 <div id="trh" style="margin:0;padding:0;padding-left:40px;width:80%;display:none;">

trunk/views/layouts/portal.ctp

@@ -53 +53 @@
 <tr>
  <td id="tdleft">
-  <div style="text-align:center;margin:5px 0 5px 0;padding:3px;">
+ <div style="text-align:center;margin:5px 0 5px 0;padding:3px;">
  <?php
+  
   if (  $session->check('Auth.User') ):
       echo  $this->element('todos');
@@ -88 +89 @@
                                            'style'=>'border:1px solid black')), 
                                                                'http://www.chipotle-software.com', null, null, false)); 
-  
   echo  $this->element('poll');
   echo  $this->element('rankpages');

trunk/views/quicks/admin_listing.ctp

@@ -2 +2 @@
   echo $html->div('title_section','Quick News');
   echo $html->para(null, $html->link($html->image('admin/new.gif', array('alt'=>'Add new', 'title'=>'Add new')), '#', 
-                                     array("onclick  "=>"hU()"), false, false)); 
-?>
-<table class="tbadmin" id="tbl">
-<tr>
-  <td style="text-align:left;display:none" id="trh" colspan="5">
-  <?php echo $form->create('Quick'); ?>
+                                     array('onclick'=>'hU()'), false, false)); 
+ echo $html->div(null, null, array('style'=>'text-align:left;display:none;width:100%', 'id'=>'trh'));
+ echo $form->create('Quick'); ?>
   <fieldset>
      <legend>Add Quick new</legend>
@@ -18 +15 @@
  ?>
 </fieldset>
-</td>
-</tr>
-
+</div>
+<table class="tbadmin" id="tbl">
 <?php
 //die(print_r($data));
@@ -48 +44 @@
 
   if (tr.style.display == 'none')
-            tr.style.display = 'table-row';
+            tr.style.display = 'block';
   else 
             tr.style.display = 'none';