mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4753 from nextcloud/fix-links-on-error-page 

Fix escaped HTML on error pages
This commit is contained in:
Roeland Jago Douma 2017-05-09 08:45:11 +02:00 committed by GitHub
parent 684997f79c 9309217ecb
commit dfa3aaa0c6
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base.php
View File

@ -246,9 +246,8 @@ class OC {
} else {
OC_Template::printErrorPage(
$l->t('Cannot write into "config" directory!'),
$l->t('This can usually be fixed by '
. '%sgiving the webserver write access to the config directory%s.',
array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>'))
$l->t('This can usually be fixed by giving the webserver write access to the config directory. See %s',
[ $urlGenerator->linkToDocs('admin-dir_permissions') ])
);
}
}

3
lib/private/Config.php
View File

@ -249,8 +249,7 @@ class Config {
$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
throw new HintException(
"Can't write into config directory!",
'This can usually be fixed by '
.'<a href="' . $url . '" target="_blank" rel="noreferrer">giving the webserver write access to the config directory</a>.');
'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
}
// Try to acquire a file lock

20
lib/private/legacy/util.php
View File

@ -669,9 +669,8 @@ class OC_Util {
if (!is_writable(OC::$configDir) or !is_readable(OC::$configDir)) {
$errors[] = array(
'error' => $l->t('Cannot write into "config" directory'),
'hint' => $l->t('This can usually be fixed by '
. '%sgiving the webserver write access to the config directory%s.',
array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>'))
'hint' => $l->t('This can usually be fixed by giving the webserver write access to the config directory. See %s',
[$urlGenerator->linkToDocs('admin-dir_permissions')])
);
}
}
@ -684,10 +683,9 @@ class OC_Util {
) {
$errors[] = array(
'error' => $l->t('Cannot write into "apps" directory'),
'hint' => $l->t('This can usually be fixed by '
. '%sgiving the webserver write access to the apps directory%s'
. ' or disabling the appstore in the config file.',
array('<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>'))
'hint' => $l->t('This can usually be fixed by giving the webserver write access to the apps directory'
. ' or disabling the appstore in the config file. See %s',
[$urlGenerator->linkToDocs('admin-dir_permissions')])
);
}
}
@ -700,16 +698,14 @@ class OC_Util {
} else {
$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>.',
'hint' => $l->t('This can usually be fixed by giving the webserver write access to the root directory. See %s',
[$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.',
['<a href="' . $urlGenerator->linkToDocs('admin-dir_permissions') . '" target="_blank" rel="noreferrer">', '</a>']);
$permissionsHint = $l->t('Permissions can usually be fixed by giving the webserver write access to the root directory. See %.',
[$urlGenerator->linkToDocs('admin-dir_permissions')]);
$errors[] = [
'error' => 'Your data directory is not writable',
'hint' => $permissionsHint