dokuwiki/dokuwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed some illogical path setups

Browse source 
darcs-hash:20081213090400-7ad00-4e21cd75978bb07513f32f5d750658e8d777c59e.gz
This commit is contained in:
Andreas Gohr 2008-12-13 10:04:00 +01:00
parent 3dea4ebc5f
commit fa8adffee3
29 changed files with 50 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inc/FeedParser.php
View file

@ -5,7 +5,7 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/HTTPClient.php');
require_once(DOKU_INC.'inc/SimplePie.php');

2
inc/HTTPClient.php
View file

@ -6,8 +6,6 @@
* @author Andreas Goetz <cpuidle@gmx.de>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_CONF.'dokuwiki.php');
define('HTTP_NL',"\r\n");

2
inc/JSON.php
View file

@ -58,7 +58,7 @@
*/
// for DokuWiki
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/utf8.php');
/**

4
inc/actions.php
View file

@ -6,8 +6,8 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_INC.'inc/template.php');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/template.php');
/**

2
inc/auth.php
View file

@ -9,7 +9,7 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/common.php');
require_once(DOKU_INC.'inc/io.php');

3
inc/cache.php
View file

@ -6,8 +6,7 @@
* @author Chris Smith <chris@jalakai.co.uk>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/io.php');
require_once(DOKU_INC.'inc/pageutils.php');
require_once(DOKU_INC.'inc/parserutils.php');

1
inc/cliopts.php
View file

@ -20,7 +20,6 @@
// +----------------------------------------------------------------------+
//
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
//------------------------------------------------------------------------------
/**

3
inc/common.php
View file

@ -6,8 +6,7 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_CONF.'dokuwiki.php');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/io.php');
require_once(DOKU_INC.'inc/changelog.php');
require_once(DOKU_INC.'inc/utf8.php');

1
inc/confutils.php
View file

@ -6,7 +6,6 @@
* @author Harry Fuecks <hfuecks@gmail.com>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
/**
* Returns the (known) extension and mimetype of a given filename

2
inc/events.php
View file

@ -6,7 +6,7 @@
* @author Christopher Smith <chris@jalakai.co.uk>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/pluginutils.php');
class Doku_Event {

2
inc/form.php
View file

@ -6,7 +6,7 @@
* @author Tom N Harris <tnharris@whoopdedo.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
if(!defined('NL')) define('NL',"\n");
require_once(DOKU_INC.'inc/html.php');

4
inc/fulltext.php
View file

@ -6,8 +6,8 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_INC.'inc/indexer.php');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/indexer.php');
/**

2
inc/html.php
View file

@ -6,7 +6,7 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
if(!defined('NL')) define('NL',"\n");
require_once(DOKU_INC.'inc/parserutils.php');
require_once(DOKU_INC.'inc/form.php');

9
inc/indexer.php
View file

@ -6,11 +6,10 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_CONF.'dokuwiki.php');
require_once(DOKU_INC.'inc/io.php');
require_once(DOKU_INC.'inc/utf8.php');
require_once(DOKU_INC.'inc/parserutils.php');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/io.php');
require_once(DOKU_INC.'inc/utf8.php');
require_once(DOKU_INC.'inc/parserutils.php');
// set the minimum token length to use in the index (note, this doesn't apply to numeric tokens)
if (!defined('IDX_MINWORDLENGTH')) define('IDX_MINWORDLENGTH',3);

2
inc/infoutils.php
View file

@ -5,7 +5,7 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
if(!defined('DOKU_MESSAGEURL')) define('DOKU_MESSAGEURL','http://update.dokuwiki.org/check/');
require_once(DOKU_INC.'inc/HTTPClient.php');

10
inc/io.php
View file

@ -6,11 +6,11 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_INC.'inc/common.php');
require_once(DOKU_INC.'inc/HTTPClient.php');
require_once(DOKU_INC.'inc/events.php');
require_once(DOKU_INC.'inc/utf8.php');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/common.php');
require_once(DOKU_INC.'inc/HTTPClient.php');
require_once(DOKU_INC.'inc/events.php');
require_once(DOKU_INC.'inc/utf8.php');
/**
* Removes empty directories

14
inc/mail.php
View file

@ -6,14 +6,14 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_INC.'inc/utf8.php');
require_once(DOKU_INC.'inc/EmailAddressValidator.php');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/utf8.php');
require_once(DOKU_INC.'inc/EmailAddressValidator.php');
// end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
// think different
if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
#define('MAILHEADER_ASCIIONLY',1);
// end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
// think different
if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
#define('MAILHEADER_ASCIIONLY',1);
/**
* Patterns for use in email detection and validation

3
inc/media.php
View file

@ -6,9 +6,8 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
if(!defined('NL')) define('NL',"\n");
require_once(DOKU_INC.'inc/html.php');
require_once(DOKU_INC.'inc/search.php');
require_once(DOKU_INC.'inc/JpegMeta.php');

3
inc/parser/handler.php
View file

@ -1,6 +1,5 @@
<?php
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
if(!defined('DOKU_INC')) die('meh.');
if (!defined('DOKU_PARSER_EOL')) define('DOKU_PARSER_EOL',"\n"); // add this to make handling test cases simpler
class Doku_Handler {

2
inc/parser/lexer.php
View file

@ -13,7 +13,7 @@
/**
* Init path constant
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
if(!defined('DOKU_INC')) die('meh.');
/**#@+
* lexer mode constant

3
inc/parser/metadata.php
View file

@ -4,8 +4,7 @@
*
* @author Esther Brunner <wikidesign@gmail.com>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
if(!defined('DOKU_INC')) die('meh.');
if ( !defined('DOKU_LF') ) {
// Some whitespace to help View > Source

4
inc/parser/parser.php
View file

@ -1,7 +1,5 @@
<?php
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
if(!defined('DOKU_INC')) die('meh.');
require_once DOKU_INC . 'inc/parser/lexer.php';
require_once DOKU_INC . 'inc/parser/handler.php';

3
inc/parser/renderer.php
View file

@ -5,8 +5,7 @@
* @author Harry Fuecks <hfuecks@gmail.com>
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
if(!defined('DOKU_INC')) die('meh.');
require_once DOKU_INC . 'inc/parser/renderer.php';
require_once DOKU_INC . 'inc/plugin.php';
require_once DOKU_INC . 'inc/pluginutils.php';

3
inc/parser/xhtml.php
View file

@ -5,8 +5,7 @@
* @author Harry Fuecks <hfuecks@gmail.com>
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
if(!defined('DOKU_INC')) die('meh.');
if ( !defined('DOKU_LF') ) {
// Some whitespace to help View > Source

3
inc/parser/xhtmlsummary.php
View file

@ -1,6 +1,5 @@
<?php
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
if(!defined('DOKU_INC')) die('meh.');
require_once DOKU_INC . 'inc/parser/xhtml.php';
/**

11
inc/parserutils.php
View file

@ -7,12 +7,11 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_INC.'inc/confutils.php');
require_once(DOKU_INC.'inc/pageutils.php');
require_once(DOKU_INC.'inc/pluginutils.php');
require_once(DOKU_INC.'inc/cache.php');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/confutils.php');
require_once(DOKU_INC.'inc/pageutils.php');
require_once(DOKU_INC.'inc/pluginutils.php');
require_once(DOKU_INC.'inc/cache.php');
/**
* Returns the parsed Wikitext in XHTML for the given id and revision.

10
inc/search.php
View file

@ -6,8 +6,8 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_INC.'inc/common.php');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/common.php');
/**
* recurse direcory
@ -55,7 +55,7 @@ function search(&$data,$base,$func,$opts,$dir='',$lvl=1){
/**
* Wrapper around call_user_func_array.
*
*
* @deprecated
*/
function search_callback($func,&$data,$base,$file,$type,$lvl,$opts){
@ -187,8 +187,8 @@ function search_namespaces(&$data,$base,$file,$type,$lvl,$opts){
function search_media(&$data,$base,$file,$type,$lvl,$opts){
//we do nothing with directories
if($type == 'd') {
return ($opts['recursive']);
}
return ($opts['recursive']);
}
$info = array();
$info['id'] = pathID($file,true);

4
inc/template.php
View file

@ -6,8 +6,8 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
require_once(DOKU_CONF.'dokuwiki.php');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_CONF.'dokuwiki.php');
/**
* Returns the path to the given template, uses

3
inc/toolbar.php
View file

@ -6,8 +6,7 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
if(!defined('DOKU_INC')) die('meh.');
require_once(DOKU_INC.'inc/JSON.php');