Changeset 652 for trunk/app/controllers
- Timestamp:
- 07/15/08 01:53:54 (4 months ago)
- Location:
- trunk/app/controllers
- Files:
-
- 2 modified
-
components/portal.php (modified) (3 diffs)
-
messages_controller.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/app/controllers/components/portal.php
r494 r652 15 15 App::import('Model', 'User'); 16 16 App::import('Model', 'Vclassroom'); 17 App::import('Model', 'Message'); 17 18 18 19 class PortalComponent extends Object { … … 32 33 $Element['Poll'] = $this->poll(); 33 34 $Element['Vclassrooms'] = $this->vclassrooms(); 34 35 $Element['Message'] = $this->chkMessage(); 35 36 $this->controller->set('Element', $Element); 36 37 … … 47 48 endif; 48 49 } 49 50 51 private function chkMessage() 52 { 53 if ($this->controller->Auth->user()): 54 $this->Message = new Message; 55 $conditions = array('Message.user_id'=>$this->controller->Auth->user('id'), 'Message.status'=>0); 56 return $this->Message->field('Message.id', $conditions, 'Message.id DESC'); 57 else: 58 return false; 59 endif; 60 } 61 50 62 private function lastEntries() { 51 63 -
trunk/app/controllers/messages_controller.php
r639 r652 80 80 $this->data['Message']['username'] = $this->Auth->user('username'); 81 81 82 $user_id = $this->Message->User->field('User.id', array('User.username'=>trim($this->data['Message']['sendern']))); 83 84 $this->data['Message']['user_id'] = $user_id; 85 86 //die(debug($this->data['Message'])); 87 88 $this->Message->create(); 89 90 if ( $this->Message->save($this->data['Message']) ): 91 $this->__sendMail($user_id); 92 $this->msgFlash('Message sent', '/messages/listing'); 82 if ( $this->Message->save($this->data) ): 83 $this->__sendMail($this->data['Message']['user_id']); 84 $this->msgFlash(__('Message sent', true), '/messages/listing'); 93 85 endif; 94 86 endif; … … 338 330 $this->paginate['limit'] = 20; 339 331 340 $data = $this->paginate(' Entry', $conditions);332 $data = $this->paginate('Message'); 341 333 342 334 $this->set(compact('data'));
