Changeset 261 for branches/Ver2.0/xpressme_integration_kit/include

Timestamp:

Jun 8, 2009, 11:46:24 AM (15 years ago)

Author:

toemon

Message:

#143 モジュール複製時のXOOPS UID と　WordPress? UID　相違による不具合

PHP Fatal error: Cannot redeclare wp_uid_to_xoops_uid()が発生
またUIDの変換が先読みしたモジュールのWordPress UIDが使われる

の修正

Location:

branches/Ver2.0/xpressme_integration_kit/include

Files:

• data.inc.php (modified) (1 diff)
• general_functions.php (modified) (1 diff)
• search.php (modified) (2 diffs)

branches/Ver2.0/xpressme_integration_kit/include/data.inc.php

@@ -92 +92 @@
                 $ret[$i]['cat_name'] = $row2['cat_name'];
 
-                $ret[$i]['uid'] = wp_uid_to_xoops_uid($row1['post_author']);
+                $ret[$i]['uid'] = wp_uid_to_xoops_uid($row1['post_author'],$mydirname);
                 $ret[$i]['replies'] = $row1['comment_count'];
 

branches/Ver2.0/xpressme_integration_kit/include/general_functions.php

@@ -8 +8 @@
  * @package             module::xpress
  */
+if (!function_exists('wp_uid_to_xoops_uid')){
+        function wp_uid_to_xoops_uid($wp_uid = '',$mydirname){
+                global $xoopsDB,$xoops_db;
+                if (empty($mydirname))
+                        $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 
-function wp_uid_to_xoops_uid($wp_uid = ''){
-        global $xoopsDB;
-        $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+                if ($mydirname == 'wordpress'){
+                        $wp_prefix = 'wp';
+                } else {
+                        $wp_prefix = $mydirname;
+                }
 
-        if ($mydirname == 'wordpress'){
-                $wp_prefix = 'wp';
-        } else {
-                $wp_prefix = $mydirname;
-        }
+                if (empty($xoops_db)) { // not load XPressME
+                        $xoops_user_tbl = $xoopsDB->prefix('users');
+                        $wp_user_tbl = $xoopsDB->prefix($wp_prefix . "_users");
 
-        $xoops_user_tbl = $xoopsDB->prefix('users');
-        $wp_user_tbl = $xoopsDB->prefix($wp_prefix . "_users");
-
-        $wp_user_SQL ="SELECT user_login FROM $wp_user_tbl WHERE ID = $wp_uid ";
-        $wp_user_Res = $xoopsDB->query($wp_user_SQL, 0, 0);
-        if ($xoopsDB->getRowsNum($wp_user_Res)  > 0){
-                $wp_user_Row = $xoopsDB->fetchArray($wp_user_Res);
-                $wp_user_name = $wp_user_Row['user_login'];
-        
-                $xoops_user_SQL ="SELECT uid FROM $xoops_user_tbl WHERE uname LIKE '$wp_user_name'";
-                $xoops_user_Res = $xoopsDB->query($xoops_user_SQL, 0, 0);
-                if ($xoopsDB->getRowsNum($xoops_user_Res)  > 0){
-                        $xoops_user_Row = $xoopsDB->fetchArray($xoops_user_Res);
-                        $xoops_uid = $xoops_user_Row['uid'];    
-                        return $xoops_uid;
+                        $wp_user_SQL ="SELECT user_login FROM $wp_user_tbl WHERE ID = $wp_uid ";
+                        $wp_user_Res = $xoopsDB->query($wp_user_SQL, 0, 0);
+                        if ($xoopsDB->getRowsNum($wp_user_Res)  > 0){
+                                $wp_user_Row = $xoopsDB->fetchArray($wp_user_Res);
+                                $wp_user_name = $wp_user_Row['user_login'];
+                        
+                                $xoops_user_SQL ="SELECT uid FROM $xoops_user_tbl WHERE uname LIKE '$wp_user_name'";
+                                $xoops_user_Res = $xoopsDB->query($xoops_user_SQL, 0, 0);
+                                if ($xoopsDB->getRowsNum($xoops_user_Res)  > 0){
+                                        $xoops_user_Row = $xoopsDB->fetchArray($xoops_user_Res);
+                                        $xoops_uid = $xoops_user_Row['uid'];    
+                                        return $xoops_uid;
+                                }
+                        }
+                        return 0;
+                } else { // load XPressME or not Load XOOPS
+                        $xoops_user_tbl = get_xoops_prefix() . 'users';
+                        $wp_user_tbl = get_wp_prefix() . 'users';
+                        $wp_user_name = $xoops_db->get_var("SELECT user_login FROM $wp_user_tbl WHERE ID = $wp_uid ");
+                        if (empty($wp_user_name)) return 0;
+                        $xoops_uid = $xoops_db->get_var("SELECT uid FROM $xoops_user_tbl WHERE uname LIKE '$wp_user_name'");
+                        if (!empty($xoops_uid)) return $xoops_uid; else return 0;
                 }
         }
-        return 0;
 }
-function xoops_uid_to_wp_uid($xoops_uid = ''){
-        global $xoopsDB;
-        $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 
-        if ($mydirname == 'wordpress'){
-                $wp_prefix = 'wp';
-        } else {
-                $wp_prefix = $mydirname;
+if (!function_exists('xoops_uid_to_wp_uid')){
+        function xoops_uid_to_wp_uid($xoops_uid = '',$mydirname){
+                global $xoopsDB,$xoops_db;
+                if (empty($mydirname))
+                        $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+
+                if ($mydirname == 'wordpress'){
+                        $wp_prefix = 'wp';
+                } else {
+                        $wp_prefix = $mydirname;
+                }
+
+                if (empty($xoops_db)) { // not load XPressME
+                        $xoops_user_tbl = $xoopsDB->prefix('users');
+                        $wp_user_tbl = $xoopsDB->prefix($wp_prefix . "_users");
+
+                        $xoops_user_SQL ="SELECT uname FROM $xoops_user_tbl WHERE uid =  $xoops_uid";
+                        $xoops_user_Res = $xoopsDB->query($xoops_user_SQL, 0, 0);
+                        if ($xoopsDB->getRowsNum($xoops_user_Res)  > 0){
+                                $xoops_user_Row = $xoopsDB->fetchArray($xoops_user_Res);
+                                $xoops_user_name = $xoops_user_Row['uname'];    
+
+                                $wp_user_SQL ="SELECT ID FROM $wp_user_tbl WHERE user_login LIKE '$xoops_user_name'";
+                                $wp_user_Res = $xoopsDB->query($wp_user_SQL, 0, 0);
+                                if ($xoopsDB->getRowsNum($wp_user_Res)  > 0){
+                                        $wp_user_Row = $xoopsDB->fetchArray($wp_user_Res);
+                                        $wp_user_id = $wp_user_Row['ID'];
+                                        return $wp_user_id;
+                                }
+                        }
+                        return 0;
+                } else { // load XPressME or not Load XOOPS
+                        $xoops_user_tbl = get_xoops_prefix() . 'users';
+                        $wp_user_tbl = get_wp_prefix() . 'users';
+                        $xoops_user_name = $xoops_db->get_var("SELECT uname FROM $xoops_user_tbl WHERE uid =  $xoops_uid");
+                        if (empty($xoops_user_name)) return 0;
+                        $wp_user_id = $xoops_db->get_var("SELECT ID FROM $wp_user_tbl WHERE user_login LIKE '$xoops_user_name'");
+                        if (!empty($wp_user_id)) return $wp_user_id; else return 0;
+                }       
         }
-
-        $xoops_user_tbl = $xoopsDB->prefix('users');
-        $wp_user_tbl = $xoopsDB->prefix($wp_prefix . "_users");
-
-        $xoops_user_SQL ="SELECT uname FROM $xoops_user_tbl WHERE uid =  $xoops_uid";
-        $xoops_user_Res = $xoopsDB->query($xoops_user_SQL, 0, 0);
-        if ($xoopsDB->getRowsNum($xoops_user_Res)  > 0){
-                $xoops_user_Row = $xoopsDB->fetchArray($xoops_user_Res);
-                $xoops_user_name = $xoops_user_Row['uname'];    
-
-                $wp_user_SQL ="SELECT ID FROM $wp_user_tbl WHERE user_login LIKE '$xoops_user_name'";
-                $wp_user_Res = $xoopsDB->query($wp_user_SQL, 0, 0);
-                if ($xoopsDB->getRowsNum($wp_user_Res)  > 0){
-                        $wp_user_Row = $xoopsDB->fetchArray($wp_user_Res);
-                        $wp_user_id = $wp_user_Row['ID'];
-                        return $wp_user_id;
-                }
-        }
-        return 0;
 }
 ?>

branches/Ver2.0/xpressme_integration_kit/include/search.php

@@ -34 +34 @@
         }
         if ($userid) {
-                $userid = xoops_uid_to_wp_uid(intval($userid));
+                $userid = xoops_uid_to_wp_uid(intval($userid),$mydirname);
                 $where  .= " AND (post_author=".$userid.")";
         }
@@ -72 +72 @@
                 $ss   = substr($date_str,17,2);
                 $ret[$i]['time'] = mktime( $hh,$nn,$ss,$mm,$dd,$yyyy);
-                $ret[$i]['uid'] = wp_uid_to_xoops_uid($myrow['post_author']);
+                $ret[$i]['uid'] = wp_uid_to_xoops_uid($myrow['post_author'],$mydirname);
 //              $ret[$i]['page'] = $myts->htmlSpecialChars($myrow['post_title']);