diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php index 00fd0a9..cd874da 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserBL.php @@ -58,6 +58,7 @@ if (checkSession()) { } else { if($bLdap) { $oPatternCustom->setHtml(getDetailsLDAPPage($sSearch,$aResults, $oAuth->oLdap->getUserIdentifier())); + $main->setOnLoadJavaScript("disable(document.MainForm.fLdap)"); $main->setFormAction($_SERVER["PHP_SELF"]. "?fAddToDb=1"); } else { $oPatternCustom->setHtml(getDetailsDBPage($sSearch,$aResults)); @@ -77,6 +78,7 @@ if (checkSession()) { // display details page if ($bLdap) { $oPatternCustom->setHtml(getDetailsLDAPPage($fName,$aResult, $oAuth->oLdap->getUserIdentifier())); + $main->setOnLoadJavaScript("disable(document.MainForm.fLdap)"); $main->setFormAction($_SERVER["PHP_SELF"]. "?fAddToDb=1"); } else { $oPatternCustom->setHtml(getDetailsDBPage($fName,$aResult)); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc index 1959f3c..05f78dd 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc @@ -86,14 +86,15 @@ function getDetailsDBPage($suserName, $aAttributes) { } function getDetailsLDAPPage($suserName, $aAttributes, $sUserIdentifier) { - - $sToRender .= renderHeading("Add User To System"); global $default; + + $sToRender .= renderHeading("Add User To System"); + foreach ($aAttributes as $sUserName => $aUserAttributes) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php index 72b52da..6ab6d89 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php @@ -37,7 +37,7 @@ if (checkSession()) { //an error occured while trying to create the document link $oPatternCustom = & new PatternCustom(); $oPatternCustom->setHtml(getPage($fDocumentID)); - + $main->setOnLoadJavaScript("disable(document.MainForm.fTargetDocument)"); $main->setCentralPayload($oPatternCustom); $main->setFormAction($_SERVER["PHP_SELF"] . "?fDocumentID=$fDocumentID&fForStore=1"); $main->setHasRequiredFields(true); @@ -50,6 +50,7 @@ if (checkSession()) { $oPatternCustom = & new PatternCustom(); $oPatternCustom->setHtml(getPage($fDocumentID)); + $main->setOnLoadJavaScript("disable(document.MainForm.fTargetDocument)"); $main->setCentralPayload($oPatternCustom); $main->setFormAction($_SERVER["PHP_SELF"] . "?fDocumentID=$fDocumentID&fForStore=1"); $main->setHasRequiredFields(true); diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc index 1da82f8..56fde95 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc @@ -19,24 +19,21 @@ function getPage($iDocumentID) { $sToRender .= ""; //had a slight problem with netscape 4.7x - it doesn't support disabled. So I had to use //javascript to set the onFocus attribute to blur - $bAddNetscapeScript = false; - if (! (($default->phpSniff->property("browser") == "moz") && ($default->phpSniff->property("version") <= "4.79")) ) { + if (!$default->bNN4) { //for any other browser but netscape 4.7 do this $sToRender .= "\n"; - }else { + } else { //for netscape 4.7 do this $sToRender .= "\n"; - $bAddNetscapeScript = true; } $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
User Details:
LDAP DN: LDAP DN: bNN4 ? "onblur=\"disable(document.MainForm.fLdap)" : "DISABLED") . " size = \"40\" type=\"text\" name=\"fLdap\" value = \"". $aUserAttributes["dn"]. "\">
Document to linkDocument to link
graphicsUrl/widgets/update.gif\" border=\"0\"/>rootUrl . "/control.php?action=viewDocument&fDocumentID=$iDocumentID\">graphicsUrl/widgets/cancel.gif\" border=\"0\"/>
\n"; - //$sToRender .= "
graphicsUrl/widgets/update.gif\" border=\"0\"/>graphicsUrl/widgets/cancel.gif\" border=\"0\"/>
\n"; $sToRender .= "
\n"; $sToRender .= "\n"; - return $sToRender . "\n\n" . getValidationJavaScript() . "\n\n" . getBrowseJavaScript() . ($bAddNetscapeScript ? getNetscapeDisableScript() : ""); + return $sToRender . "\n\n" . getValidationJavaScript() . "\n\n" . getBrowseJavaScript(); } function getValidationJavaScript() { @@ -58,13 +55,4 @@ function getBrowseJavaScript() { $sToRender .= "//-->\n"; return $sToRender; } - -function getNetscapeDisableScript() { - $sToRender = "\n\n"; - return $sToRender; -} ?> \ No newline at end of file