Changeset 18530 for branches/version-2_4

Timestamp:

2010/02/02 12:14:45 (14 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100202024041-986jxcpp6l2zrxje

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20100202031442-uhsr1elsbcg0adn4

bzr:revno:

1900

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

bzr:text-parents:

data/class/util/SC_Utils.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18274

bzr:timestamp:

2010-02-02 12:14:42.119999886 +0900

bzr:user-agent:

bzr2.0.4+bzr-svn1.0.1

svn:original-date:

2010-02-02T03:14:42.120000Z

Message:

merged r18482, r18492

• インストール前に /admin/ にアクセスすると /admin/install/ にリダイレクトされる(348)

File:

• branches/version-2_4/data/class/util/SC_Utils.php (modified) (1 diff)

branches/version-2_4/data/class/util/SC_Utils.php

@@ -83 +83 @@
             if( !ereg('/install/', $_SERVER['PHP_SELF']) ) {
                 // インストールページに遷移させる
-                header('Location: ./install/');
+
+                $script_filename = $_SERVER['SCRIPT_FILENAME'];
+                list($real_root, $tmp) = explode('/html/', $script_filename);
+                $real_root = $real_root . '/html/';
+                $script_name = $_SERVER['SCRIPT_NAME'];
+                $url_dir = rtrim($script_name, basename($script_name));
+
+                if ($dh = opendir($real_root)) {
+                    $arrDir = array();
+                    while ($entry = readdir($dh)) {
+                        if (is_dir($real_root.$entry) && !in_array($entry, array('.', '..', '.svn', 'install'))) {
+                            $url_dir = rtrim($url_dir, $entry.'/');
+                        }
+                    }
+                    closedir($dh);
+                }
+
+                $location = $url_dir . '/install/';
+                header('Location: ' . $location);
                 exit;
             }