From b4ea1a922d9f32e7578dbb12e13137287953b98e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 8 Mar 2013 17:55:14 +0100
Subject: [PATCH] pass current document to pageNavigation()

pageNavigation() still uses a global variable $document which is
replaced by a parameter passed to the function. All calls of
pageNavigation() needs a third parameter with the document.
---
 views/bootstrap/class.AddFile.php                    | 2 +-
 views/bootstrap/class.ApproveDocument.php            | 2 +-
 views/bootstrap/class.Bootstrap.php                  | 6 ++----
 views/bootstrap/class.DocumentAccess.php             | 2 +-
 views/bootstrap/class.DocumentNotify.php             | 2 +-
 views/bootstrap/class.DocumentVersionDetail.php      | 2 +-
 views/bootstrap/class.EditAttributes.php             | 2 +-
 views/bootstrap/class.EditComment.php                | 2 +-
 views/bootstrap/class.EditDocument.php               | 2 +-
 views/bootstrap/class.MoveDocument.php               | 2 +-
 views/bootstrap/class.OverrideContentStatus.php      | 2 +-
 views/bootstrap/class.RemoveDocument.php             | 2 +-
 views/bootstrap/class.RemoveDocumentFile.php         | 2 +-
 views/bootstrap/class.RemoveVersion.php              | 2 +-
 views/bootstrap/class.RemoveWorkflowFromDocument.php | 2 +-
 views/bootstrap/class.ReturnFromSubWorkflow.php      | 2 +-
 views/bootstrap/class.ReviewDocument.php             | 2 +-
 views/bootstrap/class.RewindWorkflow.php             | 2 +-
 views/bootstrap/class.RunSubWorkflow.php             | 2 +-
 views/bootstrap/class.SetExpires.php                 | 2 +-
 views/bootstrap/class.SetReviewersApprovers.php      | 2 +-
 views/bootstrap/class.SetWorkflow.php                | 2 +-
 views/bootstrap/class.TriggerWorkflow.php            | 2 +-
 views/bootstrap/class.UpdateDocument.php             | 2 +-
 views/bootstrap/class.ViewDocument.php               | 2 +-
 25 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index b8def5026..018d38369 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -42,7 +42,7 @@ class SeedDMS_View_AddFile extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 ?>
 <script language="JavaScript">
diff --git a/views/bootstrap/class.ApproveDocument.php b/views/bootstrap/class.ApproveDocument.php
index 64e6b57e1..7a4b92e79 100644
--- a/views/bootstrap/class.ApproveDocument.php
+++ b/views/bootstrap/class.ApproveDocument.php
@@ -50,7 +50,7 @@ class SeedDMS_View_ApproveDocument extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_approval"));
 ?>
 <script language="JavaScript">
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 484d6c5fa..2417b5a26 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -208,7 +208,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 					$this->folderNavigationBar($extra);
 					break;
 				case "view_document":
-					$this->documentNavigationBar();
+					$this->documentNavigationBar($extra);
 					break;
 				case "my_documents":
 					$this->myDocumentsNavigationBar();
@@ -267,9 +267,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		return;
 	} /* }}} */
 
