ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle when SERVER['HTTP_HOST'] is not set

This commit is contained in:
Isaac Connor 2021-10-05 19:49:37 -04:00
parent d622ae9251
commit 1a27ac9ab3
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/includes/Server.php
View File

@ -39,6 +39,7 @@ class Server extends ZM_Object {
} else if ( $this->Id() ) { } else if ( $this->Id() ) {
return $this->{'Name'}; return $this->{'Name'};
} }
if (isset($_SERVER['HTTP_HOST'])) {
# This theoretically will match ipv6 addresses as well # This theoretically will match ipv6 addresses as well
if ( preg_match( '/^(\[[[:xdigit:]:]+\]|[^:]+)(:[[:digit:]]+)?$/', $_SERVER['HTTP_HOST'], $matches ) ) { if ( preg_match( '/^(\[[[:xdigit:]:]+\]|[^:]+)(:[[:digit:]]+)?$/', $_SERVER['HTTP_HOST'], $matches ) ) {
return $matches[1]; return $matches[1];
@ -47,6 +48,8 @@ class Server extends ZM_Object {
$result = explode(':', $_SERVER['HTTP_HOST']); $result = explode(':', $_SERVER['HTTP_HOST']);
return $result[0]; return $result[0];
} }
return '';
}
public function Protocol( $new = null ) { public function Protocol( $new = null ) {
if ( $new != null ) if ( $new != null )