From f99317f0b9f02d11469b959e8b3b90819f6cca11 Mon Sep 17 00:00:00 2001
From: rob <rob@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Thu, 8 May 2003 09:49:34 +0000
Subject: [PATCH] Added DocumentCollaboration.inc inclusion file and changes references from Document.inc to DocumentCollaboration.inc

---
 presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationRollbackBL.php |  5 +++--
 presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php                  | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationRollbackBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationRollbackBL.php
index a89bebd..a56bf5e 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationRollbackBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationRollbackBL.php
@@ -17,6 +17,7 @@ require_once("$default->fileSystemRoot/lib/users/User.inc");
 require_once("$default->fileSystemRoot/lib/documentmanagement/PhysicalDocumentManager.inc");
 require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc");
 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
+require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentCollaboration.inc");
 
 require_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc");
 require_once("$default->fileSystemRoot/lib/foldermanagement/FolderUserRole.inc");
@@ -29,13 +30,13 @@ require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/fo
 
 if (checkSession()) {
     if (isset($fDocumentID)) {
-		if (Document::userIsPerformingCurrentCollaborationStep($fDocumentID)) {	
+		if (DocumentCollaboration::userIsPerformingCurrentCollaborationStep($fDocumentID)) {	
 			if (isset($fForStore)) {
 				//user has entered a comment
 				//create the transaction and rollback the step
 				$oDocumentTransaction = & new DocumentTransaction($fDocumentID, $fComment, COLLAB_ROLLBACK);
 				if ($oDocumentTransaction->create()) {					
-					Document::rollbackCollaborationStep($fDocumentID, $fComment);					
+					DocumentCollaboration::rollbackCollaborationStep($fDocumentID, $fComment);					
 					redirect("$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID");
 				} else {
 					$oDocument = Document::get($fDocumentID);
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
index 736c6d5..f8d67db 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
@@ -31,6 +31,7 @@ require_once("$default->fileSystemRoot/lib/users/User.inc");
 require_once("$default->fileSystemRoot/lib/documentmanagement/PhysicalDocumentManager.inc");
 require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc");
 require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
+require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentCollaboration.inc");
 
 require_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc");
 require_once("$default->fileSystemRoot/lib/foldermanagement/FolderUserRole.inc");
@@ -98,7 +99,7 @@ if (checkSession()) {
 					//if all the roles have been assigned we can start the collaboration process
                     
 					//TODO: check if this collaboration has already occured, and then reset all the steps before beginning it again
-					//Document::resetDocumentCollaborationSteps($fDocumentID);
+					//DocumentCollaboration::resetDocumentCollaborationSteps($fDocumentID);
                     
 					$oDocument->beginCollaborationProcess();
 					$oPatternCustom = & new PatternCustom();
@@ -124,9 +125,9 @@ if (checkSession()) {
 				$main->setErrorMessage("The collaboration steps for the folder must be set up before collaboration can begin");
 				$main->render();                
             }
-		} else if ((isset($fCollaborationStepComplete)) && (Document::userIsPerformingCurrentCollaborationStep($fDocumentID))) {				
+		} else if ((isset($fCollaborationStepComplete)) && (DocumentCollaboration::userIsPerformingCurrentCollaborationStep($fDocumentID))) {				
 				//the user has signled that they have completed their step in the collaboration process
-				if (Document::isLastStepInCollaborationProcess($fDocumentID)) {				
+				if (DocumentCollaboration::isLastStepInCollaborationProcess($fDocumentID)) {				
 					require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
 					//the last step in the collaboration process has been performed- email the document creator
                     
@@ -156,7 +157,7 @@ if (checkSession()) {
 				} else {
 					require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
 					//start the next steps if all criteria are met					
-					Document::beginNextStepInCollaborationProcess($fDocumentID, $_SESSION["userID"]);
+					DocumentCollaboration::beginNextStepInCollaborationProcess($fDocumentID, $_SESSION["userID"]);
 					$oDocument = Document::get($fDocumentID);
 					$oPatternCustom = & new PatternCustom();
 					$oPatternCustom->setHtml(getEditPage($oDocument));
@@ -164,7 +165,7 @@ if (checkSession()) {
 					$main->setErrorMessage("The next steps in the collaboration process have been started");
 					$main->render();
 				}
-		} else if ((isset($fForPublish)) && (!Document::documentIsPendingWebPublishing($fDocumentID))) {
+		} else if ((isset($fForPublish)) && (!DocumentCollaboration::documentIsPendingWebPublishing($fDocumentID))) {
             if (isset($fWebSiteID)) {
                 // user wishes to publish document
                 $oDocument = Document::get($fDocumentID);
--
libgit2 0.21.4