Changeset 759 for trunk/app

Timestamp:

09/07/08 18:55:25 (2 months ago)

Author:

aarkerio

Message:

Update models

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (2 diffs)
• views/messages/admin_listing.ctp (modified) (3 diffs)
• views/messages/admin_write.ctp (modified) (1 diff)
• views/vclassrooms/admin_members.ctp (modified) (2 diffs)

trunk/app/controllers/messages_controller.php

@@ -416 +416 @@
 
  public function admin_deliver()
- {
-    $this->layout = 'ajax';
-    
+ {  
     if (!empty($this->data['Message'])):
 
-           $this->Sanitize = new Sanitize;
-           
-           $this->Sanitize->html($this->data['Message']["title"]);
-           
-           $this->Sanitize->html($this->data['Message']["body"]);
-           
-           $this->Message->create();
-           
-           if ($this->Message->save($this->data['Message'])):
-                $this->__sendMail($this->data['Message']["user_id"]);
-           endif;
+        $this->Sanitize = new Sanitize;
+
+        $this->Sanitize->html($this->data['Message']['title']);
+           
+        $this->Sanitize->html($this->data['Message']['body']);
+           
+        $this->data['Message']['sender_id'] = $this->Auth->user('id');
+           
+        if ($this->Message->save($this->data)):
+                $this->__sendMail($this->data['Message']['user_id']);
+        endif;
+        $this->msgFlash(__('Message sent', true), '/admin/vclassrooms/members/'.$this->data['Message']['vclassroom_id']);    
    endif;
  }
@@ -520 +519 @@
  }
 
- public function admin_write($user_id)
+ public function admin_write($user_id, $vclassroom_id)
  {    
-        $this->layout    = 'admin';
-        
-        $this->pageTitle = 'Write Message';
-
-        $this->set('user_id', $user_id);
- }
-
+   $this->layout    = 'admin';
+   $this->pageTitle = __('Write message', true);
+   $this->set('user_id', $user_id);
+   $this->set('vclassroom_id', $vclassroom_id);
+ }
+ 
  private function __sendMessage($email, $vclassroom_id)
  {   

trunk/app/views/messages/admin_listing.ctp

@@ -16 +16 @@
 //exit(print_r($data));
 
-$th = array('Flag', 'Subject', 'From', 'Date', 'Mark');
+$th = array(__('Flag', true), __('Subject', true), __('From', true), __('Date', true), __('Mark', true));
 echo '<table class="tbadmin">';
 echo $html->tableHeaders($th);
@@ -24 +24 @@
   {
            case 0:
-                $status = 'New';
+                $status = __('New', true);
                 $img    = 'message_n.gif';
                 break;
            case 1:
-                $status = 'Readed';
+                $status = __('Readed', true);
                 $img    = 'message_r.gif';
                 break;
            case 2:
-                $status = 'Reply';
+                $status = __('Reply', true);
                 $img    = 'message_e.gif';
                 break;
@@ -53 +53 @@
  
  if ( count($data) > 0 ):
-    echo $html->link(__('Mark all', true), "javascript:select_switch(true)", array("style"=>"font-size:7pt")) . ' | ';
-    echo $html->link(__('Unmark all', true), "javascript:select_switch(false)", array("style"=>"font-size:7pt")) . '<br /><br />';
-    
+    echo $html->link(__('Mark all', true), "javascript:select_switch(true)", array('style'=>'font-size:7pt')) . ' | ';
+    echo $html->link(__('Unmark all', true), "javascript:select_switch(false)", array('style'=>'font-size:7pt')) . '<br /><br />';
     echo $form->end(__('Delete marked', true));
  endif;

trunk/app/views/messages/admin_write.ctp

@@ -1 +1 @@
 <?php 
-  echo $html->div('sec_title', 'Write message'); 
+  echo $html->div('title_section', __('Write message', true)); 
   echo $form->create('Message', array('action'=>'deliver','onsubmit'=>'return chkForm()')); 
   echo $form->hidden('Message.user_id', array('value'=> $user_id));
+  echo $form->hidden('Message.vclassroom_id', array('value'=> $vclassroom_id));
 ?>
 <fieldset>
-<legend>Write Message:</legend>
+<legend><?php __('Write message'); ?></legend>
  <?php   
-   echo $session->read('Auth.User.username') . " writes: <br />";
+   echo $session->read('Auth.User.username') . ' '. __('writes', true).': <br />';
    echo $form->input('Message.title', array('size'=> 35, 'maxlength'=>50)) . "<br />";
 
-   echo $form->label('Message.body', 'Message:' );
+   echo $form->label('Message.body', __('Message', true) );
    echo $form->textarea('Message.body', array('cols'=>30, 'rows'=>10));
  
-   echo $form->end('Send message'); 
+   echo $form->end(__('Send', true)); 
 ?>
 </fieldset>

trunk/app/views/vclassrooms/admin_members.ctp

@@ -20 +20 @@
 
  echo $html->link(
-         $html->image('static/icon_webquest.jpg', array("alt"=>"Link webquest", "title"=>"Link webquest", "style"=>"margin-right:12px")
+         $html->image('static/icon_webquest.jpg', array('alt'=>'Link webquest', 'title'=>'Link webquest', 'style'=>'margin-right:12px')
      ), '#', array("onclick"=>$w), null, null, false);
 
  echo $html->link(
-        $html->image('static/icon_treasure.jpg', array("alt"=>"Link Treasure", "title"=>"Link Treasure", "style"=>"margin-right:12px")
+        $html->image('static/icon_treasure.jpg', array('alt'=>'Link Treasure', 'title'=>'Link Treasure', 'style'=>'margin-right:12px')
         ), '#', array("onclick"=>$r), null, null, false);
 
  echo $html->link(
-        $html->image('admin/forums_icon.png', array("alt"=>"Add forum", "title"=>"Add forum", "style"=>"margin-right:12px")
+        $html->image('admin/forums_icon.png', array('alt'=>'Add forum', 'title'=>'Add forum', 'style'=>'margin-right:12px')
         ), '#', array("onclick"=>$r), null, null, false); 
 
@@ -85 +85 @@
              $html->link($val['email'], 'mailto:'.$val['email']),
                  $html->link($html->image('admin/compose_on.gif', array('alt'=>__('Compose to', true) .' '.$val['username'], 'title'=>__('Compose to', true) .' '.$val['username'])), 
-                             '/admin/messages/write/'.$val['id'], null, null, false),
+                             '/admin/messages/write/'.$val['id'].'/'.$data['Vclassroom']['id'], null, null, false),
          $html->link($html->image('static/unlink.png', array('alt'=>__('Unlink', true), 'title'=>__('Unlink', true))),
 '/admin/vclassrooms/unlink/'.$val['id'].'/'.$data['Vclassroom']['id'], null, null, false),