Changeset 722 for trunk/app/controllers

Show
Ignore:
Timestamp:
08/13/08 11:08:12 (4 months ago)
Author:
aarkerio
Message:

Little changes

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/app/controllers/messages_controller.php

    r699 r722  
    375375  endforeach; 
    376376     
    377   $this->msgFlash($messages . ' messages sent to group','/admin/vclassrooms/members/'.$this->data['Message']['vclassroom_id']);   
     377  $this->msgFlash($messages.' '.__('messages sent to group', true),'/admin/vclassrooms/members/'.$this->data['Message']['vclassroom_id']);   
    378378 } 
    379379  
     
    419419    $this->layout = 'ajax'; 
    420420     
    421     if (!empty($this->data["Message"])): 
     421    if (!empty($this->data['Message'])): 
    422422 
    423423           $this->Sanitize = new Sanitize; 
    424424            
    425            $this->Sanitize->html($this->data["Message"]["title"]); 
    426             
    427            $this->Sanitize->html($this->data["Message"]["body"]); 
     425           $this->Sanitize->html($this->data['Message']["title"]); 
     426            
     427           $this->Sanitize->html($this->data['Message']["body"]); 
    428428            
    429429           $this->Message->create(); 
    430430            
    431            if ($this->Message->save($this->data["Message"])): 
    432                 $this->__sendMail($this->data["Message"]["user_id"]); 
     431           if ($this->Message->save($this->data['Message'])): 
     432                $this->__sendMail($this->data['Message']["user_id"]); 
    433433           endif; 
    434434   endif; 
     
    450450            
    451451           $this->data['Message']['username'] = $this->Auth->user('username');  
    452  
    453            $this->Message->create(); 
    454             
    455            if ($this->Message->save($this->data["Message"])): 
    456                 $this->__sendMail($this->data["Message"]["user_id"]); 
     452            
     453           if ($this->Message->save($this->data)): 
     454                $this->__sendMail($this->data['Message']['user_id']); 
    457455                $this->render('admin_ok', 'ajax'); 
    458456           endif; 
     
    471469     $this->Sanitize = new Sanitize; 
    472470           
    473      $this->Sanitize->html($this->data['Message']["title"]); 
    474            
    475      $this->Sanitize->html($this->data['Message']["body"]); 
    476            
    477      if ( isset( $this->data['Message']["message_id"] ) ): 
    478               $this->change($this->data['Message']["message_id"], 2); 
     471     $this->Sanitize->html($this->data['Message']['title']); 
     472           
     473     $this->Sanitize->html($this->data['Message']['body']); 
     474           
     475     if ( isset( $this->data['Message']['message_id'] ) ): 
     476              $this->change($this->data['Message']['message_id'], 2); 
    479477     endif; 
    480478           
    481479     if ($this->Message->save($this->data)): 
    482             $this->__sendMail($this->data['Message']["user_id"], $this->data['Message']["username"], $this->data['Message']["title"]); 
     480            $this->__sendMail($this->data['Message']['user_id'], $this->data['Message']['username'], $this->data['Message']['title']); 
    483481            $this->render('sent','ajax'); 
    484482      endif; 
     
    492490      $this->layout    = 'admin'; 
    493491       
    494       $conditions      = array("Message.id"=>$message_id, "Message.user_id"=>$this->Auth->user('id')); 
    495        
    496       $fields          = array("Message.id", "Message.user_id", "Message.title", "Message.created", "Message.body", "Message.sender_id", "Message.status", "User.username"); 
     492      $conditions      = array('Message.id'=>$message_id, 'Message.user_id'=>$this->Auth->user('id')); 
     493       
     494      $fields          = array('Message.id', 'Message.user_id', 'Message.title', 'Message.created', 'Message.body', 'Message.sender_id', 'Message.status', 'User.username'); 
    497495       
    498496      $data            = $this->Message->find($conditions, $fields); 
     
    569567   endforeach; 
    570568 
    571    $this->msgFlash(__('Data deleted', true),'/admin/messages/listing'); 
     569   $this->msgFlash(__('Data removed', true),'/admin/messages/listing'); 
    572570 } 
    573571}