Changeset 488 for branches

Timestamp:

Dec 15, 2009, 4:52:57 PM (15 years ago)

Author:

toemon

Message:

開発ベースにVer2.2をマージ

Location:

branches/XPressMU

Files:

• extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php (modified) (1 diff)
• extras/for_wordpressme2011/ja_EUC/language/japanese/modinfo.php (modified) (2 diffs)
• extras/for_wordpressme2011/ja_EUC/wp-content/plugins/xpressme/language/xpressme-ja_EUC.mo (modified) (previous)
• extras/for_wordpressme2011/ja_EUC/wp-content/plugins/xpressme/language/xpressme-ja_EUC.po (modified) (13 diffs)
• extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php (modified) (1 diff)
• extras/for_wordpressme2011/ja_UTF/language/ja_utf8/modinfo.php (modified) (2 diffs)
• extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/blocks.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/blocks.php (modified) (2 diffs)
• extras/xpress_i18n/template/xpressme_modules_root/language/english/modinfo.php (modified) (1 diff)
• xpressme_integration_kit/admin/menu.php (modified) (1 diff)
• xpressme_integration_kit/blocks/archives_block.php (modified) (2 diffs)
• xpressme_integration_kit/blocks/authors_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/block_common.php (modified) (2 diffs)
• xpressme_integration_kit/blocks/calender_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/category_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/enhanced_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/meta_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/page_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/popular_posts_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/recent_comments_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/recent_posts_content_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/recent_posts_list_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/search_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/tag_cloud_block.php (modified) (1 diff)
• xpressme_integration_kit/blocks/widget_block.php (modified) (1 diff)
• xpressme_integration_kit/include/add_xpress_process.php (modified) (1 diff)
• xpressme_integration_kit/include/general_functions.php (modified) (3 diffs)
• xpressme_integration_kit/include/oninstall.php (modified) (1 diff)
• xpressme_integration_kit/include/onupdate.php (modified) (4 diffs)
• xpressme_integration_kit/include/set_cash_cookie_path.php (modified) (6 diffs)
• xpressme_integration_kit/include/xpress_block_render.php (modified) (8 diffs)
• xpressme_integration_kit/include/xpress_templates_make.php (modified) (5 diffs)
• xpressme_integration_kit/language/english/blocks.php (modified) (2 diffs)
• xpressme_integration_kit/language/english/modinfo.php (modified) (1 diff)
• xpressme_integration_kit/language/ja_utf8/blocks.php (modified) (1 diff)
• xpressme_integration_kit/language/ja_utf8/modinfo.php (modified) (1 diff)
• xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (modified) (5 diffs)
• xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp_old.php (modified) (1 diff)
• xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php (modified) (3 diffs)
• xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (modified) (2 diffs)
• xpressme_integration_kit/xoops_version.php (modified) (1 diff)

branches/XPressMU/extras/for_wordpressme2011/ja_EUC/language/japanese/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","¥ê¥¹¥È");
         define("_MB_XP2_FILE_NAME","¥Õ¥¡¥¤¥ë̾");
+        define("_MB_XP2_THISTEMPLATE","¤³¤Î¥Ö¥í¥Ã¥¯¤Î¥Æ¥ó¥×¥ì¡¼¥È");
         
 // recent comment block 

branches/XPressMU/extras/for_wordpressme2011/ja_EUC/language/japanese/modinfo.php

@@ -16 +16 @@
         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
         define("_MI_XP2_MENU_POST_NEW","¿·µ¬Åê¹Æ");
@@ -28 +22 @@
         define("_MI_XP2_MENU_XPRESS","XPressMEÀßÄê");
         define("_MI_XP2_MENU_TO_MODULE","¥â¥¸¥å¡¼¥ë¤Ø");
