Changeset 257 for trunk

Timestamp:

Jun 5, 2009, 5:43:15 PM (15 years ago)

Author:

toemon

Message:

#139 XOOPS UID と　WordPress? UID　相違による不具合の修正

Location:

trunk/xpressme_integration_kit

Files:

• class/xpressD3commentContent.class.php (modified) (3 diffs)
• include/data.inc.php (modified) (3 diffs)
• include/general_functions.php (added)
• include/search.php (modified) (3 diffs)
• wp-content/plugins/xpressme/include/d3forum_comment_synchro.php (modified) (1 diff)

trunk/xpressme_integration_kit/class/xpressD3commentContent.class.php

@@ -198 +198 @@
                         $mydirname = $this->mydirname ;
                         if( preg_match( '/[^0-9a-zA-Z_-]/' , $mydirname ) ) die( 'Invalid mydirname' ) ;
-                                        
+                        
                         $xpress_prefix = $mydirname;
                         if ($xpress_prefix == 'wordpress') $xpress_prefix = 'wp';
@@ -216 +216 @@
                         $blog_name = $blog_row['option_value'];
                         
-                                                
+                        
                         // query
                         $sql = "SELECT * FROM ".$wp_post." WHERE ID=$link_id ";
@@ -329 +329 @@
                                 $comment_content = "'" . addSlashes($d3f_row['post_text']) . "'";
                                 $comment_approved = "'" . $d3f_row['approval'] . "'";
-                                $user_ID = $d3f_row['uid'];
+                                require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');
+                                $user_ID = xoops_uid_to_wp_uid($d3f_row['uid']);
                                 $comment_date_gmt = "'" . gmdate('Y-m-d H:i:s' , $d3f_row['post_time']) . "'";
                                 $comment_type = '';

trunk/xpressme_integration_kit/include/data.inc.php

@@ -36 +36 @@
                 $wp_prefix = $mydirname;
         }
-        
+        require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');
         include(XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/wp-includes/version.php');
 
@@ -92 +92 @@
                 $ret[$i]['cat_name'] = $row2['cat_name'];
 
-                $ret[$i]['uid'] = $row1['post_author'];
+                $ret[$i]['uid'] = wp_uid_to_xoops_uid($row1['post_author']);
                 $ret[$i]['replies'] = $row1['comment_count'];
 
@@ -180 +180 @@
 }
 
+
 // --- function end ---
 

trunk/xpressme_integration_kit/include/search.php

@@ -17 +17 @@
 {
         global $xoopsDB, $myts;
+        
+        require_once (XOOPS_ROOT_PATH . '/modules/'.$mydirname . '/include/general_functions.php');
 
         $myts =& MyTextSanitizer::getInstance();
@@ -32 +34 @@
         }
         if ($userid) {
-                $userid = intval($userid);
+                $userid = xoops_uid_to_wp_uid(intval($userid));
                 $where  .= " AND (post_author=".$userid.")";
         }
@@ -70 +72 @@
                 $ss   = substr($date_str,17,2);
                 $ret[$i]['time'] = mktime( $hh,$nn,$ss,$mm,$dd,$yyyy);
-                $ret[$i]['uid'] = $myrow['post_author'];
+                $ret[$i]['uid'] = wp_uid_to_xoops_uid($myrow['post_author']);
 //              $ret[$i]['page'] = $myts->htmlSpecialChars($myrow['post_title']);
 

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

@@ -493 +493 @@
         $post_time = strtotime($row->comment_date);             // or   $row2['comment_date_gmt']
         $modified_time = strtotime($row->comment_date); // or   $row2['comment_date_gmt']
-        $uid = $row->user_id;
+        require_once (get_xpress_dir_path() . 'include/general_functions.php');
+        $uid =  wp_uid_to_xoops_uid($row->user_id);
         $poster_ip = "'" . addslashes($row->comment_author_IP ). "'";
         $modifier_ip = "'" . addslashes($row->comment_author_IP) . "'";