Merge remote-tracking branch 'upstream/edge' into edge

.github/ISSUE_TEMPLATE/bug_report_form.yaml

@@ -0,0 +1,55 @@
+name: Bug Report
+description: Create a report to help us improve
+title: "[Bug] "
+labels: ["Bug (unconfirmed)"]
+body:
+  - type: markdown
+    attributes:
+      value: | 
+        Thanks for taking the time to fill out this bug report to help FreshRSS improve!
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: "A clear and concise description of what the bug is.\n\nIf applicable, add screenshots to help explain your problem."
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior. (Screenshots could help to explain the steps.)
+      placeholder: "1. Go to '…'\n2. Click on '…'\n3. Scroll down to '…'\n4. See error"
+      value: "1. Go to '…'\n2. Click on '…'\n3. Scroll down to '…'\n4. See error"
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: false
+  - type: input
+    id: freshRSS
+    attributes:
+      label: FreshRSS version
+      description: Which FreshRSS version is installed?
+      placeholder: e.g. 1.23.1
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment information
+      description: Please complete the following information
+      value: "- Database version: [e.g. Mysql 5.7, SQLite]\n- PHP version: [e.g. PHP 8.1]\n- Installation type: [e.g. Docker, Docker image source, git, Yunohost]\n-Web server type: [e.g. Apache, nginx]\n- Device: [e.g. iPhone13]\n- OS: [e.g. Ubuntu 22.04, Win10, MacOS14]\n- Browser: [e.g. Firefox 124]"
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here.
+    validations:
+      required: false

.github/workflows/jekyll-gh-pages.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@v1
         with:

Makefile

@@ -40,6 +40,7 @@ start: ## Start the development environment (use Docker)
 	docker network create --driver bridge $(NETWORK) || true
 	$(foreach extension,$(extensions),$(eval volumes=$(volumes) --volume $(extension):/var/www/FreshRSS/extensions/$(notdir $(extension)):z))
 	docker run \
+		-it \
 		--rm \
 		--volume $(shell pwd):/var/www/FreshRSS:z \
 		$(volumes) \

app/Controllers/tagController.php

