From c1144612ab07c7d59022b70dc84a26b4ce5da0bf Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 08:51:44 +0200 Subject: [PATCH 1/6] fix typo in variable for new comment --- op/op.EditFolder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php index 6c3dd2404..b6418a0d3 100644 --- a/op/op.EditFolder.php +++ b/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; From 98450f2abfcb64ef84357088db612ff731749fe9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 09:09:44 +0200 Subject: [PATCH 2/6] fix code to check if user is required for approval or review --- views/blue/class.ViewDocument.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/blue/class.ViewDocument.php b/views/blue/class.ViewDocument.php index a157f64f3..649edf329 100644 --- a/views/blue/class.ViewDocument.php +++ b/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 = "".htmlspecialchars($required->getName()).""; From 0565e9c55dd41e23a96545e5db53e228ffb4946e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 09:12:56 +0200 Subject: [PATCH 3/6] fix code to determine if user is required for review --- views/bootstrap/class.ViewDocument.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index b9faf82a9..33ad75eaa 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/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 = "".htmlspecialchars($required->getName()).""; From ca5705d086470eb1f88bb5261839292c34323f66 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 09:13:36 +0200 Subject: [PATCH 4/6] fix calling getID() of user added a document link --- inc/inc.Utils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index 2492d4174..f5340f320 100644 --- a/inc/inc.Utils.php +++ b/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; } /* }}} */ From 347b95bd6b942e4ac0bf2442d09c708ee96ed123 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 09:15:08 +0200 Subject: [PATCH 5/6] added changes for 4.1.3 --- CHANGELOG | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 43c66a3c6..c8c127d04 100644 --- a/CHANGELOG +++ b/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 -------------------------------------------------------------------------------- From be7e8f9a9363a542988e4208bceadc5611a5b724 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 16:48:49 +0200 Subject: [PATCH 6/6] new version 4.1.3 --- Makefile | 2 +- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- SeedDMS_Core/package.xml | 24 ++++++++++++++++++++---- inc/inc.Version.php | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8de0257d2..a6948766a 100644 --- a/Makefile +++ b/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 diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 041d329bd..dee5164a4 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/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() { /* {{{ */ diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 5ff2f3bd7..93bf65580 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,10 +12,10 @@ uwe@steinmann.cx yes - 2013-04-05 - + 2013-04-08 + - 4.1.2 + 4.1.3 4.1.0 @@ -24,7 +24,7 @@ GPL License -- set propper folderList of sub folders after moving a folder +- stay in sync with seeddms application @@ -465,5 +465,21 @@ New release - stay in sync with seeddms application + + 2013-04-05 + + + 4.1.2 + 4.1.0 + + + stable + stable + + GPL License + +- set propper folderList of sub folders after moving a folder + + diff --git a/inc/inc.Version.php b/inc/inc.Version.php index fbf4927d0..0fc1809e3 100644 --- a/inc/inc.Version.php +++ b/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() {