From 487f6b1806d7890eba4efb7c92f577a628b57cd7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 16 May 2013 09:56:28 +0200
Subject: [PATCH 1/6] fix minor layout error in folder tree (Bug #51)

---
 styles/bootstrap/application.css    | 4 ++++
 views/bootstrap/class.Bootstrap.php | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index d3a0df5be..7f3b8ca4e 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -35,6 +35,10 @@ ul.actions li a.btn > i {
 	font-size: 200%;
 }
 
+ul.tree, ul.tree ul {
+	margin-left: 20px;
+}
+
 @media (max-width: 480px) { 
     .nav-tabs > li {
         float:none;
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 1e56d72b7..79e467d60 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -966,8 +966,9 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 		}
 		if ($folder->getAccessMode($this->params['user']) >= $accessMode) {
 
-			if ($is_open) print "<i class=\"icon-folder-open\" name=\"treeimg".$folderID."\"></i><span style=\"padding-left:5px\" >";
-			else print "<i class=\"icon-folder-close\" name=\"treeimg".$folderID."\"></i><span style=\"padding-left:5px\" >";
+			if ($is_open) print "<i class=\"icon-folder-open\" name=\"treeimg".$folderID."\"></i>";
+			else print "<i class=\"icon-folder-close\" name=\"treeimg".$folderID."\"></i>";
+//			print "<span style=\"padding-left:5px\" >";
 
 			if ($folderID != $currentFolderID){
 			

From 7ea3c9a73a970cdc85aa479981501549a9f06fc5 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 May 2013 08:47:04 +0200
Subject: [PATCH 2/6] close folder chooser dialog when folder is selected

---
 views/bootstrap/class.Bootstrap.php     | 21 ++++++++++-----------
 views/bootstrap/class.FolderChooser.php |  7 ++-----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 79e467d60..ec9dd670e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -704,25 +704,17 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
 	} /* }}} */
 
 	function printFolderChooser($formName, $accessMode, $exclude = -1, $default = false) { /* {{{ */
-		?>
-		<script language="JavaScript">
-		var openDlg;
-		function chooseFolder<?php print $formName ?>() {
-			openDlg = open("out.FolderChooser.php?form=<?php echo $formName?>&mode=<?php echo $accessMode?>&exclude=<?php echo $exclude?>", "openDlg", "width=480,height=480,scrollbars=yes,resizable=yes,status=yes");
-		}
-		</script>
-		<?php
 		print "<input type=\"hidden\" id=\"targetid".$formName."\" name=\"targetid".$formName."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		print "<div class=\"input-append\">\n";
 		print "<input type=\"text\" id=\"choosefoldersearch\" data-provide=\"typeahead\"  name=\"targetname".$formName."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
 //		print "<button type=\"button\" class=\"btn\" onclick=\"chooseFolder".$formName."(); return false;\">".getMLText("folder")."...</button>";
-		print "<a data-target=\"#folderChooser\" href=\"out.FolderChooser.php?form=".$formName."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n";
+		print "<a data-target=\"#folderChooser".$formName."\" href=\"out.FolderChooser.php?form=".$formName."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n";
 		print "</div>\n";
 ?>
-<div class="modal hide" id="folderChooser" tabindex="-1" role="dialog" aria-labelledby="folderChooserLabel" aria-hidden="true">
+<div class="modal hide" id="folderChooser<?= $formName ?>" tabindex="-1" role="dialog" aria-labelledby="folderChooser<?= $formName ?>Label" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-    <h3 id="folderChooserLabel"><?php printMLText("choose_target_folder") ?></h3>
+    <h3 id="folderChooser<?= $formName ?>Label"><?php printMLText("choose_target_folder") ?></h3>
   </div>
   <div class="modal-body">
     <p>Please wait, until document tree is loaded …</p>
@@ -731,6 +723,13 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
     <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
   </div>
 </div>
+<script language="JavaScript">
+/* Set up a callback which is called when a folder in the tree is selected */
+modalFolderChooser<?= $formName ?> = $('#folderChooser<?= $formName ?>');
+function folderSelectedCallback<?= $formName ?>(id, name) {
+	modalFolderChooser<?= $formName ?>.modal('hide');
+}
+</script>
 <?php
 	} /* }}} */
 
diff --git a/views/bootstrap/class.FolderChooser.php b/views/bootstrap/class.FolderChooser.php
index 8befe26b6..db015536d 100644
--- a/views/bootstrap/class.FolderChooser.php
+++ b/views/bootstrap/class.FolderChooser.php
@@ -52,23 +52,20 @@ function toggleTree(id){
 
 var targetName;
 var targetID;
-
 function folderSelected(id, name) {
 	targetName.value = name;
 	targetID.value = id;
-//	window.close();
-//	return true;
+	if(typeof(folderSelectedCallback<?= $form ?>) !== 'undefined')
+		folderSelectedCallback<?= $form ?>(id, name);
 }
 </script>
 
-
 <?php
 		$this->contentContainerStart();
 		$this->printFoldersTree($mode, $exclude, $rootfolderid);
 		$this->contentContainerEnd();
 ?>
 
-
 <script language="JavaScript">
 targetName = document.<?php echo $form?>.targetname<?php print $form ?>;
 targetID   = document.<?php echo $form?>.targetid<?php print $form ?>;

From e36d4c00947b22316d26dd6c03c970fd48ebfff3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 May 2013 09:27:15 +0200
Subject: [PATCH 3/6] fix approving of documents

The variable $status was overridden in the the status log if logged
in as admin. This causse problems whenever was allow to review/approve
documents. All other users where not affected because the don't see
the status log
---
 views/bootstrap/class.ViewDocument.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 31b1e8614..a6f39a375 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -401,11 +401,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		if($user->isAdmin()) {
 			$this->contentHeading(getMLText("status"));
 			$this->contentContainerStart();
-			$status = $latestContent->getStatusLog();
+			$statuslog = $latestContent->getStatusLog();
 			echo "<table class=\"table table-condensed\"><thead>";
 			echo "<th>".getMLText('date')."</th><th>".getMLText('status')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
 			echo "</thead><tbody>";
-			foreach($status as $entry) {
+			foreach($statuslog as $entry) {
 				if($suser = $dms->getUser($entry['userID']))
 					$fullname = $suser->getFullName();
 				else
@@ -452,7 +452,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "<tr><td colspan=5>\n";
 			$this->contentSubHeading(getMLText("reviewers"));
 			print "</tr>";
-			
+
 			print "<tr>\n";
 			print "<td width='20%'><b>".getMLText("name")."</b></td>\n";
 			print "<td width='20%'><b>".getMLText("last_update")."</b></td>\n";
@@ -505,7 +505,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						print "<li><a href=\"../out/out.ReviewDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-mini\">".getMLText("edit")."</a></li>";
 					}
 				}
-				
+
 				print "</ul></td>\n";	
 				print "</td>\n</tr>\n";
 			}
@@ -561,7 +561,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<td>".htmlspecialchars($a["comment"])."</td>\n";
 				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
-			
+
 				if($accessop->mayApprove()) {
 					if ($is_approver && $status["status"]==S_DRAFT_APP) {
 						print "<li><a class=\"btn btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("submit_approval")."</a></li>";
@@ -569,7 +569,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						print "<li><a class=\"btn btn-mini\" href=\"../out/out.ApproveDocument.php?documentid=".$documentid."&version=".$latestContent->getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."</a></li>";
 					}
 				}
-				
+
 				print "</ul>";
 				print "</td>\n";	
 				print "</td>\n</tr>\n";
@@ -781,10 +781,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				$vstat = $version->getStatus();
 				$workflow = $version->getWorkflow();
 				$workflowstate = $version->getWorkflowState();
-				
+
 				// verify if file exists
 				$file_exists=file_exists($dms->contentDir . $version->getPath());
-				
+
 				print "<tr>\n";
 				print "<td nowrap>";
 				/*
@@ -794,7 +794,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes))
 						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&version=".$version->getVersion()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a>";
 				}else print "<li><img class=\"mimeicon\" src=\"".$this->getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">";
-				
+
 				print "</ul>";
 				*/
 				if ($viewonlinefiletypes && in_array(strtolower($version->getFileType()), $viewonlinefiletypes))
@@ -879,7 +879,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			foreach($files as $file) {
 
 				$file_exists=file_exists($dms->contentDir . $file->getPath());
-				
+
 				$responsibleUser = $file->getUser();
 
 				print "<tr>";
@@ -890,7 +890,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						print "<li><a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$documentid."&file=". $file->getID()."\"><i class=\"icon-star\"></i>" . getMLText("view_online") . "</a></li>";
 				} else print "<li><img class=\"mimeicon\" src=\"images/icons/".$this->getMimeIcon($file->getFileType())."\" title=\"".htmlspecialchars($file->getMimeType())."\">";
 				print "</ul></td>";
-				
+
 				print "<td><ul class=\"unstyled\">\n";
 				print "<li>".htmlspecialchars($file->getName())."</li>\n";
 				print "<li>".htmlspecialchars($file->getOriginalFileName())."</li>\n";
@@ -902,12 +902,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<li>".getLongReadableDate($file->getDate())."</li>";
 
 				print "<td>".htmlspecialchars($file->getComment())."</td>";
-			
+
 				print "<td><span class=\"actions\">";
 				if (($document->getAccessMode($user) == M_ALL)||($file->getUserID()==$user->getID()))
 					print "<form action=\"../out/out.RemoveDocumentFile.php\" method=\"get\"><input type=\"hidden\" name=\"documentid\" value=\"".$documentid."\" /><input type=\"hidden\" name=\"fileid\" value=\"".$file->getID()."\" /><button type=\"submit\" class=\"btn btn-mini\"><i class=\"icon-remove\"></i> ".getMLText("delete")."</button></form>";
 				print "</span></td>";		
-				
+
 				print "</tr>";
 			}
 			print "</tbody>\n</table>\n";	

From 8238ed688e8c3ad5b969976491a78718ea73a12c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 May 2013 09:29:55 +0200
Subject: [PATCH 4/6] add changes for 4.2.2

---
 CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 4ccbc3586..226d14f37 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.2.2
+--------------------------------------------------------------------------------
+- admin can be set as reviewer/approver again and do the review/approval
+- fixed minor layout problem in folder tree (Bug #51)
+- close folder choose dialog when folder is selected (Bug #52)
+
 --------------------------------------------------------------------------------
                      Changes in version 4.2.1
 --------------------------------------------------------------------------------

From 60ea8fccb4d629badba6e6d87c0a640a72af130b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 May 2013 09:31:52 +0200
Subject: [PATCH 5/6] new version 4.2.2

---
 Makefile                           |  2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 24 ++++++++++++++++++++----
 inc/inc.Version.php                |  2 +-
 install/install.php                |  2 +-
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index b5d654491..fc460090c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=4.2.1
+VERSION=4.2.2
 SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install
 #restapi webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 961f58699..b480c9871 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -243,7 +243,7 @@ class SeedDMS_Core_DMS {
 		$this->convertFileTypes = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.2.1';
+			$this->version = '4.2.2';
 	} /* }}} */
 
 	function getDB() { /* {{{ */
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ef7e456b5..f88fa91ad 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,10 +12,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2013-04-30</date>
- <time>07:43:29</time>
+ <date>2013-05-17</date>
+ <time>9:21:37</time>
  <version>
-  <release>4.2.1</release>
+  <release>4.2.2</release>
   <api>4.2.1</api>
  </version>
  <stability>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- fixed bug in SeedDMS_Core_DocumentContent::addIndApp()
+- admins can be added as reviewer/approver again
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -510,6 +510,22 @@ New release
    </stability>
    <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
    <notes>
+- fixed bug in SeedDMS_Core_DocumentContent::addIndApp()
+   </notes>
+  </release>
+  <release>
+   <date>2013-04-30</date>
+   <time>07:43:29</time>
+   <version>
+    <release>4.2.1</release>
+    <api>4.2.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
 - fixed bug in SeedDMS_Core_DocumentContent::addIndApp()
    </notes>
   </release>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index ea6bdcd5c..8cf987df8 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	var $_number = "4.2.1";
+	var $_number = "4.2.2";
 	var $_string = "SeedDMS";
 
 	function SeedDMS_Version() {
diff --git a/install/install.php b/install/install.php
index de2a72eb6..880efd5eb 100644
--- a/install/install.php
+++ b/install/install.php
@@ -116,7 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "4.2.1");
+define("SEEDDMS_VERSION", "4.2.2");
 
 require_once('../inc/inc.ClassSettings.php');
 

From dc35122b10df608dfce6d823e52faa35948b8dc2 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 17 May 2013 09:34:10 +0200
Subject: [PATCH 6/6] fix release time

---
 SeedDMS_Core/package.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index f88fa91ad..5ce494f37 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -13,7 +13,7 @@
   <active>yes</active>
  </lead>
  <date>2013-05-17</date>
- <time>9:21:37</time>
+ <time>09:21:37</time>
  <version>
   <release>4.2.2</release>
   <api>4.2.1</api>