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

Merge pull request #11143 from owncloud/improve-404 

Make 404 page easier to understand
This commit is contained in:
Morris Jobke 2014-09-18 09:10:16 +02:00
parent 338db48c0b 8fc1a9f5a9
commit c89c6ed21d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/templates/404.php
View File

@ -1,4 +1,6 @@
<?php
/** @var $_ array */
/** @var $l OC_L10N */
if(!isset($_)) {//also provide standalone error page
require_once '../../lib/base.php';
@ -12,8 +14,9 @@ if(!isset($_)) {//also provide standalone error page
<?php else: ?>
<ul>
<li class="error">
<?php p($l->t( 'Cloud not found' )); ?><br/>
<p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
<?php p($l->t('File not found')); ?><br/>
<p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p>
<p class="hint"><a href="<?php p(OC_Helper::linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p>
</li>
</ul>
<?php endif; ?>

1
lib/private/files.php
View File

@ -116,7 +116,6 @@ class OC_Files {
} elseif (!\OC\Files\Filesystem::file_exists($filename)) {
header("HTTP/1.0 404 Not Found");
$tmpl = new OC_Template('', '404', 'guest');
$tmpl->assign('file', $name);
$tmpl->printPage();
} else {
header("HTTP/1.0 403 Forbidden");