summaryrefslogtreecommitdiff
path: root/lib/exe
diff options
context:
space:
mode:
Diffstat (limited to 'lib/exe')
-rw-r--r--lib/exe/detail.php15
-rw-r--r--lib/exe/fetch.php137
-rw-r--r--lib/exe/indexer.php10
-rw-r--r--lib/exe/mediamanager.php16
-rw-r--r--lib/exe/opensearch.php2
5 files changed, 35 insertions, 145 deletions
diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index db635c016..7008b126f 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -2,13 +2,18 @@
if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
define('DOKU_MEDIADETAIL',1);
require_once(DOKU_INC.'inc/init.php');
-trigger_event('DETAIL_STARTED', $tmp=array());
-//close session
-session_write_close();
$IMG = getID('media');
$ID = cleanID($INPUT->str('id'));
+// this makes some general infos available as well as the info about the
+// "parent" page
+$INFO = array_merge(pageinfo(),mediainfo());
+trigger_event('DETAIL_STARTED', $tmp=array());
+
+//close session
+session_write_close();
+
if($conf['allowdebug'] && $INPUT->has('debug')){
print '<pre>';
foreach(explode(' ','basedir userewrite baseurl useslash') as $x){
@@ -39,10 +44,6 @@ if($AUTH >= AUTH_READ){
$ERROR = p_locale_xhtml('denied');
}
-// this makes some general infos available as well as the info about the
-// "parent" page
-$INFO = pageinfo();
-
//start output and load template
header('Content-Type: text/html; charset=utf-8');
include(template('detail.php'));
diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php
index 9bac4d272..7a2250373 100644
--- a/lib/exe/fetch.php
+++ b/lib/exe/fetch.php
@@ -7,12 +7,17 @@
*/
if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/../../');
-define('DOKU_DISABLE_GZIP_OUTPUT', 1);
+if (!defined('DOKU_DISABLE_GZIP_OUTPUT')) define('DOKU_DISABLE_GZIP_OUTPUT', 1);
require_once(DOKU_INC.'inc/init.php');
session_write_close(); //close session
-// BEGIN main (if not testing)
-if(!defined('SIMPLE_TEST')) {
+require_once(DOKU_INC.'inc/fetch.functions.php');
+
+if (defined('SIMPLE_TEST')) {
+ $INPUT = new Input();
+}
+
+// BEGIN main
$mimetypes = getMimeTypes();
//get input
@@ -32,7 +37,7 @@ if(!defined('SIMPLE_TEST')) {
}
// check for permissions, preconditions and cache external files
- list($STATUS, $STATUSMESSAGE) = checkFileStatus($MEDIA, $FILE, $REV);
+ list($STATUS, $STATUSMESSAGE) = checkFileStatus($MEDIA, $FILE, $REV, $WIDTH, $HEIGHT);
// prepare data for plugin events
$data = array(
@@ -47,6 +52,7 @@ if(!defined('SIMPLE_TEST')) {
'height' => $HEIGHT,
'status' => $STATUS,
'statusmessage' => $STATUSMESSAGE,
+ 'ispublic' => media_ispublic($MEDIA),
);
// handle the file status
@@ -63,6 +69,7 @@ if(!defined('SIMPLE_TEST')) {
// die on errors
if($data['status'] > 203) {
print $data['statusmessage'];
+ if (defined('SIMPLE_TEST')) return;
exit;
}
}
@@ -81,127 +88,11 @@ if(!defined('SIMPLE_TEST')) {
// finally send the file to the client
$evt = new Doku_Event('MEDIA_SENDFILE', $data);
if($evt->advise_before()) {
- sendFile($data['file'], $data['mime'], $data['download'], $data['cache']);
+ sendFile($data['file'], $data['mime'], $data['download'], $data['cache'], $data['ispublic']);
}
// Do something after the download finished.
- $evt->advise_after();
-
-}// END DO main
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * Set headers and send the file to the client
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- * @author Ben Coburn <btcoburn@silicodon.net>
- */
-function sendFile($file, $mime, $dl, $cache) {
- global $conf;
- $fmtime = @filemtime($file);
- // send headers
- header("Content-Type: $mime");
- // smart http caching headers
- if($cache == -1) {
- // cache
- // cachetime or one hour
- header('Expires: '.gmdate("D, d M Y H:i:s", time() + max($conf['cachetime'], 3600)).' GMT');
- header('Cache-Control: public, proxy-revalidate, no-transform, max-age='.max($conf['cachetime'], 3600));
- header('Pragma: public');
- } else if($cache > 0) {
- // recache
- // remaining cachetime + 10 seconds so the newly recached media is used
- header('Expires: '.gmdate("D, d M Y H:i:s", $fmtime + $conf['cachetime'] + 10).' GMT');
- header('Cache-Control: public, proxy-revalidate, no-transform, max-age='.max($fmtime - time() + $conf['cachetime'] + 10, 0));
- header('Pragma: public');
- } else if($cache == 0) {
- // nocache
- header('Cache-Control: must-revalidate, no-transform, post-check=0, pre-check=0');
- header('Pragma: public');
- }
- //send important headers first, script stops here if '304 Not Modified' response
- http_conditionalRequest($fmtime);
-
- //download or display?
- if($dl) {
- header('Content-Disposition: attachment; filename="'.utf8_basename($file).'";');
- } else {
- header('Content-Disposition: inline; filename="'.utf8_basename($file).'";');
- }
-
- //use x-sendfile header to pass the delivery to compatible webservers
- if(http_sendfile($file)) exit;
-
- // send file contents
- $fp = @fopen($file, "rb");
- if($fp) {
- http_rangeRequest($fp, filesize($file), $mime);
- } else {
- http_status(500);
- print "Could not read $file - bad permissions?";
- }
-}
+ $evt->advise_after(); // will not be emitted on 304 or x-sendfile
-/**
- * Check for media for preconditions and return correct status code
- *
- * READ: MEDIA, MIME, EXT, CACHE
- * WRITE: MEDIA, FILE, array( STATUS, STATUSMESSAGE )
- *
- * @author Gerry Weissbach <gerry.w@gammaproduction.de>
- * @param $media reference to the media id
- * @param $file reference to the file variable
- * @returns array(STATUS, STATUSMESSAGE)
- */
-function checkFileStatus(&$media, &$file, $rev = '') {
- global $MIME, $EXT, $CACHE, $INPUT;
-
- //media to local file
- if(preg_match('#^(https?)://#i', $media)) {
- //check hash
- if(substr(md5(auth_cookiesalt().$media), 0, 6) !== $INPUT->str('hash')) {
- return array(412, 'Precondition Failed');
- }
- //handle external images
- if(strncmp($MIME, 'image/', 6) == 0) $file = media_get_from_URL($media, $EXT, $CACHE);
- if(!$file) {
- //download failed - redirect to original URL
- return array(302, $media);
- }
- } else {
- $media = cleanID($media);
- if(empty($media)) {
- return array(400, 'Bad request');
- }
-
- //check permissions (namespace only)
- if(auth_quickaclcheck(getNS($media).':X') < AUTH_READ) {
- return array(403, 'Forbidden');
- }
- $file = mediaFN($media, $rev);
- }
-
- //check file existance
- if(!@file_exists($file)) {
- return array(404, 'Not Found');
- }
-
- return array(200, null);
-}
-
-/**
- * Returns the wanted cachetime in seconds
- *
- * Resolves named constants
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-function calc_cache($cache) {
- global $conf;
-
- if(strtolower($cache) == 'nocache') return 0; //never cache
- if(strtolower($cache) == 'recache') return $conf['cachetime']; //use standard cache
- return -1; //cache endless
-}
+// END DO main
//Setup VIM: ex: et ts=2 :
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 27576f76d..57bee8925 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -16,15 +16,16 @@ if(!defined('NL')) define('NL',"\n");
// check if user abort worked, if yes send output early
$defer = !@ignore_user_abort() || $conf['broken_iua'];
-if(!$defer){
+$output = $INPUT->has('debug') && $conf['allowdebug'];
+if(!$defer && !$output){
sendGIF(); // send gif
}
$ID = cleanID($INPUT->str('id'));
// Catch any possible output (e.g. errors)
-$output = $INPUT->has('debug') && $conf['allowdebug'];
if(!$output) ob_start();
+else header('Content-Type: text/plain');
// run one of the jobs
$tmp = array(); // No event data
@@ -192,11 +193,6 @@ function sendDigest() {
* @author Harry Fuecks <fuecks@gmail.com>
*/
function sendGIF(){
- global $INPUT;
- if($INPUT->has('debug')){
- header('Content-Type: text/plain');
- return;
- }
$img = base64_decode('R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAEALAAAAAABAAEAAAIBTAA7');
header('Content-Type: image/gif');
header('Content-Length: '.strlen($img));
diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 53d438321..66e5ddc82 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -7,15 +7,12 @@
require_once(DOKU_INC.'inc/init.php');
- trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
- session_write_close(); //close session
-
global $INPUT;
// handle passed message
if($INPUT->str('msg1')) msg(hsc($INPUT->str('msg1')),1);
if($INPUT->str('err')) msg(hsc($INPUT->str('err')),-1);
-
+ global $DEL;
// get namespace to display (either direct or from deletion order)
if($INPUT->str('delete')){
$DEL = cleanID($INPUT->str('delete'));
@@ -29,10 +26,15 @@
$NS = getNS($IMG);
}else{
$NS = cleanID($INPUT->str('ns'));
+ $IMG = null;
}
- // check auth
- $AUTH = auth_quickaclcheck("$NS:*");
+ global $INFO;
+ $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo();
+ $AUTH = $INFO['perm']; // shortcut for historical reasons
+
+ trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
+ session_write_close(); //close session
// do not display the manager if user does not have read access
if($AUTH < AUTH_READ && !$fullscreen) {
@@ -52,7 +54,7 @@
exit;
}
- // give info on PHP catched upload errors
+ // give info on PHP caught upload errors
if($_FILES['upload']['error']){
switch($_FILES['upload']['error']){
case 1:
diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php
index 73939c347..98f5f52d5 100644
--- a/lib/exe/opensearch.php
+++ b/lib/exe/opensearch.php
@@ -21,7 +21,7 @@ if(file_exists(DOKU_INC.'favicon.ico')){
}elseif(file_exists(tpl_incdir().'favicon.ico')){
$ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico';
}else{
- $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico';
+ $ico = DOKU_URL.'lib/tpl/dokuwiki/images/favicon.ico';
}
// output
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 13:19:17 +0000