diff --git a/bbs/delete.php b/bbs/delete.php
index 3e75649cb..fe9f369be 100644
--- a/bbs/delete.php
+++ b/bbs/delete.php
@@ -1,11 +1,11 @@
 <?php
 include_once('./_common.php');
 
-if ($is_admin)
-{
-    if (!($token && get_session('ss_delete_token') == $token))
-        alert('토큰 에러로 삭제 불가합니다.');
-}
+$delete_token = get_session('ss_delete_token');
+set_session('ss_delete_token', '');
+
+if (!($token && $delete_token == $token))
+    alert('토큰 에러로 삭제 불가합니다.');
 
 //$wr = sql_fetch(" select * from $write_table where wr_id = '$wr_id' ");
 
diff --git a/bbs/delete_comment.php b/bbs/delete_comment.php
index 812c6f516..cd75e575c 100644
--- a/bbs/delete_comment.php
+++ b/bbs/delete_comment.php
@@ -2,11 +2,11 @@
 // 코멘트 삭제
 include_once('./_common.php');
 
-if ($is_admin)
-{
-    if (!($token && get_session("ss_delete_token") == $token))
-        alert('토큰 에러로 삭제 불가합니다.');
-}
+$delete_comment_token = get_session('ss_delete_comment_token');
+set_session('ss_delete_comment_token', '');
+
+if (!($token && $delete_comment_token == $token))
+    alert('토큰 에러로 삭제 불가합니다.');
 
 // 4.1
 @include_once($board_skin_path.'/delete_comment.head.skin.php');
diff --git a/bbs/password.php b/bbs/password.php
index ffd2a55b4..32d31259a 100644
--- a/bbs/password.php
+++ b/bbs/password.php
@@ -9,11 +9,13 @@ switch ($w) {
         $return_url = './board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id;
         break;
     case 'd' :
-        $action = './delete.php';
+        set_session('ss_delete_token', $token = uniqid(time()));
+        $action = './delete.php?token='.$token;
         $return_url = './board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id;
         break;
     case 'x' :
-        $action = './delete_comment.php';
+        set_session('ss_delete_comment_token', $token = uniqid(time()));
+        $action = './delete_comment.php?token='.$token;
         $row = sql_fetch(" select wr_parent from $write_table where wr_id = '$comment_id' ");
         $return_url = './board.php?bo_table='.$bo_table.'&amp;wr_id='.$row['wr_parent'];
         break;
diff --git a/bbs/view.php b/bbs/view.php
index e570a7763..1031da62c 100644
--- a/bbs/view.php
+++ b/bbs/view.php
@@ -72,12 +72,8 @@ $update_href = $delete_href = '';
 // 로그인중이고 자신의 글이라면 또는 관리자라면 비밀번호를 묻지 않고 바로 수정, 삭제 가능
 if (($member['mb_id'] && ($member['mb_id'] == $write['mb_id'])) || $is_admin) {
     $update_href = './write.php?w=u&amp;bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr;
-    $delete_href = './delete.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.urldecode($qstr);
-    if ($is_admin)
-    {
-        set_session("ss_delete_token", $token = uniqid(time()));
-        $delete_href ='./delete.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;token='.$token.'&amp;page='.$page.urldecode($qstr);
-    }
+    set_session('ss_delete_token', $token = uniqid(time()));
+    $delete_href ='./delete.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;token='.$token.'&amp;page='.$page.urldecode($qstr);
 }
 else if (!$write['mb_id']) { // 회원이 쓴 글이 아니라면
     $update_href = './password.php?w=u&amp;bo_table='.$bo_table.'&amp;wr_id='.$wr_id.'&amp;page='.$page.$qstr;
diff --git a/bbs/view_comment.php b/bbs/view_comment.php
index 6eb1c8cd4..c6e6614cc 100644
--- a/bbs/view_comment.php
+++ b/bbs/view_comment.php
@@ -9,11 +9,6 @@ if ($is_guest && $board['bo_comment_level'] < 2) {
 
 @include_once($board_skin_path.'/view_comment.head.skin.php');
 
-// 코멘트를 새창으로 여는 경우 세션값이 없으므로 생성한다.
-if ($is_admin && !$token) {
-    set_session("ss_delete_token", $token = uniqid(time()));
-}
-
 $list = array();
 
 $is_comment_write = false;
@@ -72,10 +67,13 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $list[$i]['is_del']  = false;
     if ($is_comment_write || $is_admin)
     {
+        $token = '';
+
         if ($member['mb_id'])
         {
             if ($row['mb_id'] == $member['mb_id'] || $is_admin)
             {
+                set_session('ss_delete_comment_token', $token = uniqid(time()));
                 $list[$i]['del_link']  = './delete_comment.php?bo_table='.$bo_table.'&amp;comment_id='.$row['wr_id'].'&amp;token='.$token.'&amp;page='.$page.$qstr;
                 $list[$i]['is_edit']   = true;
                 $list[$i]['is_del']    = true;
@@ -84,7 +82,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         else
         {
             if (!$row['mb_id']) {
-                $list[$i]['del_link'] = './password.php?w=x&amp;bo_table='.$bo_table.'&amp;comment_id='.$row['wr_id'].'&amp;page='.$page.$qstr;
+                $list[$i]['del_link'] = './password.php?w=x&amp;bo_table='.$bo_table.'&amp;comment_id='.$row['wr_id'].'&amp;token='.$token.'&amp;page='.$page.$qstr;
                 $list[$i]['is_del']   = true;
             }
         }
diff --git a/plugin/okname/hpcert.config.php b/plugin/okname/hpcert.config.php
index af36c47e8..06b54b4c7 100644
--- a/plugin/okname/hpcert.config.php
+++ b/plugin/okname/hpcert.config.php
@@ -33,6 +33,8 @@ else
     $clientDomain = $_SERVER['SERVER_NAME'];
 unset($p);
 
+$clientDomain = escapeshellarg($clientDomain);
+
 
 $rsv1 = '0';                                        // 예약 항목
 $rsv2 = '0';                                        // 예약 항목
@@ -78,5 +80,5 @@ if($config['cf_cert_use'] == 2) {
 // ########################################################################
 // # 리턴 URL 설정
 // ########################################################################
-$returnUrl = G5_OKNAME_URL.'/hpcert2.php';          // 본인인증 완료후 리턴될 URL (도메인 포함 full path)
+$returnUrl = escapeshellarg(G5_OKNAME_URL.'/hpcert2.php');          // 본인인증 완료후 리턴될 URL (도메인 포함 full path)
 ?>
\ No newline at end of file