From 15c5ef1441b45cb02879ece6fde308bc9af285b2 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Sep 2024 15:33:19 +0200 Subject: [PATCH 1/5] do not treat repository url like a directory name --- op/op.Settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op/op.Settings.php b/op/op.Settings.php index b522be3fe..48743a2e0 100644 --- a/op/op.Settings.php +++ b/op/op.Settings.php @@ -182,7 +182,7 @@ if ($action == "saveSettings") setDirValue("extraPath"); setDirValue("dropFolderDir"); setDirValue("backupDir"); - setDirValue("repositoryUrl"); + setStrValue("repositoryUrl"); setDirValue("proxyUrl"); setDirValue("proxyUser"); setDirValue("proxyPassword"); From f97c42f9b70f72499ab293ba107eddc245541276 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Sep 2024 16:00:17 +0200 Subject: [PATCH 2/5] use rename() on windows when moving an extension to its final destination --- inc/inc.ClassExtensionMgr.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/inc/inc.ClassExtensionMgr.php b/inc/inc.ClassExtensionMgr.php index 5cd4f1f4c..22eda0f75 100644 --- a/inc/inc.ClassExtensionMgr.php +++ b/inc/inc.ClassExtensionMgr.php @@ -565,12 +565,16 @@ class SeedDMS_Extension_Mgr { * location and leave the extracted archive in place. The next time an * extension is imported the last extracted archive will be removed. */ -// if(!rename($newdir, $this->extdir ."/". $extname)) { - if(false === exec('mv '.escapeshellarg($newdir).' '.escapeshellarg($this->extdir."/".$extname))) { + if(strpos(PHP_OS, 'WIN') === 0) + $ret = rename($newdir, $this->extdir ."/". $extname); + else + $ret = exec('mv '.escapeshellarg($newdir).' '.escapeshellarg($this->extdir."/".$extname)); + if(false === $ret) { /* If copy didn't succeed, then there is probably nothing to delete, * but do it anyway, just to be sure not just parts of the extension * has been copied. */ + $this->errmsgs[] = "Cannot move temp. extension directory to final destination"; $this->rrmdir($this->extdir ."/". $extname); return false; } From 2c8054512b473b797d8fb7f5f384d8d98d6008ff Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 2 Sep 2024 16:00:32 +0200 Subject: [PATCH 3/5] add changes for 5.1.36 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2090e092e..696469d49 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,9 @@ - fix bugs when importing files from filesystem with metadata, better logging - fix potential xss attack when showing log file - support for different storage of documents (not yet used) +- do not treat repository url like a directory name (will no longer add a + directory seperator) +- use rename() on windows when moving an extension to its final destination -------------------------------------------------------------------------------- Changes in version 5.1.35 From 36477ca71d51346c7b742ec20873151e21686c12 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 4 Sep 2024 22:07:49 +0200 Subject: [PATCH 4/5] fix typo --- inc/inc.ClassLdapAuthentication.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassLdapAuthentication.php b/inc/inc.ClassLdapAuthentication.php index 99234bd98..0f2ab27c1 100644 --- a/inc/inc.ClassLdapAuthentication.php +++ b/inc/inc.ClassLdapAuthentication.php @@ -170,7 +170,7 @@ class SeedDMS_LdapAuthentication extends SeedDMS_Authentication { if($settings->_enableLoginByEmail) { $ldapsearchterm = "|(".$ldapsearchterm.")(mail=".$username.")"; } - /* If a ldap filter is set, it will be anded */ + /* If a ldap filter is set, it will be added */ if($settings->_ldapFilter) { $ldapsearchterm = "&(".$ldapsearchterm.")".$settings->_ldapFilter; } From 77cdca3fe351f8189db25bc0529b7e322e141e06 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 5 Sep 2024 16:07:49 +0200 Subject: [PATCH 5/5] =?UTF-8?q?chzn-select=20need=D1=95=20data-placeholder?= =?UTF-8?q?=20if=20data-allow-clear=20is=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- views/bootstrap/class.Settings.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 330ac5baa..3b8399214 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -636,9 +636,10 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk)) break; case 'select': $allowempty = empty($conf['allow_empty']) ? false : $conf['allow_empty']; + $multiple = empty($conf['multiple']) ? false : $conf['multiple']; if(!empty($conf['options'])) { $selections = empty($settings->_extensions[$extname][$confkey]) ? array() : explode(",", $settings->_extensions[$extname][$confkey]); - echo ""; if(is_array($conf['options'])) { $options = $conf['options']; } elseif(is_string($conf['options']) && $conf['options'] == 'hook') { @@ -661,7 +662,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk)) case "categories": $categories = $dms->getDocumentCategories(); if($categories) { - echo ""; if($allowempty) echo ""; foreach($categories as $category) {