removed some illogical path setups

darcs-hash:20081213090400-7ad00-4e21cd75978bb07513f32f5d750658e8d777c59e.gz

29 files changed, 51 insertions, 68 deletions

diff --git a/inc/FeedParser.php b/inc/FeedParser.php
index f19dcad09..f37888f01 100644
--- a/inc/FeedParser.php
+++ b/inc/FeedParser.php
@@ -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');
 
diff --git a/inc/HTTPClient.php b/inc/HTTPClient.php
index 6b3663eaa..2385b1edd 100644
--- a/inc/HTTPClient.php
+++ b/inc/HTTPClient.php
@@ -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");
 
diff --git a/inc/JSON.php b/inc/JSON.php
index 380b064cb..16f1ce884 100644
--- a/inc/JSON.php
+++ b/inc/JSON.php
@@ -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');
 
 /**
diff --git a/inc/actions.php b/inc/actions.php
index 62b39efc2..0a347f472 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -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');
 
 
 /**
diff --git a/inc/auth.php b/inc/auth.php
index 18f1ece89..1d325b02c 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -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');
 
diff --git a/inc/cache.php b/inc/cache.php
index 50ab799e7..3eecd8a75 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -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');
diff --git a/inc/cliopts.php b/inc/cliopts.php
index 3623d35ad..a3698ab24 100644
--- a/inc/cliopts.php
+++ b/inc/cliopts.php
@@ -20,7 +20,6 @@
 // +----------------------------------------------------------------------+
 //
 
-if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
 
 //------------------------------------------------------------------------------
 /**
diff --git a/inc/common.php b/inc/common.php
index 9f6920378..bb1c45baa 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -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');
diff --git a/inc/confutils.php b/inc/confutils.php
index 1ef0942f8..aeb5f6c60 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -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
diff --git a/inc/events.php b/inc/events.php
index b87bbadbc..1604c73c6 100644
--- a/inc/events.php
+++ b/inc/events.php
@@ -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 {
diff --git a/inc/form.php b/inc/form.php
index 767788ea4..8131ec17e 100644
--- a/inc/form.php
+++ b/inc/form.php
@@ -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');
 
diff --git a/inc/fulltext.php b/inc/fulltext.php
index a1dd1774d..74195c534 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -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');
 
 
 /**
diff --git a/inc/html.php b/inc/html.php
index 636c93a13..982d01860 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -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');
diff --git a/inc/indexer.php b/inc/indexer.php
index 490ba1393..2d019dc77 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -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);
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 18de75c28..56526ac54 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -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');
 
diff --git a/inc/io.php b/inc/io.php
index 0256a6637..1c0e86104 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -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
diff --git a/inc/mail.php b/inc/mail.php
index 4dfc77552..f127ea989 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -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');
-
-  // 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);
+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);
 
 /**
  * Patterns for use in email detection and validation
diff --git a/inc/media.php b/inc/media.php
index 29b2ec986..de9273546 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -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');
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 2de8df7cb..5bcb3c2f0 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -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 {
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index 375f9e5f9..78a8d04f5 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -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
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 5994a4dd1..48eb25f4d 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -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
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 4cf57b3bf..3d62345a6 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -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';
 
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index 92bbf51fb..40b29035a 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -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';
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 58ff5e7b1..4749c470d 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -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
diff --git a/inc/parser/xhtmlsummary.php b/inc/parser/xhtmlsummary.php
index 2992b2a23..b187fef01 100644
--- a/inc/parser/xhtmlsummary.php
+++ b/inc/parser/xhtmlsummary.php
@@ -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';
 
 /**
diff --git a/inc/parserutils.php b/inc/parserutils.php
index ce4e8e995..7a023b159 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -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.
diff --git a/inc/search.php b/inc/search.php
index 35e5a358a..e8af8f64a 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -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);
diff --git a/inc/template.php b/inc/template.php
index 690f4ff41..9a4132750 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -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
diff --git a/inc/toolbar.php b/inc/toolbar.php
index 735567746..dee6db356 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -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');