Changeset 475 for trunk

Timestamp:

Dec 3, 2009, 3:38:40 PM (15 years ago)

Author:

toemon

Message:

WordPressの一般設定の「ブログのアドレス (URL)」の自動修正が間違ったＵＲＬを登録するバグを修正 Fixes #262

File:

• trunk/xpressme_integration_kit/include/add_xpress_process.php (modified) (1 diff)

trunk/xpressme_integration_kit/include/add_xpress_process.php

@@ -14 +14 @@
                 $home = get_option('home');
                 $module_url = $xoops_config->module_url;
-                $guess_url = wp_guess_url();
-                $guess_url = preg_replace('/\/$/','',$guess_url);
-                
-                if($siteurl != $module_url) {
+                $module_name = $xoops_config->module_name;
+                $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+                $guess_url = preg_replace('|/' . $module_name . '/.*|i', '/' . $module_name, $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+
+                if(strcmp($siteurl,$module_url) !== 0) {
                         if (!@fclose(@fopen($siteurl . '/xoops_version.php', "r"))){
                                 update_option('siteurl' , $module_url);
                         }
                 }
-                
-                if($guess_url != $home) {
-                        if (!@fclose(@fopen($home . '/xoops_version.php', "r"))){
+
+                if(strcmp($guess_ur,$home) !== 0) {
+                        if (@fclose(@fopen($guess_url . '/xoops_version.php', "r"))){
                                 update_option('home' , $guess_url);
                         }