dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Jerome Nadaud
2013-11-25 17:09:20 +01:00
parent 89f794ae5e 553568a72d
commit 2b0224efe1
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/system.php
+16 -13
View File
@@ -74,6 +74,9 @@ class InstallControllerHttpSystem extends InstallControllerHttp
if (!isset($this->tests['optional'])) if (!isset($this->tests['optional']))
$this->tests['optional'] = $this->model_system->checkOptionalTests(); $this->tests['optional'] = $this->model_system->checkOptionalTests();
if (!is_callable('getenv') || !($user = @getenv('APACHE_RUN_USER')))
$user = 'Apache';
// Generate display array // Generate display array
$this->tests_render = array( $this->tests_render = array(
'required' => array( 'required' => array(
@@ -96,21 +99,21 @@ class InstallControllerHttpSystem extends InstallControllerHttp
) )
), ),
array( array(
'title' => $this->l('Recursive write permissions on files and folders:'), 'title' => $this->l('Permissions on files and folders'),
'success' => 1, 'success' => 1,
'checks' => array( 'checks' => array(
'config_dir' => '~/config/', 'config_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/config/'),
'cache_dir' => '~/cache/', 'cache_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/cache/'),
'log_dir' => '~/log/', 'log_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/log/'),
'img_dir' => '~/img/', 'img_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/img/'),
'mails_dir' => '~/mails/', 'mails_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/mails/'),
'module_dir' => '~/modules/', 'module_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/modules/'),
'theme_lang_dir' => '~/themes/default/lang/', 'theme_lang_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/themes/default/lang/'),
'theme_pdf_lang_dir' => '~/themes/default/pdf/lang/', 'theme_pdf_lang_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/themes/default/pdf/lang/'),
'theme_cache_dir' => '~/themes/default/cache/', 'theme_cache_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/themes/default/cache/'),
'translations_dir' => '~/translations/', 'translations_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/translations/'),
'customizable_products_dir' => '~/upload/', 'customizable_products_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/upload/'),
'virtual_products_dir' => '~/download/' 'virtual_products_dir' => $this->l('Recursive write permissions for %1$s user on %2$s', $user, '~/download/')
) )
), ),
), ),