Merge branch 'master' into develop
This commit is contained in:
commit
5e43c1974d
3
.gitignore
vendored
3
.gitignore
vendored
@ -8,7 +8,8 @@ nav
|
||||
app/inc/config.php
|
||||
vendor
|
||||
cache/
|
||||
tpl_c/
|
||||
tpl_c/*
|
||||
!tpl_c/.gitkeep
|
||||
.php_cs.cache
|
||||
.zanata-cache/
|
||||
|
||||
|
@ -10,7 +10,6 @@ test:
|
||||
stage: test
|
||||
script:
|
||||
- composer install -o --no-interaction --no-progress --prefer-dist
|
||||
- mkdir tpl_c
|
||||
- php vendor/bin/php-cs-fixer fix --verbose --dry-run
|
||||
- APP_ENV=test bin/doctrine migrations:migrate --no-interaction -vvv
|
||||
- vendor/bin/phpunit --bootstrap app/tests/bootstrap.php --debug app/tests
|
||||
@ -40,10 +39,10 @@ pages:
|
||||
- git checkout ${latesttag}
|
||||
- composer install -o --no-interaction --no-progress --prefer-dist --no-dev
|
||||
- composer dump-autoload --optimize --no-dev --classmap-authoritative
|
||||
- mkdir tpl_c
|
||||
- mkdir framadate
|
||||
- mv `ls -A | grep -v framadate` ./framadate
|
||||
- chmod -R 644 framadate/ && chmod -R 770 framadate/tpl_c/ && chmod -R 770 framadate/app/inc/
|
||||
- find framadate/ -type d -exec chmod 750 {} \;
|
||||
- find framadate/ -type f -exec chmod 640 {} \;
|
||||
- zip -r latest.zip framadate
|
||||
- mkdir .public
|
||||
- cp latest.zip .public
|
||||
@ -65,7 +64,6 @@ beta:
|
||||
- composer dump-autoload --optimize --no-dev --classmap-authoritative
|
||||
# - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then mkdir -p ${HOME}/.config; echo -e "${ZANATA_CONFIG_FRAMABOT}" > ${HOME}/.config/zanata.ini; fi
|
||||
# - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then make pull-locales; fi
|
||||
- mkdir tpl_c
|
||||
- mkdir .public
|
||||
- cp -r * .public
|
||||
- cp -r .git .public
|
||||
|
@ -37,11 +37,13 @@ if (!empty($_POST)) {
|
||||
if ($result['status'] === 'OK') {
|
||||
header(('Location: ' . Utils::get_server_name() . 'admin/migration.php'));
|
||||
exit;
|
||||
}
|
||||
$error = __('Error', $result['code']);
|
||||
}
|
||||
|
||||
$error = __('Error', $result['code']);
|
||||
}
|
||||
|
||||
$smarty->assign('error', $error);
|
||||
$smarty->assign('error_details', $result['details']);
|
||||
$smarty->assign('title', __('Admin', 'Installation'));
|
||||
$smarty->assign('fields', $installService->getFields());
|
||||
$smarty->display('admin/install.tpl');
|
||||
$smarty->display('admin/install.tpl');
|
||||
|
@ -60,9 +60,10 @@ class InstallService {
|
||||
}
|
||||
|
||||
// Connect to database
|
||||
$connect = $this->connectTo($this->fields);
|
||||
if (!$connect) {
|
||||
return $this->error('CANT_CONNECT_TO_DATABASE');
|
||||
try {
|
||||
$connect = $this->connectTo($this->fields);
|
||||
} catch(\Doctrine\DBAL\DBALException $e) {
|
||||
return $this->error('CANT_CONNECT_TO_DATABASE', $e->getMessage());
|
||||
}
|
||||
|
||||
// Write configuration to conf.php file
|
||||
@ -87,13 +88,7 @@ class InstallService {
|
||||
'driver' => $fields['dbDriver'],
|
||||
'charset' => $fields['dbDriver'] === 'pdo_mysql' ? 'utf8mb4' : 'utf8',
|
||||
];
|
||||
try {
|
||||
return DriverManager::getConnection($connectionParams, $doctrineConfig);
|
||||
} catch (DBALException $e) {
|
||||
$logger = new LogService();
|
||||
$logger->log('ERROR', $e->getMessage());
|
||||
return null;
|
||||
}
|
||||
return DriverManager::getConnection($connectionParams, $doctrineConfig);
|
||||
}
|
||||
|
||||
function writeConfiguration(Smarty &$smarty) {
|
||||
@ -128,10 +123,11 @@ class InstallService {
|
||||
* @param $msg
|
||||
* @return array
|
||||
*/
|
||||
function error($msg) {
|
||||
function error($msg, $details = '') {
|
||||
return [
|
||||
'status' => 'ERROR',
|
||||
'code' => $msg
|
||||
'code' => $msg,
|
||||
'details' => $details,
|
||||
];
|
||||
}
|
||||
|
||||
|
2
php.ini
2
php.ini
@ -4,7 +4,7 @@ log_errors = On
|
||||
error_log = /var/log/apache2/error.log
|
||||
ignore_repeated_errors = On
|
||||
register_globals = Off
|
||||
|
||||
session.cookie_httponly = 1
|
||||
|
||||
[Date]
|
||||
date.timezone = "Europe/Paris"
|
||||
|
@ -6,7 +6,10 @@
|
||||
<form action="" method="POST">
|
||||
|
||||
{if $error}
|
||||
<div id="result" class="alert alert-danger">{$error}</div>
|
||||
<div id="result" class="alert alert-danger">
|
||||
<h4>{$error}</h4>
|
||||
<small>{$error_details}</small>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
<fieldset>
|
||||
|
0
tpl_c/.gitkeep
Normal file
0
tpl_c/.gitkeep
Normal file
Loading…
Reference in New Issue
Block a user