diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc index 05f78dd..2bd13c7 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc @@ -11,7 +11,6 @@ // display multiple users function getSelectUserPage($aResults) { global $default; - $sToRender .= renderHeading("Add User To System"); $sToRender .= "\n"; $sToRender .= "\n"; @@ -22,15 +21,12 @@ function getSelectUserPage($aResults) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
Select the User to add to the System:
graphicsUrl/widgets/select.gif\" value=\"submit\" border=\"0\"/>
\n"; - return $sToRender; } // get add pages function getSearchPage($unitID) { - global $default; - $sToRender .= renderHeading("Search For A User To Add"); $sToRender .= "\n"; $sToRender .= "\n"; @@ -43,13 +39,10 @@ function getSearchPage($unitID) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
Please enter a VALID Username to search for in the text box below
graphicsUrl/widgets/select.gif\" value=\"Submit\" border=\"0\"/>
\n"; - return $sToRender; - } -function getDetailsDBPage($suserName, $aAttributes) { - +function getDetailsDBPage($sUserName, $aAttributes) { global $default; $sToRender .= renderHeading("Add User To System"); foreach ($aAttributes as $sUserName => $aUserAttributes) { @@ -76,20 +69,19 @@ function getDetailsDBPage($suserName, $aAttributes) { $sToRender .= "\n"; $sToRender .= "Sms Notification: \n"; $sToRender .= "\n"; + $sToRender .= "Initial Group" . getGroupListBox() . "\n"; $sToRender .= "\n"; $sToRender .= "" . getAddButton() . getCancelButton() . ""; $sToRender .= "\n"; $sToRender .= "\n"; + $sToRender .= getJavascriptValidation(); } return $sToRender; - } -function getDetailsLDAPPage($suserName, $aAttributes, $sUserIdentifier) { +function getDetailsLDAPPage($sUserName, $aAttributes, $sUserIdentifier) { global $default; - $sToRender .= renderHeading("Add User To System"); - foreach ($aAttributes as $sUserName => $aUserAttributes) { $sToRender .= "\n"; $sToRender .= "\n"; @@ -98,15 +90,14 @@ function getDetailsLDAPPage($suserName, $aAttributes, $sUserIdentifier) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -117,89 +108,78 @@ function getDetailsLDAPPage($suserName, $aAttributes, $sUserIdentifier) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= ""; $sToRender .= "\n"; $sToRender .= "
User Details:
Username: Username: bNN4 ? "onblur=\"disable(document.MainForm.fUsername)" : "DISABLED") . " size = \"40\" type=\"text\" name=\"fUsername\" value = \"" . $aUserAttributes[$sUserIdentifier] ."\">
Name:
Email: 0) ? "disabled " : "") . "size = \"40\" type=\"text\" name=\"fEmail\" value = \"" . $aUserAttributes["mail"] ."\"> Email:
Mobile Number:
Sms Notification:
Group" . getGroupListBox() . "
" . getAddButton() . getCancelButton() . "
\n"; + $sToRender .= getJavascriptValidation(true); } - - return $sToRender; -} - - -// if edition is successful print otu success page -function getPageSuccess() { - global $default; - - $sToRender .= renderHeading("Add User To System"); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
Addition Successful!
The User was successfully added to the System
rootUrl/control.php?action=addUser\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; - return $sToRender; } -// if edition is successful print otu success page -function getPageFail() { - global $default; - - $sToRender .= renderHeading("Add User To System"); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
Addition Successful!
The User was not added. Username Already exists!
rootUrl/control.php?action=addUser\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; - - - return $sToRender; +function getJavascriptValidation($bLdap) { + // validation starts + $sToRender .= "\n\n\n\n"; + return $sToRender; +} + +function getPageSuccess() { + return statusPage("Add User To System", "Addition Successful!", "The User was successfully added to the System.", "addUser"); } +function getPageGroupFail() { + return statusPage("Add User To System", "Group Addition Unsuccessful!", "The user was succesfully added, but could not be assigned to the selected group.", "addUser"); +} -// if edition is successful print otu success page -function getPageUsernameNotFound() { - global $default; - - $sToRender .= renderHeading("Add User To System"); - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - $sToRender .= "
Username not found!
Please ensure that the username that you entered Exists!
rootUrl/control.php?action=addUser\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; - - - return $sToRender; +function getPageFail() { + return statusPage("Add User To System", "Addition Unsuccessful!", "The user was not added because the selected User Name already exists.", "addUser"); } +function getPageUsernameNotFound() { + return statusPage("Add User To System", "Username not found!", "Your user search string did not match any users in the user directory.", "addUser"); +} -// show delete button or select button function getAddButton() { global $default; - return "graphicsUrl/widgets/add.gif\" value=\"submit\" border=\"0\"/>\n"; + return "graphicsUrl/widgets/add.gif\" value=\"submit\" border=\"0\"/>\n"; } -// show cancel button function getCancelButton() { global $default; return "rootUrl/control.php?action=addUser\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />\n"; - } - -?> +function getGroupListBox() { + global $default; + if (Permission::userIsSystemAdministrator()) { + // if this is the system administrator, prepend group names with unit name + $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); + $oPatternListBox->setFromClause("LEFT OUTER JOIN groups_units_link GUL on ST.id=GUL.group_id " . + "LEFT OUTER JOIN units_lookup UL on GUL.unit_id=UL.id"); + $oPatternListBox->setCompositeDisplayName("DISTINCT COALESCE(CONCAT(CONCAT(UL.name, '-'),ST.name),ST.name)"); + } else if (Permission::userIsUnitAdministrator()) { + // else if this is a unit administrator, only display the groups in your unit + $oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); + $oPatternListBox->setFromClause("INNER JOIN $default->owl_groups_units_table GUL on ST.id=GUL.group_id"); + $oPatternListBox->setWhereClause("GUL.unit_id=" . User::getUnitID($_SESSION["userID"])); + } + return $oPatternListBox->render(); +} +?> \ No newline at end of file