phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-05 08:30:07 +01:00
Code Activity

Merge pull request #740 from pedroborges/master

Browse Source 
Add support to setup Kirby above webroot
This commit is contained in:
Matt Stauffer
2020-06-12 23:24:00 -04:00
committed by GitHub
parent 2a9f16a5d5 d208c83a6a
commit 6d1e9c3a06
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cli/drivers/KirbyValetDriver.php
View File

@@ -27,6 +27,8 @@ public function isStaticFile($sitePath, $siteName, $uri)
{ {
if ($this->isActualFile($staticFilePath = $sitePath.$uri)) { if ($this->isActualFile($staticFilePath = $sitePath.$uri)) {
return $staticFilePath; return $staticFilePath;
} elseif ($this->isActualFile($staticFilePath = $sitePath.'/public'.$uri)) {
return $staticFilePath;
} }
return false; return false;
@@ -42,19 +44,27 @@ public function isStaticFile($sitePath, $siteName, $uri)
*/ */
public function frontControllerPath($sitePath, $siteName, $uri) public function frontControllerPath($sitePath, $siteName, $uri)
{ {
// Needed to force Kirby to use *.dev to generate its URLs... $scriptName = '/index.php';
$_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'];
if (preg_match('/^\/panel/', $uri) && file_exists($sitePath . '/panel/index.php')) { if ($this->isActualFile($sitePath.'/index.php')) {
$_SERVER['SCRIPT_NAME'] = '/panel/index.php'; $indexPath = $sitePath.'/index.php';
return $sitePath.'/panel/index.php';
} }
if (file_exists($indexPath = $sitePath.'/index.php')) { if ($isAboveWebroot = $this->isActualFile($sitePath.'/public/index.php')) {
$_SERVER['SCRIPT_NAME'] = '/index.php'; $indexPath = $sitePath.'/public/index.php';
}
if (preg_match('/^\/panel/', $uri) && $this->isActualFile($sitePath.'/panel/index.php')) {
$scriptName = '/panel/index.php';
$indexPath = $sitePath.'/panel/index.php';
}
$sitePathPrefix = ($isAboveWebroot) ? $sitePath.'/public' : $sitePath;
$_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'];
$_SERVER['SCRIPT_NAME'] = $scriptName;
$_SERVER['SCRIPT_FILENAME'] = $sitePathPrefix.$scriptName;
return $indexPath; return $indexPath;
} }
}
} }