-	private function documentNavigationBar()	{ /* {{{ */
-		global $document;
-
+	private function documentNavigationBar($document)	{ /* {{{ */
 		$accessMode = $document->getAccessMode($this->params['user']);
 		$docid=".php?documentid=" . $document->getID();
 
diff --git a/views/bootstrap/class.DocumentAccess.php b/views/bootstrap/class.DocumentAccess.php
index 371cf0dd0..a75a4679d 100644
--- a/views/bootstrap/class.DocumentAccess.php
+++ b/views/bootstrap/class.DocumentAccess.php
@@ -52,7 +52,7 @@ class SeedDMS_View_DocumentAccess extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 ?>
 
diff --git a/views/bootstrap/class.DocumentNotify.php b/views/bootstrap/class.DocumentNotify.php
index 26cb54e77..3341caff5 100644
--- a/views/bootstrap/class.DocumentNotify.php
+++ b/views/bootstrap/class.DocumentNotify.php
@@ -43,7 +43,7 @@ class SeedDMS_View_DocumentNotify extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 ?>
 <script language="JavaScript">
diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php
index abdd8f614..3b0d9ee36 100644
--- a/views/bootstrap/class.DocumentVersionDetail.php
+++ b/views/bootstrap/class.DocumentVersionDetail.php
@@ -49,7 +49,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("document_infos"));
 		$this->contentContainerStart();
 
diff --git a/views/bootstrap/class.EditAttributes.php b/views/bootstrap/class.EditAttributes.php
index 53ada7120..e5c92adbf 100644
--- a/views/bootstrap/class.EditAttributes.php
+++ b/views/bootstrap/class.EditAttributes.php
@@ -42,7 +42,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 		$this->contentHeading(getMLText("edit_attributes"));
 		$this->contentContainerStart();
diff --git a/views/bootstrap/class.EditComment.php b/views/bootstrap/class.EditComment.php
index f6db23cbb..41ba901b3 100644
--- a/views/bootstrap/class.EditComment.php
+++ b/views/bootstrap/class.EditComment.php
@@ -42,7 +42,7 @@ class SeedDMS_View_EditComment extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 ?>
 <script language="JavaScript">
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index 7dbedab4d..e6c944453 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -42,7 +42,7 @@ class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 ?>
 <script language="JavaScript">
diff --git a/views/bootstrap/class.MoveDocument.php b/views/bootstrap/class.MoveDocument.php
index c205a1da7..576350f21 100644
--- a/views/bootstrap/class.MoveDocument.php
+++ b/views/bootstrap/class.MoveDocument.php
@@ -41,7 +41,7 @@ class SeedDMS_View_MoveDocument extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("move_document"));
 		$this->contentContainerStart('warning');
 ?>
diff --git a/views/bootstrap/class.OverrideContentStatus.php b/views/bootstrap/class.OverrideContentStatus.php
index f81530f4b..d43bc7b93 100644
--- a/views/bootstrap/class.OverrideContentStatus.php
+++ b/views/bootstrap/class.OverrideContentStatus.php
@@ -45,7 +45,7 @@ class SeedDMS_View_OverrideContentStatus extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 		$this->contentHeading(getMLText("change_status"));
 
diff --git a/views/bootstrap/class.RemoveDocument.php b/views/bootstrap/class.RemoveDocument.php
index 010932f86..e478ceb9f 100644
--- a/views/bootstrap/class.RemoveDocument.php
+++ b/views/bootstrap/class.RemoveDocument.php
@@ -40,7 +40,7 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rm_document"));
 		$this->contentContainerStart('warning');
 
diff --git a/views/bootstrap/class.RemoveDocumentFile.php b/views/bootstrap/class.RemoveDocumentFile.php
index fb7f3f497..3e1bba9a7 100644
--- a/views/bootstrap/class.RemoveDocumentFile.php
+++ b/views/bootstrap/class.RemoveDocumentFile.php
@@ -41,7 +41,7 @@ class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation(getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rm_file"));
 		$this->contentContainerStart();
 
diff --git a/views/bootstrap/class.RemoveVersion.php b/views/bootstrap/class.RemoveVersion.php
index c8890e6fd..0ef5ca518 100644
--- a/views/bootstrap/class.RemoveVersion.php
+++ b/views/bootstrap/class.RemoveVersion.php
@@ -41,7 +41,7 @@ class SeedDMS_View_RemoveVersion extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rm_version"));
 		$this->contentContainerStart();
 ?>
diff --git a/views/bootstrap/class.RemoveWorkflowFromDocument.php b/views/bootstrap/class.RemoveWorkflowFromDocument.php
index a9ae6441f..19c1488c1 100644
--- a/views/bootstrap/class.RemoveWorkflowFromDocument.php
+++ b/views/bootstrap/class.RemoveWorkflowFromDocument.php
@@ -42,7 +42,7 @@ class SeedDMS_View_RemoveWorkflowFromDocument extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rm_workflow"));
 
 		$currentstate = $latestContent->getWorkflowState();
diff --git a/views/bootstrap/class.ReturnFromSubWorkflow.php b/views/bootstrap/class.ReturnFromSubWorkflow.php
index bb7b90afd..82b763628 100644
--- a/views/bootstrap/class.ReturnFromSubWorkflow.php
+++ b/views/bootstrap/class.ReturnFromSubWorkflow.php
@@ -43,7 +43,7 @@ class SeedDMS_View_ReturnFromSubWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("return_from_subworkflow"));
 ?>
 <script language="JavaScript">
diff --git a/views/bootstrap/class.ReviewDocument.php b/views/bootstrap/class.ReviewDocument.php
index 5bf604f61..f4a61a2c2 100644
--- a/views/bootstrap/class.ReviewDocument.php
+++ b/views/bootstrap/class.ReviewDocument.php
@@ -49,7 +49,7 @@ class SeedDMS_View_ReviewDocument extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("submit_review"));
 ?>
 <script language="JavaScript">
diff --git a/views/bootstrap/class.RewindWorkflow.php b/views/bootstrap/class.RewindWorkflow.php
index 014d4f0f9..f1813e341 100644
--- a/views/bootstrap/class.RewindWorkflow.php
+++ b/views/bootstrap/class.RewindWorkflow.php
@@ -42,7 +42,7 @@ class SeedDMS_View_RewindWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("rewind_workflow"));
 
 		$currentstate = $latestContent->getWorkflowState();
diff --git a/views/bootstrap/class.RunSubWorkflow.php b/views/bootstrap/class.RunSubWorkflow.php
index a47d677d5..403f0d092 100644
--- a/views/bootstrap/class.RunSubWorkflow.php
+++ b/views/bootstrap/class.RunSubWorkflow.php
@@ -43,7 +43,7 @@ class SeedDMS_View_RunSubWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("run_subworkflow"));
 
 		$currentstate = $latestContent->getWorkflowState();
diff --git a/views/bootstrap/class.SetExpires.php b/views/bootstrap/class.SetExpires.php
index 86a48898b..a7efecd8f 100644
--- a/views/bootstrap/class.SetExpires.php
+++ b/views/bootstrap/class.SetExpires.php
@@ -40,7 +40,7 @@ class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("set_expiry"));
 		$this->contentContainerStart();
 
diff --git a/views/bootstrap/class.SetReviewersApprovers.php b/views/bootstrap/class.SetReviewersApprovers.php
index 3c4c24d37..40c43c323 100644
--- a/views/bootstrap/class.SetReviewersApprovers.php
+++ b/views/bootstrap/class.SetReviewersApprovers.php
@@ -46,7 +46,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("change_assignments"));
 
 		// Retrieve a list of all users and groups that have review / approve privileges.
diff --git a/views/bootstrap/class.SetWorkflow.php b/views/bootstrap/class.SetWorkflow.php
index 74a874f06..357695331 100644
--- a/views/bootstrap/class.SetWorkflow.php
+++ b/views/bootstrap/class.SetWorkflow.php
@@ -42,7 +42,7 @@ class SeedDMS_View_SetWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("set_workflow"));
 
 		$this->contentContainerStart();
diff --git a/views/bootstrap/class.TriggerWorkflow.php b/views/bootstrap/class.TriggerWorkflow.php
index e0186f723..a25757776 100644
--- a/views/bootstrap/class.TriggerWorkflow.php
+++ b/views/bootstrap/class.TriggerWorkflow.php
@@ -43,7 +43,7 @@ class SeedDMS_View_TriggerWorkflow extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("trigger_workflow"));
 ?>
 <script language="JavaScript">
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index ab25b46c6..4dc683c96 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -48,7 +48,7 @@ class SeedDMS_View_UpdateDocument extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 		$this->contentHeading(getMLText("update_document"));
 ?>
 
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index d38afea3c..2f2674a6b 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -87,7 +87,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
 		$this->globalNavigation($folder);
 		$this->contentStart();
-		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document");
+		$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
 
 		if ($document->isLocked()) {
 			$lockingUser = $document->getLockingUser();