Missing es_ES translations for "Updating instructions..."

.github/workflows/stable-3_3_0.yml

@@ -0,0 +1,57 @@
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      ['stable-3_3_0']
+name: ojs
+jobs:
+  ojs:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php-version: 8.0
+            validate: 'validate'
+          - php-version: 7.3
+            database: pgsql
+            test: 'test'
+          - php-version: 7.3
+            database: mysql
+            test: 'test'
+          - php-version: 7.4
+            database: pgsql
+            test: 'test'
+          - php-version: 7.4
+            database: mysql
+            test: 'test'
+          - php-version: 8.0
+            database: mysql
+            test: 'test'
+          - php-version: 8.0
+            database: pgsql
+            test: 'test'
+          - php-version: 8.1
+            database: mysql
+            test: 'test'
+          - php-version: 8.1
+            database: pgsql
+            test: 'test'
+          - php-version: 8.2
+            database: mysql
+            test: 'test'
+          - php-version: 8.2
+            database: pgsql
+            test: 'test'
+
+
+    name: ojs
+    steps:
+      - uses: pkp/pkp-github-actions@v1
+        with:
+          node_version: 12
+          dataset_branch: 'stable-3_3_0'
+          DATASETS_ACCESS_KEY:  ${{secrets.DATASETS_ACCESS_KEY}}
+          DEBUG_IN_TMATE:  false

.gitignore

@@ -5,6 +5,7 @@ temp
 /plugins/paymethod/paypal/vendor/
 .htaccess
 .project
+.vscode
 .buildpath
 .settings
 .DS_Store

README.md

@@ -2,7 +2,7 @@
 
 > Open Journal Systems (OJS) has been developed by the Public Knowledge Project. For general information about OJS and other open research systems, visit the [PKP web site][pkp].
 
