Index: /trunk/xpressme_integration_kit/include/add_xpress_process.php
===================================================================
--- /trunk/xpressme_integration_kit/include/add_xpress_process.php (revision 572)
+++ /trunk/xpressme_integration_kit/include/add_xpress_process.php (revision 573)
@@ -177,5 +177,9 @@
require_once( dirname( __FILE__ ).'/xpress_block_render.php' );
xpress_unnecessary_block_cache_delete($xoops_config->module_name);
- if (is_home()) xpress_block_cache_refresh($xoops_config->module_name);
+ if (is_home()) {
+ xpress_block_cache_refresh($xoops_config->module_name);
+ require_once( dirname( __FILE__ ).'/xpress_block_header.php' );
+ set_xpress_block_header($xoops_config->module_name);
+ }
exit(); // The return to wp-blog-header.php is stolen here
}
Index: /trunk/xpressme_integration_kit/include/xpress_block_header.php
===================================================================
--- /trunk/xpressme_integration_kit/include/xpress_block_header.php (revision 573)
+++ /trunk/xpressme_integration_kit/include/xpress_block_header.php (revision 573)
@@ -0,0 +1,101 @@
+', '' , $xml);
+ }
+ xpress_cache_write($mydirname,$xml_name,$xml);
+ }
+ function xpress_block_header_cache_read($mydirname)
+ {
+ $xml_name = 'block_header.xml';
+ $xml_data = xpress_cache_read($mydirname,$xml_name);
+
+ $GLOBALS['DO_LIBXML_PATCH'] = get_xpress_mod_config($mydirname,'libxml_patch');
+
+ // The character-code not treatable exists when 'XML_unserialize' of PHP5 processes EUC-JP.
+ // And, the result is returned by character-code UTF-8.
+ // Measures
+ // After the character-code is converted into UTF-8, XML_unserialize will be processed.
+ if ( strstr($xml_data, '') !== false
+ && version_compare(PHP_VERSION, '5.0.0', '>') )
+ {
+ $xml_data = str_replace('', '', $xml_data);
+ $ans = mb_convert_variables('UTF-8' , 'EUC-JP', &$xml_data); //EUC-JP to UTF-8
+ $ret = @xpress_XML_unserialize($xml_data);
+ $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret); //UTF-8 to EUC-JP
+ } else {
+ $ret = xpress_XML_unserialize($xml_data);
+ }
+ return $ret;
+ }
+ function get_block_stylesheet_url($mydirname)
+ {
+ global $xoops_config;
+ $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname;
+ $select_theme = get_xpress_theme_name($mydirname);
+ $style_file = $mydirpath . '/wp-content/themes/' . $select_theme . '/blocks/block_style.css';
+ if (file_exists($style_file))
+ return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/' . $select_theme . '/blocks/block_style.css';
+ else
+ return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/block_style.css';
+ }
+
+ function set_xpress_block_header($mydirname)
+ {
+ ob_start();
+ bloginfo('stylesheet_url');
+ $stylesheet_link = "\t".'';
+ ob_end_clean();
+ $block_stylesheet_link = "\t".'';
+
+ ob_start();
+ wp_head();
+ $header_str = ob_get_contents();
+ ob_end_clean();
+ $pattern = '<\s*link\s+rel\s*=[^>]*?>';
+ $header_str = preg_replace("/".$pattern."/s" , '' , $header_str);
+ $pattern = '<\s*meta\s+name\s*=[^>]*?>';
+ $header_str = preg_replace("/".$pattern."/i" , '' , $header_str);
+ $pattern = "';
-
- // hotDate
- $output .= "\n".'';
- return $output;
- }
- return '';
- }
-
- function xpress_block_css_set($mydirname = '')
- {
- $style_url = get_block_stylesheet_url($mydirname);
-
- $tplVars =& $GLOBALS['xoopsTpl']->get_template_vars();
- $csslink = "\n".'';
- // Module Main CSS Plugin Css
- $csslink .= xpress_get_plugin_css($mydirname);
-
+ function xpress_block_header_set($mydirname = '')
+ {
+ require_once( dirname( __FILE__ ).'/xpress_block_header.php' );
+ $xml = xpress_block_header_cache_read($mydirname);
+ $block_header = $xml['block_header'];
+ if (!empty($block_header)){
+ $tplVars =& $GLOBALS['xoopsTpl']->get_template_vars();
if(array_key_exists('xoops_block_header', $tplVars)) {
- if (!strstr($tplVars['xoops_block_header'],$csslink)) {
- $GLOBALS['xoopsTpl']->assign('xoops_block_header',$tplVars['xoops_block_header'].$csslink);
+ if (!strstr($tplVars['xoops_block_header'],$block_header)) {
+ $GLOBALS['xoopsTpl']->assign('xoops_block_header',$tplVars['xoops_block_header'].$block_header);
}
} else {
- $GLOBALS['xoopsTpl']->assign('xoops_block_header',$csslink);
- }
+ $GLOBALS['xoopsTpl']->assign('xoops_block_header',$block_header);
+ }
+ }
}
@@ -194,5 +152,4 @@
$call_url = $_SERVER['REQUEST_URI'];
- xpress_block_css_set($mydirname);
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);
@@ -208,4 +165,5 @@
$block['err_message'] = sprintf(_MB_XP2_BLOCK_CACHE_ERR, '' . $mydirname .'');
}
+ xpress_block_header_set($mydirname);
}
$temp_option = explode(':' , $options[1]);
Index: /trunk/xpressme_integration_kit/include/xpress_render.php
===================================================================
--- /trunk/xpressme_integration_kit/include/xpress_render.php (revision 572)
+++ /trunk/xpressme_integration_kit/include/xpress_render.php (revision 573)
@@ -38,4 +38,7 @@
$head_str = preg_replace("/^(\s)*(\r|\n|\r\n)/m", "", $head_str);
$head_str = $head_str . "\n\n";
+ $pattern = "^";
+ $head_str = preg_replace("/".$pattern."/m" , "\t" , $head_str);
+
return $head_str;
}