Changeset 387 for trunk

Timestamp:

Sep 26, 2009, 12:48:32 PM (15 years ago)

Author:

toemon

Message:

XOOPSのモジュールオプションとして、手動でlibxml2バグ回避をONさせるオプションを追加 fixed #215

Location:

trunk

Files:

• extras/for_wordpressme2011/ja_EUC/language/japanese/modinfo.php (modified) (1 diff)
• extras/for_wordpressme2011/ja_UTF/language/ja_utf8/modinfo.php (modified) (1 diff)
• extras/xpress_i18n/german/xpressme_modules_root/language/german/modinfo.php (modified) (1 diff)
• extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/modinfo.php (modified) (1 diff)
• extras/xpress_i18n/template/xpressme_modules_root/language/english/modinfo.php (modified) (1 diff)
• xpressme_integration_kit/include/xml.php (modified) (1 diff)
• xpressme_integration_kit/include/xpress_block_render.php (modified) (2 diffs)
• xpressme_integration_kit/language/english/modinfo.php (modified) (1 diff)
• xpressme_integration_kit/language/ja_utf8/modinfo.php (modified) (1 diff)
• xpressme_integration_kit/xoops_version.php (modified) (1 diff)

trunk/extras/for_wordpressme2011/ja_EUC/language/japanese/modinfo.php

@@ -15 +15 @@
         // A brief description of this module
         define("_MI_XP2_DESC","WordPressME¤òXOOPS¥â¥¸¥å¡¼¥ë²½¤·¤¿¤â¤Î¤Ç¤¹¡£");
