From fb0f89c3fede088869629ccaf1bec788ce1c07cb Mon Sep 17 00:00:00 2001
From: maTh <1645099+math-GH@users.noreply.github.com>
Date: Sun, 8 Dec 2024 16:28:06 +0100
Subject: Fixed: No user query - no information (#7062)

* Update queries.phtml

* i18n

* fix _blank target

* No user queries are saved yet

* Update app/i18n/it/conf.php

Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com>

* Update app/i18n/it/conf.php

Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com>

* Update app/i18n/fr/conf.php

---------

Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
---
 app/views/configure/queries.phtml | 104 ++++++++++++++++++++------------------
 1 file changed, 56 insertions(+), 48 deletions(-)

(limited to 'app/views')

diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
index d085016fb..e8ff32bdd 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -11,56 +11,64 @@
 	<form method="post" action="<?= _url('configure', 'queries') ?>" class="draggableList">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 		<h1><?= _t('conf.query') ?></h1>
+		<?php if (count($this->queries) < 1) { ?>
+			<div class="alert alert-warn">
+				<p><?= _t('conf.query.no_queries') ?></p>
+				<p class="help"><?= _i('help') ?> <?= _t('conf.query.no_queries.help') ?></p>
+		</div>
+		<?php
+		} else {
+			foreach ($this->queries as $key => $query) { ?>
+				<div class="form-group" id="query-group-<?= $key ?>" draggable="true">
+					<div class="box">
+						<div class="box-title">
+							<a class="configure open-slider" href="<?= _url('configure', 'query', 'id', '' . $key) ?>"><?= _i('configure') ?></a><h2><?= $query->getName() ?></h2>
+							<input type="hidden" id="queries_<?= $key ?>_name" name="queries[<?= $key ?>][name]" value="<?= $query->getName() ?>"/>
+							<input type="hidden" id="queries_<?= $key ?>_token" name="queries[<?= $key ?>][token]" value="<?= $query->getToken() ?>"/>
+							<input type="hidden" id="queries_<?= $key ?>_shareRss" name="queries[<?= $key ?>][token]" value="<?= $query->shareRss() ?>"/>
+							<input type="hidden" id="queries_<?= $key ?>_shareOpml" name="queries[<?= $key ?>][token]" value="<?= $query->shareOpml() ?>"/>
+							<input type="hidden" id="queries_<?= $key ?>_url" name="queries[<?= $key ?>][url]" value="<?= $query->getUrl() ?>"/>
+							<input type="hidden" id="queries_<?= $key ?>_search" name="queries[<?= $key ?>][search]" value="<?= urlencode($query->getSearch()->getRawInput()) ?>"/>
+							<input type="hidden" id="queries_<?= $key ?>_state" name="queries[<?= $key ?>][state]" value="<?= $query->getState() ?>"/>
+							<input type="hidden" id="queries_<?= $key ?>_order" name="queries[<?= $key ?>][order]" value="<?= $query->getOrder() ?>"/>
+							<input type="hidden" id="queries_<?= $key ?>_get" name="queries[<?= $key ?>][get]" value="<?= $query->getGet() ?>"/>
+						</div>
+						<?php if (!$query->hasParameters()) { ?>
+						<div class="box-content">
+							<div class="alert alert-warn">
+								<div class="alert-head"><?= _t('conf.query.no_filter') ?></div>
+							</div>
+						</div>
+						<?php } elseif ($query->isDeprecated()) { ?>
+						<div class="box-content">
+							<div class="alert alert-error">
+								<div class="alert-head"><?= _t('conf.query.deprecated') ?></div>
+							</div>
+						</div>
+						<?php } else { ?>
+							<ul class="box-content scrollbar-thin">
+							<?php if ($query->hasSearch()) { ?>
+							<li class="item"><?= _t('conf.query.search', htmlspecialchars($query->getSearch()->getRawInput(), ENT_NOQUOTES, 'UTF-8')) ?></li>
+							<?php } ?>
 
-		<?php foreach ($this->queries as $key => $query) { ?>
-		<div class="form-group" id="query-group-<?= $key ?>" draggable="true">
-			<div class="box">
-				<div class="box-title">
-					<a class="configure open-slider" href="<?= _url('configure', 'query', 'id', '' . $key) ?>"><?= _i('configure') ?></a><h2><?= $query->getName() ?></h2>
-					<input type="hidden" id="queries_<?= $key ?>_name" name="queries[<?= $key ?>][name]" value="<?= $query->getName() ?>"/>
-					<input type="hidden" id="queries_<?= $key ?>_token" name="queries[<?= $key ?>][token]" value="<?= $query->getToken() ?>"/>
-					<input type="hidden" id="queries_<?= $key ?>_shareRss" name="queries[<?= $key ?>][token]" value="<?= $query->shareRss() ?>"/>
-					<input type="hidden" id="queries_<?= $key ?>_shareOpml" name="queries[<?= $key ?>][token]" value="<?= $query->shareOpml() ?>"/>
-					<input type="hidden" id="queries_<?= $key ?>_url" name="queries[<?= $key ?>][url]" value="<?= $query->getUrl() ?>"/>
-					<input type="hidden" id="queries_<?= $key ?>_search" name="queries[<?= $key ?>][search]" value="<?= urlencode($query->getSearch()->getRawInput()) ?>"/>
-					<input type="hidden" id="queries_<?= $key ?>_state" name="queries[<?= $key ?>][state]" value="<?= $query->getState() ?>"/>
-					<input type="hidden" id="queries_<?= $key ?>_order" name="queries[<?= $key ?>][order]" value="<?= $query->getOrder() ?>"/>
-					<input type="hidden" id="queries_<?= $key ?>_get" name="queries[<?= $key ?>][get]" value="<?= $query->getGet() ?>"/>
-				</div>
-				<?php if (!$query->hasParameters()) { ?>
-				<div class="box-content">
-					<div class="alert alert-warn">
-						<div class="alert-head"><?= _t('conf.query.no_filter') ?></div>
-					</div>
-				</div>
-				<?php } elseif ($query->isDeprecated()) { ?>
-				<div class="box-content">
-					<div class="alert alert-error">
-						<div class="alert-head"><?= _t('conf.query.deprecated') ?></div>
-					</div>
-				</div>
-				<?php } else { ?>
-					<ul class="box-content scrollbar-thin">
-					<?php if ($query->hasSearch()) { ?>
-					<li class="item"><?= _t('conf.query.search', htmlspecialchars($query->getSearch()->getRawInput(), ENT_NOQUOTES, 'UTF-8')) ?></li>
-					<?php } ?>
-
-					<?php if ($query->getState()) { ?>
-					<li class="item"><?= _t('conf.query.state_' . $query->getState()) ?></li>
-					<?php } ?>
+							<?php if ($query->getState()) { ?>
+							<li class="item"><?= _t('conf.query.state_' . $query->getState()) ?></li>
+							<?php } ?>
 
-					<?php if ($query->getOrder() !== '') { ?>
-					<li class="item"><?= _t('conf.query.order_' . strtolower($query->getOrder())) ?></li>
-					<?php } ?>
+							<?php if ($query->getOrder() !== '') { ?>
+							<li class="item"><?= _t('conf.query.order_' . strtolower($query->getOrder())) ?></li>
+							<?php } ?>
 
-					<?php if ($query->getGet() !== '') { ?>
-					<li class="item"><?= _t('conf.query.get_' . $query->getGetType(), $query->getGetName()) ?></li>
-					<?php } ?>
-					<?php } ?>
-					</ul>
-			</div>
-		</div>
-		<?php } ?>
+							<?php if ($query->getGet() !== '') { ?>
+							<li class="item"><?= _t('conf.query.get_' . $query->getGetType(), $query->getGetName()) ?></li>
+							<?php } ?>
+							<?php } ?>
+							</ul>
+					</div>
+				</div>
+			<?php
+			}
+		}?>
 	</form>
 </main>
 
@@ -70,7 +78,7 @@
 	<div id="slider-content">
 		<?php
 			if ($this->query != null) {
-				$this->renderHelper('configure/query');
+			$this->renderHelper('configure/query');
 			}
 		?>
 	</div>
-- 
cgit v1.2.3