Changeset 202

Timestamp:

May 5, 2009, 8:20:17 AM (16 years ago)

Author:

toemon

Message:

#121 meta robotをXOOPS側を使うかWordPress側を使うか選択できるようにする。

Location:

trunk

Files:

• include/xpress_render.php (modified) (1 diff)
• wp-content/plugins/xpressme/language/xpressme-ja.mo (modified) (previous)
• wp-content/plugins/xpressme/language/xpressme-ja.po (modified) (2 diffs)
• wp-content/plugins/xpressme/xpressme_class.php (modified) (5 diffs)
• xoops_version.php (modified) (1 diff)

trunk/include/xpress_render.php

@@ -168 +168 @@
                 default :
         }
-                
+
+        $wp_robots = get_xpress_meta_name('robots',$contents);
+        switch ($xpress_config->meta_robot_type){
+                case 'xoops':
+                        break;
+                case 'wordpress':
+                        if (!empty($wp_robots))
+                                $xoopsTpl->assign('xoops_meta_robots', $wp_robots);
+                        break;
+                default :
+        }
         
         $xpress_data['body_contents'] = get_body($contents);

trunk/wp-content/plugins/xpressme/language/xpressme-ja.po

@@ -3 +3 @@
 "Project-Id-Version: XPressME Plugin\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-05-04 19:31+0900\n"
+"PO-Revision-Date: 2009-05-05 08:09+0900\n"
 "Last-Translator: toemon <toychee@toemon.com>\n"
 "Language-Team: \n"
@@ -15 +15 @@
 "X-Poedit-SearchPath-0: .\n"
 
-#: xpressme_class.php:45
+#: xpressme_class.php:46
 msgid "XPressME Settings"
 msgstr "XPressME設定"
 
-#: xpressme_class.php:62
-#: xpressme_class.php:211
+#: xpressme_class.php:63
+#: xpressme_class.php:214
 msgid "Older Post"
 msgstr "前の投稿へ"
 
-#: xpressme_class.php:63
-#: xpressme_class.php:213
+#: xpressme_class.php:64
+#: xpressme_class.php:216
 msgid "Newer Post"
 msgstr "次の投稿へ"
 
-#: xpressme_class.php:65
-#: xpressme_class.php:216
+#: xpressme_class.php:66
+#: xpressme_class.php:219
 msgid "Older Entries"
 msgstr "前ページへ"
 
-#: xpressme_class.php:66
-#: xpressme_class.php:218
+#: xpressme_class.php:67
+#: xpressme_class.php:221
 msgid "Newer Entries"
 msgstr "次ページへ"
 
-#: xpressme_class.php:80
+#: xpressme_class.php:81
 msgid "more"
 msgstr "続きを読む"
 
-#: xpressme_class.php:272
-#: xpressme_class.php:288
-#: xpressme_class.php:702
-#: xpressme_class.php:707
-#: xpressme_class.php:713
-#: xpressme_class.php:724
-#: xpressme_class.php:730
+#: xpressme_class.php:276
+#: xpressme_class.php:292
+#: xpressme_class.php:721
+#: xpressme_class.php:726
+#: xpressme_class.php:732
+#: xpressme_class.php:743
+#: xpressme_class.php:749
 msgid "YES"
 msgstr "はい"
 
-#: xpressme_class.php:273
-#: xpressme_class.php:289
-#: xpressme_class.php:703
-#: xpressme_class.php:708
-#: xpressme_class.php:714
-#: xpressme_class.php:725
-#: xpressme_class.php:731
+#: xpressme_class.php:277
+#: xpressme_class.php:293
+#: xpressme_class.php:722
+#: xpressme_class.php:727
+#: xpressme_class.php:733
+#: xpressme_class.php:744
+#: xpressme_class.php:750
 msgid "NO"
 msgstr "いいえ"
 
-#: xpressme_class.php:331
+#: xpressme_class.php:335
 msgid "Single Post Navi Setting"
 msgstr "シングルポストナビの設定"
 
-#: xpressme_class.php:336
-#: xpressme_class.php:381
+#: xpressme_class.php:340
+#: xpressme_class.php:385
 msgid "Adjustment of Navi link display position"
 msgstr "リンクの表示位置設定"
 
-#: xpressme_class.php:339
+#: xpressme_class.php:343
 msgid "'Old Post Link' is displayed in the left, and 'Newer Post Link' is displayed in the right"
 msgstr "以前の記事へのリンクを左に、より新しい記事へのリンクを右に表示"
 
-#: xpressme_class.php:340
+#: xpressme_class.php:344
 msgid "'Newer Post Link' is displayed in the left, and 'Old Post Link' is displayed in the right"
 msgstr "より新しい記事へのリンクを左に、古い記事へのリンクを右に表示"
 
