From eea6c80321ba7b5ef2d7019dc02546930a6a6d27 Mon Sep 17 00:00:00 2001 From: Nate Wright Date: Tue, 3 Nov 2020 17:54:09 +0000 Subject: [PATCH] pkp/pkp-lib#4895 Replace use of blind/double-blind terminology --- .../forms/FieldShowEnsuringLink.inc.php | 6 ++-- .../context/PKPReviewGuidanceForm.inc.php | 2 +- .../forms/context/PKPReviewSetupForm.inc.php | 4 +-- .../PKPSelectReviewerListPanel.inc.php | 2 +- .../reviewer/PKPReviewerGridHandler.inc.php | 8 ++--- classes/log/EventLogEntry.inc.php | 16 +++++----- classes/mail/Mail.inc.php | 8 ++--- classes/migration/ReviewsMigration.inc.php | 2 +- .../SubmissionFileAccessPolicy.inc.php | 2 +- .../SubmissionFileAuthorEditorPolicy.inc.php | 4 +-- .../services/PKPPublicationService.inc.php | 8 ++--- .../reviewAssignment/ReviewAssignment.inc.php | 14 ++++---- .../ReviewAssignmentDAO.inc.php | 4 +-- .../eventLog/EventLogGridCellProvider.inc.php | 3 +- .../grid/eventLog/EventLogGridRow.inc.php | 12 +++---- .../grid/queries/form/QueryForm.inc.php | 2 +- .../reviewer/ReviewerGridCellProvider.inc.php | 4 +-- .../users/reviewer/ReviewerGridRow.inc.php | 6 ++-- .../form/AdvancedSearchReviewerForm.inc.php | 2 +- .../users/reviewer/form/ReviewerForm.inc.php | 4 +-- .../form/AddParticipantForm.inc.php | 20 ++++++------ .../ViewSubmissionMetadataHandler.inc.php | 6 ++-- .../PKPSubmissionFilesUploadBaseForm.inc.php | 8 ++--- .../form/StageParticipantNotifyHandler.js | 32 +++++++++---------- locale/ar_IQ/common.po | 6 ++-- locale/ar_IQ/editor.po | 7 ++-- locale/ar_IQ/manager.po | 3 +- locale/ca_ES/common.po | 6 ++-- locale/ca_ES/editor.po | 7 ++-- locale/ca_ES/manager.po | 3 +- locale/cs_CZ/common.po | 6 ++-- locale/cs_CZ/editor.po | 7 ++-- locale/cs_CZ/manager.po | 3 +- locale/da_DK/common.po | 6 ++-- locale/da_DK/editor.po | 7 ++-- locale/da_DK/manager.po | 3 +- locale/de_DE/common.po | 6 ++-- locale/de_DE/editor.po | 7 ++-- locale/de_DE/manager.po | 3 +- locale/el_GR/common.po | 6 ++-- locale/el_GR/editor.po | 7 ++-- locale/el_GR/manager.po | 3 +- locale/en_US/common.po | 12 +++---- locale/en_US/editor.po | 10 +++--- locale/en_US/manager.po | 5 ++- locale/en_US/submission.po | 2 +- locale/es_ES/common.po | 6 ++-- locale/es_ES/editor.po | 7 ++-- locale/es_ES/manager.po | 3 +- locale/fa_IR/common.po | 6 ++-- locale/fa_IR/editor.po | 6 ++-- locale/fi_FI/common.po | 6 ++-- locale/fi_FI/editor.po | 7 ++-- locale/fi_FI/manager.po | 3 +- locale/fr_CA/common.po | 6 ++-- locale/fr_CA/editor.po | 7 ++-- locale/fr_CA/manager.po | 3 +- locale/fr_FR/common.po | 6 ++-- locale/fr_FR/editor.po | 7 ++-- locale/fr_FR/manager.po | 3 +- locale/hu_HU/common.po | 6 ++-- locale/hu_HU/editor.po | 7 ++-- locale/hu_HU/manager.po | 3 +- locale/id_ID/common.po | 6 ++-- locale/id_ID/editor.po | 7 ++-- locale/id_ID/manager.po | 3 +- locale/it_IT/common.po | 6 ++-- locale/it_IT/editor.po | 7 ++-- locale/it_IT/manager.po | 3 +- locale/ku_IQ/editor.po | 6 ++-- locale/mk_MK/editor.po | 7 ++-- locale/mk_MK/manager.po | 3 +- locale/nl_NL/common.po | 6 ++-- locale/nl_NL/editor.po | 7 ++-- locale/nl_NL/manager.po | 3 +- locale/pl_PL/common.po | 6 ++-- locale/pl_PL/editor.po | 7 ++-- locale/pl_PL/manager.po | 3 +- locale/pt_BR/common.po | 6 ++-- locale/pt_BR/editor.po | 7 ++-- locale/pt_BR/manager.po | 3 +- locale/pt_PT/common.po | 6 ++-- locale/pt_PT/editor.po | 7 ++-- locale/pt_PT/manager.po | 3 +- locale/ro_RO/common.po | 6 ++-- locale/ro_RO/editor.po | 7 ++-- locale/ro_RO/manager.po | 3 +- locale/ru_RU/common.po | 9 ++++-- locale/ru_RU/editor.po | 7 ++-- locale/ru_RU/manager.po | 3 +- locale/sl_SI/common.po | 6 ++-- locale/sl_SI/editor.po | 7 ++-- locale/sl_SI/manager.po | 3 +- locale/sr_RS@cyrillic/common.po | 6 ++-- locale/sr_RS@cyrillic/editor.po | 6 ++-- locale/sr_RS@latin/common.po | 6 ++-- locale/sr_RS@latin/editor.po | 6 ++-- locale/sv_SE/common.po | 6 ++-- locale/sv_SE/editor.po | 7 ++-- locale/sv_SE/manager.po | 3 +- locale/tr_TR/common.po | 6 ++-- locale/tr_TR/editor.po | 7 ++-- locale/tr_TR/manager.po | 3 +- locale/uk_UA/common.po | 6 ++-- locale/uk_UA/editor.po | 7 ++-- locale/uk_UA/manager.po | 3 +- locale/vi_VN/common.po | 6 ++-- locale/vi_VN/editor.po | 7 ++-- locale/vi_VN/manager.po | 3 +- locale/zh_CN/common.po | 3 +- locale/zh_CN/editor.po | 7 ++-- locale/zh_CN/manager.po | 3 +- .../stageParticipant/addParticipantForm.tpl | 6 ++-- 113 files changed, 416 insertions(+), 250 deletions(-) diff --git a/classes/components/forms/FieldShowEnsuringLink.inc.php b/classes/components/forms/FieldShowEnsuringLink.inc.php index 36ff4055825..cccc74c95c6 100644 --- a/classes/components/forms/FieldShowEnsuringLink.inc.php +++ b/classes/components/forms/FieldShowEnsuringLink.inc.php @@ -11,7 +11,7 @@ * * @brief An extension of the FieldOptions for the configuration setting which * determines whether or not to show a link to reviewers about keeping reviews - * blind. + * anonymous. */ namespace PKP\components\forms; class FieldShowEnsuringLink extends FieldOptions { @@ -26,8 +26,8 @@ class FieldShowEnsuringLink extends FieldOptions { */ public function getConfig() { $config = parent::getConfig(); - $config['message'] = __('review.blindPeerReview'); - $config['modalTitle'] = __('review.blindPeerReview.title'); + $config['message'] = __('review.anonymousPeerReview'); + $config['modalTitle'] = __('review.anonymousPeerReview.title'); return $config; } diff --git a/classes/components/forms/context/PKPReviewGuidanceForm.inc.php b/classes/components/forms/context/PKPReviewGuidanceForm.inc.php index b9c2b828266..aff5388f18f 100644 --- a/classes/components/forms/context/PKPReviewGuidanceForm.inc.php +++ b/classes/components/forms/context/PKPReviewGuidanceForm.inc.php @@ -52,7 +52,7 @@ public function __construct($action, $locales, $context) { ])) ->addField(new FieldShowEnsuringLink('showEnsuringLink', [ 'options' => [ - ['value' => true, 'label' => __('manager.setup.reviewOptions.showBlindReviewLink')], + ['value' => true, 'label' => __('manager.setup.reviewOptions.showAnonymousReviewLink')], ], 'value' => $context->getData('showEnsuringLink'), ])); diff --git a/classes/components/forms/context/PKPReviewSetupForm.inc.php b/classes/components/forms/context/PKPReviewSetupForm.inc.php index c9409ed11a4..addc006b077 100644 --- a/classes/components/forms/context/PKPReviewSetupForm.inc.php +++ b/classes/components/forms/context/PKPReviewSetupForm.inc.php @@ -46,8 +46,8 @@ public function __construct($action, $locales, $context) { 'type' => 'radio', 'value' => $context->getData('defaultReviewMode'), 'options' => [ - ['value' => SUBMISSION_REVIEW_METHOD_DOUBLEBLIND, 'label' => __('editor.submissionReview.doubleBlind')], - ['value' => SUBMISSION_REVIEW_METHOD_BLIND, 'label' => __('editor.submissionReview.blind')], + ['value' => SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS, 'label' => __('editor.submissionReview.doubleAnonymous')], + ['value' => SUBMISSION_REVIEW_METHOD_ANONYMOUS, 'label' => __('editor.submissionReview.anonymous')], ['value' => SUBMISSION_REVIEW_METHOD_OPEN, 'label' => __('editor.submissionReview.open')], ], ])) diff --git a/classes/components/listPanels/PKPSelectReviewerListPanel.inc.php b/classes/components/listPanels/PKPSelectReviewerListPanel.inc.php index 893110cfa1a..e79aed361f8 100644 --- a/classes/components/listPanels/PKPSelectReviewerListPanel.inc.php +++ b/classes/components/listPanels/PKPSelectReviewerListPanel.inc.php @@ -34,7 +34,7 @@ class PKPSelectReviewerListPanel extends ListPanel { /** @var string Name of the input field*/ public $selectorName = ''; - /** @var array List of user IDs which may not be suitable for blind review because of existing access to author details */ + /** @var array List of user IDs which may not be suitable for anonymous review because of existing access to author details */ public $warnOnAssignment = []; /** diff --git a/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.inc.php b/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.inc.php index 91e66b1a604..376101fa823 100644 --- a/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.inc.php +++ b/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.inc.php @@ -110,9 +110,9 @@ function authorize($request, &$args, $roleAssignments) { return false; } - if (in_array($operation, $this->_getAuthorDeniedBlindOps())) { + if (in_array($operation, $this->_getAuthorDeniedAnonymousOps())) { $reviewAssignment = $this->getAuthorizedContextObject(ASSOC_TYPE_REVIEW_ASSIGNMENT); - if ($reviewAssignment && in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_BLIND, SUBMISSION_REVIEW_METHOD_DOUBLEBLIND))) { + if ($reviewAssignment && in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_ANONYMOUS, SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS))) { return false; } } @@ -978,10 +978,10 @@ protected function _getAuthorDeniedOps() { /** * Get additional operations that an author is not allowed to access when the - * review type is blind or double-blind. + * review type is anonymous or double-anonymous. * @return array */ - protected function _getAuthorDeniedBlindOps() { + protected function _getAuthorDeniedAnonymousOps() { return array( 'readReview', 'reviewHistory', diff --git a/classes/log/EventLogEntry.inc.php b/classes/log/EventLogEntry.inc.php index d7a0a887ac7..a32f5f92ff9 100644 --- a/classes/log/EventLogEntry.inc.php +++ b/classes/log/EventLogEntry.inc.php @@ -157,30 +157,30 @@ function getTranslatedMessage($locale = null, $hideReviewerName = false) { $reviewAssignmentDao = DAORegistry::getDAO('ReviewAssignmentDAO'); /* @var $reviewAssignmentDao ReviewAssignmentDAO */ // Reviewer activity log entries (assigning, accepting, declining) if (isset($params['reviewerName'])) { - $blindAuthor = true; + $anonymousAuthor = true; if (isset($params['reviewAssignmentId'])) { $reviewAssignment = $reviewAssignmentDao->getById($params['reviewAssignmentId']); - if ($reviewAssignment && !in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_BLIND, SUBMISSION_REVIEW_METHOD_DOUBLEBLIND))) { - $blindAuthor = false; + if ($reviewAssignment && !in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_ANONYMOUS, SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS))) { + $anonymousAuthor = false; } } - if ($blindAuthor) { + if ($anonymousAuthor) { $params['reviewerName'] = __('editor.review.anonymousReviewer'); } } // Files submitted by reviewers if (isset($params['fileStage']) && $params['fileStage'] === SUBMISSION_FILE_REVIEW_ATTACHMENT) { assert(isset($params['fileId']) && isset($params['submissionId'])); - $blindAuthor = true; + $anonymousAuthor = true; $submissionFileDao = DAORegistry::getDAO('SubmissionFileDAO'); /* @var $submissionFileDao SubmissionFileDAO */ $submissionFile = $submissionFileDao->getLatestRevision($params['fileId']); if ($submissionFile && $submissionFile->getAssocType() === ASSOC_TYPE_REVIEW_ASSIGNMENT) { $reviewAssignment = $reviewAssignmentDao->getById($submissionFile->getAssocId()); - if ($reviewAssignment && !in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_BLIND, SUBMISSION_REVIEW_METHOD_DOUBLEBLIND))) { - $blindAuthor = false; + if ($reviewAssignment && !in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_ANONYMOUS, SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS))) { + $anonymousAuthor = false; } } - if (isset($params['username']) && $blindAuthor) { + if (isset($params['username']) && $anonymousAuthor) { if (isset($params['username'])) { $params['username'] = __('editor.review.anonymousReviewer'); } diff --git a/classes/mail/Mail.inc.php b/classes/mail/Mail.inc.php index 668f6053096..5523ab7fbb7 100644 --- a/classes/mail/Mail.inc.php +++ b/classes/mail/Mail.inc.php @@ -152,7 +152,7 @@ function setCcs($ccs) { } /** - * Add a blind carbon copy (BCC) recipient to the message. + * Add a hidden carbon copy (BCC) recipient to the message. * @param $email string * @param $name optional */ @@ -166,7 +166,7 @@ function addBcc($email, $name = '') { } /** - * Get the blind carbon copy (BCC) recipients for the message + * Get the hidden carbon copy (BCC) recipients for the message * @return array */ function getBccs() { @@ -174,7 +174,7 @@ function getBccs() { } /** - * Set the blind carbon copy (BCC) recipients for the message. + * Set the hidden carbon copy (BCC) recipients for the message. * @param $bccs array */ function setBccs($bccs) { @@ -397,7 +397,7 @@ function getFromString($send = false) { $from = $this->getFrom(); if ($from == null) { return null; - } + } return (self::encodeDisplayName($from['name'], $send) . ' <'.$from['email'].'>'); } diff --git a/classes/migration/ReviewsMigration.inc.php b/classes/migration/ReviewsMigration.inc.php index c1876295433..ef398d4b383 100644 --- a/classes/migration/ReviewsMigration.inc.php +++ b/classes/migration/ReviewsMigration.inc.php @@ -48,7 +48,7 @@ public function up() { $table->smallInteger('stage_id'); import('lib.pkp.classes.submission.reviewAssignment.ReviewAssignment'); // for constant - $table->smallInteger('review_method')->default(SUBMISSION_REVIEW_METHOD_BLIND); + $table->smallInteger('review_method')->default(SUBMISSION_REVIEW_METHOD_ANONYMOUS); $table->smallInteger('round')->default(1); $table->smallInteger('step')->default(1); diff --git a/classes/security/authorization/SubmissionFileAccessPolicy.inc.php b/classes/security/authorization/SubmissionFileAccessPolicy.inc.php index 124644ff6da..8b70fb74d53 100644 --- a/classes/security/authorization/SubmissionFileAccessPolicy.inc.php +++ b/classes/security/authorization/SubmissionFileAccessPolicy.inc.php @@ -234,7 +234,7 @@ function buildFileAccessPolicy($request, $args, $roleAssignments, $mode, $fileId import('lib.pkp.classes.security.authorization.internal.SubmissionFileMatchesWorkflowStageIdPolicy'); $managerFileAccessPolicy->addPolicy(new SubmissionFileMatchesWorkflowStageIdPolicy($request, $fileIdAndRevision, $stageId)); - // 3) ... and only if they are not also assigned as an author and this is not part of a blind review + // 3) ... and only if they are not also assigned as an author and this is not part of an anonymous review import('lib.pkp.classes.security.authorization.internal.SubmissionFileAuthorEditorPolicy'); $subEditorFileAccessPolicy->addPolicy(new SubmissionFileAuthorEditorPolicy($request, $fileIdAndRevision)); diff --git a/classes/security/authorization/internal/SubmissionFileAuthorEditorPolicy.inc.php b/classes/security/authorization/internal/SubmissionFileAuthorEditorPolicy.inc.php index 6a4d5d640d9..916edab468f 100644 --- a/classes/security/authorization/internal/SubmissionFileAuthorEditorPolicy.inc.php +++ b/classes/security/authorization/internal/SubmissionFileAuthorEditorPolicy.inc.php @@ -10,7 +10,7 @@ * @ingroup security_authorization_internal * * @brief Submission file policy to ensure that an editor is denied access to - * blind review files when they are also assigned to the submission as an + * anonymous review files when they are also assigned to the submission as an * author. */ @@ -31,7 +31,7 @@ public function effect() { if ($submissionFile->getFileStage() != SUBMISSION_FILE_REVIEW_ATTACHMENT) return AUTHORIZATION_PERMIT; // Deny if the user is assigned as an author to any stage, and this file is - // attached to a blind review + // attached to an anonymous review $userRoles = $this->getAuthorizedContextObject(ASSOC_TYPE_ACCESSIBLE_WORKFLOW_STAGES); foreach ($userRoles as $stageRoles) { if (in_array(ROLE_ID_AUTHOR, $stageRoles)) { diff --git a/classes/services/PKPPublicationService.inc.php b/classes/services/PKPPublicationService.inc.php index c85f44e7b76..7052821faea 100644 --- a/classes/services/PKPPublicationService.inc.php +++ b/classes/services/PKPPublicationService.inc.php @@ -161,7 +161,7 @@ public function getProperties($publication, $props, $args = null) { ); break; case 'authors': - if ($currentUserReviewAssignment && $currentUserReviewAssignment->getReviewMethod() === SUBMISSION_REVIEW_METHOD_DOUBLEBLIND) { + if ($currentUserReviewAssignment && $currentUserReviewAssignment->getReviewMethod() === SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS) { $values[$prop] = []; } else { $values[$prop] = array_map( @@ -174,13 +174,13 @@ function($author) use ($request) { break; case 'authorsString': $values[$prop] = ''; - if ((!$currentUserReviewAssignment || $currentUserReviewAssignment->getReviewMethod() !== SUBMISSION_REVIEW_METHOD_DOUBLEBLIND) + if ((!$currentUserReviewAssignment || $currentUserReviewAssignment->getReviewMethod() !== SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS) && isset($args['userGroups'])) { $values[$prop] = $publication->getAuthorString($args['userGroups']); } break; case 'authorsStringShort': - if ($currentUserReviewAssignment && $currentUserReviewAssignment->getReviewMethod() === SUBMISSION_REVIEW_METHOD_DOUBLEBLIND) { + if ($currentUserReviewAssignment && $currentUserReviewAssignment->getReviewMethod() === SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS) { $values[$prop] = ''; } else { $values[$prop] = $publication->getShortAuthorString(); @@ -199,7 +199,7 @@ function($citation) { $values[$prop] = $publication->getFullTitles(); break; case 'galleys': - if ($currentUserReviewAssignment && $currentUserReviewAssignment->getReviewMethod() === SUBMISSION_REVIEW_METHOD_DOUBLEBLIND) { + if ($currentUserReviewAssignment && $currentUserReviewAssignment->getReviewMethod() === SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS) { $values[$prop] = []; } else { $galleyArgs = array_merge($args, ['publication' => $publication]); diff --git a/classes/submission/reviewAssignment/ReviewAssignment.inc.php b/classes/submission/reviewAssignment/ReviewAssignment.inc.php index c5dcd6c3bde..f2f6262fd5a 100644 --- a/classes/submission/reviewAssignment/ReviewAssignment.inc.php +++ b/classes/submission/reviewAssignment/ReviewAssignment.inc.php @@ -27,8 +27,8 @@ define('SUBMISSION_REVIEWER_RATING_POOR', 2); define('SUBMISSION_REVIEWER_RATING_VERY_POOR', 1); -define('SUBMISSION_REVIEW_METHOD_BLIND', 1); -define('SUBMISSION_REVIEW_METHOD_DOUBLEBLIND', 2); +define('SUBMISSION_REVIEW_METHOD_ANONYMOUS', 1); +define('SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS', 2); define('SUBMISSION_REVIEW_METHOD_OPEN', 3); // A review is "unconsidered" when it is confirmed by an editor and then that @@ -150,7 +150,7 @@ function setStageId($stageId) { } /** - * Get the method of the review (open, blind, or double-blind). + * Get the method of the review (open, anonymous, or double-anonymous). * @return int */ function getReviewMethod() { @@ -625,10 +625,10 @@ public function getReviewMethodKey($method = null) { switch ($method) { case SUBMISSION_REVIEW_METHOD_OPEN: return 'editor.submissionReview.open'; - case SUBMISSION_REVIEW_METHOD_BLIND: - return 'editor.submissionReview.blind'; - case SUBMISSION_REVIEW_METHOD_DOUBLEBLIND: - return 'editor.submissionReview.doubleBlind'; + case SUBMISSION_REVIEW_METHOD_ANONYMOUS: + return 'editor.submissionReview.anonymous'; + case SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS: + return 'editor.submissionReview.doubleAnonymous'; } assert(false, 'No review method key could be found for ' . get_class($this) . ' on ' . __LINE__); diff --git a/classes/submission/reviewAssignment/ReviewAssignmentDAO.inc.php b/classes/submission/reviewAssignment/ReviewAssignmentDAO.inc.php index 7a5334804e9..551701a793e 100644 --- a/classes/submission/reviewAssignment/ReviewAssignmentDAO.inc.php +++ b/classes/submission/reviewAssignment/ReviewAssignmentDAO.inc.php @@ -613,8 +613,8 @@ function getLastReviewRoundReviewAssignmentByReviewer($submissionId, $reviewerId function getReviewMethodsTranslationKeys() { AppLocale::requireComponents(LOCALE_COMPONENT_PKP_EDITOR); return array( - SUBMISSION_REVIEW_METHOD_DOUBLEBLIND => 'editor.submissionReview.doubleBlind', - SUBMISSION_REVIEW_METHOD_BLIND => 'editor.submissionReview.blind', + SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS => 'editor.submissionReview.doubleAnonymous', + SUBMISSION_REVIEW_METHOD_ANONYMOUS => 'editor.submissionReview.anonymous', SUBMISSION_REVIEW_METHOD_OPEN => 'editor.submissionReview.open', ); } diff --git a/controllers/grid/eventLog/EventLogGridCellProvider.inc.php b/controllers/grid/eventLog/EventLogGridCellProvider.inc.php index 4848090f411..46270d3b27e 100644 --- a/controllers/grid/eventLog/EventLogGridCellProvider.inc.php +++ b/controllers/grid/eventLog/EventLogGridCellProvider.inc.php @@ -81,12 +81,11 @@ function getTemplateVarsFromRowColumn($row, $column) { // Maybe anonymize files submitted by reviewers if (isset($params['fileStage']) && $params['fileStage'] === SUBMISSION_FILE_REVIEW_ATTACHMENT) { assert(isset($params['fileId']) && isset($params['submissionId'])); - $blindAuthor = true; $submissionFileDao = DAORegistry::getDAO('SubmissionFileDAO'); /* @var $submissionFileDao SubmissionFileDAO */ $submissionFile = $submissionFileDao->getLatestRevision($params['fileId']); if ($submissionFile && $submissionFile->getAssocType() === ASSOC_TYPE_REVIEW_ASSIGNMENT) { $reviewAssignment = $reviewAssignmentDao->getById($submissionFile->getAssocId()); - if (!$reviewAssignment || in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_BLIND, SUBMISSION_REVIEW_METHOD_DOUBLEBLIND))) { + if (!$reviewAssignment || in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_ANONYMOUS, SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS))) { $userName = __('editor.review.anonymousReviewer'); } } diff --git a/controllers/grid/eventLog/EventLogGridRow.inc.php b/controllers/grid/eventLog/EventLogGridRow.inc.php index 97e8f39890f..cc75fb01e01 100644 --- a/controllers/grid/eventLog/EventLogGridRow.inc.php +++ b/controllers/grid/eventLog/EventLogGridRow.inc.php @@ -61,16 +61,16 @@ function initialize($request, $template = null) { case SUBMISSION_LOG_FILE_UPLOAD: $submissionFile = $submissionFileDao->getRevision($params['fileId'], $params['fileRevision']); if ($submissionFile) { - $blindAuthor = false; - $maybeBlindAuthor = $this->_isCurrentUserAssignedAuthor && $submissionFile->getFileStage() === SUBMISSION_FILE_REVIEW_ATTACHMENT; - if ($maybeBlindAuthor && $submissionFile->getAssocType() === ASSOC_TYPE_REVIEW_ASSIGNMENT) { + $anonymousAuthor = false; + $maybeAnonymousAuthor = $this->_isCurrentUserAssignedAuthor && $submissionFile->getFileStage() === SUBMISSION_FILE_REVIEW_ATTACHMENT; + if ($maybeAnonymousAuthor && $submissionFile->getAssocType() === ASSOC_TYPE_REVIEW_ASSIGNMENT) { $reviewAssignmentDao = DAORegistry::getDAO('ReviewAssignmentDAO'); /* @var $reviewAssignmentDao ReviewAssignmentDAO */ $reviewAssignment = $reviewAssignmentDao->getById($submissionFile->getAssocId()); - if ($reviewAssignment && in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_BLIND, SUBMISSION_REVIEW_METHOD_DOUBLEBLIND))) { - $blindAuthor = true; + if ($reviewAssignment && in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_ANONYMOUS, SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS))) { + $anonymousAuthor = true; } } - if (!$blindAuthor) { + if (!$anonymousAuthor) { $workflowStageId = $submissionFileDao->getWorkflowStageId($submissionFile); // If a submission file is attached to a query that has been deleted, we cannot // determine its stage. Don't present a download link in this case. diff --git a/controllers/grid/queries/form/QueryForm.inc.php b/controllers/grid/queries/form/QueryForm.inc.php index 137de8a0d90..c9bff260812 100644 --- a/controllers/grid/queries/form/QueryForm.inc.php +++ b/controllers/grid/queries/form/QueryForm.inc.php @@ -238,7 +238,7 @@ function fetch($request, $template = null, $display = false, $actionArgs = array } } - // if current user is blind reviewer, filter out authors + // if current user is an anonymous reviewer, filter out authors foreach ($reviewAssignments as $reviewAssignment) { if ($reviewAssignment->getReviewerId() == $user->getId() ){ if ($reviewAssignment->getReviewMethod() != SUBMISSION_REVIEW_METHOD_OPEN){ diff --git a/controllers/grid/users/reviewer/ReviewerGridCellProvider.inc.php b/controllers/grid/users/reviewer/ReviewerGridCellProvider.inc.php index 554799d294c..d38fbcd1942 100644 --- a/controllers/grid/users/reviewer/ReviewerGridCellProvider.inc.php +++ b/controllers/grid/users/reviewer/ReviewerGridCellProvider.inc.php @@ -69,8 +69,8 @@ function getTemplateVarsFromRowColumn($row, $column) { assert(is_a($element, 'DataObject') && !empty($columnId)); switch ($columnId) { case 'name': - $isReviewBlind = in_array($element->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_BLIND, SUBMISSION_REVIEW_METHOD_DOUBLEBLIND)); - if ($this->_isCurrentUserAssignedAuthor && $isReviewBlind) { + $isReviewAnonymous = in_array($element->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_ANONYMOUS, SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS)); + if ($this->_isCurrentUserAssignedAuthor && $isReviewAnonymous) { return array('label' => __('editor.review.anonymousReviewer')); } return array('label' => $element->getReviewerFullName()); diff --git a/controllers/grid/users/reviewer/ReviewerGridRow.inc.php b/controllers/grid/users/reviewer/ReviewerGridRow.inc.php index 627f194a265..f1fe5fc7236 100644 --- a/controllers/grid/users/reviewer/ReviewerGridRow.inc.php +++ b/controllers/grid/users/reviewer/ReviewerGridRow.inc.php @@ -47,10 +47,10 @@ function initialize($request, $template = null) { $stageId = (int) $request->getUserVar('stageId'); $round = (int) $request->getUserVar('round'); - // Authors can't perform any actions on blind reviews + // Authors can't perform any actions on anonymous reviews $reviewAssignment = $this->getData(); - $isReviewBlind = in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_BLIND, SUBMISSION_REVIEW_METHOD_DOUBLEBLIND)); - if ($this->_isCurrentUserAssignedAuthor && $isReviewBlind) { + $isReviewAnonymous = in_array($reviewAssignment->getReviewMethod(), array(SUBMISSION_REVIEW_METHOD_ANONYMOUS, SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS)); + if ($this->_isCurrentUserAssignedAuthor && $isReviewAnonymous) { return; } diff --git a/controllers/grid/users/reviewer/form/AdvancedSearchReviewerForm.inc.php b/controllers/grid/users/reviewer/form/AdvancedSearchReviewerForm.inc.php index 86cda40d486..db803f493c4 100644 --- a/controllers/grid/users/reviewer/form/AdvancedSearchReviewerForm.inc.php +++ b/controllers/grid/users/reviewer/form/AdvancedSearchReviewerForm.inc.php @@ -71,7 +71,7 @@ function fetch($request, $template = null, $display = false) { // Get user IDs already assigned to this submission, and admins and // managers who may have access to author identities and can not guarantee - // blind reviews + // anonymous reviews $warnOnAssignment = array(); $stageAssignmentDao = DAORegistry::getDAO('StageAssignmentDAO'); /* @var $stageAssignmentDao StageAssignmentDAO */ $stageAssignmentResults = $stageAssignmentDao->getBySubmissionAndStageId($this->getSubmissionId()); diff --git a/controllers/grid/users/reviewer/form/ReviewerForm.inc.php b/controllers/grid/users/reviewer/form/ReviewerForm.inc.php index b7789cf2829..7af330f680d 100644 --- a/controllers/grid/users/reviewer/form/ReviewerForm.inc.php +++ b/controllers/grid/users/reviewer/form/ReviewerForm.inc.php @@ -150,14 +150,14 @@ function initData() { $reviewAssignmentDao = DAORegistry::getDAO('ReviewAssignmentDAO'); /* @var $reviewAssignmentDao ReviewAssignmentDAO */ $reviewAssignment = $reviewAssignmentDao->getReviewAssignment($reviewRound->getId(), $reviewerId, $reviewRound->getRound()); - // Get the review method (open, blind, or double-blind) + // Get the review method (open, anonymous, or double-anonymous) if (isset($reviewAssignment) && $reviewAssignment->getReviewMethod() != false) { $reviewMethod = $reviewAssignment->getReviewMethod(); $reviewFormId = $reviewAssignment->getReviewFormId(); } else { // Set default review method. $reviewMethod = $context->getData('defaultReviewMode'); - if (!$reviewMethod) $reviewMethod = SUBMISSION_REVIEW_METHOD_DOUBLEBLIND; + if (!$reviewMethod) $reviewMethod = SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS; // If there is a section/series and it has a default // review form designated, use it. diff --git a/controllers/grid/users/stageParticipant/form/AddParticipantForm.inc.php b/controllers/grid/users/stageParticipant/form/AddParticipantForm.inc.php index 2d4ab7db47c..3377514515b 100644 --- a/controllers/grid/users/stageParticipant/form/AddParticipantForm.inc.php +++ b/controllers/grid/users/stageParticipant/form/AddParticipantForm.inc.php @@ -155,25 +155,25 @@ function fetch($request, $template = null, $display = false) { // If submission is in review, add a list of reviewer Ids that should not be - // assigned as participants because they have blind peer reviews in progress + // assigned as participants because they have anonymous peer reviews in progress import('lib.pkp.classes.submission.reviewAssignment.ReviewAssignment'); - $blindReviewerIds = array(); + $anonymousReviewerIds = array(); if (in_array($this->getSubmission()->getStageId(), array(WORKFLOW_STAGE_ID_INTERNAL_REVIEW, WORKFLOW_STAGE_ID_EXTERNAL_REVIEW))) { - $blindReviewMethods = array(SUBMISSION_REVIEW_METHOD_BLIND, SUBMISSION_REVIEW_METHOD_DOUBLEBLIND); + $anonymousReviewMethods = array(SUBMISSION_REVIEW_METHOD_ANONYMOUS, SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS); $reviewAssignmentDao = DAORegistry::getDAO('ReviewAssignmentDAO'); /* @var $reviewAssignmentDao ReviewAssignmentDAO */ $reviewAssignments = $reviewAssignmentDao->getBySubmissionId($this->getSubmission()->getId()); - $blindReviews = array_filter($reviewAssignments, function($reviewAssignment) use ($blindReviewMethods) { - return in_array($reviewAssignment->getReviewMethod(), $blindReviewMethods) && !$reviewAssignment->getDeclined(); + $anonymousReviews = array_filter($reviewAssignments, function($reviewAssignment) use ($anonymousReviewMethods) { + return in_array($reviewAssignment->getReviewMethod(), $anonymousReviewMethods) && !$reviewAssignment->getDeclined(); }); - $blindReviewerIds = array_map(function($reviewAssignment) { + $anonymousReviewerIds = array_map(function($reviewAssignment) { return $reviewAssignment->getReviewerId(); - }, $blindReviews); + }, $anonymousReviews); } $templateMgr->assign(array( - 'blindReviewerIds' => array_values(array_unique($blindReviewerIds)), - 'blindReviewerWarning' => __('editor.submission.addStageParticipant.form.reviewerWarning'), - 'blindReviewerWarningOk' => __('common.ok'), + 'anonymousReviewerIds' => array_values(array_unique($anonymousReviewerIds)), + 'anonymousReviewerWarning' => __('editor.submission.addStageParticipant.form.reviewerWarning'), + 'anonymousReviewerWarningOk' => __('common.ok'), )); return parent::fetch($request, $template, $display); diff --git a/controllers/modals/submission/ViewSubmissionMetadataHandler.inc.php b/controllers/modals/submission/ViewSubmissionMetadataHandler.inc.php index 75cdec88b91..6fa85a43828 100644 --- a/controllers/modals/submission/ViewSubmissionMetadataHandler.inc.php +++ b/controllers/modals/submission/ViewSubmissionMetadataHandler.inc.php @@ -44,7 +44,7 @@ function display($args, $request) { $templateMgr = TemplateManager::getManager($request); $publication = $submission->getCurrentPublication(); - if ($reviewAssignment->getReviewMethod() != SUBMISSION_REVIEW_METHOD_DOUBLEBLIND) { /* SUBMISSION_REVIEW_METHOD_BLIND or _OPEN */ + if ($reviewAssignment->getReviewMethod() != SUBMISSION_REVIEW_METHOD_DOUBLEANONYMOUS) { /* SUBMISSION_REVIEW_METHOD_ANONYMOUS or _OPEN */ $userGroupDao = DAORegistry::getDAO('UserGroupDAO'); /* @var $userGroupDao UserGroupDAO */ $userGroups = $userGroupDao->getByContextId($context->getId())->toArray(); $templateMgr->assign('authors', $publication->getAuthorString($userGroups)); @@ -56,7 +56,7 @@ function display($args, $request) { $additionalMetadata[] = array(__('common.keywords'), implode(', ', $publication->getLocalizedData('keywords'))); } if ($publication->getLocalizedData('subjects')) { - $additionalMetadata[] = array(__('common.subjects'), implode(', ', $publication->getLocalizedData('subjects'))); + $additionalMetadata[] = array(__('common.subjects'), implode(', ', $publication->getLocalizedData('subjects'))); } if ($publication->getLocalizedData('disciplines')) { $additionalMetadata[] = array(__('common.discipline'), implode(', ', $publication->getLocalizedData('disciplines'))); @@ -66,7 +66,7 @@ function display($args, $request) { } if ($publication->getLocalizedData('languages')) { $additionalMetadata[] = array(__('common.languages'), implode(', ', $publication->getLocalizedData('languages'))); - } + } $templateMgr->assign('additionalMetadata', $additionalMetadata); diff --git a/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadBaseForm.inc.php b/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadBaseForm.inc.php index 846c835675a..c782007ac9d 100644 --- a/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadBaseForm.inc.php +++ b/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadBaseForm.inc.php @@ -280,16 +280,16 @@ function fetch($request, $template = null, $display = false) { $this->setData('currentSubmissionFileGenres', $currentSubmissionFileGenres); $this->setData('submissionFileOptions', $submissionFileOptions); - // Show ensuring a blind review link. + // Show ensuring an anonymous review link. $context = $request->getContext(); if ($context->getData('showEnsuringLink') && in_array($this->getStageId(), array(WORKFLOW_STAGE_ID_SUBMISSION, WORKFLOW_STAGE_ID_INTERNAL_REVIEW, WORKFLOW_STAGE_ID_EXTERNAL_REVIEW))) { import('lib.pkp.classes.linkAction.request.ConfirmationModal'); $ensuringLink = new LinkAction( 'addUser', new ConfirmationModal( - __('review.blindPeerReview'), - __('review.ensuringBlindReview')), - __('review.ensuringBlindReview')); + __('review.anonymousPeerReview'), + __('review.anonymousPeerReview.title')), + __('review.anonymousPeerReview.title')); $templateMgr = TemplateManager::getManager($request); $templateMgr->assign('ensuringLink', $ensuringLink); diff --git a/js/controllers/grid/users/stageParticipant/form/StageParticipantNotifyHandler.js b/js/controllers/grid/users/stageParticipant/form/StageParticipantNotifyHandler.js index dd4cfba3f05..473862bdce3 100644 --- a/js/controllers/grid/users/stageParticipant/form/StageParticipantNotifyHandler.js +++ b/js/controllers/grid/users/stageParticipant/form/StageParticipantNotifyHandler.js @@ -63,16 +63,16 @@ options.permitMetadataEditUserGroupIds; } - if (options.blindReviewerIds) { - this.blindReviewerIds_ = options.blindReviewerIds; + if (options.anonymousReviewerIds) { + this.anonymousReviewerIds_ = options.anonymousReviewerIds; } - if (options.blindReviewerWarning) { - this.blindReviewerWarning_ = options.blindReviewerWarning; + if (options.anonymousReviewerWarning) { + this.anonymousReviewerWarning_ = options.anonymousReviewerWarning; } - if (options.blindReviewerWarningOk) { - this.blindReviewerWarningOk_ = options.blindReviewerWarningOk; + if (options.anonymousReviewerWarningOk) { + this.anonymousReviewerWarningOk_ = options.anonymousReviewerWarningOk; } // Update the recommendOnly option display when user group changes @@ -86,7 +86,7 @@ .change(this.callbackWrapper( this.updateSubmissionMetadataEditPermitOption)); - // Trigger a warning message if a blind reviewer is selected + // Trigger a warning message if an anonymous reviewer is selected $('input[name=\'userIdSelected\']', $form) .change(this.callbackWrapper(this.maybeTriggerReviewerWarning)); @@ -113,33 +113,33 @@ /** - * A list of user IDs which are already assigned blind reviews for this + * A list of user IDs which are already assigned anonymous reviews for this * submission. * @private * @type {Array} */ $.pkp.controllers.grid.users.stageParticipant.form. - StageParticipantNotifyHandler.prototype.blindReviewerIds_ = null; + StageParticipantNotifyHandler.prototype.anonymousReviewerIds_ = null; /** - * A warning message to display when a blind reviewer is selected to be + * A warning message to display when an anonymous reviewer is selected to be * added as a recipient * @private * @type {string?} */ $.pkp.controllers.grid.users.stageParticipant.form. - StageParticipantNotifyHandler.prototype.blindReviewerWarning_ = null; + StageParticipantNotifyHandler.prototype.anonymousReviewerWarning_ = null; /** - * The OK button language for the blind reviewer warning message + * The OK button language for the anonymous reviewer warning message * @private * @type {string?} */ $.pkp.controllers.grid.users.stageParticipant.form. StageParticipantNotifyHandler.prototype. - blindReviewerWarningOk_ = null; + anonymousReviewerWarningOk_ = null; /** @@ -274,15 +274,15 @@ var userId = $(sourceElement).val(), opts; - if (!userId || this.blindReviewerIds_.indexOf(userId) < 0) { + if (!userId || this.anonymousReviewerIds_.indexOf(userId) < 0) { return; } opts = { title: '', - okButton: this.blindReviewerWarningOk_, + okButton: this.anonymousReviewerWarningOk_, cancelButton: false, - dialogText: this.blindReviewerWarning_ + dialogText: this.anonymousReviewerWarning_ }; $('
لضمان تكامل التحكيم المناظر السري بالنسبة إلى طلبات النشر لهذه الدار، يجب بذل كل جهد من شأنه حجب هويات المؤلفين والمحكمين بعضهم عن البعض الآخر. هذه المهمة يضطلع بها المؤلفون، المحررون والمحكمون (الذين يرفعون الملفات كجزء من مهام التحكيم) عبر تدقيق فيما إذا تم العمل بالخطوات الآتية المتعلقة بالنصوص وخصائص الملفات:

\n" "