Changeset 716 for trunk

Timestamp:

Apr 24, 2011, 12:53:31 AM (14 years ago)

Author:

toemon

Message:

ブロック用のcacheディレクトリに書き込み権限がないときメッセージを表示するように変更 Fixed#397

Location:

trunk/xpressme_integration_kit

Files:

• include/xpress_block_render.php (modified) (1 diff)
• language/english/blocks.php (modified) (1 diff)
• language/ja_utf8/blocks.php (modified) (1 diff)
• language/japanese/blocks.php (modified) (1 diff)
• language/pt-br_utf8/blocks.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -156 +156 @@
                                 $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'];
+                        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)";
                         } else {
-                                $block['err_message'] = sprintf(_MB_XP2_BLOCK_CACHE_ERR, '<a href="' . XOOPS_URL . '/modules/' . $mydirname . '">' . $mydirname .'</a>');
+                                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>');
+                                }
                         }
                 }

trunk/xpressme_integration_kit/language/english/blocks.php

@@ -27 +27 @@
         define("_MB_XP2_FILE_NAME","Files Name");
         define("_MB_XP2_THISTEMPLATE","Template");
-        define("_MB_XP2_NO_JSCRIPT","Javascript should be enable by a browser.");       
+        define("_MB_XP2_NO_JSCRIPT","Javascript should be enable by a browser.");
+        define("_MB_XP2_CACHE_NOT_WRITABLE","Cache Directory is not writable.");
         
 // recent comment block 

trunk/xpressme_integration_kit/language/ja_utf8/blocks.php

@@ -27 +27 @@
         define("_MB_XP2_FILE_NAME","ファイル名");
         define("_MB_XP2_THISTEMPLATE","このブロックのテンプレート");
-        define("_MB_XP2_NO_JSCRIPT","ブラウザでJavascriptを有効にする必要があります。");   
+        define("_MB_XP2_NO_JSCRIPT","ブラウザでJavascriptを有効にする必要があります。");
+        define("_MB_XP2_CACHE_NOT_WRITABLE","キャッシュディレクトリへの書き込みが許可されていません。");
         
 // recent comment block 

trunk/xpressme_integration_kit/language/japanese/blocks.php

@@ -27 +27 @@
         define("_MB_XP2_FILE_NAME","¥Õ¥¡¥¤¥ë̾");
         define("_MB_XP2_THISTEMPLATE","¤³¤Î¥Ö¥í¥Ã¥¯¤Î¥Æ¥ó¥×¥ì¡¼¥È");
-        define("_MB_XP2_NO_JSCRIPT","¥Ö¥é¥¦¥¶¤ÇJavascript¤òÍ­¸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£");        
+        define("_MB_XP2_NO_JSCRIPT","¥Ö¥é¥¦¥¶¤ÇJavascript¤òÍ­¸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£");
+        define("_MB_XP2_CACHE_NOT_WRITABLE","¥­¥ã¥Ã¥·¥å¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î½ñ¤­¹þ¤ß¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£");
         
 // recent comment block 

trunk/xpressme_integration_kit/language/pt-br_utf8/blocks.php

@@ -27 +27 @@
         define("_MB_XP2_FILE_NAME","Nome do arquivo");
         define("_MB_XP2_THISTEMPLATE","Modelo");
-        define("_MB_XP2_NO_JSCRIPT","Javascript deveria ser habilite por um browser."); 
+        define("_MB_XP2_NO_JSCRIPT","Javascript deveria ser habilite por um browser.");
+        define("_MB_XP2_CACHE_NOT_WRITABLE","Diretório de Cache não é nenhum writable.");
         
 // recent comment block