Changeset 689 for trunk/app/controllers

Timestamp:

08/03/08 00:27:55 (4 months ago)

Author:

aarkerio

Message:

Test JS

Files:

• trunk/app/controllers/acquaintances_controller.php (modified) (3 diffs)

trunk/app/controllers/acquaintances_controller.php

@@ -26 +26 @@
  public function display($username, $user_id)
  {
-       $this->pageTitle = 'Links';
+  $this->pageTitle = 'Links';
           
-       $this->layout    = $this->Edublog->layout($user_id);
+  $this->layout    = $this->Edublog->layout($user_id);
          
-       $this->Edublog->blog($user_id);
+  $this->Edublog->blog($user_id);
          
-       $conditions = array("Acquaintance.user_id"=>$user_id);
+  $conditions = array("Acquaintance.user_id"=>$user_id);
   
-       $this->set('data', $this->Acquaintance->findAll($conditions));
+  $this->set('data', $this->Acquaintance->findAll($conditions));
  }
  
@@ -40 +40 @@
  public function admin_listing()
  { 
-   $this->layout = 'admin';
+  $this->layout = 'admin';
    
-   $conditions   = array("user_id" => $this->Auth->user('id'));
+  $conditions   = array("user_id" => $this->Auth->user('id'));
       
-   //$fields     = array("id", "title", "description", "pubdate", "size");
-      
-   $this->set('data', $this->Acquaintance->findAll($conditions));
+  $this->set('data', $this->Acquaintance->findAll($conditions));
  }
  
- public function admin_add($id = null)
+ public function admin_add()
  {
-    $this->layout = 'admin';
-
-    if (empty($this->data["Acquaintance"])):
-        $this->Acquaintance->id = $id;
-        
-        $this->data = $this->Acquaintance->read();
-    else:
-       $this->Sanitize = new Sanitize;
-       $this->data['Acquaintance']['url'] = trim($this->data['Acquaintance']['url']);
-       $this->Sanitize->clean($this->data['Acquaintance']); 
+  $this->layout = 'admin';
+ 
+  $this->Sanitize = new Sanitize;
+  $this->data['Acquaintance']['url'] = trim($this->data['Acquaintance']['url']);
+  $this->Sanitize->clean($this->data['Acquaintance']); 
        
-       $this->data['Acquaintance']['user_id'] = $this->Auth->user('id');
+  $this->data['Acquaintance']['user_id'] = $this->Auth->user('id');
           
-       $this->Acquaintance->create();
-
-       if ($this->Acquaintance->save($this->data['Acquaintance'])):
-          $this->msgFlash('Link added','/admin/acquaintances/listing');
-       endif;
-    endif;
+  if ($this->Acquaintance->save($this->data)):
+      $this->msgFlash(__('Link added', true), '/admin/acquaintances/listing');
+  endif;   
  }
  
@@ -76 +66 @@
     $this->layout = 'admin';
 
-    if (empty($this->data["Acquaintance"])):
+    if (empty($this->data['Acquaintance'])):
         $this->data = $this->Acquaintance->read(null, $id);
     else:
         $this->Sanitize = new Sanitize;
        
-        $this->Sanitize->clean($this->data["Acquaintance"]); 
+        $this->Sanitize->clean($this->data['Acquaintance']); 
        
-        if ($this->Acquaintance->save($this->data['Acquaintance'])):
-           $this->msgFlash('Link saved','/admin/acquaintances/listing');
+        if ($this->Acquaintance->save($this->data)):
+           $this->msgFlash(__('Data saved', true),'/admin/acquaintances/listing');
         endif;
     endif;
 }
   
-  public function admin_delete($id)
+  public function admin_delete($acquaintance_id)
   {
-    if ($this->Acquaintance->del($id)):
-          $this->msgFlash('Link deleted','/admin/acquaintances/listing');
+    if ($this->Acquaintance->del($acquaintance_id)):
+          $this->msgFlash(__('Link deleted', true),'/admin/acquaintances/listing');
     else:
            $this->flash('Error, call support', '/admin/acquaintances/listing');