From 45e6bcf26f2a2f997e9841d7b4f4efb68bd4f8f4 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@sir.co.kr>
Date: Tue, 4 Aug 2015 09:00:32 +0900
Subject: [PATCH] =?UTF-8?q?=ED=88=AC=ED=8F=AC=20=ED=85=8C=EB=A7=88=20?=
 =?UTF-8?q?=EC=8A=A4=ED=82=A8=20=EC=A0=81=EC=9A=A9=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/poll_result.php                           | 23 +++++++++++++++----
 lib/poll.lib.php                              |  2 +-
 .../mobile/skin/poll/basic/poll.skin.php      |  4 ++--
 .../skin/poll/basic/poll_result.skin.php      |  4 ++--
 theme/basic/skin/poll/basic/poll.skin.php     |  4 ++--
 .../skin/poll/basic/poll_result.skin.php      |  4 ++--
 6 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/bbs/poll_result.php b/bbs/poll_result.php
index 0866439a8..939758de6 100644
--- a/bbs/poll_result.php
+++ b/bbs/poll_result.php
@@ -85,12 +85,25 @@ for ($i=0; $row2=sql_fetch_array($result); $i++) {
     $list3[$i]['subject'] = cut_str($row2['po_subject'],60,"…");
 }
 
-if (G5_IS_MOBILE) {
-    $poll_skin_path = G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/poll/'.$skin_dir;
-    $poll_skin_url  = G5_MOBILE_URL.'/'.G5_SKIN_DIR.'/poll/'.$skin_dir;
+if(preg_match('#^theme/(.+)$#', $skin_dir, $match)) {
+    if (G5_IS_MOBILE) {
+        $poll_skin_path = G5_THEME_MOBILE_PATH.'/'.G5_SKIN_DIR.'/poll/'.$match[1];
+        if(!is_dir($poll_skin_path))
+            $poll_skin_path = G5_THEME_PATH.'/'.G5_SKIN_DIR.'/poll/'.$match[1];
+        $poll_skin_url = str_replace(G5_PATH, G5_URL, $poll_skin_path);
+    } else {
+        $poll_skin_path = G5_THEME_PATH.'/'.G5_SKIN_DIR.'/poll/'.$match[1];
+        $poll_skin_url = str_replace(G5_PATH, G5_URL, $poll_skin_path);
+    }
+    //$skin_dir = $match[1];
 } else {
-    $poll_skin_path = G5_SKIN_PATH.'/poll/'.$skin_dir;
-    $poll_skin_url  = G5_SKIN_URL.'/poll/'.$skin_dir;
+    if (G5_IS_MOBILE) {
+        $poll_skin_path = G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/poll/'.$skin_dir;
+        $poll_skin_url  = G5_MOBILE_URL.'/'.G5_SKIN_DIR.'/poll/'.$skin_dir;
+    } else {
+        $poll_skin_path = G5_SKIN_PATH.'/poll/'.$skin_dir;
+        $poll_skin_url  = G5_SKIN_URL.'/poll/'.$skin_dir;
+    }
 }
 
 include_once(G5_PATH.'/head.sub.php');
diff --git a/lib/poll.lib.php b/lib/poll.lib.php
index f45693c8d..3ffa1d770 100644
--- a/lib/poll.lib.php
+++ b/lib/poll.lib.php
@@ -25,7 +25,7 @@ function poll($skin_dir='basic', $po_id=false)
             $poll_skin_path = G5_THEME_PATH.'/'.G5_SKIN_DIR.'/poll/'.$match[1];
             $poll_skin_url = str_replace(G5_PATH, G5_URL, $poll_skin_path);
         }
-        $skin_dir = $match[1];
+        //$skin_dir = $match[1];
     } else {
         if (G5_IS_MOBILE) {
             $poll_skin_path = G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/poll/'.$skin_dir;
diff --git a/theme/basic/mobile/skin/poll/basic/poll.skin.php b/theme/basic/mobile/skin/poll/basic/poll.skin.php
index 3585bbf6a..2dbdc1033 100644
--- a/theme/basic/mobile/skin/poll/basic/poll.skin.php
+++ b/theme/basic/mobile/skin/poll/basic/poll.skin.php
@@ -7,7 +7,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$poll_skin_url.'/style.css">', 0)
 
 <form name="fpoll" action="<?php echo G5_BBS_URL ?>/poll_update.php" onsubmit="return fpoll_submit(this);" method="post">
 <input type="hidden" name="po_id" value="<?php echo $po_id ?>">
-<input type="hidden" name="skin_dir" value="<?php echo $skin_dir ?>">
+<input type="hidden" name="skin_dir" value="<?php echo urlencode($skin_dir); ?>">
 <aside id="poll">
     <header>
         <h2>설문조사</h2>
@@ -21,7 +21,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$poll_skin_url.'/style.css">', 0)
     </ul>
     <footer>
         <input type="submit" value="투표하기">
-        <a href="<?php echo G5_BBS_URL."/poll_result.php?po_id=$po_id&amp;skin_dir=$skin_dir" ?>" target="_blank" onclick="poll_result(this.href); return false;">결과보기</a>
+        <a href="<?php echo G5_BBS_URL."/poll_result.php?po_id=$po_id&amp;skin_dir=".urlencode($skin_dir); ?>" target="_blank" onclick="poll_result(this.href); return false;">결과보기</a>
     </footer>
 </aside>
 </form>
