@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | out('EC-CUBE3 installer use database driver of ', null, false); |
32 | 32 | |
33 | 33 | $database_driver = 'pdo_sqlite'; |
34 | -switch($argv[1]) { |
|
34 | +switch ($argv[1]) { |
|
35 | 35 | case 'mysql': |
36 | 36 | $database_driver = 'pdo_mysql'; |
37 | 37 | break; |
@@ -157,8 +157,7 @@ discard block |
||
157 | 157 | putenv('MAIL_PASS='.(getenv('MAIL_PASS') ? getenv('MAIL_PASS') : null)); |
158 | 158 | putenv('ADMIN_ROUTE='.(getenv('ADMIN_ROUTE') ? getenv('ADMIN_ROUTE') : 'admin')); |
159 | 159 | putenv('ROOT_URLPATH='.(getenv('ROOT_URLPATH') ? getenv('ROOT_URLPATH') : null)); |
160 | - putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : |
|
161 | - substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32))); |
|
160 | + putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32))); |
|
162 | 161 | } |
163 | 162 | |
164 | 163 | function getExampleVariables() |
@@ -357,15 +356,15 @@ discard block |
||
357 | 356 | foreach ($finder as $content) { |
358 | 357 | $permission = $content->getPerms(); |
359 | 358 | // see also http://www.php.net/fileperms |
360 | - if (!($permission & 0x0010) || !($permission & 0x0002)) { |
|
359 | + if (!($permission&0x0010) || !($permission&0x0002)) { |
|
361 | 360 | $realPath = $content->getRealPath(); |
362 | 361 | if ($verbose) { |
363 | 362 | out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false); |
364 | 363 | } |
365 | - $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r |
|
366 | - $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w |
|
367 | - $permission = !($permission & 0x0004) ? $permission += 04 : $permission; // o+r |
|
368 | - $permission = !($permission & 0x0002) ? $permission += 02 : $permission; // o+w |
|
364 | + $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r |
|
365 | + $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w |
|
366 | + $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r |
|
367 | + $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w |
|
369 | 368 | $result = chmod($realPath, $permission); |
370 | 369 | if ($verbose) { |
371 | 370 | if ($result) { |
@@ -396,13 +395,13 @@ discard block |
||
396 | 395 | |
397 | 396 | function getConfig() |
398 | 397 | { |
399 | - $config = array ( |
|
398 | + $config = array( |
|
400 | 399 | 'auth_magic' => getenv('AUTH_MAGIC'), |
401 | 400 | 'password_hash_algos' => 'sha256', |
402 | 401 | 'shop_name' => getenv('SHOP_NAME'), |
403 | 402 | 'force_ssl' => NULL, |
404 | 403 | 'admin_allow_host' => |
405 | - array ( |
|
404 | + array( |
|
406 | 405 | ), |
407 | 406 | 'cookie_lifetime' => 0, |
408 | 407 | 'locale' => 'ja', |
@@ -414,9 +413,9 @@ discard block |
||
414 | 413 | |
415 | 414 | function getDatabaseConfig($database_driver) |
416 | 415 | { |
417 | - $database = array ( |
|
416 | + $database = array( |
|
418 | 417 | 'database' => |
419 | - array ( |
|
418 | + array( |
|
420 | 419 | 'driver' => $database_driver, |
421 | 420 | ) |
422 | 421 | ); |
@@ -443,9 +442,9 @@ discard block |
||
443 | 442 | |
444 | 443 | function getMailConfig() |
445 | 444 | { |
446 | - $mail = array ( |
|
445 | + $mail = array( |
|
447 | 446 | 'mail' => |
448 | - array ( |
|
447 | + array( |
|
449 | 448 | 'transport' => getenv('MAIL_BACKEND'), |
450 | 449 | 'host' => getenv('MAIL_HOST'), |
451 | 450 | 'port' => getenv('MAIL_PORT'), |