From a353e769e148911915bbb6c26635fe5eb6700504 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Sun, 4 Dec 2022 15:54:52 +0100
Subject: [PATCH] clean alias list and separate new alias form

---
 index.php | 103 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 67 insertions(+), 36 deletions(-)
diff --git a/index.php b/index.php
index 2a324b4..23d418f 100644
--- a/index.php
+++ b/index.php
@@ -18,6 +18,7 @@ dcPage::check(dcCore::app()->auth->makePermissions([dcAuth::PERMISSION_ADMIN]));
 
 $o       = new dcAliases();
 $aliases = $o->getAliases();
+$part   = $_REQUEST['part'] ?? 'list';
 
 # Update aliases
 if (isset($_POST['a']) && is_array($_POST['a'])) {
@@ -49,50 +50,80 @@ if (isset($_POST['alias_url'])) {
 <body>
 <?php
 
-echo
-dcPage::breadcrumb([
-    __('Plugins') => '',
-    __('Aliases') => '',
-]) .
-dcPage::notices() .
-
-'<h3>' . __('Aliases list') . '</h3>';
-
-if (empty($aliases)) {
-    echo '<p>' . __('No alias') . '</p>';
+if ($part == 'new') {
+    echo
+    dcPage::breadcrumb([
+        __('Plugins') => '',
+        __('Aliases') => dcCore::app()->adminurl->get('admin.plugin.alias', ['part' => 'list']),
+        __('New alias') => '',
+    ]) .
+    dcPage::notices() .
+    '<h3>' . __('New alias') . '</h3>' .
+    '<form action="' . dcCore::app()->admin->getPageURL() . '" method="post">' .
+    '<p class="field"><label>' . __('Alias URL:') . ' ' . form::field('alias_url', 50, 255) . '</label></p>' .
+    '<p class="field"><label>' . __('Alias destination:') . ' ' . form::field('alias_destination', 50, 255) . '</label></p>' .
+    '<p class="form-note">' . sprintf(__('Do not put blog URL "%s" in fields.'), dcCore::app()->blog->url) . '</p>' .
+    '<p>' . 
+    dcCore::app()->formNonce() . 
+    form::hidden('part', 'new') .
+    '<input type="submit" value="' . __('Save') . '" /></p>' .
+    '</form>';
 } else {
     echo
-    '<form action="' . dcCore::app()->admin->getPageURL() . '" method="post">' .
-    '<table><tr>' .
-    '<td>' . __('Alias URL') . '</td>' .
-    '<td>' . __('Alias destination') . '</td>' .
-    '<td>' . __('Alias position') . '</td>' .
-    '</tr>';
+    dcPage::breadcrumb([
+        __('Plugins') => '',
+        __('Aliases') => ''
+    ]) .
+    dcPage::notices() .
+    '<p class="top-add"><a class="button add" href="' .
+        dcCore::app()->adminurl->get('admin.plugin.alias', ['part' => 'new']) .
+    '">' . __('New alias') . '</a></p>';
 
-    foreach ($aliases as $k => $v) {
+    if (empty($aliases)) {
+        echo '<p>' . __('No alias') . '</p>';
+    } else {
         echo
+        '<form action="' . dcCore::app()->admin->getPageURL() . '" method="post">' .
+        '<div class="table-outer">' .
+        '<table>' .
+        '<caption>' . __('Aliases list') . '</caption>' .
+        '<thead>' .
         '<tr>' .
-        '<td>' . form::field(['a[' . $k . '][alias_url]'], 30, 255, html::escapeHTML($v['alias_url'])) . '</td>' .
-        '<td>' . form::field(['a[' . $k . '][alias_destination]'], 50, 255, html::escapeHTML($v['alias_destination'])) . '</td>' .
-        '<td>' . form::field(['a[' . $k . '][alias_position]'], 3, 5, html::escapeHTML($v['alias_position'])) . '</td>' .
-        '</tr>';
+        '<th class="nowrap" scope="col">' . __('Alias URL') . '</th>' .
+        '<th class="nowrap" scope="col">' . __('Alias destination') . '</th>' .
+        '<th class="nowrap" scope="col">' . __('Alias position') . '</th>' .
+        '</tr>' .
+        '</thead><tbody>';
+
+        foreach ($aliases as $k => $v) {
+            echo
+            '<tr class="line" id="l_' . $k . '">' .
+            '<td>' . 
+            form::field(['a[' . $k . '][alias_url]'], 50, 255, html::escapeHTML($v['alias_url'])) . '</td>' .
+            '<td class="maximal">' . 
+            form::field(['a[' . $k . '][alias_destination]'], 50, 255, html::escapeHTML($v['alias_destination'])) . '</td>' .
+            '<td class="minimal">' . 
+            form::number(['a[' . $k . '][alias_position]'], [
+                'min'        => 1,
+                'max'        => count($aliases),
+                'default'    => (int) $v['alias_position'],
+                'class'      => 'position',
+                'extra_html' => 'title="' . sprintf(__('position of %s'), html::escapeHTML($v['alias_url'])) . '"',
+            ]) . '</td>' .
+            '</tr>';
+        }
+
+        echo 
+        '</tbody></table></div>' .
+        '<p class="form-note">' . __('To remove an alias, empty its URL or destination.') . '</p>' .
+        '<p>' . 
+        dcCore::app()->formNonce() .
+        form::hidden('part', 'list') .
+        '<input type="submit" value="' . __('Update') . '" /></p>' .
+        '</form>';
     }
-
-    echo '</table>' .
-    '<p>' . __('To remove an alias, empty its URL or destination.') . '</p>' .
-    '<p>' . dcCore::app()->formNonce() .
-    '<input type="submit" value="' . __('Update') . '" /></p>' .
-    '</form>';
 }
 
-echo
-'<h3>' . __('New alias') . '</h3>' .
-'<form action="' . dcCore::app()->admin->getPageURL() . '" method="post">' .
-'<p class="field"><label>' . __('Alias URL:') . ' ' . form::field('alias_url', 50, 255) . '</label></p>' .
-'<p class="field"><label>' . __('Alias destination:') . ' ' . form::field('alias_destination', 50, 255) . '</label></p>' .
-'<p>' . dcCore::app()->formNonce() . '<input type="submit" value="' . __('Save') . '" /></p>' .
-'</form>';
-
 dcPage::helpBlock('alias');
 ?>
 </body>

' . __('Alias URL') . '	' . __('Alias destination') . '	' . __('Alias position') . '
' . form::field(['a[' . $k . '][alias_url]'], 30, 255, html::escapeHTML($v['alias_url'])) . '	' . form::field(['a[' . $k . '][alias_destination]'], 50, 255, html::escapeHTML($v['alias_destination'])) . '	' . form::field(['a[' . $k . '][alias_position]'], 3, 5, html::escapeHTML($v['alias_position'])) . '
' . + form::field(['a[' . $k . '][alias_url]'], 50, 255, html::escapeHTML($v['alias_url'])) . '	' . + form::field(['a[' . $k . '][alias_destination]'], 50, 255, html::escapeHTML($v['alias_destination'])) . '	' . + form::number(['a[' . $k . '][alias_position]'], [ + 'min' => 1, + 'max' => count($aliases), + 'default' => (int) $v['alias_position'], + 'class' => 'position', + 'extra_html' => 'title="' . sprintf(__('position of %s'), html::escapeHTML($v['alias_url'])) . '"', + ]) . '