Changeset 360 for trunk

Timestamp:

Aug 11, 2009, 4:31:35 PM (15 years ago)

Author:

toemon

Message:

WP2.1.3MEへの対応 fixed #199
但しWP2.1.3ME自体のバグ（MySQL４．１以上でEUC-JPを使用したときの文字化け）があるので注意

Location:

trunk/xpressme_integration_kit

Files:

• class/config_from_xoops.class.php (modified) (2 diffs)
• include/add_xpress_process.php (modified) (3 diffs)
• wp-content/plugins/xpressme/include/custom_functions.php (modified) (1 diff)
• wp-content/plugins/xpressme/include/functions_for_wp20.php (deleted)
• wp-content/plugins/xpressme/include/functions_for_wp_old.php (added)
• wp-content/plugins/xpressme/include/xpress_common_functions.php (modified) (2 diffs)
• wp-content/plugins/xpressme/xpressme.php (modified) (2 diffs)
• wp-content/themes/xpress_default/blocks/authors_block_theme.php (modified) (1 diff)
• wp-content/themes/xpress_default/blocks/meta_block_theme.php (modified) (1 diff)
• wp-content/themes/xpress_default/blocks/page_block_theme.php (modified) (1 diff)
• wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php (modified) (2 diffs)
• wp-content/themes/xpress_default/comments.php (modified) (2 diffs)
• wp-content/themes/xpress_default/single.php (modified) (1 diff)

trunk/xpressme_integration_kit/class/config_from_xoops.class.php

@@ -41 +41 @@
         var $mu_path_current_site;
         var $wp_db_version;
-        var $is_wp20;
+        var $wp_version;
+        var $is_wp_me;
         
         function __constructor()        //for PHP5
@@ -291 +292 @@
         
         $this->wp_db_version = $wp_db_version;
-        if ($wp_db_version == 3441)
-                        $this->is_wp20 = true;
-                else
-                        $this->is_wp20 = false;
-                
+                
+                $this->wp_version = str_replace("ME", "", $wp_version);
+                
+                $pattern = 'ME.*';
+        if (preg_match('/' . $pattern . '/' ,$wp_version)){
+                        $this->is_wp_me = true;
+                } else {
+                        $this->is_wp_me = true;
+                }
     }
     

trunk/xpressme_integration_kit/include/add_xpress_process.php

@@ -2 +2 @@
 require_once( dirname( __FILE__ ).'/request_url.php');
 if (is_xpress_index_page_call()){
-        //When notifying by a private message, 
+        //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. 
         $_SERVER['REQUEST_METHOD'] = 'POST';
@@ -27 +27 @@
         Notification_reserve_send();
         ob_start();     
-                if($xoops_config->is_wp20 )
+                if (version_compare($xoops_config->wp_version,'2.2', '<'))
                         require_once dirname( __FILE__ ).'/old_template-loader.php' ;
                 else
@@ -49 +49 @@
         exit();         // The return to wp-blog-header.php is stolen here
 }
-if (is_admin_post_call()) require_once $xoops_config->xoops_mainfile_path;
-if (is_xpress_comments_post_call()) require_once $xoops_config->xoops_mainfile_path;
+if (is_admin_post_call()) require_once $xoops_config->xoops_mainfile_path;              // for Notification_triggerEvent
+if (is_xpress_comments_post_call()) require_once $xoops_config->xoops_mainfile_path;    // for Notification_triggerEvent
 ?>

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -16 +16 @@
 }
 
