Skip to content
Snippets Groups Projects
Commit 51078315 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

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

small fix

See merge request !10
parents 886b80aa 08e8e154
No related branches found
No related tags found
1 merge request!10small fix
...@@ -149,7 +149,7 @@ if (!$oR->isEnabled()) { ...@@ -149,7 +149,7 @@ if (!$oR->isEnabled()) {
$sRelFrom = $sFrom; $sRelFrom = $sFrom;
break; break;
case 'regex': case 'regex':
$sRelFrom = $aTo['link'] ?? false; $sRelFrom = $aTo['link'] ?? ($sFrom == '.*' ? 'something' : false);
break; break;
} }
......
...@@ -164,8 +164,9 @@ class redirectadmin extends redirect ...@@ -164,8 +164,9 @@ class redirectadmin extends redirect
// $sReturn .= '<strong>'.$iJump.') HTTP status: '.$iStatus.' - '.$sUrl.'</strong><pre>'.$sBlock.'</pre>'; // $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\">" $sBox.="<div class=\"box $sStatus\">"
// .$sUrl.'<br>'
.$sWebhost.'<br>' .$sWebhost.'<br>'
. $this->_getIp($sWebhost) . $this->_getIp($sWebhost)
.'</div>'; .'</div>';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment