Changeset 701

Timestamp:

08/08/08 16:03:49 (4 months ago)

Author:

aarkerio

Message:

New validates

Location:

trunk/app

Files:

• app_model.php (modified) (1 diff)
• controllers/catglossaries_controller.php (modified) (1 diff)
• controllers/entries_controller.php (modified) (3 diffs)
• controllers/lessons_controller.php (modified) (1 diff)
• controllers/news_controller.php (modified) (3 diffs)
• locale/spa/LC_MESSAGES/default.po (modified) (3 diffs)
• models/answer.php (modified) (2 diffs)
• models/catglossary.php (modified) (2 diffs)
• models/entry.php (modified) (3 diffs)
• models/lesson.php (modified) (1 diff)
• models/news.php (modified) (1 diff)
• views/entries/admin_add.ctp (modified) (2 diffs)
• views/entries/admin_edit.ctp (modified) (2 diffs)
• views/glossaries/admin_edit.ctp (modified) (2 diffs)
• views/news/admin_add.ctp (modified) (4 diffs)
• views/news/admin_edit.ctp (modified) (4 diffs)
• views/news/admin_listing.ctp (modified) (2 diffs)
• views/quotes/admin_listing.ctp (modified) (3 diffs)
• views/users/admin_edit.ctp (modified) (2 diffs)

trunk/app/app_model.php

@@ -82 +82 @@
  public function invalidate($field, $value = true) 
  {
-     return parent::invalidate($field, __($value, true));
+   return parent::invalidate($field, __($value, true));
  }
 }

trunk/app/controllers/catglossaries_controller.php

@@ -109 +109 @@
  }
 
-public function admin_edit($catglossary_id=null)
-{
- $this->layout    = 'admin';
+ public function admin_edit($catglossary_id=null)
+ {
+  $this->layout    = 'admin';
      
   if ( empty( $this->data['Catglossary'] ) ):       

trunk/app/controllers/entries_controller.php

@@ -123 +123 @@
    $this->layout = 'admin';
 
-   $this->set('subjects', Set::combine($this->Entry->Subject->find('all', array('order' => 'title')), "{n}.Subject.id","{n}.Subject.title"));
-      
-    if ( !empty($this->data['Entry']) )  
-    {
+   $this->set('subjects',Set::combine($this->Entry->Subject->find('all', array('order'=>'title')),"{n}.Subject.id","{n}.Subject.title"));
+      
+   if ( !empty($this->data['Entry']) ):
+    
         $this->Sanitize = new Sanitize;
       
@@ -134 +134 @@
 
         $this->data['Entry']['user_id'] = $this->Auth->user('id');
-
-    $this->Entry->create();
       
         if ($this->Entry->save($this->data)): 
@@ -146 +144 @@
            endif;
         endif;
-    }
+    endif;
  }
  

trunk/app/controllers/lessons_controller.php

@@ -31 +31 @@
         
     $this->layout      = $this->Edublog->layout($user_id);
-        
+    
     $this->Edublog->blog($user_id); // blogger elements
         
-    $this->LessonTitle = __('Lesson', true);
+    $this->LessonTitle = $username .' '. __('Lessons', true);
         
     $conditions        = array('Lesson.id'=>$id, 'Lesson.status'=>1);

trunk/app/controllers/news_controller.php

@@ -114 +114 @@
   
   /*** ======ADMIN METHODS === *****/
-   public function admin_listing($page=1) 
+   public function admin_listing() 
    {
       $this->pageTitle = 'News manager';
@@ -147 +147 @@
     $this->set('themes', Set::combine($this->News->Theme->find('all', array('order'=>'theme')),"{n}.Theme.id","{n}.Theme.theme"));
     
-    if (!empty($this->data["News"]))
-    {
+    if (!empty($this->data['News'])):
          $this->Sanitize = new Sanitize;
          
-         $this->Sanitize->paranoid($this->data["News"]["title"]);
-         
-         $this->Sanitize->paranoid($this->data["News"]["reference"]);
-
-         $this->Sanitize->html($this->data["News"]["body"]); 
-        
-         $this->data["News"]["user_id"] = $this->Auth->user('id');
+         $this->Sanitize->paranoid($this->data['News']['title']);
+         
+         $this->Sanitize->paranoid($this->data['News']['reference']);
+
+         $this->Sanitize->html($this->data['News']['body']); 
+        
+         $this->data['News']['user_id'] = $this->Auth->user('id');
 
      $this->News->create();
          
-     if ($this->News->save($this->data["News"]))
-         {
-             if ( $this->data["News"]["end"] == 1 )
-             {
-                         $this->msgFlash('Story added!','/admin/news/listing');
-             } 
-             else 
-             {
-                         $id = $this->News->getLastInsertID();
-                         $this->msgFlash('Story added','/admin/news/edit/'.$id);
-             }
-         }
-    }
- }
- 
- public function admin_edit($id=null)
-  {
-     $this->layout    = 'admin';
-     
-     if ( empty( $this->data["News"] ) )
-     {
-         $this->News->id  = $id;
-         
-         $this->data      = $this->News->read();
-
-         $this->set('themes', Set::combine($this->News->Theme->find('all', array('order'=>'theme')),"{n}.Theme.id","{n}.Theme.theme"));
-     }
-     else
-     {   
+     if ($this->News->save($this->data)):
+         if ( $this->data['News']['end'] == 1 ):
+                   $this->msgFlash(__('Data saved', true),'/admin/news/listing');
+             else:
+                   $id = $this->News->getLastInsertID();
+                   $this->msgFlash(__('Data saved', true),'/admin/news/edit/'.$id);
+             endif;
+     endif;
+    endif;
+ }
+ 
+ public function admin_edit($news_id=null)
+ {
+  $this->layout    = 'admin';
+
+  $this->set('themes', Set::combine($this->News->Theme->find('all', array('order'=>'theme')),"{n}.Theme.id","{n}.Theme.theme"));
+ 
+  if ( empty($this->data['News']) ):
+         $this->data      = $this->News->read(null, $news_id);
+  else:   
          $this->Sanitize = new Sanitize;
-         
+  
          $this->Sanitize->paranoid($this->data['News']['title']);
          
@@ -198 +188 @@
          $this->Sanitize->html($this->data['News']['body']);
          
-         if ($this->News->save($this->data['News']))
-         {   
-             if ( $this->data["News"]["end"] == 1 )
-             {
-                    $this->msgFlash('Story saved', '/admin/news/listing');
-             } 
-             else 
-             {
-                    $this->msgFlash('Story saved', '/admin/news/edit/'.$this->data["News"]["id"]);
-             }
-        }
-     }
-  }
-  
-  public function admin_delete($id) 
+         if ($this->News->save($this->data)):
+         if ( $this->data['News']['end'] == 1 ):
+                    $this->msgFlash(__('Data saved', true), '/admin/news/listing');
+             else: 
+                    $this->msgFlash(__('Data saved', true), '/admin/news/edit/'.$this->data['News']['id']);
+         endif;
+     endif;
+     endif;
+  }
+  
+  public function admin_delete($news_id) 
   {   
-      if ( $this->News->del($id) )
-      {
-            $this->msgFlash('New deleted', '/admin/news/listing');
-      } 
-      else 
-      {
-            $this->flash('Database error!', '/admin/news/listing');
-      }
+   if ( $this->News->del($news_id) ):
+         $this->msgFlash(__('Data removed', true), '/admin/news/listing/');
+   endif; 
   }
 }

trunk/app/locale/spa/LC_MESSAGES/default.po

@@ -4 +4 @@
 msgid  "New item"
 msgstr "Nuevo término"
+
+msgid  "Title must be at least four characters long"
+msgstr "El título debe tener al menos cuatro letras"
+
+msgid  "Entry must be at least 8 characters long"
+msgstr "La entrada debe tener al menos ocho letras"
 
 msgid  "Message sent"
@@ -482 +488 @@
 msgstr "Temas noticias"
 
+msgid  "Theme"
+msgstr "Tema"
+
+msgid  "profile"
+msgstr "perfil"
+
+msgid  "Your URL format lucks incorrect"
+msgstr "El formato del URL parece incorrecto"
+
+msgid  "See comments"
+msgstr "Ver comentarios"
+
 msgid  "Help"
 msgstr "Ayuda"
@@ -491 +509 @@
 msgstr "Examenes"
 
+msgid  "Name"
+msgstr "Nombre"
+
+msgid  "eduBlog name"
+msgstr "Nombre del eduBlog"
+
 msgid  "New Test"
 msgstr "Nuevo examen"

trunk/app/models/answer.php

