Changeset 722 for trunk/app/controllers
- Timestamp:
- 08/13/08 11:08:12 (4 months ago)
- Files:
-
- 1 modified
-
trunk/app/controllers/messages_controller.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/app/controllers/messages_controller.php
r699 r722 375 375 endforeach; 376 376 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']); 378 378 } 379 379 … … 419 419 $this->layout = 'ajax'; 420 420 421 if (!empty($this->data[ "Message"])):421 if (!empty($this->data['Message'])): 422 422 423 423 $this->Sanitize = new Sanitize; 424 424 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"]); 428 428 429 429 $this->Message->create(); 430 430 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"]); 433 433 endif; 434 434 endif; … … 450 450 451 451 $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']); 457 455 $this->render('admin_ok', 'ajax'); 458 456 endif; … … 471 469 $this->Sanitize = new Sanitize; 472 470 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); 479 477 endif; 480 478 481 479 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']); 483 481 $this->render('sent','ajax'); 484 482 endif; … … 492 490 $this->layout = 'admin'; 493 491 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'); 497 495 498 496 $data = $this->Message->find($conditions, $fields); … … 569 567 endforeach; 570 568 571 $this->msgFlash(__('Data deleted', true),'/admin/messages/listing');569 $this->msgFlash(__('Data removed', true),'/admin/messages/listing'); 572 570 } 573 571 }