+
+        // Module Config
+        define("_MI_LIBXML_PATCH","¥Ö¥í¥Ã¥¯¤Çlibxml2 ¥Ð¥°¤ËÂФ¹¤ë¥Ñ¥Ã¥Á¤ò¶¯À©Å¬±þ¤¹¤ë");
+        define("_MI_LIBXML_PATCH_DESC","libxml2 Ver 2.70-2.72¤Ë¤Ï'<'¤È'>'¤¬¼è¤ê½ü¤«¤ì¤ë¥Ð¥°¤¬¤¢¤ê¤Þ¤¹¡£
+XPressME¤Ïlibxml2¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼«Æ°Åª¤Ë¼èÆÀ¤·¡¢É¬ÍפǤ¢¤ì¤Ð¥Ñ¥Ã¥Á¤¬Å¬±þ¤µ¤ì¤Þ¤¹¡£
+XPressME¤¬libxml2¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼èÆÀ¤Ç¤­¤Ê¤¤¾ì¹ç¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¶¯À©Åª¤Ë¥Ñ¥Ã¥Á¤òŬ±þ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£");
 
         // Sub menu titles

trunk/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/modinfo.php

@@ -15 +15 @@
         // A brief description of this module
         define("_MI_XP2_DESC","WordPressMEをXOOPSモジュール化したものです。");
+
+        // Module Config
+        define("_MI_LIBXML_PATCH","ブロックでlibxml2 バグに対するパッチを強制適応する");
+        define("_MI_LIBXML_PATCH_DESC","libxml2 Ver 2.70-2.72には'<'と'>'が取り除かれるバグがあります。
+XPressMEはlibxml2のバージョンを自動的に取得し、必要であればパッチが適応されます。
+XPressMEがlibxml2のバージョンを取得できない場合、このオプションで強制的にパッチを適応させることができます。");
 
         // Sub menu titles

trunk/extras/xpress_i18n/german/xpressme_modules_root/language/german/modinfo.php

@@ -15 +15 @@
         // A brief description of this module
         define("_MI_XP2_DESC","WordPress For XOOPS Community");
+
+        // Module Config
+        define("_MI_LIBXML_PATCH","Force a patch for the libxml2 bug in a block");
+        define("_MI_LIBXML_PATCH_DESC","libxml2 Ver 2.70-2.72 have the bug that '<' and '>' are removed. 
+XPressME acquires a version of libxml2 automatically, and it is adapted a patch if it is necessary. 
+When XPressME cannot acquire a version of libxml2, you can let a patch fit it with this option forcibly.");
 
         // Sub menu titles

trunk/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/modinfo.php

@@ -22 +22 @@
         define("_MI_XP2_MENU_XPRESS","Configurações do XPressME");
         define("_MI_XP2_MENU_TO_MODULE","Ir para o módulo");
+
+        // Module Config
+        define("_MI_LIBXML_PATCH","Force um remendo para o bicho de libxml2 em um bloco");
+        define("_MI_LIBXML_PATCH_DESC","libxml2 Ver 2.70-2.72 têm o bicho que' < ' e' > ' é afastado. 
+XPressME adquire uma versão de libxml2 automaticamente, e é adaptado um remendo se for necessário. 
+Quando XPressME não puder adquirir uma versão de libxml2, o senhor pode deixar um remendo isto ajustar violentamente com esta opção.");
 
         // Block Name

trunk/extras/xpress_i18n/template/xpressme_modules_root/language/english/modinfo.php

@@ -22 +22 @@
         define("_MI_XP2_MENU_XPRESS","XPressME Setting");
         define("_MI_XP2_MENU_TO_MODULE","to Modules");
+
+        // Module Config
+        define("_MI_LIBXML_PATCH","Force a patch for the libxml2 bug in a block");
+        define("_MI_LIBXML_PATCH_DESC","libxml2 Ver 2.70-2.72 have the bug that '<' and '>' are removed. 
+XPressME acquires a version of libxml2 automatically, and it is adapted a patch if it is necessary. 
+When XPressME cannot acquire a version of libxml2, you can let a patch fit it with this option forcibly.");
 
         // Block Name

trunk/xpressme_integration_kit/include/xml.php

@@ -88 +88 @@
                 //libxml2 ver.2.7.0 -2.7.2 stripping leading angle brackets bug patch
                 if ( 
-                        LIBXML_DOTTED_VERSION == '2.7.0' 
+                        $GLOBALS['DO_LIBXML_PATCH'] == '1' 
+                        || LIBXML_DOTTED_VERSION == '2.7.0' 
                         || LIBXML_DOTTED_VERSION == '2.7.1' 
                         || LIBXML_DOTTED_VERSION == '2.7.2' 

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -24 +24 @@
                         $xml_name = $block_name . '.xml';
                         $xml_data = xpress_cache_read($mydirname,$xml_name);
-
+                        
+                        $GLOBALS['DO_LIBXML_PATCH'] = get_xpress_mod_config($mydirname,'libxml_patch');
+                        
                         $ret = @xpress_XML_unserialize($xml_data);
                         if (strstr($xml_data, '<?xml version="1.0" encoding="EUC-JP" ?>') !== false){
@@ -266 +268 @@
         } 
     } 
+    
+    function get_xpress_mod_config($mydirname,$conf_name=''){
+                $module_handler =& xoops_gethandler('module');
+                $xoopsModule =& $module_handler->getByDirname($mydirname);
+                $mid = $xoopsModule->getVar('mid');
+                $xoopsDB =& Database::getInstance();
+                $db_config = $xoopsDB->prefix('config');
+            
+                $wu_sql  =      "SELECT conf_value FROM  $db_config ";
+                $wu_sql .=      "WHERE (conf_modid = $mid ) AND (conf_name LIKE '$conf_name')";
+                $wu_res = $xoopsDB->queryF($wu_sql, 0, 0);
+                        
+                if ($wu_res === false){
+                        return 0;
+                } else {
+                        $xu_row = $xoopsDB->fetchArray($wu_res);
+                        return $xu_row['conf_value'];
+                }
+        }
+
 }       
 ?>

trunk/xpressme_integration_kit/language/english/modinfo.php

@@ -22 +22 @@
         define("_MI_XP2_MENU_XPRESS","XPressME Setting");
         define("_MI_XP2_MENU_TO_MODULE","to Modules");
+
+        // Module Config
+        define("_MI_LIBXML_PATCH","Force a patch for the libxml2 bug in a block");
+        define("_MI_LIBXML_PATCH_DESC","libxml2 Ver 2.70-2.72 have the bug that '<' and '>' are removed. 
+XPressME acquires a version of libxml2 automatically, and it is adapted a patch if it is necessary. 
+When XPressME cannot acquire a version of libxml2, you can let a patch fit it with this option forcibly.");
 
         // Block Name

trunk/xpressme_integration_kit/language/ja_utf8/modinfo.php

@@ -22 +22 @@
         define("_MI_XP2_MENU_XPRESS","XPressME設定");
         define("_MI_XP2_MENU_TO_MODULE","モジュールへ");
+
+        // Module Config
+        define("_MI_LIBXML_PATCH","ブロックでlibxml2 バグに対するパッチを強制適応する");
+        define("_MI_LIBXML_PATCH_DESC","libxml2 Ver 2.70-2.72には'<'と'>'が取り除かれるバグがあります。
+XPressMEはlibxml2のバージョンを自動的に取得し、必要であればパッチが適応されます。
+XPressMEがlibxml2のバージョンを取得できない場合、このオプションで強制的にパッチを適応させることができます。");
 
         // Block Name

trunk/xpressme_integration_kit/xoops_version.php

@@ -118 +118 @@
 $modversion['templates'] = array() ;
 
-if (defined('ICMS_ROOT_PATH')){
-        $modversion['hasconfig'] = 1;
-        $modversion['config'][] = array(
-                'name'                  => 'dummy' ,
-                'title'                 =>  'Dummy Value' ,
-                'description'   =>  'This is Dummy Value' ,
-                'formtype'              => 'yesno' ,
-                'valuetype'             => 'int' ,
-                'default'               => 0 ,
-        );
-}
+$modversion['hasconfig'] = 1;
+$modversion['config'][] = array(
+        'name'                  => 'libxml_patch' ,
+        'title'                 =>  '_MI_LIBXML_PATCH' ,
+        'description'   =>  '_MI_LIBXML_PATCH_DESC' ,
+        'formtype'              => 'yesno' ,
+        'valuetype'             => 'int' ,
+        'default'               => 0 ,
+);
 
 //BLOCKS