From 92279dcaf4316356a3ebcb9a8071e3240b0a2101 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 30 Jan 2015 08:18:52 +0100 Subject: [PATCH 1/4] minor change in html structure --- views/bootstrap/class.AddDocument.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index ef69d5b3c..96b2d1e64 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -102,13 +102,17 @@ $(document).ready(function() { // Retrieve a list of all users and groups that have review / approve // privileges. $docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp); - $this->contentSubHeading(getMLText("document_infos")); ?>
+ + + From 8963879f5dc34055d7f007c938c4383b4ab8ccc4 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Feb 2015 07:41:33 +0100 Subject: [PATCH 2/4] htmlencode() the complete content in deletion dialog this used to be just the filename, but translations of the text may also contain qoutes which break the javascript --- views/bootstrap/class.Bootstrap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 58bb1204e..90bb6dedd 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1352,7 +1352,7 @@ $('#delete-document-btn-".$docid."').popover({ title: '".getMLText("rm_document")."', placement: 'left', html: true, - content: \"
".getMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName(), ENT_QUOTES)))."
\"}); + content: \"
".htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES)."
\"}); "); if($return) return $content; @@ -1381,7 +1381,7 @@ $('#delete-folder-btn-".$folderid."').popover({ title: '".getMLText("rm_folder")."', placement: 'left', html: true, - content: \"
".getMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName(), ENT_QUOTES)))."
\"}); + content: \"
".htmlspecialchars(getMLText("confirm_rm_folder", array ("foldername" => $folder->getName())), ENT_QUOTES)."
\"}); "); if($return) return $content; From b04aecd7f38b12dcc3a4ef6a09e4d27f1485bdf5 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Feb 2015 09:35:05 +0100 Subject: [PATCH 3/4] fix objects returned by SeedDMS_Core_DMS::getAllUsers() they have lanuage und theme set again --- SeedDMS_Core/Core/inc.ClassDMS.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 5e313802f..c26f45d8b 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1221,7 +1221,7 @@ class SeedDMS_Core_DMS { $users = array(); for ($i = 0; $i < count($resArr); $i++) { - $user = new SeedDMS_Core_User($resArr[$i]["id"], $resArr[$i]["login"], $resArr[$i]["pwd"], $resArr[$i]["fullName"], $resArr[$i]["email"], (isset($resArr["language"])?$resArr["language"]:NULL), (isset($resArr["theme"])?$resArr["theme"]:NULL), $resArr[$i]["comment"], $resArr[$i]["role"], $resArr[$i]["hidden"], $resArr[$i]["disabled"], $resArr[$i]["pwdExpiration"], $resArr[$i]["loginfailures"], $resArr[$i]["quota"]); + $user = new SeedDMS_Core_User($resArr[$i]["id"], $resArr[$i]["login"], $resArr[$i]["pwd"], $resArr[$i]["fullName"], $resArr[$i]["email"], (isset($resArr[$i]["language"])?$resArr[$i]["language"]:NULL), (isset($resArr[$i]["theme"])?$resArr[$i]["theme"]:NULL), $resArr[$i]["comment"], $resArr[$i]["role"], $resArr[$i]["hidden"], $resArr[$i]["disabled"], $resArr[$i]["pwdExpiration"], $resArr[$i]["loginfailures"], $resArr[$i]["quota"]); $user->setDMS($this); $users[$i] = $user; } From 1bb931a629948b5abd62879651d89e746250f5fa Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Feb 2015 09:36:01 +0100 Subject: [PATCH 4/4] new version 4.3.15 --- SeedDMS_Core/package.xml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 90852c87a..dc1540ca7 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2015-01-29 + 2015-02-05 - 4.3.14 - 4.3.14 + 4.3.15 + 4.3.15 stable @@ -24,8 +24,7 @@ GPL License -- add missing start transaction in SeedDMD_Core_Folder::remove() -- SeedDMD_Core_Folder::isSubFolder() doesn't compare object instances anymore (Bug #194) +users returned by SeedDMS_Core_DMS::getAllUsers() have language and theme set again @@ -769,5 +768,20 @@ new release - new methode SeedDMS_Core_Document::replaceContent() which replaces the content of a version. + + + 4.3.14 + 4.3.14 + + + stable + stable + + GPL License + +- add missing start transaction in SeedDMD_Core_Folder::remove() +- SeedDMD_Core_Folder::isSubFolder() doesn't compare object instances anymore (Bug #194) + +
+ contentSubHeading(getMLText("document_infos")); ?> +
: