diff options
| author | zotlabs <mike@macgirvin.com> | 2018-03-11 16:42:46 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-03-11 16:42:46 -0700 |
| commit | 717ae5486806f7f238f6cdafe08c8aefd94056d2 (patch) | |
| tree | 856449558f98be6123015ccd6e70b3d6cbf462f3 /Zotlabs/Module | |
| parent | 08d2adddf519117e0cd7c0a97222cac63a431631 (diff) | |
| download | volse-hubzilla-717ae5486806f7f238f6cdafe08c8aefd94056d2.tar.gz volse-hubzilla-717ae5486806f7f238f6cdafe08c8aefd94056d2.tar.bz2 volse-hubzilla-717ae5486806f7f238f6cdafe08c8aefd94056d2.zip | |
Setup - .htconfig.php write access is now required for automated installation. [String change - leave in dev for the next release]
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Setup.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 8e7fbbddf..a3832d156 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -563,16 +563,20 @@ class Setup extends \Zotlabs\Web\Controller { $status = true; $help = ''; - if( (file_exists('.htconfig.php') && !is_writable('.htconfig.php')) || - (!file_exists('.htconfig.php') && !is_writable('.')) ) { - $status = false; - $help = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL; - $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL; - $help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Red top folder.').EOL; - $help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "install/INSTALL.txt" for instructions.').EOL; + $fname = '.htconfig.php'; + + if((file_exists($fname) && is_writable($fname)) || + (! (file_exists($fname) && is_writable('.')))) { + $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help); + return; } - $this->check_add($checks, t('.htconfig.php is writable'), $status, false, $help); + $status = false; + $help = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL; + $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL; + $help .= t('Please see install/INSTALL.txt for additional information.'); + + $this->check_add($checks, t('.htconfig.php is writable'), $status, true, $help); } /** |