@@ -195,6 +195,8 @@ public function renameAction(): void {
 	}
 
 	public function indexAction(): void {
+		FreshRSS_View::prependTitle(_t('sub.menu.label_management') . ' · ');
+
 		if (!FreshRSS_Auth::hasAccess()) {
 			Minz_Error::error(403);
 		}

app/Models/Category.php

@@ -214,6 +214,7 @@ public function refreshDynamicOpml(): bool {
 						// The feed does not exist in the current category, so add that feed
 						$dryRunFeed->_category($this);
 						$ok &= ($feedDAO->addFeedObject($dryRunFeed) !== false);
+						$existingFeeds[$dryRunFeed->url()] = $dryRunFeed;
 					} else {
 						$existingFeed = $existingFeeds[$dryRunFeed->url()];
 						if ($existingFeed->mute()) {

app/Services/ImportService.php

@@ -183,7 +183,7 @@ private function createFeed(array $feed_elt, FreshRSS_Category $category, bool $
 			if (isset($feed_elt['frss:filtersActionRead'])) {
 				$feed->_filtersAction(
 					'read',
-					preg_split('/\R/', $feed_elt['frss:filtersActionRead']) ?: []
+					preg_split('/\R/u', $feed_elt['frss:filtersActionRead']) ?: []
 				);
 			}
 
@@ -268,7 +268,7 @@ private function createFeed(array $feed_elt, FreshRSS_Category $category, bool $
 				$curl_params[CURLOPT_FOLLOWLOCATION] = (bool)$feed_elt['frss:CURLOPT_FOLLOWLOCATION'];
 			}
 			if (isset($feed_elt['frss:CURLOPT_HTTPHEADER'])) {
-				$curl_params[CURLOPT_HTTPHEADER] = preg_split('/\R/', $feed_elt['frss:CURLOPT_HTTPHEADER']) ?: [];
+				$curl_params[CURLOPT_HTTPHEADER] = preg_split('/\R/u', $feed_elt['frss:CURLOPT_HTTPHEADER']) ?: [];
 			}
 			if (isset($feed_elt['frss:CURLOPT_MAXREDIRS'])) {
 				$curl_params[CURLOPT_MAXREDIRS] = (int)$feed_elt['frss:CURLOPT_MAXREDIRS'];

app/views/feed/contentSelectorPreview.phtml

@@ -6,14 +6,14 @@
 	$dir = '';
 	if (_t('gen.dir') === 'rtl') {
 		$dir = ' dir="rtl"';
-		$class = 'rtl ';
+		$class = ' rtl ';
 	}
 	if (FreshRSS_Context::userConf()->darkMode !== 'no') {
-		$class .= 'darkMode_' . FreshRSS_Context::userConf()->darkMode;
+		$class .= ' darkMode_' . FreshRSS_Context::userConf()->darkMode;
 	}
 ?>
 <!DOCTYPE html>
-<html class="preview_background" lang="<?= FreshRSS_Context::userConf()->language ?>"<?= $dir ?> xml:lang="<?= FreshRSS_Context::userConf()->language ?>" class="<?= $class ?>">
+<html class="preview_background<?= $class ?>" lang="<?= FreshRSS_Context::userConf()->language ?>"<?= $dir ?> xml:lang="<?= FreshRSS_Context::userConf()->language ?>">
 	<head>
 		<?= FreshRSS_View::headStyle() ?>
 		<script src="<?= Minz_Url::display('/scripts/preview.js?' . @filemtime(PUBLIC_PATH . '/scripts/preview.js')) ?>"></script>

app/views/tag/index.phtml

@@ -29,10 +29,30 @@
 
 	<?php if (count($this->tags) > 0): ?>
 	<h2><?= _t('gen.action.manage') ?></h2>
-	<ul>
+	<ul id="tagsList" <?= (count($this->tags) > 11) ? 'class="listInColumns"' : '' ?>>
 	<?php foreach ($this->tags as $tag): ?>
-		<li><a href="<?= _url('tag', 'update', 'id', $tag->id()) ?>"><?= $tag->name() ?></a></li>
+		<li>
+			<a href="<?= _url('tag', 'update', 'id', $tag->id()) ?>" class="configure open-slider" title="<?= _t('gen.action.manage') ?>">
+				<?= _i('configure') ?>
+			</a>
+			<?= $tag->name() ?>
+		</li>
 	<?php endforeach; ?>
 	</ul>
 	<?php endif; ?>
 </main>
+
+<?php $class = isset($this->tag) ? ' active' : ''; ?>
+<aside id="slider" class="<?= $class ?>">
+	<a class="toggle_aside" href="#close"><img class="icon" src="../themes/icons/close.svg" loading="lazy" alt="❌"></a>
+	<div id="slider-content">
+		<?php
+			if (isset($this->tag)) {
+				$this->renderHelper('tag/update');
+			}
+		?>
+	</div>
+</aside>
+<a href="#" id="close-slider">
+	<?= _i('close') ?>
+</a>

composer.json

@@ -61,7 +61,7 @@
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "^9",
-        "squizlabs/php_codesniffer": "^3.8"
+        "squizlabs/php_codesniffer": "^3.9"
     },
     "scripts": {
         "php-lint": "find . -type d -name 'vendor' -prune -o -name '*.php' -print0 | xargs -0 -n1 -P4 php -l 1>/dev/null",

docs/en/admins/01_Index.md

@@ -25,4 +25,5 @@ Learn how to install, update, and backup FreshRSS, as well as how to use the com
 * [Database configuration](DatabaseConfig.md)
 * [Using the command line interface (CLI)](https://github.com/FreshRSS/FreshRSS/tree/edge/cli)
 * [Configuring the email address validation](05_Configuring_email_validation.md)
+* [Reverse proxy with Caddy](Caddy.md)
 * [Frequently asked questions](04_Frequently_Asked_Questions.md)