reverting reader now that files.php always copies into-place

modifying files to check for double-mkdir() and only throw an exception if the subdir either doesn't exist or can't be written to

Author: arcfieldOSS

phpfastcache/3.0.0/abstract.php

@@ -270,24 +270,24 @@ protected function required_extension($name) {
 
 
     protected function readfile($file) {
+        if(function_exists("file_get_contents")) {
+            return @file_get_contents($file);
+        } else {
             $string = "";
 
             $file_handle = @fopen($file, "r");
             if(!$file_handle) {
                 throw new Exception("Can't Read File",96);
 
             }
-            if (flock($file_handle, LOCK_SH | LOCK_NB)) {
-                while (!feof($file_handle)) {
-                    $line = fgets($file_handle);
-                    $string .= $line;
-                }
-            } else {
-                throw new Exception("Can't Read File",96);
+            while (!feof($file_handle)) {
+                $line = fgets($file_handle);
+                $string .= $line;
             }
             fclose($file_handle);
 
             return $string;
+        }
     }
 
 

phpfastcache/3.0.0/drivers/files.php

@@ -52,15 +52,13 @@ private function getFilePath($keyword, $skip = false) {
          * Skip Create Sub Folders;
          */
         if($skip == false) {
-            if(!@file_exists($path)) {
-                if(!@mkdir($path,$this->__setChmodAuto())) {
+            //if it doesn't exist, I can't create it, and nobody beat me to creating it:
+            if(!@is_dir($path) && !@mkdir($path,$this->__setChmodAuto()) && !@is_dir($path)) {
                     throw new Exception("PLEASE CHMOD ".$this->getPath()." - 0777 OR ANY WRITABLE PERMISSION!",92);
-                }
-
-            } elseif(!is_writeable($path)) {
-                if(!chmod($path,$this->__setChmodAuto())) {
+            }
+            //if it does exist (after someone beat me to it, perhaps), but isn't writable or fixable:
+            if(@is_dir($path) && !is_writeable($path) && !@chmod($path,$this->__setChmodAuto())) {
                     throw new Exception("PLEASE CHMOD ".$this->getPath()." - 0777 OR ANY WRITABLE PERMISSION!",92);
-                }
             }
         }