diff options
author | Kawohl <john@owncloud.com> | 2016-11-15 11:41:33 +0100 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2017-04-04 19:07:59 -0500 |
commit | bee0a3699e9f42a1ff89585bfbee5ad43f04d129 (patch) | |
tree | 5088c141e97073c37a233433ad67057fa91ca5db /lib/private/legacy | |
parent | fa4107893de4e94020dc1b3182cfea969b5db1a6 (diff) | |
download | nextcloud-server-bee0a3699e9f42a1ff89585bfbee5ad43f04d129.tar.gz nextcloud-server-bee0a3699e9f42a1ff89585bfbee5ad43f04d129.zip |
removed path to datadir
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/legacy')
-rw-r--r-- | lib/private/legacy/util.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 0672fefbe0c..9bfadbbd8bb 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -698,22 +698,22 @@ class OC_Util { if ($success) { $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY)); } else { - $errors[] = array( - 'error' => $l->t('Cannot create "data" directory (%s)', array($CONFIG_DATADIRECTORY)), + $errors[] = [ + 'error' => $l->t('Cannot create "data" directory'), 'hint' => $l->t('This can usually be fixed by ' . '<a href="%s" target="_blank" rel="noreferrer">giving the webserver write access to the root directory</a>.', - array($urlGenerator->linkToDocs('admin-dir_permissions'))) - ); + [$urlGenerator->linkToDocs('admin-dir_permissions')]) + ]; } } else if (!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) { //common hint for all file permissions error messages $permissionsHint = $l->t('Permissions can usually be fixed by ' . '%sgiving the webserver write access to the root directory%s.', - array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>')); - $errors[] = array( - 'error' => 'Data directory (' . $CONFIG_DATADIRECTORY . ') not writable', + ['<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>']); + $errors[] = [ + 'error' => 'Your Data directory is not writable', 'hint' => $permissionsHint - ); + ]; } else { $errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY)); } @@ -928,10 +928,10 @@ class OC_Util { clearstatcache(); $perms = substr(decoct(@fileperms($dataDirectory)), -3); if (substr($perms, 2, 1) != '0') { - $errors[] = array( - 'error' => $l->t('Data directory (%s) is readable by other users', array($dataDirectory)), + $errors[] = [ + 'error' => $l->t('Your Data directory is readable by other users'), 'hint' => $permissionsModHint - ); + ]; } } return $errors; @@ -949,13 +949,13 @@ class OC_Util { $errors = []; if ($dataDirectory[0] !== '/') { $errors[] = [ - 'error' => $l->t('Data directory (%s) must be an absolute path', [$dataDirectory]), + 'error' => $l->t('Your Data directory must be an absolute path'), 'hint' => $l->t('Check the value of "datadirectory" in your configuration') ]; } if (!file_exists($dataDirectory . '/.ocdata')) { $errors[] = [ - 'error' => $l->t('Data directory (%s) is invalid', [$dataDirectory]), + 'error' => $l->t('Your Data directory is invalid'), 'hint' => $l->t('Please check that the data directory contains a file' . ' ".ocdata" in its root.') ]; |