Changeset 305 for trunk

Timestamp:

Jun 22, 2009, 1:30:16 PM (15 years ago)

Author:

toemon

Message:

Ver2.0ブランチの修正項目 r303 r304 をtrunkにマージ

Location:

trunk

Files:

• external/xpress_i18n/ja_EUC/language/japanese/blocks.php (modified) (1 diff)
• external/xpress_i18n/ja_UTF/language/ja_utf8/blocks.php (modified) (1 diff)
• xpressme_integration_kit/blocks/widget_block.php (modified) (3 diffs)
• xpressme_integration_kit/language/english/blocks.php (modified) (1 diff)
• xpressme_integration_kit/language/ja_utf8/blocks.php (modified) (1 diff)

trunk/external/xpress_i18n/ja_EUC/language/japanese/blocks.php

@@ -123 +123 @@
         define("_MB_XP2_META_CH_STYLE","ɽ¼¨¥â¡¼¥ÉÀÚÂؤòɽ¼¨");
 
-// meta 
+// widget 
         define("_MB_XP2_SELECT_WIDGET","ɽ¼¨¤¹¤ë¥¦¥£¥¸¥§¥Ã¥È¤òÁªÂò (Ê£¿ôÁªÂò²Ä)");
+        define("_MB_XP2_NO_WIDGET","WordPress¦¤Çɽ¼¨¤¹¤ë¥¦¥£¥¸¥§¥Ã¥È¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó");
         
 // custom 

trunk/external/xpress_i18n/ja_UTF/language/ja_utf8/blocks.php

@@ -123 +123 @@
         define("_MB_XP2_META_CH_STYLE","表示モード切替を表示");
 
-// meta 
+// widget 
         define("_MB_XP2_SELECT_WIDGET","表示するウィジェットを選択 (複数選択可)");
+        define("_MB_XP2_NO_WIDGET","WordPress側で表示するウィジェットが選択されていません");
         
 // custom 

trunk/xpressme_integration_kit/blocks/widget_block.php

@@ -20 +20 @@
                 $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_widget_block.html' : trim( $options[1] );
         $selected = array_slice($options,2); // get allowed cats
+
+                if ($mydirname == 'wordpress'){
+                        $wp_prefix = 'wp_';
+                } else {
+                        $wp_prefix = $mydirname . '_';
+                }
+                $xoopsDB =& Database::getInstance();
+                $myts =& MyTextSanitizer::getInstance();
+
+                $db_xpress_options = $xoopsDB->prefix($wp_prefix . 'options');
+                $query = "SELECT option_value FROM $db_xpress_options WHERE option_name = 'sidebars_widgets' LIMIT 1";
+                $res =  $xoopsDB->query($query, 0, 0);
+            if ($res !== false){
+                        $row = $xoopsDB->fetchArray($res);
+                        $sidebars_widgets = @unserialize( $row['option_value'] );
+                }
+                if ( !isset($sidebars_widgets['array_version']) )
+                        $sidebars_widgets['array_version'] = 1;
                 
-                global $table_prefix,$wpdb,$xoops_db;
-                global $wp_registered_sidebars, $wp_registered_widgets;
                 
                 require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
@@ -30 +46 @@
                 $form .= "<br />";
                 $form .= _MB_XP2_SELECT_WIDGET .":<br />\n";
-                $form .= "&nbsp;&nbsp;&nbsp;<select name='options[]' multiple=\"multiple\">\n";
-                $sidebars_widgets = wp_get_sidebars_widgets();
-                foreach($wp_registered_sidebars as $sidebar){
-                        $sidebar_id = $sidebar['id'];
-                        $widgets = $sidebars_widgets[$sidebar_id];
-                        foreach($widgets as $widget){
-                                if (empty($wp_registered_widgets[$widget])) continue;
-                                $widget_str = $sidebar_id . '::' . $widget;
-                                if (in_array($widget_str, $selected))
-                                        $form .=  "<option value='" .  $widget_str . "' selected='selected'>" . $widget_str;
-                                else
-                                        $form .=  "<option value='" . $widget_str . "'>" . $widget_str;
+                $select = "&nbsp;&nbsp;&nbsp;<select name='options[]' multiple=\"multiple\">\n";
+                $found = false;
+                foreach ( (array) $sidebars_widgets as $index => $sidebar ){
+                        if ( is_array($sidebar) ){
+                                $sidebar_id = $index;
+                                foreach ( (array) $sidebar as $i => $name ) {
+                                        $found = true;
+                                        $widget = strtolower($name);
+                                        $widget_str = $sidebar_id . '::' . $widget;
+                                        if (in_array($widget_str, $selected))
+                                                $$select .=  "<option value='" .  $widget_str . "' selected='selected'>" . $widget_str;
+                                        else
+                                                $$select .=  "<option value='" . $widget_str . "'>" . $widget_str;
+                                        
+                                }
                         }
                 }
-                $form .=  "</select><br/>\n";
+
+                $select .=  "</select><br/>\n";
+                if ($found){
+                        $form = $form . $select;
+                } else {
+                        $form = $form . "&nbsp;&nbsp;&nbsp;" . _MB_XP2_NO_WIDGET;
+                }
+                
                 return $form;
         }
@@ -57 +83 @@
                 return xpress_block_render($mydirname,$block_function_name,$options);
         }
-        
-        function sidebar_select($wp_registered_sidebars,$option_name,$option_value)
-        {
-                
-        }
-        
 }
-
 ?>

trunk/xpressme_integration_kit/language/english/blocks.php

@@ -123 +123 @@
         define("_MB_XP2_META_CH_STYLE","'display mode' is displayed.");
 
-// meta 
+// widget 
         define("_MB_XP2_SELECT_WIDGET","Displayed Widget is selected.");
+        define("_MB_XP2_NO_WIDGET","Widget displayed on the WordPress side has not been selected. ");
         
 // custom 

trunk/xpressme_integration_kit/language/ja_utf8/blocks.php

@@ -123 +123 @@
         define("_MB_XP2_META_CH_STYLE","表示モード切替を表示");
 
-// meta 
+// widget 
         define("_MB_XP2_SELECT_WIDGET","表示するウィジェットを選択 (複数選択可)");
+        define("_MB_XP2_NO_WIDGET","WordPress側で表示するウィジェットが選択されていません");
+        
         
 // custom