Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
17cff0b0
Commit
17cff0b0
authored
Nov 18, 2016
by
Vincent Petry
Committed by
GitHub
Nov 18, 2016
Browse files
Merge pull request #26643 from owncloud/rmdisplayofdatadirectory
removed path to datadir
parents
85f8249c
252e47c2
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/private/legacy/util.php
View file @
17cff0b0
...
...
@@ -687,7 +687,7 @@ class OC_Util {
$errors
=
array_merge
(
$errors
,
self
::
checkDataDirectoryPermissions
(
$CONFIG_DATADIRECTORY
));
}
else
{
$errors
[]
=
[
'error'
=>
$l
->
t
(
'Cannot create "data" directory
(%s)'
,
[
$CONFIG_DATADIRECTORY
]
),
'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>.'
,
[
$urlGenerator
->
linkToDocs
(
'admin-dir_permissions'
)])
...
...
@@ -699,7 +699,7 @@ class OC_Util {
.
'%sgiving the webserver write access to the root directory%s.'
,
[
'<a href="'
.
$urlGenerator
->
linkToDocs
(
'admin-dir_permissions'
)
.
'" target="_blank" rel="noreferrer">'
,
'</a>'
]);
$errors
[]
=
[
'error'
=>
'Data directory
('
.
$CONFIG_DATADIRECTORY
.
')
not writable by ownCloud'
,
'error'
=>
'
Your
Data directory
is
not writable by ownCloud'
,
'hint'
=>
$permissionsHint
];
}
else
{
...
...
@@ -910,7 +910,7 @@ class OC_Util {
$perms
=
substr
(
decoct
(
@
fileperms
(
$dataDirectory
)),
-
3
);
if
(
substr
(
$perms
,
2
,
1
)
!=
'0'
)
{
$errors
[]
=
[
'error'
=>
$l
->
t
(
'Data directory
(%s)
is readable by other users'
,
[
$dataDirectory
]
),
'error'
=>
$l
->
t
(
'
Your
Data directory is readable by other users'
),
'hint'
=>
$permissionsModHint
];
}
...
...
@@ -930,13 +930,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.'
)
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment