Mirrors/Sequenzia
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Parziphal 2013-10-27 15:19:10 -05:00
parent 30764ffc17
commit 23e213d226
1 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
install/ApplicationInstaller/Installer.php
View File

@ -17,51 +17,56 @@ class Installer extends Base
{
$this->loadConfig();
if (!$this->validateSafeIps()) {
# Client not allowed
if ($this->dataDirExists()) {
# Updating message
$this->renderMessage(self::$PLEASE_WAIT_MESSAGE);
if ($this->request()->path() == '/') {
if (!$this->validateSafeIps()) {
# Client not allowed
if ($this->dataDirExists()) {
# Updating message
$this->renderMessage(self::$PLEASE_WAIT_MESSAGE);
} else {
# Installing message
$this->renderMessage(sprintf(self::$ACCESS_DENIED_MESSAGE, $_SERVER['REMOTE_ADDR']));
}
} else {
# Installing message
$this->renderMessage(sprintf(self::$ACCESS_DENIED_MESSAGE, $_SERVER['REMOTE_ADDR']));
# Client allowed; serve forms/commit actions
try {
# To make things nice, check write permissions
# on some paths.
$this->checkWriteablePaths();
if ($this->request()->isGet()) {
# Serve forms
if ($this->dataDirExists()) {
# Update form
$this->renderUpdateForm();
} else {
# Install form
$this->renderInstallForm();
}
} else {
# Commit actions
if ($this->dataDirExists()) {
# Update
$this->commitUpdate();
} else {
# Install
$this->commitInstall();
}
}
} catch (Exception\ExceptionInterface $e) {
$this->renderMessage($e->getMessage());
}
}
} else {
# Client allowed; serve forms/commit actions
try {
# To make things nice, check write permissions
# on some paths.
$this->checkWriteablePaths();
if ($this->request()->isGet()) {
# Serve forms
if ($this->dataDirExists()) {
# Update form
$this->renderUpdateForm();
} else {
# Install form
$this->renderInstallForm();
}
} else {
# Commit actions
if ($this->dataDirExists()) {
# Update
$this->commitUpdate();
} else {
# Install
$this->commitInstall();
}
}
} catch (Exception\ExceptionInterface $e) {
$this->renderMessage($e->getMessage());
}
# Load application and let it serve the request.
$appClass = get_class(Rails::application());
$appClass::dispatchRequest();
}
}
protected function checkWriteablePaths()
{
$paths = [
'/install',
'/log',
'/tmp',
'/public'