diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php index a9d3488..5e70267 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php @@ -25,39 +25,48 @@ if (checkSession()) { $oPatternCustom = & new PatternCustom(); + - if(!isset($fUserSet)){ - // build first page + if(isset($fUserSet)){ - $oPatternCustom->setHtml(getPage(null,null)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1"); - - }else{ // do a check to see both drop downs selected if($fUserID == -1){ $oPatternCustom->setHtml(getPageNotSelected()); - }else{ $fGroupID = GroupUserLink::getGroups($fUserID); - echo "GroupID:" . $fGroupID[1]; - echo "GroupID:" . $fGroupID[2]; - echo "GroupID:" . $fGroupID[3]; - - $oPatternCustom->setHtml(getPage($fUserID,$fGroupID)); - $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1&fDeleteConfirmed=1"); + }else{ $faGroupID = GroupUserLink::getGroups($fUserID); + + $oPatternCustom->setHtml(getGroupPage($fUserID,$faGroupID)); + $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1&fGroupSet=1"); } + + }else{ + + // build first page + + $oPatternCustom->setHtml(getPage(null,null)); + $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1"); } + if(isset($fGroupSet)) + { + $oPatternCustom->setHtml(getDeleteConfirmedPage($fUserID,$fGroupID)); + $main->setFormAction($_SERVER["PHP_SELF"] . "?fDeleteConfirmed=1&fGroupID=$fGroupID"); + } if (isset($fDeleteConfirmed)){ - + // else add to db and then goto page succes $oUserGroup = new GroupUserLink($fGroupID, $fUserID); - $oUserGroup->setUserGroupID($fUserID); + $oUserGroup->setUserGroupID($fGroupID,$fUserID); - $oUserGroup->delete(); - $oPatternCustom->setHtml(getPageSuccess()); + if($oUserGroup->delete()){ + $oPatternCustom->setHtml(getPageSuccess()); + }else{ + $oPatternCustom->setHtml(getPageFail()); + } + } diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc index e283422..870b2bb 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc @@ -9,7 +9,7 @@ */ // get page for removal -function getPage($iUserID, $iGroupID) { +function getPage($iUserID) { global $default; $oUser = null; $oGroup = null; @@ -17,27 +17,65 @@ function getPage($iUserID, $iGroupID) { // change headings if User selected if (isset($iUserID)) { $oUser = User::get($iUserID); - $heading = "Are you sure you wish to remove the User from the Group? \n"; }else{ $heading = "Please select a User: \n"; } + $sToRender .= "

\n"; + $sToRender .= "Select a User to Remove from a Group:\n"; + $sToRender .= "\n"; + $sToRender .= "

\n"; + $sToRender .= $heading; + $sToRender .= "
\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + //$sToRender .= "
User Name: " . getUserDisplay($oUser) . "
" . getDeleteButton($oUser); + //$sToRender .= "" . getCancelButton($oUser); + $sToRender .= "
\n"; + + + return $sToRender; +} + + + +// get page for removal +function getGroupPage($iUserID, $aGroup) { + global $default; + $oUser = null; + $oGroup = null; + + // change headings if User selected + if (isset($iUserID)) { + $oUser = User::get($iUserID); + } + + // change headings if User selected + if (isset($fGroupID)) { + $oGroup = Group::get($fGroupID); + echo "what: " . $oGroup->getName(); + } + // when Groupid is gotten show the name - if (isset($iGroupID)) { - $oGroup = Group::get($iGroupID); - $Groupdisplay = "Group Name: " . getGroupDisplay($oGroup) . "\n"; + if (!isset($oGroup)) { + $Groupdisplay = "Group Name: " . getGroupDisplay($aGroup) . "\n"; } else{ - $Groupdisplay = ""; + $Groupdisplay = "Group Name: " . $oGroup->getName() . "\n"; } $sToRender .= "

\n"; - $sToRender .= "Select a User to Remove from its Group:\n"; + $sToRender .= "Select a Group to Remove User from:\n"; $sToRender .= "\n"; $sToRender .= "

\n"; - $sToRender .= $heading; - $sToRender .= "
\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -50,7 +88,7 @@ function getPage($iUserID, $iGroupID) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "
User Name: " . getUserDisplay($oUser) . "
" . getDeleteButton($oUser); + $sToRender .= "" . getSelectButton($oUser); $sToRender .= "" . getCancelButton($oUser); $sToRender .= "
\n"; @@ -58,57 +96,71 @@ function getPage($iUserID, $iGroupID) { return $sToRender; } -// show paig if deletion fails -function getPageFail($iUserID) { +// get page for removal +function getDeleteConfirmedPage($iUserID,$fGroupID) { global $default; $oUser = null; $oGroup = null; - + + // change headings if User selected if (isset($iUserID)) { $oUser = User::get($iUserID); + $heading = "Are you sure you wish to remove this user from the Group?"; } - $iGroupID = GroupUserLink::userBelongsToGroup($iUserID); - - $oGroup= Group::get($iGroupID); + // change headings if User selected + if (isset($fGroupID)) { + $oGroup = Group::get($fGroupID); + $Groupdisplay = "Group Name: " . $oGroup->getName() . "\n"; + } $sToRender .= "

\n"; - $sToRender .= "Sorry, Removal Failed\n"; + $sToRender .= "Select a Group to Remove User from:\n"; $sToRender .= "\n"; $sToRender .= "

\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= $heading; $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= $Groupdisplay; $sToRender .= "\n"; - - $sToRender .= "
User Name: " . getUserDisplay($oUser) . "
rootUrl/control.php?action=removeUserFromGroup\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "" . getDeleteButton($oUser); + $sToRender .= "" . getCancelButton($oUser); + $sToRender .= "\n"; return $sToRender; } -// if no User selected show selection fail page -function getPageNotSelected() { + +// show paig if deletion fails +function getPageFail() { global $default; - + $sToRender .= "

\n"; - $sToRender .= "Sorry, Selection Failed\n"; + $sToRender .= "Sorry, Removal Failed\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 .= "
Please select a User
rootUrl/control.php?action=removeUserFromGroup\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; return $sToRender; } + // show success page if removed from Group successfully function getPageSuccess() { global $default; @@ -138,33 +190,47 @@ function getUserDisplay($oUser) { if (!isset($oUser)) { - $oPatternListBox = & new PatternListBox($default->owl_users_table, "name", "id", "fUserID"); + $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID"); $oPatternListBox->setWhereClause($where); $oPatternListBox->setFromClause($from); //$oPatternListBox->setIncludeDefaultValue(true); - //$oPatternListBox->setPostBackOnChange(true); + $oPatternListBox->setPostBackOnChange(true); return $oPatternListBox->render(); } else { return "iId . "\">\n" . - $oUser->getName(); + $oUser->getUserName(); } } + + + // show Group details on confirm deletion page -function getGroupDisplay($oGroup) { +function getGroupDisplay($aGroup) { global $default; - if (!isset($oGroup)) { - //$oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); - //$oPatternLiListBoxstBox->setPostBackOnChange(true); - //return $oPatternListBox->render(); - } else { - return "iId . "\">\n" . - $oGroup->getName(); - } + /*"select UGL.group_id, GL.name from users_groups_link as UGL + inner join groups_lookup AS GL on UGL.group_id = GL.id + where UGL.user_id=1" + */ + + $oGroup= null; + $sGroup = ""; + return $sGroup; + } + // show delete button or select button function getDeleteButton($oUser) { global $default; @@ -175,6 +241,16 @@ function getDeleteButton($oUser) { } } + +// show delete button or select button +function getSelectButton($oUser) { + global $default; + if (!isset($oUser)) { + return "graphicsUrl/widgets/select.gif\" value=\"submit\" />\n"; + } else { + return "graphicsUrl/widgets/select.gif\" value=\"submit\" />\n"; + } +} // show cancel button function getCancelButton($oUser) { global $default;