|
|
@@ -294,7 +294,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { |
|
|
|
* @return string |
|
|
|
*/ |
|
|
|
public function getHeader(string $name): string { |
|
|
|
$name = strtoupper(str_replace('-', '_', $name)); |
|
|
|
$name = strtoupper(str_replace('-', '_',$name)); |
|
|
|
if (isset($this->server['HTTP_' . $name])) { |
|
|
|
return $this->server['HTTP_' . $name]; |
|
|
|
} |
|
|
@@ -622,14 +622,12 @@ class Request implements \ArrayAccess, \Countable, IRequest { |
|
|
|
|
|
|
|
/** |
|
|
|
* Check overwrite condition |
|
|
|
* @param string $type |
|
|
|
* @return bool |
|
|
|
*/ |
|
|
|
private function isOverwriteCondition(string $type = ''): bool { |
|
|
|
private function isOverwriteCondition(): bool { |
|
|
|
$regex = '/' . $this->config->getSystemValueString('overwritecondaddr', '') . '/'; |
|
|
|
$remoteAddr = isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : ''; |
|
|
|
return $regex === '//' || preg_match($regex, $remoteAddr) === 1 |
|
|
|
|| $type !== 'protocol'; |
|
|
|
return $regex === '//' || preg_match($regex, $remoteAddr) === 1; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
@@ -639,7 +637,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { |
|
|
|
*/ |
|
|
|
public function getServerProtocol(): string { |
|
|
|
if ($this->config->getSystemValueString('overwriteprotocol') !== '' |
|
|
|
&& $this->isOverwriteCondition('protocol')) { |
|
|
|
&& $this->isOverwriteCondition()) { |
|
|
|
return $this->config->getSystemValueString('overwriteprotocol'); |
|
|
|
} |
|
|
|
|