Merge branch '7728-handle-http-and-https-redirects' into 'master'

small fix

See merge request !10

public_html/admin/index.php

@@ -149,7 +149,7 @@ if (!$oR->isEnabled()) {
                                 $sRelFrom = $sFrom;
                                 break;
                             case 'regex':
-                                $sRelFrom = $aTo['link'] ?? false;
+                                $sRelFrom = $aTo['link'] ?? ($sFrom == '.*' ? 'something' : false);
                                 break;
                         }
 

public_html/classes/redirect.admin.class.php

@@ -164,8 +164,9 @@ class redirectadmin extends redirect
                 // $sReturn .= '<strong>'.$iJump.') HTTP status: '.$iStatus.' - '.$sUrl.'</strong><pre>'.$sBlock.'</pre>';
                 
 
-                $sWebhost=parse_url($sUrl, PHP_URL_HOST);
+                $sWebhost=preg_replace('/_$/', '', parse_url($sUrl, PHP_URL_HOST));
                 $sBox.="<div class=\"box $sStatus\">"
+                    // .$sUrl.'<br>'
                     .$sWebhost.'<br>'
                     . $this->_getIp($sWebhost)
                     .'</div>';
@@ -179,7 +180,7 @@ class redirectadmin extends redirect
         }
         $iHops = $iJump-1;
         $sReturn = '<br>'.($iHops > 0
-            ? 'Found hops: <strong>' . $iHops . '</strong>'
+            ? 'Found hops: <strong>' . $iHops . '</strong> '
             . ($iHops > 1 ? '<span class="warning"> ⚠️ Verify your redirect to skip unneeded hops.</span>' : '') . '<br><br>'
             . '<div>'.$sBox.'</div><br><br><br>'
             : ''