Updates to UserAdmin.

application/modules/auth/controllers/UserAdminController.php

@@ -19,6 +19,23 @@ class Auth_UserAdminController extends App_Controller_Action
         $this->view->groupUsers = $groupUsers;
     }
     
+    public function importUserAction()
+    {
+    	$this->view->messages = $this->_helper->getHelper('FlashMessenger')->getMessages();
+    }
+    
+    public function importUserPostAction()
+    {
+    	$username = $this->_getParam('username');
+    	$user = Auth_UserModel::fetchNewFromLdap($username);
+    	if ($user) {
+            $this->_redirect('/auth/user-admin/edit-user/id/' . $user->getId());
+    	} else {
+    		$this->_helper->getHelper('FlashMessenger')->addMessage('User "' . $username . '" not found!');
+    		$this->_redirect('/auth/user-admin/import-user');
+    	}
+    }
+    
     public function editUserAction()
     {
     	$user = Auth_UserModel::find($this->_getParam('id'));
@@ -72,6 +89,9 @@ class Auth_UserAdminController extends App_Controller_Action
     public function editGroupAction()
     {	
         $group = Auth_GroupModel::find($this->_getParam('id'));
+        if (!$group) {
+        	$group = Auth_GroupModel::fetchNew();
+        }
         $this->view->group = $group;
         
         $groups = Auth_GroupModel::findAll(false);

application/modules/auth/models/UserModel.php

@@ -11,9 +11,12 @@ class Auth_UserModel extends Unl_Model {
     
     static public function find($id)
 	{
-		if (count($id) == 0) {
+		if (Unl_Util::isArray($id) && count($id) == 0) {
 			return new Unl_Model_Collection(__CLASS__);
 		}
+		if ($id === null) {
+			return null;
+		}
 		
 		$db = Zend_Registry::get('db');
 		
@@ -167,6 +170,7 @@ class Auth_UserModel extends Unl_Model {
         );
 
         $new = new self($data);
+        $new->_setClean();
         return $new;
 	}
 	
@@ -180,6 +184,11 @@ class Auth_UserModel extends Unl_Model {
      */
     public function fetchNewFromLdap($userName)
     {
+    	$user = self::findByUsername($userName);
+    	if ($user) {
+    		return $user;
+    	}
+    	
         if (!self::$_ldap) {
             self::$_ldap = new Unl_Ldap('ldap://localhost:10389');
             self::$_ldap->bind('uid=fpatrack,ou=service,dc=unl,dc=edu', 'eziehuoz');

application/modules/auth/views/scripts/user-admin/import-user.phtml

+<h1>Importing LDAP User</h1>
+
+
+<form action="<?php echo $this->baseUrl(); ?>/auth/user-admin/import-user.post" method="post">
+
+    User Name:<br />
+    <?php echo $this->formText('username'); ?><br />
+    
+	<?php foreach ($this->messages as $message) { ?>
+	<div class="error"><?php echo $message; ?></div>
+    <?php } ?>
+
+    <br />
+    <?php echo $this->formSubmit('submit', 'Import User'); ?><br />
+    
+</form>
\ No newline at end of file

application/modules/auth/views/scripts/user-admin/index.phtml

@@ -21,13 +21,15 @@
 <?php } ?>
 
 
-
-
-
+<h1>Actions</h1>
+<ul>
+    <li><a href="<?php echo $this->baseUrl(); ?>/auth/user-admin/import-user">Import User</a></li>
+    <li><a href="<?php echo $this->baseUrl(); ?>/auth/user-admin/edit-group/id/-1">Create Group</a></li>
+</ul>
 
 <?php $this->users->orderBy('getUsername'); ?>
-
 <?php $this->groups->orderBy('getName'); ?>
+
 <h1>Select a User or Group</h1>
 <ul>
 <?php foreach ($this->groups as $group) { ?>