cvs: php4 /pear/Cache/Container dbx.php file.php

chregu Sat May 5 10:37:30 2001 EDT Modified files: /php4/pear/Cache/Container file.php dbx.php Log: fixed some typos in the code. Index: php4/pear/Cache/Container/file.php diff -u php4/pear/Cache/Container/file.php:1.12 php4/pear/Cache/Container/file.php:1.13 --- php4/pear/Cache/Container/file.php:1.12 Wed May 2 11:49:33 2001 +++ php4/pear/Cache/Container/file.php Sat May 5 10:37:29 2001 @@ -16,7 +16,7 @@ // | Sebastian Bergmann <sb@sebastian-bergmann.de> | // +----------------------------------------------------------------------+ // -// $Id: file.php,v 1.12 2001/05/02 18:49:33 uw Exp $ +// $Id: file.php,v 1.13 2001/05/05 17:37:29 chregu Exp $ require_once 'Cache/Container.php'; @@ -24,7 +24,7 @@ * Stores cache contents in a file. * * @author Ulf Wendel <ulf.wendel@phpdoc.de> -* @version $Id: file.php,v 1.12 2001/05/02 18:49:33 uw Exp $ +* @version $Id: file.php,v 1.13 2001/05/05 17:37:29 chregu Exp $ */ class Cache_Container_file extends Cache_Container { @@ -76,7 +76,7 @@ */ function Cache_Container_file($options = "") { if (is_array($options)) - $this->setOptions($options, array_merge($this->allowed_options), array("cache_dir", "filename_prefix"))); + $this->setOptions($options, array_merge($this->allowed_options, array("cache_dir", "filename_prefix"))); clearstatcache(); @@ -205,7 +205,7 @@ while ($this->total_size > $this->lowwater && list($lastmod, $entry) = each($this->entries)) { if (@unlink($entry["file"])) - $this->total_size -= $entry["size"]); + $this->total_size -= $entry["size"]; else new CacheError("Can't delete {$entry["file"]}. Check the permissions."); } @@ -237,7 +237,7 @@ $file = $dir . $file; if (is_dir($file)) { - $this->doGarbageCollection($file . "/"); + $this->doGarbageCollection($maxlifetime,$file . "/"); continue; } Index: php4/pear/Cache/Container/dbx.php diff -u php4/pear/Cache/Container/dbx.php:1.5 php4/pear/Cache/Container/dbx.php:1.6 --- php4/pear/Cache/Container/dbx.php:1.5 Wed May 2 11:49:33 2001 +++ php4/pear/Cache/Container/dbx.php Sat May 5 10:37:29 2001 @@ -15,7 +15,7 @@ // | Authors: Christian Stocker <chregu@nomad.ch> | // +----------------------------------------------------------------------+ // -// $Id: dbx.php,v 1.5 2001/05/02 18:49:33 uw Exp $ +// $Id: dbx.php,v 1.6 2001/05/05 17:37:29 chregu Exp $ require_once 'Cache/Container.php'; @@ -50,7 +50,7 @@ * ) * * @author Christian Stocker <chregu@nomad.ch> -* @version $Id: dbx.php,v 1.5 2001/05/02 18:49:33 uw Exp $ +* @version $Id: dbx.php,v 1.6 2001/05/05 17:37:29 chregu Exp $ * @package Cache */ class Cache_Container_dbx extends Cache_Container { @@ -121,7 +121,7 @@ return new Cache_Error('No options specified!', __FILE__, __LINE__); } - $this->setOptions($options, array_merge($this->allowed_options), array('module','host','db','username','password', 'cache_table', 'persistent'))); + $this->setOptions($options, array_merge($this->allowed_options, array('module','host','db','username','password', 'cache_table', 'persistent'))); if (!$this->module) return new Cache_Error('No module specified!', __FILE__, __LINE__);