Changeset 803 for branches

Timestamp:

Apr 3, 2012, 9:33:21 AM (13 years ago)

Author:

toemon

Message:

XCL2.2 & XOOPS 2.3 or higher & Impress CMSにおける、xoops_meta_keyword　xoops_meta_description の取り扱い修正 Fixed #411

File:

• branches/Ver2.4/xpressme_integration_kit/include/xpress_render.php (modified) (7 diffs)

branches/Ver2.4/xpressme_integration_kit/include/xpress_render.php

@@ -180 +180 @@
 }
 
+function xpress_meta_assign($meta_key,$meta_word){
+        global $xoopsTpl,$xoTheme; //for XOOPS
+
+        if (!empty($meta_key) && !empty($meta_word)){
+                if (defined('LEGACY_MODULE_VERSION') && version_compare(LEGACY_MODULE_VERSION, '2.2', '>=')) {
+                // For XCL 2.2
+                $xclRoot =& XCube_Root::getSingleton();
+                $headerScript = $xclRoot->mContext->getAttribute('headerScript');
+                $headerScript->addMeta($meta_key, $meta_word);
+                } elseif (isset($xoTheme) && is_object($xoTheme)) {
+                // For XOOPS 2.3 or higher & Impress CMS.
+                $xoTheme->addMeta('meta', $meta_key, $meta_word);
+                }
+                $xoopsTpl->assign('xoops_meta_'.  $meta_key, $meta_word);                               
+        }       
+}
+function xpress_get_xoops_meta($meta_key){
+        global $xoopsTpl,$xoTheme; //for XOOPS
+        
+        if (defined('LEGACY_MODULE_VERSION') && version_compare(LEGACY_MODULE_VERSION, '2.2', '>=')) {
+                // For XCL 2.2
+                        $moduleHandler =& xoops_gethandler('module');
+                        $legacyRender =& $moduleHandler->getByDirname('legacyRender');
+                $configHandler =& xoops_gethandler('config');
+                        $configs =& $configHandler->getConfigsByCat(0, $legacyRender->get('mid'));
+                        $ret = htmlspecialchars($configs['meta_'.$meta_key]);
+        } elseif (isset($xoTheme) && is_object($xoTheme)) {
+                $ret = $xoTheme->metas['meta'][$meta_key];
+        } else {
+                $ret = $xoopsTpl->get_template_vars('xoops_meta_'.$meta_key);
+        }
+        return $ret;
+}
+        
+
 //rendering for the module header and the body
 function xpress_render($contents){
@@ -196 +231 @@
         $xoopsTpl->assign('xoops_pagetitle', $page_title);
         
-        $xoops_keywords = $xoopsTpl->get_template_vars('xoops_meta_keywords');
+        $xoops_keywords =  xpress_get_xoops_meta('keywords');
+        
         $wp_keyword = get_xpress_meta_name('keywords',$contents);
         switch ($xpress_config->meta_keyword_type){
@@ -202 +238 @@
                         break;
                 case 'wordpress':
-                        if (!empty($wp_keyword))
-                                $xoopsTpl->assign('xoops_meta_keywords', $wp_keyword);
+                        if (!empty($wp_keyword)){
+                                xpress_meta_assign('keywords', $wp_keyword);
+                        }
                         break;
                 case 'wordpress_xoops':
@@ -212 +249 @@
                                         $keywords = $wp_keyword;
                                 }
-                                $xoopsTpl->assign('xoops_meta_keywords', $keywords);
+                                xpress_meta_assign('keywords', $keywords);
                         } 
                         break;
@@ -218 +255 @@
         }
 
-        $xoops_description = $xoopsTpl->get_template_vars('xoops_meta_description');
+        $xoops_description =  xpress_get_xoops_meta('description');
         $wp_description = get_xpress_meta_name('description',$contents);
+
         switch ($xpress_config->meta_description_type){
                 case 'xoops':
                         break;
                 case 'wordpress':
-                        if (!empty($wp_description))
-                                $xoopsTpl->assign('xoops_meta_description', $wp_description);
+                        if (!empty($wp_description)){
+                                xpress_meta_assign('description', $wp_description);
+                        }
                         break;
                 case 'wordpress_xoops':
@@ -234 +273 @@
                                         $description = $wp_description;
                                 }
-                                $xoopsTpl->assign('xoops_meta_description', $description);
+                                xpress_meta_assign('description', $description);
                         } 
                         break;
@@ -246 +285 @@
                 case 'wordpress':
                         if (!empty($wp_robots))
-                                $xoopsTpl->assign('xoops_meta_robots', $wp_robots);
+                                xpress_meta_assign('robots', $wp_robots);
                         break;
                 default :