From b33a1d18932ae21ed3ce8f4bb8ab5ab57a9c35cc Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 8 Jun 2007 08:27:49 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1583
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 classes/context/Context.class.php       | 3 ++-
 common/js/common.js                     | 3 +++
 common/js/xml_handler.js                | 2 +-
 common/tpl/common_layout.html           | 1 +
 config/config.inc.php                   | 4 ++--
 plugins/styx_clock/styx_clock.class.php | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 8c29acdcc..75aa38687 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -111,6 +111,7 @@
             } else {
                 Context::set('current_url',$this->getRequestUri());
             }
+            Context::set('request_uri',Context::getRequestUri());
         }
 
         /**
@@ -503,7 +504,7 @@
                     if($target=='act.mid' && !ereg('([A-Z]+)',$get_vars['act'])) return sprintf('%s%s/%s',$this->path,$get_vars['mid'],$get_vars['act']);
                     elseif($target=='document_srl.mid')  return sprintf('%s%s/%s',$this->path,$get_vars['mid'],$get_vars['document_srl']);
                     elseif($target=='act.document_srl')  return sprintf('%s%s/%s',$this->path,$get_vars['document_srl'],$get_vars['act']);
-                    elseif($target=='mid.page')  return sprintf('%s%s/page/%s',$this->path,$get_vars['mid'],$get_vars['page']);
+                    //elseif($target=='mid.page')  return sprintf('%s%s/page/%s',$this->path,$get_vars['mid'],$get_vars['page']);
                 }
             }
 
diff --git a/common/js/common.js b/common/js/common.js
index 25bbf95d1..7520f60c3 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -110,6 +110,9 @@ function move_url(url, open_wnidow) {
     if(!url) return false;
     if(typeof(open_wnidow)=='undefined') open_wnidow = false;
     if(open_wnidow=='N') open_wnidow = false;
+
+    if(/^\./.test(url)) url = request_uri+url;
+
     if(open_wnidow) {
         winopen(url);
     } else {
diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js
index 464f43c20..d9b4e3f03 100644
--- a/common/js/xml_handler.js
+++ b/common/js/xml_handler.js
@@ -52,7 +52,7 @@ function xml_response_filter(oXml, callback_func, response_tags, callback_func_a
 function xml_handler() {
     this.obj_xmlHttp = null;
     this.method_name = null;
-    this.xml_path = "./index.php";
+    this.xml_path = request_uri+"index.php";
 
     this.params = new Array();
 
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index f0aabceb2..9cd8b47c6 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -20,6 +20,7 @@
     <!--@end--><script type="text/javascript">
         var zbxe_url = "{$zbxe_url}";
         var current_url = "{$current_url}";
+        var request_uri = "{$request_uri}";
     </script>
 
     {Context::getHtmlHeader()}
diff --git a/config/config.inc.php b/config/config.inc.php
index 51c948255..4933778f0 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -15,7 +15,7 @@
      * 0 : files/_debug_message.php 에 연결하여 출력
      * 1 : Response Method 가 XML 형식이 아닐 경우 브라우저에 최상단에 주석으로 표시
      **/
-    define('__DEBUG_OUTPUT__', 0);
+    define('__DEBUG_OUTPUT__', 1);
 
     /**
      * @brief 디버깅 메세지 출력
@@ -24,7 +24,7 @@
      * 2 : 1 + DB 쿼리
      * 3 : 모든 로그
      **/
-    define('__DEBUG__', 2);
+    define('__DEBUG__', 1);
 
     /**
      * @brief 간단하게 사용하기 위한 함수 정의한 파일 require
diff --git a/plugins/styx_clock/styx_clock.class.php b/plugins/styx_clock/styx_clock.class.php
index 7e39a3d7f..dbd38dd10 100644
--- a/plugins/styx_clock/styx_clock.class.php
+++ b/plugins/styx_clock/styx_clock.class.php
@@ -32,7 +32,7 @@
             if(!$width) $width = 200;
             $plugin_info->width = $width;
 
-            $plugin_info->src = sprintf("%s/%s/clock.swf?theme=%s&day=%s", $tpl_path, $colorset, $theme, $day);
+            $plugin_info->src = sprintf("%s%s/%s/clock.swf?theme=%s&day=%s", Context::getRequestUri(), $tpl_path, $colorset, $theme, $day);
 
             Context::set('plugin_info', $plugin_info);