Merge branch 'pkp:main' into f5000_7431

pkp · Sep 18, 2023 · 7132aab · 7132aab
2 parents 34cd3fe + 43e3855
commit 7132aab
Show file tree

Hide file tree

Showing 72 changed files with 1,799 additions and 851 deletions.
diff --git a/classes/author/Author.php b/classes/author/Author.php
@@ -27,7 +27,7 @@ class Author extends Identity
     /**
      * Get the default/fall back locale the values should exist for
      */
-    public function getDefaultLocale(): string
+    public function getDefaultLocale(): ?string
     {
         return $this->getSubmissionLocale();
     }

diff --git a/classes/cliTool/CommandLineTool.php b/classes/cliTool/CommandLineTool.php
@@ -31,6 +31,8 @@
 use PKP\plugins\PluginRegistry;
 use PKP\security\Role;
 use PKP\session\SessionManager;
+use PKP\user\User;
+use PKP\config\Config;
 
 /** Initialization code */
 define('PWD', getcwd());
@@ -50,10 +52,10 @@ class CommandLineTool
     public $argv;
 
     /** @var string the username provided */
-    public $username;
+    public ?string $username = null;
 
     /** @var \PKP\user\User the user provided */
-    public $user;
+    public ?User $user = null;
 
     public function __construct($argv = [])
     {
@@ -77,7 +79,7 @@ public function __construct($argv = [])
 
         $this->scriptName = isset($this->argv[0]) ? array_shift($this->argv) : '';
 
-        $this->checkArgsForUsername();
+        if (Config::getVar('general', 'installed')) $this->checkArgsForUsername();
 
         if (isset($this->argv[0]) && $this->argv[0] == '-h') {
             $this->exitWithUsageMessage();

diff --git a/classes/components/forms/announcement/PKPAnnouncementForm.php b/classes/components/forms/announcement/PKPAnnouncementForm.php
@@ -75,7 +75,7 @@ public function __construct($action, $locales, $announcementContext)
         foreach ($announcementTypes as $announcementType) {
             $announcementOptions[] = [
                 'value' => (int) $announcementType->getId(),
-                'label' => $announcementType->getLocalizedTypeName(),
+                'label' => htmlspecialchars($announcementType->getLocalizedTypeName()),
             ];
         }
         if (!empty($announcementOptions)) {

diff --git a/classes/components/forms/context/PKPAppearanceSetupForm.php b/classes/components/forms/context/PKPAppearanceSetupForm.php
@@ -58,7 +58,7 @@ public function __construct($action, $locales, $context, $baseUrl, $temporaryFil
             if (isset($plugins[$plugin])) {
                 $enabledOptions[] = [
                     'value' => $plugin,
-                    'label' => $plugins[$plugin]->getDisplayName(),
+                    'label' => htmlspecialchars($plugins[$plugin]->getDisplayName()),
                 ];
             }
         }
@@ -67,7 +67,7 @@ public function __construct($action, $locales, $context, $baseUrl, $temporaryFil
             if (!in_array($pluginName, $currentBlocks)) {
                 $disabledOptions[] = [
                     'value' => $pluginName,
-                    'label' => $plugin->getDisplayName(),
+                    'label' => htmlspecialchars($plugin->getDisplayName()),
                 ];
             }
         }

diff --git a/classes/components/forms/context/PKPPaymentSettingsForm.php b/classes/components/forms/context/PKPPaymentSettingsForm.php
@@ -47,7 +47,7 @@ public function __construct($action, $locales, $context)
         foreach (Locale::getCurrencies() as $currency) {
             $currencies[] = [
                 'value' => $currency->getLetterCode(),
-                'label' => $currency->getLocalName(),
+                'label' => htmlspecialchars($currency->getLocalName()),
             ];
         }
 
@@ -57,7 +57,7 @@ public function __construct($action, $locales, $context)
         foreach ($paymentPlugins as $plugin) {
             $pluginList[] = [
                 'value' => $plugin->getName(),
-                'label' => $plugin->getDisplayName(),
+                'label' => htmlspecialchars($plugin->getDisplayName()),
             ];
         }
 

diff --git a/classes/components/forms/context/PKPRestrictBulkEmailsForm.php b/classes/components/forms/context/PKPRestrictBulkEmailsForm.php
@@ -43,7 +43,7 @@ public function __construct($action, $context, LazyCollection $userGroups)
         foreach ($userGroups as $userGroup) {
             $userGroupOptions[] = [
                 'value' => $userGroup->getId(),
-                'label' => $userGroup->getLocalizedData('name'),
+                'label' => htmlspecialchars($userGroup->getLocalizedData('name')),
             ];
         }
 

diff --git a/classes/components/forms/context/PKPThemeForm.php b/classes/components/forms/context/PKPThemeForm.php
@@ -67,7 +67,7 @@ public function __construct($action, $locales, $context = null)
         foreach ($plugins as $plugin) {
             $themes[] = [
                 'value' => $plugin->getDirName(),
-                'label' => $plugin->getDisplayName(),
+                'label' => htmlspecialchars($plugin->getDisplayName()),
             ];
         }
 

diff --git a/classes/components/forms/site/PKPSiteAppearanceForm.php b/classes/components/forms/site/PKPSiteAppearanceForm.php
@@ -51,7 +51,7 @@ public function __construct($action, $locales, $site, $baseUrl, $temporaryFileAp
         foreach ($plugins as $pluginName => $plugin) {
             $sidebarOptions[] = [
                 'value' => $pluginName,
-                'label' => $plugin->getDisplayName(),
+                'label' => htmlspecialchars($plugin->getDisplayName()),
             ];
         }
 

diff --git a/classes/components/forms/site/PKPSiteBulkEmailsForm.php b/classes/components/forms/site/PKPSiteBulkEmailsForm.php
@@ -47,7 +47,7 @@ public function __construct($action, $site, $contexts)
         foreach ($contexts as $context) {
             $options[] = [
                 'value' => $context->id,
-                'label' => $context->name,
+                'label' => htmlspecialchars($context->name),
             ];
         }
 

diff --git a/classes/components/forms/site/PKPSiteConfigForm.php b/classes/components/forms/site/PKPSiteConfigForm.php
@@ -55,7 +55,7 @@ public function __construct($action, $locales, $site)
         foreach ($contextsIterator as $context) {
             $options[] = [
                 'value' => $context->getId(),
-                'label' => $context->getLocalizedData('name'),
+                'label' => htmlspecialchars($context->getLocalizedData('name')),
             ];
         }
         if (count($options) > 1) {

diff --git a/classes/components/forms/submission/PKPSubmissionFileForm.php b/classes/components/forms/submission/PKPSubmissionFileForm.php
@@ -45,7 +45,7 @@ public function __construct($action, $genres)
             'options' => array_map(function ($genre) {
                 return [
                     'value' => (int) $genre->getId(),
-                    'label' => $genre->getLocalizedName(),
+                    'label' => htmlspecialchars($genre->getLocalizedName()),
                 ];
             }, $genres),
             'value' => 0,

diff --git a/classes/components/listPanels/PKPSelectReviewerListPanel.php b/classes/components/listPanels/PKPSelectReviewerListPanel.php
@@ -24,6 +24,9 @@ class PKPSelectReviewerListPanel extends ListPanel
     /** @var string URL to the API endpoint where items can be retrieved */
     public $apiUrl = '';
 
+    /** @var array Affiliatory institutions of the publication authors */
+    public $authorAffiliations = [];
+
     /** @var int Number of items to show at one time */
     public $count = 30;
 
@@ -62,6 +65,7 @@ public function getConfig()
     {
         $config = parent::getConfig();
         $config['apiUrl'] = $this->apiUrl;
+        $config['authorAffiliations'] = $this->authorAffiliations;
         $config['count'] = $this->count;
         $config['currentlyAssigned'] = $this->currentlyAssigned;
         $config['selectorName'] = $this->selectorName;
@@ -129,7 +133,6 @@ public function getConfig()
         }
 
         $config['itemsMax'] = $this->itemsMax;
-
         $config['activeReviewsCountLabel'] = __('reviewer.list.activeReviews');
         $config['activeReviewsLabel'] = __('reviewer.list.activeReviewsDescription');
         $config['assignedToLastRoundLabel'] = __('reviewer.list.assignedToLastRound');
@@ -148,6 +151,7 @@ public function getConfig()
         $config['reassignLabel'] = __('reviewer.list.reassign');
         $config['reassignWithNameLabel'] = __('reviewer.list.reassign.withName');
         $config['reviewerRatingLabel'] = __('reviewer.list.reviewerRating');
+        $config['reviewerSameInstitutionLabel'] = __('reviewer.list.reviewerSameInstitution');
         $config['reviewInterestsLabel'] = __('reviewer.list.reviewInterests');
         $config['selectReviewerLabel'] = __('editor.submission.selectReviewer');
         $config['warnOnAssignmentLabel'] = __('reviewer.list.warnOnAssign');

diff --git a/classes/core/DataObject.php b/classes/core/DataObject.php
@@ -19,11 +19,10 @@
 namespace PKP\core;
 
 use APP\core\Application;
-use Exception;
 use PKP\db\DAO;
 use PKP\db\DAORegistry;
-use \PKP\filter\FilterDAO;
 use PKP\facades\Locale;
+use PKP\filter\FilterDAO;
 
 /**
  * @template T of EntityDAO|DAO
@@ -62,56 +61,59 @@ public function __construct()
     /**
      * Get a piece of data for this object, localized to the current
      * locale if possible.
-     *
-     * @param string $key
-     * @param string $preferredLocale
      */
-    public function getLocalizedData($key, $preferredLocale = null)
+    public function getLocalizedData(string $key, string $preferredLocale = null, string &$selectedLocale = null): mixed
     {
-        $localePrecedence = $this->_getLocalePrecedence();
-        foreach ($localePrecedence as $locale) {
+        foreach ($this->getLocalePrecedence($preferredLocale) as $locale) {
             $value = & $this->getData($key, $locale);
             if (!empty($value)) {
+                $selectedLocale = $locale;
                 return $value;
             }
             unset($value);
         }
 
         // Fallback: Get the first available piece of data.
         $data = $this->getData($key, null);
-        if (!empty($data)) {
-            $locales = array_keys($data);
-            $firstLocale = array_shift($locales);
-            return $data[$firstLocale];
+        foreach ((array) $data as $locale => $dataValue) {
+            if (!empty($dataValue)) {
+                $selectedLocale = $locale;
+                return $dataValue;
+            }
         }
 
         return null;
     }
 
     /**
-     * Get the stack of "important" locales, most important first.
-
+     * Get the locale precedence order for object in the following order
      *
-     * @return string[]
+     * 1. Preferred Locale if provided
+     * 2. User's current local
+     * 3. Object's default locale if set
+     * 4. Context's primary locale if context available
+     * 5. Site's primary locale
      */
-    private function _getLocalePrecedence(): array
+    public function getLocalePrecedence(string $preferredLocale = null): array
     {
-        static $localePrecedence;
-        if (!isset($localePrecedence)) {
-            $request = Application::get()->getRequest();
-            $localePrecedence = [Locale::getLocale()];
-
-            $context = $request->getContext();
-            if ($context && !in_array($context->getPrimaryLocale(), $localePrecedence)) {
-                $localePrecedence[] = $context->getPrimaryLocale();
-            }
+        $request = Application::get()->getRequest();
+
+        return array_unique(
+            array_filter([
+                $preferredLocale ?? Locale::getLocale(),
+                $this->getDefaultLocale(),
+                $request->getContext()?->getPrimaryLocale(),
+                $request->getSite()->getPrimaryLocale(),
+            ])
+        );
+    }
 
-            $site = $request->getSite();
-            if ($site && !in_array($site->getPrimaryLocale(), $localePrecedence)) {
-                $localePrecedence[] = $site->getPrimaryLocale();
-            }
-        }
-        return $localePrecedence;
+    /**
+     * Get the default locale for object
+     */
+    public function getDefaultLocale(): ?string
+    {
+        return null;
     }
 
     /**
@@ -120,7 +122,6 @@ private function _getLocalePrecedence(): array
      * @param string $key
      * @param string $locale (optional)
      *
-     * @return mixed
      */
     public function &getData($key, $locale = null)
     {
@@ -493,7 +494,7 @@ public function injectMetadata($metadataDescription)
      *
      * @param \PKP\metadata\MetadataSchema $metadataSchema
      *
-     * @return $metadataDescription MetadataDescription
+     * @return MetadataDescription
      */
     public function extractMetadata($metadataSchema)
     {

diff --git a/classes/core/ItemIterator.php b/classes/core/ItemIterator.php
@@ -18,7 +18,7 @@
 namespace PKP\core;
 
 /**
- * @template TKey
+ * @template TKey of array-key
  * @template TValue
  */
 class ItemIterator
@@ -43,7 +43,7 @@ public function next()
     /**
      * Return the next item with key.
      *
-     * @return array<Tkey,TValue>
+     * @return array{?TKey, ?TValue}
      */
     public function nextWithKey()
     {

diff --git a/classes/core/PKPApplication.php b/classes/core/PKPApplication.php
@@ -467,7 +467,6 @@ public function getCurrentVersion()
     public function getDAOMap()
     {
         return [
-            'AccessKeyDAO' => 'PKP\security\AccessKeyDAO',
             'AnnouncementDAO' => 'PKP\announcement\AnnouncementDAO',
             'AnnouncementTypeDAO' => 'PKP\announcement\AnnouncementTypeDAO',
             'CitationDAO' => 'PKP\citation\CitationDAO',

diff --git a/classes/facades/Repo.php b/classes/facades/Repo.php
@@ -35,6 +35,7 @@
 use PKP\submissionFile\Repository as SubmissionFileRepository;
 use PKP\userGroup\Repository as UserGroupRepository;
 use PKP\log\event\Repository as EventLogRepository;
+use PKP\invitation\repositories\Invitation as InvitationRepository;
 
 class Repo
 {
@@ -88,8 +89,13 @@ public static function userGroup(): UserGroupRepository
         return app(UserGroupRepository::class);
     }
 
-	public static function eventLog(): EventLogRepository
-	{
-		return app(EventLogRepository::class);
-	}
+    public static function eventLog(): EventLogRepository
+    {
+        return app(EventLogRepository::class);
+    }
+
+    public static function invitation(): InvitationRepository
+    {
+        return app(InvitationRepository::class);
+    }
 }
diff --git a/classes/filter/CompositeFilter.php b/classes/filter/CompositeFilter.php
@@ -367,7 +367,7 @@ public function hasData($key, $locale = null)
      *
      * @param string $settingName
      *
-     * @return $compositeSettingName string
+     * @return string Composite setting name
      */
     public function _getCompositeSettingName($settingName)
     {

diff --git a/classes/filter/FilterHelper.php b/classes/filter/FilterHelper.php
@@ -210,7 +210,7 @@ public function compareFilters(&$filterA, $filterBSettings, &$filterBSubfilters)
      *
      * @param XMLNode $settingNode
      *
-     * @return $setting array a key-value pair.
+     * @return array A key-value pair.
      */
     public function getFilterSetting($settingNode)
     {