@@ -8 +8 @@
 class Answer extends AppModel {
    
-  public $belongsTo = array('Question' =>
+ public $belongsTo = array('Question' =>
                                     array('className'  => 'Question',
                                           'conditions' => '',
@@ -16 +16 @@
                           );
  
-  public $validate = array(
-                'comment'  => VALID_NOT_EMPTY, 
-                'user_id'  => VALID_NOT_EMPTY,
-                'entry_id' => VALID_NOT_EMPTY,
-                'username' => VALID_NOT_EMPTY
-                   );
-   
+
+ public $validate = array(
+  'answer' => array(
+                    'rule'       => array('minLength', 2),
+                    'message'    => 'Answer must be at least two characters long',
+            'allowEmpty' => false,
+                    'required'   => true 
+            ),
+  'correct' => array(
+             'rule'       => 'numeric',
+                     'allowEmpty' => false,
+                     'required'   => true 
+             ),
+  'question_id' => array(
+             'rule'       => 'numeric',
+                     'allowEmpty' => false,
+                     'required'   => true 
+             ),
+  'user_id' => array(
+             'rule'       => 'numeric',
+                     'allowEmpty' => false,
+                     'required'   => true 
+             )
+   );
 }
 ?>

trunk/app/models/catglossary.php

@@ -8 +8 @@
 class Catglossary extends AppModel
 {
-    public $name    = 'Catglossary';
+  public $name    = 'Catglossary';
     
-    public $belongsTo = array('User' =>
+  public $belongsTo = array('User' =>
                          array('className'      => 'User',
                                'conditions'     => null,
@@ -20 +20 @@
                          );
     
-    public $hasMany = array('Glossary' =>
+ public $hasMany = array('Glossary' =>
                 array('className'   => 'Glossary',
-                                  'foreignKey'  => 'catglossary_id'
+                                  'foreignKey'  => 'catglossary_id',
+                                  'order'       => 'item'
                          )
                   );
 
     
-    public $validate = array(
-      'title' => VALID_NOT_EMPTY,
-        'description' => VALID_NOT_EMPTY,
-      'user_id' => VALID_NOT_EMPTY,
-      'status' => VALID_NOT_EMPTY
+ public $validate = array(
+  'title' => array(
+                    'rule'       => array('minLength', 8),
+                    'message'    => 'Title must be at least 8 characters long',
+            'allowEmpty' => false,
+                    'required'   => true 
+            ),
+      
+  'description' => array(
+                    'rule'       => array('minLength', 8),
+                    'message'    => 'Title must be at least 8 characters long',
+            'allowEmpty' => false,
+                    'required'   => true 
+            )
    );
-    
 }
-
 ?>

trunk/app/models/entry.php

@@ -5 +5 @@
 {
     
-    public $belongsTo = array('User' =>
+ public $belongsTo = array('User' =>
                            array('className'  => 'User',
                                  'conditions' => '',
@@ -19 +19 @@
                      );
     
-    public $hasMany = array('Comment' =>
+ public $hasMany = array('Comment' =>
                          array('className'     => 'Comment',
                                'conditions'    =>  null,
@@ -30 +30 @@
                          )
                   );
-    
-    public $validate = array(
-      'title' => VALID_NOT_EMPTY,         //'/[a-z0-9\_\-]{3,}$/i',
-      'user_id' => VALID_NOT_EMPTY,
-      'body' => VALID_NOT_EMPTY,
-      'status' => VALID_NOT_EMPTY
+
+ public $validate = array(
+  'title' => array(
+                    'rule'       => array('minLength', 4),
+                    'message'    => 'Title must be at least four characters long',
+            'allowEmpty' => false,
+                    'required'   => true 
+            ),
+      
+  'body' => array(
+                    'rule'       => array('minLength', 8),
+                    'message'    => 'Entry must be at least 8 characters long',
+            'allowEmpty' => false,
+                    'required'   => true 
+            )
    );
 
-public function getComments($blogger_id)
-{
- 
+ public function getComments($blogger_id)
+ {
   $conditions   = array('Entry.user_id'=>$blogger_id);
   $fields       = array('Entry.title', 'Entry.id');

trunk/app/models/lesson.php

@@ -37 +37 @@
                  );  
 
-  public $validate = array(
-      'title' => VALID_NOT_EMPTY,         //'/[a-z0-9\_\-]{3,}$/i',
-      'body' => VALID_NOT_EMPTY,
-      'user_id' => VALID_NOT_EMPTY
+ public $validate = array(
+  'title' => array(
+                    'rule'       => array('minLength', 4),
+                    'message'    => 'Title must be at least four characters long',
+            'allowEmpty' => false,
+                    'required'   => true 
+            ),
+      
+  'body' => array(
+                    'rule'       => array('minLength', 8),
+                    'message'    => 'Entry must be at least 8 characters long',
+            'allowEmpty' => false,
+                    'required'   => true 
+            ),
+  'user_id' => array(
+             'rule'       => 'numeric',
+                     'allowEmpty' => false,
+                     'required'   => true 
+             )
    );
-/*
-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
-                               )
-                       ); */
 }
 ?>

trunk/app/models/news.php

@@ -32 +32 @@
                          );
 
-     public $validate = array(
-           'title' => VALID_NOT_EMPTY,
-           'user_id' => VALID_NOT_EMPTY,
-           'body' => VALID_NOT_EMPTY,
-           'status' => VALID_NOT_EMPTY
-     );
-/*
 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
-                               )
-                       ); */ 
+  'title' => array(
+                   'rule'       => array('minLength', 4),
+                   'message'    => 'Title must be at least four characters long',
+           'allowEmpty' => false,
+                   'required'   => true 
+          ),
+  'body'  => array(
+                   'rule'       => array('minLength', 8),
+                   'message'    => 'Entry must be at least 8 characters long',
+           'allowEmpty' => false,
+                   'required'   => true 
+          ),
+   'reference' => array(
+             'rule' => 'url',
+                         'allowEmpty' => true,
+                         'required'   => false,
+                         'message'    => 'Your URL format lucks incorrect', 
+   ),
+  'theme_id' => array(
+             'rule'       => 'numeric',
+                     'allowEmpty' => false,
+                     'required'   => true 
+             )
+  ); 
 }
 ?>

trunk/app/views/entries/admin_add.ctp

@@ -13 +13 @@
   <?php 
      echo $form->input('Entry.title', array('size' => 50, 'maxlength' => 50, 'label'=>__('Title', true)));
-     echo $form->error('Entry.title', 'Title is required.');
+     echo $form->error('Entry.title');
  ?>
   </td>
@@ -31 +31 @@
      echo $form->textarea('Entry.body', array('cols'=>80, 'rows'=>30)); 
      echo $fck->load('EntryBody', 'Karamelo'); 
+     echo $form->error('Entry.body');
    ?>
   </td></tr>

trunk/app/views/entries/admin_edit.ctp

@@ -51 +51 @@
   <td>
   <?php 
-      echo $form->label('Entry.end', 'Finish edition' );
+      echo $form->label('Entry.end', __('Finish edition', true) );
       echo $form->checkbox('Entry.end', array('value'=>1)); 
   ?>
@@ -62 +62 @@
   </tr>
 </table>
-
 </fieldset>

trunk/app/views/glossaries/admin_edit.ctp

@@ -1 @@
-<div>
 <?php 
-    echo $html->addCrumb('Control Tools', '/admin/entries/start'); 
-    echo $html->addCrumb('Glossaries', '/admin/catglossaries/listing'); 
-    echo $html->getCrumbs(' / '); 
-?>
-</div>
-
-<?php 
+   echo $html->addCrumb('Control Panel', '/admin/entries/start'); 
+   echo $html->addCrumb(__('Glossaries', true), '/admin/catglossaries/listing'); 
+   echo $html->getCrumbs(' / '); 
+    
    echo $form->create('Glossary'); 
    echo $form->hidden('Glossary.id');
@@ -13 +9 @@
 ?>
 <fieldset>
-  <legend>Edit Item</legend>
+  <legend><?php __('Edit item'); ?></legend>
   <?php 
-    echo $form->input('Glossary.item', array("size" => 30, "maxlength" => 90));
+    echo $form->input('Glossary.item', array('size' => 30, 'maxlength' => 90));
     echo $form->error('Glossary.item', 'An item  is required.');
      
-    echo $form->label('Glossary.definition', 'Definition:');
-    echo $form->textarea('Glossary.definition', array("cols" => 40, "rows" => 6));
+    echo $form->label('Glossary.definition', __('Definition', true));
+    echo $form->textarea('Glossary.definition', array('cols' => 40, 'rows' => 6));
     echo $form->error('Glossary.definition', 'A category definition is required.');
-  ?>