From cb3471dfd5d6ea6cede5d43d8238a930aca4d4e5 Mon Sep 17 00:00:00 2001
From: Michael Joseph <michael@knowledgetree.com>
Date: Wed, 9 Jul 2003 14:40:40 +0000
Subject: [PATCH] #2723- display a blank user form if using the db to authenticate. changed the search function name and the title of the search page

---
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php | 20 +++++++++++---------
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
index 4006ad0..00fd0a9 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php
@@ -47,7 +47,7 @@ if (checkSession()) {
         $aResults = $oAuth->searchUsers($sSearch, $aAttributes);
 
         //post array to page
-        if(isset($aResults)) {
+        if (isset($aResults)) {
             if(count($aResults) == 0) {
                 $oPatternCustom->setHtml(getPageUsernameNotFound());
             } else {
@@ -65,7 +65,6 @@ if (checkSession()) {
                     }
                 }
             }
-
         } else {
             $oPatternCustom->setHtml(getAddPageFail());
             $main->setFormAction($_SERVER["PHP_SELF"]);
@@ -87,7 +86,6 @@ if (checkSession()) {
     } else if(isset($fAddToDb)) {
         // if db authentication
         if(isset($fFromDb)) {
-            //User($sNewUserName, $sNewName, $sNewPassword, $iNewQuotaMax, $sNewEmail, $sNewMobile, $bNewEmailNotification, $bNewSmsNotification, $sNewLdapDn, $iNewMaxSessions, $iNewLanguageID)
             $oUser = new User($fUsername,$fName,$fPassword,0,$fEmail,$fMobile,$fEmailNotification,$fSmsNotification,0,1,0);
 
         } else {
@@ -100,14 +98,18 @@ if (checkSession()) {
             $oPatternCustom->setHtml(getPageFail());
         }
     } else {
-        // if nothing happens...just reload edit page
-        $oPatternCustom->setHtml(getAddPage(null));
-        $main->setFormAction($_SERVER["PHP_SELF"]. "?fSearch=1");
-
+    	if ($default->authenticationClass == "DBAuthenticator")  {
+			$aAttributes = array("" => array ("username", "name", "email", "mobile", "email_notification", "sms_notification"));    		
+            $oPatternCustom->setHtml(getDetailsDBPage(null,$aAttributes));
+            $main->setFormAction($_SERVER["PHP_SELF"]. "?fAddToDb=1&fFromDb=1");
+    	} else {
+	        // if nothing happens...just reload edit page
+	        $oPatternCustom->setHtml(getSearchPage(null));
+	        $main->setFormAction($_SERVER["PHP_SELF"]. "?fSearch=1");
+    	}
     }
 
-    //$main->setFormAction("$default->rootUrl/presentation/lookAndFeel/knowledgeTree/create.php?fRedirectURL=".urlencode("$default->rootUrl/control.php?action=addUnitSuccess&fUnit"));
     $main->setCentralPayload($oPatternCustom);
     $main->render();
 }
-?>
+?>
\ No newline at end of file
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
index a06d97a..1959f3c 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
@@ -27,11 +27,11 @@ function getSelectUserPage($aResults) {
 }
 
 // get add pages
-function getAddPage($unitID) {
+function getSearchPage($unitID) {
 
 	global $default;
 	
-    $sToRender .= renderHeading("Add User To System");
+    $sToRender .= renderHeading("Search For A User To Add");
 	$sToRender .= "<table>\n";
 	$sToRender .= "<tr><td colspan=\"2\">Please enter a VALID Username to search for in the text box below</td></tr>\n";
 	$sToRender .= "<tr>\n";
--
libgit2 0.21.4