Changeset 18767

Timestamp:

2010/08/02 10:43:51 (14 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18766

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
test/TestSuite.php 15114@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Ftest%2FTestSuite.php
test/class/util util-20100802013951-87mspb4qllp7hwwu-1
test/class/util/SC_Utils_Test.php sc_utils_test.php-20100802013957-750m2yralg9cowkd-1
test/class/util/Util_AllTests.php util_alltests.php-20100802013957-750m2yralg9cowkd-2

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100802014347-0nmgk10iml8gzru5

bzr:revno:

2250

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-parents:

data/class/util/SC_Utils.php ohkouchi@loop-az.jp-20100623032937-dhwktuevjyk0jv13
test/TestSuite.php ohkouchi@loop-az.jp-20100726081655-tqxqwy02bxqhswcu

bzr:timestamp:

2010-08-02 10:43:47.825999975 +0900

bzr:user-agent:

bzr2.1.2+bzr-svn1.0.2

svn:original-date:

2010-08-02T01:43:47.826000Z

Message:

• merged r18709
  • SC_Utils::searchInstallerPath() が相対パスの URL を返さないように修正(#348)
• SC_Utils::getRealURL() のテストケース追加

Location:

branches/version-2_5-dev

Files:

• data/class/util/SC_Utils.php (modified) (1 diff)
• test/TestSuite.php (modified) (2 diffs)
• test/class/util (added)
• test/class/util/SC_Utils_Test.php (added)
• test/class/util/Util_AllTests.php (added)

branches/version-2_5-dev/data/class/util/SC_Utils.php

@@ -105 +105 @@
     function searchInstallerPath($path) {
         $installer = 'install/index.php';
+
+        if (SC_Utils::sfIsHTTPS()) {
+            $proto = "https://";
+        } else {
+            $proto = "http://";
+        }
+        $host = $proto . $_SERVER['SERVER_NAME'];
         if ($path == '/') {
-            return $path . $installer;
+            return $host . $path . $installer;
         }
         if (substr($path, -1, 1) != '/') {
             $path .= $path . '/';
         }
-        if (SC_Utils::sfIsHTTPS()) {
-            $proto = "https://";
-        } else {
-            $proto = "http://";
-        }
-        $installer_url = $proto . $_SERVER['SERVER_NAME'] . $path . $installer;
-        $resources = fopen($installer_url, 'r');
+        $installer_url = $host . $path . $installer;
+        $resources = fopen(SC_Utils::getRealURL($installer_url), 'r');
         if ($resources === false) {
             $installer_url = SC_Utils::searchInstallerPath($path . '../');
         }
         return $installer_url;
+    }
+
+    /**
+     * 相対パスで記述された URL から絶対パスの URL を取得する.
+     *
+     * この関数は, http(s):// から始まる URL を解析し, 相対パスで記述されていた
+     * 場合, 絶対パスに変換して返す
+     *
+     * 例)
+     * http://www.example.jp/aaa/../index.php
+     * ↓
+     * http://www.example.jp/index.php
+     *
+     * @param string $url http(s):// から始まる URL
+     * @return string $url を絶対パスに変換した URL
+     */
+    function getRealURL($url) {
+        $parse = parse_url($url);
+        $tmp = split('/', $parse['path']);
+        $results = array();
+        foreach ($tmp as $v) {
+            if ($v == '' || $v == '.') {
+                // queit.
+            } elseif ($v == '..') {
+                array_pop($results);
+            } else {
+                array_push($results, $v);
+            }
+        }
+
+        $path = join('/', $results);
+        return $parse['scheme'] . '://' . $parse['host'] . '/' . $path;
     }
 

branches/version-2_5-dev/test/TestSuite.php

@@ -27 +27 @@
 require_once(realpath(dirname(__FILE__)) . "/class/db/DB_AllTests.php");
 require_once(realpath(dirname(__FILE__)) . "/class/helper/Helper_AllTests.php");
+require_once(realpath(dirname(__FILE__)) . "/class/util/Util_AllTests.php");
 
 /**
@@ -41 +42 @@
         $suite->addTest(DB_AllTests::suite());
         $suite->addTest(Helper_AllTests::suite());
+        $suite->addTest(Util_AllTests::suite());
         return $suite;
     }