Changeset 701 for trunk/app/controllers

Timestamp:

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

Author:

aarkerio

Message:

New validates

Location:

trunk/app/controllers

Files:

• catglossaries_controller.php (modified) (1 diff)
• entries_controller.php (modified) (3 diffs)
• lessons_controller.php (modified) (1 diff)
• news_controller.php (modified) (3 diffs)

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; 
   }
 }