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

Timestamp:

04/23/08 19:07:23 (9 months ago)

Author:

aarkerio

Message:

Tests answers

Files:

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

trunk/app/controllers/messages_controller.php

@@ -85 +85 @@
            
            if ($this->Message->save($this->data["Message"]))
-           {
-                $this->sendMail($this->data["Message"]["user_id"], $this->data["Message"]["username"], $this->data["Message"]["title"]);
+       {
+             $this->__sendMail($this->data["Message"]["user_id"], $this->data["Message"]["username"], $this->data["Message"]["title"]);
                 
                 if ( isset($this->data["Message"]["admin"]))
@@ -95 +95 @@
                 {
                     $this->render('sent', 'ajax');
-                }
+        }
         }
      }
  }
-  private function sendMail($user_id, $username, $title) 
-   {
-        $this->User = new User;
-        
-        $fields = array('email', 'username');
-        
-        $data = $this->User->find(array("User.id"=>$user_id), $fields);
-        //exit($data["User"]["email"]);
-        $this->Email->sender    = '::MonoNeurona.org::';
-        $this->Email->to        = $data["User"]["email"];
-        $this->Email->subject   = '::MonoNeurona.org:: New message from '. $username;
-        $this->Email->sendAs    = 'html';
-        $this->Email->template  = null;
-        $this->Email->from      = 'noreply@mononeurona.org';
-        //$this->set('foo', 'Cake tastes good today'); 
-        //Set the body of the mail as we send it.
-        //Note: the text can be an array, each element will appear as a
-        //seperate line in the message body.
-        $url   = '<img src="http://www.mononeurona.org/img/admin/new_user.jpg" alt="MonoNeurona" title="MonoNeurona" /><br />';
-        $url  .= '<h2>'.$data["User"]["username"].'</h2><p>You have a new message from '. $username;
-        $url  .= '<a href="http://'.$_SERVER['SERVER_NAME'].'/admin/messages/listing/">'.$title.'</a></p>';
-        
-        //die($url);
-        
-        if ( $this->Email->send($url) ) 
-        {
-            return true; 
-        } 
-        else 
-        {
-            
-            exit("Error!!");
-        }
+
+  /* == PRIVATE == **/
+  private function __sendMail($email)
+  {   
+    $this->layout          = 'default';
+    $this->Email->to       = $email;
+
+    // this could be just a string too
+    $this->Email->subject  = 'Karamelo e-Learning:: New message';
+    $this->Email->replyTo  = 'support@karamelo.org';
+    $this->Email->from     = 'Chipotle-software.com';
+    $this->Email->template = 'message'; 
+    $this->Email->sendAs   = 'text'; // because we like to send pretty mail
+    //Do not pass any args to send()
+    if ( $this->Email->send() )
+    {
+              return true;
+    }
+    else
+    {
+                return false;
+    }
  }
  
@@ -178 +167 @@
           
           if ($this->Message->save($this->data["Message"]))
-          {
+      {
              $j++;
-          }
+      }
           else
           {
@@ -187 +176 @@
         }
         $this->msgFlash($j . ' messages sent', '/admin/messages/listing');
-      }
+     }
  }
  
@@ -225 +214 @@
  public function admin_add()
  {    
-        $this->layout    = 'admin';
-        
-        if (!empty($this->data["Message"]))
-        {
-          $this->Sanitize = new Sanitize;
-          
-          $this->Sanitize->html($this->data["Message"]["title"]);
-          
-          $this->Sanitize->html($this->data["Message"]["body"]);
-          
-          if ( isset( $this->data["Message"]["message_id"] ) )
-          {
+   $this->layout    = 'admin';
+        
+   if (!empty($this->data["Message"]))
+   {
+     $this->Sanitize = new Sanitize;
+          
+     $this->Sanitize->html($this->data["Message"]["title"]);
+          
+     $this->Sanitize->html($this->data["Message"]["body"]);
+          
+     if ( isset( $this->data["Message"]["message_id"] ) )
+     {
               $this->change($this->data["Message"]["message_id"], 2);
-          }
-          
-          $this->Message->create();
-          
-          if ($this->Message->save($this->data["Message"]))
-          {
+     }
+          
+     $this->Message->create();
+          
+     if ($this->Message->save($this->data["Message"]))
+     {
             $this->sendMail($this->data["Message"]["user_id"], $this->data["Message"]["username"], $this->data["Message"]["title"]);
             $this->render('send','ajax');
-          }
-       }
+     }
    }
+ }
    
-   public function admin_display($message_id)
-   {
+ public function admin_display($message_id)
+ {
       $this->pageTitle = 'Message';
       
@@ -291 +280 @@
         }
     }
-}
-  
-  public function admin_delete($id=null)
-  {
-        if ( isset($this->data["Message"]["several"]) )
-        {   
+ }
+
+ public function admin_write($user_id)
+ {    
+        $this->layout    = 'admin';
+        
+        $this->pageTitle = 'Write Message';
+
+        $this->set('user_id', $user_id);
+ }
+
+ public function admin_deliver()
+ {  
+    if (!empty($this->data['Message']))
+    {
+      $this->Sanitize = new Sanitize;
+           
+      $this->Sanitize->html($this->data['Message']['title']);
+           
+      $this->Sanitize->html($this->data['Message']['body']);
+
+      $this->data['Message']['sender'] = $this->Auth->user('id');
+      //die(debug($this->data));
+      $this->Message->create();
+           
+      if ($this->Message->save($this->data['Message']))
+      {
+      $email = $this->Message->User->field('email', array('id'=>$this->data['Message']['user_id']));
+      if ( $this->__sendMail($email) )
+      {
+               $this->msgFlash('Message sent','/admin/messages/listing');
+      }
+      }
+    }
+ }
+ 
+ public function admin_delete($id=null)
+ {
+   if ( isset($this->data["Message"]["several"]) )
+   {   
             //exit(print_r($this->data["Message"]["id"]));
             foreach ($this->data["Message"]["id"] as $v)
@@ -307 +330 @@
             
             $this->msgFlash('The message has been deleted.','/admin/messages/listing');
-        }
-        else
-        {
+   }
+   else
+   {
            if ( isset( $this->data["Message"]["id"] ) )
            {
@@ -315 +338 @@
            }
            
-             $this->Message->del($id);
-        }
-        $this->msgFlash('Message has been deleted.','/admin/messages/listing');
+       $this->Message->del($id);
+  }
+     $this->msgFlash('Message has been deleted.','/admin/messages/listing');
   }
 }