Changeset 657 for trunk

Timestamp:

Sep 17, 2010, 11:13:52 AM (14 years ago)

Author:

toemon

Message:

cube2.2よりcacheディレクトリがtrust_path側へ移ったことへの対応 Fixes#373

Location:

trunk/xpressme_integration_kit

Files:

• class/config_from_xoops.class.php (modified) (3 diffs)
• include/xpress_block_render.php (modified) (2 diffs)
• include/xpress_cache.php (modified) (3 diffs)

trunk/xpressme_integration_kit/class/config_from_xoops.class.php

@@ -20 +20 @@
         var $xoops_url;
         var $xoops_trust_path;
+        var $xoops_cache_path;
         var $xoops_db_prefix;
         var $xoops_db_name;
@@ -101 +102 @@
                         $this->xoops_time_zone = date_default_timezone_get();
                 }
+                $this->_get_cache_path();
     }
 
@@ -253 +255 @@
                         if(defined('XOOPS_SALT')) $this->xoops_salt = XOOPS_SALT; else $this->xoops_salt = '';
                 } // end of if file_exists
-        }       
+        }
+        
+        // call after the $this->xoops_trust_path is set
+        function _get_cache_path(){
+                $cache_path = $this->xoops_trust_path . '/cache';
+                if (file_exists($cache_path) && is_writable($cache_path)){
+                        $this->xoops_cache_path = $cache_path;
+                        return;
+                }
+                $this->xoops_cache_path = $this->xoops_root_path . '/cache';
+        }
     
     function get_xoops_mainfile_path(){

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -122 +122 @@
     {
         global $xoops_config;
-        if(defined('XOOPS_ROOT_PATH')){
-                $cache_dir = XOOPS_ROOT_PATH . '/cache/';
-        } else {
-                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
-        }
+        
+                $cache_dir = $xoops_config->xoops_cache_path . '/';
         $xml_name = $block_name . '.xml';
 
@@ -280 +277 @@
                 $pattern = '(' . $pattern . ')';
                 
-                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
+                $cache_dir = $xoops_config->xoops_cache_path . '/';
                 $cache_time = 0;
         if ($dh = opendir($cache_dir)) {

trunk/xpressme_integration_kit/include/xpress_cache.php

@@ -18 +18 @@
     {
         global $xoops_config;
-        if(defined('XOOPS_ROOT_PATH')){
-                $cache_dir = XOOPS_ROOT_PATH . '/cache/';
-        } else {
-                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
-        }
+        
+        $cache_dir = $xoops_config->xoops_cache_path . '/';
         $filename = $cache_dir .$mydirname . '_' . $collation_key;
         if (xpress_cache_found($filename)) {
@@ -36 +33 @@
     {
                 global $xoops_config;
-                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
+                $cache_dir = $xoops_config->xoops_cache_path . '/';
                 $cache_time = 0;
 
@@ -53 +50 @@
     {
                 global $xoops_config;
-                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
+                $cache_dir = $xoops_config->xoops_cache_path . '/';
                 $cache_time = 0;
         if ($dh = opendir($cache_dir)) {