Changeset 342 for trunk/app/controllers/users_controller.php

Timestamp:

03/25/08 01:03:27 (8 months ago)

Author:

aarkerio

Message:

eCourses fixes

Files:

• trunk/app/controllers/users_controller.php (modified) (5 diffs)

trunk/app/controllers/users_controller.php

@@ -55 +55 @@
      
      $limit      = 20;
-        
+     
      $this->set('data', $this->User->Entry->findAll($conditions, $fields, $order, $limit)); 
-        
+     
      $this->layout    = $this->Edublog->layout($user_id);
-        
+     
      $this->Edublog->blog($user_id);
  }
@@ -393 +393 @@
  public function admin_edit() 
  {
-    
-    $this->layout    = 'admin';
-    
-    $this->set('Groups', $this->User->Group->generateList());       
-    
-    if (empty($this->data))
-    {
-        $this->User->id = $this->Auth->user('id');
-        $this->data = $this->User->read();
+    if ( empty($this->data['User']) )
+    {
+        $this->layout    = 'admin';
+        
+        $this->set('Groups', Set::combine($this->User->Group->find('all', array('order' => 'name')), "{n}.Group.id","{n}.Group.name"));
+        
+        $this->User->unbindModel($this->User->notNow);
+            
+        $this->data = $this->User->read(null, $this->Auth->user('id'));
     }
     else
@@ -480 +480 @@
      }
  }
-
-  /*** DELETE  **/ 
-  public function delete($id)
-  {
-    $this->User->del($id);
-    $this->msgFlash('User has been deleted.', '/admin/users/listing');
-  }
-  
-  /*** List user's blog entries  **/ 
-  public function blogs($order = null)
-  {
-  
-    $conditions = array("active" => 1 );
-    
-    $data = $this->User->findAll($conditions, $order);
-    
-    $this->set('data', $data);
-   
-  }
-
+ 
+ /*** DELETE  **/ 
+ public function admin_delete($id)
+ {
+    if ($this->User->del($id))
+    {
+       $this->msgFlash('User has been deleted.', '/admin/users/listing');
+    }
+ }
+ 
  /****   AVATAR   ***/
  public function admin_avatar() 
@@ -573 +563 @@
     }
         
-    $extension   = $this->get_extension($type);
+    $extension   = $this->Adds->get_extension($type);
     
     $Name        = $this->Auth->user('username') . "_avatar" . $extension;
@@ -607 +597 @@
    
    }
-}
-
-public function admin_delete($id)
-{
-    if ( $this->User->del($id) )
-    {
-        $this->msgFlash('User has been deleted','/admin/users/listing');
-    }
 }