diff -Naur dokuwiki-2006-11-06/bin/dwpage.php dokuwiki-2006-11-06.fhs/bin/dwpage.php --- dokuwiki-2006-11-06/bin/dwpage.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/bin/dwpage.php 2006-12-12 11:38:34.000000000 +0100 @@ -3,7 +3,7 @@ #------------------------------------------------------------------------------ if ('cli' != php_sapi_name()) die(); -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/common.php'; require_once DOKU_INC.'inc/cliopts.php'; diff -Naur dokuwiki-2006-11-06/bin/indexer.php dokuwiki-2006-11-06.fhs/bin/indexer.php --- dokuwiki-2006-11-06/bin/indexer.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/bin/indexer.php 2006-12-12 11:38:34.000000000 +0100 @@ -2,7 +2,7 @@ <?php if ('cli' != php_sapi_name()) die(); -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/common.php'); require_once(DOKU_INC.'inc/pageutils.php'); diff -Naur dokuwiki-2006-11-06/bin/wantedpages.php dokuwiki-2006-11-06.fhs/bin/wantedpages.php --- dokuwiki-2006-11-06/bin/wantedpages.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/bin/wantedpages.php 2006-12-12 11:38:34.000000000 +0100 @@ -4,7 +4,7 @@ #------------------------------------------------------------------------------ ini_set('memory_limit','128M'); -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once DOKU_INC.'inc/init.php'; require_once DOKU_INC.'inc/common.php'; require_once DOKU_INC.'inc/search.php'; diff -Naur dokuwiki-2006-11-06/conf/dokuwiki.php dokuwiki-2006-11-06.fhs/conf/dokuwiki.php --- dokuwiki-2006-11-06/conf/dokuwiki.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/conf/dokuwiki.php 2006-12-12 11:38:34.000000000 +0100 @@ -18,7 +18,7 @@ $conf['lang'] = 'en'; //your language $conf['basedir'] = ''; //absolute dir from serveroot - blank for autodetection $conf['baseurl'] = ''; //URL to server including protocol - blank for autodetect -$conf['savedir'] = './data'; //where to store all the files +$conf['savedir'] = '/var/lib/dokuwiki';//where to store all the files $conf['allowdebug'] = 0; //allow debug output, enable if needed 0|1 /* Display Options */ diff -Naur dokuwiki-2006-11-06/doku.php dokuwiki-2006-11-06.fhs/doku.php --- dokuwiki-2006-11-06/doku.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/doku.php 2006-12-12 11:38:35.000000000 +0100 @@ -8,7 +8,7 @@ // xdebug_start_profiling(); - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__)).'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/common.php'); require_once(DOKU_INC.'inc/events.php'); diff -Naur dokuwiki-2006-11-06/feed.php dokuwiki-2006-11-06.fhs/feed.php --- dokuwiki-2006-11-06/feed.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/feed.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__)).'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/common.php'); require_once(DOKU_INC.'inc/events.php'); diff -Naur dokuwiki-2006-11-06/inc/FeedParser.php dokuwiki-2006-11-06.fhs/inc/FeedParser.php --- dokuwiki-2006-11-06/inc/FeedParser.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/FeedParser.php 2006-12-12 11:38:34.000000000 +0100 @@ -5,7 +5,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/HTTPClient.php'); require_once(DOKU_INC.'inc/SimplePie.php'); diff -Naur dokuwiki-2006-11-06/inc/HTTPClient.php dokuwiki-2006-11-06.fhs/inc/HTTPClient.php --- dokuwiki-2006-11-06/inc/HTTPClient.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/HTTPClient.php 2006-12-12 11:38:34.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Goetz <cpuidle@gmx.de> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_CONF.'dokuwiki.php'); define('HTTP_NL',"\r\n"); diff -Naur dokuwiki-2006-11-06/inc/JSON.php dokuwiki-2006-11-06.fhs/inc/JSON.php --- dokuwiki-2006-11-06/inc/JSON.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/JSON.php 2006-12-12 11:38:34.000000000 +0100 @@ -58,7 +58,7 @@ */ // for DokuWiki -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/utf8.php'); /** diff -Naur dokuwiki-2006-11-06/inc/actions.php dokuwiki-2006-11-06.fhs/inc/actions.php --- dokuwiki-2006-11-06/inc/actions.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/actions.php 2006-12-12 11:38:34.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/template.php'); diff -Naur dokuwiki-2006-11-06/inc/auth.php dokuwiki-2006-11-06.fhs/inc/auth.php --- dokuwiki-2006-11-06/inc/auth.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/auth.php 2006-12-12 11:38:34.000000000 +0100 @@ -9,7 +9,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/common.php'); require_once(DOKU_INC.'inc/io.php'); diff -Naur dokuwiki-2006-11-06/inc/cache.php dokuwiki-2006-11-06.fhs/inc/cache.php --- dokuwiki-2006-11-06/inc/cache.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/cache.php 2006-12-12 11:38:34.000000000 +0100 @@ -6,7 +6,7 @@ * @author Chris Smith <chris@jalakai.co.uk> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/io.php'); require_once(DOKU_INC.'inc/pageutils.php'); diff -Naur dokuwiki-2006-11-06/inc/cliopts.php dokuwiki-2006-11-06.fhs/inc/cliopts.php --- dokuwiki-2006-11-06/inc/cliopts.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/cliopts.php 2006-12-12 11:38:34.000000000 +0100 @@ -20,7 +20,7 @@ // +----------------------------------------------------------------------+ // -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); //------------------------------------------------------------------------------ /** diff -Naur dokuwiki-2006-11-06/inc/common.php dokuwiki-2006-11-06.fhs/inc/common.php --- dokuwiki-2006-11-06/inc/common.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/common.php 2006-12-12 11:38:34.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_CONF.'dokuwiki.php'); require_once(DOKU_INC.'inc/io.php'); require_once(DOKU_INC.'inc/changelog.php'); diff -Naur dokuwiki-2006-11-06/inc/confutils.php dokuwiki-2006-11-06.fhs/inc/confutils.php --- dokuwiki-2006-11-06/inc/confutils.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/confutils.php 2006-12-12 11:38:34.000000000 +0100 @@ -6,7 +6,7 @@ * @author Harry Fuecks <hfuecks@gmail.com> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); /** * Returns the (known) extension and mimetype of a given filename diff -Naur dokuwiki-2006-11-06/inc/events.php dokuwiki-2006-11-06.fhs/inc/events.php --- dokuwiki-2006-11-06/inc/events.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/events.php 2006-12-12 11:38:34.000000000 +0100 @@ -6,7 +6,7 @@ * @author Christopher Smith <chris@jalakai.co.uk> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/pluginutils.php'); class Doku_Event { diff -Naur dokuwiki-2006-11-06/inc/fulltext.php dokuwiki-2006-11-06.fhs/inc/fulltext.php --- dokuwiki-2006-11-06/inc/fulltext.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/fulltext.php 2006-12-12 11:38:34.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/indexer.php'); diff -Naur dokuwiki-2006-11-06/inc/html.php dokuwiki-2006-11-06.fhs/inc/html.php --- dokuwiki-2006-11-06/inc/html.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/html.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/parserutils.php'); diff -Naur dokuwiki-2006-11-06/inc/indexer.php dokuwiki-2006-11-06.fhs/inc/indexer.php --- dokuwiki-2006-11-06/inc/indexer.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/indexer.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_CONF.'dokuwiki.php'); require_once(DOKU_INC.'inc/io.php'); require_once(DOKU_INC.'inc/utf8.php'); diff -Naur dokuwiki-2006-11-06/inc/infoutils.php dokuwiki-2006-11-06.fhs/inc/infoutils.php --- dokuwiki-2006-11-06/inc/infoutils.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/infoutils.php 2006-12-12 11:38:35.000000000 +0100 @@ -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',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); if(!defined('DOKU_MESSAGEURL')) define('DOKU_MESSAGEURL','http://update.dokuwiki.org/check/'); require_once(DOKU_INC.'inc/HTTPClient.php'); diff -Naur dokuwiki-2006-11-06/inc/init.php dokuwiki-2006-11-06.fhs/inc/init.php --- dokuwiki-2006-11-06/inc/init.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/init.php 2006-12-12 11:38:35.000000000 +0100 @@ -11,10 +11,10 @@ define('DOKU_START_TIME', delta_time()); // define the include path - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); // define config path (packagers may want to change this to /etc/dokuwiki/) - if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/'); + if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/dokuwiki/'); // check for error reporting override or set error reporting to sane values if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) { diff -Naur dokuwiki-2006-11-06/inc/io.php dokuwiki-2006-11-06.fhs/inc/io.php --- dokuwiki-2006-11-06/inc/io.php 2006-11-06 20:32:07.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/io.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/common.php'); require_once(DOKU_INC.'inc/HTTPClient.php'); require_once(DOKU_INC.'inc/events.php'); diff -Naur dokuwiki-2006-11-06/inc/mail.php dokuwiki-2006-11-06.fhs/inc/mail.php --- dokuwiki-2006-11-06/inc/mail.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/mail.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/utf8.php'); // end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?) diff -Naur dokuwiki-2006-11-06/inc/media.php dokuwiki-2006-11-06.fhs/inc/media.php --- dokuwiki-2006-11-06/inc/media.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/media.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); if(!defined('NL')) define('NL',"\n"); require_once(DOKU_INC.'inc/html.php'); diff -Naur dokuwiki-2006-11-06/inc/parser/handler.php dokuwiki-2006-11-06.fhs/inc/parser/handler.php --- dokuwiki-2006-11-06/inc/parser/handler.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/parser/handler.php 2006-12-12 11:38:35.000000000 +0100 @@ -1,5 +1,5 @@ <?php -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); class Doku_Handler { diff -Naur dokuwiki-2006-11-06/inc/parser/lexer.php dokuwiki-2006-11-06.fhs/inc/parser/lexer.php --- dokuwiki-2006-11-06/inc/parser/lexer.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/parser/lexer.php 2006-12-12 11:38:35.000000000 +0100 @@ -13,7 +13,7 @@ /** * Init path constant */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); /**#@+ * lexer mode constant diff -Naur dokuwiki-2006-11-06/inc/parser/metadata.php dokuwiki-2006-11-06.fhs/inc/parser/metadata.php --- dokuwiki-2006-11-06/inc/parser/metadata.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/parser/metadata.php 2006-12-12 11:38:35.000000000 +0100 @@ -5,7 +5,7 @@ * @author Esther Brunner <wikidesign@gmail.com> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); if ( !defined('DOKU_LF') ) { // Some whitespace to help View > Source diff -Naur dokuwiki-2006-11-06/inc/parser/parser.php dokuwiki-2006-11-06.fhs/inc/parser/parser.php --- dokuwiki-2006-11-06/inc/parser/parser.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/parser/parser.php 2006-12-12 11:38:35.000000000 +0100 @@ -1,6 +1,6 @@ <?php -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once DOKU_INC . 'inc/parser/lexer.php'; require_once DOKU_INC . 'inc/parser/handler.php'; diff -Naur dokuwiki-2006-11-06/inc/parser/renderer.php dokuwiki-2006-11-06.fhs/inc/parser/renderer.php --- dokuwiki-2006-11-06/inc/parser/renderer.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/parser/renderer.php 2006-12-12 11:38:35.000000000 +0100 @@ -5,7 +5,7 @@ * @author Harry Fuecks <hfuecks@gmail.com> * @author Andreas Gohr <andi@splitbrain.org> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once DOKU_INC . 'inc/parser/renderer.php'; require_once DOKU_INC . 'inc/pluginutils.php'; diff -Naur dokuwiki-2006-11-06/inc/parser/xhtml.php dokuwiki-2006-11-06.fhs/inc/parser/xhtml.php --- dokuwiki-2006-11-06/inc/parser/xhtml.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/parser/xhtml.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); if ( !defined('DOKU_LF') ) { // Some whitespace to help View > Source diff -Naur dokuwiki-2006-11-06/inc/parser/xhtmlsummary.php dokuwiki-2006-11-06.fhs/inc/parser/xhtmlsummary.php --- dokuwiki-2006-11-06/inc/parser/xhtmlsummary.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/parser/xhtmlsummary.php 2006-12-12 11:38:35.000000000 +0100 @@ -1,5 +1,5 @@ <?php -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once DOKU_INC . 'inc/parser/xhtml.php'; diff -Naur dokuwiki-2006-11-06/inc/parserutils.php dokuwiki-2006-11-06.fhs/inc/parserutils.php --- dokuwiki-2006-11-06/inc/parserutils.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/parserutils.php 2006-12-12 11:38:35.000000000 +0100 @@ -7,7 +7,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/confutils.php'); require_once(DOKU_INC.'inc/pageutils.php'); diff -Naur dokuwiki-2006-11-06/inc/search.php dokuwiki-2006-11-06.fhs/inc/search.php --- dokuwiki-2006-11-06/inc/search.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/search.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/common.php'); /** diff -Naur dokuwiki-2006-11-06/inc/template.php dokuwiki-2006-11-06.fhs/inc/template.php --- dokuwiki-2006-11-06/inc/template.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/template.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_CONF.'dokuwiki.php'); /** diff -Naur dokuwiki-2006-11-06/inc/toolbar.php dokuwiki-2006-11-06.fhs/inc/toolbar.php --- dokuwiki-2006-11-06/inc/toolbar.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/inc/toolbar.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/JSON.php'); diff -Naur dokuwiki-2006-11-06/install.php dokuwiki-2006-11-06.fhs/install.php --- dokuwiki-2006-11-06/install.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/install.php 2006-12-12 11:38:35.000000000 +0100 @@ -5,9 +5,9 @@ * @author Chris Smith <chris@jalakai.co.uk> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__)).'/'); -if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/'); -if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); +if(!defined('DOKU_CONF')) define('DOKU_CONF','/etc/dokuwiki/'); +if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL','/etc/dokuwiki/'); // check for error reporting override or set error reporting to sane values if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); } diff -Naur dokuwiki-2006-11-06/lib/exe/ajax.php dokuwiki-2006-11-06.fhs/lib/exe/ajax.php --- dokuwiki-2006-11-06/lib/exe/ajax.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/lib/exe/ajax.php 2006-12-12 11:38:35.000000000 +0100 @@ -11,7 +11,7 @@ parse_str($HTTP_RAW_POST_DATA, $_POST); } -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/common.php'); require_once(DOKU_INC.'inc/pageutils.php'); diff -Naur dokuwiki-2006-11-06/lib/exe/css.php dokuwiki-2006-11-06.fhs/lib/exe/css.php --- dokuwiki-2006-11-06/lib/exe/css.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/lib/exe/css.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching) require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/pageutils.php'); diff -Naur dokuwiki-2006-11-06/lib/exe/detail.php dokuwiki-2006-11-06.fhs/lib/exe/detail.php --- dokuwiki-2006-11-06/lib/exe/detail.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/lib/exe/detail.php 2006-12-12 11:38:35.000000000 +0100 @@ -1,5 +1,5 @@ <?php - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); + if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); define('DOKU_MEDIADETAIL',1); require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/common.php'); diff -Naur dokuwiki-2006-11-06/lib/exe/fetch.php dokuwiki-2006-11-06.fhs/lib/exe/fetch.php --- dokuwiki-2006-11-06/lib/exe/fetch.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/lib/exe/fetch.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); define('DOKU_DISABLE_GZIP_OUTPUT', 1); require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/common.php'); diff -Naur dokuwiki-2006-11-06/lib/exe/indexer.php dokuwiki-2006-11-06.fhs/lib/exe/indexer.php --- dokuwiki-2006-11-06/lib/exe/indexer.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/lib/exe/indexer.php 2006-12-12 11:38:35.000000000 +0100 @@ -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',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); define('DOKU_DISABLE_GZIP_OUTPUT',1); require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/auth.php'); diff -Naur dokuwiki-2006-11-06/lib/exe/js.php dokuwiki-2006-11-06.fhs/lib/exe/js.php --- dokuwiki-2006-11-06/lib/exe/js.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/lib/exe/js.php 2006-12-12 11:38:35.000000000 +0100 @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching) if(!defined('NL')) define('NL',"\n"); require_once(DOKU_INC.'inc/init.php'); diff -Naur dokuwiki-2006-11-06/lib/exe/mediamanager.php dokuwiki-2006-11-06.fhs/lib/exe/mediamanager.php --- dokuwiki-2006-11-06/lib/exe/mediamanager.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/lib/exe/mediamanager.php 2006-12-12 11:38:35.000000000 +0100 @@ -1,5 +1,5 @@ <?php - if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); define('DOKU_MEDIAMANAGER',1); require_once(DOKU_INC.'inc/init.php'); require_once(DOKU_INC.'inc/lang/en/lang.php'); diff -Naur dokuwiki-2006-11-06/lib/exe/spellcheck.php dokuwiki-2006-11-06.fhs/lib/exe/spellcheck.php --- dokuwiki-2006-11-06/lib/exe/spellcheck.php 2006-11-06 20:32:08.000000000 +0100 +++ dokuwiki-2006-11-06.fhs/lib/exe/spellcheck.php 2006-12-12 11:38:35.000000000 +0100 @@ -46,7 +46,7 @@ parse_str($HTTP_RAW_POST_DATA, $_POST); } -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC','/usr/share/dokuwiki/'); require_once (DOKU_INC.'inc/init.php'); session_write_close(); require_once (DOKU_INC.'inc/utf8.php');