reactos/web
1
0
Fork 0
mirror of https://github.com/reactos/web.git synced 2024-12-04 01:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ROSWEB] Relative paths suck when symlinks are involved, so source the layout parts from the only absolute server path that is guaranteed to work.

Browse Source
This commit is contained in:
Colin Finck 2020-03-08 07:58:36 +01:00
parent 71d302e7cd
commit 367c0bd0db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/www.reactos.org/rosweb/rosweb.php
View File

@ -66,11 +66,11 @@
// Server name might be just an IP address // Server name might be just an IP address
if (preg_match("#[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}#", $_SERVER["SERVER_NAME"])) if (preg_match("#[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}#", $_SERVER["SERVER_NAME"]))
return $_SERVER["SERVER_NAME"]; return $_SERVER["SERVER_NAME"];
// If it' a DNS address, return the domain name along with the suffix // If it' a DNS address, return the domain name along with the suffix
if (preg_match("#(\.[^.]+\.[^.]+$)#", $_SERVER["SERVER_NAME"], $matches)) if (preg_match("#(\.[^.]+\.[^.]+$)#", $_SERVER["SERVER_NAME"], $matches))
return $matches[1]; return $matches[1];
// Otherwise return nothing // Otherwise return nothing
return ""; return "";
} }
@ -96,9 +96,9 @@
private function _queryProvider($part) private function _queryProvider($part)
{ {
if (file_exists(__DIR__ . '../../www.reactos.org_content/parts/' . $part)) if (file_exists('/srv/www/www.reactos.org_content/parts/' . $part))
{ {
readfile(__DIR__ . '../../www.reactos.org_content/parts/' . $part); readfile('/srv/www/www.reactos.org_content/parts/' . $part);
} }
else else
{ {