diff --git a/theme/basic/mobile/skin/poll/basic/poll_result.skin.php b/theme/basic/mobile/skin/poll/basic/poll_result.skin.php
index 451d92217..65c0eb70f 100644
--- a/theme/basic/mobile/skin/poll/basic/poll_result.skin.php
+++ b/theme/basic/mobile/skin/poll/basic/poll_result.skin.php
@@ -56,7 +56,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$poll_skin_url.'/style.css">', 0)
         <form name="fpollresult" method="post" action="./poll_etc_update.php" onsubmit="return fpollresult_submit(this);" autocomplete="off">
         <input type="hidden" name="po_id" value="<?php echo $po_id ?>">
         <input type="hidden" name="w" value="">
-        <input type="hidden" name="skin_dir" value="<?php echo $skin_dir ?>">
+        <input type="hidden" name="skin_dir" value="<?php echo urlencode($skin_dir); ?>">
         <?php if ($is_member) { ?><input type="hidden" name="pc_name" value="<?php echo cut_str($member['mb_nick'],255) ?>"><?php } ?>
         <h3><?php echo $po_etc ?></h3>
 
@@ -93,7 +93,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$poll_skin_url.'/style.css">', 0)
         <h2>다른 투표 결과 보기</h2>
         <ul>
             <?php for ($i=0; $i<count($list3); $i++) { ?>
-            <li><a href="./poll_result.php?po_id=<?php echo $list3[$i]['po_id'] ?>&amp;skin_dir=<?php echo $skin_dir ?>">[<?php echo $list3[$i]['date'] ?>] <?php echo $list3[$i]['subject'] ?></a></li>
+            <li><a href="./poll_result.php?po_id=<?php echo $list3[$i]['po_id'] ?>&amp;skin_dir=<?php echo urlencode($skin_dir); ?>">[<?php echo $list3[$i]['date'] ?>] <?php echo $list3[$i]['subject'] ?></a></li>
             <?php } ?>
         </ul>
     </aside>
diff --git a/theme/basic/skin/poll/basic/poll.skin.php b/theme/basic/skin/poll/basic/poll.skin.php
index 05d3260e1..e9bee3333 100644
--- a/theme/basic/skin/poll/basic/poll.skin.php
+++ b/theme/basic/skin/poll/basic/poll.skin.php
@@ -8,7 +8,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$poll_skin_url.'/style.css">', 0)
 <!-- 설문조사 시작 { -->
 <form name="fpoll" action="<?php echo G5_BBS_URL ?>/poll_update.php" onsubmit="return fpoll_submit(this);" method="post">
 <input type="hidden" name="po_id" value="<?php echo $po_id ?>">
-<input type="hidden" name="skin_dir" value="<?php echo $skin_dir ?>">
+<input type="hidden" name="skin_dir" value="<?php echo urlencode($skin_dir); ?>">
 <section id="poll">
     <header>
         <h2>설문조사</h2>
@@ -22,7 +22,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$poll_skin_url.'/style.css">', 0)
     </ul>
     <footer>
         <input type="submit" value="투표하기">
-        <a href="<?php echo G5_BBS_URL."/poll_result.php?po_id=$po_id&amp;skin_dir=$skin_dir" ?>" target="_blank" onclick="poll_result(this.href); return false;">결과보기</a>
+        <a href="<?php echo G5_BBS_URL."/poll_result.php?po_id=$po_id&amp;skin_dir=".urlencode($skin_dir); ?>" target="_blank" onclick="poll_result(this.href); return false;">결과보기</a>
     </footer>
 </section>
 </form>
diff --git a/theme/basic/skin/poll/basic/poll_result.skin.php b/theme/basic/skin/poll/basic/poll_result.skin.php
index 4741f5941..a19233b4c 100644
--- a/theme/basic/skin/poll/basic/poll_result.skin.php
+++ b/theme/basic/skin/poll/basic/poll_result.skin.php
@@ -60,7 +60,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$poll_skin_url.'/style.css">', 0)
         <form name="fpollresult" action="./poll_etc_update.php" onsubmit="return fpollresult_submit(this);" method="post" autocomplete="off">
         <input type="hidden" name="po_id" value="<?php echo $po_id ?>">
         <input type="hidden" name="w" value="">
-        <input type="hidden" name="skin_dir" value="<?php echo $skin_dir ?>">
+        <input type="hidden" name="skin_dir" value="<?php echo urlencode($skin_dir); ?>">
         <?php if ($is_member) {  ?><input type="hidden" name="pc_name" value="<?php echo cut_str($member['mb_nick'],255) ?>"><?php }  ?>
         <h3><?php echo $po_etc ?></h3>
 
@@ -102,7 +102,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$poll_skin_url.'/style.css">', 0)
         <h2>다른 투표 결과 보기</h2>
         <ul>
             <?php for ($i=0; $i<count($list3); $i++) {  ?>
-            <li><a href="./poll_result.php?po_id=<?php echo $list3[$i]['po_id'] ?>&amp;skin_dir=<?php echo $skin_dir ?>">[<?php echo $list3[$i]['date'] ?>] <?php echo $list3[$i]['subject'] ?></a></li>
+            <li><a href="./poll_result.php?po_id=<?php echo $list3[$i]['po_id'] ?>&amp;skin_dir=<?php echo urlencode($skin_dir); ?>">[<?php echo $list3[$i]['date'] ?>] <?php echo $list3[$i]['subject'] ?></a></li>
             <?php }  ?>
         </ul>
     </aside>