summaryrefslogtreecommitdiff
path: root/lib/exe
diff options
context:
space:
mode:
Diffstat (limited to 'lib/exe')
-rw-r--r--lib/exe/ajax.php9
-rw-r--r--lib/exe/css.php4
-rw-r--r--lib/exe/js.php12
-rw-r--r--lib/exe/opensearch.php4
-rw-r--r--lib/exe/xmlrpc.php52
5 files changed, 39 insertions, 42 deletions
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index f8d62cb57..3d1584244 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -6,11 +6,6 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
-//fix for Opera XMLHttpRequests
-if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){
- parse_str($HTTP_RAW_POST_DATA, $_POST);
-}
-
if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
require_once(DOKU_INC.'inc/init.php');
//close session
@@ -54,6 +49,8 @@ function ajax_qsearch(){
if(empty($query)) $query = $_GET['q'];
if(empty($query)) return;
+ $query = urldecode($query);
+
$data = ft_pageLookup($query, true, useHeading('navigation'));
if(!count($data)) return;
@@ -257,7 +254,7 @@ function ajax_mediaupload(){
$id = $_GET['qqfile'];
}
- $id = cleanID($id, false, true);
+ $id = cleanID($id);
$NS = $_REQUEST['ns'];
$ns = $NS.':'.getNS($id);
diff --git a/lib/exe/css.php b/lib/exe/css.php
index d54e2e46c..69b512205 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -41,8 +41,8 @@ function css_out(){
$tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/';
$tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/';
}else{
- $tplinc = DOKU_TPLINC;
- $tpldir = DOKU_TPL;
+ $tplinc = tpl_incdir();
+ $tpldir = tpl_basedir();
}
// The generated script depends on some dynamic options
diff --git a/lib/exe/js.php b/lib/exe/js.php
index b7f2fd222..4b72014b2 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -32,8 +32,8 @@ function js_out(){
global $config_cascade;
// The generated script depends on some dynamic options
- $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],
- '.js');
+ $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js');
+ $cache->_event = 'JS_CACHE_USE';
// load minified version for some files
$min = $conf['compress'] ? '.min' : '';
@@ -65,7 +65,7 @@ function js_out(){
# disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js',
DOKU_INC.'lib/scripts/behaviour.js',
DOKU_INC.'lib/scripts/page.js',
- DOKU_TPLINC.'script.js',
+ tpl_incdir().'script.js',
);
// add possible plugin scripts and userscript
@@ -79,15 +79,15 @@ function js_out(){
// check cache age & handle conditional request
// This may exit if a cache can be used
- http_cached($cache->cache,
- $cache->useCache(array('files' => $cache_files)));
+ $cache_ok = $cache->useCache(array('files' => $cache_files));
+ http_cached($cache->cache, $cache_ok);
// start output buffering and build the script
ob_start();
// add some global variables
print "var DOKU_BASE = '".DOKU_BASE."';";
- print "var DOKU_TPL = '".DOKU_TPL."';";
+ print "var DOKU_TPL = '".tpl_basedir()."';";
// FIXME: Move those to JSINFO
print "var DOKU_UHN = ".((int) useHeading('navigation')).";";
print "var DOKU_UHC = ".((int) useHeading('content')).";";
diff --git a/lib/exe/opensearch.php b/lib/exe/opensearch.php
index 03a1632c4..73939c347 100644
--- a/lib/exe/opensearch.php
+++ b/lib/exe/opensearch.php
@@ -16,9 +16,9 @@ require_once(DOKU_INC.'inc/init.php');
// try to be clever about the favicon location
if(file_exists(DOKU_INC.'favicon.ico')){
$ico = DOKU_URL.'favicon.ico';
-}elseif(file_exists(DOKU_TPLINC.'images/favicon.ico')){
+}elseif(file_exists(tpl_incdir().'images/favicon.ico')){
$ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico';
-}elseif(file_exists(DOKU_TPLINC.'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';
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index e5e3298ae..1264ff333 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -7,7 +7,7 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
/**
* Increased whenever the API is changed
*/
-define('DOKU_XMLRPC_API_VERSION', 6);
+define('DOKU_XMLRPC_API_VERSION', 7);
require_once(DOKU_INC.'inc/init.php');
session_write_close(); //close session
@@ -286,7 +286,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
function rawPage($id,$rev=''){
$id = cleanID($id);
if(auth_quickaclcheck($id) < AUTH_READ){
- return new IXR_Error(1, 'You are not allowed to read this page');
+ return new IXR_Error(111, 'You are not allowed to read this page');
}
$text = rawWiki($id,$rev);
if(!$text) {
@@ -304,14 +304,14 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
function getAttachment($id){
$id = cleanID($id);
if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ)
- return new IXR_Error(1, 'You are not allowed to read this file');
+ return new IXR_Error(211, 'You are not allowed to read this file');
$file = mediaFN($id);
if (!@ file_exists($file))
- return new IXR_Error(1, 'The requested file does not exist');
+ return new IXR_Error(221, 'The requested file does not exist');
$data = io_readFile($file, false);
- $base64 = base64_encode($data);
+ $base64 = new IXR_Base64($data);
return $base64;
}
@@ -342,7 +342,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
function htmlPage($id,$rev=''){
$id = cleanID($id);
if(auth_quickaclcheck($id) < AUTH_READ){
- return new IXR_Error(1, 'You are not allowed to read this page');
+ return new IXR_Error(111, 'You are not allowed to read this page');
}
return p_wiki_xhtml($id,$rev,false);
}
@@ -411,7 +411,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
$pages[] = array(
'id' => $id,
- 'score' => $score,
+ 'score' => intval($score),
'rev' => filemtime($file),
'mtime' => filemtime($file),
'size' => filesize($file),
@@ -462,7 +462,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
}
return $data;
} else {
- return new IXR_Error(1, 'You are not allowed to list media files.');
+ return new IXR_Error(215, 'You are not allowed to list media files.');
}
}
@@ -479,12 +479,12 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
function pageInfo($id,$rev=''){
$id = cleanID($id);
if(auth_quickaclcheck($id) < AUTH_READ){
- return new IXR_Error(1, 'You are not allowed to read this page');
+ return new IXR_Error(111, 'You are not allowed to read this page');
}
$file = wikiFN($id,$rev);
$time = @filemtime($file);
if(!$time){
- return new IXR_Error(10, 'The requested page does not exist');
+ return new IXR_Error(121, 'The requested page does not exist');
}
$info = getRevisionInfo($id, $time, 1024);
@@ -515,22 +515,22 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
$minor = $params['minor'];
if(empty($id))
- return new IXR_Error(1, 'Empty page ID');
+ return new IXR_Error(131, 'Empty page ID');
if(!page_exists($id) && trim($TEXT) == '' ) {
- return new IXR_ERROR(1, 'Refusing to write an empty new wiki page');
+ return new IXR_ERROR(132, 'Refusing to write an empty new wiki page');
}
if(auth_quickaclcheck($id) < AUTH_EDIT)
- return new IXR_Error(1, 'You are not allowed to edit this page');
+ return new IXR_Error(112, 'You are not allowed to edit this page');
// Check, if page is locked
if(checklock($id))
- return new IXR_Error(1, 'The page is currently locked');
+ return new IXR_Error(133, 'The page is currently locked');
// SPAM check
if(checkwordblock())
- return new IXR_Error(1, 'Positive wordblock check');
+ return new IXR_Error(134, 'Positive wordblock check');
// autoset summary on new pages
if(!page_exists($id) && empty($sum)) {
@@ -575,7 +575,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
$auth = auth_quickaclcheck(getNS($id).':*');
if(!isset($id)) {
- return new IXR_ERROR(1, 'Filename not given.');
+ return new IXR_ERROR(231, 'Filename not given.');
}
global $conf;
@@ -611,11 +611,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
if ($res & DOKU_MEDIA_DELETED) {
return 0;
} elseif ($res & DOKU_MEDIA_NOT_AUTH) {
- return new IXR_ERROR(1, "You don't have permissions to delete files.");
+ return new IXR_ERROR(212, "You don't have permissions to delete files.");
} elseif ($res & DOKU_MEDIA_INUSE) {
- return new IXR_ERROR(1, 'File is still referenced');
+ return new IXR_ERROR(232, 'File is still referenced');
} else {
- return new IXR_ERROR(1, 'Could not delete file');
+ return new IXR_ERROR(233, 'Could not delete file');
}
}
@@ -635,7 +635,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
function listLinks($id) {
$id = cleanID($id);
if(auth_quickaclcheck($id) < AUTH_READ){
- return new IXR_Error(1, 'You are not allowed to read this page');
+ return new IXR_Error(111, 'You are not allowed to read this page');
}
$links = array();
@@ -684,7 +684,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
*/
function getRecentChanges($timestamp) {
if(strlen($timestamp) != 10)
- return new IXR_Error(20, 'The provided value is not a valid timestamp');
+ return new IXR_Error(311, 'The provided value is not a valid timestamp');
$recents = getRecentsSince($timestamp);
@@ -705,7 +705,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
return $changes;
} else {
// in case we still have nothing at this point
- return new IXR_Error(30, 'There are no changes in the specified timeframe');
+ return new IXR_Error(321, 'There are no changes in the specified timeframe');
}
}
@@ -717,7 +717,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
*/
function getRecentMediaChanges($timestamp) {
if(strlen($timestamp) != 10)
- return new IXR_Error(20, 'The provided value is not a valid timestamp');
+ return new IXR_Error(311, 'The provided value is not a valid timestamp');
$recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES);
@@ -738,7 +738,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
return $changes;
} else {
// in case we still have nothing at this point
- return new IXR_Error(30, 'There are no changes in the specified timeframe');
+ return new IXR_Error(321, 'There are no changes in the specified timeframe');
}
}
@@ -750,14 +750,14 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
function pageVersions($id, $first) {
$id = cleanID($id);
if(auth_quickaclcheck($id) < AUTH_READ){
- return new IXR_Error(1, 'You are not allowed to read this page');
+ return new IXR_Error(111, 'You are not allowed to read this page');
}
global $conf;
$versions = array();
if(empty($id))
- return new IXR_Error(1, 'Empty page ID');
+ return new IXR_Error(131, 'Empty page ID');
$revisions = getRevisions($id, $first, $conf['recent']+1);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 17:12:31 +0000