Mibew/mibew
1
0
Fork 0
mirror of https://github.com/Mibew/mibew.git synced 2025-01-31 13:24:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove "mibew_root" variable from configs

Browse Source
This commit is contained in:
Dmitriy Simushev 2014-07-10 14:18:11 +00:00
parent 5688f81904
commit b5e502c647
4 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mibew/configs/default_config.yml
View File

@ -2,9 +2,6 @@
# your own settings!
# Application path on server
mibew_root: /mibew
# MySQL Database parameters
database:
host: ""

2
src/mibew/libs/classes/Mibew/Controller/InstallController.php
View File

@ -89,7 +89,7 @@ class InstallController extends AbstractController
}
$installer = $this->getInstaller();
if (!$installer->checkRequirements($request->getBasePath())) {
if (!$installer->checkRequirements()) {
return $this->renderError(
'install_err',
array('error' => $installer->getErrors())

38
src/mibew/libs/classes/Mibew/Installer.php
View File

@ -109,12 +109,9 @@ class Installer
* {@link Installer::getLog()} method. Also the list of all errors can be
* got using {@link \Mibew\Installer::getErrors()}.
*
* @param string $real_base_path Real base path of the Mibew instance. For
* example if one tries to install Mibew to http://example.com/foo/mibew/
* the argument should be equal to "foo/mibew".
* @return boolean True if all reqirements are satisfied and false otherwise
*/
public function checkRequirements($real_base_path)
public function checkRequirements()
{
if (!$this->checkPhpVersion()) {
return false;
@ -125,15 +122,6 @@ class Installer
array(format_version_id($this->getPhpVersionId()))
);
if (!$this->checkMibewRoot($real_base_path)) {
return false;
}
$this->log[] = getlocal(
'Application path is {0}',
array($real_base_path)
);
return true;
}
@ -444,30 +432,6 @@ class Installer
return true;
}
/**
* Checks if $mibewroot param in system configs is correct or not.
*
* @param string $real_base_path Real base path of the Mibew instance.
* @return boolean True if the $mibewroot param in config is correct and
* false otherwise.
*/
protected function checkMibewRoot($real_base_path)
{
if ($real_base_path != MIBEW_WEB_ROOT) {
$this->errors[] = getlocal(
"Please, check file {0}<br/>Wrong value of \"mibew_root\" variable, should be \"{1}\"",
array(
$real_base_path . "/configs/config.yml",
$real_base_path
)
);
return false;
}
return true;
}
/**
* Checks database connection.
*

14
src/mibew/libs/init.php
View File

@ -34,19 +34,13 @@ require_once(MIBEW_FS_ROOT . '/vendor/autoload.php');
require_once(MIBEW_FS_ROOT . '/libs/common/configurations.php');
$configs = load_system_configs();
// Sanitize path to application and remove extra slashes
$mibewroot = join(
"/",
array_map(
"rawurlencode",
preg_split('/\//', preg_replace('/\/+$/', '', preg_replace('/\/{2,}/', '/', '/' . $configs['mibew_root'])))
)
);
/**
* Base URL of the Mibew installation
*/
define('MIBEW_WEB_ROOT', $mibewroot);
define(
'MIBEW_WEB_ROOT',
\Symfony\Component\HttpFoundation\Request::createFromGlobals()->getBasePath()
);
// Include system constants file
require_once(MIBEW_FS_ROOT . '/libs/common/constants.php');