+        define("_MI_XP2_TO_UPDATE","¥¢¥Ã¥×¥Ç¡¼¥È");
+
+        // Module Config
+        define("_MI_LIBXML_PATCH","¥Ö¥í¥Ã¥¯¤Çlibxml2 ¥Ð¥°¤ËÂФ¹¤ë¥Ñ¥Ã¥Á¤ò¶¯À©Å¬±þ¤¹¤ë");
+        define("_MI_LIBXML_PATCH_DESC","libxml2 Ver 2.70-2.72¤Ë¤Ï'<'¤È'>'¤¬¼è¤ê½ü¤«¤ì¤ë¥Ð¥°¤¬¤¢¤ê¤Þ¤¹¡£
+XPressME¤Ïlibxml2¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼«Æ°Åª¤Ë¼èÆÀ¤·¡¢É¬ÍפǤ¢¤ì¤Ð¥Ñ¥Ã¥Á¤¬Å¬±þ¤µ¤ì¤Þ¤¹¡£
+XPressME¤¬libxml2¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¼èÆÀ¤Ç¤­¤Ê¤¤¾ì¹ç¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ç¶¯À©Åª¤Ë¥Ñ¥Ã¥Á¤òŬ±þ¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£");
 
         // Block Name

branches/XPressMU/extras/for_wordpressme2011/ja_EUC/wp-content/plugins/xpressme/language/xpressme-ja_EUC.po

@@ -9 +9 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-10-06 21:59+0900\n"
-"PO-Revision-Date: 2009-11-20 12:52+0900\n"
+"PO-Revision-Date: 2009-11-24 18:42+0900\n"
 "Last-Translator: toemon <info@toemon.com>\n"
 "Language-Team: toemon <info@toemon.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Japanese\n"
@@ -25 +25 @@
 #: xpressme.php:59
 msgid "Display Settings"
-msgstr "表示設定"
+msgstr "ɽ¼¨ÀßÄê"
 
 #: xpressme.php:60
 msgid "Integration Settings"
-msgstr "統合設定"
+msgstr "Åý¹çÀßÄê"
 
 #: xpressme.php:61
 msgid "Other Settings"
-msgstr "その他の設定"
+msgstr "¤½¤Î¾¤ÎÀßÄê"
 
 #: xpressme.php:63
 msgid "Upgrade"
-msgstr "アップグレード"
+msgstr "¥¢¥Ã¥×¥°¥ì¡¼¥É"
 
 #: xpressme.php:64
 msgid "to Modules Admin"
-msgstr "モジュール管理へ"
+msgstr "¥â¥¸¥å¡¼¥ë´ÉÍý¤Ø"
 
 #: xpressme.php:164
 msgid "XPressME Display Setting"
-msgstr "XPressME 表示設定"
+msgstr "XPressME ɽ¼¨ÀßÄê"
 
 #: xpressme.php:170
 msgid "Thema Sidebar Display"
-msgstr "テーマ表示時にサイドバー表示する。"
+msgstr "¥Æ¡¼¥Þɽ¼¨»þ¤Ë¥µ¥¤¥É¥Ð¡¼É½¼¨¤¹¤ë¡£"
 
 #: xpressme.php:171
@@ -61 +61 @@
 #: xpressme_class.php:456
 msgid "YES"
-msgstr "はい"
+msgstr "¤Ï¤¤"
 
 #: xpressme.php:172
@@ -73 +73 @@
 #: xpressme_class.php:457
 msgid "NO"
-msgstr "いいえ"
+msgstr "¤¤¤¤¤¨"
 
 #: xpressme.php:181
@@ -79 +79 @@
 #: xpressme.php:291
 msgid "Update Config"
-msgstr "更新"
+msgstr "¹¹¿·"
 
 #: xpressme.php:182
@@ -85 +85 @@
 #: xpressme.php:292
 msgid "Preset Config"
-msgstr "プリセット"
+msgstr "¥×¥ê¥»¥Ã¥È"
 
 #: xpressme.php:214
 msgid "XPressME Integration Setting"
-msgstr "XPressME 統合設定"
+msgstr "XPressME Åý¹çÀßÄê"
 
 #: xpressme.php:218
 msgid "Media Upload Base Path"
-msgstr "メディアアップロードのベースパス設定"
+msgstr "¥á¥Ç¥£¥¢¥¢¥Ã¥×¥í¡¼¥É¤Î¥Ù¡¼¥¹¥Ñ¥¹ÀßÄê"
 
 #: xpressme.php:222
 msgid "Use XOOPS UPLOAD PATH"
-msgstr "XOOPSのアップロードパスを使用する。"
+msgstr "XOOPS¤Î¥¢¥Ã¥×¥í¡¼¥É¥Ñ¥¹¤ò»ÈÍѤ¹¤ë¡£"
 
 #: xpressme.php:223
 msgid "USE WordPress BASE_PATH"
-msgstr "WordPressのベースパスを使用する。"
+msgstr "WordPress¤Î¥Ù¡¼¥¹¥Ñ¥¹¤ò»ÈÍѤ¹¤ë¡£"
 
 #: xpressme.php:257
 msgid "XPressME Other Setting"
-msgstr "XPressME その他の設定"
+msgstr "XPressME ¤½¤Î¾¤ÎÀßÄê"
 
 #: xpressme.php:262
 msgid "The change tracking of the post is preserved"
-msgstr "投稿の変更履歴を有効にする。"
+msgstr "Åê¹Æ¤ÎÊѹ¹ÍúÎò¤òÍ­¸ú¤Ë¤¹¤ë¡£"
 
 #: xpressme.php:268
 msgid "Select Multi user mode"
-msgstr "マルチユーザーモードを選択"
+msgstr "¥Þ¥ë¥Á¥æ¡¼¥¶¡¼¥â¡¼¥É¤òÁªÂò"
 
 #: xpressme.php:273
 msgid "Is the posts author views counted?"
-msgstr "投稿者の閲覧をカウントしますか？"
+msgstr "Åê¹Æ¼Ô¤Î±ÜÍ÷¤ò¥«¥¦¥ó¥È¤·¤Þ¤¹¤«¡©"
 
 #: xpressme.php:279
 msgid "Is SQL debugging window displayed?"
-msgstr "SQLデバッグウィンドを表示しますか？"
+msgstr "SQL¥Ç¥Ð¥Ã¥°¥¦¥£¥ó¥É¤òɽ¼¨¤·¤Þ¤¹¤«¡©"
 
 #: xpressme.php:284
 msgid "Select warning display of block file version check"
-msgstr "ブロックファイルのバージョンチェック時における警告表示"
+msgstr "¥Ö¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤Î¥Ð¡¼¥¸¥ç¥ó¥Á¥§¥Ã¥¯»þ¤Ë¤ª¤±¤ë·Ù¹ðɽ¼¨"
 
 #: xpressme.php:285
 msgid "Do display"
-msgstr "表示する"
+msgstr "ɽ¼¨¤¹¤ë"
 
 #: xpressme.php:286
 msgid "Do not display"
-msgstr "表示しない"
+msgstr "ɽ¼¨¤·¤Ê¤¤"
 
 #: xpressme_class.php:61
 #: xpressme_class.php:243
 msgid "Older Post"
-msgstr "前の投稿へ"
+msgstr "Á°¤ÎÅê¹Æ¤Ø"
 
 #: xpressme_class.php:62
 #: xpressme_class.php:246
 msgid "Newer Post"
-msgstr "次の投稿へ"
+msgstr "¼¡¤ÎÅê¹Æ¤Ø"
 
 #: xpressme_class.php:64
 #: xpressme_class.php:249
 msgid "Older Entries"
-msgstr "前ページへ"
+msgstr "Á°¥Ú¡¼¥¸¤Ø"
 
 #: xpressme_class.php:65
 #: xpressme_class.php:252
 msgid "Newer Entries"
-msgstr "次ページへ"
+msgstr "¼¡¥Ú¡¼¥¸¤Ø"
 
 #: xpressme_class.php:79
@@ -159 +159 @@
 #: xpressme_class.php:255
 msgid "Read the rest of this entry &raquo;"
-msgstr "この投稿の続きを読む &raquo;"
+msgstr "¤³¤ÎÅê¹Æ¤Î³¤­¤òÆɤà &raquo;"
 
 #: xpressme_class.php:356
 msgid "Single Post Navi Setting"
-msgstr "シングルポストナビの設定"
+msgstr "¥·¥ó¥°¥ë¥Ý¥¹¥È¥Ê¥Ó¤ÎÀßÄê"
 
 #: xpressme_class.php:361
 #: xpressme_class.php:406
 msgid "Adjustment of Navi link display position"
-msgstr "リンクの表示位置設定"
+msgstr "¥ê¥ó¥¯¤Îɽ¼¨°ÌÃÖÀßÄê"
 
 #: xpressme_class.php:364
 msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right"
-msgstr "以前の記事へのリンクを左に、より新しい記事へのリンクを右に表示"
+msgstr "°ÊÁ°¤Îµ­»ö¤Ø¤Î¥ê¥ó¥¯¤òº¸¤Ë¡¢¤è¤ê¿·¤·¤¤µ­»ö¤Ø¤Î¥ê¥ó¥¯¤ò±¦¤Ëɽ¼¨"
 
 #: xpressme_class.php:365
 msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right"
-msgstr "より新しい記事へのリンクを左に、古い記事へのリンクを右に表示"
+msgstr "¤è¤ê¿·¤·¤¤µ­»ö¤Ø¤Î¥ê¥ó¥¯¤òº¸¤Ë¡¢¸Å¤¤µ­»ö¤Ø¤Î¥ê¥ó¥¯¤ò±¦¤Ëɽ¼¨"
 
 #: xpressme_class.php:371
 msgid "Select Display name of PostNavi Link"
-msgstr "表示するリンクテキストを選択"
+msgstr "ɽ¼¨¤¹¤ë¥ê¥ó¥¯¥Æ¥­¥¹¥È¤òÁªÂò"
 
 #: xpressme_class.php:374
 msgid "Title of post"
-msgstr "投稿記事のタイトルを表示"
+msgstr "Åê¹Æµ­»ö¤Î¥¿¥¤¥È¥ë¤òɽ¼¨"
 
 #: xpressme_class.php:375
 msgid "Title of Navi"
-msgstr "ナビタイトルを表示"
+msgstr "¥Ê¥Ó¥¿¥¤¥È¥ë¤òɽ¼¨"
 
 #: xpressme_class.php:381
 msgid "Display Navi Title of Old Post Link"
-msgstr "古い記事へのナビタイトルを設定"
+msgstr "¸Å¤¤µ­»ö¤Ø¤Î¥Ê¥Ó¥¿¥¤¥È¥ë¤òÀßÄê"
 
 #: xpressme_class.php:388
 msgid "Display Navi Title of Newer Post Link"
-msgstr "より新しい記事へのナビタイトルを設定"
+msgstr "¤è¤ê¿·¤·¤¤µ­»ö¤Ø¤Î¥Ê¥Ó¥¿¥¤¥È¥ë¤òÀßÄê"
 
 #: xpressme_class.php:401
 msgid "Posts List Page Navi Setting"
-msgstr "ポストリストページナビの設定"
+msgstr "¥Ý¥¹¥È¥ê¥¹¥È¥Ú¡¼¥¸¥Ê¥Ó¤ÎÀßÄê"
 
 #: xpressme_class.php:409
 msgid "'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right"
-msgstr "古いページへのリンクを左に、より新しいページへのリンクを右に表示"
+msgstr "¸Å¤¤¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤òº¸¤Ë¡¢¤è¤ê¿·¤·¤¤¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò±¦¤Ëɽ¼¨"
 
 #: xpressme_class.php:410
 msgid "'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right"
-msgstr "より新しいページへのリンクを左に、古いページへのリンクを右に表示"
+msgstr "¤è¤ê¿·¤·¤¤¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤òº¸¤Ë¡¢¸Å¤¤¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ò±¦¤Ëɽ¼¨"
 
 #: xpressme_class.php:416
 msgid "Display Navi Title of Old Page Link"
-msgstr "古いページへのナビタイトルを設定"
+msgstr "¸Å¤¤¥Ú¡¼¥¸¤Ø¤Î¥Ê¥Ó¥¿¥¤¥È¥ë¤òÀßÄê"
 
 #: xpressme_class.php:423
 msgid "Display Navi Title of Newer Page Link"
-msgstr "より新しいページへのナビタイトルを設定"
+msgstr "¤è¤ê¿·¤·¤¤¥Ú¡¼¥¸¤Ø¤Î¥Ê¥Ó¥¿¥¤¥È¥ë¤òÀßÄê"
 
 #: xpressme_class.php:436
 msgid "Dashboard feed Display Setting"
-msgstr "ダッシュボード　フィード表示設定"
+msgstr "¥À¥Ã¥·¥å¥Ü¡¼¥É¡¡¥Õ¥£¡¼¥Éɽ¼¨ÀßÄê"
 
 #: xpressme_class.php:442
 msgid "Display XPressMe Integration Kit Blog"
-msgstr "XPressME Integration Kit ブログを表示する。"
+msgstr "XPressME Integration Kit ¥Ö¥í¥°¤òɽ¼¨¤¹¤ë¡£"
 
 #: xpressme_class.php:453
 msgid "Display XPressMe Integration Kit Forum"
-msgstr "XPressME Integration Kit フォーラムを表示する。"
+msgstr "XPressME Integration Kit ¥Õ¥©¡¼¥é¥à¤òɽ¼¨¤¹¤ë¡£"
 
 #: xpressme_class.php:471
 msgid "Role Setting at Login"
-msgstr "ログイン時の権限設定"
+msgstr "¥í¥°¥¤¥ó»þ¤Î¸¢¸ÂÀßÄê"
 
 #: xpressme_class.php:474
 msgid "XOOPS Groupe"
-msgstr "XOOPSグループ名"
+msgstr "XOOPS¥°¥ë¡¼¥×̾"
 
 #: xpressme_class.php:474
 msgid "WordPress Role"
-msgstr "WordPressでの権限"
+msgstr "WordPress¤Ç¤Î¸¢¸Â"
 
 #: xpressme_class.php:474
 msgid "Role is set at each login"
-msgstr "ログイン時、常に権限を更新する"
+msgstr "¥í¥°¥¤¥ó»þ¡¢¾ï¤Ë¸¢¸Â¤ò¹¹¿·¤¹¤ë"
 
 #: xpressme_class.php:500
@@ -250 +250 @@
 #: xpressme_class.php:507
 msgid "Default Role of WordPress"
-msgstr "WordPressのデフォルト権限"
+msgstr "WordPress¤Î¥Ç¥Õ¥©¥ë¥È¸¢¸Â"
 
 #: xpressme_class.php:501
@@ -256 +256 @@
 #: xpressme_class.php:508
 msgid "Group User Doesn't Register"
-msgstr "ユーザ登録しない"
+msgstr "¥æ¡¼¥¶ÅÐÏ¿¤·¤Ê¤¤"
 
 #: xpressme_class.php:521
 msgid "Only the Admin can set Group Role Setting"
-msgstr "管理者だけがグループ権限を設定できます。"
+msgstr "´ÉÍý¼Ô¤À¤±¤¬¥°¥ë¡¼¥×¸¢¸Â¤òÀßÄê¤Ç¤­¤Þ¤¹¡£"
 
 #: xpressme_class.php:541
 msgid "WordPress MU cannot integrate the comments."
-msgstr "WordPress MUはコメント統合できません。"
+msgstr "WordPress MU¤Ï¥³¥á¥ó¥ÈÅý¹ç¤Ç¤­¤Þ¤»¤ó¡£"
 
 #: xpressme_class.php:543
 msgid "Do Not Comment Integration."
-msgstr "コメント統合しません。"
+msgstr "¥³¥á¥ó¥ÈÅý¹ç¤·¤Þ¤»¤ó¡£"
 
 #: xpressme_class.php:578
 msgid "Comment integration with D3Forum"
-msgstr "D3Forumとのコメント統合"
+msgstr "D3Forum¤È¤Î¥³¥á¥ó¥ÈÅý¹ç"
 
 #: xpressme_class.php:580
 msgid "Select the forum of D3Forum that does the comment integration from the following lists."
-msgstr "以下のリストからコメント統合をするD3Forumのフォーラムを選択してください。"
+msgstr "°Ê²¼¤Î¥ê¥¹¥È¤«¤é¥³¥á¥ó¥ÈÅý¹ç¤ò¤¹¤ëD3Forum¤Î¥Õ¥©¡¼¥é¥à¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: xpressme_class.php:585
 msgid "Select the Type of display of D3Forum comment."
-msgstr "D3Forumの表示タイプを選択"
+msgstr "D3Forum¤Îɽ¼¨¥¿¥¤¥×¤òÁªÂò"
 
 #: xpressme_class.php:587
 #: xpressme_class.php:590
 msgid "Flat"
-msgstr "フラット"
+msgstr "¥Õ¥é¥Ã¥È"
 
 #: xpressme_class.php:588
 #: xpressme_class.php:591
 msgid "Threaded"
-msgstr "スレッド"
+msgstr "¥¹¥ì¥Ã¥É"
 
 #: xpressme_class.php:594
 msgid "Select the order of display of D3Forum comment."
-msgstr "D3Forumコメントの表示順を選択"
+msgstr "D3Forum¥³¥á¥ó¥È¤Îɽ¼¨½ç¤òÁªÂò"
 
 #: xpressme_class.php:596
 #: xpressme_class.php:599
 msgid "DESC"
-msgstr "降順"
+msgstr "¹ß½ç"
 
 #: xpressme_class.php:597
 #: xpressme_class.php:600
 msgid "ASC"
-msgstr "昇順"
+msgstr "¾º½ç"
 
 #: xpressme_class.php:603
 msgid "Number of displays of D3Forum comments."
-msgstr "D3Forumのコメント表示数"
+msgstr "D3Forum¤Î¥³¥á¥ó¥Èɽ¼¨¿ô"
 
 #: xpressme_class.php:606
 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. "
-msgstr "WordPressコメントとD3Forumポスト間の一括転送（エクスポート・インポート）"
+msgstr "WordPress¥³¥á¥ó¥È¤ÈD3Forum¥Ý¥¹¥È´Ö¤Î°ì³çžÁ÷¡Ê¥¨¥¯¥¹¥Ý¡¼¥È¡¦¥¤¥ó¥Ý¡¼¥È¡Ë"
 
 #: xpressme_class.php:607
 msgid "Export to D3Forum"
-msgstr "D3Forumへ一括エクスポート"
+msgstr "D3Forum¤Ø°ì³ç¥¨¥¯¥¹¥Ý¡¼¥È"
 
 #: xpressme_class.php:608
 msgid "Import from D3Forum"
-msgstr "D3Forumから一括インポート"
+msgstr "D3Forum¤«¤é°ì³ç¥¤¥ó¥Ý¡¼¥È"
 
 #: xpressme_class.php:621
 msgid "Contents Excerpt Setting"
-msgstr "記事抜粋の設定"
+msgstr "µ­»öÈ´¿è¤ÎÀßÄê"
 
 #: xpressme_class.php:626
 msgid "Is the excerpt display done with the archive of contents?"
-msgstr "記事のアーカイブで抜粋表示を行いますか？"
+msgstr "µ­»ö¤Î¥¢¡¼¥«¥¤¥Ö¤ÇÈ´¿èɽ¼¨¤ò¹Ô¤¤¤Þ¤¹¤«¡©"
 
 #: xpressme_class.php:633
 msgid "When ASCII character more than the set ratio is included, it is judged ASCII contents. "
-msgstr "ASCII文字が含まれる比率が設定された値より大きい場合、ASCII文字コンテンツと判断します。"
+msgstr "ASCIIʸ»ú¤¬´Þ¤Þ¤ì¤ëÈæΨ¤¬ÀßÄꤵ¤ì¤¿Ãͤè¤êÂ礭¤¤¾ì¹ç¡¢ASCIIʸ»ú¥³¥ó¥Æ¥ó¥Ä¤ÈȽÃǤ·¤Þ¤¹¡£"
 
 #: xpressme_class.php:640
 msgid "Excerpt length of word for ASCII contents"
-msgstr "ASCIIコンテンツの抜粋単語数"
+msgstr "ASCII¥³¥ó¥Æ¥ó¥Ä¤ÎÈ´¿èñ¸ì¿ô"
 
 #: xpressme_class.php:647
 msgid "Excerpt length of character for multibyte contents"
-msgstr "マルチバイトコンテンツの抜粋文字数"
+msgstr "¥Þ¥ë¥Á¥Ð¥¤¥È¥³¥ó¥Æ¥ó¥Ä¤ÎÈ´¿èʸ»ú¿ô"
 
 #: xpressme_class.php:654
 msgid "This text is displayed in the link that reads contents not excerpted.(Is not displayed for the blank.)"
-msgstr "抜粋されていないコンテンツを読むためのリンクに表示されるテキスト(空白の場合リンクを表示しません)"
+msgstr "È´¿è¤µ¤ì¤Æ¤¤¤Ê¤¤¥³¥ó¥Æ¥ó¥Ä¤òÆɤि¤á¤Î¥ê¥ó¥¯¤Ëɽ¼¨¤µ¤ì¤ë¥Æ¥­¥¹¥È(¶õÇò¤Î¾ì¹ç¥ê¥ó¥¯¤òɽ¼¨¤·¤Þ¤»¤ó)"
 
 #: xpressme_class.php:661
 msgid "This text is displayed in the link that more tag (&lt;!--more--&gt;). "
-msgstr "more タグ (&lt;!--more--&gt;)のリンクに表示されるテキスト"
+msgstr "more ¥¿¥° (&lt;!--more--&gt;)¤Î¥ê¥ó¥¯¤Ëɽ¼¨¤µ¤ì¤ë¥Æ¥­¥¹¥È"
 
 #: xpressme_class.php:673
 msgid "Display Mode Setting"
-msgstr "表示モード設定"
+msgstr "ɽ¼¨¥â¡¼¥ÉÀßÄê"
 
 #: xpressme_class.php:676
 msgid "Select the XPressME Display Mode."
-msgstr "XPressMEの表示モードの選択"
+msgstr "XPressME¤Îɽ¼¨¥â¡¼¥É¤ÎÁªÂò"
 
 #: xpressme_class.php:681
 msgid "Xoops Mode"
-msgstr "XOOPSモード"
+msgstr "XOOPS¥â¡¼¥É"
 
 #: xpressme_class.php:685
 msgid "WordPress Mode"
-msgstr "WordPressモード"
+msgstr "WordPress¥â¡¼¥É"
 
 #: xpressme_class.php:689
 msgid "User select"
-msgstr "ユーザによる選択"
+msgstr "¥æ¡¼¥¶¤Ë¤è¤ëÁªÂò"
 
 #: xpressme_class.php:694
 msgid "Select the theme used in the XOOPS Mode."
-msgstr "XOOPSモードで使用するテーマを選択"
+msgstr "XOOPS¥â¡¼¥É¤Ç»ÈÍѤ¹¤ë¥Æ¡¼¥Þ¤òÁªÂò"
 
 #: xpressme_class.php:699
 msgid "Use WordPress Selected Themes"
-msgstr "WordPressで選択したテーマを使う"
+msgstr "WordPress¤ÇÁªÂò¤·¤¿¥Æ¡¼¥Þ¤ò»È¤¦"
 
 #: xpressme_class.php:717
 msgid "Header Meta Option"
-msgstr "ヘッダメタ　オプション"
+msgstr "¥Ø¥Ã¥À¥á¥¿¡¡¥ª¥×¥·¥ç¥ó"
 
 #: xpressme_class.php:722
 msgid "Select the Header keyword."
-msgstr "ヘッダで使用するキーワードの選択"
+msgstr "¥Ø¥Ã¥À¤Ç»ÈÍѤ¹¤ë¥­¡¼¥ï¡¼¥É¤ÎÁªÂò"
 
 #: xpressme_class.php:727
 msgid "Xoops KeyWord"
-msgstr "XOOPSのキーワード"
+msgstr "XOOPS¤Î¥­¡¼¥ï¡¼¥É"
 
 #: xpressme_class.php:730
 msgid "WordPress KeyWord"
-msgstr "WordPressのキーワード"
+msgstr "WordPress¤Î¥­¡¼¥ï¡¼¥É"
 
 #: xpressme_class.php:733
 msgid "WordPress & Xoops KeyWord"
-msgstr "WordPressｊとXOOPSのキーワード"
+msgstr "WordPress£ê¤ÈXOOPS¤Î¥­¡¼¥ï¡¼¥É"
 
 #: xpressme_class.php:739
 msgid "Select the Header Description."
-msgstr "ヘッダで使用するディスクリプション（説明）の選択"
+msgstr "¥Ø¥Ã¥À¤Ç»ÈÍѤ¹¤ë¥Ç¥£¥¹¥¯¥ê¥×¥·¥ç¥ó¡ÊÀâÌÀ¡Ë¤ÎÁªÂò"
 
 #: xpressme_class.php:744
 msgid "Xoops Description"
-msgstr "XOOPSのディスクリプション"
+msgstr "XOOPS¤Î¥Ç¥£¥¹¥¯¥ê¥×¥·¥ç¥ó"
 
 #: xpressme_class.php:747
 msgid "WordPress Description"
-msgstr "WordPressのディスクリプション"
+msgstr "WordPress¤Î¥Ç¥£¥¹¥¯¥ê¥×¥·¥ç¥ó"
 
 #: xpressme_class.php:750
 msgid "WordPress & Xoops Description"
-msgstr "WordPressとXOOPSのディスクリプション"
+msgstr "WordPress¤ÈXOOPS¤Î¥Ç¥£¥¹¥¯¥ê¥×¥·¥ç¥ó"
 
 #: xpressme_class.php:756
 msgid "Select the Header Robots Index."
-msgstr "ヘッダで使用するロボットインデックスの選択"
+msgstr "¥Ø¥Ã¥À¤Ç»ÈÍѤ¹¤ë¥í¥Ü¥Ã¥È¥¤¥ó¥Ç¥Ã¥¯¥¹¤ÎÁªÂò"
 
 #: xpressme_class.php:761
 msgid "Xoops Robots Index"
-msgstr "XOOPSのロボットインデックス"
+msgstr "XOOPS¤Î¥í¥Ü¥Ã¥È¥¤¥ó¥Ç¥Ã¥¯¥¹"
 
 #: xpressme_class.php:764
 msgid "WordPress Robots Index"
-msgstr "WordPressのロボットインデックス"
+msgstr "WordPress¤Î¥í¥Ü¥Ã¥È¥¤¥ó¥Ç¥Ã¥¯¥¹"
 
 #: xpressme_class.php:793
 #, php-format
 msgid "Unable to create directory %s. Is its parent directory writable by the server?"
-msgstr "%s ディレクトリーが作成できません。サーバーの親ディレクトリー書き込み権限があるか確認くださいr?"
+msgstr "%s ¥Ç¥£¥ì¥¯¥È¥ê¡¼¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó¡£¥µ¡¼¥Ð¡¼¤Î¿Æ¥Ç¥£¥ì¥¯¥È¥ê¡¼½ñ¤­¹þ¤ß¸¢¸Â¤¬¤¢¤ë¤«³Îǧ¤¯¤À¤µ¤¤r?"
 
 #: xpressme_widget_class.php:17
 msgid "XPressME User Menu Widget"
-msgstr "XPressME ユーザメニュー ウィジェット"
+msgstr "XPressME ¥æ¡¼¥¶¥á¥Ë¥å¡¼ ¥¦¥£¥¸¥§¥Ã¥È"
 
 #: xpressme_widget_class.php:19
 msgid "XPressME MENU"
-msgstr "XPressME メニュー"
+msgstr "XPressME ¥á¥Ë¥å¡¼"
 
 #: xpressme_widget_class.php:143
@@ -444 +444 @@
 #: xpressme_widget_class.php:205
 msgid "Link"
-msgstr "リンク"
+msgstr "¥ê¥ó¥¯"
 
 #: xpressme_widget_class.php:144
 #: xpressme_widget_class.php:160
 msgid "Site Home"
-msgstr "サイトホーム"
+msgstr "¥µ¥¤¥È¥Û¡¼¥à"
 
 #: xpressme_widget_class.php:145
 #: xpressme_widget_class.php:165
 msgid "Add New"
-msgstr "新規投稿"
+msgstr "¿·µ¬Åê¹Æ"
 
 #: xpressme_widget_class.php:146
 #: xpressme_widget_class.php:170
 msgid "User Profile"
-msgstr "ユーザプロファイル"
+msgstr "¥æ¡¼¥¶¥×¥í¥Õ¥¡¥¤¥ë"
 
 #: xpressme_widget_class.php:147
 #: xpressme_widget_class.php:176
 msgid "WordPress Admin"
-msgstr "WordPress管理"
+msgstr "WordPress´ÉÍý"
 
 #: xpressme_widget_class.php:148
 #: xpressme_widget_class.php:181
 msgid "Module Admin"
-msgstr "モジュール管理"
+msgstr "¥â¥¸¥å¡¼¥ë´ÉÍý"
 
 #: xpressme_widget_class.php:149
 #: xpressme_widget_class.php:186
 msgid "XPressME Setting"
-msgstr "XPressME設定"
+msgstr "XPressMEÀßÄê"
 
 #: xpressme_widget_class.php:150
 msgid "Display Mode Select"
-msgstr "表示モード選択"
+msgstr "ɽ¼¨¥â¡¼¥ÉÁªÂò"
 
 #: xpressme_widget_class.php:152
 #: xpressme_widget_class.php:171
 msgid "Auto Setting"
-msgstr "自動設定"
+msgstr "¼«Æ°ÀßÄê"
 
 #: xpressme_widget_class.php:157
 msgid "User Menu"
-msgstr "ユーザメニュー"
+msgstr "¥æ¡¼¥¶¥á¥Ë¥å¡¼"
 
 #: xpressme_widget_class.php:245
 msgid "Title:"
-msgstr "タイトル:"
+msgstr "¥¿¥¤¥È¥ë:"
 
 #: include/custom_functions.php:74
 #, php-format
 msgid "Permanent Link to %s"
-msgstr "%sのパーマリンク"
+msgstr "%s¤Î¥Ñ¡¼¥Þ¥ê¥ó¥¯"
 
 #: include/custom_functions.php:429
@@ -502 +502 @@
 #, php-format
 msgid "views :%d"
-msgstr "閲覧数 :%d"
+msgstr "±ÜÍ÷¿ô :%d"
 
 #: include/custom_functions.php:623
 msgid "Main"
-msgstr "メイン"
+msgstr "¥á¥¤¥ó"
 
 #: include/custom_functions.php:626
 #, php-format
 msgid "Archive for the &#8216;%s&#8217; Category"
-msgstr "カテゴリー &#8216;%s&#8217; のアーカイブ"
+msgstr "¥«¥Æ¥´¥ê¡¼ &#8216;%s&#8217; ¤Î¥¢¡¼¥«¥¤¥Ö"
 
 #: include/custom_functions.php:629
 #, php-format
 msgid "Posts Tagged &#8216;%s&#8217;"
-msgstr "&#8216;%s&#8217; タグのついている投稿"
+msgstr "&#8216;%s&#8217; ¥¿¥°¤Î¤Ä¤¤¤Æ¤¤¤ëÅê¹Æ"
 
 #: include/custom_functions.php:632
 #, php-format
 msgid "Archive for %s|Daily archive page"
-msgstr "%sの日別アーカイブ"
+msgstr "%s¤ÎÆüÊÌ¥¢¡¼¥«¥¤¥Ö"
 
 #: include/custom_functions.php:632
 msgid "F jS, Y"
-msgstr "Y年n月j日"
+msgstr "Yǯn·îjÆü"
 
 #: include/custom_functions.php:634
 #, php-format
 msgid "Archive for %s|Monthly archive page"
-msgstr "%sの月別アーカイブ"
+msgstr "%s¤Î·îÊÌ¥¢¡¼¥«¥¤¥Ö"
 
 #: include/custom_functions.php:634
 msgid "F, Y"
-msgstr "Y年n月"
+msgstr "Yǯn·î"
 
 #: include/custom_functions.php:636
 #, php-format
 msgid "Archive for %s|Yearly archive page"
-msgstr "%sの年別アーカイブ "
+msgstr "%s¤ÎǯÊÌ¥¢¡¼¥«¥¤¥Ö "
 
 #: include/custom_functions.php:636
 msgid "Y"
-msgstr "Y年"
+msgstr "Yǯ"
 
 #: include/custom_functions.php:639
 #, php-format
 msgid "Archive for the &#8216;%s&#8217; Author"
-msgstr "投稿者 &#8216;%s&#8217; のアーカイブ"
+msgstr "Åê¹Æ¼Ô &#8216;%s&#8217; ¤Î¥¢¡¼¥«¥¤¥Ö"
 
 #: include/custom_functions.php:642
 #, php-format
 msgid "Search Results of word &#8216;%s&#8217;"
-msgstr "&#8216;%s&#8217; の検索結果"
+msgstr "&#8216;%s&#8217; ¤Î¸¡º÷·ë²Ì"
 
 #: include/custom_functions.php:648
@@ -559 +559 @@
 #, php-format
 msgid "Article of %s"
-msgstr "%sの記事"
+msgstr "%s¤Îµ­»ö"
 
 #: include/custom_functions.php:672
 #, php-format
 msgid "From %1$s on site %2$s"
-msgstr "サイト %2$s の %1$s より"
+msgstr "¥µ¥¤¥È %2$s ¤Î %1$s ¤è¤ê"
 
 #: include/custom_functions.php:693
 msgid "No Trackback/Pingback"
-msgstr "トラックバック・ピンバックはありません"
+msgstr "¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¡¦¥Ô¥ó¥Ð¥Ã¥¯¤Ï¤¢¤ê¤Þ¤»¤ó"
 
 #: include/custom_functions.php:694
 msgid "One Trackback/Pingback"
-msgstr "トラックバック・ピンバック 1 件"
+msgstr "¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¡¦¥Ô¥ó¥Ð¥Ã¥¯ 1 ·ï"
 
 #: include/custom_functions.php:695
 msgid "% TrackBack/Pingback"
-msgstr "トラックバック・ピンバック % 件"
+msgstr "¥È¥é¥Ã¥¯¥Ð¥Ã¥¯¡¦¥Ô¥ó¥Ð¥Ã¥¯ % ·ï"
 
 #: include/dashboard_feed.php:19
 msgid "XPressME Integration Kit Blog"
-msgstr "XPressME Integration Kit ブログ"
+msgstr "XPressME Integration Kit ¥Ö¥í¥°"
 
 #: include/dashboard_feed.php:32
 msgid "XPressME Integration Kit Folum"
-msgstr "XPressME Integration Kit フォーラム"
+msgstr "XPressME Integration Kit ¥Õ¥©¡¼¥é¥à"
 
 #: include/dashboard_feed.php:92
 msgid "Unknown Feed"
-msgstr "不明なフィード"
+msgstr "ÉÔÌÀ¤Ê¥Õ¥£¡¼¥É"
 
 #: include/functions_for_wp_old.php:21
 msgid "<strong>ERROR</strong>: The password field is empty."
-msgstr "<strong>エラー</strong>: パスワードが入力されていません."
+msgstr "<strong>¥¨¥é¡¼</strong>: ¥Ñ¥¹¥ï¡¼¥É¤¬ÆþÎϤµ¤ì¤Æ¤¤¤Þ¤»¤ó."
 
 #: include/functions_for_wp_old.php:29
 msgid "<strong>ERROR</strong>: Invalid username."
-msgstr "<strong>エラー</strong>: ユーザ名が異なっています."
+msgstr "<strong>¥¨¥é¡¼</strong>: ¥æ¡¼¥¶Ì¾¤¬°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹."
 
 #: include/functions_for_wp_old.php:37
 msgid "<strong>ERROR</strong>: Incorrect password."
-msgstr "<strong>エラー</strong>: パスワードが異なっています."
+msgstr "<strong>¥¨¥é¡¼</strong>: ¥Ñ¥¹¥ï¡¼¥É¤¬°Û¤Ê¤Ã¤Æ¤¤¤Þ¤¹."
 
 #: include/pluggable-override.php:265
 #, php-format
 msgid "If the page does not automatically reload, please click <a href='%s'>here</a>"
-msgstr "自動的にページが読み込まれない場合は<a href='%s'>こちら</a>をクリックしてください。"
+msgstr "¼«Æ°Åª¤Ë¥Ú¡¼¥¸¤¬Æɤ߹þ¤Þ¤ì¤Ê¤¤¾ì¹ç¤Ï<a href='%s'>¤³¤Á¤é</a>¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: include/xpress_common_functions.php:202
 msgid "Themes"
-msgstr "テーマ"
+msgstr "¥Æ¡¼¥Þ"
 
 #: include/xpress_common_functions.php:217
 msgid "Switch to XOOPS mode"
-msgstr "XOOPSモードへ切替"
+msgstr "XOOPS¥â¡¼¥É¤ØÀÚÂØ"
 
 #: include/xpress_common_functions.php:221
 #: include/xpress_common_functions.php:224
 msgid "Switch to WordPress mode"
-msgstr "WordPressモードへ切替"
+msgstr "WordPress¥â¡¼¥É¤ØÀÚÂØ"
 
 #: include/xpress_common_functions.php:390
 #, php-format
 msgid "Block file %1$s is an old version %2$s.<br />used block file %3$s of new version %4$s."
-msgstr "ブロックファイル %1$s は古いバージョン %2$s の為、<br /> 新しいバージョン %4$s　のブロックファイル %3$s を使用します。"
+msgstr "¥Ö¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %1$s ¤Ï¸Å¤¤¥Ð¡¼¥¸¥ç¥ó %2$s ¤Î°Ù¡¢<br /> ¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó %4$s¡¡¤Î¥Ö¥í¥Ã¥¯¥Õ¥¡¥¤¥ë %3$s ¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
 #: include/xpress_upgrade.php:13
 msgid "XPressME Upgrade"
-msgstr "XPressME アップグレード"
+msgstr "XPressME ¥¢¥Ã¥×¥°¥ì¡¼¥É"
 
 #: include/xpress_upgrade.php:28
 #, php-format
 msgid "You are using a XPressME Integration Kit development version (%1$s). Cool! Please <a href=\"%2$s\">stay updated</a>."
-msgstr "お使いの XPressME Integration Kit は開発版 (%1$s) です。すばらしい ! どうぞ<a href=\"%2$s\">最新版を使い続けてください</a>。"
+msgstr "¤ª»È¤¤¤Î XPressME Integration Kit ¤Ï³«È¯ÈÇ (%1$s) ¤Ç¤¹¡£¤¹¤Ð¤é¤·¤¤ ! ¤É¤¦¤¾<a href=\"%2$s\">ºÇ¿·ÈǤò»È¤¤Â³¤±¤Æ¤¯¤À¤µ¤¤</a>¡£"
 
 #: include/xpress_upgrade.php:32
 msgid "There is a new version of XPressME Integration Kit available for upgrade"
-msgstr "新しいバージョンの XPressME Integration Kit にアップグレードが可能です"
+msgstr "¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤Î XPressME Integration Kit ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¬²Äǽ¤Ç¤¹"
 
 #: include/xpress_upgrade.php:35
 #, php-format
 msgid "You can upgrade to version %s download the package and install it manually:"
-msgstr "バージョン %s のパッケージを手動でダウンロードしてインストールすることができます。"
+msgstr "¥Ð¡¼¥¸¥ç¥ó %s ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°¤Ç¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #: include/xpress_upgrade.php:38
@@ -647 +647 @@
 #, php-format
 msgid "Download %s"
-msgstr "%s をダウンロード"
+msgstr "%s ¤ò¥À¥¦¥ó¥í¡¼¥É"
 
 #: include/xpress_upgrade.php:43
 #, php-format
 msgid "You can download the differential file from version %s to %s and upgrade it manually:"
-msgstr "バージョン%sから%sへの差分ファイルをダウンロードし、手動でアップグレードすることができます："
+msgstr "¥Ð¡¼¥¸¥ç¥ó%s¤«¤é%s¤Ø¤Îº¹Ê¬¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢¼êÆ°¤Ç¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡§"
 
 #: include/xpress_upgrade.php:46
 #, php-format
 msgid "Download differential file for %s"
-msgstr "%sの差分ファイルをダウンロード"
+msgstr "%s¤Îº¹Ê¬¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É"
 
 #: include/xpress_upgrade.php:50
 msgid "You have the latest version of XPressME Integration Kit. You do not need to upgrade"
-msgstr "最新バージョンの XPressME Integration Kit をご利用中です。アップグレードの必要はありません。"
+msgstr "ºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Î XPressME Integration Kit ¤ò¤´ÍøÍÑÃæ¤Ç¤¹¡£¥¢¥Ã¥×¥°¥ì¡¼¥É¤ÎɬÍפϤ¢¤ê¤Þ¤»¤ó¡£"
 
 #: include/xpress_upgrade.php:58
 #, php-format
 msgid "You can use the development version %s download the package and install it manually:"
-msgstr "開発バージョン %s のパッケージを手動でダウンロードしてインストールすることができます。"
+msgstr "³«È¯¥Ð¡¼¥¸¥ç¥ó %s ¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¼êÆ°¤Ç¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
 #: include/xpress_upgrade.php:67
 #, php-format
 msgid "There is no response from <a href=\"%s\">version check API</a> now. sorry, please confirm it after."
-msgstr "現在、<a href=\"%s\">version check API</a>からのレスポンスがありません。　申し訳ありませんが、しばらく後で確認してください。"
+msgstr "¸½ºß¡¢<a href=\"%s\">version check API</a>¤«¤é¤Î¥ì¥¹¥Ý¥ó¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£¡¡¿½¤·Ìõ¤¢¤ê¤Þ¤»¤ó¤¬¡¢¤·¤Ð¤é¤¯¸å¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #: include/xpress_upgrade.php:212
 #, php-format
 msgid "XPressME Integration Kit Version %1$s is available! <a href=\"%2$s\">Please update now</a>."
-msgstr "XPressME Integration Kit Version %1$s が利用可能です ! <a href=\"%2$s\">アップデートしてください</a>。"
+msgstr "XPressME Integration Kit Version %1$s ¤¬ÍøÍѲÄǽ¤Ç¤¹ ! <a href=\"%2$s\">¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤</a>¡£"
 
 #: include/xpress_upgrade.php:214
 #, php-format
 msgid "XPressME Integration Kit Version %1$s is available! Please notify the site administrator."
-msgstr "XPressME Integration Kit Version %1$s が利用可能です ! サイト管理者に連絡してください。"
+msgstr "XPressME Integration Kit Version %1$s ¤¬ÍøÍѲÄǽ¤Ç¤¹ ! ¥µ¥¤¥È´ÉÍý¼Ô¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
 #~ msgid "Title"
-#~ msgstr "タイトル"
+#~ msgstr "¥¿¥¤¥È¥ë"
 #~ msgid "URL"
 #~ msgstr "URL"
 #~ msgid "more"
-#~ msgstr "続きを読む"
+#~ msgstr "³¤­¤òÆɤà"
 #~ msgid "More Link Text (Is not displayed for the blank.)"
-#~ msgstr "Moreリンクテキスト（ブランクの場合リンクを表示しません。）"
+#~ msgstr "More¥ê¥ó¥¯¥Æ¥­¥¹¥È¡Ê¥Ö¥é¥ó¥¯¤Î¾ì¹ç¥ê¥ó¥¯¤òɽ¼¨¤·¤Þ¤»¤ó¡£¡Ë"
 #~ msgid "Calendar"
-#~ msgstr "カレンダー"
+#~ msgstr "¥«¥ì¥ó¥À¡¼"
 #~ msgid "%1$s %2$s|Used as a calendar caption"
-#~ msgstr "%2$s 年 %1$s|カレンダーのキャプションに使われます"
+#~ msgstr "%2$s ǯ %1$s|¥«¥ì¥ó¥À¡¼¤Î¥­¥ã¥×¥·¥ç¥ó¤Ë»È¤ï¤ì¤Þ¤¹"
 #~ msgid "View posts for %1$s %2$s"
-#~ msgstr "%2$s年%1$sの投稿を表示"
+#~ msgstr "%2$sǯ%1$s¤ÎÅê¹Æ¤òɽ¼¨"
 #~ msgid "XPressME Configuration Page"
-#~ msgstr "XPressMEの設定ページ"
-
+#~ msgstr "XPressME¤ÎÀßÄê¥Ú¡¼¥¸"
+

branches/XPressMU/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","リスト");
         define("_MB_XP2_FILE_NAME","ファイル名");
+        define("_MB_XP2_THISTEMPLATE","このブロックのテンプレート");
         
 // recent comment block 

branches/XPressMU/extras/for_wordpressme2011/ja_UTF/language/ja_utf8/modinfo.php

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

branches/XPressMU/extras/xpress_i18n/portuguese-br/xpressme_modules_root/language/pt-br_utf8/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","Lista");
         define("_MB_XP2_FILE_NAME","Nome do arquivo");
+        define("_MB_XP2_THISTEMPLATE","Modelo");
         
 // recent comment block 

branches/XPressMU/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");
+        define("_MI_XP2_TO_UPDATE","atualização");
 
         // Module Config

branches/XPressMU/extras/xpress_i18n/template/xpressme_modules_root/language/english/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","List");
         define("_MB_XP2_FILE_NAME","Files Name");
+        define("_MB_XP2_THISTEMPLATE","Template");
         
 // recent comment block 
@@ -107 +108 @@
         
 // Categorie
-        define("_MB_XP2_CAT_ALL_STR","All categories link Display Title. (blank is not displayj");
+        define("_MB_XP2_CAT_ALL_STR","All categories link Display Title. (blank is not display)");
         define("_MB_XP2_CAT_ORDERBY","Order of the categories");
         define("_MB_XP2_CAT_NAME","name");

branches/XPressMU/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");
+        define("_MI_XP2_TO_UPDATE","Update");
 
         // Module Config

branches/XPressMU/xpressme_integration_kit/admin/menu.php

@@ -58 +58 @@
 $adminmenu[$i++]['link'] = "index.php";
 
+$adminmenu[$i]['title'] = _MI_XP2_TO_UPDATE ;
+$adminmenu[$i++]['link'] = "admin/update.php";
 
 ?>

branches/XPressMU/xpressme_integration_kit/blocks/archives_block.php

@@ -28 +28 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";
                 $a_month = _MB_XP2_ARC_MONTH ;
@@ -62 +62 @@
                 $form .=  "</select><br/>";
                 
-                $form .= "<br />" . _MB_XP2_COUNT_ZERO_ALL . "  <input type='text' name='options[3]' value='" . $limit . "' />";
+                $form .= "<br />" . _MB_XP2_COUNT_ZERO_ALL . "  <input type='text' size='3' name='options[3]' value='" . $limit . "' />";
                 $form .= "<br />" . yes_no_radio_option('options[4]', _MB_XP2_SHOW_NUM_OF_POST , $show_post_count);
                 $form .= "<br />" . yes_no_radio_option('options[5]', _MB_XP2_SHOW_DROP_DOWN , $drop_down);

branches/XPressMU/xpressme_integration_kit/blocks/authors_block.php

@@ -28 +28 @@
                         
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";
                 $form .= yes_no_radio_option('options[2]', _MB_XP2_SHOW_NUM_OF_POST , $optioncount);

branches/XPressMU/xpressme_integration_kit/blocks/block_common.php

@@ -103 +103 @@
 
     $option = "<option value=\"0\" ";
-    if ($isAll) $form .= " selected=\"selected\"";
+    if ($isAll) $option .= " selected=\"selected\"";
     $option .= ">"._MB_XP2_ALL ."</option>";
 
@@ -146 +146 @@
 endif;
 
+if(!function_exists("block_template_setting")):
+function block_template_setting($mydirname,$option_name = '',$value='')
+{
+        $temp_parm = explode(':' , $value);
+        if (empty($temp_parm[1])) {
+                $filename=$temp_parm[0];
+                $temp_type = 'db';
+        } else  {
+                $filename=$temp_parm[1];
+                $temp_type = $temp_parm[0];
+        }
+
+        $none_prefix_filename = '';
+        $pattern = '^' . $mydirname . '_(.*).html';
+        if (preg_match('/' . $pattern . '/' , $filename, $match)){ // file prefix check
+                $none_prefix_filename = $match[1];
+        }
+        
+        $output = _MB_XP2_THISTEMPLATE . "\n";
+        $output .=      '<input type="hidden" size="50" name="' . $option_name . '" value="' . $value .'"/>' . "\n";
+    $output .= '&nbsp;<select name="template_type" onclick="Template_Make()">' ."\n";
+        switch ($temp_type){
+                case 'db':
+                case 'DB':
+                        $output .=  '<option value="0" selected="selected">db</option>';
+                        $output .=  '<option value="1">file</option>';
+                        break;
+                default:
+                        $output .=  '<option value="0">db</option>';
+                        $output .=  '<option value="1" selected="selected">file</option>';
+        }
+        $output .= '</select>';
+        $output .= '<b>:'.$mydirname . '_</b>';
+        $output .= '<input type="text" size="30" name="none_prefix_file" value="'. $none_prefix_filename. '"  onChange="Template_Make()"/><b>.html</b><br />';
+    $output .= '
+<script type="text/javascript">
+        function Template_Make(){
+                var type_element = document.getElementsByName("template_type").item(0);
+                var name_element = document.getElementsByName("none_prefix_file").item(0);
+                var real_element = document.getElementsByName("' .$option_name . '").item(0);
+
+                var file_name = "' . $mydirname . '_" + name_element.value + ".html";
+                if (type_element.value ==0) var tmp_type = "db:"; else var tmp_type = "file:";
+                real_element.value = tmp_type + file_name;
+        }
+</script>
+';
+    
+    return $output;
+
+}
+endif;
 
 ?>

branches/XPressMU/xpressme_integration_kit/blocks/calender_block.php

@@ -26 +26 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";
                 $form .= _MB_XP2_SUN_COLOR .": <input type='text' name='options[2]' value='" . $sun_color . "' /><br />\n";

branches/XPressMU/xpressme_integration_kit/blocks/category_block.php

@@ -34 +34 @@
                 require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');        
 
-                $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";
                 $form .= _MB_XP2_CAT_ALL_STR . "  <input type='text' name='options[2]' value='" . $show_option_all . "' /><br />";

branches/XPressMU/xpressme_integration_kit/blocks/enhanced_block.php

@@ -19 +19 @@
                 $mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
                 $this_template = empty( $options[1] ) ? 'db:'.$mydirname.'_enhanced_block.html' : trim( $options[1] );
+            $form .= _MB_XP2_THISTEMPLATE . "<input type='text' size='50' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
                 $include_file = empty( $options[2] ) ? '' : $options[2] ;
                 
+                require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";
                 $form .= _MB_XP2_ENHACED_FILE .":<br />\n";
-                $form .= '&emsp;' . _MB_XP2_FILE_NAME . ": my_<input type='text' name='options[2]' value='" . $include_file . "' />_block.php<br>\n";
+                $form .= '&emsp;' . _MB_XP2_FILE_NAME . ": <b>my_</b><input type='text' name='options[2]' value='" . $include_file . "' /><b>_block.php</b><br>\n";
                 $form .= '&emsp;' . _MB_XP2_MAKE_ENHACED_FILE . "<br>\n";
                 return $form;

branches/XPressMU/xpressme_integration_kit/blocks/meta_block.php

@@ -31 +31 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";
                 $form .= yes_no_radio_option('options[2]', _MB_XP2_META_WP_LINK , $wp_link) . "<br />\n";

branches/XPressMU/xpressme_integration_kit/blocks/page_block.php

@@ -35 +35 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";
                 $form .= _MB_XP2_PAGE_ORDERBY .": ";

branches/XPressMU/xpressme_integration_kit/blocks/popular_posts_block.php

@@ -28 +28 @@
                 
                 require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
-
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />\n";
                 $form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";

branches/XPressMU/xpressme_integration_kit/blocks/recent_comments_block.php

@@ -30 +30 @@
                 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";
-                $form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-                $form .= _MB_XP2_LENGTH .": <input type='text' name='options[3]' value='" . $disp_length . "' /><br />\n";
+                $form .= _MB_XP2_COUNT .": <input type='text' size='3' name='options[2]' value='" . $disp_count . "' /><br />\n";
+                $form .= _MB_XP2_LENGTH .": <input type='text' size='3' name='options[3]' value='" . $disp_length . "' /><br />\n";
                 $form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[4]' value='" . $date_format . "' /><br />\n";
                 $form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[5]' value='" . $time_format . "' /><br />\n";

branches/XPressMU/xpressme_integration_kit/blocks/recent_posts_content_block.php

@@ -34 +34 @@
                 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
-                $form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
+                $form .= "<br />";
+                $form .= _MB_XP2_COUNT .": <input type='text' size='3' name='options[2]' value='" . $disp_count . "' /><br />\n";
                 $form .= yes_no_radio_option('options[3]', _MB_XP2_P_EXCERPT , $excerpt) . "<br />\n";
                 $form .= _MB_XP2_P_EXCERPT_SIZE .": <input type='text' name='options[4]' value='" . $excerpt_size . "' /><br />\n";

branches/XPressMU/xpressme_integration_kit/blocks/recent_posts_list_block.php

@@ -31 +31 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />\n";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />\n";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />\n";    
-                $form .= _MB_XP2_COUNT .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />\n";
-                $form .= _MB_XP2_REDNEW_DAYS .": <input type='text' name='options[3]' value='" . $disp_red . "' /><br />\n";
-                $form .= _MB_XP2_GREENNEW_DAYS .": <input type='text' name='options[4]' value='" . $disp_green . "' /><br />\n";
+                $form .= _MB_XP2_COUNT .": <input type='text' size='3' name='options[2]' value='" . $disp_count . "' /><br />\n";
+                $form .= _MB_XP2_REDNEW_DAYS .": <input type='text' size='3' name='options[3]' value='" . $disp_red . "' /><br />\n";
+                $form .= _MB_XP2_GREENNEW_DAYS .": <input type='text' size='3' name='options[4]' value='" . $disp_green . "' /><br />\n";
                 $form .= _MB_XP2_DATE_FORMAT .": <input type='text' name='options[5]' value='" . $date_format . "' /><br />\n";
                 $form .= _MB_XP2_TIME_FORMAT .": <input type='text' name='options[6]' value='" . $time_format . "' /><br />\n";

branches/XPressMU/xpressme_integration_kit/blocks/search_block.php

@@ -25 +25 @@
                 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";              
-                $form .= _MB_XP2_SEARCH_LENGTH .": <input type='text' name='options[2]' value='" . $disp_count . "' /><br />";
+                $form .= _MB_XP2_SEARCH_LENGTH .": <input type='text' size='3' name='options[2]' value='" . $disp_count . "' /><br />";
 //          $form .="<br /><input type='text' size='60' name='options[2]' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
 

branches/XPressMU/xpressme_integration_kit/blocks/tag_cloud_block.php

@@ -32 +32 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />";
                 $form .= _MB_XP2_CLOUD_SMALLEST .": <input type='text' size='4' name='options[2]' value='" . $smallest . "' /><br />";

branches/XPressMU/xpressme_integration_kit/blocks/widget_block.php

@@ -46 +46 @@
 
                 $form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-            $form .= "<input type='hidden' name='options[1]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' /><br />";
+                $form .= block_template_setting($mydirname,'options[1]',htmlspecialchars($this_template,ENT_QUOTES));
                 $form .= "<br />" . yes_no_radio_option('options[2]', _MB_XP2_WIDGET_TITLE_SHOW , $title_show);
                 $form .= "<br />";

branches/XPressMU/xpressme_integration_kit/include/add_xpress_process.php

@@ -7 +7 @@
 }
 
