diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserBL.php
index 551698d..a1a06c6 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserBL.php
@@ -10,59 +10,48 @@
require_once("../../../../../config/dmsDefaults.php");
if (checkSession()) {
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
- require_once("removeUserUI.inc");
- require_once("$default->fileSystemRoot/lib/security/permission.inc");
- require_once("$default->fileSystemRoot/lib/users/User.inc");
- require_once("$default->fileSystemRoot/lib/groups/Group.inc");
- require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc");
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
- require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
- require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
- require_once("$default->fileSystemRoot/presentation/Html.inc");
-
- $oPatternCustom = & new PatternCustom();
-
- // get main page
- if (isset($fUserID)) {
-
-
- $oPatternCustom->setHtml(getDeleteConfirmedPage($fUserID));
- $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDeleteConfirmed=1");
- }
- else {
- $oPatternCustom->setHtml(getDeletePage(null));
- $main->setFormAction($_SERVER["PHP_SELF"]);
- }
-
- if (isset($fForDeleteConfirmed)) {
-
-
- //get User object
- $oUser = User::get($fUserID);
- $oUser->setUserName($fUserName);
-
- //delete from all groups
- $oUser->deleteFromSystem();
-
-
- //delete the User object
- if ($oUser->delete()) {
-
- $oPatternCustom->setHtml(getDeleteSuccessPage());
-
- } else {
- $oPatternCustom->setHtml(getDeleteFailPage());
- }
-
- }
-
-
-
-
- $main->setCentralPayload($oPatternCustom);
- $main->render();
+ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
+ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
+ require_once("removeUserUI.inc");
+ require_once("../adminUI.inc");
+ require_once("$default->fileSystemRoot/lib/security/permission.inc");
+ require_once("$default->fileSystemRoot/lib/users/User.inc");
+ require_once("$default->fileSystemRoot/lib/groups/Group.inc");
+ require_once("$default->fileSystemRoot/lib/groups/GroupUserLink.inc");
+ require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
+ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
+ require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+ require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
+ require_once("$default->fileSystemRoot/presentation/Html.inc");
+
+ $oPatternCustom = & new PatternCustom();
+
+ // get main page
+ if (isset($fUserID)) {
+ $oPatternCustom->setHtml(getDeleteConfirmedPage($fUserID));
+ $main->setFormAction($_SERVER["PHP_SELF"] . "?fForDeleteConfirmed=1");
+ } else {
+ $oPatternCustom->setHtml(getDeletePage(null));
+ $main->setFormAction($_SERVER["PHP_SELF"]);
+ }
+
+ if (isset($fForDeleteConfirmed)) {
+ //get User object
+ $oUser = User::get($fUserID);
+ $oUser->setUserName($fUserName);
+
+ //delete from all groups
+ $oUser->deleteFromSystem();
+
+ //delete the User object
+ if ($oUser->delete()) {
+ $oPatternCustom->setHtml(getDeleteSuccessPage());
+ } else {
+ $oPatternCustom->setHtml(getDeleteFailPage());
+ }
+ }
+
+ $main->setCentralPayload($oPatternCustom);
+ $main->render();
}
?>
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc
index 282b159..afea68b 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc
@@ -9,182 +9,157 @@
*
*/
// gets the delete stuff
-function getDeletePage($iUserID) {
- global $default;
- $oUser = null;
- if (isset($iUserID)) {
- $oUser = User::get($iUserID);
- $sToRender .= " \n";
- $sToRender .= "Are you sure you wish to Remove this User From the System?: \n";
- }
- else{
- $sToRender .= " \n";
- $sToRender .= "Remove User From System: \n";
- }
-
- $sToRender .= "
\n";
- $sToRender .= " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= "User Name: " . getUserDisplay($oUser) . " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= getDeleteButton($oUser);
- $sToRender .= " \n";
- $sToRender .= "
\n";
-
-
- return $sToRender;
+function getDeletePage($iUserID) {
+ global $default;
+ $oUser = null;
+ if (isset($iUserID)) {
+ $oUser = User::get($iUserID);
+ $sHeading .= "Are you sure you wish to Remove this User From the System?: \n";
+ } else {
+ $sHeading .= "Please select a User: \n";
+ }
+
+ $sToRender .= "" . renderHeading("Remove User") . "
";
+ $sToRender .= "\n";
+ $sToRender .= $sHeading;
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= "User Name: " . getUserDisplay($oUser) . " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+ return $sToRender;
}
// get successfully deletion page
-function getDeleteSuccessPage() {
-
-global $default;
-
-$sToRender = " \n" ;
-$sToRender .= "\n";
-
-return $sToRender;
+function getDeleteSuccessPage() {
+
+ global $default;
+
+ $sToRender .= "" . renderHeading("Remove User") . "
";
+ $sToRender .= "\n";
+
+ return $sToRender;
}
// get deletion failed page
-function getDeleteFailPage() {
-
-global $default;
-
-$sToRender = " \n" ;
-$sToRender .= "\n";
-
-return $sToRender;
+function getDeleteFailPage() {
+
+ global $default;
+
+ $sToRender .= "" . renderHeading("Remove User") . "
";
+ $sToRender .= "\n";
+
+ return $sToRender;
}
-function getDeleteConfirmedPage($iUserID) {
- global $default;
- $oUser = null;
- if (isset($iUserID)) {
- $oUser = User::get($iUserID);
- $sToRender .= " \n";
- $sToRender .= "Are you sure you wish to Remove this User?: \n";
- $sToRender .= " Note: This User will be Removed from ALL Groups as well\n";
- }
- else{
- $sToRender .= " \n";
- $sToRender .= "Remove User From System: \n";
- }
-
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= "User Name: " . getUserDisplay($oUser) . " \n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= getUserDetails($oUser). "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " \n";
- $sToRender .= "\n";
- $sToRender .= " " . getDeleteButton($oUser);
- $sToRender .= " \n";
- $sToRender .= "
\n";
-
-
- return $sToRender;
+function getDeleteConfirmedPage($iUserID) {
+ global $default;
+ $oUser = null;
+ if (isset($iUserID)) {
+ $oUser = User::get($iUserID);
+ }
+
+ $sToRender .= "" . renderHeading("Remove User") . "
";
+ $sToRender .= "\n";
+ $sToRender .= "Are you sure you wish to Remove this User?: ";
+ $sToRender .= "Note: This User will be Removed from ALL Groups as well\n \n";
+ $sToRender .= "\n";
+ $sToRender .= "User Name: " . getUserDisplay($oUser) . " \n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= getUserDetails($oUser). "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " \n";
+ $sToRender .= "\n";
+ $sToRender .= " " . getDeleteButton($oUser);
+ $sToRender .= " \n";
+ $sToRender .= "
\n";
+
+
+ return $sToRender;
}
// show listbox...or the text name
function getUserDisplay($oUser) {
- global $default;
- if (!isset($oUser)) {
- $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID");
- $oPatternListBox->setIncludeDefaultValue(true);
- $oPatternListBox->setPostBackOnChange(true);
- return $oPatternListBox->render();
- } else {
- return " iId . "\">\n" .
- "" . $oUser->getUserName() . " ";
-
- }
-
+ global $default;
+ if (!isset($oUser)) {
+ $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID");
+ $oPatternListBox->setIncludeDefaultValue(true);
+ $oPatternListBox->setPostBackOnChange(true);
+ return $oPatternListBox->render();
+ } else {
+ return " iId . "\">\n" .
+ "" . $oUser->getUserName() . " ";
+ }
}
// show listbox...or the text name
function getUserDetails($oUser) {
- global $default;
- if (!isset($oUser)) {
- return "";
- } else {
- return
- "\n".
- "Name: ". $oUser->getName() . " \n" .
- " \n".
- "\n".
- "Email Address: ". $oUser->getEmail() . " \n" .
- " \n".
- "\n".
- "Mobile Number: ". $oUser->getMobile() . " \n" .
- " \n".
- "\n".
- "LDAP Dn: ". $oUser->getLdapDn() . " \n" .
- " \n";
-
- }
-
+ global $default;
+ if (!isset($oUser)) {
+ return "";
+ } else {
+ return
+ "\n".
+ "Name: ". $oUser->getName() . " \n" .
+ " \n".
+ "\n".
+ "Email Address: ". $oUser->getEmail() . " \n" .
+ " \n".
+ "\n".
+ "Mobile Number: ". $oUser->getMobile() . " \n" .
+ " \n";
+ }
}
// show delete button
function getDeleteButton($oUser) {
- global $default;
- if (!isset($oUser)) {
- return "Please select a User: ";
- } else {
- return " graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/> \n".
- "rootUrl/control.php?action=removeUser\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> \n";
- }
+ global $default;
+ return " graphicsUrl/widgets/delete.gif\" value=\"submit\" border=\"0\"/> \n".
+ "rootUrl/control.php?action=removeUser\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> \n";
}
// show cancel button
function getCancelButton($oUser) {
- global $default;
- if (!isset($oUser)) {
- //return "rootUrl/control.php?action=groupManagement\"> graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /> \n";
- } else {
- return "rootUrl/control.php?action=removeUser\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> \n";
- }
+ global $default;
+ if (!isset($oUser)) {
+ return "rootUrl/control.php?action=userAdministration\"> graphicsUrl/widgets/cancel.gif\" value=\"cancel\" /> \n";
+ }
+ else {
+ return "rootUrl/control.php?action=removeUser\"> graphicsUrl/widgets/cancel.gif\" border = \"0\" /> \n";
+ }
}
?>