From beabe56505017ef8ffcc7e2057bb482c443ad6b7 Mon Sep 17 00:00:00 2001
From: ngleader <ngleader@gmail.com>
Date: Wed, 19 Nov 2008 08:41:45 +0000
Subject: [PATCH] bug fix

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4906 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/context/Context.class.php            | 6 ++++++
 modules/board/board.view.php                 | 1 +
 modules/board/skins/xe_board/js/board.js     | 2 +-
 modules/board/skins/xe_default/js/board.js   | 2 +-
 modules/board/skins/xe_guestbook/js/board.js | 2 +-
 modules/planet/planet.model.php              | 4 +++-
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 053fac7e3..fdcd2b7f0 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1224,5 +1224,11 @@
             return false;
         }
 
+        function getFixUrl($url){
+            if(eregi("(http|https):\/\/",$url)) return $url;
+            if(ereg("^/",$url)) return $url;
+            return dirname($_SERVER['PHP_SELF']) . "/" . $url;
+        }
+
     }
 ?>
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index 310b157ad..2f32cf7d0 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -166,6 +166,7 @@
             // 검색과 정렬을 위한 변수 설정
             $args->search_target = Context::get('search_target'); ///< 검색 대상 (title, contents...)
             $args->search_keyword = Context::get('search_keyword'); ///< 검색어
+
             if($this->module_info->use_category=='Y') $args->category_srl = Context::get('category'); ///< 카테고리 사용시 선택된 카테고리
 
             $args->sort_index = Context::get('sort_index');
diff --git a/modules/board/skins/xe_board/js/board.js b/modules/board/skins/xe_board/js/board.js
index 5b32f7d9c..0c33797dd 100644
--- a/modules/board/skins/xe_board/js/board.js
+++ b/modules/board/skins/xe_board/js/board.js
@@ -107,7 +107,7 @@ function doChangeCategory() {
     var sel_obj = xGetElementById("board_category");
     var sel_idx = sel_obj.selectedIndex;
     var category_srl = sel_obj.options[sel_idx].value;
-    location.href = current_url.setQuery('category',category_srl);
+    location.href = decodeURI(current_url).setQuery('category',category_srl);
 }
 
 /* 스크랩 */
diff --git a/modules/board/skins/xe_default/js/board.js b/modules/board/skins/xe_default/js/board.js
index 5b32f7d9c..0c33797dd 100644
--- a/modules/board/skins/xe_default/js/board.js
+++ b/modules/board/skins/xe_default/js/board.js
@@ -107,7 +107,7 @@ function doChangeCategory() {
     var sel_obj = xGetElementById("board_category");
     var sel_idx = sel_obj.selectedIndex;
     var category_srl = sel_obj.options[sel_idx].value;
-    location.href = current_url.setQuery('category',category_srl);
+    location.href = decodeURI(current_url).setQuery('category',category_srl);
 }
 
 /* 스크랩 */
diff --git a/modules/board/skins/xe_guestbook/js/board.js b/modules/board/skins/xe_guestbook/js/board.js
index 6b4d69475..751fa4948 100644
--- a/modules/board/skins/xe_guestbook/js/board.js
+++ b/modules/board/skins/xe_guestbook/js/board.js
@@ -107,7 +107,7 @@ function doChangeCategory() {
     var sel_obj = xGetElementById("board_category");
     var sel_idx = sel_obj.selectedIndex;
     var category_srl = sel_obj.options[sel_idx].value;
-    location.href = current_url.setQuery('category',category_srl);
+    location.href = decodeURI(current_url).setQuery('category',category_srl);
 }
 
 /* 스크랩 */
diff --git a/modules/planet/planet.model.php b/modules/planet/planet.model.php
index f11931d00..5aff5018c 100644
--- a/modules/planet/planet.model.php
+++ b/modules/planet/planet.model.php
@@ -29,6 +29,7 @@
                 $config->is_default = $dummy->is_default;
                 $config->module_srl = $dummy->module_srl;
                 $config->browser_title = $dummy->browser_title;
+                if($config->logo_image) $config->logo_image = context::getFixUrl($config->logo_image);
             }
             return $config;
         }
@@ -505,7 +506,8 @@
             if(!is_dir($path)) return sprintf("%s%s%s", Context::getRequestUri(), $this->module_path, 'tpl/images/blank_photo.gif');
             $filename = sprintf('%s/%d.jpg', $path, $module_srl);
             if(!file_exists($filename)) return sprintf("%s%s%s", Context::getRequestUri(), $this->module_path, 'tpl/images/blank_photo.gif');
-            return Context::getRequestUri().$filename."?rnd=".filemtime($filename);
+            $src = Context::getRequestUri().$filename."?rnd=".filemtime($filename);
+            return $src;
         }
 
         /**