gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-11 20:21:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- pass the user how removes a group or user to remove()

Browse Source
This commit is contained in:
steinm 2010-12-22 19:47:08 +00:00
parent 17dae3a432
commit 985a1f3915
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inc/inc.ClassGroup.php
View File

@ -161,14 +161,16 @@ class LetoDMS_Group {
} /* }}} */
/**
* Entfernt die Gruppe aus dem System.
* Dies ist jedoch nicht mit einem Löschen des entsprechenden Eintrags aus tblGroups geschehen - vielmehr
* muss dafür gesorgt werden, dass die Gruppe nirgendwo mehr auftaucht. D.h. auch die Tabellen tblACLs,
* tblNotify und tblGroupMembers müssen berücksichtigt werden.
* Delete user group
* This function deletes the user group and all it references, like access
* control lists, notifications, as a child of other groups, etc.
*
* @param object $user the user doing the removal (needed for entry in
* review log.
* @return boolean true on success or false in case of an error
*/
function remove() { /* {{{ */
function remove($user) { /* {{{ */
$db = $this->_dms->getDB();
$user = $this->_dms->user;
$queryStr = "DELETE FROM tblGroups WHERE id = " . $this->_id;
if (!$db->getResult($queryStr))

5
inc/inc.ClassUser.php
View File

@ -284,13 +284,14 @@ class LetoDMS_User {
* Do not remove folders and documents of the user, but assign them
* to a different user.
*
* @param object $user the user doing the removal (needed for entry in
* review log.
* @param object $assignToUser the user who is new owner of folders and
* documents which previously were owned by the delete user.
* @return boolean true on success or false in case of an error
*/
function remove( $assignToUser=null ) { /* {{{ */
function remove($user, $assignToUser=null) { /* {{{ */
$db = $this->_dms->getDB();
$user = $this->_dms->user;
/* Records like folders and documents that formely have belonged to
* the user will assign to another user. If no such user is set,

2
op/op.GroupMgr.php
View File

@ -67,7 +67,7 @@ else if ($action == "removegroup") {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_group_id"));
}
if (!$group->remove()) {
if (!$group->remove($user)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}

2
op/op.UsrMgr.php
View File

@ -123,7 +123,7 @@ else if ($action == "removeuser") {
}
$userToAssign = $dms->getUser($_POST["assignTo"]);
if (!$userToRemove->remove($userToAssign)) {
if (!$userToRemove->remove($user, $userToAssign)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
}