+function safe_site_url(){
+        global $xoops_config;
+        
+        if (is_xpress_index_page_call()){
+                $siteurl = get_option('siteurl');
+                $home = get_option('home');
+                $module_url = $xoops_config->module_url;
+                $module_name = $xoops_config->module_name;
+                $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+                $guess_url = preg_replace('|/' . $module_name . '/.*|i', '/' . $module_name, $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+
+                if(strcmp($siteurl,$module_url) !== 0) {
+                        if (!@fclose(@fopen($siteurl . '/xoops_version.php', "r"))){
+                                update_option('siteurl' , $module_url);
+                        }
+                }
+
+                if(strcmp($guess_ur,$home) !== 0) {
+                        if (@fclose(@fopen($guess_url . '/xoops_version.php', "r"))){
+                                update_option('home' , $guess_url);
+                        }
+                }
+        }
+}
+
 require_once( dirname( __FILE__ ).'/request_url.php');
 if (is_xpress_index_page_call()){
+        //$_SERVER['REQUEST_METHOD'] = 'POST' is
         //When notifying by a private message, Notification_reserve_send();
         //it is evaded that the data base becomes read-only as a result of the check on the referrer and the method. 
+        $request_method =  (isset($_SERVER['REQUEST_METHOD'])) ? $_SERVER['REQUEST_METHOD'] : '';
         $_SERVER['REQUEST_METHOD'] = 'POST';
+        require_once $xoops_config->xoops_mainfile_path; //It is necessary to execute it for the user attestation before wp-settings.php. 
+        $_SERVER['REQUEST_METHOD'] = $request_method;
+        
+        unset($offset);         //This Trap is provides the case where $offset is defined on the XOOPS side.
+        require_once(ABSPATH.'wp-settings.php');
+        
+        //When it is not possible to connect it correctly at site home URL on the WordPress side, 
+        //URL is corrected based on accessed URL. 
+        safe_site_url();
 
-        require_once $xoops_config->xoops_mainfile_path; //It is necessary to execute it for the user attestation before wp-settings.php. 
-        unset($offset);
-        require_once(ABSPATH.'wp-settings.php');
         if (!is_object($xoopsUser)){    // before login auth cookie clear
                 wp_logout();

branches/XPressMU/xpressme_integration_kit/include/general_functions.php

@@ -126 +126 @@
                 $table_list = array();
                 $ret = array();
+                $pattern = $wp_prefix . $table_name . '|' . $wp_prefix . '[0-9]*_' . $table_name;
+
                 if (!empty($wp_prefix) && !empty($table_name)){
                         $sql = "SHOW TABLES LIKE '" . $wp_prefix  . '%' . $table_name . "'";
@@ -132 +134 @@
                                 if($result = $xoopsDB->queryF($sql)){
                                         while($row = $xoopsDB->fetchRow($result)){
-                                                $table_list[] = $row[0];
+                                                if(preg_match('/' . $pattern . '/' , $row[0])){
+                                                        $table_list[] = $row[0];
+                                                }
                                         }
                                 }
@@ -138 +142 @@
                                 $rows = $xoops_db->get_results($sql, ARRAY_N);
                                 foreach ($rows as $row){
-                                        $table_list[] = $row[0];
+                                        if(preg_match('/' . $pattern . '/' , $row[0])){
+                                                $table_list[] = $row[0];
+                                        }
                                 }
                         }                       

branches/XPressMU/xpressme_integration_kit/include/oninstall.php

@@ -45 +45 @@
 
 //xpress
-        global $wpdb,$wp_rewrite, $wp_queries, $table_prefix, $wp_db_version, $wp_roles, $wp_query;
+        global $wpdb,$wp_rewrite, $wp_queries, $table_prefix, $wp_db_version, $wp_roles, $wp_query,$wp_embed;
         global $xoops_config;
                 

branches/XPressMU/xpressme_integration_kit/include/onupdate.php

@@ -42 +42 @@
         $site_url= XOOPS_URL."/modules/".$mydirname;
         xpress_put_siteurl($mydirname,$site_url);
-        xpress_put_home($mydirname,$site_url);
-
+        $home = get_xpress_option($mydirname,'home');
+        $home_check = 'home option is right';
+        if (strcmp($site_url,$home) !== 0 ){
+                if (!@fclose(@fopen($home . '/xoops_version.php', "r"))){
+                        xpress_put_home($mydirname,$site_url);
+                        $home_check = 'Change home option $home to $site_url';
+                }
+        }
+        $msgs[] = $home_check;
 // XPressME orignal table update
         $t_mess = xpress_table_make($module , $mydirname);
@@ -50 +57 @@
 // make templates
         include_once XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/include/xpress_templates_make.php' ;
+        $mod_version = $module->getVar('version') ;
+
+        $t_mess = xpress_clean_templates_file($mydirname,$mod_version);
+        $msgs = array_merge($msgs,$t_mess);
+        
         $t_mess = xpress_templates_make($mid,$mydirname);
-        
         $msgs = array_merge($msgs,$t_mess);
 
@@ -97 +108 @@
 endif;
 
+if( ! function_exists( 'get_xpress_option' ) ) {
+        function get_xpress_option($mydirname,$option_name){
+                global $xoopsModule;
+                $wp_prefix = $mydirname;
+                if ($wp_prefix == 'wordpress'){
+                        $wp_prefix = 'wp';
+                }
+                $xoopsDB =& Database::getInstance();
+                $option_table = $xoopsDB->prefix($wp_prefix . '_options');
+
+                $sql = "SELECT option_value FROM $option_table WHERE option_name = '" . $option_name . "'";
+                
+                $result =  $xoopsDB->query($sql, 0, 0);
+                if ($xoopsDB->getRowsNum($result)  > 0){
+                        $row = $xoopsDB->fetchArray($result);
+                        return $row['option_value'];
+                }
+                return 0;
+        }
+}
 
 if( ! function_exists( 'xpress_message_append_onupdate' ) ) :
@@ -190 +221 @@
                         $db->queryF( $queries ) ;
                         $msgs[] = "$views_table  ADD blog_id .";
+                }
+                
+                // The table is repaired.
+                $non_blogid_sql ="SELECT * FROM $views_table WHERE blog_id IS NULL OR blog_id < 1";
+                $non_blogid_res = $db->query($non_blogid_sql, 0, 0);
+                while($row = $db->fetchArray($non_blogid_res)){
+                        $total_view = $row['post_views'];
+                        $post_id = $row['post_id'];
+                        $new_blogid_sql ="SELECT SUM(post_views) as post_views_sum FROM $views_table WHERE post_id = $post_id AND blog_id = 1 GROUP BY post_id";
+                        $new_blogid_res = $db->query($new_blogid_sql, 0, 0);
+                        if ($db->getRowsNum($new_blogid_res)  > 0){
+                                $new_row = $db->fetchArray($new_blogid_res);
+                                $total_view = $total_view + $new_row['post_views_sum'];
+                                $del_sql = "DELETE FROM $views_table WHERE post_id = $post_id AND blog_id = 1";
+                                $db->queryF( $del_sql ) ;
+                        }
+                        $update_sql = "UPDATE $views_table SET post_views = $total_view , blog_id = 1 WHERE post_id = $post_id AND (blog_id IS NULL OR blog_id < 1)";
+                        $db->queryF( $update_sql ) ;
                 }
         }

branches/XPressMU/xpressme_integration_kit/include/set_cash_cookie_path.php

@@ -8 +8 @@
  */
 if ( !defined('USER_COOKIE') )
-        define('USER_COOKIE', $modname . 'user_' . $hash);
+        define('USER_COOKIE', 'wordpress_' . $modname . '_user_' . $hash);
 
 /**
@@ -15 +15 @@
  */
 if ( !defined('PASS_COOKIE') )
-        define('PASS_COOKIE', $modname . 'pass_' . $hash);
+        define('PASS_COOKIE', 'wordpress_' . $modname . '_pass_' . $hash);
 
 /**
@@ -22 +22 @@
  */
 if ( !defined('AUTH_COOKIE') )
-        define('AUTH_COOKIE', $modname . '_auth_' . $hash);
+        define('AUTH_COOKIE', 'wordpress_' . $modname . '_auth_' . $hash);
 
 /**
@@ -29 +29 @@
  */
 if ( !defined('SECURE_AUTH_COOKIE') )
-        define('SECURE_AUTH_COOKIE', $modname . '_sec_' . $hash);
+        define('SECURE_AUTH_COOKIE', 'wordpress_' . $modname . '_sec_' . $hash);
 
 /**
@@ -36 +36 @@
  */
 if ( !defined('LOGGED_IN_COOKIE') )
-        define('LOGGED_IN_COOKIE', $modname . '_logged_in_' . $hash);
+        define('LOGGED_IN_COOKIE', 'wordpress_' . $modname . '_logged_in_' . $hash);
 
 /**
@@ -43 +43 @@
  */
 if ( !defined('TEST_COOKIE') )
-        define('TEST_COOKIE', $modname . '_test_cookie');
+        define('TEST_COOKIE', 'wordpress_' . $modname . '_test_cookie');
 
 /**

branches/XPressMU/xpressme_integration_kit/include/xpress_block_render.php

@@ -29 +29 @@
                         $ret = @xpress_XML_unserialize($xml_data);
                         if (strstr($xml_data, '<?xml version="1.0" encoding="EUC-JP" ?>') !== false){
-                                $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret);
+                                if (version_compare(PHP_VERSION, '5.0.0', '>')) {
+                                        $ans = mb_convert_variables('EUC-JP' , 'UTF-8', &$ret); //xpress_XML_unserialize() Return UTF-8 at PHP5
+                                }
                         }
                         return $ret;
@@ -52 +54 @@
                         }
                         return $block_id;
+        }
+
+        function get_block_mid($mydirname)
+        {
+                        $xoopsDB =& Database::getInstance();
+                        $modules_tbl = $xoopsDB->prefix('modules');     
+
+                        $sql = "SELECT mid FROM $modules_tbl WHERE dirname = '$mydirname'";
+                        $result =  $xoopsDB->query($sql, 0, 0);
+                        if ($xoopsDB->getRowsNum($result)  > 0){
+                                $row = $xoopsDB->fetchArray($result);
+                                $mid = $row['mid'];
+                        }
+                        return $mid;
         }
 
@@ -160 +176 @@
         function xpress_block_render($mydirname,$block_function_name,$options)
         {
-                global $wpdb;
+                global $wpdb,$xoops_config;
                 $func_file = $block_function_name;
                 $call_theme_function_name = str_replace(".php", "", $block_function_name);
@@ -167 +183 @@
                 $blockID =get_block_id($mydirname,$func_file,$options);         
 
-                $this_url = '/modules/'. $mydirname;
+                $this_block_url = '/' . $mydirname . '/';
                 $call_url = $_SERVER['REQUEST_URI'];
                 
                 xpress_block_css_set($mydirname);
-                if (strstr($call_url,$this_url)){                       
+                if (strstr($call_url , $this_block_url) !== false){
                         $block_theme_file = get_block_file_path($mydirname,$inc_theme_file_name);
                         require_once $block_theme_file['file_path'];
@@ -185 +201 @@
                         }
                 }
-
-                $templates_file = 'db:'.$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
+                $temp_option = explode(':' , $options[1]);
+                
+                if (isset($temp_option[1])) {
+                        $templates_file = $temp_option[1];
+                } else {
+                        $templates_file = 'db:'.$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
+                }
+                
                 $tpl =& new XoopsTpl() ;
+                $tpl->template_dir = $xoops_config->module_path . '/templates';
+                if (!$tpl->template_exists($templates_file)){
+                        $src_file_path = $xoops_config->module_path . '/templates/' .$mydirname. '_' . str_replace(".php", ".html", $block_function_name);
+                        $templates_file = add_xpress_tpl($mydirname,$templates_file,$src_file_path);
+                }
                 $tpl->assign( 'block' , $block ) ;
                 $ret['content'] = $tpl->fetch( $templates_file ) ;
                 return $ret ;
+        }
+        
+        function add_xpress_tpl($mydirname,$templates='',$src_file_path){
+                global $wpdb,$xoops_config , $xoops_db;
+                
+                $mid = get_block_mid($mydirname);
+
+                $temp_parm = explode(':' , $templates);
+                if (empty($temp_parm[1])) {
+                        $filename=$temp_parm[0];
+                        $type = 'db';
+                } else  {
+                        $filename=$temp_parm[1];
+                        $type = $temp_parm[0];
+                }
+                $temp_file_path = $xoops_config->module_path . '/templates/'. $filename;
+                $pattern = '^' . $mydirname . '_';
+                if (preg_match('/' . $pattern . '/' , $filename, $match)){ // file prefix check
+                        if (!file_exists($temp_file_path)){             // Repetition check
+                                if (file_exists($src_file_path)){       // source file check
+                                        $rcd = copy($src_file_path, $temp_file_path);
+                                }
+                        }
+                        return  'file:' . $filename;
+                }
+                return $templates;
         }
         
@@ -243 +296 @@
         {
                 global $xoops_db,$xoops_config;
+                
                 $mid = get_xpress_modid();
                 $sql = "SELECT bid,options,func_file FROM " . get_xoops_prefix() . "newblocks WHERE mid = $mid AND visible = 1";
@@ -260 +314 @@
         if ($dh = opendir($cache_dir)) {
             while (($file = readdir($dh)) !== false) {
-                if (preg_match('/^' . preg_quote($mydirname) . '/', $file)) {
+                if (preg_match('/^' . preg_quote($mydirname) . '_/', $file)) {
                         if(! preg_match('/' . $pattern . '/', $file)) {
                         unlink($cache_dir.$file);
@@ -287 +341 @@
                         return $xu_row['conf_value'];
                 }
-        }
-        
+        }       
 }       
 ?>

branches/XPressMU/xpressme_integration_kit/include/xpress_templates_make.php

@@ -7 +7 @@
         $tplfile_handler =& xoops_gethandler( 'tplfile' ) ;
         $tpl_path = XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/templates' ;
+        
+        //copy  template file from source
         if( $handler = @opendir( $tpl_path . '/source/' ) ) {
                 while( ( $file = readdir( $handler ) ) !== false ) {
@@ -26 +28 @@
                                         $msgs[] = '<span style="color:#ff0000;">ERROR: Could not copy template <b>'.htmlspecialchars($target_file_name).'</b> from ' . htmlspecialchars($file). '(check templates directory permision (777))</span><br />';
                                 }                                       
-                                $tplfile =& $tplfile_handler->create() ;
-                                if ($rcd) {
-                                        $mtime = intval( @filemtime( $target_file_path ) ) ;
-                                        $tplfile->setVar( 'tpl_source' , file_get_contents( $target_file_path ) , true ) ;
-                                } else {
-                                        $mtime = intval( @filemtime( $file_path ) ) ;
-                                        $tplfile->setVar( 'tpl_source' , file_get_contents( $file_path ) , true ) ;
-                                }
-
-                                $tplfile->setVar( 'tpl_refid' , $mid ) ;
-                                $tplfile->setVar( 'tpl_tplset' , 'default' ) ;
-                                $tplfile->setVar( 'tpl_file' , $target_file_name ) ;
-                                $tplfile->setVar( 'tpl_desc' , '' , true ) ;
-                                $tplfile->setVar( 'tpl_module' , $mydirname ) ;
-                                $tplfile->setVar( 'tpl_lastmodified' , $mtime ) ;
-                                $tplfile->setVar( 'tpl_lastimported' , 0 ) ;
-                                $tplfile->setVar( 'tpl_type' , 'module' ) ;
-                                if( ! $tplfile_handler->insert( $tplfile ) ) {
-                                        $msgs[] = '<span style="color:#ff0000;">ERROR: Could not insert template <b>'.htmlspecialchars($target_file_name).'</b> to the database.</span><br />';
-                                } else {
-                                        $tplid = $tplfile->getVar( 'tpl_id' ) ;
-                                        $msgs[] = 'Template <b>'.htmlspecialchars($target_file_name) .'</b> added to the database. (ID: <b>'.$tplid.'</b>)<br />';
-                                        // generate compiled file
-                                        include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
-                                        include_once XOOPS_ROOT_PATH.'/class/template.php' ;
-                                        if( ! xoops_template_touch( $tplid ) ) {
-                                                $msgs[] = '<span style="color:#ff0000;">ERROR: Failed compiling template <b>'.htmlspecialchars($target_file_name).'</b>.</span><br />';
-                                        } else {
-                                                $msgs[] = 'Template <b>'.htmlspecialchars($target_file_name).'</b> compiled.</span><br />';
-                                        }
+                        }
+                }
+                closedir( $handler ) ;
+        }
+        
+        // template added to the database.
+        if( $handler = @opendir( $tpl_path . '/' ) ) {
+                while( ( $file = readdir( $handler ) ) !== false ) {
+                        if( substr( $file , 0 , 1 ) == '.' ) continue ;
+                        $file_path = $tpl_path . '/' . $file ;
+                        $file_name = $file ;
+                        $pattern = '^' . $mydirname . '_';
+                        if (preg_match('/' . $pattern . '/' , $file_name, $match)){
+                                if( is_file( $file_path ) ) {
+                                        $msgs[] = xpress_create_db_template($file_name,$file_path,$mydirname,$mid);
                                 }
                         }
@@ -61 +48 @@
                 closedir( $handler ) ;
         }
+        
         include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
         include_once XOOPS_ROOT_PATH.'/class/template.php' ;
@@ -68 +56 @@
 }
 
+function xpress_create_db_template($file_name,$file_path,$mydirname,$mid){
+        if( is_file( $file_path ) ) {
+                $tplfile_handler =& xoops_gethandler( 'tplfile' ) ;
+                $tplfile =& $tplfile_handler->create() ;
+                $mtime = intval( @filemtime( $file_path ) ) ;
+                $tplfile->setVar( 'tpl_source' , file_get_contents( $file_path ) , true ) ;
+                $tplfile->setVar( 'tpl_refid' , $mid ) ;
+                $tplfile->setVar( 'tpl_tplset' , 'default' ) ;
+                $tplfile->setVar( 'tpl_file' ,  $file_name ) ;
+                $tplfile->setVar( 'tpl_desc' , '' , true ) ;
+                $tplfile->setVar( 'tpl_module' , $mydirname ) ;
+                $tplfile->setVar( 'tpl_lastmodified' , $mtime ) ;
+                $tplfile->setVar( 'tpl_lastimported' , 0 ) ;
+                $tplfile->setVar( 'tpl_type' , 'module' ) ;
+                if( ! $tplfile_handler->insert( $tplfile ) ) {
+                        $msg = '<span style="color:#ff0000;">ERROR: Template Could not added to the database. <b>'.htmlspecialchars($file_name).'</b> to the database.</span><br />';
+                } else {
+                        $tplid = $tplfile->getVar( 'tpl_id' ) ;
+                        $msg = 'Template <b>'.htmlspecialchars($file_name) .'</b> added to the database. (ID: <b>'.$tplid.'</b>)<br />';
+                        // generate compiled file
+                        include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ;
+                        include_once XOOPS_ROOT_PATH.'/class/template.php' ;
+                        if( ! xoops_template_touch( $tplid ) ) {
+                                $msg = '<span style="color:#ff0000;">ERROR: Failed compiling template <b>'.htmlspecialchars($file_name).'</b>.</span><br />';
+                        } else {
+                                $msg = 'Template <b>'.htmlspecialchars($file_name).'</b> compiled.</span><br />';
+                        }
+                }
+        }
+        return $msg;
+}
 
 function is_template($file_name){
@@ -96 +115 @@
 }
 
+function xpress_clean_templates_file($mydirname,$mod_version)
+{
+        $tpl_path = XOOPS_ROOT_PATH . '/modules/' . $mydirname . '/templates/' ;
+        $msgs = array();
+        if( $handler = @opendir( $tpl_path) ) {
+                while( ( $file = readdir( $handler ) ) !== false ) {
+                        if( substr( $file , 0 , 1 ) == '.' ) continue ;
+                        if ( strcmp($file,'source')==0 ) continue ;
+                        if ( strcmp($file,'index.html')==0 ) continue ;
+                        $target_file_path = $tpl_path . $file;
+                        if (is_dir($target_file_path)){
+                                rmDirectory($target_file_path);
+                                $msgs[] = 'Template <b>'.htmlspecialchars($file).'</b> directory deleted.</span><br />';
+                        } else {
+                                if ($mod_version >= 200){
+                                        $pattern = '^' . $mydirname . '_';
+                                        if (preg_match('/' . $pattern . '/' , $file, $match))  continue ;
+                                }
+                                $rcd = @unlink($target_file_path);
+                                $msgs[] = 'Template <b>'.htmlspecialchars($file).'</b> file deleted.</span><br />';
+                        }
+                }
+                closedir( $handler ) ;
+        }
+        return $msgs;
+}
+
+function rmDirectory($dir){
+        if ($handle = opendir("$dir")){
+                while (false !== ($item = readdir($handle))){
+                        if ($item != "." && $item != ".."){
+                                if (is_dir("$dir/$item")){
+                                        rmDirectory("$dir/$item");
+                                }else{
+                                        unlink("$dir/$item");
+                                }
+                        }
+                }
+                closedir($handle);
+                rmdir($dir);
+        }
+}
 
 ?>

branches/XPressMU/xpressme_integration_kit/language/english/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","List");
         define("_MB_XP2_FILE_NAME","Files Name");
+        define("_MB_XP2_THISTEMPLATE","Template");
         
 // recent comment block 
@@ -107 +108 @@
         
 // Categorie
-        define("_MB_XP2_CAT_ALL_STR","All categories link Display Title. (blank is not displayj");
+        define("_MB_XP2_CAT_ALL_STR","All categories link Display Title. (blank is not display)");
         define("_MB_XP2_CAT_ORDERBY","Order of the categories");
         define("_MB_XP2_CAT_NAME","name");

branches/XPressMU/xpressme_integration_kit/language/english/modinfo.php

@@ -22 +22 @@
         define("_MI_XP2_MENU_XPRESS","XPressME Setting");
         define("_MI_XP2_MENU_TO_MODULE","to Modules");
+        define("_MI_XP2_TO_UPDATE","Update");
 
         // Module Config

branches/XPressMU/xpressme_integration_kit/language/ja_utf8/blocks.php

@@ -26 +26 @@
         define("_MB_XP2_LIST","リスト");
         define("_MB_XP2_FILE_NAME","ファイル名");
+        define("_MB_XP2_THISTEMPLATE","このブロックのテンプレート");
         
 // recent comment block 

branches/XPressMU/xpressme_integration_kit/language/ja_utf8/modinfo.php

@@ -22 +22 @@
         define("_MI_XP2_MENU_XPRESS","XPressME設定");
         define("_MI_XP2_MENU_TO_MODULE","モジュールへ");
+        define("_MI_XP2_TO_UPDATE","アップデート");
 
         // Module Config

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -95 +95 @@
 
         $output = '';
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         if (!empty($_COOKIE[$author_cookie])){
                 $uid = intval($_COOKIE[$author_cookie]);
@@ -115 +115 @@
         extract( $r );
         $output = '';
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         if (!empty($_COOKIE[$author_cookie])){
                 $output = intval($_COOKIE[$author_cookie]);
@@ -161 +161 @@
         $xpress_codename = $xoops_config->module_codename;
         if ($no_link){
-                $output = 'XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
                 if ($xoops_config->is_wpmu) {
+                        $output = 'XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
                         $output .= '(included WordPress MU ' . $wpmu_version. ')';
                 } else {
+                        $output = 'XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
                         if (strstr($wp_version,'ME')){
                                 $output .= '(included WordPress ' . $wp_version . ')';
@@ -172 +173 @@
                 }
         } else {
-                $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
                 if ($xoops_config->is_wpmu) {
+                        $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
                         $output .= '(included <a href="http://mu.wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress MU ' . $wpmu_version . '</a>)';
                 } else {
+                        $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
                         if (strstr($wp_version,'ME')){
                                 $output .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
@@ -467 +469 @@
 }
 
-function set_post_views_count(&$content) {
+function set_post_views_count($content) {
         if ( empty($_GET["feed"]) &&  empty($GLOBALS["feed"]) && empty($GLOBALS["doing_trackback"]) && empty($GLOBALS["doing_rss"]) && empty($_POST) && is_single() ){
                 post_views_counting();

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp_old.php

@@ -190 +190 @@
 
 endif;  // Under WP2.5
+
+// Under WP2.7
+if (version_compare($xoops_config->wp_version,'2.6', '<')) :
+        /**
+         * Guess the URL for the site.
+         *
+         * Will remove wp-admin links to retrieve only return URLs not in the wp-admin
+         * directory.
+         *
+         * @since 2.6.0
+         *
+         * @return string
+         */
+        function wp_guess_url() {
+        if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+                $url = WP_SITEURL;
+        } else {
+                $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+                $url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+        }
+        return $url;
+}
+endif;  // Under WP2.6
 
 // Under WP2.7

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -242 +242 @@
         if (is_admin()) return $query_vars;
         
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         if(xpress_is_multi_user()){
                 if (!empty($_GET)){
@@ -290 +290 @@
 }
 
-function xpress_query_filter(&$query)
+function xpress_query_filter($query)
 {
         if (is_admin()) return $query;
 
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         
         if (strpos($query,'SELECT') === false)  return $query;
@@ -357 +357 @@
 }
 
-function safe_site_url_filter($site_url){
-        global $xoops_config;
-        if (!$xoops_config->is_wpmu){
-                if ($site_url != get_xpress_url()) $site_url = get_xpress_url();
-        }
-        return $site_url;
-}
-
 function get_block_file_path($mydirname,$file_name)
 {

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php

@@ -71 +71 @@
 }
 add_action("wp_meta" , "wp_meta_add_xpress_menu");                      // add xpress menu  in wp_meta
-        
-//Site URL check
-add_filter('option_home',                       "safe_site_url_filter");
-add_filter('option_siteurl',            "safe_site_url_filter");
-        
 
 //XOOPS Bloack Cache Refresh
@@ -301 +296 @@
 
 include_once dirname( __FILE__ ).'/include/dashboard_feed.php' ;
-
-include_once dirname( __FILE__ ).'/xpressme_widget_class.php' ;
-
+if(xpress_is_wp_version('>=','2.8')){
+        include_once dirname( __FILE__ ).'/xpressme_widget_class.php' ;
+}
 ?>

branches/XPressMU/xpressme_integration_kit/xoops_version.php

@@ -47 +47 @@
 
 // status
-$modversion['codename'] = "RC1";
+$modversion['codename'] = "";
 
 // onInstall, onUpdate, onUninstall