From 24ef83d55b24568408d3331a8bd94bbdc1246746 Mon Sep 17 00:00:00 2001 From: Jonas Raoni Soares da Silva Date: Tue, 30 May 2023 21:41:22 +0300 Subject: [PATCH 1/4] Replaced outdated code --- .../csv/CSVImportExportPlugin.php | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/plugins/importexport/csv/CSVImportExportPlugin.php b/plugins/importexport/csv/CSVImportExportPlugin.php index b0e0976f78b..2307865204e 100644 --- a/plugins/importexport/csv/CSVImportExportPlugin.php +++ b/plugins/importexport/csv/CSVImportExportPlugin.php @@ -21,10 +21,8 @@ use APP\publicationFormat\PublicationFormatDAO; use APP\submission\Submission; use APP\template\TemplateManager; -use PKP\core\Core; use PKP\db\DAORegistry; use PKP\file\FileManager; -use PKP\file\TemporaryFileManager; use PKP\plugins\ImportExportPlugin; use PKP\security\Role; use PKP\submission\GenreDAO; @@ -160,7 +158,7 @@ public function executeCLI($scriptName, &$args) if (in_array($locale, $supportedLocales)) { $submission = Repo::submission()->newDataObject(); $submission->setContextId($press->getId()); - $submission->setUserId($user->getId()); + $submission->setData('uploaderUserId', $user->getId()); $submission->stampLastActivity(); $submission->setStatus(PKPSubmission::STATUS_PUBLISHED); $submission->setWorkType($isEditedVolume == 1 ? Submission::WORK_TYPE_EDITED_VOLUME : Submission::WORK_TYPE_AUTHORED_WORK); @@ -218,7 +216,6 @@ public function executeCLI($scriptName, &$args) $publicationFormat->setPhysicalFormat(false); $publicationFormat->setIsApproved(true); $publicationFormat->setIsAvailable(true); - $publicationFormat->setSubmissionId($submissionId); $publicationFormat->setProductAvailabilityCode('20'); // ONIX code for Available. $publicationFormat->setEntryKey('DA'); // ONIX code for Digital $publicationFormat->setData('name', 'PDF', $submission->getLocale()); @@ -240,30 +237,32 @@ public function executeCLI($scriptName, &$args) $publicationDateDao->insertObject($publicationDate); // Submission File. - $temporaryFileManager = new TemporaryFileManager(); - $temporaryFilename = tempnam($temporaryFileManager->getBasePath(), 'remote'); - $temporaryFileManager->copyFile($pdfUrl, $temporaryFilename); + $fileManager = new FileManager(); + $extension = $fileManager->parseFileExtension($_FILES['uploadedFile']['name']); + $submissionDir = Repo::submissionFile()->getSubmissionDir($press->getId(), $submissionId); + /** @var PKPFileService */ + $fileService = Services::get('file'); + $fileId = $fileService->add( + $pdfUrl, + $submissionDir . '/' . uniqid() . '.' . $extension + ); $submissionFile = $submissionFileDao->newDataObject(); $submissionFile->setData('submissionId', $submissionId); $submissionFile->setSubmissionLocale($submission->getLocale()); $submissionFile->setGenreId($genre->getId()); $submissionFile->setFileStage(SubmissionFile::SUBMISSION_FILE_PROOF); - $submissionFile->setDateUploaded(Core::getCurrentDate()); - $submissionFile->setDateModified(Core::getCurrentDate()); $submissionFile->setAssocType(Application::ASSOC_TYPE_REPRESENTATION); $submissionFile->setData('assocId', $publicationFormatId); $submissionFile->setData('mimetype', 'application/pdf'); + $submissionFile->setData('fileId', $fileId); // Assume open access, no price. $submissionFile->setDirectSalesPrice(0); $submissionFile->setSalesType('openAccess'); Repo::submissionFile() - ->add($submissionFile, $temporaryFilename); - - $fileManager = new FileManager(); - $fileManager->deleteByPath($temporaryFilename); + ->add($submissionFile); echo __('plugins.importexport.csv.import.submission', ['title' => $title]) . "\n"; } else { From 7e0344cdb4e47e15270b1ad70334b5033ace5999 Mon Sep 17 00:00:00 2001 From: Jonas Raoni Soares da Silva Date: Tue, 30 May 2023 21:42:07 +0300 Subject: [PATCH 2/4] Fixed/improved returns --- classes/notification/NotificationManager.php | 1 - classes/spotlight/SpotlightDAO.php | 2 +- pages/manageCatalog/ManageCatalogHandler.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/classes/notification/NotificationManager.php b/classes/notification/NotificationManager.php index d222527b8a6..bc43a126abe 100644 --- a/classes/notification/NotificationManager.php +++ b/classes/notification/NotificationManager.php @@ -118,7 +118,6 @@ public function getNotificationTypeByEditorDecision(Decision $decision): ?int default: return parent::getNotificationTypeByEditorDecision($decision); } - return null; } } diff --git a/classes/spotlight/SpotlightDAO.php b/classes/spotlight/SpotlightDAO.php index f99287a521a..c3818a5fd0a 100644 --- a/classes/spotlight/SpotlightDAO.php +++ b/classes/spotlight/SpotlightDAO.php @@ -187,7 +187,7 @@ public function updateObject($spotlight) */ public function deleteObject($spotlight) { - return $this->deleteById($spotlight->getId()); + $this->deleteById($spotlight->getId()); } /** diff --git a/pages/manageCatalog/ManageCatalogHandler.php b/pages/manageCatalog/ManageCatalogHandler.php index 84c356b230f..5dcc64eceba 100644 --- a/pages/manageCatalog/ManageCatalogHandler.php +++ b/pages/manageCatalog/ManageCatalogHandler.php @@ -147,6 +147,6 @@ public function index($args, $request) 'catalog' => $catalogList->getConfig() ] ]); - return $templateMgr->display('manageCatalog/index.tpl'); + $templateMgr->display('manageCatalog/index.tpl'); } } From fbdc3ca35b48f40e14b7191ba03e11a3e490a583 Mon Sep 17 00:00:00 2001 From: Jonas Raoni Soares da Silva Date: Tue, 30 May 2023 21:50:48 +0300 Subject: [PATCH 3/4] Replaced is_a() by a more specific instanceof check --- .../grid/catalogEntry/PublicationFormatGridCellProvider.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/grid/catalogEntry/PublicationFormatGridCellProvider.php b/controllers/grid/catalogEntry/PublicationFormatGridCellProvider.php index 2153c22ccbf..27054cbfce1 100644 --- a/controllers/grid/catalogEntry/PublicationFormatGridCellProvider.php +++ b/controllers/grid/catalogEntry/PublicationFormatGridCellProvider.php @@ -17,6 +17,7 @@ namespace APP\controllers\grid\catalogEntry; use APP\core\Application; +use APP\publicationFormat\PublicationFormat; use PKP\controllers\api\file\linkAction\AddFileLinkAction; use PKP\controllers\grid\DataObjectGridCellProvider; use PKP\controllers\grid\files\fileList\linkAction\SelectFilesLinkAction; @@ -97,8 +98,7 @@ public function getTemplateVarsFromRowColumn($row, $column) { $data = $row->getData(); - if (is_a($data, 'Representation')) { - /** @var Representation $data */ + if ($data instanceof PublicationFormat) { switch ($column->getId()) { case 'indent': return []; case 'name': @@ -151,7 +151,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler: { $data = $row->getData(); $router = $request->getRouter(); - if (is_a($data, 'Representation')) { + if ($data instanceof PublicationFormat) { switch ($column->getId()) { case 'isAvailable': return [new LinkAction( From d20ae24e8dd8d3258047e5f805731456d517ccaa Mon Sep 17 00:00:00 2001 From: Jonas Raoni Soares da Silva Date: Tue, 30 May 2023 21:51:06 +0300 Subject: [PATCH 4/4] Submodule update ##jonasraoni/bugfix/main/minor-fixes## --- lib/pkp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pkp b/lib/pkp index 1e66eccb0a3..7f21cf1b46d 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 1e66eccb0a36ca1fbaf56b25ecc61d3a36829702 +Subproject commit 7f21cf1b46d8eb84f011634d752414303b493f00