Commit ccae92449092d9f302ccdbb7b49b32656a3a5317
1 parent
148f16c4
added removeuserfrom group
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1240 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
142 additions
and
57 deletions
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupBL.php
| @@ -25,39 +25,48 @@ if (checkSession()) { | @@ -25,39 +25,48 @@ if (checkSession()) { | ||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | $oPatternCustom = & new PatternCustom(); | 27 | $oPatternCustom = & new PatternCustom(); |
| 28 | + | ||
| 28 | 29 | ||
| 29 | - if(!isset($fUserSet)){ | ||
| 30 | - // build first page | 30 | + if(isset($fUserSet)){ |
| 31 | 31 | ||
| 32 | - $oPatternCustom->setHtml(getPage(null,null)); | ||
| 33 | - $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1"); | ||
| 34 | - | ||
| 35 | - }else{ | ||
| 36 | // do a check to see both drop downs selected | 32 | // do a check to see both drop downs selected |
| 37 | if($fUserID == -1){ | 33 | if($fUserID == -1){ |
| 38 | $oPatternCustom->setHtml(getPageNotSelected()); | 34 | $oPatternCustom->setHtml(getPageNotSelected()); |
| 39 | 35 | ||
| 40 | - }else{ $fGroupID = GroupUserLink::getGroups($fUserID); | ||
| 41 | - echo "GroupID:" . $fGroupID[1]; | ||
| 42 | - echo "GroupID:" . $fGroupID[2]; | ||
| 43 | - echo "GroupID:" . $fGroupID[3]; | ||
| 44 | - | ||
| 45 | - $oPatternCustom->setHtml(getPage($fUserID,$fGroupID)); | ||
| 46 | - $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1&fDeleteConfirmed=1"); | 36 | + }else{ $faGroupID = GroupUserLink::getGroups($fUserID); |
| 37 | + | ||
| 38 | + $oPatternCustom->setHtml(getGroupPage($fUserID,$faGroupID)); | ||
| 39 | + $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1&fGroupSet=1"); | ||
| 47 | } | 40 | } |
| 41 | + | ||
| 42 | + }else{ | ||
| 43 | + | ||
| 44 | + // build first page | ||
| 45 | + | ||
| 46 | + $oPatternCustom->setHtml(getPage(null,null)); | ||
| 47 | + $main->setFormAction($_SERVER["PHP_SELF"] . "?fUserSet=1"); | ||
| 48 | 48 | ||
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | + if(isset($fGroupSet)) | ||
| 52 | + { | ||
| 53 | + $oPatternCustom->setHtml(getDeleteConfirmedPage($fUserID,$fGroupID)); | ||
| 54 | + $main->setFormAction($_SERVER["PHP_SELF"] . "?fDeleteConfirmed=1&fGroupID=$fGroupID"); | ||
| 55 | + } | ||
| 51 | 56 | ||
| 52 | if (isset($fDeleteConfirmed)){ | 57 | if (isset($fDeleteConfirmed)){ |
| 53 | - | 58 | + |
| 54 | // else add to db and then goto page succes | 59 | // else add to db and then goto page succes |
| 55 | $oUserGroup = new GroupUserLink($fGroupID, $fUserID); | 60 | $oUserGroup = new GroupUserLink($fGroupID, $fUserID); |
| 56 | 61 | ||
| 57 | - $oUserGroup->setUserGroupID($fUserID); | 62 | + $oUserGroup->setUserGroupID($fGroupID,$fUserID); |
| 58 | 63 | ||
| 59 | - $oUserGroup->delete(); | ||
| 60 | - $oPatternCustom->setHtml(getPageSuccess()); | 64 | + if($oUserGroup->delete()){ |
| 65 | + $oPatternCustom->setHtml(getPageSuccess()); | ||
| 66 | + }else{ | ||
| 67 | + $oPatternCustom->setHtml(getPageFail()); | ||
| 68 | + } | ||
| 69 | + | ||
| 61 | 70 | ||
| 62 | } | 71 | } |
| 63 | 72 |
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | // get page for removal | 11 | // get page for removal |
| 12 | -function getPage($iUserID, $iGroupID) { | 12 | +function getPage($iUserID) { |
| 13 | global $default; | 13 | global $default; |
| 14 | $oUser = null; | 14 | $oUser = null; |
| 15 | $oGroup = null; | 15 | $oGroup = null; |
| @@ -17,27 +17,65 @@ function getPage($iUserID, $iGroupID) { | @@ -17,27 +17,65 @@ function getPage($iUserID, $iGroupID) { | ||
| 17 | // change headings if User selected | 17 | // change headings if User selected |
| 18 | if (isset($iUserID)) { | 18 | if (isset($iUserID)) { |
| 19 | $oUser = User::get($iUserID); | 19 | $oUser = User::get($iUserID); |
| 20 | - $heading = "<tr><td>Are you sure you wish to remove the User from the Group?</td> </tr>\n"; | ||
| 21 | }else{ | 20 | }else{ |
| 22 | $heading = "<tr>Please select a User: </tr>\n"; | 21 | $heading = "<tr>Please select a User: </tr>\n"; |
| 23 | } | 22 | } |
| 24 | 23 | ||
| 24 | + $sToRender .= "<br></br>\n"; | ||
| 25 | + $sToRender .= "<b>Select a User to Remove from a Group:</b>\n"; | ||
| 26 | + $sToRender .= "<table>\n"; | ||
| 27 | + $sToRender .= "<br></br>\n"; | ||
| 28 | + $sToRender .= $heading; | ||
| 29 | + $sToRender .= "<br>\n"; | ||
| 30 | + $sToRender .= "<tr>\n"; | ||
| 31 | + $sToRender .= "</tr>\n"; | ||
| 32 | + $sToRender .= "<td>User Name: " . getUserDisplay($oUser) . "</td>\n"; | ||
| 33 | + $sToRender .= "<tr>\n"; | ||
| 34 | + $sToRender .= "</tr>\n"; | ||
| 35 | + $sToRender .= "<tr>\n"; | ||
| 36 | + $sToRender .= "</tr>\n"; | ||
| 37 | + $sToRender .= "<tr>\n"; | ||
| 38 | + $sToRender .= "</tr>\n"; | ||
| 39 | + //$sToRender .= "<td></td><td>" . getDeleteButton($oUser); | ||
| 40 | + //$sToRender .= "<td></td><td>" . getCancelButton($oUser); | ||
| 41 | + $sToRender .= "</td></table>\n"; | ||
| 42 | + | ||
| 43 | + | ||
| 44 | + return $sToRender; | ||
| 45 | +} | ||
| 46 | + | ||
| 47 | + | ||
| 48 | + | ||
| 49 | +// get page for removal | ||
| 50 | +function getGroupPage($iUserID, $aGroup) { | ||
| 51 | + global $default; | ||
| 52 | + $oUser = null; | ||
| 53 | + $oGroup = null; | ||
| 54 | + | ||
| 55 | + // change headings if User selected | ||
| 56 | + if (isset($iUserID)) { | ||
| 57 | + $oUser = User::get($iUserID); | ||
| 58 | + } | ||
| 59 | + | ||
| 60 | + // change headings if User selected | ||
| 61 | + if (isset($fGroupID)) { | ||
| 62 | + $oGroup = Group::get($fGroupID); | ||
| 63 | + echo "what: " . $oGroup->getName(); | ||
| 64 | + } | ||
| 65 | + | ||
| 25 | // when Groupid is gotten show the name | 66 | // when Groupid is gotten show the name |
| 26 | - if (isset($iGroupID)) { | ||
| 27 | - $oGroup = Group::get($iGroupID); | ||
| 28 | - $Groupdisplay = "<td>Group Name: " . getGroupDisplay($oGroup) . "</td>\n"; | 67 | + if (!isset($oGroup)) { |
| 29 | 68 | ||
| 69 | + $Groupdisplay = "<td>Group Name: " . getGroupDisplay($aGroup) . "</td>\n"; | ||
| 30 | } | 70 | } |
| 31 | else{ | 71 | else{ |
| 32 | - $Groupdisplay = ""; | 72 | + $Groupdisplay = "<td>Group Name: " . $oGroup->getName() . "</td>\n"; |
| 33 | } | 73 | } |
| 34 | 74 | ||
| 35 | $sToRender .= "<br></br>\n"; | 75 | $sToRender .= "<br></br>\n"; |
| 36 | - $sToRender .= "<b>Select a User to Remove from its Group:</b>\n"; | 76 | + $sToRender .= "<b>Select a Group to Remove User from:</b>\n"; |
| 37 | $sToRender .= "<table>\n"; | 77 | $sToRender .= "<table>\n"; |
| 38 | $sToRender .= "<br></br>\n"; | 78 | $sToRender .= "<br></br>\n"; |
| 39 | - $sToRender .= $heading; | ||
| 40 | - $sToRender .= "<br>\n"; | ||
| 41 | $sToRender .= "<tr>\n"; | 79 | $sToRender .= "<tr>\n"; |
| 42 | $sToRender .= "</tr>\n"; | 80 | $sToRender .= "</tr>\n"; |
| 43 | $sToRender .= "<td>User Name: " . getUserDisplay($oUser) . "</td>\n"; | 81 | $sToRender .= "<td>User Name: " . getUserDisplay($oUser) . "</td>\n"; |
| @@ -50,7 +88,7 @@ function getPage($iUserID, $iGroupID) { | @@ -50,7 +88,7 @@ function getPage($iUserID, $iGroupID) { | ||
| 50 | $sToRender .= "</tr>\n"; | 88 | $sToRender .= "</tr>\n"; |
| 51 | $sToRender .= "<tr>\n"; | 89 | $sToRender .= "<tr>\n"; |
| 52 | $sToRender .= "</tr>\n"; | 90 | $sToRender .= "</tr>\n"; |
| 53 | - $sToRender .= "<td></td><td>" . getDeleteButton($oUser); | 91 | + $sToRender .= "<td></td><td>" . getSelectButton($oUser); |
| 54 | $sToRender .= "<td></td><td>" . getCancelButton($oUser); | 92 | $sToRender .= "<td></td><td>" . getCancelButton($oUser); |
| 55 | $sToRender .= "</td></table>\n"; | 93 | $sToRender .= "</td></table>\n"; |
| 56 | 94 | ||
| @@ -58,57 +96,71 @@ function getPage($iUserID, $iGroupID) { | @@ -58,57 +96,71 @@ function getPage($iUserID, $iGroupID) { | ||
| 58 | return $sToRender; | 96 | return $sToRender; |
| 59 | } | 97 | } |
| 60 | 98 | ||
| 61 | -// show paig if deletion fails | ||
| 62 | -function getPageFail($iUserID) { | 99 | +// get page for removal |
| 100 | +function getDeleteConfirmedPage($iUserID,$fGroupID) { | ||
| 63 | global $default; | 101 | global $default; |
| 64 | $oUser = null; | 102 | $oUser = null; |
| 65 | $oGroup = null; | 103 | $oGroup = null; |
| 66 | - | 104 | + |
| 105 | + // change headings if User selected | ||
| 67 | if (isset($iUserID)) { | 106 | if (isset($iUserID)) { |
| 68 | $oUser = User::get($iUserID); | 107 | $oUser = User::get($iUserID); |
| 108 | + $heading = "<tr>Are you sure you wish to remove this user from the Group?</tr>"; | ||
| 69 | } | 109 | } |
| 70 | 110 | ||
| 71 | - $iGroupID = GroupUserLink::userBelongsToGroup($iUserID); | ||
| 72 | - | ||
| 73 | - $oGroup= Group::get($iGroupID); | 111 | + // change headings if User selected |
| 112 | + if (isset($fGroupID)) { | ||
| 113 | + $oGroup = Group::get($fGroupID); | ||
| 114 | + $Groupdisplay = "<td>Group Name: " . $oGroup->getName() . "</td>\n"; | ||
| 115 | + } | ||
| 74 | 116 | ||
| 75 | $sToRender .= "<br></br>\n"; | 117 | $sToRender .= "<br></br>\n"; |
| 76 | - $sToRender .= "<b>Sorry, Removal Failed</b>\n"; | 118 | + $sToRender .= "<b>Select a Group to Remove User from:</b>\n"; |
| 77 | $sToRender .= "<table>\n"; | 119 | $sToRender .= "<table>\n"; |
| 78 | $sToRender .= "<br></br>\n"; | 120 | $sToRender .= "<br></br>\n"; |
| 79 | - $sToRender .= "<tr></tr>\n"; | 121 | + $sToRender .= "<tr>\n"; |
| 122 | + $sToRender .= $heading; | ||
| 80 | $sToRender .= "</tr>\n"; | 123 | $sToRender .= "</tr>\n"; |
| 124 | + $sToRender .= "<td>User Name: " . getUserDisplay($oUser) . "</td>\n"; | ||
| 81 | $sToRender .= "<tr>\n"; | 125 | $sToRender .= "<tr>\n"; |
| 82 | $sToRender .= "</tr>\n"; | 126 | $sToRender .= "</tr>\n"; |
| 83 | $sToRender .= "<tr>\n"; | 127 | $sToRender .= "<tr>\n"; |
| 84 | - $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=removeUserFromGroup\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n"; | 128 | + $sToRender .= $Groupdisplay; |
| 85 | $sToRender .= "</tr>\n"; | 129 | $sToRender .= "</tr>\n"; |
| 86 | - | ||
| 87 | - $sToRender .= "</table>\n"; | 130 | + $sToRender .= "<tr>\n"; |
| 131 | + $sToRender .= "</tr>\n"; | ||
| 132 | + $sToRender .= "<tr>\n"; | ||
| 133 | + $sToRender .= "</tr>\n"; | ||
| 134 | + $sToRender .= "<td></td><td>" . getDeleteButton($oUser); | ||
| 135 | + $sToRender .= "<td></td><td>" . getCancelButton($oUser); | ||
| 136 | + $sToRender .= "</td></table>\n"; | ||
| 88 | 137 | ||
| 89 | 138 | ||
| 90 | return $sToRender; | 139 | return $sToRender; |
| 91 | } | 140 | } |
| 92 | -// if no User selected show selection fail page | ||
| 93 | -function getPageNotSelected() { | 141 | + |
| 142 | +// show paig if deletion fails | ||
| 143 | +function getPageFail() { | ||
| 94 | global $default; | 144 | global $default; |
| 95 | - | 145 | + |
| 96 | $sToRender .= "<br></br>\n"; | 146 | $sToRender .= "<br></br>\n"; |
| 97 | - $sToRender .= "<b>Sorry, Selection Failed</b>\n"; | 147 | + $sToRender .= "<b>Sorry, Removal Failed</b>\n"; |
| 98 | $sToRender .= "<table>\n"; | 148 | $sToRender .= "<table>\n"; |
| 99 | $sToRender .= "<br></br>\n"; | 149 | $sToRender .= "<br></br>\n"; |
| 100 | $sToRender .= "<tr></tr>\n"; | 150 | $sToRender .= "<tr></tr>\n"; |
| 101 | - $sToRender .= "<tr><td>Please select a User</td></tr>\n"; | ||
| 102 | - $sToRender .= "<tr></tr>\n"; | ||
| 103 | - $sToRender .= "<tr></tr>\n"; | 151 | + $sToRender .= "</tr>\n"; |
| 152 | + $sToRender .= "<tr>\n"; | ||
| 153 | + $sToRender .= "</tr>\n"; | ||
| 104 | $sToRender .= "<tr>\n"; | 154 | $sToRender .= "<tr>\n"; |
| 105 | $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=removeUserFromGroup\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n"; | 155 | $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=removeUserFromGroup\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n"; |
| 106 | $sToRender .= "</tr>\n"; | 156 | $sToRender .= "</tr>\n"; |
| 157 | + | ||
| 107 | $sToRender .= "</table>\n"; | 158 | $sToRender .= "</table>\n"; |
| 108 | 159 | ||
| 109 | 160 | ||
| 110 | return $sToRender; | 161 | return $sToRender; |
| 111 | } | 162 | } |
| 163 | + | ||
| 112 | // show success page if removed from Group successfully | 164 | // show success page if removed from Group successfully |
| 113 | function getPageSuccess() { | 165 | function getPageSuccess() { |
| 114 | global $default; | 166 | global $default; |
| @@ -138,33 +190,47 @@ function getUserDisplay($oUser) { | @@ -138,33 +190,47 @@ function getUserDisplay($oUser) { | ||
| 138 | 190 | ||
| 139 | 191 | ||
| 140 | if (!isset($oUser)) { | 192 | if (!isset($oUser)) { |
| 141 | - $oPatternListBox = & new PatternListBox($default->owl_users_table, "name", "id", "fUserID"); | 193 | + $oPatternListBox = & new PatternListBox($default->owl_users_table, "username", "id", "fUserID"); |
| 142 | $oPatternListBox->setWhereClause($where); | 194 | $oPatternListBox->setWhereClause($where); |
| 143 | $oPatternListBox->setFromClause($from); | 195 | $oPatternListBox->setFromClause($from); |
| 144 | //$oPatternListBox->setIncludeDefaultValue(true); | 196 | //$oPatternListBox->setIncludeDefaultValue(true); |
| 145 | - //$oPatternListBox->setPostBackOnChange(true); | 197 | + $oPatternListBox->setPostBackOnChange(true); |
| 146 | return $oPatternListBox->render(); | 198 | return $oPatternListBox->render(); |
| 147 | } else { | 199 | } else { |
| 148 | return "<input type=\"hidden\" name=\"fUserID\" value=\"" . $oUser->iId . "\">\n" . | 200 | return "<input type=\"hidden\" name=\"fUserID\" value=\"" . $oUser->iId . "\">\n" . |
| 149 | - $oUser->getName(); | 201 | + $oUser->getUserName(); |
| 150 | } | 202 | } |
| 151 | 203 | ||
| 152 | } | 204 | } |
| 153 | 205 | ||
| 206 | + | ||
| 207 | + | ||
| 208 | + | ||
| 154 | // show Group details on confirm deletion page | 209 | // show Group details on confirm deletion page |
| 155 | -function getGroupDisplay($oGroup) { | 210 | +function getGroupDisplay($aGroup) { |
| 156 | global $default; | 211 | global $default; |
| 157 | - if (!isset($oGroup)) { | ||
| 158 | - //$oPatternListBox = & new PatternListBox($default->owl_groups_table, "name", "id", "fGroupID"); | ||
| 159 | - //$oPatternLiListBoxstBox->setPostBackOnChange(true); | ||
| 160 | - //return $oPatternListBox->render(); | ||
| 161 | - } else { | ||
| 162 | - return "<input type=\"hidden\" name=\"fGroupID\" value=\"" . $oGroup->iId . "\">\n" . | ||
| 163 | - $oGroup->getName(); | ||
| 164 | - } | 212 | + /*"select UGL.group_id, GL.name from users_groups_link as UGL |
| 213 | + inner join groups_lookup AS GL on UGL.group_id = GL.id | ||
| 214 | + where UGL.user_id=1" | ||
| 215 | + */ | ||
| 216 | + | ||
| 217 | + $oGroup= null; | ||
| 218 | + $sGroup = "<Select Name=\"fGroupID\">"; | ||
| 219 | + | ||
| 220 | + for ($i=0;$i < count($aGroup);$i++){ | ||
| 221 | + | ||
| 222 | + $oGroup= Group::get($aGroup[$i]); | ||
| 223 | + $Options .= "<OPTION value= \"". $oGroup->iId . "\">". $oGroup->getName() ."</OPTION>\n"; | ||
| 224 | + | ||
| 225 | + } | ||
| 226 | + | ||
| 227 | + $sGroup .= $Options . "</SELECT>"; | ||
| 165 | 228 | ||
| 229 | + return $sGroup; | ||
| 230 | + | ||
| 166 | } | 231 | } |
| 167 | 232 | ||
| 233 | + | ||
| 168 | // show delete button or select button | 234 | // show delete button or select button |
| 169 | function getDeleteButton($oUser) { | 235 | function getDeleteButton($oUser) { |
| 170 | global $default; | 236 | global $default; |
| @@ -175,6 +241,16 @@ function getDeleteButton($oUser) { | @@ -175,6 +241,16 @@ function getDeleteButton($oUser) { | ||
| 175 | } | 241 | } |
| 176 | } | 242 | } |
| 177 | 243 | ||
| 244 | + | ||
| 245 | +// show delete button or select button | ||
| 246 | +function getSelectButton($oUser) { | ||
| 247 | + global $default; | ||
| 248 | + if (!isset($oUser)) { | ||
| 249 | + return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/select.gif\" value=\"submit\" /></td>\n"; | ||
| 250 | + } else { | ||
| 251 | + return "<td align = right><input type=\"image\" src =\"$default->graphicsUrl/widgets/select.gif\" value=\"submit\" /></td>\n"; | ||
| 252 | + } | ||
| 253 | +} | ||
| 178 | // show cancel button | 254 | // show cancel button |
| 179 | function getCancelButton($oUser) { | 255 | function getCancelButton($oUser) { |
| 180 | global $default; | 256 | global $default; |