more fixes

This commit is contained in:
Parziphal 2013-10-27 15:19:10 -05:00
parent 30764ffc17
commit 23e213d226

View File

@ -17,6 +17,7 @@ class Installer extends Base
{ {
$this->loadConfig(); $this->loadConfig();
if ($this->request()->path() == '/') {
if (!$this->validateSafeIps()) { if (!$this->validateSafeIps()) {
# Client not allowed # Client not allowed
if ($this->dataDirExists()) { if ($this->dataDirExists()) {
@ -56,12 +57,16 @@ class Installer extends Base
$this->renderMessage($e->getMessage()); $this->renderMessage($e->getMessage());
} }
} }
} else {
# Load application and let it serve the request.
$appClass = get_class(Rails::application());
$appClass::dispatchRequest();
}
} }
protected function checkWriteablePaths() protected function checkWriteablePaths()
{ {
$paths = [ $paths = [
'/install',
'/log', '/log',
'/tmp', '/tmp',
'/public' '/public'