Changeset 810 for trunk

Timestamp:

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

Author:

aarkerio

Message:

Little changes

Location:

trunk/app

Files:

• controllers/newsletters_controller.php (modified) (6 diffs)
• models/newsletter.php (modified) (1 diff)
• views/newsletters/admin_add.ctp (modified) (2 diffs)
• views/newsletters/admin_edit.ctp (modified) (3 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;  
   }
 }

trunk/app/models/newsletter.php

@@ -9 +9 @@
 class Newsletter extends AppModel {
 
-    public $name      = 'Newsletter';
+  public $name      = 'Newsletter';
     
-    public $belongsTo = array('User');
-/*
-public $validate = array(
-        'login' => array('alphanumeric' => array(
-                                                 'rule' => 'alphaNumeric',
-                                             'required' => true,
-                                                         'message' => 'Alphabets and numbers only'
-                                   ),
-                                'between' => array(
-                                           'rule' => array('between', 5, 15),
-                                                                               'message' => 'Between 5 to 15 characters'
-                                           )
-                                ),
-                       'password' => array(
-                                   'rule' => array('minLength', '8'),
-                                                               'message' => 'Mimimum 8 characters long'
-                                   ),
-                       'email' => 'email',
-                       'born' => array(
-                               'rule' => 'date',
-                               'message' => 'Enter a valid date',
-                                                           'allowEmpty' => true
-                               )
-                       ); */
+  public $belongsTo = array('User');
+
+  public $validate = array(
+               'title' => array('rule' => array('minLength', 8),
+                                                         'message' => 'Mimimum 8 characters long'
+                           ),
+                            'body' => array('rule' => array('minLength', 40),
+                                                         'message' => 'Mimimum 40 characters long'
+                           )                
+               );
 }
-
 ?>

trunk/app/views/newsletters/admin_add.ctp

@@ -12 +12 @@
 
 <table style="margin:0 auto 0 auto;">
-<tr><td>
-    <?php  echo $form->input('Newsletter.title', array('size'=>50, 'maxlength' => 50, 'label'=>__('Title', true))); ?>
-  </td>
-  <td>
-    <?php 
-        echo $html->link($html->image('admin/myimages.jpg', array('alt'=>__('My Images', true), 'title'=>__('My Images', true))), 
+<tr>
+<td>
+   <?php  echo $form->input('Newsletter.title', array('size'=>50, 'maxlength' => 50, 'label'=>__('Title', true))); ?>
+</td>
+<td>
+ <?php 
+    echo $html->link($html->image('admin/myimages.jpg', array('alt'=>__('My Images', true), 'title'=>__('My Images', true))), 
                          '#', 
                          array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false); ?>
@@ -24 +25 @@
 <tr><td colspan="2">
 <?php 
-  echo $form->textarea('Newsletter.body', array('cols'=>60, 'rows'=>17)); 
+  echo $form->textarea('Newsletter.body', array('cols'=>60, 'rows'=>17));
+  echo $form->error('Newsletter.body');
   echo $fck->load('NewsletterBody', 'Karamelo'); 
 ?>

trunk/app/views/newsletters/admin_edit.ctp

@@ -1 +1 @@
 <?php 
-    echo $javascript->link('myfunctions');
     echo $javascript->link('fckeditor/fckeditor'); 
 
-    echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
-    echo $html->addCrumb('Entries', '/admin/newsletters/listing'); 
+    echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
+    echo $html->addCrumb(__('Newsletters', true), '/admin/newsletters/listing'); 
     echo $html->getCrumbs(' / '); 
 
@@ -10 +9 @@
     echo $form->hidden('Newsletter.id');
 ?>
-
 <fieldset>
-<legend>New newsletter</legend>
-
+<legend><?php __('Newsletter'); ?></legend>
 <table style="margin:0 auto 0 auto;">
 <tr>
-   <td>
-    <?php
-      echo $form->input('Newsletter.title', array("size" => 50, "maxlength" => 50));
-    ?>
-  </td>
-   <td>
-    <?php 
-        echo $html->link($html->image('admin/myimages.jpg', array("alt"=>"My Images", "title"=>"My Images")), 
+ <td><?php echo $form->input('Newsletter.title', array('size' => 50, 'maxlength' => 50)); ?></td>
+ <td>
+ <?php 
+   echo $html->link($html->image('admin/myimages.jpg', array('alt'=>__('My Images', true), 'title'=>__('My Images', true))), 
                          '#', 
-                         array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false); ?></p>
+                         array("onclick"=>"javascript:window.open('/admin/images/listing/set', 'blank', 'toolbar=no, scrollbars=yes,width=700,height=500')"), null, false); ?>
   </td>
   </tr>
   <tr><td colspan="2">
-  <?php 
-    echo $form->label('Newsletter.Body', 'Text:');
-    echo $form->textarea('Newsletter.body', array('cols'=>60, 'rows'=>17)); 
+  <?php
+    echo $form->textarea('Newsletter.body', array('cols'=>60, 'rows'=>17));
+    echo $form->error('Newsletter.body'); 
     echo $fck->load('NewsletterBody', 'Karamelo'); 
   ?>
@@ -37 +30 @@
 </tr> 
 <tr>
-  <td>
-       <?php
-            echo $form->label('Newsletter.status', __('Published', true));
-            echo $form->checkbox('Newsletter.status'); 
-        ?>
-  </td>
-   <td>
-       <?php 
-            echo $form->label('Newsletter.end', __('Finish edition', true));
-            echo $form->checkbox('Newsletter.end'); 
-       ?>
-   </td>
-  </tr>
-  <tr><td colspan="2"></fieldset>
+<td>
+ <?php
+    echo $form->label('Newsletter.status', __('Published', true));
+    echo $form->checkbox('Newsletter.status'); 
+ ?>
+</td>
+<td>
+ <?php 
+    echo $form->label('Newsletter.end', __('Finish edition', true));
+    echo $form->checkbox('Newsletter.end'); 
+  ?>
+ </td>
+ </tr>
+  <tr><td colspan="2">
   <?php echo $form->end(__('Save', true)); ?>
+</fieldset>
 </td></tr>
 </table>