Changeset 23600 for branches/version-2_13-dev/data/module/Cache/Lite.php

Timestamp:

2014/08/22 18:31:39 (10 years ago)

Author:

kimoto

Message:

#2609 モジュールのバグfix

XML_Util 1.2.3
Mobile_Detect 2.8.3
Cache_Lite 1.7.16
Archive_Tar 1.3.12

File:

• branches/version-2_13-dev/data/module/Cache/Lite.php (modified) (6 diffs)

branches/version-2_13-dev/data/module/Cache/Lite.php

@@ -248 +248 @@
      */
     var $_errorHandlingAPIBreak = false;
+    
+    var $_hashedDirectoryGroup = NULL;
+    
+    var $_cacheFileMode = NULL;
+    
+    var $_cacheFileGroup = NULL;
     
     // --- Public methods ---
@@ -273 +279 @@
     *     'hashedDirectoryUmask' => umask for hashed directory structure (int),
     *     'errorHandlingAPIBreak' => API break for better error handling ? (boolean)
+    *     'hashedDirectoryGroup' => group of hashed directory structure (int | string) (see function chgrp)
+    *     'cacheFileMode' => filesystem mode of newly created cache files (int)
+    *     'cacheFileGroup' => group of newly created cache files (int | string) (see function chgrp)
     * );
     * 
@@ -307 +316 @@
     function setOption($name, $value) 
     {
-        $availableOptions = array('errorHandlingAPIBreak', 'hashedDirectoryUmask', 'hashedDirectoryLevel', 'automaticCleaningFactor', 'automaticSerialization', 'fileNameProtection', 'memoryCaching', 'onlyMemoryCaching', 'memoryCachingLimit', 'cacheDir', 'caching', 'lifeTime', 'fileLocking', 'writeControl', 'readControl', 'readControlType', 'pearErrorMode');
+        $availableOptions = array('errorHandlingAPIBreak', 'hashedDirectoryUmask', 'hashedDirectoryLevel', 'automaticCleaningFactor', 'automaticSerialization', 'fileNameProtection', 'memoryCaching', 'onlyMemoryCaching', 'memoryCachingLimit', 'cacheDir', 'caching', 'lifeTime', 'fileLocking', 'writeControl', 'readControl', 'readControlType', 'pearErrorMode', 'hashedDirectoryGroup', 'cacheFileMode', 'cacheFileGroup');
         if (in_array($name, $availableOptions)) {
             $property = '_'.$name;
@@ -666 +675 @@
         return $result;
     }
-      
+
+    /**
+    * Touch the cache file while are recreating it to avoid
+    * launch this task more then once when necessary
+    * When the cache recreated and Added in Cache Memory
+    * @return void
+    * @access private
+    */
+    function _touchCacheFile(){
+        if (file_exists($this->_file)) {
+            @touch($this->_file);
+        }
+    }
     /**
     * Add some date in the memory caching array
@@ -675 +696 @@
     function _memoryCacheAdd($data)
     {
+        $this->_touchCacheFile();
         $this->_memoryCachingArray[$this->_file] = $data;
         if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
@@ -776 +798 @@
                 $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
                 if (!(@is_dir($root))) {
-                    @mkdir($root, $this->_hashedDirectoryUmask);
+                    if (@mkdir($root))
+                    {
+                        @chmod($root, $this->_hashedDirectoryUmask);
+                        if (! is_null($this->_hashedDirectoryGroup))
+                            @chgrp($root, $this->_hashedDirectoryGroup);
+                    }
                 }
             }
         }
+        // if both _cacheFileMode and _cacheFileGroup is null, then we don't need to call
+        // file_exists (see below: if ($is_newfile) ...)
+        $is_newfile = (! is_null($this->_cacheFileMode) || !is_null($this->_cacheFileGroup)) 
+            && ! @file_exists($this->_file);
         $fp = @fopen($this->_file, "wb");
         if ($fp) {
             if ($this->_fileLocking) @flock($fp, LOCK_EX);
+            if ($is_newfile)
+            {
+                if (! is_null($this->_cacheFileMode))
+                    @chmod($this->_file, $this->_cacheFileMode);
+                if (! is_null($this->_cacheFileGroup))
+                    @chgrp($this->_file, $this->_cacheFileGroup);
+            }
             if ($this->_readControl) {
                 @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);