Index: trunk/include/include_xoops_define.php
===================================================================
--- trunk/include/include_xoops_define.php	(revision 17)
+++ trunk/include/include_xoops_define.php	(revision 18)
@@ -41,4 +41,8 @@
 		include_once dirname( __FILE__ ).'/../../../mainfile.php';
 	}
+	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");
 } else {
 	// index page is load xoops
Index: trunk/include/xpress_action_filter.php
===================================================================
--- trunk/include/xpress_action_filter.php	(revision 17)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?php
-/**
- * XPress - WordPress for XOOPS
- *
- * Adding multi-author features to XPressME
- *
- * @copyright	The XPressME project
- * @license		http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author		toemon
- * @package		module::xpress
- */
- 
-
-function xpress_action_filter()
-{
-	add_filter("upload_dir","xpress_upload_filter",	1);		// Change wp-include/wp_upload_dir()
-}
-
-function xpress_upload_filter($uploads)
-{
-	if ($is_xoops_upload_dir){
-		$wordpress_dir = ABSPATH ;
-		$xoops_dir = XOOPS_UPLOAD_PATH . '/';
-		$wordpress_base_url = get_option( 'siteurl' );
-		$xoops_upload_url = XOOPS_UPLOAD_URL;
-		
-		$uploads[path] =  str_replace ($wordpress_dir, $xoops_dir, $uploads[path]);
-		$uploads[basedir] = str_replace ($wordpress_dir, $xoops_dir, $uploads[basedir]);
-		$uploads[url] = str_replace ($wordpress_base_url, $xoops_upload_url, $uploads[url]);
-		$uploads[baseurl] = str_replace ($wordpress_base_url, $xoops_upload_url, $uploads[baseurl]);
-	}
-	return $uploads;
-}
-?>
Index: trunk/wp-config.php
===================================================================
--- trunk/wp-config.php	(revision 17)
+++ trunk/wp-config.php	(revision 18)
@@ -38,9 +38,5 @@
 	define('ABSPATH', dirname(__FILE__).'/');
 
-require dirname( __FILE__ ).'/include/xpress_action_filter.php' ;
-
-
 require_once(ABSPATH.'wp-settings.php');
-
 if (is_root_index_page_call()){
 	// The return to wp-blog-header.php is stolen here
Index: trunk/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- trunk/wp-content/plugins/xpressme/xpressme.php	(revision 18)
+++ trunk/wp-content/plugins/xpressme/xpressme.php	(revision 18)
@@ -0,0 +1,27 @@
+<?php
+/*
+Plugin Name: Plugin for XPressME
+Plugin URI: http://www.toemon.com
+Description: Plugin for XPressME (custom function,filter,action)
+Author: toemon
+Version: 0.001
+Author URI: http://www.toemon.com
+*/
+
+add_filter("upload_dir","xpress_upload_filter",	1);		// Change wp-include/wp_upload_dir()
+function xpress_upload_filter($uploads)
+{
+	if (1){		// Select XPressME Configlation
+		$wordpress_dir = ABSPATH ;
+		$xoops_dir = XOOPS_UPLOAD_PATH . '/';
+		$wordpress_base_url = get_option( 'siteurl' );
+		$xoops_upload_url = XOOPS_UPLOAD_URL;
+		
+		$uploads[path] =  str_replace ($wordpress_dir, $xoops_dir, $uploads[path]);
+		$uploads[basedir] = str_replace ($wordpress_dir, $xoops_dir, $uploads[basedir]);
+		$uploads[url] = str_replace ($wordpress_base_url, $xoops_upload_url, $uploads[url]);
+		$uploads[baseurl] = str_replace ($wordpress_base_url, $xoops_upload_url, $uploads[baseurl]);
+	}
+	return $uploads;
+}
+?>
Index: trunk/xoops_version.php
===================================================================
--- trunk/xoops_version.php	(revision 17)
+++ trunk/xoops_version.php	(revision 18)
@@ -35,5 +35,5 @@
 $modversion['author'] = "toemon (http://www.toemon.com)";
 $modversion['license'] = "GPL see LICENSE";
-$modversion['official'] = 0 ;
+$modversion['official'] = r18 ;
 $modversion['image'] =  'module_icon.php' ;
 $modversion['dirname'] = $mydirname;