From f62ea8a1d1cf10eddeae777b11420624e111b7ea Mon Sep 17 00:00:00 2001 From: andi Date: Sun, 5 Jun 2005 12:38:42 +0200 Subject: directory layout cleanup !IMPORTANT This patch changes the directory structure of dokuwiki as suggested in http://www.freelists.org/archives/dokuwiki/06-2005/msg00045.html As the changes.log is not managed through darcs you need to move it your self to the new location in data/changes.log I think I modified the code at all nessessary places, but I may have forgotten a few things. darcs-hash:20050605103842-9977f-af20f63c1d604888375d175d89ac6bd71566d47d.gz --- inc/io.php | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'inc/io.php') diff --git a/inc/io.php b/inc/io.php index 3981757da..a3e5f85c4 100644 --- a/inc/io.php +++ b/inc/io.php @@ -9,55 +9,6 @@ if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); require_once(DOKU_INC.'inc/common.php'); -/** - * Returns the parsed text from the given sourcefile. Uses cache - * if exists. Creates it if not. - * - * @author Andreas Gohr - * @deprecated -> parserutils - */ -function io_cacheParse($file){ - trigger_error("deprecated io_cacheParse called"); - - global $conf; - global $CACHEGROUP; - global $parser; //we read parser options - $parsed = ''; - $cache = $conf['datadir'].'/_cache/'; - $cache .= md5($file.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$CACHEGROUP); - $purge = $conf['datadir'].'/_cache/purgefile'; - - // check if cache can be used - $cachetime = @filemtime($cache); - - if( @file_exists($cache) // does the cachefile exist - && @file_exists($file) // and does the source exist - && !isset($_REQUEST['purge']) // no purge param was set - && filesize($cache) // and contains the cachefile any data - && ((time() - $cachetime) < $conf['cachetime']) // and is cachefile young enough - && ($cachetime > filemtime($file)) // and newer than the source - && ($cachetime > @filemtime($purge)) // and newer than the purgefile - && ($cachetime > filemtime('conf/dokuwiki.php')) // and newer than the config file - && ($cachetime > @filemtime('conf/local.php')) // and newer than the local config file - && ($cachetime > filemtime('inc/parser.php')) // and newer than the parser - && ($cachetime > filemtime('inc/format.php'))) // and newer than the formating functions - { - $parsed = io_readFile($cache); //give back cache - $parsed .= "\n\n"; - }elseif(@file_exists($file)){ - $parsed = parse(io_readFile($file)); //sets global parseroptions - if($parser['cache']){ - io_saveFile($cache,$parsed); //save cachefile - $parsed .= "\n\n"; - }else{ - @unlink($cache); //try to delete cachefile - $parsed .= "\n\n"; - } - } - - return $parsed; -} - /** * Removes empty directories * -- cgit v1.2.3