Changeset 658 for trunk/app/controllers/messages_controller.php

Timestamp:

07/18/08 13:20:57 (5 months ago)

Author:

aarkerio

Message:

Update general

Files:

• trunk/app/controllers/messages_controller.php (modified) (5 diffs)

trunk/app/controllers/messages_controller.php

@@ -457 +457 @@
          $this->Message->change($data['Message']['id'], 1);
       endif;
-      
-      //var_dump($data);
-      
+           
       $this->set('data', $data);
    }
 
-public function admin_edit($id = null)
+public function admin_edit($message_id = null)
 {
-    if (empty($this->data))
-    {
+    if (empty($this->data)):
         $this->layout = 'admin';
-        
-        $this->Message->id = $id;
-        
-        $this->data = $this->Message->read();
-    }
-    else
-    {
+                
+        $this->data = $this->Message->read(null, $message_id);
+    
+     else:
+   
         $this->sanitize = new Sanitize;
-         $this->sanitize->cleanArray($this->data); 
-        if ($this->Message->save($this->data['Message']))
-        {
-            $this->flash('Classroom has been updated.','/admin/messages/listing');
-        }
-    }
+    $this->sanitize->cleanArray($this->data); 
+    if ($this->Message->save($this->data)):
+            $this->msgFlash(__('Message updated', true),'/admin/messages/listing');
+    endif;
+    endif;
  }
 
@@ -510 +504 @@
 
   //Do not pass any args to send()
-   if ( $this->Email->send() )
-   {
-               return true;
-   }
-   else
-   {
+   if ( $this->Email->send() ):
+           return true;
+   else:
            return false;
-   }
+   endif;
  }
 
@@ -527 +518 @@
  {
    if ( isset($this->data['Message']['several']) ):   
-     //exit(debug($this->data['Message']["id"]));
+   
      foreach ($this->data['Message']['id'] as $v):
          if ( $v != 0):
@@ -534 +525 @@
      endforeach;
             
-     $this->msgFlash('The message has been deleted.','/admin/messages/listing');
+     $this->msgFlash(__('The message has been deleted', true),'/admin/messages/listing');
 
   else:
@@ -543 +534 @@
        $this->Message->del($id);
   
-           $this->msgFlash('Message has been deleted.','/admin/messages/listing');
+           $this->msgFlash(__('Message deleted', true),'/admin/messages/listing');
   endif;
  }