I5717 email composer

api/v1/_email/PKPEmailHandler.inc.php

@@ -27,7 +27,7 @@
 
 class PKPEmailHandler extends APIHandler
 {
- /** Number of emails to send in each job */
+ /** @var int Number of emails to send in each job */
  public const EMAILS_PER_JOB = 100;
 
  /**

api/v1/_library/PKPLibraryHandler.inc.php

@@ -0,0 +1,145 @@
+<?php
+
+/**
+ * @file api/v1/_library/PKPLibraryHandler.inc.php
+ *
+ * Copyright (c) 2014-2021 Simon Fraser University
+ * Copyright (c) 2003-2021 John Willinsky
+ * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
+ *
+ * @class PKPLibraryHandler
+ * @ingroup api_v1_announcement
+ *
+ * @brief Handle API requests for announcement operations.
+ *
+ */
+
+use APP\core\Application;
+use APP\core\Services;
+use APP\file\LibraryFileManager;
+use PKP\context\LibraryFile;
+use PKP\context\LibraryFileDAO;
+use PKP\core\APIResponse;
+use PKP\db\DAORegistry;
+use PKP\db\DAOResultFactory;
+use PKP\handler\APIHandler;
+use PKP\security\authorization\PolicySet;
+use PKP\security\authorization\RoleBasedHandlerOperationPolicy;
+use PKP\security\authorization\SubmissionAccessPolicy;
+use PKP\security\Role;
+
+use Psr\Http\Message\ServerRequestInterface;
+
+class PKPLibraryHandler extends APIHandler
+{
+ public function __construct()
+ {
+ $this->_handlerPath = '_library';
+ $this->_endpoints = [
+ 'GET' => [
+ [
+ 'pattern' => $this->getEndpointPattern(),
+ 'handler' => [$this, 'getLibrary'],
+ 'roles' => [Role::ROLE_ID_SITE_ADMIN, Role::ROLE_ID_MANAGER, Role::ROLE_ID_SUB_EDITOR],
+ ],
+ ],
+ ];
+ parent::__construct();
+
+ }
+
+ /**
+ * @copydoc PKPHandler::authorize
+ */
+ public function authorize($request, &$args, $roleAssignments)
+ {
+ $rolePolicy = new PolicySet(PolicySet::COMBINING_PERMIT_OVERRIDES);
+
+ foreach ($roleAssignments as $role => $operations) {
+ $rolePolicy->addPolicy(new RoleBasedHandlerOperationPolicy($request, $role, $operations));
+ }
+ $this->addPolicy($rolePolicy);
+
+ if ($request->getUserVar('includeSubmissionId')) {
+ $this->addPolicy(new SubmissionAccessPolicy($request, $args, $roleAssignments, 'includeSubmissionId'));
+ }
+
+ return parent::authorize($request, $args, $roleAssignments);
+ }
+
+ /**
+ * Get a list of all files in the library
+ *
+ * @param array $args arguments
+ *
+ * @return APIResponse
+ */
+ public function getLibrary(ServerRequestInterface $slimRequest, APIResponse $response, array $args)
+ {
+ /** @var LibraryFileDAO $libraryFileDao */
+ $libraryFileDao = DAORegistry::getDAO('LibraryFileDAO');
+ $submission = $this->getAuthorizedContextObject(Application::ASSOC_TYPE_SUBMISSION);
+ $context = $this->getRequest()->getContext();
+ $contextId = $context->getId();
+ $libraryFileManager = new LibraryFileManager($contextId);
+
+ $files = [];
+
+ $params = $slimRequest->getQueryParams();
+ if (isset($params['includeSubmissionId'])) {
+ /** @var DAOResultFactory $result */
+ $result = $libraryFileDao->getBySubmissionId($submission->getId());
+ /** @var LibraryFile $file */
+ while ($file = $result->next()) {
+ $files[] = $this->fileToResponse($file, $libraryFileManager);
+ }
+ }
+
+ /** @var DAOResultFactory $result */
+ $result = $libraryFileDao->getByContextId($contextId);
+ /** @var LibraryFile $file */
+ while ($file = $result->next()) {
+ $files[] = $this->fileToResponse($file, $libraryFileManager);
+ }
+
+ return $response->withJson([
+ 'items' => $files,
+ 'itemsMax' => count($files),
+ ], 200);
+ }
+
+ /**
+ * Convert a file object to the JSON response object
+ */
+ protected function fileToResponse(LibraryFile $file, LibraryFileManager $libraryFileManager): array
+ {
+ $request = Application::get()->getRequest();
+
+ $urlArgs = [
+ 'libraryFileId' => $file->getId(),
+ ];
+ if ($file->getSubmissionId()) {
+ $urlArgs['submissionId'] = $file->getSubmissionId();
+ }
+
+ return [
+ 'id' => $file->getId(),
+ 'filename' => $file->getServerFileName(),
+ 'name' => $file->getName(null),
+ 'mimetype' => $file->getFileType(),
+ 'documentType' => Services::get('file')->getDocumentType($file->getFileType()),
+ 'submissionId' => $file->getSubmissionId() ?? 0,
+ 'type' => $file->getType(),
+ 'typeName' => __($libraryFileManager->getTitleKeyFromType($file->getType())),
+ 'url' => $request->getDispatcher()->url(
+ $request,
+ Application::ROUTE_COMPONENT,
+ null,
+ 'api.file.FileApiHandler',
+ 'downloadLibraryFile',
+ null,
+ $urlArgs
+ ),
+ ];
+ }
+}

api/v1/_payments/PKPBackendPaymentsSettingsHandler.inc.php

@@ -63,8 +63,8 @@ public function authorize($request, &$args, $roleAssignments)
  /**
  * Receive requests to edit the payments form
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
  *
  * @return Response
  */

api/v1/_submissions/PKPBackendSubmissionsHandler.inc.php

@@ -22,8 +22,9 @@
 use PKP\plugins\HookRegistry;
 
 use PKP\security\authorization\ContextAccessPolicy;
-
+use PKP\security\authorization\SubmissionAccessPolicy;
 use PKP\security\Role;
+use Slim\Http\Response;
 
 abstract class PKPBackendSubmissionsHandler extends APIHandler
 {
@@ -72,14 +73,20 @@ public function __construct()
  public function authorize($request, &$args, $roleAssignments)
  {
  $this->addPolicy(new ContextAccessPolicy($request, $roleAssignments));
+
+ $routeName = $this->getSlimRequest()->getAttribute('route')->getName();
+ if (in_array($routeName, ['delete'])) {
+ $this->addPolicy(new SubmissionAccessPolicy($request, $args, $roleAssignments));
+ }
+
  return parent::authorize($request, $args, $roleAssignments);
  }
 
  /**
  * Get a collection of submissions
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
  * @param array $args arguments
  *
  * @return Response
@@ -114,9 +121,13 @@ public function getMany($slimRequest, $response, $args)
  $userGroupDao = DAORegistry::getDAO('UserGroupDAO'); /** @var UserGroupDAO $userGroupDao */
  $userGroups = $userGroupDao->getByContextId($context->getId())->toArray();
 
+ /** @var GenreDAO $genreDao */
+ $genreDao = DAORegistry::getDAO('GenreDAO');
+ $genres = $genreDao->getByContextId($context->getId())->toArray();
+
  return $response->withJson([
  'itemsMax' => Repo::submission()->getCount($collector->limit(null)->offset(null)),
- 'items' => Repo::submission()->getSchemaMap()->mapManyToSubmissionsList($submissions, $userGroups),
+ 'items' => Repo::submission()->getSchemaMap()->mapManyToSubmissionsList($submissions, $userGroups, $genres),
  ], 200);
  }
 
@@ -165,7 +176,7 @@ protected function getSubmissionCollector(array $queryParams): Collector
 
  case 'assignedTo':
  $val = array_map('intval', $this->paramToArray($val));
- if ($val == [-1]) {
+ if ($val == [\PKP\submission\Collector::UNASSIGNED]) {
  $val = array_shift($val);
  }
  $collector->assignedTo($val);
@@ -203,8 +214,8 @@ protected function getSubmissionCollector(array $queryParams): Collector
  /**
  * Delete a submission
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
  * @param array $args arguments
  *
  * @return Response

api/v1/_uploadPublicFile/PKPUploadPublicFileHandler.inc.php

@@ -66,7 +66,7 @@ public function authorize($request, &$args, $roleAssignments)
  * A helper method which adds the necessary response headers to allow
  * file uploads
  *
- * @param $response Response object
+ * @param Response $response object
  *
  * @return Response
  */
@@ -78,9 +78,9 @@ private function getResponse($response)
  /**
  * Upload a requested file
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
- * @param $args array arguments
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
+ * @param array $args arguments
  *
  * @return Response
  */
@@ -198,9 +198,9 @@ public function uploadFile($slimRequest, $response, $args)
  * Respond affirmatively to a HTTP OPTIONS request with headers which allow
  * file uploads
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
- * @param $args array arguments
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
+ * @param array $args arguments
  *
  * @return Response
  */

api/v1/announcements/PKPAnnouncementHandler.inc.php

@@ -16,7 +16,10 @@
 
 use APP\core\Application;
 use APP\facades\Repo;
+use APP\notification\Notification;
+use PKP\db\DAORegistry;
 use PKP\handler\APIHandler;
+use PKP\notification\managerDelegate\AnnouncementNotificationManager;
 use PKP\plugins\HookRegistry;
 use PKP\security\authorization\PolicySet;
 use PKP\security\authorization\RoleBasedHandlerOperationPolicy;
@@ -94,8 +97,8 @@ public function authorize($request, &$args, $roleAssignments)
  /**
  * Get a single submission
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
  * @param array $args arguments
  *
  * @return Response
@@ -119,8 +122,8 @@ public function get($slimRequest, $response, $args)
  /**
  * Get a collection of announcements
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
  * @param array $args arguments
  *
  * @return Response
@@ -165,8 +168,8 @@ public function getMany($slimRequest, $response, $args)
  /**
  * Add an announcement
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
  * @param array $args arguments
  *
  * @return Response
@@ -195,14 +198,31 @@ public function add($slimRequest, $response, $args)
  $id = Repo::announcement()->add($announcement);
  $announcement = Repo::announcement()->get($id);
 
+ if(filter_var($params['sendEmail'], FILTER_VALIDATE_BOOLEAN)){
+ import('lib.pkp.classes.notification.managerDelegate.AnnouncementNotificationManager');
+ $announcementNotificationManager = new AnnouncementNotificationManager(Notification::NOTIFICATION_TYPE_NEW_ANNOUNCEMENT);
+ $announcementNotificationManager->initialize($announcement);
+
+ $notificationSubscriptionSettingsDao = DAORegistry::getDAO('NotificationSubscriptionSettingsDAO'); /** @var NotificationSubscriptionSettingsDAO $notificationSubscriptionSettingsDao */
+ $userGroupDao = DAORegistry::getDAO('UserGroupDAO'); /** @var UserGroupDAO $userGroupDao */
+ $allUsers = $userGroupDao->getUsersByContextId($request->getContext()->getId());
+ while ($user = $allUsers->next()) {
+ if ($user->getDisabled()) continue;
+ $blockedEmails = $notificationSubscriptionSettingsDao->getNotificationSubscriptionSettings('blocked_emailed_notification', $user->getId(), $request->getContext()->getId());
+ if (!in_array(Notification::NOTIFICATION_TYPE_NEW_ANNOUNCEMENT, $blockedEmails)) {
+ $announcementNotificationManager->notify($user);
+ }
+ }
+ }
+
  return $response->withJson(Repo::announcement()->getSchemaMap()->map($announcement), 200);
  }
 
  /**
  * Edit an announcement
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
  * @param array $args arguments
  *
  * @return Response
@@ -249,8 +269,8 @@ public function edit($slimRequest, $response, $args)
  /**
  * Delete an announcement
  *
- * @param $slimRequest Request Slim request object
- * @param $response Response object
+ * @param Request $slimRequest Slim request object
+ * @param Response $response object
  * @param array $args arguments
  *
  * @return Response