From 5c83ea9681096d1a7ece2214e1906c5a7a8a7cf1 Mon Sep 17 00:00:00 2001
From: michael <michael@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 5 Jun 2003 16:17:44 +0000
Subject: [PATCH] allow restoration of archived documents by admin allow restoration request by users

---
 presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php | 11 +++++++++--
 presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc | 16 +++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
index 71582be..1f9a355 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
@@ -51,6 +51,7 @@ require_once("$default->fileSystemRoot/lib/web/WebDocument.inc");
 
 require_once("$default->fileSystemRoot/lib/subscriptions/Subscription.inc");
 
+require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/restoreArchivedDocumentUI.inc");
 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc");
 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc");
 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
@@ -259,9 +260,15 @@ if (checkSession()) {
 	                $oPatternCustom->setHtml(getViewPage($oDocument));
 	            }
             } else if ($oDocument->isArchived()) {
-            	// cancel
-	            $oPatternCustom->setHtml("<a href=\"" . generateControllerLink("browse", "fFolderID=" . $oDocument->getFolderID()) . "\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\" /></a>\n");
 	            $main->setErrorMessage("This document has been archived.");
+	                        	
+            	// allow admins to restore the document
+            	if (Permission::userIsSystemAdministrator() || Permission::userIsUnitAdministrator()) {
+					$oPatternCustom->setHtml(getRestoreArchivedDocumentPage($oDocument));
+            	} else {
+            		// and ordinary users to request that the document be restored
+					$oPatternCustom->setHtml(getRequestRestoreDocumentPage($oDocument));
+            	}            
             }
             $main->setCentralPayload($oPatternCustom);
             $main->setFormAction("$default->rootUrl/control.php?action=modifyDocument&fDocumentID=" . $oDocument->getID());
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
index 92530f0..d9d9448 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
@@ -234,7 +234,7 @@ function getEditPage($oDocument) {
     $sToRender .= "<td>\n";
     
     $sToRender .= "\t<table border = 0>\n";
-    $sToRender .= "\t<tr width>\n";
+    $sToRender .= "\t<tr>\n";
     $sToRender .= "\t\t<td>" . renderDocumentData($oDocument) . "</td>\n";    
     $sToRender .= "\t</tr>\n";
 	$sToRender .= "\t<tr>\n";
@@ -344,7 +344,7 @@ function getViewPage($oDocument) {
     $sToRender .= "<tr>\n";
     $sToRender .= "<td>\n";
     $sToRender .= "\t<table border = 0 width = 280>\n";
-    $sToRender .= "\t<tr width>\n";
+    $sToRender .= "\t<tr>\n";
     $sToRender .= "\t\t<td>" . renderDocumentData($oDocument) . "</td>\n";
     $sToRender .= "\t</tr>\n";
     $sToRender .= "\t<tr>\n";
@@ -395,7 +395,7 @@ function getCheckOutEditPage($oDocument, $bCheckedOut = false) {
     $sToRender .= "<tr>\n";
     $sToRender .= "<td>\n";
     $sToRender .= "\t<table border = 0 width = 280>\n";
-    $sToRender .= "\t<tr width>\n";
+    $sToRender .= "\t<tr>\n";
     $sToRender .= "\t\t<td>" . renderDocumentData($oDocument) . "</td>\n";
     $sToRender .= "\t</tr>\n";
     $sToRender .= "\t<tr>\n";
@@ -443,7 +443,7 @@ function getCheckInEditPage($oDocument) {
     $sToRender .= "<tr>\n";
     $sToRender .= "<td>\n";
     $sToRender .= "\t<table border = 0 width = 280>\n";
-    $sToRender .= "\t<tr width>\n";
+    $sToRender .= "\t<tr>\n";
     $sToRender .= "\t\t<td>" . renderDocumentData($oDocument) . "</td>\n";
     $sToRender .= "\t</tr>\n";
     $sToRender .= "\t<tr>\n";
@@ -480,7 +480,7 @@ function getWebPublishPage($oDocument) {
     $sToRender .= "<tr>\n";
     $sToRender .= "<td>\n";
     $sToRender .= "\t<table border = 0 width = 280>\n";
-    $sToRender .= "\t<tr width>\n";
+    $sToRender .= "\t<tr>\n";
     $sToRender .= "\t\t<td>" . renderDocumentData($oDocument) . "</td>\n";
     $sToRender .= "\t</tr>\n";
     $sToRender .= "\t<tr>\n";
@@ -522,8 +522,10 @@ function getWebPublishPage($oDocument) {
     return $sToRender;
 }
 
+/**
+ * Wraps html in a bordered table
+ */
 function wrapInTable($sHtml) {
     return "\n\t\t\t<table border = 1, width = 100%><tr><td>$sHtml</td></tr></table>\n";
 }
-
-?>
+?>
\ No newline at end of file
--
libgit2 0.21.4