Change add feed action (#3027)

* Docker Alpine 3.12 (#3025)

https://alpinelinux.org/posts/Alpine-3.12.0-released.html
With PHP 7.3.18 (from 7.3.17) (and Apache 2.4.43 unchanged).
No other significant change spotted

* Ensure feed attributes are used before load

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

2 files changed, 95 insertions, 55 deletions

diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml
new file mode 100644
index 000000000..a86c105f2
--- /dev/null
+++ b/app/views/subscription/add.phtml
@@ -0,0 +1,91 @@
+<?php $this->partial('aside_subscription'); ?>
+
+<div class="post drop-section">
+    <a href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
+
+	<h2><?= _t('sub.title.add_feed') ?></h2>
+    <form id="add_rss" method="post" action="<?= _url('feed', 'add') ?>" autocomplete="off">
+		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+
+		<div class="form-group">
+			<label class="group-name" for="url_rss"><?= _t('sub.feed.url') ?></label>
+			<div class="group-controls">
+				<input id="url_rss" name="url_rss" type="url" required="required" autocomplete="off" class="long"/>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="category"><?= _t('sub.category') ?></label>
+			<div class="group-controls">
+                <select name="category" id="category">
+                <?php foreach ($this->categories as $cat) { ?>
+                <option value="<?= $cat->id() ?>"<?= $cat->id() == 1 ? ' selected="selected"' : '' ?>>
+                    <?= $cat->name() ?>
+                </option>
+                <?php } ?>
+                </select>
+			</div>
+		</div>
+
+        <legend><?= _t('sub.feed.auth.configuration') ?></legend>
+		<div class="form-group">
+			<label class="group-name" for="http_user_feed"><?= _t('sub.feed.auth.username') ?></label>
+			<div class="group-controls">
+				<input id="http_user_feed" name="http_user_feed" type="text" autocomplete="off"/>
+			</div>
+		</div>
+
+		<div class="form-group">
+        <label class="group-name" for="http_pass_feed"><?= _t('sub.feed.auth.password') ?></label>
+			<div class="group-controls">
+				<input id="http_pass_feed" name="http_pass_feed" type="text" value=" " autocomplete="new-password"/>
+			</div>
+		</div>
+
+		<?php if (FreshRSS_Auth::hasAccess('admin')) { ?>
+		<legend><?= _t('sub.feed.advanced') ?></legend>
+		<div class="form-group">
+			<label class="group-name" for="timeout"><?= _t('sub.feed.timeout') ?></label>
+			<div class="group-controls">
+				<input type="number" name="timeout" id="timeout" min="3" max="120" value="" placeholder="<?= _t('gen.short.by_default') ?>" />
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name" for="ssl_verify"><?= _t('sub.feed.ssl_verify') ?></label>
+			<div class="group-controls">
+				<label class="checkbox" for="ssl_verify">
+					<select name="ssl_verify" id="ssl_verify">
+						<option value=""><?= _t('gen.short.by_default') ?></option>
+						<option value="0"><?= _t('gen.short.no') ?></option>
+						<option value="1"><?= _t('gen.short.yes') ?></option>
+					</select>
+				</label>
+			</div>
+		</div>
+		<?php } ?>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?= _t('gen.action.add') ?></button>
+			</div>
+		</div>
+	</form>
+
+	<h2><?= _t('sub.title.add_category') ?></h2>
+	<form action="<?= _url('category', 'create') ?>" method="post">
+		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+		<div class="form-group">
+			<label class="group-name" for="new-category"><?= _t('sub.category') ?></label>
+			<div class="group-controls">
+				<input id="new-category" name="new-category" type="text" autocomplete="off"/>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?= _t('gen.action.add') ?></button>
+			</div>
+		</div>
+	</form>
+</div>
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index a92359151..131a1db91 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -5,71 +5,20 @@
 
 	<h2><?= _t('sub.title') ?></h2>
 
-	<form id="add_rss" method="post" action="<?= _url('feed', 'add') ?>" autocomplete="off">
-		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
-		<div class="stick">
-			<input type="url" name="url_rss" class="long" placeholder="<?= _t('sub.feed.add') ?>" />
-			<div class="dropdown">
-				<div id="dropdown-cat" class="dropdown-target"></div>
-
-				<a class="dropdown-toggle btn" href="#dropdown-cat"><?= _i('down') ?></a>
-				<ul class="dropdown-menu">
-					<li class="dropdown-close"><a href="#close">❌</a></li>
-
-					<li class="dropdown-header"><?= _t('sub.category') ?></li>
-
-					<li class="input">
-						<select name="category" id="category">
-						<?php foreach ($this->categories as $cat) { ?>
-						<option value="<?= $cat->id() ?>"<?= $cat->id() == 1 ? ' selected="selected"' : '' ?>>
-							<?= $cat->name() ?>
-						</option>
-						<?php } ?>
-						<option value="nc"><?= _t('sub.category.new') ?></option>
-						</select>
-					</li>
-
-					<li class="input" aria-hidden="true">
-						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?= _t('sub.category.new') ?>" />
-					</li>
-
-					<li class="separator"></li>
-
-					<li class="dropdown-header"><?= _t('sub.feed.auth.http') ?></li>
-					<li class="input">
-						<input type="text" name="http_user" id="http_user_feed" value=" " autocomplete="off" placeholder="<?= _t('sub.feed.auth.username') ?>" />
-					</li>
-					<li class="input">
-						<input type="password" name="http_pass" id="http_pass_feed" autocomplete="new-password" placeholder="<?= _t('sub.feed.auth.password') ?>" />
-					</li>
-				</ul>
-			</div>
-			<button class="btn" type="submit"><?= _i('add') ?></button>
-		</div>
-	</form>
-
 	<p class="alert alert-warn">
 		<?= _t('sub.feed.moved_category_deleted', $this->default_category->name()) ?>
 	</p>
 
+	<p class="alert alert-warn">
+		<?= _t('sub.add', _url('subscription', 'add')) ?>
+	</p>
+
 	<?php if ($this->onlyFeedsWithError): ?>
 	<p class="alert alert-warn">
 		<?= _t('sub.feed.showing.error') ?>
 	</p>
 	<?php endif; ?>
 
-	<div class="box">
-		<div class="box-title"><label for="new-category"><?= _t('sub.category.add') ?></label></div>
-
-		<ul class="box-content box-content-centered">
-			<form action="<?= _url('category', 'create') ?>" method="post">
-				<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
-				<li class="item"><input type="text" id="new-category" name="new-category" placeholder="<?= _t('sub.category.new') ?>" /></li>
-				<li class="item"><button class="btn btn-important" type="submit"><?= _t('gen.action.submit') ?></button></li>
-			</form>
-		</ul>
-	</div>
-
 	<form id="controller-category" method="post" aria-hidden="true">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 	</form>