From d759f1b2086cf1574150f0ea1bf52a727f3a8daa Mon Sep 17 00:00:00 2001
From: Michael Joseph <michael@knowledgetree.com>
Date: Thu, 31 Jul 2003 14:09:54 +0000
Subject: [PATCH] don't allow folder deletion if there are archived documents in it

---
 presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php | 12 ++++++++----
 presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc | 14 +-------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
index a952a05..b67932b 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
@@ -110,13 +110,17 @@ if (checkSession()) {
                                     
                 // get folders descended from this one
                 $aFolderArray = Folder::getList("parent_id=$fFolderID");
-                // get documents in this folder
-                $aDocumentArray = Document::getList("folder_id=$fFolderID AND status_id=" . LIVE);
+                // get live documents in this folder
+                $aLiveDocuments = Document::getList("folder_id=$fFolderID AND status_id=" . LIVE);
+				// get archived documents in this folder                
+                $aArchivedDocuments = Document::getList("folder_id=$fFolderID AND status_id=" . ARCHIVED);
                 
                 if (count($aFolderArray) > 0) {
                     $oPatternCustom->setHtml(getFolderNotEmptyPage($fFolderID,  count($aFolderArray), "folder(s)"));
-                } else if (count($aDocumentArray) > 0) {
-                    $oPatternCustom->setHtml(getFolderNotEmptyPage($fFolderID, count($aDocumentArray), "document(s)"));                                                                  
+                } else if (count($aLiveDocuments) > 0) {
+                    $oPatternCustom->setHtml(getFolderNotEmptyPage($fFolderID, count($aDocumentArray), "document(s)"));
+                } else if (count($aArchivedDocuments) > 0) {
+                    $oPatternCustom->setHtml(getFolderNotEmptyPage($fFolderID, "", " archived documents"));                	
                 } else {                
                     // get confirmation first
                     $oFolder = Folder::get($fFolderID);
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc
index ab2c423..2429717 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc
@@ -10,18 +10,6 @@
  * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
  */
 
- /*function renderHeading($sHeading) {
-    global $default;
-    $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
-    $sColor = $default->siteMap->getSectionColour($sSectionName, "th");
-    $sToRender  = "<table border=\"0\" width=\"600\">\n";
-    $sToRender .= "<tr align=\"left\"><th class=\"sectionHeading\" bgcolor=\"$sColor\">$sHeading</th></tr>\n";
-    $sToRender .= "<tr/>\n";
-    $sToRender .= "<tr/>\n";
-    $sToRender .= "</table>\n";
-    return $sToRender;
-}*/
-
 function getFolderPath($iFolderID) {
 	global $default;
 	$sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
@@ -36,7 +24,7 @@ function getFolderNotEmptyPage($iFolderID, $iObjectCount, $sObjectType) {
 	$sToRender .= getFolderPath($iFolderID) . "<br>\n";
 	$sToRender .= "<table border=\"0\">\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td>There are still $iObjectCount $sObjectType in this folder</td>\n";
+	$sToRender .= "<td>This folder cannot be deleted because there are still $iObjectCount $sObjectType in it.</td>\n";
 	$sToRender .= "<tr>\n";
 	$sToRender .= "<td>Select 'Cancel' to return to the browse page.</td>\n";
 	$sToRender .= "<tr>\n";
--
libgit2 0.21.4