-[![Build Status](https://travis-ci.org/pkp/ojs.svg?branch=master)](https://travis-ci.org/pkp/ojs)
+[![Build Status](https://app.travis-ci.com/pkp/ojs.svg?branch=stable-3_3_0)](https://app.travis-ci.com/pkp/ojs)
 
 ## Documentation
 

api/v1/submissions/index.php

@@ -16,10 +16,11 @@
  *
  */
 $requestPath = Application::get()->getRequest()->getRequestPath();
-if (strpos($requestPath, '/files')) {
+$urlParts = explode('/', trim($_SERVER['PATH_INFO'], '/'));
+if (count($urlParts) >= 6 && $urlParts[5] == 'files') {
 	import('lib.pkp.api.v1.submissions.PKPSubmissionFileHandler');
 	return new PKPSubmissionFileHandler();
 } else {
 	import('lib.pkp.api.v1.submissions.PKPSubmissionHandler');
 	return new PKPSubmissionHandler();
-}
+}

classes/article/ArticleGalleyDAO.inc.php

@@ -14,6 +14,9 @@
  * @brief Operations for retrieving and modifying ArticleGalley objects.
  */
 
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Database\Query\Builder;
+
 import('classes.article.ArticleGalley');
 import('lib.pkp.classes.db.SchemaDAO');
 import('lib.pkp.classes.plugins.PKPPubIdPluginDAO');
@@ -52,6 +55,24 @@ function newDataObject() {
 		return new ArticleGalley();
 	}
 
+	/**
+	 * @copydoc RepresentationDAO::getById()
+	 */
+	function getById($representationId, $publicationId = null) {
+		$row = Capsule::table($this->tableName)
+			->where($this->primaryKeyColumn, (int) $representationId)
+			->when(!is_null($publicationId), function(Builder $query) use ($publicationId) {
+				$query->where('publication_id', (int) $publicationId);
+			})
+			->first();
+		if (!$row) {
+			return null;
+		}
+		// Convert to an assoc array
+		$rowArray = json_decode(json_encode($row), true);
+		return $this->_fromRow($rowArray);
+	}
+
 	/**
 	 * Retrieve a galley by ID.
 	 * @param $pubIdType string One of the NLM pub-id-type values or
@@ -289,20 +310,19 @@ function getExportable($contextId, $pubIdType = null, $title = null, $author = n
 			$params[] = $pubIdSettingValue;
 		}
 
-		$result = $this->retrieveRange(
-			$sql = 'SELECT	g.*
-			FROM	publication_galleys g
-				LEFT JOIN publications p ON (p.publication_id = g.publication_id)
-				LEFT JOIN publication_settings ps ON (ps.publication_id = p.publication_id)
-				LEFT JOIN submissions s ON (s.submission_id = p.submission_id)
-				LEFT JOIN submission_files sf ON (g.submission_file_id = sf.submission_file_id)
-				' . ($pubIdType != null?' LEFT JOIN publication_galley_settings gs ON (g.galley_id = gs.galley_id)':'')
-				. ($title != null?' LEFT JOIN publication_settings pst ON (p.publication_id = pst.publication_id)':'')
-				. ($author != null?' LEFT JOIN authors au ON (p.publication_id = au.publication_id)
-						LEFT JOIN author_settings asgs ON (asgs.author_id = au.author_id AND asgs.setting_name = \''.IDENTITY_SETTING_GIVENNAME.'\')
-						LEFT JOIN author_settings asfs ON (asfs.author_id = au.author_id AND asfs.setting_name = \''.IDENTITY_SETTING_FAMILYNAME.'\')
-					':'')
-				. ($pubIdSettingName != null?' LEFT JOIN publication_galley_settings gss ON (g.galley_id = gss.galley_id AND gss.setting_name = ?)':'') .'
+		$baseSql = '
+			FROM publication_galleys g
+			LEFT JOIN publications p ON (p.publication_id = g.publication_id)
+			LEFT JOIN publication_settings ps ON (ps.publication_id = p.publication_id)
+			LEFT JOIN submissions s ON (s.submission_id = p.submission_id)
+			LEFT JOIN submission_files sf ON (g.submission_file_id = sf.submission_file_id)
+			' . ($pubIdType != null?' LEFT JOIN publication_galley_settings gs ON (g.galley_id = gs.galley_id)':'')
+			. ($title != null?' LEFT JOIN publication_settings pst ON (p.publication_id = pst.publication_id)':'')
+			. ($author != null?' LEFT JOIN authors au ON (p.publication_id = au.publication_id)
+					LEFT JOIN author_settings asgs ON (asgs.author_id = au.author_id AND asgs.setting_name = \''.IDENTITY_SETTING_GIVENNAME.'\')
+					LEFT JOIN author_settings asfs ON (asfs.author_id = au.author_id AND asfs.setting_name = \''.IDENTITY_SETTING_FAMILYNAME.'\')
+				':'')
+			. ($pubIdSettingName != null?' LEFT JOIN publication_galley_settings gss ON (g.galley_id = gss.galley_id AND gss.setting_name = ?)':'') .'
 			WHERE
 				s.status = ? AND s.context_id = ?
 				' . ($pubIdType != null?' AND gs.setting_name = ? AND gs.setting_value IS NOT NULL':'')
@@ -312,12 +332,15 @@ function getExportable($contextId, $pubIdType = null, $title = null, $author = n
 				. (($pubIdSettingName != null && $pubIdSettingValue != null && $pubIdSettingValue == EXPORT_STATUS_NOT_DEPOSITED)?' AND gss.setting_value IS NULL':'')
 				. (($pubIdSettingName != null && $pubIdSettingValue != null && $pubIdSettingValue != EXPORT_STATUS_NOT_DEPOSITED)?' AND gss.setting_value = ?':'')
 				. (($pubIdSettingName != null && is_null($pubIdSettingValue))?' AND (gss.setting_value IS NULL OR gss.setting_value = \'\')':'') .'
-				GROUP BY g.galley_id
-				ORDER BY p.date_published DESC, p.publication_id DESC, g.galley_id DESC',
+			GROUP BY g.galley_id
+		';
+
+		$result = $this->retrieveRange(
+			"SELECT g.* {$baseSql} ORDER BY p.date_published DESC, p.publication_id DESC, g.galley_id DESC",
 			$params,
 			$rangeInfo
 		);
 
-		return new DAOResultFactory($result, $this, '_fromRow', [], $sql, $params, $rangeInfo);
+		return new DAOResultFactory($result, $this, '_fromRow', [], "SELECT 0 {$baseSql}", $params, $rangeInfo);
 	}
 }

classes/article/AuthorDAO.inc.php

@@ -25,7 +25,7 @@ class AuthorDAO extends PKPAuthorDAO {
 	 * Authors will be sorted by (family, given). Note that if journalId is null,
 	 * alphabetized authors for all enabled journals are returned.
 	 * If authors have the same given names, first names and affiliations in all journal locales,
-	 * as well as country and email (otional), they are considered to be the same.
+	 * as well as country and email (optional), they are considered to be the same.
 	 * @param $journalId int Optional journal ID to restrict results to
 	 * @param $initial An initial a family name must begin with, "-" for authors with no family names
 	 * @param $rangeInfo Range information
@@ -90,46 +90,52 @@ function getAuthorsAlphabetizedByJournal($journalId = null, $initial = null, $ra
 			$initialSql .= ')';
 		}
 
+		$baseSql = '
+			FROM authors a
+			JOIN user_groups ug ON (a.user_group_id = ug.user_group_id)
+			JOIN publications p ON (p.publication_id = a.publication_id)
+			JOIN submissions s ON (s.current_publication_id = p.publication_id)
+			LEFT JOIN author_settings agl ON (a.author_id = agl.author_id AND agl.setting_name = ? AND agl.locale = ?)
+			LEFT JOIN author_settings agpl ON (a.author_id = agpl.author_id AND agpl.setting_name = ? AND agpl.locale = s.locale)
+			LEFT JOIN author_settings afl ON (a.author_id = afl.author_id AND afl.setting_name = ? AND afl.locale = ?)
+			LEFT JOIN author_settings afpl ON (a.author_id = afpl.author_id AND afpl.setting_name = ? AND afpl.locale = s.locale)
+			JOIN (
+				SELECT
+				MIN(aa.author_id) as author_id,
+				CONCAT(
+				' . ($includeEmail ? 'aa.email, \' \', ' : '') . '
+				ac.setting_value,
+				\' \'
+				' . $sqlColumnsAuthorSettings . '
+				) as names
+				FROM authors aa
+				JOIN publications pp ON (pp.publication_id = aa.publication_id)
+				LEFT JOIN publication_settings ppss ON (ppss.publication_id = pp.publication_id)
+				JOIN submissions ss ON (ss.submission_id = pp.submission_id AND ss.current_publication_id = pp.publication_id AND ss.status = ' . STATUS_PUBLISHED . ')
+				JOIN journals j ON (ss.context_id = j.journal_id)
+				JOIN issues i ON (ppss.setting_name = ? AND ppss.setting_value = CAST(i.issue_id AS CHAR(20)) AND i.published = 1)
+				LEFT JOIN author_settings ac ON (ac.author_id = aa.author_id AND ac.setting_name = \'country\')
+				' . $sqlJoinAuthorSettings . '
+				WHERE j.enabled = 1
+				' . (isset($journalId) ? ' AND j.journal_id = ?' : '')
+				. $initialSql . '
+				GROUP BY names
+			) as t1 ON (t1.author_id = a.author_id)
+		';
+
 		$result = $this->retrieveRange(
-			$sql = 'SELECT a.*, ug.show_title, s.locale,
+			"SELECT
+				a.*, ug.show_title, s.locale,
 				COALESCE(agl.setting_value, agpl.setting_value) AS author_given,
-				CASE WHEN agl.setting_value <> \'\' THEN afl.setting_value ELSE afpl.setting_value END AS author_family
-			FROM	authors a
-				JOIN user_groups ug ON (a.user_group_id = ug.user_group_id)
-				JOIN publications p ON (p.publication_id = a.publication_id)
-				JOIN submissions s ON (s.current_publication_id = p.publication_id)
-				LEFT JOIN author_settings agl ON (a.author_id = agl.author_id AND agl.setting_name = ? AND agl.locale = ?)
-				LEFT JOIN author_settings agpl ON (a.author_id = agpl.author_id AND agpl.setting_name = ? AND agpl.locale = s.locale)
-				LEFT JOIN author_settings afl ON (a.author_id = afl.author_id AND afl.setting_name = ? AND afl.locale = ?)
-				LEFT JOIN author_settings afpl ON (a.author_id = afpl.author_id AND afpl.setting_name = ? AND afpl.locale = s.locale)
-				JOIN (
-					SELECT
-					MIN(aa.author_id) as author_id,
-					CONCAT(
-					' . ($includeEmail ? 'aa.email, \' \', ' : '') . '
-					ac.setting_value,
-					\' \'
-					' . $sqlColumnsAuthorSettings . '
-					) as names
-					FROM authors aa
-					JOIN publications pp ON (pp.publication_id = aa.publication_id)
-					LEFT JOIN publication_settings ppss ON (ppss.publication_id = pp.publication_id)
-					JOIN submissions ss ON (ss.submission_id = pp.submission_id AND ss.current_publication_id = pp.publication_id AND ss.status = ' . STATUS_PUBLISHED . ')
-					JOIN journals j ON (ss.context_id = j.journal_id)
-					JOIN issues i ON (ppss.setting_name = ? AND ppss.setting_value = CAST(i.issue_id AS CHAR(20)) AND i.published = 1)
-					LEFT JOIN author_settings ac ON (ac.author_id = aa.author_id AND ac.setting_name = \'country\')
-					' . $sqlJoinAuthorSettings . '
-					WHERE j.enabled = 1
-					' . (isset($journalId) ? ' AND j.journal_id = ?' : '')
-					. $initialSql . '
-					GROUP BY names
-				) as t1 ON (t1.author_id = a.author_id)
-				ORDER BY author_family, author_given',
+				CASE WHEN agl.setting_value <> '' THEN afl.setting_value ELSE afpl.setting_value END AS author_family
+			{$baseSql}
+			ORDER BY
+				author_family, author_given",
 			$params,
 			$rangeInfo
 		);
 
-		return new DAOResultFactory($result, $this, '_fromRow', [], $sql, $params, $rangeInfo);
+		return new DAOResultFactory($result, $this, '_fromRow', [], "SELECT 0 {$baseSql}", $params, $rangeInfo);
 	}
 }
 

classes/components/forms/context/MastheadForm.inc.php

@@ -39,6 +39,11 @@ public function __construct($action, $locales, $context, $imageUploadUrl) {
 				'groupId' => 'publishing',
 				'value' => $context->getData('publisherInstitution'),
 			]))
+			->addField(new FieldText('publisherUrl', [
+				'label' => __('common.url'),
+				'groupId' => 'publishing',
+				'value' => $context->getData('publisherUrl'),
+			]))
 			->addField(new FieldText('onlineIssn', [
 				'label' => __('manager.setup.onlineIssn'),
 				'size' => 'small',

classes/components/forms/publication/AssignToIssueForm.inc.php

@@ -45,7 +45,7 @@ public function __construct($action, $publication, $publicationContext) {
 			foreach ($unpublishedIssues as $issue) {
 				$issueOptions[] = [
 					'value' => (int) $issue->getId(),
-					'label' => $issue->getIssueIdentification(),
+					'label' => htmlspecialchars($issue->getIssueIdentification()),
 				];
 			}
 		}
@@ -58,7 +58,7 @@ public function __construct($action, $publication, $publicationContext) {
 			foreach ($publishedIssues as $issue) {
 				$issueOptions[] = [
 					'value' => (int) $issue->getId(),
-					'label' => $issue->getIssueIdentification(),
+					'label' => htmlspecialchars($issue->getIssueIdentification()),
 				];
 			}
 		}