-#: xpressme_class.php:346
+#: xpressme_class.php:350
 msgid "Select Display name of PostNavi Link"
 msgstr "表示するリンクテキストを選択"
 
-#: xpressme_class.php:349
+#: xpressme_class.php:353
 msgid "Title of post"
 msgstr "投稿記事のタイトルを表示"
 
-#: xpressme_class.php:350
+#: xpressme_class.php:354
 msgid "Title of Navi"
 msgstr "ナビタイトルを表示"
 
-#: xpressme_class.php:356
+#: xpressme_class.php:360
 msgid "Display Navi Title of Old Post Link"
 msgstr "古い記事へのナビタイトルを設定"
 
-#: xpressme_class.php:363
+#: xpressme_class.php:367
 msgid "Display Navi Title of Newer Post Link"
 msgstr "より新しい記事へのナビタイトルを設定"
 
-#: xpressme_class.php:376
+#: xpressme_class.php:380
 msgid "Posts List Page Navi Setting"
 msgstr "ポストリストページナビの設定"
 
-#: xpressme_class.php:384
+#: xpressme_class.php:388
 msgid "'Old Page Link' is displayed in the left, and 'Newer Page Link' is displayed in the right"
 msgstr "古いページへのリンクを左に、より新しいページへのリンクを右に表示"
 
-#: xpressme_class.php:385
+#: xpressme_class.php:389
 msgid "'Newer Page Link' is displayed in the left, and 'Old Page Link' is displayed in the right"
 msgstr "より新しいページへのリンクを左に、古いページへのリンクを右に表示"
 
-#: xpressme_class.php:391
+#: xpressme_class.php:395
 msgid "Display Navi Title of Old Page Link"
 msgstr "古いページへのナビタイトルを設定"
 
-#: xpressme_class.php:398
+#: xpressme_class.php:402
 msgid "Display Navi Title of Newer Page Link"
 msgstr "より新しいページへのナビタイトルを設定"
 
-#: xpressme_class.php:413
+#: xpressme_class.php:417
 msgid "Role Setting at Login"
 msgstr "ログイン時の権限設定"
 
-#: xpressme_class.php:416
+#: xpressme_class.php:420
 msgid "XOOPS Groupe"
 msgstr "XOOPSグループ名"
 
-#: xpressme_class.php:416
+#: xpressme_class.php:420
 msgid "WordPress Role"
 msgstr "WordPressでの権限"
 
-#: xpressme_class.php:416
+#: xpressme_class.php:420
 msgid "Role is set at each login"
 msgstr "ログイン時、常に権限を更新する"
 
-#: xpressme_class.php:442
 #: xpressme_class.php:446
-#: xpressme_class.php:449
+#: xpressme_class.php:450
+#: xpressme_class.php:453
 msgid "Default Role of WordPress"
 msgstr "WordPressのデフォルト権限"
 
-#: xpressme_class.php:443
 #: xpressme_class.php:447
-#: xpressme_class.php:450
+#: xpressme_class.php:451
+#: xpressme_class.php:454
 msgid "Group User Doesn't Register"
 msgstr "ユーザ登録しない"
 
-#: xpressme_class.php:479
+#: xpressme_class.php:483
 msgid "Do Not Comment Integration."
 msgstr "コメント統合しません。"
 
-#: xpressme_class.php:513
+#: xpressme_class.php:517
 msgid "Comment integration with D3Forum"
 msgstr "D3Forumとのコメント統合"
 
-#: xpressme_class.php:515
+#: xpressme_class.php:519
 msgid "Select the forum of D3Forum that does the comment integration from the following lists."
 msgstr "以下のリストからコメント統合をするD3Forumのフォーラムを選択してください。"
 
-#: xpressme_class.php:519
+#: xpressme_class.php:523
 msgid "Select the Type of display of D3Forum comment."
 msgstr "D3Forumの表示タイプを選択"
 
-#: xpressme_class.php:521
-#: xpressme_class.php:524
+#: xpressme_class.php:525
+#: xpressme_class.php:528
 msgid "Flat"
 msgstr "フラット"
 
-#: xpressme_class.php:522
-#: xpressme_class.php:525
+#: xpressme_class.php:526
+#: xpressme_class.php:529
 msgid "Threaded"
 msgstr "スレッド"
 
-#: xpressme_class.php:528
+#: xpressme_class.php:532
 msgid "Select the order of display of D3Forum comment."
 msgstr "D3Forumコメントの表示順を選択"
 
-#: xpressme_class.php:530
-#: xpressme_class.php:533
+#: xpressme_class.php:534
+#: xpressme_class.php:537
 msgid "DESC"
 msgstr "降順"
 
