diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/copyInheritedPermissionsBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/copyInheritedPermissionsBL.php
deleted file mode 100644
index 3330453..0000000
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/copyInheritedPermissionsBL.php
+++ /dev/null
@@ -1,134 +0,0 @@
-fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
-require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListFromQuery.inc");
-require_once("editUI.inc");
-require_once("$default->fileSystemRoot/lib/security/Permission.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");
-require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-
-$oPatternCustom = & new PatternCustom();
-
-if (!isset($fFolderID)) {
- $oPatternCustom->setHtml("
\n");
- $main->setErrorMessage(_("No folder currently selected"));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- exit(0);
-}
-
-$oFolder = Folder::get($fFolderID);
-if (!$oFolder) {
- // folder doesn't exist
- $oPatternCustom->setHtml("
\n");
- $main->setErrorMessage(_("The folder you're trying to modify does not exist in the DMS"));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- exit(0);
-}
-
-if (!isset($fInheritedFolderID)) {
- //else display an error message
- $oPatternCustom->setHtml("
\n");
- $main->setErrorMessage(_("No inherited folder given"));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- exit(0);
-}
-
-$oInheritedFolder = Folder::get($fInheritedFolderID);
-if (!$oInheritedFolder) {
- //else display an error message
- $oPatternCustom->setHtml("
\n");
- $main->setErrorMessage(_("The inherited folder given does not exist in the DMS"));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- exit(0);
-}
-
-//if the user can edit the folder
-if (!Permission::userHasFolderWritePermission($oFolder)) {
- //user does not have write permission for this folder,
- $oPatternCustom->setHtml("
\n");
- $main->setErrorMessage(_("You do not have permission to edit this folder"));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- exit(0);
-}
-
-$sQuery = DBUtil::compactQuery("
-SELECT
- GFL.group_id AS group_id,
- GFL.can_read AS can_read,
- GFL.can_write AS can_write
-FROM
- $default->groups_folders_table AS GFL
-WHERE GFL.folder_id = ?");
-$aParams = array($fInheritedFolderID);
-$aPermissions = DBUtil::getResultArray(array($sQuery, $aParams));
-
-if (PEAR::isError($aPermissions)) {
- $oPatternCustom->setHtml("
\n");
- $main->setErrorMessage(_("Error retrieving folder permissions"));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- exit(0);
-}
-
-foreach ($aPermissions as $aRow) {
- $aRow['folder_id'] = $fFolderID;
- $res = DBUtil::autoInsert($default->groups_folders_table, $aRow);
- if (PEAR::isError($res)) {
- $oPatternCustom->setHtml("
\n");
- $main->setErrorMessage(_("Error saving folder permissions"));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- exit(0);
- }
-}
-
-$oFolder->updatePermissions();
-
-controllerRedirect("editFolder", "fFolderID=$fFolderID&fShowSection=folderPermissions");
-
-?>
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderPermissions.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderPermissions.php
deleted file mode 100644
index 9fb9057..0000000
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderPermissions.php
+++ /dev/null
@@ -1,170 +0,0 @@
-log->debug("displayFolderPathLink: slinkPage=$sLinkPage");
- // display a separate link to each folder in the path
- for ($i=0; $i 0) ? $sPathLinks . " > " . $sLink : $sLink;
- }
- return $sPathLinks;
-}
-
-
-class FolderPermissions extends KTStandardDispatcher {
- var $bAutomaticTransaction = true;
-
- function check() {
- if (KTUtil::arrayGet($_REQUEST, 'fFolderID')) {
- $_REQUEST['fFolderId'] = $_REQUEST['fFolderID'];
- }
- $this->oFolder =& $this->oValidator->validateFolder($_REQUEST['fFolderId']);
- return true;
- }
- function do_main() {
- $oTemplating = new KTTemplating;
- $oTemplate = $oTemplating->loadTemplate("ktcore/folder/permissions");
- $oPO = KTPermissionObject::get($this->oFolder->getPermissionObjectId());
- $aPermissions = KTPermission::getList();
- $aMapPermissionGroup = array();
- foreach ($aPermissions as $oPermission) {
- $oPA = KTPermissionAssignment::getByPermissionAndObject($oPermission, $oPO);
- if (PEAR::isError($oPA)) {
- continue;
- }
- $oDescriptor = KTPermissionDescriptor::get($oPA->getPermissionDescriptorId());
- $iPermissionId = $oPermission->getId();
- $aIds = $oDescriptor->getGroups();
- $aMapPermissionGroup[$iPermissionId] = array();
- foreach ($aIds as $iId) {
- $aMapPermissionGroup[$iPermissionId][$iId] = true;
- }
- }
- $aMapPermissionUser = array();
- $aUsers = User::getList();
- foreach ($aPermissions as $oPermission) {
- $iPermissionId = $oPermission->getId();
- foreach ($aUsers as $oUser) {
- if (KTPermissionUtil::userHasPermissionOnItem($oUser, $oPermission, $this->oFolder)) {
- $aMapPermissionUser[$iPermissionId][$oUser->getId()] = true;
- }
- }
- }
-
- $oInherited = KTPermissionUtil::findRootObjectForPermissionObject($oPO);
- if ($oInherited === $this->oFolder) {
- $bEdit = true;
- } else {
- $iInheritedFolderId = $oInherited->getId();
- $sInherited = displayFolderPathLink(Folder::getFolderPathAsArray($iInheritedFolderId),
- Folder::getFolderPathNamesAsArray($iInheritedFolderId),
- "$default->rootUrl/control.php?action=editFolderPermissions");
- $bEdit = false;
- }
-
- $aDynamicConditions = KTPermissionDynamicCondition::getByPermissionObject($oPO);
- $aTemplateData = array(
- "permissions" => $aPermissions,
- "groups" => Group::getList(),
- "iFolderId" => $this->oFolder->getId(),
- "aMapPermissionGroup" => $aMapPermissionGroup,
- "users" => $aUsers,
- "aMapPermissionUser" => $aMapPermissionUser,
- "edit" => $bEdit,
- "inherited" => $sInherited,
- "conditions" => KTSavedSearch::getConditions(),
- "dynamic_conditions" => $aDynamicConditions,
- );
- return $oTemplate->render($aTemplateData);
- }
-
- function handleOutput($data) {
- global $main;
- $main->bFormDisabled = true;
- $main->setCentralPayload($data);
- $main->render();
- }
-
- function do_update() {
- $oPO = KTPermissionObject::get($this->oFolder->getPermissionObjectId());
- $aFoo = $_REQUEST['foo'];
- $aPermissions = KTPermission::getList();
- foreach ($aPermissions as $oPermission) {
- $iPermId = $oPermission->getId();
- $aAllowed = KTUtil::arrayGet($aFoo, $iPermId, array());
- KTPermissionUtil::setPermissionForId($oPermission, $oPO, $aAllowed);
- }
- KTPermissionUtil::updatePermissionLookupForPO($oPO);
- return $this->successRedirectToMain('Permissions updated',
- array('fFolderId' => $this->oFolder->getId()));
- }
-
- function do_copyPermissions() {
- KTPermissionUtil::copyPermissionObject($this->oFolder);
- return $this->successRedirectToMain('Permissions updated',
- array('fFolderId' => $oFolder->getId()));
- }
-
- function do_inheritPermissions() {
- KTPermissionUtil::inheritPermissionObject($this->oFolder);
- return $this->successRedirectToMain('Permissions updated',
- array('fFolderId' => $this->oFolder->getId()));
- }
-
- function do_newDynamicPermission() {
- $oGroup =& $this->oValidator->validateGroup($_REQUEST['fGroupId']);
- $oCondition =& $this->oValidator->validateCondition($_REQUEST['fConditionId']);
- $aPermissionIds = $_REQUEST['fPermissionIds'];
- $oPO = KTPermissionObject::get($this->oFolder->getPermissionObjectId());
-
- $oDynamicCondition = KTPermissionDynamicCondition::createFromArray(array(
- 'groupid' => $oGroup->getId(),
- 'conditionid' => $oCondition->getId(),
- 'permissionobjectid' => $oPO->getId(),
- ));
- $aOptions = array(
- 'redirect_to' => array('main', 'fFolderId=' . $this->oFolder->getId()),
- );
- $this->oValidator->notError($oDynamicCondition, $aOptions);
- $res = $oDynamicCondition->saveAssignment($aPermissionIds);
- $this->oValidator->notError($res, $aOptions);
- $this->successRedirectToMain("Dynamic permission added", "fFolderId=" . $this->oFolder->getId());
- }
-}
-
-$oDispatcher = new FolderPermissions;
-$oDispatcher->dispatch();
-
-?>