-function xpress_is_wp20() {
+function xpress_is_wp_version($operator='==',$comp_version){
         global $xoops_config;
-        
-        return $xoops_config->is_wp20;
+        return version_compare($xoops_config->wp_version, $comp_version, $operator);
 }
 

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -250 +250 @@
                         }
                 } else {
-                        if(xpress_is_wp20()){
+                        if(xpress_is_wp_version('<','2.1')){  // Maybe, I think that it is ver2.1 or less.
                                 if (!empty($wp->matched_query) ){
                                         if (strpos($wp->matched_query,'author_name') !== false ){
@@ -303 +303 @@
         $query = preg_replace('/\s\s+/', ' ', $query);
         if (!empty($_COOKIE[$author_cookie])){
-                if(xpress_is_wp20()){
+                if(xpress_is_wp_version('<','2.1')){
                         $pattern = "WHERE.*AND\s?\(*post_author\s*=";
                         if ( preg_match ( "/".$pattern."/i", $query, $match ) ){

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

@@ -20 +20 @@
 
 require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
-if ($xoops_config->is_wp20)
-        require_once dirname( __FILE__ ).'/include/functions_for_wp20.php' ;
+require_once dirname( __FILE__ ).'/include/functions_for_wp_old.php' ;
 
 function my_plugin_menu()
@@ -98 +97 @@
 add_filter('query','xpress_query_filter');
 //add_action("init", "xpress_set_author_cookie");
-if(xpress_is_wp20()){
+if(xpress_is_wp_version('<','2.1')){
         // It is called before parse_request() makes $GET. 
         add_action("query_vars", "xpress_set_author_cookie");

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/authors_block_theme.php

@@ -10 +10 @@
         $mydirpath = get_xpress_dir_path();
         
-        if(xpress_is_wp20() ){
+        if(xpress_is_wp_version('<','2.3') ){
                 $param_str = 'optioncount='. $optioncount . '&exclude_admin=' . $exclude_admin .'&show_fullname='. $show_fullname . '&hide_empty=' . $hide_empty;
                 ob_start();

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/meta_block_theme.php

@@ -35 +35 @@
                 if ($post_new){
                         if($Now_user_level > 0){
-                                if (xpress_is_wp20()){
+                                if (xpress_is_wp_version('<','2.1') ){
                                         $output .=
                                         '<li>'.

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/page_block_theme.php

@@ -22 +22 @@
         if ($show_date == 'none' ) $show_date = '';
         
-        if (!xpress_is_wp20()){
+        if (xpress_is_wp_version('>=','2.2')){
                 $parm = array(
                 'sort_column'   => $sort_column, 

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php

@@ -46 +46 @@
                 $comment_sql  = "SELECT comment_ID,comment_post_ID,comment_author,comment_author_email,comment_author_url,comment_content, comment_type,UNIX_TIMESTAMP(comment_date) as comment_unix_time ";
                 $comment_sql .= "FROM $wpdb->comments LEFT JOIN $wpdb->posts ON  $wpdb->posts.ID = $wpdb->comments.comment_post_ID ";
-                if (xpress_is_wp20()){
+                if (xpress_is_wp_version('<','2.1')){
                         $comment_sql .= "WHERE comment_approved = '1' AND post_status = 'publish' $type_select ";
                 } else {
@@ -60 +60 @@
                                 $comment_content = $comment->comment_content;
                                 $comment_excerpt = ($disp_length>0 ? xpress_substr($comment_content, 0, $disp_length): $comment->comment_content);
-                                if (xpress_is_wp20()){
-                                        $comment_link = get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID ;
-                                } else {
-                                        $comment_link = get_comment_link($comment->comment_ID);
-                                }
+                                $comment_link = get_comment_link($comment->comment_ID);
                                 $comment_title = $comment_excerpt;
                                 $comment_title_link = "<a href='$comment_link' rel='external nofollow' class='url'>$comment_title</a>";

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php

@@ -12 +12 @@
 
 <!-- You can start editing here. -->
-<?php if (! xpress_is_wp20() ) : ?>
+<?php if ( xpress_is_wp_version('>=','2.7')) : ?>
         <?php if ( have_comments() ) : ?>
                 <?php if ( ! empty($comments_by_type['comment']) ) : ?>
@@ -34 +34 @@
                 <?php endif; ?>
         <?php endif; ?>
-<?php else : // is WordPress2.0 ?>
+<?php else : // is version 2.7 under?>
         <?php if ( $comments ) : ?>
                 <h3 id="xpress_comments"><?php comments_number(__('No Responses', 'xpress'), __('One Response', 'xpress'), __('% Responses', 'xpress'));?> <?php printf(__('to &#8220;%s&#8221;', 'xpress'), the_title('', '', false)); ?></h3>

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/single.php

@@ -66 +66 @@
                                         <div id ="xpress-comments-block">
                                                 <?php
-                                                        if (xpress_is_wp20() )
+                                                        if ( xpress_is_wp_version('<','2.7') )
                                                                 comments_template();
                                                         else