Changeset 719

Timestamp:

Apr 26, 2011, 3:38:22 PM (14 years ago)

Author:

toemon

Message:

Windows フィルシステムでディレクトリのis_writable()が正常に取得できないので代替え処理を行う

Location:

trunk/xpressme_integration_kit/include

Files:

• xpress_block_header.php (modified) (1 diff)
• xpress_block_render.php (modified) (6 diffs)
• xpress_cache.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/xpress_block_header.php

@@ -18 +18 @@
                                 $xml = str_replace('<?xml version="1.0" ?>', '<?xml version="1.0" encoding="EUC-JP" ?>' , $xml);
                         }
-                        xpress_cache_write($mydirname,$xml_name,$xml);
+                        if(cache_is_writable())
+                                xpress_cache_write($mydirname,$xml_name,$xml);
         }
         function xpress_block_header_cache_read($mydirname)

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -68 +68 @@
         {
                         $xoopsDB =& Database::getInstance();
-                        $modules_tbl = $xoopsDB->prefix('modules');     
+                        $modules_tbl = $xoopsDB->prefix('modules');
 
                         $sql = "SELECT mid FROM $modules_tbl WHERE dirname = '$mydirname'";
@@ -87 +87 @@
                         $wp_prefix = preg_replace('/wordpress/','wp',$mydirname);
 
-                        $module_tbl = $xoopsDB->prefix($wp_prefix).'_options';  
-                        $theme_name = '';       
+                        $module_tbl = $xoopsDB->prefix($wp_prefix).'_options';
+                        $theme_name = '';
 
                         $sql = "SELECT option_value FROM $module_tbl WHERE option_name LIKE 'template'";
@@ -139 +139 @@
         function xpress_block_render($mydirname,$block_function_name,$options)
         {
-                global $wpdb,$xoops_config;
+                global $wpdb,$xoops_config,$xoopsUserIsAdmin;
                 $func_file = $block_function_name;
                 $call_theme_function_name = str_replace(".php", "", $block_function_name);
@@ -148 +148 @@
                 $this_block_url = '/' . $mydirname . '/';
                 $call_url = $_SERVER['REQUEST_URI'];
-                
+                $block['err_message'] = '';
+
                 if (strstr($call_url , $this_block_url) !== false && strstr($call_url , $this_block_url . 'admin/') === false){
                         $block_theme_file = get_block_file_path($mydirname,$inc_theme_file_name);
@@ -154 +155 @@
                         $block = $call_theme_function_name($options);           //The block name and the called function name should be assumed to be the same name. 
                         if (!empty($block_theme_file['error']))
-                                $block['err_message'] = $block_theme_file['error'];
-                } else {
-                        global $xoops_config,$xoopsUserIsAdmin;
-                        $cache_dir = $xoops_config->xoops_cache_path;
-                        if(!is_writable($cache_dir)){
-                                $block['err_message'] = _MB_XP2_CACHE_NOT_WRITABLE ;
-                                if($xoopsUserIsAdmin)
-                                        $block['err_message'] .=  " ($cache_dir)";
+                                $block['err_message'] .= $block_theme_file['error'];
+                } else {
+                        if (xpress_block_cache_found($mydirname,$cache_title. $blockID)){
+                                $xml = xpress_block_cache_read($mydirname,$cache_title. $blockID);
+                                $block = $xml['block'];
                         } else {
-                                if (xpress_block_cache_found($mydirname,$cache_title. $blockID)){
-                                        $xml = xpress_block_cache_read($mydirname,$cache_title. $blockID);
-                                        $block = $xml['block'];
-                                } else {
-                                        $block['err_message'] = sprintf(_MB_XP2_BLOCK_CACHE_ERR, '<a href="' . XOOPS_URL . '/modules/' . $mydirname . '">' . $mydirname .'</a>');
-                                }
+                                $block['err_message'] .= sprintf(_MB_XP2_BLOCK_CACHE_ERR, '<a href="' . XOOPS_URL . '/modules/' . $mydirname . '">' . $mydirname .'</a>');
+                        }
+                }
+
+                if(!cache_is_writable()){
+                        $block['err_message']  ='<span style="color:#ff0000">';
+                        $block['err_message'] .= _MB_XP2_CACHE_NOT_WRITABLE ;
+                        if($xoopsUserIsAdmin){
+                                $block['err_message'] .=  " ($cache_dir)";
+                                $block['err_message'] .= '</span>';
                         }
                 }
@@ -253 +255 @@
                         if (!empty($block_theme_file['error']))
                                 $render_array['block']['err_message'] = $block_theme_file['error'];
-                        if (xpress_block_cache_found($mydirname,$cache_title. $blockID)){       
-                                $render_serialize = xpress_XML_serialize($render_array);
-                                $render_md5 = md5($render_serialize);
-
-                                $cache_serialize = xpress_cache_read($mydirname,$cache_title. $blockID.'.xml');
-                                $cache_md5 = md5($cache_serialize);
-                                
-                                if ($render_md5 != $cache_md5){
+                        if(cache_is_writable()){
+                                if (xpress_block_cache_found($mydirname,$cache_title. $blockID)){       
+                                        $render_serialize = xpress_XML_serialize($render_array);
+                                        $render_md5 = md5($render_serialize);
+
+                                        $cache_serialize = xpress_cache_read($mydirname,$cache_title. $blockID.'.xml');
+                                        $cache_md5 = md5($cache_serialize);
+                                        
+                                        if ($render_md5 != $cache_md5){
+                                                xpress_block_cache_write($mydirname,$cache_title. $blockID, $render_array);
+                                        }
+                                } else {
                                         xpress_block_cache_write($mydirname,$cache_title. $blockID, $render_array);
                                 }
-                        } else {
-                                xpress_block_cache_write($mydirname,$cache_title. $blockID, $render_array);
                         }
                 }

trunk/xpressme_integration_kit/include/xpress_cache.php

@@ -1 +1 @@
 <?php
         
+// is_writable() doesn't operate normally on the windows filesystem
+if(!function_exists("cache_is_writable")):
+        function cache_is_writable(){
+                global $xoops_config;
+                $cache_dir = $xoops_config->xoops_cache_path . '/';
+                $filename = $cache_dir .'xpress_cache_test.txt';
+                $fp = @fopen($filename, "w");
+                if ($fp == false) return false;
+                fclose($fp);
+                return true;
+        }
+endif;
+
 if(!function_exists("xpress_cache_found")):
     function xpress_cache_found($filename)