Merge branch 'master' of github.com:gnuboard/g4s

bbs/filter.ajax.php

@@ -1,18 +1,11 @@
 <?
 include_once('./_common.php');
 
-header("Content-Type: text/html; charset={$g4['charset']}");
+header("Content-Type: text/html; charset=utf-8");
 
 $subject = strtolower($_POST['subject']);
 $content = strtolower(strip_tags($_POST['content']));
 
-//euc-kr 일 경우 $config['cf_filter'] 를 utf-8로 변환한다.
-if (strtolower($g4['charset']) == 'euc-kr') {
-    //$subject = convert_charset('utf-8', 'cp949', $subject);
-    //$content = convert_charset('utf-8', 'cp949', $content);
-    $config['cf_filter'] = convert_charset('cp949', 'utf-8', $config['cf_filter']);
-}
-
 //$filter = explode(",", strtolower(trim($config['cf_filter'])));
 // strtolower 에 의한 한글 변형으로 아래 코드로 대체 (곱슬최씨님이 알려 주셨습니다.)
 $filter = explode(",", trim($config['cf_filter']));
@@ -23,10 +16,7 @@ for ($i=0; $i<count($filter); $i++) {
     $subj = "";
     $pos = strpos($subject, $str);
     if ($pos !== false) {
-        if (strtolower($g4['charset']) == 'euc-kr')
+        $subj = $str;
-            $subj = convert_charset('utf-8', 'cp949', $str);//cp949 로 변환해서 반환
-        else
-            $subj = $str;
         break;
     }
 
@@ -34,10 +24,7 @@ for ($i=0; $i<count($filter); $i++) {
     $cont = "";
     $pos = strpos($content, $str);
     if ($pos !== false) {
-        if (strtolower($g4['charset']) == 'euc-kr')
+        $cont = $str;
-            $cont = convert_charset('utf-8', 'cp949', $str);//cp949 로 변환해서 반환
-        else
-            $cont = $str;
         break;
     }
 }

js/common.js

@@ -569,13 +569,25 @@ $(function(){
     });
 
     // 사이드뷰
+    var sv_hide = true;
     $('.sv').click(function() {
         $('.sv_wrap').hide();
-        $(this).find('.sv_wrap').css("display", "block");
+        $(this).find('.sv_wrap').show();
 
     });
 
+    $('.sv_wrap').hover(
+        function() {
+            sv_hide = false;
+        },
+        function() {
+            sv_hide = true;
+        }
+    );
+
     $(document).click(function() {
-    //    $('.sv_wrap').hide();
+        if(sv_hide) {
+            $('.sv_wrap').hide();
+        }
     });
 });

skin/board/neo/view_comment.skin.php

@@ -144,7 +144,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
         var subject = "";
         var content = "";
         $.ajax({
-            url: g4_bbs_path+"/filter.ajax.php",
+            url: g4_bbs_url+"/filter.ajax.php",
             type: "POST",
             data: {
                 "subject": "",

skin/board/neo/write.skin.php

@@ -198,7 +198,7 @@ function fwrite_submit(f)
     var subject = "";
     var content = "";
     $.ajax({
-        url: g4_bbs_path+"/filter.ajax.php",
+        url: g4_bbs_url+"/filter.ajax.php",
         type: "POST",
         data: {
             "subject": f.wr_subject.value,