From 1dff2a48632289cf7775adfa9410a849bd53216a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 9 Jan 2008 05:27:34 +0000
Subject: [PATCH] =?UTF-8?q?#369=20sapi=20type=EC=9D=B4=20cgi=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20PATH=5FINFO=20=ED=99=98=EA=B2=BD=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=EC=97=90=EC=84=9C=20=EA=B2=BD=EB=A1=9C=EB=A5=BC=20?=
 =?UTF-8?q?=EA=B5=AC=ED=95=98=EB=8F=84=EB=A1=9D=20=ED=95=A8.=20=EA=B7=B8?=
 =?UTF-8?q?=EB=A6=AC=EA=B3=A0=20index.php=20=ED=8C=8C=EC=9D=BC=EC=9D=84=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0=ED=95=A0=EB=95=8C=20preg=20=EC=A0=95?=
 =?UTF-8?q?=EA=B7=9C=ED=91=9C=ED=98=84=EC=8B=9D=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=8C=80=EC=86=8C=EB=AC=B8=EC=9E=90=20=EA=B5=AC=EB=B3=84?=
 =?UTF-8?q?=EC=97=86=EC=9D=B4=20=EC=A0=9C=EA=B1=B0=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@3514 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/context/Context.class.php        | 6 +-----
 classes/display/DisplayHandler.class.php | 2 +-
 config/func.inc.php                      | 7 +++++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index a91a673f6..d3079e119 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -609,11 +609,7 @@
          * @brief 요청이 들어온 URL에서 argument를 제거하여 return
          **/
         function getRequestUri() {
-            $hostname = $_SERVER['HTTP_HOST'];
-            //$port = $_SERVER['SERVER_PORT'];
-            //if($port!=80) $hostname .= ":{$port}";
-            $path = str_replace('index.php','',$_SERVER['SCRIPT_NAME']);
-            return sprintf("http://%s%s",$hostname,$path);
+            return sprintf("http://%s%s",$_SERVER['HTTP_HOST'], getScriptPath());
         }
 
         /**
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 201e6c50c..dd6ddfbc6 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -86,7 +86,7 @@
         function display($content) {
             $content .= $this->_debugOutput();
 
-            $path = str_replace('index.php','',$_SERVER['SCRIPT_NAME']);
+            $path = getScriptPath();
 
             // commons/modules/files/widgets/layouts/addons 로 시작되는 src나 href의 값을 절대경로로 변경
             $content = preg_replace('!(href|src)=("|\'){0,1}(commons|modules|widgets|layouts|addons|files)!is', '\\1=\\2'.$path.'\\3', $content);
diff --git a/config/func.inc.php b/config/func.inc.php
index e0100c5fa..f1f7d39dc 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -463,4 +463,11 @@
         return sprintf("%08lx%08lx", $nr, $nr2);
     }
 
+    /**
+     * 현재 요청받은 스크립트 경로를 return
+     **/
+    function getScriptPath() {
+        if(function_exists('php_sapi_name') && php_sapi_name()=='cgi') return preg_replace('/index.php/i','',$_SERVER['PATH_INFO']);
+        return preg_replace('/index.php/i','',$_SERVER['SCRIPT_NAME']);
+    }
 ?>