From 5c53fc69c7bfa6487fb2bf8c4113705179713305 Mon Sep 17 00:00:00 2001 From: Saagar Arya Date: Thu, 28 Mar 2024 14:53:56 -0400 Subject: [PATCH 1/6] [Publication] Fix baseurl missing from emails --- modules/publication/ajax/FileUpload.php | 13 +++++++------ modules/publication/jsx/uploadForm.js | 5 ++++- modules/publication/jsx/viewProject.js | 6 +++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/publication/ajax/FileUpload.php b/modules/publication/ajax/FileUpload.php index 9cec2979205..e11882e5b3f 100644 --- a/modules/publication/ajax/FileUpload.php +++ b/modules/publication/ajax/FileUpload.php @@ -138,7 +138,7 @@ function uploadPublication() : void showPublicationError($e->getMessage(), 500); } - notify($pubID, 'submission'); + notify($pubID, 'submission', $_POST['baseURL']); } /** @@ -431,7 +431,7 @@ function cleanup(int $pubID) : void * * @return void */ -function notify($pubID, $type) : void +function notify($pubID, $type, $baseURL) : void { $acceptedTypes = [ 'submission', @@ -464,12 +464,11 @@ function notify($pubID, $type) : void ); throw new \LorisException('Invalid publication ID specified.'); } - $url = \NDB_Factory::singleton()->settings()->getBaseURL(); $emailData['Title'] = $data['Title']; $emailData['Date'] = $data['DateProposed']; $emailData['User'] = $user->getFullname(); - $emailData['URL'] = $url . '/publication/view_project/?id='.$pubID; + $emailData['URL'] = $baseURL . '/publication/view_project/?id='.$pubID; $emailData['ProjectName'] = $config->getSetting('prefix'); $Notifier = new \NDB_Notifier( "publication", @@ -511,6 +510,8 @@ function notify($pubID, $type) : void */ function editProject() : void { + + error_log(print_r($_POST, true)); $db = \NDB_Factory::singleton()->database(); $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null; @@ -618,10 +619,10 @@ function editProject() : void processFiles($id); // if publication status is changed, send review email if (isset($toUpdate['PublicationStatusID'])) { - notify($id, 'review'); + notify($id, 'review', $_POST['baseURL']); } else { // otherwise send edit email - notify($id, 'edit'); + notify($id, 'edit', $_POST['baseURL']); } if (!empty($toUpdate)) { $db->update( diff --git a/modules/publication/jsx/uploadForm.js b/modules/publication/jsx/uploadForm.js index ebb28285006..8cb845cd358 100644 --- a/modules/publication/jsx/uploadForm.js +++ b/modules/publication/jsx/uploadForm.js @@ -158,7 +158,10 @@ class PublicationUploadForm extends React.Component { ); return; } - let formData = this.state.formData; + let formData = { + ...this.state.formData, + baseURL: loris.BaseURL + }; let formObj = new FormData(); for (let key in formData) { diff --git a/modules/publication/jsx/viewProject.js b/modules/publication/jsx/viewProject.js index b479ba224f9..dfaca55bbec 100644 --- a/modules/publication/jsx/viewProject.js +++ b/modules/publication/jsx/viewProject.js @@ -54,7 +54,11 @@ class ViewProject extends React.Component { ); return; } - let formData = this.state.formData; + let formData = { + ...this.state.formData, + baseURL: loris.BaseURL + }; + let formObj = new FormData(); for (let key in formData) { if (formData.hasOwnProperty(key) && formData[key] !== '') { From ac29049e8e112576dc2a12d4b014eb2a73b39955 Mon Sep 17 00:00:00 2001 From: Saagar Arya Date: Thu, 28 Mar 2024 14:55:52 -0400 Subject: [PATCH 2/6] Remove erroneous error_log --- modules/publication/ajax/FileUpload.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/publication/ajax/FileUpload.php b/modules/publication/ajax/FileUpload.php index e11882e5b3f..7fcadf9d606 100644 --- a/modules/publication/ajax/FileUpload.php +++ b/modules/publication/ajax/FileUpload.php @@ -511,7 +511,6 @@ function notify($pubID, $type, $baseURL) : void function editProject() : void { - error_log(print_r($_POST, true)); $db = \NDB_Factory::singleton()->database(); $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null; From 113fe0d889d18864499ea5567bcf420ef7fd5b5a Mon Sep 17 00:00:00 2001 From: Saagar Arya Date: Thu, 28 Mar 2024 15:01:57 -0400 Subject: [PATCH 3/6] Remove extra space added --- modules/publication/ajax/FileUpload.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/publication/ajax/FileUpload.php b/modules/publication/ajax/FileUpload.php index 7fcadf9d606..f7d391749f3 100644 --- a/modules/publication/ajax/FileUpload.php +++ b/modules/publication/ajax/FileUpload.php @@ -510,7 +510,6 @@ function notify($pubID, $type, $baseURL) : void */ function editProject() : void { - $db = \NDB_Factory::singleton()->database(); $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : null; From 118ee8d6b4c07a7699ff2cd7bf0a8cb7b14bbf83 Mon Sep 17 00:00:00 2001 From: Saagar Arya Date: Thu, 28 Mar 2024 15:18:32 -0400 Subject: [PATCH 4/6] Add php doc comment --- modules/publication/ajax/FileUpload.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/publication/ajax/FileUpload.php b/modules/publication/ajax/FileUpload.php index f7d391749f3..3e0b7ccc68b 100644 --- a/modules/publication/ajax/FileUpload.php +++ b/modules/publication/ajax/FileUpload.php @@ -428,6 +428,7 @@ function cleanup(int $pubID) : void * * @param int $pubID publication ID * @param string $type The notification type i.e., submission|edit|review + * @param string $baseURL the base URL of the loris site * * @return void */ From b45422750b48f5300d4db28ca0a93a128f1a02ee Mon Sep 17 00:00:00 2001 From: Saagar Arya <51128536+skarya22@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:55:16 -0400 Subject: [PATCH 5/6] Fix for phpcs --- modules/publication/ajax/FileUpload.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/publication/ajax/FileUpload.php b/modules/publication/ajax/FileUpload.php index 3e0b7ccc68b..382e8dca285 100644 --- a/modules/publication/ajax/FileUpload.php +++ b/modules/publication/ajax/FileUpload.php @@ -426,8 +426,8 @@ function cleanup(int $pubID) : void /** * Send out email notifications for project submission * - * @param int $pubID publication ID - * @param string $type The notification type i.e., submission|edit|review + * @param int $pubID publication ID + * @param string $type The notification type i.e., submission|edit|review * @param string $baseURL the base URL of the loris site * * @return void From 8e499013595678a72ab496ba3b3d5fa3b718d936 Mon Sep 17 00:00:00 2001 From: Saagar Arya Date: Tue, 16 Apr 2024 09:19:54 -0400 Subject: [PATCH 6/6] Add missing trailing commas --- modules/publication/jsx/uploadForm.js | 2 +- modules/publication/jsx/viewProject.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/publication/jsx/uploadForm.js b/modules/publication/jsx/uploadForm.js index 8cb845cd358..e4dcbe359c2 100644 --- a/modules/publication/jsx/uploadForm.js +++ b/modules/publication/jsx/uploadForm.js @@ -160,7 +160,7 @@ class PublicationUploadForm extends React.Component { } let formData = { ...this.state.formData, - baseURL: loris.BaseURL + baseURL: loris.BaseURL, }; let formObj = new FormData(); diff --git a/modules/publication/jsx/viewProject.js b/modules/publication/jsx/viewProject.js index dfaca55bbec..5610bd8e791 100644 --- a/modules/publication/jsx/viewProject.js +++ b/modules/publication/jsx/viewProject.js @@ -56,7 +56,7 @@ class ViewProject extends React.Component { } let formData = { ...this.state.formData, - baseURL: loris.BaseURL + baseURL: loris.BaseURL, }; let formObj = new FormData();