0ct0pu5/webmum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change how config directory is checked, no more writable check but error if writing fails.

Browse source
This commit is contained in:
ohartl 2016-05-23 18:29:34 +02:00
parent ca77ed3029
commit dfccdcc218
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
installer/step0.php
View file

@ -21,10 +21,10 @@ if(function_exists('mysqli_connect')){
if(session_status() != PHP_SESSION_DISABLED){
$requirements[] = 'php_session_enabled';
}
if(file_exists('config') && is_writable('config') && !file_exists('config/config.php')){
$requirements[] = 'config_path_writable';
if(file_exists('config') && is_dir('config')){
$requirements[] = 'config_directory';
}
if(file_exists('config') && file_exists('config/config.php.example')){
if(file_exists('config/config.php.example')){
$requirements[] = 'config_example';
}
@ -81,10 +81,10 @@ if(isset($_GET['go']) && $_GET['go'] == 'next'){
<strong>Directories and files</strong>
<ul>
<?php if(in_array('config_path_writable', $requirements)): ?>
<li class="text-success">"config/": <strong>writable &#x2713;</strong></li>
<?php if(in_array('config_directory', $requirements)): ?>
<li class="text-success">"config/": <strong>exists &#x2713;</strong></li>
<?php else: ?>
<li class="text-fail">"config/": <strong>not writable &#x274c;</strong></li>
<li class="text-fail">"config/": <strong>is missing &#x274c;</strong></li>
<?php endif; ?>
<?php if(in_array('config_example', $requirements)): ?>
<li class="text-success">"config/config.php.example": <strong>exists &#x2713;</strong></li>

10
installer/step7.php
View file

@ -35,16 +35,14 @@ if(isset($_GET['go'])){
throw new Exception('The file "'.$configPath.'"" already exists, if you\'ve already written the config manually then complete manually.');
}
if(!file_exists(dirname($configPath))){
if(!file_exists(dirname($configPath)) || !is_dir(dirname($configPath))){
throw new Exception('The directory "'.dirname($configPath).'"" is missing.');
}
if(!is_writable(dirname($configPath))){
throw new Exception('The directory "'.dirname($configPath).'"" isn\'t writable.');
}
// Write config
file_put_contents($configPath, $configString);
if(file_put_contents($configPath, $configString) === false){
throw new Exception('Couldn\'t automatically write config to "'.$configPath.'", please write the config on your own.');
}
$_SESSION['installer']['finished'] = true;
}