Changeset 95 for trunk

Timestamp:

Mar 3, 2009, 8:33:23 PM (16 years ago)

Author:

toemon

Message:

XOOPS mainfile.phpのdefine文を事前に読み取りwp-config.phpのDB接続関係を生成することにより、XOOPSシステムを必要なときだけ呼び出す仕組みを作る。
およびイベント通知関係の修正（まだゲストのアクセス権限がないと駄目)

Location:

trunk

Files:

• include/config_from_xoops.class.php (modified) (2 diffs)
• include/include_xoops_define.php (deleted)
• include/notification.inc.php (modified) (1 diff)
• include/notification.inc.sub.php (deleted)
• include/notification.inc.sub.php.delete (added)
• include/request_url.php (added)
• include/set_cash_cookie_path.php (modified) (2 diffs)
• include/specfic_on_call_page.php (deleted)
• include/xpress_block_render.php (modified) (2 diffs)
• include/xpress_cache.php (modified) (3 diffs)
• include/xpress_debug_log.php (added)
• wp-config.php (modified) (5 diffs)
• wp-content/plugins/xpressme/include/common_functions.php (added)
• wp-content/plugins/xpressme/include/custom_functions.php (modified) (1 diff)
• wp-content/plugins/xpressme/include/notify_functions.php (modified) (5 diffs)
• wp-content/plugins/xpressme/include/user_sync_xoops.php (modified) (3 diffs)
• wp-content/plugins/xpressme/include/xpress_common_functions.php (added)
• wp-content/plugins/xpressme/xpressme.php (modified) (2 diffs)
• wp-content/plugins/xpressme/xpressme_class.php (modified) (4 diffs)
• wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php (modified) (2 diffs)
• wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php (modified) (2 diffs)
• xoops_version.php (modified) (1 diff)

trunk/include/config_from_xoops.class.php

@@ -26 +26 @@
         var $module_path;
         var $module_url;
+        var $module_db_prefix;
+        var $xoops_upload_path;
+        var $xoops_upload_url;
+        
         
         function __constructor()        //for PHP5
     {
         $this->ConfigFromXoops();
+       
     }
 
@@ -89 +94 @@
                         }
                 }
+                
+                //  define from /settings/definition.inc.php (XCL)  or /include/common.php(2016a-JP)
+                $this->xoops_upload_path = $this->xoops_root_path .'/uploads';
+                $this->xoops_upload_url = $this->xoops_url . '/uploads';
+                
+                if ($this->module_name == 'wordpress')
+                        $this->module_db_prefix =  $this->xoops_db_prefix  . '_wp_';
+                else
+                        $this->module_db_prefix =  $this->xoops_db_prefix  . '_' . $this->module_name . '_';
+                
     }
     

trunk/include/notification.inc.php

@@ -1 +1 @@
 <?php
