diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentBL.php
deleted file mode 100644
index b95e71d..0000000
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentBL.php
+++ /dev/null
@@ -1,218 +0,0 @@
-, Jam Warehouse (Pty) Ltd, South Africa
- * @package documentmanagement
- */
-
-require_once("../../../../config/dmsDefaults.php");
-
-KTUtil::extractGPC('fConfirmed', 'fDocumentIDs', 'fFolderID', 'fForMove', 'fRememberDocumentID');
-
-require_once("$default->fileSystemRoot/lib/security/Permission.inc");
-require_once("$default->fileSystemRoot/lib/users/User.inc");
-require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc");
-require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
-require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-
-require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionEngine.inc");
-
-require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
-require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
-
-require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc");
-require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-require_once("$default->fileSystemRoot/presentation/Html.inc");
-
-require_once(KT_LIB_DIR . '/storage/storagemanager.inc.php');
-
-$aUnmovedDocs = array();
-
-if (!checkSession()) {
- die();
-}
-
-if (isset($fRememberDocumentID)) {
- $fDocumentIDs = $_SESSION['documents'][$fRememberDocumentID];
-} else {
- $sUniqueID = KTUtil::randomString();
- $_SESSION["documents"][$sUniqueID] = $fDocumentIDs;
- $fRememberDocumentID = $sUniqueID;
-}
-
-
-if (!isset($fDocumentIDs) || !isset($fFolderID)) {
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- $oPatternCustom = & new PatternCustom();
- $oPatternCustom->setHtml("");
- $main->setCentralPayload($oPatternCustom);
- $main->setErrorMessage(_("No document/folder selected"));
- $main->render();
- exit(0);
-}
-
-if (!isset($fForMove)) {
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- $oPatternCustom = & new PatternCustom();
- $oPatternCustom->setHtml(getPage($fFolderID, $fRememberDocumentID));
- $main->setCentralPayload($oPatternCustom);
- $main->setFormAction($_SERVER["PHP_SELF"] . "?fForMove=1&fRememberDocumentID=$fRememberDocumentID&fFolderID=$fFolderID");
- $main->render();
- exit(0);
-}
-
-if (!$fConfirmed) {
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- $oPatternCustom = & new PatternCustom();
-
- // Check for all docs
- for ($i = 0; $i < count($fDocumentIDs); $i++) {
- $oDocument = Document::get($fDocumentIDs[$i]);
-
- // check if the selected folder has the same document type as the document we're moving
- if (!Folder::folderIsLinkedToDocType($fFolderID, $oDocument->getDocumentTypeID())) {
- // the right document type isn't mapped
- $oPatternCustom->setHtml(getPage($fFolderID, $fRememberDocumentID, _("You can't move the document to this folder because it cannot store the document type of your document.") . " " . _("Please choose another directory")));
- break;
- }
-
- // check that there is no filename collision in the destination directory
- $sNewDocumentFileSystemPath = Folder::getFolderPath($fFolderID) . $oDocument->getFileName();
-
- if (file_exists($sNewDocumentFileSystemPath)) {
- // filename collision
- $oPatternCustom->setHtml(getPage($fFolderID, $fRememberDocumentID, _("This folder already contains a document of the same name.") . " " . _("Please choose another directory")));
- break;
- }
- // display confirmation page
- $oPatternCustom->setHtml(getConfirmationPage($fFolderID, $fRememberDocumentID));
- }
- $main->setFormAction($_SERVER["PHP_SELF"] . "?fForMove=1&fRememberDocumentID=$fRememberDocumentID&fFolderID=$fFolderID");
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- exit(0);
-}
-
-$oStorage =& KTStorageManagerUtil::getSingleton();
-
-for ($i = 0; $i < count($fDocumentIDs); $i++) {
-
- //we're trying to move a document
- $oDocument = & Document::get($fDocumentIDs[$i]);
- $iOldFolderID = $oDocument->getFolderID();
- $oOldFolder =& Folder::get($iOldFolderID);
- $oNewFolder = & Folder::get($fFolderID);
-
- // check that there is no filename collision in the destination directory
- $sNewDocumentFileSystemPath = Folder::getFolderPath($fFolderID) . $oDocument->getFileName();
-
- if (file_exists($sNewDocumentFileSystemPath)) {
- // Store the doc with problem
- array_push($aUnmovedDocs, array($oDocument, _("This folder already contains a document of the same name. Please choose another directory")));
- continue;
- }
-
- if (!Permission::userHasDocumentWritePermission($oDocument) || !Permission::userHasFolderWritePermission($oNewFolder)) {
- array_push($aUnmovedDocs, array($oDocument, _("You do not have rights to move this document")));
- continue;
- }
-
- //put the document in the new folder
- $oDocument->setFolderID($fFolderID);
- if (!$oDocument->update(true)) {
- //had a problem with the database
- array_push($aUnmovedDocs, array($oDocument, _("Could not update document in database")));
- continue;
- }
-
- //move the document on the file system
- if (!$oStorage->moveDocument($oDocument, $oOldFolder, $oNewFolder)) {
- $oDocument->setFolderID($iOldFolderID);
- $oDocument->update(true);
-
- // Store the doc with problem
- array_push($aUnmovedDocs, array($oDocument, _("Could not move document on file system")));
- continue;
- }
- $oDocument->update();
-
- $sMoveMessage = sprintf("Moved from %s/%s to %s/%s",
- $oOldFolder->getFullPath(),
- $oOldFolder->getName(),
- $oNewFolder->getFullPath(),
- $oNewFolder->getName());
-
- // create the document transaction record
- $oDocumentTransaction = & new DocumentTransaction($oDocument->getID(), $sMoveMessage, MOVE);
- $oDocumentTransaction->create();
-
- // fire subscription alerts for the moved document (and the folder its in)
- $count = SubscriptionEngine::fireSubscription($fDocumentIDs[$i], SubscriptionConstants::subscriptionAlertType("MovedDocument"),
- SubscriptionConstants::subscriptionType("DocumentSubscription"),
- array(
- "folderID" => $iOldFolderID,
- "modifiedDocumentName" => $oDocument->getName(),
- "oldFolderName" => Folder::getFolderName($iOldFolderID),
- "newFolderName" => Folder::getFolderName($fFolderID),
- )
- );
- $default->log->info("moveDocumentBL.php fired $count subscription alerts for moved document " . $oDocument->getName());
-
- // fire folder subscriptions for the destination folder
- $count = SubscriptionEngine::fireSubscription($fFolderID, SubscriptionConstants::subscriptionAlertType("MovedDocument"),
- SubscriptionConstants::subscriptionType("FolderSubscription"),
- array(
- "folderID" => $iOldFolderID,
- "modifiedDocumentName" => $oDocument->getName(),
- "oldFolderName" => Folder::getFolderName($iOldFolderID),
- "newFolderName" => Folder::getFolderName($fFolderID),
- )
- );
- $default->log->info("moveDocumentBL.php fired $count (folderID=$fFolderID) folder subscription alerts for moved document " . $oDocument->getName());
-}
-
-// Move terminated
-
-// List undeleted documents
-if (!empty($aUnmovedDocs) ) {
- require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
- $oPatternCustom = & new PatternCustom();
-
- $sError = _("An error occured moving the following document(s):") . "
";
- foreach ($aUnmovedDocs as $oDoc) {
- $sError .= $oDoc[0]->getDisplayPath() . ": " .$oDoc[1] . "
";
- }
- $sError .= "
" . _("The other documents are been moved.");
-
- $oPatternCustom = & new PatternCustom();
- $oPatternCustom->setHtml(renderErrorPage($sError));
- $main->setCentralPayload($oPatternCustom);
- $main->render();
- reset($aUnmovedDocs);
- exit(0);
-}
-
-// redirect to the browse folder page
-redirect("$default->rootUrl/control.php?action=browse&fFolderID=" . $oDocument->getFolderID());
-
-?>
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc
deleted file mode 100644
index a2d92cb..0000000
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc
+++ /dev/null
@@ -1,103 +0,0 @@
-, Jam Warehouse (Pty) Ltd, South Africa
- * @package documentmanagement
- */
-
-function getConfirmationPage($iFolderID, $sRememberDocumentID) {
- global $default;
- $iDocumentIDs = $_SESSION['documents'][$sRememberDocumentID];
-
- $sToRender = renderHeading(_("Move Document"));
- $sToRender .= "
\n";
- return $sToRender;
-}
-
-
-function getPage($iFolderID, $sRememberDocumentID, $sErrorMessage = "") {
- global $default;
- $iDocumentIDs = $_SESSION['documents'][$sRememberDocumentID];
-
- $sToRender = renderHeading(_("Move Document"));
- $sToRender .= "\n";
- if ($sErrorMessage) {
- $sToRender .= "| $sErrorMessage |
";
- }
- $sToRender .= "" . _("Move document(s)") . ":
| \n";
-
- for ($i = 0; $i < count($iDocumentIDs); $i++) {
- $sToRender .= "
\n";
- $sToRender .= "| '" . Document::getDocumentDisplayPath($iDocumentIDs[$i]) . "' | \n";
- }
- $sQueryString .= "fRememberDocumentID=$sRememberDocumentID&";
-
- $sToRender .= "
| " . _("To Folder") . ": |
";
- $sToRender .= "\n";
- $sToRender .= "| " . renderFolderPath($iFolderID, "/control.php?action=moveDocument&" . $sQueryString) . " | \n";
- $sToRender .= "
\n";
- $sToRender .= "
\n";
- $sToRender .= "\n";
- $sToRender .= "\n";
- $sToRender .= "| " . renderFolderList($iFolderID, "/control.php?action=moveDocument&" . $sQueryString) . " | \n";
- $sToRender .= "
\n";
- $sToRender .= " | ";
-
- $sToRender .= "
\n";
- return $sToRender;
-}
-function renderErrorPage($sErrorMessage, $iDocumentID = "") {
- global $default;
- if ($iDocumentID) {
- return statusPage(_("Delete Document"), "", $sErrorMessage, "viewDocument", "fDocumentID=$iDocumentID");
- } else {
- $sToRender = renderHeading(_("Delete Document"));
- $sToRender .= "\n";
- $sToRender .= "$sErrorMessage \n" .
- " \n" .
- " |
\n";
- return $sToRender;
- }
-}
-
-?>