Changeset 810 for trunk/app/controllers

Timestamp:

10/11/08 22:52:11 (7 weeks ago)

Author:

aarkerio

Message:

Little changes

Files:

• trunk/app/controllers/newsletters_controller.php (modified) (6 diffs)

trunk/app/controllers/newsletters_controller.php

@@ -54 +54 @@
  public function admin_listing()
  {
-        $this->layout = 'admin';   
-        $this->pageTitle = $this->Auth->user('username') . '\'s News';
+  $this->layout    = 'admin';   
+  $this->pageTitle =  __('Newsletters', true);
         
-        $conditions   = null; //array("Newsletter.status" => 1);
-        $fields       = array("id", "title", "body", "created", "status", "delivered");
-        $order        = "Newsletter.id DESC";
-        $limit        = 12;
-        
-        $this->set('data', $this->Newsletter->findAll($conditions, $fields, $order, $limit)); 
+  $conditions   = null;
+  $fields       = array('id', 'title', 'body', 'created', 'status', 'delivered');
+  $order        = 'Newsletter.id DESC';
+  $limit        = 20;
+      
+  $this->set('data', $this->Newsletter->findAll($conditions, $fields, $order, $limit)); 
  }
 
  public function admin_add()
  {
-    $this->layout = 'admin';
+   $this->layout = 'admin';
 
-    if (!empty($this->data['Newsletter']))
-    {
+   if (!empty($this->data['Newsletter'])):
        $this->Sanitize = new Sanitize;
                
-       $this->Sanitize->clean($this->data["Newsletter"]);
+       $this->Sanitize->clean($this->data['Newsletter']);
                
        $this->data['Newsletter']['user_id'] = $this->Auth->user('id');
+   
+       if ($this->Newsletter->save($this->data)): 
+               $this->msgFlash(__('Data saved', true), '/admin/newsletters/listing');
+          endif; 
     
-       $this->Newsletter->create();
-   
-      if ($this->Newsletter->save($this->data['Newsletter']))
-          { 
-               $this->msgFlash('Newsletter saved', '/admin/newsletters/listing');
-          } 
-          else 
-          {
-            $this->flash('Database error!', '/news/listing');
-          }
-    }
+     endif;
   }
   public function admin_send($newsletter_id)
@@ -98 +91 @@
      $this->layout = 'admin';
 
-     $this->pageTitle = 'Newsletters';
+     $this->pageTitle = __('Newsletters', true);
                 
      $this->set('number', $this->__sendNewsletter($newsletter_id));
@@ -105 +98 @@
   private function __sendNewsletter($newsletter_id)
   {
-     $conditions   = array("Newsletter.status" => 1, "Newsletter.id" => $newsletter_id);
+     $conditions   = array('Newsletter.status' => 1, 'Newsletter.id' => $newsletter_id);
 
-     $fields       = array("id", "title", "body", "created", "status");
+     $fields       = array('id', 'title', 'body', 'created', 'status');
      
      $data         = $this->Newsletter->find($conditions, $fields);
@@ -131 +124 @@
         $this->Email->from        = 'noreply@chipotle-software.com';
        
-     if ( $this->Email->send($data['Newsletter']['body']) )
-     {
+    if ( $this->Email->send($data['Newsletter']['body']) ):
                   $i++;
-     }
-         else
-     {
+        else:
                  exit("Error!!");
-     }
+    endif;
      }
      return $i;
@@ -145 +135 @@
   public function admin_edit($newsletter_id=null)
   {
-    if (!empty($this->data['Newsletter']))
-    { 
+    if (!empty($this->data['Newsletter'])):
        $this->Sanitize = new Sanitize;
                
@@ -153 +142 @@
        $this->Sanitize->html($this->data['Newsletter']['body']);
    
-      if ($this->Newsletter->save($this->data['Newsletter']))
-          {
-           if ( $this->data['Newsletter']['end'] == 1  ) 
-           {
-                   $this->msgFlash('Newsletter saved', '/admin/newsletters/listing');
-               }
-               else
-               {
+       if ($this->Newsletter->save($this->data['Newsletter'])):
+        if ( $this->data['Newsletter']['end'] == 1  ):
+         $this->msgFlash('Newsletter saved', '/admin/newsletters/listing');
+            else:
                    $this->msgFlash('Newsletter saved', '/admin/newsletters/edit/'.$this->data['Newsletter']['id']); 
-           }
-          } 
-          else 
-          {
-            $this->flash('Database error!', '/news/listing');
-          }
-    }
-    else
-    {
+        endif;
+       endif;
+   else:
        $this->data     = $this->Newsletter->read(null, $newsletter_id);
-    }
+   endif;
  }
      
- public function admin_delete($id) 
+ public function admin_delete($newsletter_id) 
  {
-      if ( $this->Newsletter->del($id) )
-      {
-            $this->msgFlash('Newsletter removed', '/admin/newsletters/listing');
-      }
-      else
-      {
-            $this->msgFlash('Database error!', '/admin/newsletters/listing');
-      }   
+   if ( $this->Newsletter->del($newsletter_id) ):
+        $this->msgFlash(__('Data removed', true), '/admin/newsletters/listing');
+   endif;  
   }
 }