From 273ecdc9a5ec46bc0d346d7241211fb660358ee3 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Mar 2013 17:24:52 +0900
Subject: [PATCH 1/7] =?UTF-8?q?ie10=EC=97=90=EC=84=9C=20po=5Fid=20?=
 =?UTF-8?q?=EA=B0=92=EC=9D=B4=20=EB=84=98=EC=96=B4=EA=B0=80=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/poll.php                  | 27 +++++++++++++++++++++++++++
 skin/poll/basic/poll.skin.php |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 bbs/poll.php

diff --git a/bbs/poll.php b/bbs/poll.php
new file mode 100644
index 000000000..176497776
--- /dev/null
+++ b/bbs/poll.php
@@ -0,0 +1,27 @@
+<?
+include_once('./_common.php');
+
+$field = '';
+
+foreach($_POST as $key=>$value)
+{
+    $field .= '<input type="hidden" name="'.$key.'" value="'.$value.'"/>'."\n";
+}
+
+$g4['title'] = '투표하기';
+include_once(G4_PATH.'/head.sub.php');
+?>
+
+<form id="fpoll" name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" method="post">
+<? echo $field; ?>
+</form>
+
+<script>
+$(function() {
+    $("#fpoll").submit();
+});
+</script>
+
+<?
+include_once(G4_PATH.'/tail.sub.php');
+?>
\ No newline at end of file
diff --git a/skin/poll/basic/poll.skin.php b/skin/poll/basic/poll.skin.php
index b1da218a4..924cdae26 100644
--- a/skin/poll/basic/poll.skin.php
+++ b/skin/poll/basic/poll.skin.php
@@ -44,7 +44,9 @@ function fpoll_submit(f)
         return false;
     }
 
-    win_poll(f.action);
+    var url = "<?=G4_BBS_URL?>/poll.php";
+    f.action = url;
+    win_poll(url);
     return true;
 }
 

From fa4c508a3cdb1cdf6b47e83f53c12a0476be43b4 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 22 Mar 2013 17:25:40 +0900
Subject: [PATCH 2/7] =?UTF-8?q?subject=5Fsort=5Flink()=20=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20$query=5Fstring=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index 7d0e739ba..6b571e669 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -751,6 +751,7 @@ function subject_sort_link($col, $query_string='', $flag='asc')
     }
 
     $arr_query = array();
+    $arr_query[] = $query_string;
     $arr_query[] = $q1;
     $arr_query[] = $q2;
     $arr_query[] = 'sfl='.$sfl;

From 5411e64c10581d7746b52d55b707083c1695b0bd Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Mar 2013 17:32:37 +0900
Subject: [PATCH 3/7] =?UTF-8?q?ie10=EC=97=90=EC=84=9C=20po=5Fid=20?=
 =?UTF-8?q?=EA=B0=92=EC=9D=B4=20=EB=84=98=EC=96=B4=EA=B0=80=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/skin/poll/basic/poll.skin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/skin/poll/basic/poll.skin.php b/mobile/skin/poll/basic/poll.skin.php
index b1da218a4..924cdae26 100644
--- a/mobile/skin/poll/basic/poll.skin.php
+++ b/mobile/skin/poll/basic/poll.skin.php
@@ -44,7 +44,9 @@ function fpoll_submit(f)
         return false;
     }
 
-    win_poll(f.action);
+    var url = "<?=G4_BBS_URL?>/poll.php";
+    f.action = url;
+    win_poll(url);
     return true;
 }
 

From c18c09d0219dc9d9d7b3f520397a219132d99f22 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 22 Mar 2013 18:04:56 +0900
Subject: [PATCH 4/7] =?UTF-8?q?ie10=20=EC=97=90=EC=84=9C=20=EC=84=A4?=
 =?UTF-8?q?=EB=AC=B8=EC=A1=B0=EC=82=AC=20=EC=84=A0=ED=83=9D=EC=8B=9C=20FOR?=
 =?UTF-8?q?M=20=EC=A0=84=EC=86=A1=EC=A0=84=EC=97=90=20action=20=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=98=EB=8A=94=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=EB=A5=BC=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skin/poll/basic/poll.skin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/skin/poll/basic/poll.skin.php b/skin/poll/basic/poll.skin.php
index 924cdae26..6ec6feeee 100644
--- a/skin/poll/basic/poll.skin.php
+++ b/skin/poll/basic/poll.skin.php
@@ -2,7 +2,7 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>
 
-<form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="win_poll" method="post">
+<form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" method="post">
 <input type="hidden" name="po_id" value="<?=$po_id?>">
 <input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
 <section id="poll">
@@ -44,9 +44,9 @@ function fpoll_submit(f)
         return false;
     }
 
