From 4a60415cab27650e155e272ec5cf8aa3b33d8bd3 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 19 Apr 2007 09:45:14 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1248
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 classes/module/ModuleHandler.class.php     | 13 +++++++------
 common/js/tree_menu.js                     |  4 +---
 modules/blog/blog.controller.php           |  2 +-
 modules/blog/blog.view.php                 | 11 ++++++++---
 modules/blog/skins/default/write_form.html |  2 +-
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 66114bb1f..a12343bc3 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -177,12 +177,13 @@
             }
 
             // 현재 페이지의 정보를 $zbxe_url이라는 변수로 등록 (common/tpl/common_header.tpl에서 javascript 변수로 설정함)
-            //if($_REQUEST['mid']) $zbxe_url = sprintf('mid=%s',$_REQUEST['mid']);
-            if($this->mid) $zbxe_url = sprintf('mid=%s',$this->mid);
-            elseif($_REQUEST['module']) $zbxe_url = sprintf('module=%s',$_REQUEST['module']);
-            elseif($_REQUEST['document_srl']) $zbxe_url = sprintf('mid=%s', $this->mid);
-            else $zbxe_url = Context::getRequestUri();
-            Context::set('zbxe_url', $zbxe_url);
+            if(!Context::get('zbxe_url')) {
+                if($this->mid) $zbxe_url = sprintf('mid=%s',$this->mid);
+                elseif($_REQUEST['module']) $zbxe_url = sprintf('module=%s',$_REQUEST['module']);
+                elseif($_REQUEST['document_srl']) $zbxe_url = sprintf('mid=%s', $this->mid);
+                else $zbxe_url = Context::getRequestUri();
+                Context::set('zbxe_url', $zbxe_url);
+            }
 
             // 해당 모듈에 layout_srl이 있는지 확인
             if($oModule->module_info->layout_srl && !$oModule->getLayoutFile()) {
diff --git a/common/js/tree_menu.js b/common/js/tree_menu.js
index 42c6ff147..93932982c 100644
--- a/common/js/tree_menu.js
+++ b/common/js/tree_menu.js
@@ -398,9 +398,7 @@ function moveTreeMenu(menu_id, node) {
     // url이 있으면 url을 분석한다 (제로보드 특화된 부분. url이 http나 ftp등으로 시작하면 그냥 해당 url 열기)
     if(url) {
         // http, ftp등의 연결이 아닌 경우 제로보드용으로 처리
-        if(url.indexOf('://')==-1 && url.indexOf('.')==-1) {
-            url = "./?"+url;
-        }
+        if(url.indexOf('://')==-1) url = "./?"+url;
 
         // open_window에 따라서 처리
         if(open_window != "Y") location.href=url;
diff --git a/modules/blog/blog.controller.php b/modules/blog/blog.controller.php
index 8c5dafa72..65eca81e0 100644
--- a/modules/blog/blog.controller.php
+++ b/modules/blog/blog.controller.php
@@ -581,7 +581,7 @@
                         $category_srl,
                         $group_check_code,
                         $name,
-                        sprintf('./?mid=%s&amp;category=%d', $this->module_info->mid, $category_srl),
+                        sprintf('mid=%s&amp;category=%d', $this->module_info->mid, $category_srl),
                         $expand
                 );
                 
diff --git a/modules/blog/blog.view.php b/modules/blog/blog.view.php
index 51678d53f..8ee035470 100644
--- a/modules/blog/blog.view.php
+++ b/modules/blog/blog.view.php
@@ -94,6 +94,13 @@
                 foreach($category_list as $key => $val) {
                     $this->category_list[$val->category_srl] = $val;
                 }
+                Context::set('category_list', $this->category_list);
+            }
+
+            $category_srl = Context::get('category');
+            if($this->category_list[$category_srl]) {
+                $this->category_srl = $category_srl;
+                Context::set('zbxe_url', sprintf("mid=%s&category=%d", $this->module_info->mid, $this->category_srl));
             }
 
             Context::set('module_info',$this->module_info);
@@ -154,9 +161,7 @@
             // 검색 옵션
             $args->search_target = Context::get('search_target'); ///< 검색 대상 (title, contents...)
             $args->search_keyword = Context::get('search_keyword'); ///< 검색어
-
-            $category_srl = Context::get('category');
-            if($this->category_list[$category_srl]) $args->category_srl = $category_srl;
+            $args->category_srl = $this->category_srl;
 
             $args->sort_index = 'list_order'; ///< 소팅 값
 
diff --git a/modules/blog/skins/default/write_form.html b/modules/blog/skins/default/write_form.html
index 2a8f6d27e..9270f88ba 100644
--- a/modules/blog/skins/default/write_form.html
+++ b/modules/blog/skins/default/write_form.html
@@ -17,7 +17,7 @@
             <select name="category_srl" >
                 <option value="">{$lang->category}</option>
                 <!--@foreach($category_list as $val)-->
-                <option value="{$val->category_srl}" <!--@if($category==$val->category_srl||$val->category_srl==$document->category_srl)-->selected="true"<!--@end-->>{$val->title} <!--@if($val->document_count)-->({$val->document_count})<!--@end--></option>
+                <option value="{$val->category_srl}" <!--@if($category==$val->category_srl||$val->category_srl==$document->category_srl)-->selected="true"<!--@end-->>{$val->name}</option>
                 <!--@end-->
             </select>
         </td>