diff options
author | Robin Appelman <icewind@owncloud.com> | 2013-11-25 13:04:23 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2013-11-25 13:04:23 +0100 |
commit | 317d421874158cefba5fae80398513a453c38f77 (patch) | |
tree | 04cd275691933628fd5b102d94ef53bb5cbda234 /lib/base.php | |
parent | de2b4440301badf48e638ede84f64692f2a2db41 (diff) | |
download | nextcloud-server-317d421874158cefba5fae80398513a453c38f77.tar.gz nextcloud-server-317d421874158cefba5fae80398513a453c38f77.zip |
provide more cli friendly error messages
Diffstat (limited to 'lib/base.php')
-rw-r--r-- | lib/base.php | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/lib/base.php b/lib/base.php index 865d174d212..187cedf9422 100644 --- a/lib/base.php +++ b/lib/base.php @@ -178,11 +178,19 @@ class OC { if (file_exists(OC::$SERVERROOT . "/config/config.php") and !is_writable(OC::$SERVERROOT . "/config/config.php")) { $defaults = new OC_Defaults(); - OC_Template::printErrorPage( - "Can't write into config directory!", - 'This can usually be fixed by ' - .'<a href="' . \OC_Helper::linkToDocs('admin-dir_permissions') . '" target="_blank">giving the webserver write access to the config directory</a>.' - ); + if (self::$CLI) { + echo "Can't write into config directory!\n"; + echo "This can usually be fixed by giving the webserver write access to the config directory\n"; + echo "\n"; + echo "See " . \OC_Helper::linkToDocs('admin-dir_permissions') . "\n"; + exit; + } else { + OC_Template::printErrorPage( + "Can't write into config directory!", + 'This can usually be fixed by ' + .'<a href="' . \OC_Helper::linkToDocs('admin-dir_permissions') . '" target="_blank">giving the webserver write access to the config directory</a>.' + ); + } } } @@ -480,7 +488,14 @@ class OC { $errors = OC_Util::checkServer(); if (count($errors) > 0) { - OC_Template::printGuestPage('', 'error', array('errors' => $errors)); + if (self::$CLI) { + foreach ($errors as $error) { + echo $error['error']."\n"; + echo $error['hint'] . "\n\n"; + } + } else { + OC_Template::printGuestPage('', 'error', array('errors' => $errors)); + } exit; } |