-    var url = "<?=G4_BBS_URL?>/poll.php";
-    f.action = url;
-    win_poll(url);
+    var new_win = window.open("about:blank", "win_poll", "width=616,height=500,scrollbars=yes,resizable=yes"); 
+    f.target = "win_poll"; 
+
     return true;
 }
 

From 7b48bb9687280fd114654edc512781034b68875e Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 22 Mar 2013 18:14:07 +0900
Subject: [PATCH 5/7] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=84=A4?=
 =?UTF-8?q?=EB=AC=B8=EC=A1=B0=EC=82=AC=20ie10=20=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=A0=95=EC=83=81=20=EC=9E=91=EB=8F=99=EB=90=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/skin/poll/basic/poll.skin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/skin/poll/basic/poll.skin.php b/mobile/skin/poll/basic/poll.skin.php
index 924cdae26..6ec6feeee 100644
--- a/mobile/skin/poll/basic/poll.skin.php
+++ b/mobile/skin/poll/basic/poll.skin.php
@@ -2,7 +2,7 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>
 
-<form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="win_poll" method="post">
+<form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" method="post">
 <input type="hidden" name="po_id" value="<?=$po_id?>">
 <input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
 <section id="poll">
@@ -44,9 +44,9 @@ function fpoll_submit(f)
         return false;
     }
 
-    var url = "<?=G4_BBS_URL?>/poll.php";
-    f.action = url;
-    win_poll(url);
+    var new_win = window.open("about:blank", "win_poll", "width=616,height=500,scrollbars=yes,resizable=yes"); 
+    f.target = "win_poll"; 
+
     return true;
 }
 

From 8e64aa1a82ff418fb8bef4c887c8da7d7a2f85bb Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 25 Mar 2013 09:45:19 +0900
Subject: [PATCH 6/7] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/poll.php | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 bbs/poll.php

diff --git a/bbs/poll.php b/bbs/poll.php
deleted file mode 100644
index 176497776..000000000
--- a/bbs/poll.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?
-include_once('./_common.php');
-
-$field = '';
-
-foreach($_POST as $key=>$value)
-{
-    $field .= '<input type="hidden" name="'.$key.'" value="'.$value.'"/>'."\n";
-}
-
-$g4['title'] = '투표하기';
-include_once(G4_PATH.'/head.sub.php');
-?>
-
-<form id="fpoll" name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" method="post">
-<? echo $field; ?>
-</form>
-
-<script>
-$(function() {
-    $("#fpoll").submit();
-});
-</script>
-
-<?
-include_once(G4_PATH.'/tail.sub.php');
-?>
\ No newline at end of file

From 51cca33444b8ffd73726118bab2e24da36baf4c1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 25 Mar 2013 11:55:22 +0900
Subject: [PATCH 7/7] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=EC=97=90?=
 =?UTF-8?q?=EC=84=A0=20=EC=8A=A4=ED=82=A8=EC=9D=98=20=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=9D=BC=20=EB=A1=9C=EB=93=9C=ED=95=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 head.sub.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/head.sub.php b/head.sub.php
index 2b1edc8d3..f802f1d26 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -45,18 +45,20 @@ header("Pragma: no-cache"); // HTTP/1.0
 <link rel="stylesheet" href="<?=G4_CSS_URL?>/<?=(G4_IS_MOBILE?'mobile':'default')?>.css?=<?=date("md")?>">
 <?}?>
 <? // 스킨의 style sheet 불러옴
-if(isset($board_skin_path))
-    echo get_skin_stylesheet($board_skin_path);
-if(isset($member_skin_path))
-    echo get_skin_stylesheet($member_skin_path);
-if(isset($new_skin_path))
-    echo get_skin_stylesheet($new_skin_path);
-if(isset($search_skin_path))
-    echo get_skin_stylesheet($search_skin_path);
-if(isset($connect_skin_path))
-    echo get_skin_stylesheet($connect_skin_path);
-if(isset($poll_skin_path))
-    echo get_skin_stylesheet($poll_skin_path);
+if (!defined('G4_IS_ADMIN')) {
+    if(isset($board_skin_path))
+        echo get_skin_stylesheet($board_skin_path);
+    if(isset($member_skin_path))
+        echo get_skin_stylesheet($member_skin_path);
+    if(isset($new_skin_path))
+        echo get_skin_stylesheet($new_skin_path);
+    if(isset($search_skin_path))
+        echo get_skin_stylesheet($search_skin_path);
+    if(isset($connect_skin_path))
+        echo get_skin_stylesheet($connect_skin_path);
+    if(isset($poll_skin_path))
+        echo get_skin_stylesheet($poll_skin_path);
+}
 ?>
 <!--[if lte IE 8]>
 <script src="<?=G4_JS_URL?>/html5.js"></script>