Index: /trunk/extras/for_wordpressme2011/ja_EUC/wp-config.php
===================================================================
--- /trunk/extras/for_wordpressme2011/ja_EUC/wp-config.php (revision 530)
+++ /trunk/extras/for_wordpressme2011/ja_EUC/wp-config.php (revision 531)
@@ -51,17 +51,4 @@
define('NONCE_KEY', 'put your unique phrase here');
-if ($xoops_config->is_wpmu){ //for WordPressMU
- define('VHOST', 'no');
- $base = $xoops_config->mu_path_current_site;
- define('DOMAIN_CURRENT_SITE', $xoops_config->mu_domain_current_site );
- define('PATH_CURRENT_SITE', $xoops_config->mu_path_current_site );
- define('SITE_ID_CURRENT_SITE', 1);
- define('BLOGID_CURRENT_SITE', '1' );
-
- define('AUTH_SALT', 'put your unique phrase here');
- define('LOGGED_IN_SALT', 'put your unique phrase here');
- define('SECURE_AUTH_SALT', 'put your unique phrase here');
-}
-
/**
* WordPress Database Table prefix.
Index: /trunk/extras/for_wordpressme2011/ja_UTF/wp-config.php
===================================================================
--- /trunk/extras/for_wordpressme2011/ja_UTF/wp-config.php (revision 530)
+++ /trunk/extras/for_wordpressme2011/ja_UTF/wp-config.php (revision 531)
@@ -50,17 +50,4 @@
define('NONCE_KEY', 'put your unique phrase here');
-if ($xoops_config->is_wpmu){ //for WordPressMU
- define('VHOST', 'no');
- $base = $xoops_config->mu_path_current_site;
- define('DOMAIN_CURRENT_SITE', $xoops_config->mu_domain_current_site );
- define('PATH_CURRENT_SITE', $xoops_config->mu_path_current_site );
- define('SITE_ID_CURRENT_SITE', 1);
- define('BLOGID_CURRENT_SITE', '1' );
-
- define('AUTH_SALT', 'put your unique phrase here');
- define('LOGGED_IN_SALT', 'put your unique phrase here');
- define('SECURE_AUTH_SALT', 'put your unique phrase here');
-}
-
/**
* WordPress Database Table prefix.
Index: /trunk/extras/xpress_i18n/en/xpressme_modules_root/wp-config.php
===================================================================
--- /trunk/extras/xpress_i18n/en/xpressme_modules_root/wp-config.php (revision 530)
+++ /trunk/extras/xpress_i18n/en/xpressme_modules_root/wp-config.php (revision 531)
@@ -50,17 +50,4 @@
define('NONCE_KEY', 'put your unique phrase here');
-if ($xoops_config->is_wpmu){ //for WordPressMU
- define('VHOST', 'no');
- $base = $xoops_config->mu_path_current_site;
- define('DOMAIN_CURRENT_SITE', $xoops_config->mu_domain_current_site );
- define('PATH_CURRENT_SITE', $xoops_config->mu_path_current_site );
- define('SITE_ID_CURRENT_SITE', 1);
- define('BLOGID_CURRENT_SITE', '1' );
-
- define('AUTH_SALT', 'put your unique phrase here');
- define('LOGGED_IN_SALT', 'put your unique phrase here');
- define('SECURE_AUTH_SALT', 'put your unique phrase here');
-}
-
/**
* WordPress Database Table prefix.
Index: /trunk/extras/xpress_i18n/portuguese-br/xpressme_modules_root/wp-config.php
===================================================================
--- /trunk/extras/xpress_i18n/portuguese-br/xpressme_modules_root/wp-config.php (revision 530)
+++ /trunk/extras/xpress_i18n/portuguese-br/xpressme_modules_root/wp-config.php (revision 531)
@@ -49,17 +49,4 @@
/**#@-*/
-if ($xoops_config->is_wpmu){ //para WordPressMU
- define('VHOST', 'no');
- $base = $xoops_config->mu_path_current_site;
- define('DOMAIN_CURRENT_SITE', $xoops_config->mu_domain_current_site );
- define('PATH_CURRENT_SITE', $xoops_config->mu_path_current_site );
- define('SITE_ID_CURRENT_SITE', 1);
- define('BLOGID_CURRENT_SITE', '1' );
-
- define('AUTH_SALT', 'coloque sua frase única aqui');
- define('LOGGED_IN_SALT', 'coloque sua frase única aqui');
- define('SECURE_AUTH_SALT', 'coloque sua frase única aqui');
-}
-
/**
* Prefixo da tabela do banco de dados do WordPress.
Index: /trunk/extras/xpress_i18n/template/xpressme_modules_root/wp-config.php
===================================================================
--- /trunk/extras/xpress_i18n/template/xpressme_modules_root/wp-config.php (revision 530)
+++ /trunk/extras/xpress_i18n/template/xpressme_modules_root/wp-config.php (revision 531)
@@ -50,17 +50,4 @@
define('NONCE_KEY', 'put your unique phrase here');
-if ($xoops_config->is_wpmu){ //for WordPressMU
- define('VHOST', 'no');
- $base = $xoops_config->mu_path_current_site;
- define('DOMAIN_CURRENT_SITE', $xoops_config->mu_domain_current_site );
- define('PATH_CURRENT_SITE', $xoops_config->mu_path_current_site );
- define('SITE_ID_CURRENT_SITE', 1);
- define('BLOGID_CURRENT_SITE', '1' );
-
- define('AUTH_SALT', 'put your unique phrase here');
- define('LOGGED_IN_SALT', 'put your unique phrase here');
- define('SECURE_AUTH_SALT', 'put your unique phrase here');
-}
-
/**
* WordPress Database Table prefix.
Index: /trunk/xpressme_integration_kit/class/config_from_xoops.class.php
===================================================================
--- /trunk/xpressme_integration_kit/class/config_from_xoops.class.php (revision 530)
+++ /trunk/xpressme_integration_kit/class/config_from_xoops.class.php (revision 531)
@@ -37,7 +37,4 @@
var $is_impress;
var $impress_db_config_file;
- var $is_wpmu;
- var $mu_domain_current_site;
- var $mu_path_current_site;
var $wp_db_version;
var $wp_version;
@@ -104,5 +101,4 @@
$this->set_module_version();
$this->set_wp_version();
- $this->set_mu_current_site();
$this->xpress_get_module_id();
$this->xoops_language = $this->xpress_get_xoops_config('language');
@@ -292,9 +288,4 @@
include dirname(dirname(__FILE__)) . '/wp-includes/version.php';
- if (empty($wpmu_version))
- $this->is_wpmu = false;
- else
- $this->is_wpmu = true;
-
$this->wp_db_version = $wp_db_version;
@@ -309,16 +300,4 @@
}
- function set_mu_current_site(){
- $pattern = 'http:\/\/([^\/]*).*';
- if (preg_match('/' . $pattern . '/' ,$this->xoops_url,$matchs)){
- $this->mu_domain_current_site = $matchs[1];
- }
-
- $pattern = 'http:\/\/[^\/]*(\/.*)';
- if (preg_match('/' . $pattern . '/' ,$this->module_url,$matchs)){
- $this->mu_path_current_site = $matchs[1] . '/';
- }
- }
-
function xpress_get_xoops_config($config_name = '',$mid = 0){
$ret = '';
Index: /trunk/xpressme_integration_kit/include/oninstall.php
===================================================================
--- /trunk/xpressme_integration_kit/include/oninstall.php (revision 530)
+++ /trunk/xpressme_integration_kit/include/oninstall.php (revision 531)
@@ -167,9 +167,5 @@
if ( !$user_id ) {
$random_password = 'admin';
- if (!$xoops_config->is_wpmu){
- $user_id = wp_create_user($user_name, $random_password, $email);
- } else {
- $user_id = wpmu_create_user($user_name, $random_password, $email);
- }
+ $user_id = wp_create_user($user_name, $random_password, $email);
} else {
$random_password = __('User already exists. Password inherited.');
@@ -186,54 +182,39 @@
// Set Default data
- if (!$xoops_config->is_wpmu){ // for WordPress
- // make WordPress Default data
- if (function_exists('wp_install_defaults')){
- wp_install_defaults($user_id);
- } else {
- wp_install_old_defaults($user_id);
- }
-
- $ret[] = 'The first sample post & comment was written.
';
-
- // Rewrite Option for Xpress
- if (WPLANG == 'ja_EUC') {
- $setup_charset = 'EUC-JP';
- } elseif(WPLANG == 'ja_SJIS') {
- $setup_charset = 'Shift_JIS';
- } else {
- $setup_charset = 'UTF-8';
- }
- update_option("blog_charset", $setup_charset);
-
- update_option('blogname', $site_name );
- update_option('blogdescription', 'WordPress for XOOPS');
- update_option("admin_email", $GLOBALS["xoopsConfig"]['adminmail']);
- update_option("ping_sites", "http://rpc.pingomatic.com/\nhttp://ping.xoopsforge.com/");
- update_option("home", $site_url);
- update_option("siteurl", $site_url);
- update_option("what_to_show", "posts");
- update_option('default_pingback_flag', 0);
- $ret[] = 'The initial data was written in the data base of wordpress.
';
+ // make WordPress Default data
+ if (function_exists('wp_install_defaults')){
+ wp_install_defaults($user_id);
+ } else {
+ wp_install_old_defaults($user_id);
+ }
+
+ $ret[] = 'The first sample post & comment was written.
';
+
+ // Rewrite Option for Xpress
+ if (WPLANG == 'ja_EUC') {
+ $setup_charset = 'EUC-JP';
+ } elseif(WPLANG == 'ja_SJIS') {
+ $setup_charset = 'Shift_JIS';
+ } else {
+ $setup_charset = 'UTF-8';
+ }
+ update_option("blog_charset", $setup_charset);
+
+ update_option('blogname', $site_name );
+ update_option('blogdescription', 'WordPress for XOOPS');
+ update_option("admin_email", $GLOBALS["xoopsConfig"]['adminmail']);
+ update_option("ping_sites", "http://rpc.pingomatic.com/\nhttp://ping.xoopsforge.com/");
+ update_option("home", $site_url);
+ update_option("siteurl", $site_url);
+ update_option("what_to_show", "posts");
+ update_option('default_pingback_flag', 0);
+ $ret[] = 'The initial data was written in the data base of wordpress.
';
+
+ update_option("template", "xpress_default");
+ update_option("stylesheet", "xpress_default");
+ $ret[] = 'The default theme of wordpress was set to xpress_default.
';
+// update_option('uploads_use_yearmonth_folders', 1);
+ update_option('upload_path', 'wp-content/uploads');
- update_option("template", "xpress_default");
- update_option("stylesheet", "xpress_default");
- $ret[] = 'The default theme of wordpress was set to xpress_default.
';
- // update_option('uploads_use_yearmonth_folders', 1);
- update_option('upload_path', 'wp-content/uploads');
-
- } else { // for WordPress MU
- global $base,$current_site, $dirs, $wpmu_version;
-
- $base = $xoops_config->mu_path_current_site;
- $domain = $xoops_config->mu_domain_current_site;
- $admin_email = $GLOBALS["xoopsConfig"]['adminmail'];
- $admin_user_name = $user_name;
- $admin_user_id = $user_id;
- include_once($mydirpath . '/include/xpress_mu_function.php');
-
- do_htaccess( $xoops_config->module_path . '/htaccess.dist', $xoops_config->module_path . '/.htaccess', $base, '');
- xpress_mu_install_defaults($domain,$base,$site_name,$admin_user_id,$admin_user_name,$admin_email);
- }
-
// activate the xpressme plugin
require_once dirname( __FILE__ ).'/xpress_active_plugin.php';
Index: /trunk/xpressme_integration_kit/wp-config.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-config.php (revision 530)
+++ /trunk/xpressme_integration_kit/wp-config.php (revision 531)
@@ -50,17 +50,4 @@
define('NONCE_KEY', 'put your unique phrase here');
-if ($xoops_config->is_wpmu){ //for WordPressMU
- define('VHOST', 'no');
- $base = $xoops_config->mu_path_current_site;
- define('DOMAIN_CURRENT_SITE', $xoops_config->mu_domain_current_site );
- define('PATH_CURRENT_SITE', $xoops_config->mu_path_current_site );
- define('SITE_ID_CURRENT_SITE', 1);
- define('BLOGID_CURRENT_SITE', '1' );
-
- define('AUTH_SALT', 'put your unique phrase here');
- define('LOGGED_IN_SALT', 'put your unique phrase here');
- define('SECURE_AUTH_SALT', 'put your unique phrase here');
-}
-
/**
* WordPress Database Table prefix.
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (revision 530)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (revision 531)
@@ -41,15 +41,9 @@
}
-function xpress_is_wpmu() {
- global $xoops_config;
-
- return $xoops_config->is_wpmu;
-}
-
function xpress_is_multiblog() {
global $xoops_config;
if (defined('MULTISITE')) return MULTISITE;
- return $xoops_config->multiblog;
+ return false;
}
Index: /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 530)
+++ /trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 531)
@@ -213,10 +213,10 @@
echo '