diff --git a/lib/base.php b/lib/base.php
index af54f43915..d1279a4633 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -173,11 +173,12 @@ class OC {
public static function checkConfig() {
if (file_exists(OC::$SERVERROOT . "/config/config.php")
and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
+ $defaults = new OC_Defaults();
$tmpl = new OC_Template('', 'error', 'guest');
$tmpl->assign('errors', array(1 => array(
'error' => "Can't write into config directory 'config'",
- 'hint' => 'You can usually fix this by giving the webserver user write access'
- .' to the config directory in owncloud'
+ 'hint' => 'This can usually be fixed by '
+ .'giving the webserver write access to the config directory.'
)));
$tmpl->printPage();
exit();
diff --git a/lib/config.php b/lib/config.php
index f1c139f22b..7dd596fcea 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -168,6 +168,7 @@ class OC_Config{
*/
public static function writeData() {
// Create a php file ...
+ $defaults = new OC_Defaults;
$content = "assign('errors', array(1=>array(
'error'=>"Can't write into config directory 'config'",
- 'hint'=>'You can usually fix this by giving the webserver user write access'
- .' to the config directory in owncloud')));
+ 'hint'=>'This can usually be fixed by '
+ .'giving the webserver write access to the config directory.')));
$tmpl->printPage();
exit;
}
diff --git a/lib/util.php b/lib/util.php
index 4bc02daf36..8f5f79b6b0 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -172,6 +172,8 @@ class OC_Util {
public static function checkServer() {
$errors=array();
+ $defaults = new \OC_Defaults();
+
$web_server_restart= false;
//check for database drivers
if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
@@ -184,14 +186,16 @@ class OC_Util {
}
//common hint for all file permissons error messages
- $permissionsHint='Permissions can usually be fixed by giving the webserver write access'
- .' to the ownCloud directory';
+ $permissionsHint = 'Permissions can usually be fixed by '
+ .'giving the webserver write access to the root directory.';
// Check if config folder is writable.
if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
- $errors[]=array('error'=>"Can't write into config directory 'config'",
- 'hint'=>'You can usually fix this by giving the webserver user write access'
- .' to the config directory in owncloud');
+ $errors[] = array(
+ 'error' => "Can't write into config directory",
+ 'hint' => 'This can usually be fixed by '
+ .'giving the webserver write access to the config directory.'
+ );
}
// Check if there is a writable install folder.
@@ -199,9 +203,12 @@ class OC_Util {
if( OC_App::getInstallPath() === null
|| !is_writable(OC_App::getInstallPath())
|| !is_readable(OC_App::getInstallPath()) ) {
- $errors[]=array('error'=>"Can't write into apps directory",
- 'hint'=>'You can usually fix this by giving the webserver user write access'
- .' to the apps directory in owncloud or disabling the appstore in the config file.');
+ $errors[] = array(
+ 'error' => "Can't write into apps directory",
+ 'hint' => 'This can usually be fixed by '
+ .'giving the webserver write access to the apps directory '
+ .'or disabling the appstore in the config file.'
+ );
}
}
$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
@@ -211,10 +218,11 @@ class OC_Util {
if ($success) {
$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
} else {
- $errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")",
- 'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '"
- .OC::$SERVERROOT."' (in a terminal, use the command "
- ."'chown -R www-data:www-data /path/to/your/owncloud/install/data' ");
+ $errors[] = array(
+ 'error' => "Can't create data directory (".$CONFIG_DATADIRECTORY.")",
+ 'hint' => 'This can usually be fixed by '
+ .'giving the webserver write access to the root directory.'
+ );
}
} else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud',
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index d439640752..147ad834a9 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -105,7 +105,7 @@ if($_['passwordChangeSupported']) {