From 5351bd9596fe02c0c8a830d22e28538eeef33a07 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 30 Nov 2015 20:45:03 +0100 Subject: [PATCH] create checkout filename from id, version and name --- SeedDMS_Core/Core/inc.ClassDocument.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 1479429de..5a25d6921 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -803,7 +803,14 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */ $lc = self::getLatestContent(); - $filename = $checkoutdir."/".$lc->getOriginalFileName(); + $ext = pathinfo($this->getName(), PATHINFO_EXTENSION); + $oext = pathinfo($lc->getOriginalFileName(), PATHINFO_EXTENSION); + if($ext == $oext) + $filename = preg_replace('/[^A-Za-z0-9_.-]/', '_', $this->getName()); + else { + $filename = preg_replace('/[^A-Za-z0-9_-]/', '_', $this->getName()).'.'.$oext; + } + $filename = $checkoutdir.$this->getID().'-'.$lc->getVersion().'-'.$filename; //$lc->getOriginalFileName(); $queryStr = "INSERT INTO tblDocumentCheckOuts (document, version, userID, date, filename) VALUES (".$this->_id.", ".$lc->getVersion().", ".$user->getID().", ".$db->getCurrentDatetime().", ".$db->qstr($filename).")"; if (!$db->getResult($queryStr)) return false;