Merge branch 'seeddms-4.1.3'

CHANGELOG

@@ -1,3 +1,11 @@
+--------------------------------------------------------------------------------
+                     Changes in version 4.1.3
+--------------------------------------------------------------------------------
+- fixed setting document link (no more PHP fatal error)
+- fixed typo in variable name which cause a PHP warning when sending the
+  notification mail after updating a folder comment
+- fixed code to determine required approver and reviewer
+
 --------------------------------------------------------------------------------
                      Changes in version 4.1.2
 --------------------------------------------------------------------------------

Makefile

@@ -1,4 +1,4 @@
-VERSION=4.1.2
+VERSION=4.1.3
 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
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -225,7 +225,7 @@ class SeedDMS_Core_DMS {
 		$this->convertFileTypes = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.1.2';
+			$this->version = '4.1.3';
 	} /* }}} */
 
 	function getDB() { /* {{{ */

SeedDMS_Core/package.xml

@@ -12,10 +12,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2013-04-05</date>
+ <date>2013-04-08</date>
- <time>16:08:38</time>
+ <time>16:45:06</time>
  <version>
-  <release>4.1.2</release>
+  <release>4.1.3</release>
   <api>4.1.0</api>
  </version>
  <stability>
@@ -24,7 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- set propper folderList of sub folders after moving a folder
+- stay in sync with seeddms application
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -465,5 +465,21 @@ New release
 - stay in sync with seeddms application
    </notes>
   </release>
+  <release>
+   <date>2013-04-05</date>
+   <time>16:08:38</time>
+   <version>
+    <release>4.1.2</release>
+    <api>4.1.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- set propper folderList of sub folders after moving a folder
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.Utils.php

@@ -326,7 +326,7 @@ function _add_log_line($msg="") { /* {{{ */
 function filterDocumentLinks($user, $links) { /* {{{ */
 	$tmp = array();
 	foreach ($links as $link)
-		if ($link->isPublic() || ($link->getUser()->getID == $user->getID()) || $user->isAdmin())
+		if ($link->isPublic() || ($link->getUser()->getID() == $user->getID()) || $user->isAdmin())
 			array_push($tmp, $link);
 	return $tmp;
 } /* }}} */

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	var $_number = "4.1.2";
+	var $_number = "4.1.3";
 	var $_string = "SeedDMS";
 
 	function SeedDMS_Version() {

op/op.EditFolder.php

@@ -134,7 +134,7 @@ if(($oldcomment = $folder->getComment()) != $comment) {
 			$params['name'] = $folder->getName();
 			$params['folder_path'] = $folder->getFolderPathPlain();
 			$params['old_comment'] = $oldcomment;
-			$params['comment'] = $dcomment;
+			$params['comment'] = $comment;
 			$params['username'] = $user->getFullName();
 			$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
 			$params['sitename'] = $settings->_siteName;

views/blue/class.ViewDocument.php

@@ -299,7 +299,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Blue_Style {
 					case 0: // Approver is an individual.
 						$required = $dms->getUser($a["required"]);
 						if (!is_object($required)) {
-							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
+							$reqName = getMLText("unknown_user")." '".$a["required"]."'";
 						}
 						else {
 							$reqName = htmlspecialchars($required->getFullName());
@@ -310,7 +310,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Blue_Style {
 					case 1: // Approver is a group.
 						$required = $dms->getGroup($a["required"]);
 						if (!is_object($required)) {
-							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
+							$reqName = getMLText("unknown_group")." '".$a["required"]."'";
 						}
 						else {
 							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";

views/bootstrap/class.ViewDocument.php

@@ -493,7 +493,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					case 0: // Approver is an individual.
 						$required = $dms->getUser($a["required"]);
 						if (!is_object($required)) {
-							$reqName = getMLText("unknown_user")." '".$r["required"]."'";
+							$reqName = getMLText("unknown_user")." '".$a["required"]."'";
 						}
 						else {
 							$reqName = htmlspecialchars($required->getFullName());
@@ -504,7 +504,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					case 1: // Approver is a group.
 						$required = $dms->getGroup($a["required"]);
 						if (!is_object($required)) {
-							$reqName = getMLText("unknown_group")." '".$r["required"]."'";
+							$reqName = getMLText("unknown_group")." '".$a["required"]."'";
 						}
 						else {
 							$reqName = "<i>".htmlspecialchars($required->getName())."</i>";