aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-04-18 14:04:55 +0200
committerRobin Appelman <icewind1991@gmail.com>2011-04-18 14:10:58 +0200
commit1c300bb49b1139f25bd0b66f2a2cd36c49c013b5 (patch)
treec4f7a5fefa6aba4593ec745fa19ec753ca0ee563
parent46f1ea14c0af9f64722d44d9390d868c4e060c14 (diff)
downloadnextcloud-server-1c300bb49b1139f25bd0b66f2a2cd36c49c013b5.tar.gz
nextcloud-server-1c300bb49b1139f25bd0b66f2a2cd36c49c013b5.zip
make error 404 template usable as stand alone php file
-rw-r--r--plugins/publiclink/get.php7
-rw-r--r--templates/404.php10
2 files changed, 17 insertions, 0 deletions
diff --git a/plugins/publiclink/get.php b/plugins/publiclink/get.php
index fb8a13b5417..41b10484f9b 100644
--- a/plugins/publiclink/get.php
+++ b/plugins/publiclink/get.php
@@ -19,6 +19,13 @@ if($path!==false){
$subPath='';
}
$path.=$subPath;
+ if(!OC_FILESYSTEM::file_exists($path)){
+ header("HTTP/1.0 404 Not Found");
+ $tmpl = new OC_TEMPLATE( '', '404', 'guest' );
+ $tmpl->assign('file',$subPath);
+ $tmpl->printPage();
+ exit;
+ }
if(OC_FILESYSTEM::is_dir($path)){
$files = array();
$rootLength=strlen($root);
diff --git a/templates/404.php b/templates/404.php
index 7696d16f8e2..8909db29a40 100644
--- a/templates/404.php
+++ b/templates/404.php
@@ -1,3 +1,13 @@
+<?php
+if(!isset($_)){//also provide standalone error page
+ require_once '../lib/base.php';
+ require( 'template.php' );
+
+ $tmpl = new OC_TEMPLATE( '', '404', 'guest' );
+ $tmpl->printPage();
+ exit;
+}
+?>
<div id="login">
<img src="<?php echo image_path("", "weather-clear.png"); ?>" alt="ownCloud" />
<ul>