-#: xpressme_class.php:531
-#: xpressme_class.php:534
+#: xpressme_class.php:535
+#: xpressme_class.php:538
 msgid "ASC"
 msgstr "昇順"
 
-#: xpressme_class.php:537
+#: xpressme_class.php:541
 msgid "Number of displays of D3Forum comments."
 msgstr "D3Forumのコメント表示数"
 
-#: xpressme_class.php:541
+#: xpressme_class.php:545
 msgid "The import and the export between Wordpress Comments and the D3Forum Posts can be done. "
 msgstr "WordPressコメントとD3Forumポスト間の一括転送（エクスポート・インポート）"
 
-#: xpressme_class.php:542
+#: xpressme_class.php:546
 msgid "Export to D3Forum"
 msgstr "D3Forumへ一括エクスポート"
 
-#: xpressme_class.php:543
+#: xpressme_class.php:547
 msgid "Import from D3Forum"
 msgstr "D3Forumから一括インポート"
 
-#: xpressme_class.php:555
+#: xpressme_class.php:559
 msgid "Contents Excerpt Setting"
 msgstr "記事抜粋の設定"
 
-#: xpressme_class.php:560
+#: xpressme_class.php:564
 msgid "Is the excerpt display done with the archive of contents?"
 msgstr "記事のアーカイブで抜粋表示を行いますか？"
 
-#: xpressme_class.php:567
+#: xpressme_class.php:571
 msgid "When ASCII character more than the set ratio is included, it is judged ASCII contents. "
 msgstr "ASCII文字が含まれる比率が設定された値より大きい場合、ASCII文字コンテンツと判断します。"
 
-#: xpressme_class.php:574
+#: xpressme_class.php:578
 msgid "Excerpt length of word for ASCII contents"
 msgstr "ASCIIコンテンツの抜粋単語数"
 
-#: xpressme_class.php:581
+#: xpressme_class.php:585
 msgid "Excerpt length of character for multibyte contents"
 msgstr "マルチバイトコンテンツの抜粋文字数"
 
-#: xpressme_class.php:588
+#: xpressme_class.php:592
 msgid "More Link Text (Is not displayed for the blank.)"
 msgstr "Moreリンクテキスト（ブランクの場合リンクを表示しません。）"
 
-#: xpressme_class.php:600
+#: xpressme_class.php:604
 msgid "Display Mode Setting"
 msgstr "表示モード設定"
 
-#: xpressme_class.php:603
+#: xpressme_class.php:607
 msgid "Select the XPressME Display Mode."
 msgstr "XPressMEの表示モードの選択"
 
-#: xpressme_class.php:608
+#: xpressme_class.php:612
 msgid "Xoops Mode"
 msgstr "XOOPSモード"
 
-#: xpressme_class.php:612
+#: xpressme_class.php:616
 msgid "WordPress Mode"
 msgstr "WordPressモード"
 
-#: xpressme_class.php:616
+#: xpressme_class.php:620
 msgid "User select"
 msgstr "ユーザによる選択"
 
-#: xpressme_class.php:626
+#: xpressme_class.php:630
 msgid "Header Meta Option"
 msgstr "ヘッダメタ　オプション"
 
-#: xpressme_class.php:631
+#: xpressme_class.php:635
 msgid "Select the Header keyword."
 msgstr "ヘッダで使用するキーワードの選択"
 
-#: xpressme_class.php:636
+#: xpressme_class.php:640
 msgid "Xoops KeyWord"
 msgstr "XOOPSのキーワード"
 
-#: xpressme_class.php:639
+#: xpressme_class.php:643
 msgid "WordPress KeyWord"
 msgstr "WordPressのキーワード"
 
-#: xpressme_class.php:642
+#: xpressme_class.php:646
 msgid "WordPress & Xoops KeyWord"
 msgstr "WordPressｊとXOOPSのキーワード"
 
-#: xpressme_class.php:648
+#: xpressme_class.php:652
 msgid "Select the Header Description."
 msgstr "ヘッダで使用するディスクリプション（説明）の選択"
 
-#: xpressme_class.php:653
+#: xpressme_class.php:657
 msgid "Xoops Description"
 msgstr "XOOPSのディスクリプション"
 
-#: xpressme_class.php:656
+#: xpressme_class.php:660
 msgid "WordPress Description"
 msgstr "WordPressのディスクリプション"
 
-#: xpressme_class.php:659
+#: xpressme_class.php:663
 msgid "WordPress & Xoops Description"
 msgstr "WordPressとXOOPSのディスクリプション"
 
