Changeset 658

Timestamp:

07/18/08 13:20:57 (3 months ago)

Author:

aarkerio

Message:

Update general

Location:

trunk/app

Files:

• controllers/messages_controller.php (modified) (5 diffs)
• views/entries/admin_start.ctp (modified) (2 diffs)
• views/messages/admin_listing.ctp (modified) (1 diff)

trunk/app/controllers/messages_controller.php

@@ -457 +457 @@
          $this->Message->change($data['Message']['id'], 1);
       endif;
-      
-      //var_dump($data);
-      
+           
       $this->set('data', $data);
    }
 
-public function admin_edit($id = null)
+public function admin_edit($message_id = null)
 {
-    if (empty($this->data))
-    {
+    if (empty($this->data)):
         $this->layout = 'admin';
-        
-        $this->Message->id = $id;
-        
-        $this->data = $this->Message->read();
-    }
-    else
-    {
+                
+        $this->data = $this->Message->read(null, $message_id);
+    
+     else:
+   
         $this->sanitize = new Sanitize;
-         $this->sanitize->cleanArray($this->data); 
-        if ($this->Message->save($this->data['Message']))
-        {
-            $this->flash('Classroom has been updated.','/admin/messages/listing');
-        }
-    }
+    $this->sanitize->cleanArray($this->data); 
+    if ($this->Message->save($this->data)):
+            $this->msgFlash(__('Message updated', true),'/admin/messages/listing');
+    endif;
+    endif;
  }
 
@@ -510 +504 @@
 
   //Do not pass any args to send()
-   if ( $this->Email->send() )
-   {
-               return true;
-   }
-   else
-   {
+   if ( $this->Email->send() ):
+           return true;
+   else:
            return false;
-   }
+   endif;
  }
 
@@ -527 +518 @@
  {
    if ( isset($this->data['Message']['several']) ):   
-     //exit(debug($this->data['Message']["id"]));
+   
      foreach ($this->data['Message']['id'] as $v):
          if ( $v != 0):
@@ -534 +525 @@
      endforeach;
             
-     $this->msgFlash('The message has been deleted.','/admin/messages/listing');
+     $this->msgFlash(__('The message has been deleted', true),'/admin/messages/listing');
 
   else:
@@ -543 +534 @@
        $this->Message->del($id);
   
-           $this->msgFlash('Message has been deleted.','/admin/messages/listing');
+           $this->msgFlash(__('Message deleted', true),'/admin/messages/listing');
   endif;
  }

trunk/app/views/entries/admin_start.ctp

@@ -29 +29 @@
 echo $html->div('main-item', $tmp, array('title'=>'FAQs', 'onclick'=>"document.location.href='/admin/catfaqs/listing'"));
 
- $tmp = $html->link($html->image('Glossary.png', array('title'=>'Glossary', 'alt'=>'Glossary')), '/admin/catglossaries/listing', null, null, false);
+ $tmp = $html->link($html->image('Glossary.png', array('title'=>'Glossaries', 'alt'=>'Glossaries')), '/admin/catglossaries/listing', null, null, false);
  $tmp .= $html->link(__('Glossaries', true), '/admin/catglossaries/listing', array('title'=>'Glossary', 'class'=>'main-item-caption'));
 echo $html->div('main-item',$tmp,array('title'=>'Blog','onclick'=>"document.location.href='/admin/catglossaries/listing'"));
@@ -37 +37 @@
 echo $html->div('main-item', $tmp, array('title'=>'Blog', 'onclick'=>"document.location.href='/admin/podcasts/listing'"));
 
- $tmp  = $html->link($html->image('wikis.png', array('title'=>'Wikis', 'alt'=>'Wikis')), '/admin/wikis/listing', null, null, false);
- $tmp .= $html->link('Wikis', '/admin/wikis/listing', array('title'=>'Wikis', 'class'=>'main-item-caption'));
-echo $html->div('main-item', $tmp, array('title'=>'Blog', 'onclick'=>"document.location.href='/admin/wikis/listing'"));
+// $tmp  = $html->link($html->image('wikis.png', array('title'=>'Wikis', 'alt'=>'Wikis')), '/admin/wikis/listing', null, null, false);
+// $tmp .= $html->link('Wikis', '/admin/wikis/listing', array('title'=>'Wikis', 'class'=>'main-item-caption'));
+//echo $html->div('main-item', $tmp, array('title'=>'Blog', 'onclick'=>"document.location.href='/admin/wikis/listing'"));
 
  $tmp  = $html->link($html->image('mmultimedia.png',array('title'=>'Files', 'alt'=>'Files')), '/admin/shares/listing', null, null, false);

trunk/app/views/messages/admin_listing.ctp

@@ -50 +50 @@
 endforeach;
  
- echo '<tr><td colspan="5" style="text-align:right">';
+echo '<tr><td colspan="5" style="text-align:right">';
  
  if ( count($data) > 0 ):