-
-function xpress_notify_info( $category , $item_id )
+function xpress_notify( $category , $item_id )
 {
-        $db =& Database::getInstance() ;
         $mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-
-
-//      $module_handler =& xoops_gethandler( 'module' ) ;
-//      $module =& $module_handler->getByDirname( $mydirname ) ;
 
         if( $category == 'global' ) {

trunk/include/set_cash_cookie_path.php

@@ -50 +50 @@
  */
 if ( !defined('COOKIEPATH') )
-        define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', XOOPS_URL . '/' ) );
+        define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', $xoops_config->xoops_url . '/' ) );
 
 /**
@@ -57 +57 @@
  */
 if ( !defined('SITECOOKIEPATH') )
-        define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', XOOPS_URL . '/' ) );
+        define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', $xoops_config->xoops_url  . '/' ) );
 
 /**

trunk/include/xpress_block_render.php

@@ -62 +62 @@
         function get_block_stylesheet_url($mydirname)
         {
-                $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+                global $xoops_config;
+                $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname;
                 $select_theme = get_xpress_theme_name($mydirname);
                 $style_file = $mydirpath . '/wp-content/themes/' . $select_theme . '/blocks/style.css';
                 if (file_exists($style_file))
-                        return XOOPS_URL . '/modules/' .$mydirname . '/wp-content/themes/' . $select_theme . '/blocks/style.css';
+                        return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/' . $select_theme . '/blocks/style.css';
                 else    
-                        return XOOPS_URL . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/style.css';
+                        return $xoops_config->xoops_url . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/style.css';
         }
 
@@ -88 +89 @@
         function get_block_file_path($mydirname,$file_name)
         {
-                $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+                global $xoops_config;
+                $mydirpath = $xoops_config->xoops_root_path . '/modules/' . $mydirname;
                 $select_theme = get_xpress_theme_name($mydirname);
                 $block_file = $mydirpath . '/wp-content/themes/' . $select_theme . '/blocks/' . $file_name;
 
                 if (!file_exists($block_file))
-                        $block_file =  XOOPS_ROOT_PATH . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/' . $file_name;
+                        $block_file =  $xoops_config->xoops_root_path . '/modules/' .$mydirname . '/wp-content/themes/xpress_default/blocks/' . $file_name;
                 return $block_file;
         }

trunk/include/xpress_cache.php

@@ -4 +4 @@
     function xpress_cache_read($mydirname,$collation_key)
     {
-                $cache_dir = XOOPS_ROOT_PATH . '/cache/';
+        global $xoops_config;
+                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
                 $cache_time = 0;
         $filename = $cache_dir .$mydirname . '_' . $collation_key;
@@ -19 +20 @@
     function xpress_cache_write($mydirname,$collation_key,$content)
     {
-                $cache_dir = XOOPS_ROOT_PATH . '/cache/';
+                global $xoops_config;
+                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
                 $cache_time = 0;
 
@@ -35 +37 @@
     function xpress_cache_clear($mydirname)
     {
-                $cache_dir = XOOPS_ROOT_PATH . '/cache/';
+                global $xoops_config;
+                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
                 $cache_time = 0;
         if ($dh = opendir($cache_dir)) {

trunk/wp-config.php

@@ -5 +5 @@
 require_once dirname( __FILE__ ).'/include/set_cash_cookie_path.php' ;
 
-mb_language('Japanese');
-mb_internal_encoding('UTF-8');
+
+if (function_exists("mb_language")) mb_language('Japanese');
+// The setting of mb_internal_encoding might be unnecessary. 
+// Because mb_internal_encoding setting wp-setting.php line 484
+if (function_exists("mb_internal_encoding")) mb_internal_encoding('UTF-8');
 
 // ** MySQL settings ** //
@@ -16 +19 @@
 define('DB_COLLATE', '');
 
+//define('WP_DEBUG' ,true);
+
 // Change each KEY to a different unique phrase.  You won't have to remember the phrases later,
 // so make them long and complicated.  You can visit http://api.wordpress.org/secret-key/1.1/
@@ -24 +29 @@
 
 // You can have multiple installations in one database if you give each a unique prefix
-$xp_prefix = basename(dirname(__FILE__));
-if ($xp_prefix == 'wordpress'){
-        $xp_prefix = 'wp';
-}
-$table_prefix  = $xoops_config->xoops_db_prefix . '_' . $xp_prefix . '_';   // Only numbers, letters, and underscores please!
+$table_prefix  = $xoops_config->module_db_prefix;   // Only numbers, letters, and underscores please!
 
 // Change this to localize WordPress.  A corresponding MO file for the
@@ -40 +41 @@
 if ( !defined('ABSPATH') )
         define('ABSPATH', dirname(__FILE__).'/');
-require_once(ABSPATH.'wp-settings.php');
-require dirname( __FILE__ ).'/include/include_xoops_define.php' ;
-if (is_xpress_index_page_call()){
+
+require_once dirname( __FILE__ ).'/include/request_url.php' ;
+if (!is_xpress_index_page_call()){
+//      if ( is_wp_cron_page_call()){
+//              if ( !defined("XOOPS_ROOT_PATH") ) {
+//                      require_once $xoops_config->xoops_mainfile_path;
+//              }
+//      }
+        require_once(ABSPATH.'wp-settings.php');
+} else {
+        // If $xoops_config->xoops_mainfile_path is not executed before wp-settings.php is executed, log in cannot be done. 
+        require_once $xoops_config->xoops_mainfile_path;
+        require_once(ABSPATH.'wp-settings.php');
         // The return to wp-blog-header.php is stolen here
         wp();
@@ -52 +63 @@
         xpress_render($wp_output);
         require_once( ABSPATH .'/include/xpress_breadcrumbs.php' );
-        include XOOPS_ROOT_PATH . '/footer.php';
+        include $xoops_config->xoops_root_path . '/footer.php';
         exit();
 }

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

@@ -148 +148 @@
     }
 }
-// xoops db
-function get_xpress_dir_path()
-{
-        return ABSPATH;
-}
-
-function get_xpress_dir_name()
-{
-        return basename(ABSPATH);
-}
-
-function get_wp_prefix_only()
-{
-        $dir_name = get_xpress_dir_name();
-        $prefix = $dir_name;
-        if ($prefix == 'wordpress') $prefix = 'wp';
-        
-        $prefix = $prefix . '_';
-        return $prefix;
-}
-
-function get_xoops_prefix()
-{
-        $ret =XOOPS_DB_PREFIX . '_';
-        return $ret;
-}
-function get_wp_prefix()
-{
-        $prefix = get_xoops_prefix() . get_wp_prefix_only();
-        return $prefix;
-}
-
-function get_xpress_modid()
-{
-        global $xoops_db;
-        
-        $modulename = get_xpress_dir_name();    
-        $sql = "SELECT mid FROM " . get_xoops_prefix() . "modules WHERE dirname = '$modulename'";
-        $mid = $xoops_db->get_var($sql);
-        return $mid;    
-}
-
-function block_cache_refresh()
-{
-        global $xoops_db;
-        $mid = get_xpress_modid();
-        $sql = "SELECT bid,options,func_file FROM " . get_xoops_prefix() . "newblocks WHERE mid = $mid";
-        $blocks = $xoops_db->get_results($sql);
-        $mydirname = get_xpress_dir_name();
-        require_once get_xpress_dir_path() . '/include/xpress_block_render.php';
-
-
-        foreach($blocks as $block){
-                $func_file = $block->func_file;
-                $call_theme_function_name = str_replace(".php", "", $func_file);
-                $inc_theme_file_name = str_replace(".php", "", $func_file) . '_theme.php';
-                $cache_title = str_replace(".php", "", $func_file);
-                $blockID = $block->bid;
-                $options = explode("|", $block->options);
-                                        
-                $block_theme_file = get_block_file_path($mydirname,$inc_theme_file_name);
-                require_once $block_theme_file;
-                $block_render = $call_theme_function_name($options);            //The block name and the called function name should be assumed to be the same name.                    
-                $xml['block'] = $block_render;
-                xpress_block_cache_write($mydirname,$cache_title. $blockID, $xml);
-        }
-}
+
 
 // views count

trunk/wp-content/plugins/xpressme/include/notify_functions.php

@@ -1 +1 @@
 <?php
-        
+
 function onaction_publish_post_notify($new_status, $old_status, $post)
 {
         if ($new_status == 'publish'){
-                include_once dirname(__FILE__) . '/notification.inc.sub.php';
                 do_PostNotifications($post->ID,'newpost');
         }
@@ -11 +10 @@
 function onaction_edit_post_notify($post_id)
 {
-        include_once ABSPATH . '/include/notification.inc.sub.php';
         do_PostNotifications($post_id,'editpost');
 }
@@ -21 +19 @@
 
         if ($status ==1){
-                include_once ABSPATH . '/include/notification.inc.sub.php';
                 do_CommentNotifications($commentID, $post_id);
         } else {
-                require_once XOOPS_ROOT_PATH . '/include/notification_functions.php' ;
-                $notification_handler =& xoops_gethandler( 'notification' ) ;
-                $notification_handler->triggerEvent( 'global' , 0 , 'waiting') ;
+                do_CommentWaiting($commentID, $post_id);
         }
 }
@@ -35 +30 @@
         $status = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_ID = $commentID");
         if(is_null($status)) return;
-        //      $status = wp_get_comment_status($commentID);
         if ($status == 1){
                         onaction_comment_notify($commentID);
@@ -41 +35 @@
 }
 
+function Notification_triggerEvent($category, $item_id, $event, $extra_tags=array(), $user_list=array(), $omit_user_id=null)
+{
+        global $xoops_db,$xoops_config;
+        //When notifying by a private message, 
+        //it is evaded that the data base becomes read-only as a result of the check on the referrer and the method. 
+        if (is_wp_cron_page_call() ){
+                $_SERVER['HTTP_REFERER'] = 'http://'. $_SERVER[HTTP_HOST]  . $_SERVER['PHP_SELF'];
+                $_SERVER['REQUEST_METHOD'] = 'POST';
+        }
+        if (is_xmlrpc_call() ){
+                $_SERVER['HTTP_REFERER'] = 'http://'. $_SERVER[HTTP_HOST]  . $_SERVER['PHP_SELF'];
+                $_SERVER['REQUEST_METHOD'] = 'POST';
+        }
+        
+        include_once $xoops_config->xoops_mainfile_path;        // load XOOPS System
+        include_once $xoops_config->xoops_root_path . '/include/notification_functions.php' ;
+        $module_id = get_xpress_modid() ;
+        $notification_handler =& xoops_gethandler( 'notification' ) ;
+        $notification_handler->triggerEvent($category, $item_id, $event, $extra_tags, $user_list, $module_id, $omit_user_id);
+}
+
+function do_CommentWaiting($commentID, $comment_post_ID)
+{
+//      global $xoops_config;
+//      require_once $xoops_config->xoops_mainfile_path;
+//      xoops_mainfile_path;
+//      require_once XOOPS_ROOT_PATH . '/include/notification_functions.php' ;
+//      $notification_handler =& xoops_gethandler( 'notification' ) ;
+        Notification_triggerEvent( 'global' , 0 , 'waiting') ;
+}
+
+
+function do_CommentNotifications($commentID, $comment_post_ID)
+{
+        global $xoops_config , $xoops_db;
+
+        $xpress_prefix = get_wp_prefix() ;
+
+        $table_term_relationships = $xpress_prefix .'term_relationships';
+        $table_term_taxonomy = $xpress_prefix .'term_taxonomy';
+        $table_terms = $xpress_prefix .'terms';
+        $table_categories = $xpress_prefix .'categories';
+        $wp_post = $xpress_prefix .'posts';
+        $wp_options = $xpress_prefix .'options';
+        $wp_users  = $xpress_prefix .'users';
+        $wp_comments  = $xpress_prefix .'comments';
+        $post_id = $comment_post_ID;
+
+        $post_title = get_the_title($post_id);
+        $post_url = get_permalink($post_id). '#comment';
+        $blog_name = get_bloginfo('name');
+
+        // query
+        $sql = "SELECT post_author FROM ".$wp_post." WHERE ID=$comment_post_ID ";
+        $post_author = $xoops_db->get_var($sql);
+
+        $sql = "SELECT display_name  FROM $wp_users WHERE ID ='$post_author'";
+        $user_name = $xoops_db->get_var($sql);
+
+        $comment_tags = array( 'XPRESS_AUTH_NAME' =>$user_name,'XPRESS_BLOG_NAME' =>$blog_name,'XPRESS_POST_TITLE' => $post_title , 'XPRESS_POST_URL' => $post_url ) ;
+        Notification_triggerEvent('global' , 0 , 'comment' , $comment_tags , false);
+        Notification_triggerEvent('author' , $post_author , 'comment' , $comment_tags , false);
+        Notification_triggerEvent('post' , $comment_post_ID , 'comment' , $comment_tags , false);
+
+        // categorie notification
+        if (get_xpress_db_version() < 6124){
+                $sql2 = "SELECT c.cat_ID, c.cat_name FROM ".$table_categories." c, ".$table_post2cat." p2c WHERE c.cat_ID = p2c.category_id AND p2c.post_id=".$comment_post_ID;
+        } else {
+                $sql2  = "SELECT $table_term_relationships.object_id, $table_terms.term_id AS cat_ID, $table_terms.name AS cat_name ";
+                $sql2 .= "FROM $table_term_relationships INNER JOIN ($table_term_taxonomy INNER JOIN $table_terms ON $table_term_taxonomy.term_id = $table_terms.term_id) ON $table_term_relationships.term_taxonomy_id = $table_term_taxonomy.term_taxonomy_id ";
+                $sql2 .= "WHERE ($table_term_relationships.object_id =" . $comment_post_ID.") AND ($table_term_taxonomy.taxonomy='category')";          
+        }
+        $categories = $xoops_db->get_results($sql);
+        foreach($categories as $categorie){
+                $cat_id = $categorie->cat_ID;
+                $cat_name = $categorie->cat_name;
+                $comment_tags = array( 'XPRESS_AUTH_NAME' =>$user_name,'XPRESS_BLOG_NAME' =>$blog_name,'XPRESS_CAT_TITLE' => $cat_name,'XPRESS_POST_TITLE' => $post_title , 'XPRESS_POST_URL' => $post_url ) ;
+                Notification_triggerEvent('category' , $cat_id , 'comment' , $comment_tags , false);
+
+        }
+}
+
+function do_PostNotifications($post_id,$not_event)
+{
+        global $xoops_config, $xoops_db;
+        xpress_debug();
+        
+
+
+         // $not_event:         newpost,editpost ; $commentID, $comment_post_ID)
+         
+        $xpress_prefix = get_wp_prefix() ;
+
+        $table_term_relationships = $xpress_prefix .'term_relationships';
+        $table_term_taxonomy = $xpress_prefix .'term_taxonomy';
+        $table_terms = $xpress_prefix .'terms';
+        $table_categories = $xpress_prefix .'categories';
+        $wp_post = $xpress_prefix .'posts';
+        $wp_options = $xpress_prefix .'options';
+        $wp_users  = $xpress_prefix .'users';
+        $wp_comments  = $xpress_prefix .'comments';
+
+        $post_title = get_the_title($post_id);
+        $post_url = get_permalink($post_id). '#comment';
+        $blog_name = get_bloginfo('name');
+
+        // query
+        $sql = "SELECT post_author FROM ".$wp_post." WHERE ID=$post_id ";
+        $post_author = $xoops_db->get_var($sql);
+
+        $sql = "SELECT display_name  FROM $wp_users WHERE ID ='$post_author'";
+        $user_name = $xoops_db->get_var($sql);
+
+        $posts_tags = array( 'XPRESS_AUTH_NAME' =>$user_name,'XPRESS_BLOG_NAME' =>$blog_name,'XPRESS_POST_TITLE' => $post_title , 'XPRESS_POST_URL' => $post_url ) ;
+
+        switch ($not_event) {
+                case 'newpost' :
+                        Notification_triggerEvent('global' , 0 , 'newpost' , $posts_tags , false);
+                        Notification_triggerEvent('author' , $post_author , 'newpost' , $posts_tags , false);
+
+                        // categorie notification
+                        if (get_xpress_db_version() < 6124){
+                                $sql2 = "SELECT c.cat_ID, c.cat_name FROM ".$table_categories." c, ".$table_post2cat." p2c WHERE c.cat_ID = p2c.category_id AND p2c.post_id=".$post_id;
+                        } else {
+                                $sql2  = "SELECT $table_term_relationships.object_id, $table_terms.term_id AS cat_ID, $table_terms.name AS cat_name ";
+                                $sql2 .= "FROM $table_term_relationships INNER JOIN ($table_term_taxonomy INNER JOIN $table_terms ON $table_term_taxonomy.term_id = $table_terms.term_id) ON $table_term_relationships.term_taxonomy_id = $table_term_taxonomy.term_taxonomy_id ";
+                                $sql2 .= "WHERE ($table_term_relationships.object_id =" . $post_id.") AND ($table_term_taxonomy.taxonomy='category')";          
+                        }
+                        $categories = $xoops_db->get_results($sql);
+                        foreach($categories as $categorie){
+                                $cat_id = $categorie->cat_ID;
+                                $cat_name = $categorie->cat_name;
+                                $posts_tags = array( 'XPRESS_AUTH_NAME' =>$user_name,'XPRESS_BLOG_NAME' =>$blog_name,'XPRESS_CAT_TITLE' => $cat_name,'XPRESS_POST_TITLE' => $post_title , 'XPRESS_POST_URL' => $post_url ) ;
+                                Notification_triggerEvent('category' , $cat_id , 'newpost' , $posts_tags , false);
+                        }
+                        break;
+                case 'editpost' :
+                        Notification_triggerEvent('post' , $post_id , 'editpost' , $posts_tags , false);
+                        break;
+                default :
+        }
+}               
+
 ?>

trunk/wp-content/plugins/xpressme/include/user_sync_xoops.php

@@ -43 +43 @@
         $db_groups_users_link = get_xoops_prefix() . 'groups_users_link';
         $db_group_role = get_wp_prefix() . 'group_role';
+        $db_groups = get_xoops_prefix() . 'groups';
         
         $sql  = "SELECT * ";
         $sql .= "FROM $db_groups_users_link ";
         $sql .= "LEFT JOIN $db_group_role ON $db_groups_users_link.groupid = $db_group_role.groupid ";
+        $sql .= "LEFT JOIN $db_groups ON $db_groups_users_link.groupid = $db_groups.groupid ";
         $sql .= "WHERE  uid = $uid";
-
         $user_groups = $xoops_db->get_results($sql);
         $ans['capabillities'] = '';
@@ -54 +55 @@
         
         foreach($user_groups as $user_group){
+                if ($user_group->group_type == 'Admin'){
+                        $ans['capabillities'] = 'administrator';
+                        $ans['allway_update'] = 0;
+                        break;
+                }
                 $before_level = get_role_level($ans['capabillities']);
+                
                 $now_level = get_role_level($user_group->role);
                 if ($now_level > $before_level){
@@ -80 +87 @@
 function user_sync_to_wordpress($sync_uid = 0, &$message){
         global $xoops_db;
-        global $xoopsModule;
-
-        if( is_object($xoopsModule)) {
-                $db_xoops_users = get_xoops_prefix() . 'users';
-                $db_xpress_users = get_wp_prefix() . 'users';
-
-                $message = 'Do Sync';
-        
-                if ($sync_uid == 0) {
-                        $xu_sql  = "SELECT uid ,name ,uname ,pass ,email, url, user_regdate, user_aim, user_yim FROM $db_xoops_users";
+
+        $db_xoops_users = get_xoops_prefix() . 'users';
+        $db_xpress_users = get_wp_prefix() . 'users';
+
+        $message = 'Do Sync';
+
+        if ($sync_uid == 0) {
+                $xu_sql  = "SELECT uid ,name ,uname ,pass ,email, url, user_regdate, user_aim, user_yim FROM $db_xoops_users";
+        } else {
+                $xu_sql  = "SELECT uid ,name ,uname ,pass ,email, url, user_regdate, user_aim, user_yim FROM $db_xoops_users WHERE uid = $sync_uid";
+        }
+
+        $xoops_users = $xoops_db->get_results($xu_sql);
+        if (empty($xoops_users)){
+                $message .= '...ERR ('. $xu_sql . ')';
+                return false;
+        }
+
+        foreach($xoops_users as $xoops_user){
+                $role = get_xoops_group_role($xoops_user->uid);
+                $capabillities_name = $role['capabillities'];
+                $allway_update = $role['allway_update'];
+                if (empty($capabillities_name)){
+                                $message .= "...PASS '" . $xoops_user->uname ."'[uid=".$xoops_user->uid ."](not xpress user)";
+                        if ($sync_uid != 0){
+                                $message .= '...NOT XPRESS USER ' . $xoops_user->uname;
+                                return false;
+                        }
                 } else {
-                        $xu_sql  = "SELECT uid ,name ,uname ,pass ,email, url, user_regdate, user_aim, user_yim FROM $db_xoops_users WHERE uid = $sync_uid";
-                }
-
-                $xoops_users = $xoops_db->get_results($xu_sql);
-                if (empty($xoops_users)){
-                        $message .= '...ERR ('. $xu_sql . ')';
-                        return false;
-                }
-
-                foreach($xoops_users as $xoops_user){
-                        $role = get_xoops_group_role($xoops_user->uid);
-                        $capabillities_name = $role['capabillities'];
-                        $allway_update = $role['allway_update'];
-                        if (empty($capabillities_name)){
-                                        $message .= "...PASS '" . $xoops_user->uname ."'[uid=".$xoops_user->uid ."](not xpress user)";
-                                if ($sync_uid != 0){
-                                        $message .= '...NOT XPRESS USER ' . $xoops_user->uname;
-                                        return false;
+                        $user_regist_time = date('Y-m-d H:i:s' , $xoops_user->user_regdate);
+                        $user_status = 0;
+                        $user_display_name =empty($xoops_user->name) ? $xoops_user->uname :$xoops_user->name ;
+
+                        $is_update = false;
+                        
+                        $wp_user_id = get_wp_user_id($xoops_user->uname) ;
+                        if ($wp_user_id){
+                                $wu_sql  =      "UPDATE $db_xpress_users ";
+                                $wu_sql .=      'SET ';
+                                $wu_sql .=              "user_pass  = '$xoops_user->pass', ";
+                                $wu_sql .=              "user_email = '$xoops_user->email', ";
+                                $wu_sql .=              "user_url = '$xoops_user->url', ";
+                                $wu_sql .=              "user_nicename = '$xoops_user->uname', ";
+                                $wu_sql .=              "user_registered = '$user_regist_time', ";
+                                $wu_sql .=              "user_status = 0 ";
+                                $wu_sql .=      "WHERE (user_login = '$xoops_user->uname' )";
+
+                                $xoops_db->query($wu_sql);
+                                if ($allway_update){
+                                        $sycc_user = new WP_User($wp_user_id);
+                                        $sycc_user->set_role($capabillities_name);
+                                        $message .= '...UPDATE ' . $user_login_name . '(' . $capabillities_name . ')';
+
+                                } else {
+                                        $message .= '...UPDATE ' . $user_login_name . '(Level Not Change)';
                                 }
-                        } else {
-                                $user_regist_time = date('Y-m-d H:i:s' , $xoops_user->user_regdate);
-                                $user_status = 0;
-                                $user_display_name =empty($xoops_user->name) ? $xoops_user->uname :$xoops_user->name ;
-
-                                $is_update = false;
-                                
-                                $wp_user_id = get_wp_user_id($xoops_user->uname) ;
-                                if ($wp_user_id){
-                                        $wu_sql  =      "UPDATE $db_xpress_users ";
-                                        $wu_sql .=      'SET ';
-                                        $wu_sql .=              "user_pass  = '$xoops_user->pass', ";
-                                        $wu_sql .=              "user_email = '$xoops_user->email', ";
-                                        $wu_sql .=              "user_url = '$xoops_user->url', ";
-                                        $wu_sql .=              "user_nicename = '$xoops_user->uname', ";
-                                        $wu_sql .=              "user_registered = '$user_regist_time', ";
-                                        $wu_sql .=              "user_status = 0 ";
-                                        $wu_sql .=      "WHERE (user_login = '$xoops_user->uname' )";
-
-                                        $xoops_db->query($wu_sql);
-                                        if ($allway_update){
-                                                $sycc_user = new WP_User($wp_user_id);
-                                                $sycc_user->set_role($capabillities_name);
-                                                $message .= '...UPDATE ' . $user_login_name . '(' . $capabillities_name . ')';
-
-                                        } else {
-                                                $message .= '...UPDATE ' . $user_login_name . '(Level Not Change)';
-                                        }
-                                }else{
-                                        $wu_sql  =      "INSERT INTO $db_xpress_users ";
-                                        $wu_sql .=      "(user_login , user_pass ,user_email , user_url , user_nicename " ;
-                                        $wu_sql .=              " , user_registered , user_status , display_name) ";
-                                        $wu_sql .=      "VALUES ";
-                                        $wu_sql .=              "('$xoops_user->uname', '$xoops_user->pass', '$xoops_user->email', '$xoops_user->url', '$xoops_user->uname' ";
-                                        $wu_sql .=              " , '$user_regist_time', $user_status, '$user_display_name')";
-                                        $xoops_db->query($wu_sql);
+                        }else{
+                                $wu_sql  =      "INSERT INTO $db_xpress_users ";
+                                $wu_sql .=      "(user_login , user_pass ,user_email , user_url , user_nicename " ;
+                                $wu_sql .=              " , user_registered , user_status , display_name) ";
+                                $wu_sql .=      "VALUES ";
+                                $wu_sql .=              "('$xoops_user->uname', '$xoops_user->pass', '$xoops_user->email', '$xoops_user->url', '$xoops_user->uname' ";
+                                $wu_sql .=              " , '$user_regist_time', $user_status, '$user_display_name')";
+                                $xoops_db->query($wu_sql);
 //                                      $wp_user_id = get_wp_user_id($user_login_name) ;                                        
-                                        $wp_user_id = mysql_insert_id();
-                                        $sycc_user = new WP_User($wp_user_id);
-                                        $sycc_user->set_role($capabillities_name);                                              
-                                        $message .= '...INSERT ' . $user_login_name . '(' . $capabillities_name . ')';
-                                }
-                                
-                                $user_nickname =        empty($xoops_user->name) ? $xoops_user->uname :$xoops_user->name ;
-                                $user_rich_editing = 'true';
-                                $user_first_name =      $xoops_user->uname;
-                                $user_last_name =       '';
-                                $user_description = '';
-                                $user_jabber =          '';
-
-                                update_usermeta( $wp_user_id,'nickname',$user_nickname);
-                                update_usermeta( $wp_user_id,'first_name',$user_first_name);
-                                update_usermeta( $wp_user_id,'last_name',$user_last_name);
-                                update_usermeta( $wp_user_id,'description',$user_description);
-                                update_usermeta( $wp_user_id,'jabber',$user_jabber);
-                                update_usermeta( $wp_user_id,'aim',$xoops_user->user_aim);
-                                update_usermeta( $wp_user_id,'yim',$xoops_user->user_yim);
-                                if ($is_update === false ) {
-                                        update_usermeta( $wp_user_id,'rich_editing',$user_rich_editing);
-                                }                       
-                        }
-                }
-                $message .= "...END";
-                return true;
-        }
+                                $wp_user_id = mysql_insert_id();
+                                $sycc_user = new WP_User($wp_user_id);
+                                $sycc_user->set_role($capabillities_name);                                              
+                                $message .= '...INSERT ' . $user_login_name . '(' . $capabillities_name . ')';
+                        }
+                        
+                        $user_nickname =        empty($xoops_user->name) ? $xoops_user->uname :$xoops_user->name ;
+                        $user_rich_editing = 'true';
+                        $user_first_name =      $xoops_user->uname;
+                        $user_last_name =       '';
+                        $user_description = '';
+                        $user_jabber =          '';
+
+                        update_usermeta( $wp_user_id,'nickname',$user_nickname);
+                        update_usermeta( $wp_user_id,'first_name',$user_first_name);
+                        update_usermeta( $wp_user_id,'last_name',$user_last_name);
+                        update_usermeta( $wp_user_id,'description',$user_description);
+                        update_usermeta( $wp_user_id,'jabber',$user_jabber);
+                        update_usermeta( $wp_user_id,'aim',$xoops_user->user_aim);
+                        update_usermeta( $wp_user_id,'yim',$xoops_user->user_yim);
+                        if ($is_update === false ) {
+                                update_usermeta( $wp_user_id,'rich_editing',$user_rich_editing);
+                        }                       
+                }
+        }
+        $message .= "...END";
+        return true;
 }
 

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

@@ -10 +10 @@
 require_once('xpressme_class.php');
 
-require_once dirname( __FILE__ ).'/include/custom_functions.php' ;
+require_once dirname( __FILE__ ).'/include/custom_functions.php' ;              // XPressME functions for themes
+require_once dirname( __FILE__ ).'/include/xpress_common_functions.php' ;
 
 $xoops_db = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
@@ -55 +56 @@
 add_action('admin_footer', array(&$XPressME, 'displayDebugLog'));
 add_action('get_footer', array(&$XPressME, 'displayDebugLog'));
-
 ?>

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

@@ -120 +120 @@
                         $insert_sql .= "'" . $groupe->description . "' , ";
                         $insert_sql .= "'" . $groupe->group_type . "' , ";
-                        $insert_sql .= "'" . $role . "' , ";
-                        $insert_sql .= $login_all . ")";
+                        $insert_sql .= "'" . $role . "' , '";
+                        $insert_sql .= $login_all . "')";
                         $xoops_db->query($insert_sql);
                 }
@@ -331 +331 @@
         function xpress_upload_filter($uploads)
         {
+                global $xoops_config;
                 if ($this->is_use_xoops_upload_path){
-                        if (!defined("XOOPS_UPLOAD_PATH"))
-                                define("XOOPS_UPLOAD_PATH", XOOPS_ROOT_PATH."/uploads");
-                        if (!defined("XOOPS_UPLOAD_URL"))
-                                define("XOOPS_UPLOAD_URL", XOOPS_URL."/uploads");
-
                         $wordpress_dir = ABSPATH ;
-                        $xoops_dir = XOOPS_UPLOAD_PATH . '/';
+                        $xoops_dir = $xoops_config->xoops_upload_path . '/';
                         $wordpress_base_url = get_option( 'siteurl' );
-                        $xoops_upload_url = XOOPS_UPLOAD_URL;
+                        $xoops_upload_url = $xoops_config->xoops_upload_url;
                         
                         $uploads[path] =  str_replace ($wordpress_dir, $xoops_dir, $uploads[path]);
@@ -355 +351 @@
                 global $current_user;
 
+                if (!is_object($current_user)) return false;
                 if ($this->is_sql_debug && ($current_user->user_level >= 10))
                         return true;
@@ -377 +374 @@
                         $content .= '<meta http-equiv="content-language" content="'._LANGCODE.'" />' ;
                         $content .= '<title>XPressME SQL DEBUG</title>' ;
-                        $content .= '<link rel="stylesheet" type="text/css" media="all" href="'.getcss($GLOBALS['xoopsConfig']['theme_set']).'" />';
                         $content .= '</head><body>';
                         $content .= $GLOBALS['XPress_SQL_Query'];

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

@@ -1 +1 @@
 <?php
-if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
+//if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
 
 function recent_comments_block($options)
@@ -9 +9 @@
         $selected = array_slice($options,3); // get allowed cats
         $this_template = empty( $options[4] ) ? 'db:'.$mydirname.'_block_comments.html' : trim( $options[4] );
-        $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
-        
+//      $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+        $mydirpath = get_xpress_dir_path();
         $this_url = '/modules/'. $mydirname;
         $call_url = $_SERVER['REQUEST_URI'];

trunk/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php

@@ -1 +1 @@
 <?php
-if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
+//if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
 
 function recent_posts_content_block($options)
@@ -11 +11 @@
     $selected = array_slice($options,5); // get allowed cats
         $this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_block_content.html' : trim( $options[6] );
-        $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+//      $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+        $mydirpath = get_xpress_dir_path();
         
         $this_url = '/modules/'. $mydirname;

trunk/xoops_version.php

@@ -127 +127 @@
 $modversion['notification'] = array(
         'lookup_file' => 'include/notification.inc.php' ,
-        'lookup_func' => "{$mydirname}_notify_info" ,
+        'lookup_func' => "xpress_notify" ,
         'category' => array(
                 array(