diff --git "a/docs/30_\342\232\231\357\270\217_Configuration.md" "b/docs/30_\342\232\231\357\270\217_Configuration.md" index cb6580c058bb023e3b507fdd9a849518c335d381..05fa791ae6d6be05d9129d6eaaf7f590ad22fed6 100644 --- "a/docs/30_\342\232\231\357\270\217_Configuration.md" +++ "b/docs/30_\342\232\231\357\270\217_Configuration.md" @@ -28,9 +28,9 @@ Let's start with an example for a `redirects_<FQDN>.json`: }, "regex":{ - "^/$": {"code": 307, "target": "https://www.iml.unibe.ch" }, - "^/ax.l.*": {"code": 307, "target": "https://www.axel-hahn.de" }, - ".*": {"code": 301, "target": "https://www2.example.com" } + "^/$": {"code": 307, "target": "https://www.iml.unibe.ch", "link": "/" }, + "^/ax.l.*": {"code": 307, "target": "https://www.axel-hahn.de", "link": "/axelhahn" }, + ".*": {"code": 301, "target": "https://www2.example.com", "link": "/testme" } } } ``` @@ -72,6 +72,7 @@ Both redirect section contain a redirect definition * code - http status code for redirection * target - target url of the redirect +* link - optional, for regex only: set a path for a test link Status codes diff --git a/public_html/admin/index.php b/public_html/admin/index.php index daf645531b85d41ab89a4ac37542f54d1df048c0..9076f48593a47863e6a2d8983bebb6e7ae7585d9 100644 --- a/public_html/admin/index.php +++ b/public_html/admin/index.php @@ -24,7 +24,6 @@ $sHtml = ''; $sErrors = ''; $aIco = [ - 'h2_err' => '⚠️', 'h2_config' => '🛠️', 'h2_file' => '📄', @@ -32,6 +31,8 @@ $aIco = [ 'ip_warn' => '🟠', 'ip_err' => '❗', + 'error' => '❗', + 'type_config' => '🔷', 'type_alias' => '▪️', @@ -89,7 +90,7 @@ if (!$oR->isEnabled()) { $sMyIp = gethostbyname($_SERVER['SERVER_NAME']); if (!$sMyIp) { - $sErrors .= '<li>Ip address of current host [' . $_SERVER['SERVER_NAME'] . '] was not found.</li>'; + $sErrors .= '<li>'.$aIco['error'].' Ip address of current host [' . $_SERVER['SERVER_NAME'] . '] was not found.</li>'; } // ---------- GET CONFIG DATA @@ -99,7 +100,7 @@ if (!$oR->isEnabled()) { // ---------- SHOW ERRORS if (count($aHosts['_errors'])) { - $sErrors .= '<li>' . implode('</li><li>', $aHosts['_errors']) . '</li>'; + $sErrors .= '<li>'.$aIco['error'].' ' . implode('</li><li>'.$aIco['error'].' ', $aHosts['_errors']) . '</li>'; } unset($aHosts['_errors']); @@ -238,8 +239,7 @@ if (!$oR->isEnabled()) { ; $sErrors = $sErrors - ? '<!-- <h2>' . $aIco['h2_err'] . ' Found errors</h2> -->' - . '<ol class="error">' + ? '<ol class="error">' . $sErrors . '</ol>' : '' diff --git a/public_html/classes/redirect.admin.class.php b/public_html/classes/redirect.admin.class.php index b1b66cf9a491ebbca74f6be638ad6d9e731fa709..92979e10f6a319328bbbfd887c700c8c05d94e02 100644 --- a/public_html/classes/redirect.admin.class.php +++ b/public_html/classes/redirect.admin.class.php @@ -141,8 +141,8 @@ class redirectadmin extends redirect $iHops = (count($aTmp[0]) - 1); $sReturn = ($iHops > 0 - ? 'Found hops: <strong>' . $iHops . '</strong>' - . ($iHops > 1 ? ' <span class="warning"> ⚠️ Verify your redirect to skip unneeded hops.</span>' : '') . '<br><br>' + ? '<br>Found hops: <strong>' . $iHops . '</strong>' + . ($iHops > 1 ? ' <br><span class="warning"> ⚠️ Verify your redirect to skip unneeded hops.</span>' : '') . '<br><br>' : '' ) . $sReturn ;