-#: xpressme_class.php:691
+#: xpressme_class.php:669
+#, fuzzy
+msgid "Select the Header Robots Index."
+msgstr "ヘッダで使用するロボットインデックスの選択"
+
+#: xpressme_class.php:674
+#, fuzzy
+msgid "Xoops Robots Index"
+msgstr "XOOPSのロボットインデックス"
+
+#: xpressme_class.php:677
+#, fuzzy
+msgid "WordPress Robots Index"
+msgstr "WordPressのロボットインデックス"
+
+#: xpressme_class.php:710
 msgid "XPressME Configuration Page"
 msgstr "XPressMEの設定ページ"
 
-#: xpressme_class.php:696
+#: xpressme_class.php:715
 msgid "Media Upload Base Path"
 msgstr "メディアアップロードのベースパス設定"
 
-#: xpressme_class.php:697
+#: xpressme_class.php:716
 msgid "Use XOOPS UPLOAD PATH"
 msgstr "XOOPSのアップロードパスを使用する。"
 
-#: xpressme_class.php:698
+#: xpressme_class.php:717
 msgid "USE WordPress BASE_PATH"
 msgstr "WordPressのベースパスを使用する。"
 
-#: xpressme_class.php:701
+#: xpressme_class.php:720
 msgid "Thema Sidebar Display"
 msgstr "テーマ表示時にサイドバー表示する。"
 
-#: xpressme_class.php:706
+#: xpressme_class.php:725
 msgid "The change tracking of the post is preserved"
 msgstr "投稿の変更履歴を有効にする。"
 
-#: xpressme_class.php:712
+#: xpressme_class.php:731
 msgid "Select Multi user mode"
 msgstr "マルチユーザーモードを選択"
 
-#: xpressme_class.php:723
+#: xpressme_class.php:742
 msgid "Is the posts author views counted?"
 msgstr "投稿者の閲覧をカウントしますか？"
 
-#: xpressme_class.php:729
+#: xpressme_class.php:748
 msgid "Is SQL debugging window displayed?"
 msgstr "SQLデバッグウィンドを表示しますか？"
 
-#: xpressme_class.php:741
+#: xpressme_class.php:760
 msgid "Update Config"
 msgstr "更新"
 
-#: xpressme_class.php:742
+#: xpressme_class.php:761
 msgid "Preset Config"
 msgstr "プリセット"

trunk/wp-content/plugins/xpressme/xpressme_class.php

@@ -31 +31 @@
         var $meta_keyword_type;
         var $meta_description_type;
+        var $meta_robot_type;
         //constructor
         function XPressME_Class()
@@ -83 +84 @@
                 $this->meta_keyword_type = 'xoops';
                 $this->meta_description_type = 'xoops';
+                $this->meta_robot_type = 'xoops';       
         }
         
@@ -132 +134 @@
                         'is_multi_user' => $this->is_multi_user,
                         'meta_keyword_type' => $this->meta_keyword_type,
-                        'meta_description_type' => $this->meta_description_type
+                        'meta_description_type' => $this->meta_description_type,
+                        'meta_robot_type' => $this->meta_robot_type
                 );
                 if ($mode == 'add_new') {
@@ -246 +249 @@
                 $this->meta_keyword_type = stripslashes(trim($_POST['ch_meta_keyword_type']));
                 $this->meta_description_type = stripslashes(trim($_POST['ch_meta_description_type']));
+                $this->meta_robot_type = stripslashes(trim($_POST['ch_meta_robot_type']));
 
                 global $xoops_db;
@@ -661 +665 @@
                 $form .= "</td>\n";
                 $form .= "</tr>\n";
+
+                $form .= "<tr>\n";
+                $form .=  "<td>" . __('Select the Header Robots Index.', 'xpressme') . "</td>\n";
+                $form .= "<td>\n";
+                $form .= '<select name="ch_meta_robot_type">' . "\n";
+                $form .= '<option value="xoops" ';
+                if ($this->meta_robot_type == 'xoops') $form .= ' selected="selected"';
+                $form .= '>'.__('Xoops Robots Index', 'xpressme') ."</option>\n";
+                $form .= '<option value="wordpress" ';
+                if ($this->meta_robot_type == 'wordpress') $form .= ' selected="selected"';
+                $form .= '>'.__('WordPress Robots Index', 'xpressme') ."</option>\n";
+                $form .= "</select><br />\n";
+                $form .= "</td>\n";
+                $form .= "</tr>\n";
+
                 $form .= "</table>\n";
                 

trunk/xoops_version.php

@@ -40 +40 @@
 
 // status
-$modversion['codename'] = "RC1(r201)";
+$modversion['codename'] = "RC1(r202)";
 
 // onInstall, onUpdate, onUninstall