\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Japanese\n"
+"X-Poedit-Country: JAPAN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-KeywordsList: __;_e;_c\n"
+"X-Poedit-Basepath: C:\\XPressME_Ver2_SVN\\trunk\\wp-content\\themes\\xpress_default\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-SearchPath-0: .\n"
+
+#: 404.php:22
+msgid "Error 404 - Not Found"
+msgstr "エラー 404 - 見つかりませんでした"
+
+#: archives.php:20
+msgid "Archives by Month:"
+msgstr "月別のアーカイブ:"
+
+#: archives.php:25
+msgid "Archives by Subject:"
+msgstr "カテゴリー別アーカイブ:"
+
+#: comments-popup.php:9
+#, php-format
+msgid "%1$s - Comments on %2$s"
+msgstr "%1$s - %2$s へのコメント"
+
+#: comments-popup.php:22
+msgid "Comments"
+msgstr "コメント"
+
+#: comments-popup.php:24
+msgid "RSS feed for comments on this post."
+msgstr "このコメント欄の RSS フィード"
+
+#: comments-popup.php:27
+#, php-format
+msgid "The URL to TrackBack this entry is: %s"
+msgstr "この投稿へのトラックバック URL: %s"
+
+#: comments-popup.php:45
+msgid "Comment"
+msgstr "コメント"
+
+#: comments-popup.php:45
+msgid "Trackback"
+msgstr "トラックバック"
+
+#: comments-popup.php:45
+msgid "Pingback"
+msgstr "ピンバック"
+
+#: comments-popup.php:45
+#, php-format
+msgid "by %1$s — %2$s @ %4$s"
+msgstr "— %2$s @ %4$s: %1$s より"
+
+#: comments-popup.php:51
+msgid "No comments yet."
+msgstr "コメントはまだありません。"
+
+#: comments-popup.php:55
+msgid "Leave a comment"
+msgstr "コメントをどうぞ"
+
+#: comments-popup.php:56
+#, php-format
+msgid "Line and paragraph breaks automatic, e-mail address never displayed, HTML allowed: %s"
+msgstr "改行と段落タグは自動で挿入されます。メールアドレスは表示されません。利用可能な HTML タグ: %s"
+
+#: comments-popup.php:60
+#, php-format
+msgid "Logged in as %2$s. Log out »"
+msgstr "%2$s としてログイン中。ログアウト »"
+
+#: comments-popup.php:64
+#: comments.php:54
+msgid "Name"
+msgstr "お名前"
+
+#: comments-popup.php:71
+msgid "E-mail"
+msgstr "メールアドレス"
+
+#: comments-popup.php:76
+msgid "URL"
+msgstr "URL"
+
+#: comments-popup.php:81
+msgid "Your Comment"
+msgstr "コメント"
+
+#: comments-popup.php:87
+msgid "Say It!"
+msgstr "送信する !"
+
+#: comments-popup.php:92
+msgid "Sorry, the comment form is closed at this time."
+msgstr "コメントフォームは現在閉鎖中です。"
+
+#: comments-popup.php:97
+msgid "Close this window."
+msgstr "このウインドウを閉じる。"
+
+#: comments-popup.php:105
+#, php-format
+msgid "Powered by WordPress"
+msgstr "Powered by WordPress"
+
+#: comments.php:6
+msgid "This post is password protected. Enter the password to view comments."
+msgstr "この投稿はパスワードで保護されています。コメントを閲覧するにはパスワードを入力してください。"
+
+#: comments.php:16
+msgid "No Responses"
+msgstr "コメント はありません"
+
+#: comments.php:16
+msgid "One Response"
+msgstr "コメント 1 件"
+
+#: comments.php:16
+msgid "% Responses"
+msgstr "コメント % 件"
+
+#: comments.php:16
+#, php-format
+msgid "to “%s”"
+msgstr ""
+
+#: comments.php:32
+msgid "Comments are closed."
+msgstr "現在コメントは受け付けていません。"
+
+#: comments.php:38
+msgid "Leave a Reply"
+msgstr "コメントをどうぞ"
+
+#: comments.php:38
+#, php-format
+msgid "Leave a Reply for %s"
+msgstr "%s にコメントする"
+
+#: comments.php:46
+#, php-format
+msgid "You must be logged in to post a comment."
+msgstr "コメントを投稿するにはログインしてください。"
+
+#: comments.php:51
+#, php-format
+msgid "Logged in as %2$s."
+msgstr "%2$s としてログイン中。"
+
+#: comments.php:51
+msgid "Log out of this account"
+msgstr "このアカウントからログアウト"
+
+#: comments.php:51
+msgid "Log out »"
+msgstr "ログアウト »"
+
+#: comments.php:54
+#: comments.php:57
+msgid "(required)"
+msgstr " (必須)"
+
+#: comments.php:57
+msgid "Mail (will not be published)"
+msgstr "メールアドレス (公開されません)"
+
+#: comments.php:60
+msgid "Website"
+msgstr "ウェブサイト"
+
+#: comments.php:65
+#, php-format
+msgid "XHTML: You can use these tags: %s"
+msgstr "XHTML: 次のタグを使用できます: %s"
+
+#: comments.php:69
+msgid "Submit Comment"
+msgstr "コメント送信"
+
+#: footer.php:5
+#, php-format
+msgid "%1$s and %2$s."
+msgstr "%1$s と %2$s"
+
+#: footer.php:5
+msgid "Entries (RSS)"
+msgstr "投稿 (RSS)"
+
+#: footer.php:5
+msgid "Comments (RSS)"
+msgstr "コメント (RSS)"
+
+#: footer.php:7
+#, php-format
+msgid "%d queries. %s seconds."
+msgstr "%d 個のクエリと %s 秒を要しました。"
+
+#: functions.php:149
+msgid "Customize Header"
+msgstr "ヘッダーのカスタマイズ"
+
+#: functions.php:149
+#: functions.php:363
+msgid "Header Image and Color"
+msgstr "ヘッダーの背景と文字の色"
+
+#: functions.php:162
+msgid "Close Color Picker"
+msgstr "カラーピッカーを閉じる"
+
+#: functions.php:359
+msgid "Options saved."
+msgstr "設定を保存しました。"
+
+#: functions.php:376
+#: functions.php:383
+msgid "Save"
+msgstr "保存"
+
+#: functions.php:377
+msgid "Font Color:"
+msgstr "フォントの色:"
+
+#: functions.php:377
+#, php-format
+msgid "Any CSS color (%s or %s or %s)"
+msgstr "CSS 色指定 (%s 、%s もしくは %s)"
+
+#: functions.php:378
+msgid "Upper Color:"
+msgstr "グラデーション上側の色:"
+
+#: functions.php:378
+#: functions.php:379
+#, php-format
+msgid "HEX only (%s or %s)"
+msgstr "16 進数のみ (%s もしくは %s)"
+
+#: functions.php:379
+msgid "Lower Color:"
+msgstr "グラデーション下側の色:"
+
+#: functions.php:381
+msgid "Toggle Text"
+msgstr "テキスト表示の切替え"
+
+#: functions.php:382
+msgid "Use Defaults"
+msgstr "デフォルト設定に戻す"
+
+#: functions.php:391
+msgid "Font Color"
+msgstr "フォントの色"
+
+#: functions.php:392
+msgid "Upper Color"
+msgstr "グラデーション上側の色"
+
+#: functions.php:393
+msgid "Lower Color"
+msgstr "グラデーション下側の色"
+
+#: functions.php:394
+msgid "Revert"
+msgstr "取り消し"
+
+#: functions.php:395
+msgid "Advanced"
+msgstr "詳細"
+
+#: functions.php:402
+msgid "Update Header »"
+msgstr "ヘッダーを更新 »"
+
+#: functions.php:408
+msgid "Font Color (CSS):"
+msgstr "フォントの色 (CSS):"
+
+#: functions.php:409
+msgid "Upper Color (HEX):"
+msgstr "グラデーション上側の色 (16 進数):"
+
+#: functions.php:410
+msgid "Lower Color (HEX):"
+msgstr "グラデーション下側の色 (16 進数):"
+
+#: functions.php:411
+msgid "Select Default Colors"
+msgstr "デフォルト設定に戻す"
+
+#: functions.php:412
+msgid "Toggle Text Display"
+msgstr "テキスト表示の切替え"
+
+#: header.php:9
+msgid "» Blog Archive"
+msgstr "» ブログアーカイブ"
+
+#: header.php:14
+#, php-format
+msgid "%s RSS Feed"
+msgstr "%s RSS フィード"
+
+#: header.php:15
+#, php-format
+msgid "%s Atom Feed"
+msgstr "%s Atom フィード"
+
+#: header.php:43
+msgid "Main Page"
+msgstr "メインページ"
+
+#: header.php:43
+msgid "Blogs Home"
+msgstr "ブログのホーム"
+
+#: header.php:44
+msgid "Post New"
+msgstr "新規投稿"
+
+#: image.php:13
+#: index.php:32
+#: single.php:28
+msgid "Read the rest of this entry »"
+msgstr "この投稿の続きを読む »"
+
+#: image.php:15
+#: page.php:29
+msgid "Pages:"
+msgstr "ページ:"
+
+#: image.php:25
+#, php-format
+msgid "This entry was posted on %1$s at %2$s and is filed under %3$s."
+msgstr "この投稿は %1$s %2$s に %3$s カテゴリーに公開されました。"
+
+#: image.php:25
+#: sidebar.php:24
+msgid "l, F jS, Y"
+msgstr "Y 年 n 月 j 日 l"
+
+#: image.php:27
+#, php-format
+msgid "You can follow any responses to this entry through the RSS 2.0 feed."
+msgstr "この投稿へのコメントは RSS 2.0 フィードで購読することができます。"
+
+#: image.php:31
+#, php-format
+msgid "You can leave a response, or trackback from your own site."
+msgstr "コメントを残すか、ご自分のサイトからトラックバックすることができます。"
+
+#: image.php:35
+#, php-format
+msgid "Responses are currently closed, but you can trackback from your own site."
+msgstr "現在コメントは受け付けておりませんが、ご自分のサイトからトラックバックを送ることはできます。"
+
+#: image.php:39
+msgid "You can skip to the end and leave a response. Pinging is currently not allowed."
+msgstr "このページの一番下でコメントを残すことができます。トラックバック / ピンバックは現在受け付けていません。"
+
+#: image.php:43
+msgid "Both comments and pings are currently closed."
+msgstr "現在コメント、トラックバックともに受け付けておりません。"
+
+#: image.php:45
+#: page.php:34
+msgid "Edit this entry."
+msgstr "この投稿を編集する。"
+
+#: image.php:58
+#: single.php:85
+msgid "Sorry, no posts matched your criteria."
+msgstr "該当する投稿は見つかりませんでした。"
+
+#: index.php:28
+#: single.php:23
+#: blocks/recent_posts_content_block_theme.php:111
+#, php-format
+msgid "Permanent Link to %s"
+msgstr "%s のパーマリンク"
+
+#: index.php:40
+#: single.php:38
+#: blocks/recent_posts_content_block_theme.php:133
+#, php-format
+msgid "Views :%d"
+msgstr "閲覧 :%d"
+
+#: index.php:43
+#: single.php:41
+#: blocks/recent_posts_content_block_theme.php:136
+#, php-format
+msgid "Posted in %s"
+msgstr "カテゴリー: %s"
+
+#: index.php:45
+#: single.php:43
+#: blocks/recent_posts_content_block_theme.php:138
+msgid "Edit"
+msgstr "編集"
+
+#: index.php:46
+#: single.php:44
+#: blocks/recent_posts_content_block_theme.php:139
+msgid "No Comments »"
+msgstr "コメントはまだありません »"
+
+#: index.php:46
+#: single.php:44
+#: blocks/recent_posts_content_block_theme.php:139
+msgid "1 Comment »"
+msgstr "1 件のコメント »"
+
+#: index.php:46
+#: single.php:44
+#: blocks/recent_posts_content_block_theme.php:139
+msgid "% Comments »"
+msgstr "% 件のコメント »"
+
+#: index.php:46
+#: single.php:44
+#: blocks/recent_posts_content_block_theme.php:139
+msgid "Comments Closed"
+msgstr "コメントは受け付けていません。"
+
+#: index.php:64
+msgid "Not Found"
+msgstr "見つかりませんでした。"
+
+#: index.php:65
+msgid "Sorry, but you are looking for something that isn’t here."
+msgstr "お探しの物はここにはありません。"
+
+#: links.php:18
+msgid "Links:"
+msgstr "リンク:"
+
+#: page.php:27
+msgid "Read the rest of this page »"
+msgstr "このページの続きを読む »"
+
+#: searchform.php:2
+msgid "Search for:"
+msgstr "検索:"
+
+#: searchform.php:4
+#: blocks/search_block_theme.php:13
+msgid "Search"
+msgstr "検索"
+
+#: sidebar.php:10
+msgid "Author"
+msgstr "作成者"
+
+#: sidebar.php:21
+#, php-format
+msgid "You are currently browsing the archives for the %s category."
+msgstr "%s カテゴリーのアーカイブを表示しています。"
+
+#: sidebar.php:24
+#, php-format
+msgid "You are currently browsing the %2$s blog archives for the day %3$s."
+msgstr "%2$s ブログの %3$s のアーカイブを表示しています。"
+
+#: sidebar.php:27
+#, php-format
+msgid "You are currently browsing the %2$s blog archives for %3$s."
+msgstr "%2$s の %3$s のアーカイブを閲覧中です。"
+
+#: sidebar.php:27
+msgid "F, Y"
+msgstr "Y 年 n 月"
+
+#: sidebar.php:30
+#, php-format
+msgid "You are currently browsing the %2$s blog archives for the year %3$s."
+msgstr "%2$s ブログの %3$s 年のアーカイブを表示しています。"
+
+#: sidebar.php:33
+#, php-format
+msgid "You have searched the %2$s blog archives for ‘%3$s’. If you are unable to find anything in these search results, you can try one of these links."
+msgstr "%2$s のアーカイブ内で‘%3$s’を探しました。お探しのものが見つからない場合は他のリンクを試してみてください。"
+
+#: sidebar.php:36
+#, php-format
+msgid "You are currently browsing the %2$s blog archives."
+msgstr "%2$s ブログのアーカイブを閲覧中です。"
+
+#: sidebar.php:42
+msgid "Pages"
+msgstr "ページ"
+
+#: sidebar.php:44
+msgid "Archives"
+msgstr "アーカイブ"
+
+#: sidebar.php:51
+#: sidebar.php:53
+msgid "Categories"
+msgstr "カテゴリー"
+
+#: sidebar.php:62
+msgid "Meta"
+msgstr "メタ情報"
+
+#: sidebar.php:66
+msgid "This page validates as XHTML 1.0 Transitional"
+msgstr "このページが XHTML 1.0 Transitional に準拠しているか確認する"
+
+#: sidebar.php:66
+msgid "Valid XHTML"
+msgstr "Valid XHTML"
+
+#: sidebar.php:67
+msgid "XHTML Friends Network"
+msgstr "XHTML Friends Network"
+
+#: sidebar.php:67
+msgid "XFN"
+msgstr "XFN"
+
+#: sidebar.php:68
+msgid "Powered by WordPress, state-of-the-art semantic personal publishing platform."
+msgstr "Powered by WordPress, state-of-the-art semantic personal publishing platform."
+
+#: single.php:49
+msgid "No Trackback/Pingback"
+msgstr "トラックバック・ピンバックはありません"
+
+#: single.php:49
+msgid "One Trackback/Pingback"
+msgstr "トラックバック・ピンバック 1 件"
+
+#: single.php:49
+msgid "% TrackBack/Pingback"
+msgstr "トラックバック・ピンバック % 件"
+
+#: single.php:53
+#, php-format
+msgid "You can trackback from your own site."
+msgstr "ご自分のサイトからトラックバックを送ることができます。"
+
+#: single.php:55
+msgid "Pinging is currently not allowed."
+msgstr "トラックバック / ピンバックは現在受け付けていません。"
+
+#: blocks/archives_block_theme.php:13
+msgid "Select Yearly"
+msgstr "年を選択"
+
+#: blocks/archives_block_theme.php:16
+#: blocks/archives_block_theme.php:28
+msgid "Select Monthly"
+msgstr "月を選択"
+
+#: blocks/archives_block_theme.php:19
+msgid "Select Weekly"
+msgstr "週を選択"
+
+#: blocks/archives_block_theme.php:22
+msgid "Select Daily"
+msgstr "日を選択"
+
+#: blocks/archives_block_theme.php:25
+msgid "Select Post"
+msgstr "記事を選択"
+
+#: blocks/authors_block_theme.php:26
+msgid "All Authors"
+msgstr "全ての投稿者"
+
+#: blocks/calender_block_theme.php:71
+msgid "Calendar"
+msgstr "カレンダー"
+
+#: blocks/calender_block_theme.php:72
+#, php-format
+msgid "%1$s %2$s|Used as a calendar caption"
+msgstr "%2$s 年 %1$s|カレンダーのキャプションに使われます"
+
+#: blocks/calender_block_theme.php:104
+#: blocks/calender_block_theme.php:114
+#, php-format
+msgid "View posts for %1$s %2$s"
+msgstr "%2$s 年 %1$s の投稿を表示"
+
+#: blocks/enhanced_block_theme.php:11
+msgid "The include file name to display it is not set."
+msgstr "表示を行うためのインクルードファイル名が設定されていません。"
+
+#: blocks/enhanced_block_theme.php:13
+#, php-format
+msgid "File %s not exist."
+msgstr "ファイル %s が見つかりません。"
+
+#: blocks/enhanced_block_theme.php:19
+msgid "PHP code error"
+msgstr "PHPコードにエラーがあります。"
+
+#: blocks/meta_block_theme.php:24
+msgid "Posts RSS"
+msgstr "投稿の RSS"
+
+#: blocks/meta_block_theme.php:27
+msgid "Comments RSS"
+msgstr "コメント のRSS"
+
+#: blocks/meta_block_theme.php:39
+msgid "Add New"
+msgstr "新規投稿"
+
+#: blocks/meta_block_theme.php:47
+msgid "Site Admin"
+msgstr "WordPress管理"
+
+#: blocks/meta_block_theme.php:53
+msgid "User Profile"
+msgstr "ユーザープロファイル"
+
+#: blocks/meta_block_theme.php:61
+#: blocks/meta_block_theme.php:66
+msgid "Subscription management"
+msgstr "メール購読の設定"
+
+#: blocks/meta_block_theme.php:74
+msgid "ReadMe"
+msgstr "ReadMe表示"
+
+#: blocks/meta_block_theme.php:79
+msgid "Themes"
+msgstr "テーマ選択"
+
+#: blocks/popular_posts_block_theme.php:109
+#: blocks/recent_posts_content_block_theme.php:65
+#: blocks/recent_posts_list_block_theme.php:67
+msgid "Tags:"
+msgstr "タグ:"
+
+#: blocks/popular_posts_block_theme.php:135
+#: blocks/recent_posts_content_block_theme.php:100
+#: blocks/recent_posts_list_block_theme.php:93
+msgid "Comments (0)"
+msgstr "コメントはありません"
+
+#: blocks/popular_posts_block_theme.php:135
+#: blocks/recent_posts_content_block_theme.php:100
+#: blocks/recent_posts_list_block_theme.php:93
+msgid "Comments (1)"
+msgstr "1件のコメント"
+
+#: blocks/popular_posts_block_theme.php:135
+#: blocks/recent_posts_content_block_theme.php:100
+#: blocks/recent_posts_list_block_theme.php:93
+msgid "Comments (%)"
+msgstr "Comments (%)"
+
+#: blocks/popular_posts_block_theme.php:144
+#, php-format
+msgid "views: %d"
+msgstr "閲覧 :%d回"
+
+#: blocks/recent_comments_block_theme.php:73
+#, fuzzy, php-format
+msgid "%1$s on %2$s"
+msgstr "%1$s と %2$s"
+
+#: blocks/recent_posts_content_block_theme.php:75
+#: blocks/recent_posts_content_block_theme.php:122
+msgid "more"
+msgstr "続きを読む"
+
Index: /trunk/xpressme_integration_kit/class/config_from_xoops.class.php
===================================================================
--- /trunk/xpressme_integration_kit/class/config_from_xoops.class.php (revision 251)
+++ /trunk/xpressme_integration_kit/class/config_from_xoops.class.php (revision 252)
@@ -38,5 +38,6 @@
var $mu_domain_current_site;
var $mu_path_current_site;
-
+ var $wp_db_version;
+ var $is_wp20;
function __constructor() //for PHP5
@@ -163,5 +164,5 @@
$this->set_module_version();
- $this->set_is_wpmu();
+ $this->set_wp_version();
$this->set_mu_current_site();
}
@@ -194,5 +195,5 @@
}
- function set_is_wpmu(){
+ function set_wp_version(){
include dirname(dirname(__FILE__)) . '/wp-includes/version.php';
@@ -201,4 +202,11 @@
else
$this->is_wpmu = true;
+
+ $this->wp_db_version = $wp_db_version;
+ if ($wp_db_version == 3441)
+ $this->is_wp20 = true;
+ else
+ $this->is_wp20 = false;
+
}
Index: /trunk/xpressme_integration_kit/include/old_template-loader.php
===================================================================
--- /trunk/xpressme_integration_kit/include/old_template-loader.php (revision 252)
+++ /trunk/xpressme_integration_kit/include/old_template-loader.php (revision 252)
@@ -0,0 +1,67 @@
+
Index: /trunk/xpressme_integration_kit/include/oninstall.php
===================================================================
--- /trunk/xpressme_integration_kit/include/oninstall.php (revision 251)
+++ /trunk/xpressme_integration_kit/include/oninstall.php (revision 252)
@@ -126,4 +126,7 @@
$pass_md5 = is_object($GLOBALS["xoopsUser"])?$GLOBALS["xoopsUser"]->getVar("pass"):'';
+ if (!function_exists('username_exists')){
+ require_once($mydirpath . '/wp-includes/registration-functions.php');
+ }
$user_id = username_exists($user_name);
if ( !$user_id ) {
@@ -150,5 +153,10 @@
if (!$xoops_config->is_wpmu){ // for WordPress
// make WordPress Default data
- wp_install_defaults($user_id);
+ if (function_exists('wp_install_defaults')){
+ wp_install_defaults($user_id);
+ } else {
+ wp_install_old_defaults($user_id);
+ }
+
$ret[] = 'The first sample post & comment was written.';
@@ -210,3 +218,36 @@
endif;
+if( ! function_exists( 'wp_install_old_defaults' ) ) :
+function wp_install_old_defaults($user_id) {
+ global $wpdb;
+
+ // Now drop in some default links
+ $wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, '".$wpdb->escape(__('Blogroll'))."')");
+ $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, 'http://blogs.linux.ie/xeer/feed/', '');");
+ $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zengun.org/weblog/', 'Michel', 1, 'http://zengun.org/weblog/feed/', '');");
+ $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://boren.nu/', 'Ryan', 1, 'http://boren.nu/feed/', '');");
+ $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://photomatt.net/', 'Matt', 1, 'http://xml.photomatt.net/feed/', '');");
+ $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zed1.com/journalized/', 'Mike', 1, 'http://zed1.com/journalized/feed/', '');");
+ $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://www.alexking.org/', 'Alex', 1, 'http://www.alexking.org/blog/wp-rss2.php', '');");
+ $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://dougal.gunters.org/', 'Dougal', 1, 'http://dougal.gunters.org/feed/', '');");
+
+ // Default category
+ $wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_count, category_description) VALUES ('0', '".$wpdb->escape(__('Uncategorized'))."', '".sanitize_title(__('Uncategorized'))."', '1', '')");
+
+ // First post
+ $now = date('Y-m-d H:i:s');
+ $now_gmt = gmdate('Y-m-d H:i:s');
+ $wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, comment_count, to_ping, pinged, post_content_filtered) VALUES ('1', '$now', '$now_gmt', '".$wpdb->escape(__('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'))."', '', '".$wpdb->escape(__('Hello world!'))."', '0', '".$wpdb->escape(__('hello-world'))."', '$now', '$now_gmt', '1', '', '', '')");
+
+ $wpdb->query( "INSERT INTO $wpdb->post2cat (`rel_id`, `post_id`, `category_id`) VALUES (1, 1, 1)" );
+
+ // Default comment
+ $wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_date, comment_date_gmt, comment_content) VALUES ('1', '".$wpdb->escape(__('Mr WordPress'))."', '', 'http://wordpress.org/', '$now', '$now_gmt', '".$wpdb->escape(__('Hi, this is a comment.
To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.'))."')");
+
+ // First Page
+
+ $wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, post_status, to_ping, pinged, post_content_filtered) VALUES ('1', '$now', '$now_gmt', '".$wpdb->escape(__('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.'))."', '', '".$wpdb->escape(__('About'))."', '0', '".$wpdb->escape(__('about'))."', '$now', '$now_gmt', 'static', '', '', '')");
+}
+endif;
+
?>
Index: /trunk/xpressme_integration_kit/include/onupdate.php
===================================================================
--- /trunk/xpressme_integration_kit/include/onupdate.php (revision 251)
+++ /trunk/xpressme_integration_kit/include/onupdate.php (revision 252)
@@ -27,4 +27,5 @@
//XPressME Update
global $wpdb,$wp_rewrite, $wp_queries, $table_prefix, $wp_db_version, $wp_roles,$wp_query;
+ global $xoops_db;
define('WP_INSTALLING', true);
$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
@@ -48,6 +49,6 @@
$site_url= XOOPS_URL."/modules/".$mydirname;
- update_option("home", $site_url); // Site_url is set again.
- update_option("siteurl", $site_url);
+ xpress_put_siteurl($mydirname,$site_url); // Site_url is set again.
+ update_option("home", $site_url);
require_once($mydirpath . '/wp-admin/upgrade-functions.php');
Index: /trunk/xpressme_integration_kit/wp-config.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-config.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-config.php (revision 252)
@@ -111,17 +111,19 @@
}
+ ob_start();
+ if($xoops_config->is_wp20 )
+ require_once dirname( __FILE__ ).'/include/old_template-loader.php' ;
+ else
+ require_once( ABSPATH . WPINC . '/template-loader.php' );
+ $wp_output = ob_get_contents();
+ ob_end_clean();
// It judges it here because it does in is_index_page() through feed to which the permalink is set.
if (is_wordpress_style() || is_feed()) {
- require_once( ABSPATH . WPINC . '/template-loader.php' );
+ echo $wp_output;
} else {
- ob_start();
- require_once( ABSPATH . WPINC . '/template-loader.php' );
- $wp_output = ob_get_contents();
- ob_end_clean();
require_once( ABSPATH .'/include/xpress_render.php' );
xpress_render($wp_output);
}
-
-
+
//When there is no block cache, and an optional block is different, cache is refreshed.
//When adding, and changing and deleting Post & Comment, block cache is refreshed by add_action at any time.
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (revision 252)
@@ -399,5 +399,7 @@
$blog_encoding = get_option('blog_charset');
$text = get_the_content('');
- $text = strip_shortcodes( $text );
+ if (function_exists('strip_shortcodes')){ //@since WP2.5
+ $text = strip_shortcodes( $text );
+ }
$text = apply_filters('the_content', $text);
$text = str_replace(']]>', ']]>', $text);
@@ -454,5 +456,11 @@
function xpress_post_new_link($link_title = 'Post New',$display = true)
{
- $output = '' . $link_title . '';
+ global $xoops_config;
+
+ if ($xoops_config->wp_db_version > 5000){
+ $output = '' . $link_title . '';
+ } else {
+ $output = '' . $link_title . '';
+ }
if ($display)
echo $output;
@@ -469,6 +477,8 @@
if (is_category())
$output = sprintf(__('Archive for the ‘%s’ Category', 'xpressme'), single_cat_title('', false));
- if (is_tag())
- $output = sprintf(__('Posts Tagged ‘%s’', 'xpressme'), single_tag_title('', false) );
+ if (function_exists( 'is_tag' )){
+ if (is_tag())
+ $output = sprintf(__('Posts Tagged ‘%s’', 'xpressme'), single_tag_title('', false) );
+ }
if (is_day())
$output = sprintf(__('Archive for %s|Daily archive page', 'xpressme'), get_the_time(__('F jS, Y', 'xpressme')));
@@ -587,7 +597,17 @@
function xpress_get_calendar($sun_color = '#DB0000' ,$sat_color = '#004D99' ,$initial = true) {
- global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
-
-
+ global $wpdb, $m, $monthnum, $year, $wp_locale, $posts , $xoops_config;
+
+ if ($xoops_config->is_wp20){
+ ob_start();
+ get_calendar(true);
+ $output = ob_get_contents();
+ ob_end_clean();
+ $output = preg_replace('//', ' | ', $output); //days align center
+ $output = preg_replace('/ | /', ' | ', $output); //today align center
+
+ return $output;
+ }
ob_start();
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp20.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp20.php (revision 252)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp20.php (revision 252)
@@ -0,0 +1,256 @@
+getVar("dirname")){
+ if(!is_object($GLOBALS["xoopsUser"])){
+ wp_clearcookie();
+ return false;
+ }
+ }
+
+ $username = sanitize_user($username);
+
+ if ( '' == $username )
+ return false;
+
+ if ( '' == $password ) {
+ $error = __('ERROR: The password field is empty.');
+ return false;
+ }
+
+ $login = get_userdatabylogin($username);
+ //$login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'");
+
+ if (!$login) {
+ $error = __('ERROR: Invalid username.');
+ return false;
+ } else {
+ if ($login->user_login == $username) {
+ if ($login->user_pass == $password) return true;
+ if ($login->user_pass == md5($password)) return true;
+ }
+
+ $error = __('ERROR: Incorrect password.');
+ $pwd = '';
+ return false;
+ }
+}
+if ( !function_exists('wp_sanitize_redirect') ) :
+/**
+ * Sanitizes a URL for use in a redirect.
+ *
+ * @since 2.3
+ *
+ * @return string redirect-sanitized URL
+ **/
+function wp_sanitize_redirect($location) {
+ $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location);
+ $location = wp_kses_no_null($location);
+
+ // remove %0d and %0a from location
+ $strip = array('%0d', '%0a');
+ $found = true;
+ while($found) {
+ $found = false;
+ foreach( (array) $strip as $val ) {
+ while(strpos($location, $val) !== false) {
+ $found = true;
+ $location = str_replace($val, '', $location);
+ }
+ }
+ }
+ return $location;
+}
+endif;
+
+
+// Added WP2.7 separate_comments()
+function &separate_comments(&$comments) {
+ $comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
+ $count = count($comments);
+ for ( $i = 0; $i < $count; $i++ ) {
+ $type = $comments[$i]->comment_type;
+ if ( empty($type) )
+ $type = 'comment';
+ $comments_by_type[$type][] = &$comments[$i];
+ if ( 'trackback' == $type || 'pingback' == $type )
+ $comments_by_type['pings'][] = &$comments[$i];
+ }
+
+ return $comments_by_type;
+}
+
+// Added WP2.7 get_comments()
+function get_comments( $args = '' ) {
+ global $wpdb;
+
+ $defaults = array('status' => '', 'orderby' => 'comment_date_gmt', 'order' => 'DESC', 'number' => '', 'offset' => '', 'post_id' => 0);
+
+ $args = wp_parse_args( $args, $defaults );
+ extract( $args, EXTR_SKIP );
+
+ // $args can be whatever, only use the args defined in defaults to compute the key
+ $key = md5( serialize( compact(array_keys($defaults)) ) );
+ $last_changed = wp_cache_get('last_changed', 'comment');
+ if ( !$last_changed ) {
+ $last_changed = time();
+ wp_cache_set('last_changed', $last_changed, 'comment');
+ }
+ $cache_key = "get_comments:$key:$last_changed";
+
+ if ( $cache = wp_cache_get( $cache_key, 'comment' ) ) {
+ return $cache;
+ }
+
+ $post_id = absint($post_id);
+
+ if ( 'hold' == $status )
+ $approved = "comment_approved = '0'";
+ elseif ( 'approve' == $status )
+ $approved = "comment_approved = '1'";
+ elseif ( 'spam' == $status )
+ $approved = "comment_approved = 'spam'";
+ else
+ $approved = "( comment_approved = '0' OR comment_approved = '1' )";
+
+ $order = ( 'ASC' == $order ) ? 'ASC' : 'DESC';
+
+ $orderby = 'comment_date_gmt'; // Hard code for now
+
+ $number = absint($number);
+ $offset = absint($offset);
+
+ if ( !empty($number) ) {
+ if ( $offset )
+ $number = 'LIMIT ' . $offset . ',' . $number;
+ else
+ $number = 'LIMIT ' . $number;
+
+ } else {
+ $number = '';
+ }
+
+ if ( ! empty($post_id) )
+ $post_where = "comment_post_ID = $post_id AND" ;
+ else
+ $post_where = '';
+
+ $comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE $post_where $approved ORDER BY $orderby $order $number" );
+ wp_cache_add( $cache_key, $comments, 'comment' );
+
+ return $comments;
+}
+
+// Added WP2.2 wp_parse_args()
+function wp_parse_args( $args, $defaults = '' ) {
+ if ( is_object( $args ) )
+ $r = get_object_vars( $args );
+ elseif ( is_array( $args ) )
+ $r =& $args;
+ else
+ wp_parse_str( $args, $r );
+
+ if ( is_array( $defaults ) )
+ return array_merge( $defaults, $r );
+ return $r;
+}
+
+// Added WP2.2.1 wp_parse_str()
+function wp_parse_str( $string, &$array ) {
+ parse_str( $string, $array );
+ if ( get_magic_quotes_gpc() )
+ $array = stripslashes_deep( $array );
+ $array = apply_filters( 'wp_parse_str', $array );
+}
+// Added WP2.5 absint()
+function absint( $maybeint ) {
+ return abs( intval( $maybeint ) );
+}
+
+// Added WP2.7 absint()
+function locate_template($template_names, $load = false) {
+ if (!is_array($template_names))
+ return '';
+
+ $located = '';
+ foreach($template_names as $template_name) {
+ if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
+ $located = STYLESHEETPATH . '/' . $template_name;
+ break;
+ } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
+ $located = TEMPLATEPATH . '/' . $template_name;
+ break;
+ }
+ }
+
+ if ($load && '' != $located)
+ load_template($located);
+
+ return $located;
+}
+
+// Added WP2.5 translate_with_context()
+function translate_with_context( $text, $domain = 'default' ) {
+ return before_last_bar(translate( $text, $domain ) );
+
+}
+
+// Added WP2.2 translate()
+function translate($text, $domain = 'default') {
+ global $l10n;
+
+ if (isset($l10n[$domain]))
+ return apply_filters('gettext', $l10n[$domain]->translate($text), $text, $domain);
+ else
+ return apply_filters('gettext', $text, $text, $domain);
+}
+
+// Added WP2.2 translate_with_context()
+function before_last_bar( $string ) {
+ $last_bar = strrpos( $string, '|' );
+ if ( false == $last_bar )
+ return $string;
+ else
+ return substr( $string, 0, $last_bar );
+}
+
+// Added WP2.7 post_password_required()
+function post_password_required( $post = null ) {
+ $post = get_post($post);
+
+ if ( empty($post->post_password) )
+ return false;
+
+ if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) )
+ return true;
+
+ if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password )
+ return true;
+
+ return false;
+}
+// Added WP2.7 comment_form_title()
+function comment_form_title( $noreplytext = 'Leave a Reply', $replytext = 'Leave a Reply to %s', $linktoparent = TRUE ) {
+ global $comment;
+
+ $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
+
+ if ( 0 == $replytoid )
+ echo $noreplytext;
+ else {
+ $comment = get_comment($replytoid);
+ $author = ( $linktoparent ) ? '' . get_comment_author() . '' : get_comment_author();
+ printf( $replytext, $author );
+ }
+}
+
+/**
+ * @ignore
+ */
+function _c() {}
+
+
+?>
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php (revision 252)
@@ -51,5 +51,5 @@
} else {
- // WP2.7 original
+ // WP original
if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
return false;
@@ -58,12 +58,21 @@
return;
- if ( ! $user = wp_validate_auth_cookie() ) {
- if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
- wp_set_current_user(0);
- return false;
- }
- }
-
- wp_set_current_user($user);
+ if (function_exists('wp_validate_auth_cookie')){
+ if ( ! $user = wp_validate_auth_cookie() ) {
+ if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
+ wp_set_current_user(0);
+ return false;
+ }
+ }
+ wp_set_current_user($user);
+ } else { // for WP2.0
+ if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) ||
+ !wp_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true) ) {
+ wp_set_current_user(0);
+ return false;
+ }
+ $user_login = $_COOKIE[USER_COOKIE];
+ wp_set_current_user(0, $user_login);
+ }
}
}
@@ -77,5 +86,5 @@
if(is_object($xoopsUser)){
$u_name = $xoopsUser->getVar("uname");
- $u_pass_md5 = $xoopsUser->getVar("pass");
+ $u_pass_md5 = $xoopsUser->getVar("pass");
if ( ! empty($u_name) && ! empty($u_pass_md5) ) {
include_once dirname( __FILE__ ).'/user_sync_xoops.php';
@@ -96,5 +105,5 @@
wp_set_current_user(0);
wp_clearcookie();
- return 0;
+ return 0;
}
endif;
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 252)
@@ -20,4 +20,6 @@
require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
+if ($xoops_config->is_wp20)
+ require_once dirname( __FILE__ ).'/include/functions_for_wp20.php' ;
add_action('admin_menu', array(&$xpress_config, 'add_option_page'));
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php (revision 252)
@@ -410,5 +410,5 @@
}
-
+
function groupe_role_option(){
global $wp_roles , $xoops_db;
@@ -427,6 +427,6 @@
$select_value = $groupe->role;
-
-
+
+
foreach($wp_roles->role_names as $role => $name) {
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/category_block_theme.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/category_block_theme.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/category_block_theme.php (revision 252)
@@ -17,25 +17,50 @@
$depth = !is_numeric( $options[12] ) ? 0 : $options[12] ;
- $param = array(
- 'show_option_all' => $show_option_all,
- 'orderby' => $orderby,
- 'order' => $order,
- 'show_last_update' => $show_last_updated,
- 'style' => 'list',
- 'show_count' => $show_count,
- 'hide_empty' => $hide_empty,
- 'use_desc_for_title' => $use_desc_for_title,
- 'child_of' => 0,
- 'feed' => '',
- 'feed_image' => '',
- 'exclude' => $exclude,
- 'include' => $includes,
- 'hierarchical' => $hierarchical,
- 'title_li' => '',
- 'number' => '',
- 'echo' => 0,
- 'depth' => $depth
- );
- $block['categories'] = wp_list_categories($param);
+ if (function_exists('wp_list_categories')){
+ $param = array(
+ 'show_option_all' => $show_option_all,
+ 'orderby' => $orderby,
+ 'order' => $order,
+ 'show_last_update' => $show_last_updated,
+ 'style' => 'list',
+ 'show_count' => $show_count,
+ 'hide_empty' => $hide_empty,
+ 'use_desc_for_title' => $use_desc_for_title,
+ 'child_of' => 0,
+ 'feed' => '',
+ 'feed_image' => '',
+ 'exclude' => $exclude,
+ 'include' => $includes,
+ 'hierarchical' => $hierarchical,
+ 'title_li' => '',
+ 'number' => '',
+ 'echo' => 0,
+ 'depth' => $depth
+ );
+ $block['categories'] = wp_list_categories($param);
+ } else {
+ if (empty($show_option_all))
+ $optionall = 0;
+ else
+ $optionall = 1;
+ $param = array(
+ 'optionall' => $optionall,
+ 'all' => $show_option_all,
+ 'sort_column' => $orderby,
+ 'sort_order' => $order,
+ 'show_last_update' => $show_last_updated,
+ 'optioncount' => $show_count,
+ 'hide_empty' => $hide_empty,
+ 'use_desc_for_title' => $use_desc_for_title,
+ 'child_of' => 0,
+ 'feed' => '',
+ 'feed_image' => '',
+ 'exclude' => $exclude,
+ 'hierarchical' => $hierarchical,
+ 'recurse' => 1,
+ );
+ $block['categories'] = wp_list_cats($param);
+
+ }
return $block ;
}
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/tag_cloud_block_theme.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/tag_cloud_block_theme.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/tag_cloud_block_theme.php (revision 252)
@@ -25,9 +25,12 @@
'include' => $wp_include
);
- ob_start();
- wp_tag_cloud($param);
- $output = ob_get_contents();
- ob_end_clean();
-
+ if (function_exists('wp_tag_cloud')) {
+ ob_start();
+ wp_tag_cloud($param);
+ $output = ob_get_contents();
+ ob_end_clean();
+ } else {
+ $output = 'not function wp_tag_cloud()';
+ }
$block['tag_cloud'] = $output;
return $block ;
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/widget_block_theme.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/widget_block_theme.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/widget_block_theme.php (revision 252)
@@ -38,5 +38,8 @@
}
}
-
+ if (!function_exists('wp_get_sidebars_widgets')) {
+ echo 'Not support sidebar widget';
+ return;
+ }
$sidebars_widgets = wp_get_sidebars_widgets();
$registered_sidebars = $wp_registered_sidebars[$index];
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php (revision 252)
@@ -8,20 +8,48 @@
return;
}
+
+ if (function_exists('have_comments'))
+ $have_comments= have_comments();
+ else
+ $have_comments= $comments;
+
?>
-
-
+
-
-
+
+
+
+
@@ -39,7 +67,9 @@
-
+
+
+
@@ -49,5 +79,9 @@
-
+
+
+
+
+
ID); ?>
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/index.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/index.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/index.php (revision 252)
@@ -26,5 +26,9 @@
Index: /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/searchform.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/searchform.php (revision 251)
+++ /trunk/xpressme_integration_kit/wp-content/themes/xpress_default/searchform.php (revision 252)
@@ -1,5 +1,9 @@
|
+ + +- id="comment-">
+
+ %s Says:', 'xpressme'), get_comment_author_link()); ?>
+ comment_approved == '0') : ?>
+
+
+
+
+
+
++ + +