From bee0a3699e9f42a1ff89585bfbee5ad43f04d129 Mon Sep 17 00:00:00 2001 From: Kawohl Date: Tue, 15 Nov 2016 11:41:33 +0100 Subject: removed path to datadir Signed-off-by: Morris Jobke --- lib/private/legacy/util.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'lib/private/legacy') 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 ' . 'giving the webserver write access to the root directory.', - 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('', '')); - $errors[] = array( - 'error' => 'Data directory (' . $CONFIG_DATADIRECTORY . ') not writable', + ['', '']); + $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.') ]; -- cgit v1.2.3