Changeset 3400

Timestamp:

01/05/2006 02:56:42 AM (19 years ago)

Author:

ryan

Message:

More reliable cache flusher that does not require glob().

Location:

trunk/wp-includes

Files:

• cache.php (modified) (2 diffs)
• functions-compat.php (modified) (1 diff)

trunk/wp-includes/cache.php

@@ -92 +92 @@
             return;
         
-        $this->rm($this->cache_dir.'*');
+        $this->rm_cache_dir();
         $this->cache = array ();
         $this->dirty_objects = array ();
@@ -215 +215 @@
     }
 
-    function rm($fileglob) {
-        if (is_file($fileglob)) {
-            return @ unlink($fileglob);
-        } else
-            if (is_dir($fileglob)) {
-                $ok = WP_Object_Cache::rm("$fileglob/*");
-                if (!$ok)
-                    return false;
-                return @ rmdir($fileglob);
-            } else {
-                $matching = glob($fileglob);
-                if ($matching === false)
-                    return true;
-                $rcs = array_map(array ('WP_Object_Cache', 'rm'), $matching);
-                if (in_array(false, $rcs)) {
-                    return false;
-                }
-            }
-        return true;
+    function rm_cache_dir() {
+        $dir = $this->cache_dir;
+        $dir = rtrim($dir, DIRECTORY_SEPARATOR);
+        $stack = array($dir);
+
+        while (count($stack)) {
+            # Get last directory on stack
+            $dir = end($stack);
+      
+            $dh = @ opendir($dir);
+            if (!$dh)
+                return false;
+      
+            while (($file = @ readdir($dh)) !== false) {
+                if ($file == '.' or $file == '..')
+                    continue;
+
+                if (@ is_dir($dir . DIRECTORY_SEPARATOR . $file))
+                    $stack[] = $dir . DIRECTORY_SEPARATOR . $file;
+                else if (@ is_file($dir . DIRECTORY_SEPARATOR . $file))
+                    @ unlink($dir . DIRECTORY_SEPARATOR . $file);
+            }
+
+            if (end($stack) == $dir) {
+                @ rmdir($dir);
+                array_pop($stack);
+            }
+        }
     }
 

trunk/wp-includes/functions-compat.php

@@ -90 +90 @@
 }
 
-/* Added in PHP 4.3.0 */
-
-if( !function_exists('glob') ):
-function glob($pattern) {
-    // get pathname (everything up until the last / or \)
-    $path=$output=null;
-//  if(PHP_OS=='WIN32')
-//      $slash='\\';
-//  else
-//      $slash='/';
-    $slash = '/';
-    $lastpos=strrpos($pattern,$slash);
-    if(!($lastpos===false)) {
-        $path=substr($pattern,0,$lastpos); #negative length means take from the right
-        $pattern=substr($pattern,$lastpos+1);
-    } else {
-        //no dir info, use current dir
-        $path=getcwd();
-    }
-    $handle=@ opendir($path);
-    if($handle===false)
-        return false;
-    while($dir=readdir($handle)) {
-        if ( '.' == $dir || '..' == $dir )
-            continue;
-        if (pattern_match($pattern,$dir))
-            $output[]=$path . '/' . $dir;
-    }
-    closedir($handle);
-    if(is_array($output))
-        return $output;
-
-    return false;
-}
-
-function pattern_match($pattern,$string) {
-    // basically prepare a regular expression
-    $out=null;
-    $chunks=explode(';',$pattern);
-    foreach($chunks as $pattern) {
-        $escape=array('$','^','.','{','}','(',')','[',']','|');
-        while(strpos($pattern,'**')!==false)
-            $pattern=str_replace('**','*',$pattern);
-        foreach($escape as $probe)
-            $pattern=str_replace($probe,"\\$probe",$pattern);
-
-        $pattern=str_replace('?*','*',
-        str_replace('*?','*',
-        str_replace('*',".*",
-        str_replace('?','.{1,1}',$pattern))));
-        $out[]=$pattern;
-    }
-
-    if(count($out)==1)
-        return(eregi("^$out[0]$",$string));
-    else
-        foreach($out as $tester)
-            if(eregi("^$tester$",$string))
-                return true;
-    return false;
-}
-endif;
-
 ?>