Changeset 573

Timestamp:

Apr 13, 2010, 4:19:26 PM (15 years ago)

Author:

toemon

Message:

XOOPS smartyテンプレートタグ$xoops_block_headerに<script>を追加 Fixes #329

Location:

trunk/xpressme_integration_kit/include

Files:

• add_xpress_process.php (modified) (1 diff)
• xpress_block_header.php (added)
• xpress_block_render.php (modified) (3 diffs)
• xpress_render.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/add_xpress_process.php

@@ -177 +177 @@
         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
 }

trunk/xpressme_integration_kit/include/xpress_block_render.php

@@ -102 +102 @@
         }
 
-        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 get_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 . '/style.css';
-                if (file_exists($style_file))
-                        return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/' . $select_theme . '/style.css';
-                else    
-                        return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/style.css';
-        }
-        
-        function xpress_get_plugin_css($mydirname = '')
-        {
-                $this_url = '/modules/'. $mydirname;
-                $call_url = $_SERVER['REQUEST_URI'];
-                if (!strstr($call_url,$this_url)){                      
-                        global $xoops_config;
-                        
-                        // Module Main CSS
-                        $output = "\n".'<style type="text/css">@import url('.get_stylesheet_url($mydirname).');</style>';
-                        
-                        // hotDate
-                        $output .= "\n".'<style type="text/css">@import url('.$xoops_config->module_url.'/wp-content/plugins/hotDates/hotDates.css);</style>';
-                        return $output; 
-                } 
-                return '';
-        }
-
-        function xpress_block_css_set($mydirname = '')
-        {
-                $style_url =  get_block_stylesheet_url($mydirname);
-                
-                $tplVars =& $GLOBALS['xoopsTpl']->get_template_vars();
-                $csslink = "\n".'<link rel="stylesheet" type="text/css" media="screen" href="'. $style_url .'" />';
-                // 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 +152 @@
                 $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 +165 @@
                                 $block['err_message'] = sprintf(_MB_XP2_BLOCK_CACHE_ERR, '<a href="' . XOOPS_URL . '/modules/' . $mydirname . '">' . $mydirname .'</a>');
                         }
+                        xpress_block_header_set($mydirname);
                 }
                 $temp_option = explode(':' , $options[1]);

trunk/xpressme_integration_kit/include/xpress_render.php

@@ -38 +38 @@
         $head_str = preg_replace("/^(\s)*(\r|\n|\r\n)/m", "", $head_str);       
         $head_str = $head_str . "\n<!-- credit " . xpress_credit('echo=0&no_link=1') . " -->\n";
+        $pattern = "^";
+        $head_str = preg_replace("/".$pattern."/m" , "\t" , $head_str);
+
         return $head_str;
 }