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

adm/shop_admin/codedupcheck.php

@@ -1,30 +1,24 @@
 <?
 include_once("./_common.php");
-include_once("$g4[path]/head.sub.php");
 
+$name = "";
 if ($it_id)
 {
-    $sql = " select it_name from $g4[yc4_item_table] where it_id = '$it_id' ";
+    $sql = " select it_name from {$g4['yc4_item_table']} where it_id = '$it_id' ";
     $row = sql_fetch($sql);
     $code = $it_id;
-    $name = $row[it_name];
+    $name = $row['it_name'];
 }
 else if ($ca_id)
 {
-    $sql = " select ca_name from $g4[yc4_category_table] where ca_id = '$ca_id' ";
+    $sql = " select ca_name from {$g4['yc4_category_table']} where ca_id = '$ca_id' ";
     $row = sql_fetch($sql);
     $code = $ca_id;
-    $name = $row[ca_name];
+    $name = $row['ca_name'];
 }
+
+echo $name;
+
+// json 포맷으로 데이터 전달
+//echo '{ "name": "' . $name . '", "code": "' . $code . '" }';
 ?>
-<SCRIPT LANGUAGE="JavaScript">
-<!--
-	<? if ($name) { ?>
-	    alert("코드 '<?=$code?>' 는 '<?=$name?>' (으)로 이미 등록되어 있으므로\n\n사용하실 수 없습니다.");
-	<? } else { ?>
-        alert("'<?=$code?>' 은(는) 등록된 코드가 없으므로 사용하실 수 있습니다.");
-        parent.document.<?=$frmname?>.codedup.value = '';
-	<? } ?>
-	window.close();
-//-->
-</SCRIPT>

adm/shop_admin/contentform.php

@@ -1,7 +1,7 @@
 <?
 $sub_menu = "400700";
+define('G4_EDITOR', 1);
 include_once("./_common.php");
-include_once ("$g4[path]/lib/cheditor4.lib.php");
 
 auth_check($auth[$sub_menu], "w");
 
@@ -34,9 +34,6 @@ include_once ("$g4[admin_path]/admin.head.php");
 
 <?=subtitle($html_title)?><p>
 
-<script src="<?=$g4[cheditor4_path]?>/cheditor.js"></script>
-<?=cheditor1('co_content', '100%', '350');?>
-
 <table cellpadding=0 cellspacing=0 width=100%>
 <form name=frmcontentform method=post action="./contentformupdate.php" enctype="MULTIPART/FORM-DATA" onsubmit="return frmcontentform_check(this);">
 <input type=hidden name=w value='<? echo $w?>'>
@@ -59,7 +56,7 @@ include_once ("$g4[admin_path]/admin.head.php");
 <input type=hidden name=co_html value=1>
 <tr>
     <td>내용</td>
-    <td style='padding-top:5px; padding-bottom:5px;'><?=cheditor2('co_content', $co[co_content]);?></td>
+    <td style='padding-top:5px; padding-bottom:5px;'><?=editor_html('co_content', $co[co_content]);?></td>
 </tr>
 <tr class=ht>
     <td>상단 파일 경로</td>
@@ -115,7 +112,7 @@ function frmcontentform_check(f)
     errmsg = "";
     errfld = "";
 
-    <?=cheditor3('co_content');?>
+    <?=get_editor_js('co_content');?>
 
     check_field(f.co_id, "ID를 입력하세요.");
     check_field(f.co_subject, "제목을 입력하세요.");

adm/shop_admin/faqform.php

@@ -1,7 +1,7 @@
 <?
 $sub_menu = "400710";
+define('G4_EDITOR', 1);
 include_once("./_common.php");
-include_once ("$g4[path]/lib/cheditor4.lib.php");
 
 auth_check($auth[$sub_menu], "w");
 
@@ -33,10 +33,6 @@ include_once ("$g4[admin_path]/admin.head.php");
 
 <?=subtitle($html_title)?><p>
 
-<script src="<?=$g4[cheditor4_path]?>/cheditor.js"></script>
-<?=cheditor1('fa_subject', '100%', '150');?>
-<?=cheditor1('fa_content', '100%', '300');?>
-
 <form name=frmfaqform method=post action='./faqformupdate.php' onsubmit="return frmfaqform_check(this);" style="margin:0px;">
 <input type=hidden name=w     value='<? echo $w ?>'>
 <input type=hidden name=fm_id value='<? echo $fm_id ?>'>
@@ -60,13 +56,13 @@ include_once ("$g4[admin_path]/admin.head.php");
         ?>
     </td>
     <td style='padding-top:5px; padding-bottom:5px;'>
-        <?=cheditor2('fa_subject', $fa[fa_subject]);?>
+        <?=editor_html('fa_subject', $fa[fa_subject]);?>
     </td>
 </tr>
 <tr>
     <td> 답변</td>
     <td style='padding-top:5px; padding-bottom:5px;'>
-        <?=cheditor2('fa_content', $fa[fa_content]);?>
+        <?=editor_html('fa_content', $fa[fa_content]);?>
     </td>
 </tr>
 <tr><td colspan=2 height=1 bgcolor=CCCCCC><td></tr>
@@ -93,8 +89,8 @@ function frmfaqform_check(f)
         return false;
     }
 
-    <?=cheditor3('fa_subject');?>
+    <?=get_editor_js('fa_subject');?>
-    <?=cheditor3('fa_content');?>
+    <?=get_editor_js('fa_content');?>
 
     return true;
 }

adm/shop_admin/faqmasterform.php

@@ -1,7 +1,7 @@
 <?
 $sub_menu = "400710";
+define('G4_EDITOR', 1);
 include_once("./_common.php");
-include_once ("$g4[path]/lib/cheditor4.lib.php");
 
 auth_check($auth[$sub_menu], "w");
 
@@ -26,10 +26,6 @@ include_once ("$g4[admin_path]/admin.head.php");
 
 <?=subtitle($html_title)?>
 
-<script src="<?=$g4[cheditor4_path]?>/cheditor.js"></script>
-<?=cheditor1('fm_head_html', '100%', '150');?>
-<?=cheditor1('fm_tail_html', '100%', '150');?>
-
 <form name=frmfaqmasterform method=post action="./faqmasterformupdate.php" onsubmit="return frmfaqmasterform_check(this);"enctype="MULTIPART/FORM-DATA" style="margin:0px;">
 <input type=hidden name=w     value='<? echo $w ?>'>
 <input type=hidden name=fm_id value='<? echo $fm_id ?>'>
@@ -82,11 +78,11 @@ include_once ("$g4[admin_path]/admin.head.php");
 
 <tr>
     <td>상단 내용</td>
-    <td style='padding-top:5px; padding-bottom:5px;'><?=cheditor2('fm_head_html', $fm[fm_head_html]);?></td>
+    <td style='padding-top:5px; padding-bottom:5px;'><?=editor_html('fm_head_html', $fm[fm_head_html]);?></td>
 </tr>
 <tr>
     <td>하단 내용</td>
-    <td style='padding-top:5px; padding-bottom:5px;'><?=cheditor2('fm_tail_html', $fm[fm_tail_html]);?></td>
+    <td style='padding-top:5px; padding-bottom:5px;'><?=editor_html('fm_tail_html', $fm[fm_tail_html]);?></td>
 </tr>
 <tr><td colspan=2 height=1 bgcolor=CCCCCC></td></tr>
 </table>
@@ -99,8 +95,8 @@ include_once ("$g4[admin_path]/admin.head.php");
 <script language="javascript">
 function frmfaqmasterform_check(f)
 {
-    <?=cheditor3('fm_head_html');?>
+    <?=get_editor_js('fm_head_html');?>
-    <?=cheditor3('fm_tail_html');?>
+    <?=get_editor_js('fm_tail_html');?>
 }
 
 document.frmfaqmasterform.fm_subject.focus();

adm/shop_admin/itemeventform.php

@@ -1,7 +1,7 @@
 <?
 $sub_menu = "400630";
+define('G4_EDITOR', 1);
 include_once("./_common.php");
-include_once ("$g4[path]/lib/cheditor4.lib.php");
 
 auth_check($auth[$sub_menu], "w");
 
@@ -37,10 +37,6 @@ include_once ("$g4[admin_path]/admin.head.php");
 
 <?=subtitle($html_title);?><p>
 
-<script src="<?=$g4[cheditor4_path]?>/cheditor.js"></script>
-<?=cheditor1('ev_head_html', '100%', '150');?>
-<?=cheditor1('ev_tail_html', '100%', '150');?>
-
 <form name=feventform method=post action="./itemeventformupdate.php" enctype="MULTIPART/FORM-DATA" style="margin:0px;" onsubmit="return feventform_check(this);">
 <input type=hidden name=w     value='<? echo $w ?>'>
 <input type=hidden name=ev_id value='<? echo $ev_id ?>'>
@@ -164,11 +160,11 @@ include_once ("$g4[admin_path]/admin.head.php");
 
 <tr>
     <td>상단 내용</td>
-    <td colspan=3 align=right style='padding-top:5px; padding-bottom:5px;'><?=cheditor2('ev_head_html', $ev[ev_head_html]);?></td>
+    <td colspan=3 align=right style='padding-top:5px; padding-bottom:5px;'><?=editor_html('ev_head_html', $ev[ev_head_html]);?></td>
 </tr>
 <tr>
     <td>하단 내용</td>
-    <td colspan=3 align=right style='padding-top:5px; padding-bottom:5px;'><?=cheditor2('ev_tail_html', $ev[ev_tail_html]);?></td>
+    <td colspan=3 align=right style='padding-top:5px; padding-bottom:5px;'><?=editor_html('ev_tail_html', $ev[ev_tail_html]);?></td>
 </tr>
 <tr><td colspan=4 height=1 bgcolor=#CCCCCC></td></tr>
 </table>
@@ -182,8 +178,8 @@ include_once ("$g4[admin_path]/admin.head.php");
 <script language="javascript">
 function feventform_check(f)
 {
-    <?=cheditor3('ev_head_html');?>
+    <?=get_editor_js('ev_head_html');?>
-    <?=cheditor3('ev_tail_html');?>
+    <?=get_editor_js('ev_tail_html');?>
 
     return true;
 }

adm/shop_admin/itemform.php

@@ -1,7 +1,7 @@
 <?
 $sub_menu = "400300";
+define('G4_EDITOR', 1);
 include_once("./_common.php");
-include_once ($g4['path'].'/lib/cheditor4.lib.php');
 
 auth_check($auth[$sub_menu], "w");
 
@@ -76,11 +76,6 @@ $g4[title] = $html_title;
 include_once ("$g4[admin_path]/admin.head.php");
 ?>
 
-<script src="<?=$g4[cheditor4_path]?>/cheditor.js"></script>
-<?=cheditor1('it_explan', '100%', '350');?>
-<?=cheditor1('it_head_html', '100%', '150');?>
-<?=cheditor1('it_tail_html', '100%', '150');?>
-
 <style type="text/css">
 <!--
 ul { margin: 0; padding: 0; list-style: none; }
@@ -312,7 +307,7 @@ ul { margin: 0; padding: 0; list-style: none; }
 <input type=hidden name=it_explan_html value=1>
 <tr>
     <td>상품설명</td>
-    <td colspan=3 style='padding-top:7px; padding-bottom:7px;'><?=cheditor2('it_explan', $it[it_explan]);?></td>
+    <td colspan=3 style='padding-top:7px; padding-bottom:7px;'><?=editor_html('it_explan', $it[it_explan]);?></td>
 </tr>
 <? if($default['de_send_cost_case'] == "개별배송") { ?>
 <tr class="ht">
@@ -792,11 +787,11 @@ ul { margin: 0; padding: 0; list-style: none; }
 
 <tr>
     <td>상품상단내용 <?=help("상품상세설명 페이지 상단에 출력하는 HTML 내용입니다.", -150);?></td>
-    <td colspan=3 align=right style='padding-top:7px; padding-bottom:7px;'><?=cheditor2('it_head_html', $it[it_head_html]);?></td>
+    <td colspan=3 align=right style='padding-top:7px; padding-bottom:7px;'><?=editor_html('it_head_html', $it[it_head_html]);?></td>
 </tr>
 <tr>
     <td>상품하단내용 <?=help("상품상세설명 페이지 상단에 출력하는 HTML 내용입니다.", -150);?></td>
-    <td colspan=3 align=right style='padding-top:7px; padding-bottom:7px;'><?=cheditor2('it_tail_html', $it[it_tail_html]);?></td>
+    <td colspan=3 align=right style='padding-top:7px; padding-bottom:7px;'><?=editor_html('it_tail_html', $it[it_tail_html]);?></td>
 </tr>
 
 <? if ($w == "u") { ?>
@@ -853,7 +848,21 @@ function codedupcheck(id)
         f.it_id.focus();
         return;
     }
-    window.open("./codedupcheck.php?it_id="+id+"&frmname=fitemform", "hiddenframe");
+
+    $.post(
+        "./codedupcheck.php",
+        { id: id },
+        function(data)
+        {
+            if(data) {
+                alert("코드 "+id+" 는 '"+data+"' (으)로 이미 등록되어 있으므로\n\n사용하실 수 없습니다.");
+                return false;
+            } else {
+                alert("'"+id+"' 은(는) 등록된 코드가 없으므로 사용하실 수 있습니다.");
+                f.codedup.value = "";
+            }
+        }
+    );
 }
 
 // 선택옵션창
@@ -918,9 +927,9 @@ function fitemformcheck(f)
         }
     }
 
-    <?=cheditor3('it_explan')."\n";?>
+    <?=get_editor_js('it_explan');?>
-    <?=cheditor3('it_head_html')."\n";?>
+    <?=get_editor_js('it_head_html');?>
-    <?=cheditor3('it_tail_html')."\n";?>
+    <?=get_editor_js('it_tail_html');?>
     return true;
 }
 

adm/shop_admin/itempsform.php

@@ -1,7 +1,7 @@
 <?
 $sub_menu = "400650";
+define('G4_EDITOR', 1);
 include_once("./_common.php");
-include_once ("$g4[path]/lib/cheditor4.lib.php");
 
 auth_check($auth[$sub_menu], "w");
 
@@ -21,8 +21,6 @@ include_once ("$g4[admin_path]/admin.head.php");
 
 $qstr = "page=$page&sort1=$sort1&sort2=$sort2";
 ?>
-<script src="<?=$g4[cheditor4_path]?>/cheditor.js"></script>
-<?=cheditor1('is_content', '100%', '350');?>
 
 <?=subtitle($g4[title])?>
 
@@ -58,7 +56,7 @@ $qstr = "page=$page&sort1=$sort1&sort2=$sort2";
     <td>
         <!-- <?=textarea_size("is_content")?>
         <textarea id='is_content' name="is_content" rows="10" style='width:99%;' class=ed required itemname='내용'><? echo get_text($is[is_content]) ?></textarea> -->
-        <?=cheditor2('is_content', $is['is_content']);?>
+        <?=editor_html('is_content', $is['is_content']);?>
     </td>
 </tr>
 <tr height=25>
@@ -76,7 +74,7 @@ $qstr = "page=$page&sort1=$sort1&sort2=$sort2";
 <script>
 function fitemps_submit(f)
 {
-    <? echo cheditor3('is_content'); ?>
+    <? echo get_editor_js('is_content'); ?>
 
     f.action="./itempsformupdate.php";
     return true;

adm/shop_admin/newwinform.php

@@ -1,7 +1,7 @@
 <?
 $sub_menu = "400720";
+define('G4_EDITOR', 1);
 include_once("./_common.php");
-include_once ("$g4[path]/lib/cheditor4.lib.php");
 
 auth_check($auth[$sub_menu], "w");
 
@@ -30,9 +30,6 @@ include_once ("$g4[admin_path]/admin.head.php");
 
 <?=subtitle($html_title)?>
 
-<script src="<?=$g4[cheditor4_path]?>/cheditor.js"></script>
-<?=cheditor1('nw_content', '100%', '350');?>
-
 <form name=frmnewwin method=post action="./newwinformupdate.php" onsubmit="return frmnewwin_check(this);" style="margin:0px;">
 <input type=hidden name=w     value='<? echo $w ?>'>
 <input type=hidden name=nw_id value='<? echo $nw_id ?>'>
@@ -75,7 +72,7 @@ include_once ("$g4[admin_path]/admin.head.php");
 <input type=hidden name=nw_content_html value=1>
 <tr>
     <td>내용</td>
-    <td colspan=3 style='padding-top:5px; padding-bottom:5px;'><?=cheditor2('nw_content', $nw[nw_content]);?></td>
+    <td colspan=3 style='padding-top:5px; padding-bottom:5px;'><?=editor_html('nw_content', $nw[nw_content]);?></td>
 </tr>
 <tr><td colspan=4 height=1 bgcolor=CCCCCC></td></tr>
 </table>
@@ -91,7 +88,7 @@ function frmnewwin_check(f)
     errmsg = "";
     errfld = "";
 
-    <?=cheditor3('nw_content');?>
+    <?=get_editor_js('nw_content');?>
 
     check_field(f.nw_subject, "제목을 입력하세요.");
 

lib/thumb.lib.php

@@ -0,0 +1,128 @@
+<?
+if (!defined('_GNUBOARD_')) exit;
+
+/*******************************************************************************
+    썸네일 Class
+
+    사용법 : 
+    
+    $thumb = new g4_thumbnail(경로, 썸네일이미지폭);
+    $thumb->run(이미지 경로가 포함된 컨텐츠);
+
+*******************************************************************************/
+class g4_thumb {
+    var $path;
+    var $width;
+    var $red = 0xff;
+    var $green = 0xff;
+    var $blue = 0xff;
+    var $quality = 100;
+    var $permission = 0606;
+
+    function g4_thumb($path, $width) {
+        $this->set_path($path);
+        $this->set_width($width);
+    }
+
+    // 경로
+    function set_path($path) {
+        $this->path = $path;
+        @mkdir($path, 0707);
+        @chmod($path, 0707);
+    }
+
+    function set_width($width) {
+        $this->width = $width;
+    }
+
+    function get_width() {
+        return $this->width;
+    }
+
+    function set_bgcolor($red, $green, $blue) {
+        $this->red   = $red;
+        $this->green = $green;
+        $this->blue  = $blue;
+    }
+
+    function set_quality($quality) {
+        $this->quality = $quality;
+    }
+
+    function set_permission($permission) {
+        $this->permission = $permission;
+    }
+
+    function create($srcimg, $thumbfile) {
+        $width = $this->get_width();
+        $source = null;
+        $size = @getimagesize($srcimg);
+        if ($size[2] == 1) 
+            $source = @imagecreatefromgif($srcimg);
+        else if ($size[2] == 2)
+            $source = @imagecreatefromjpeg($srcimg);
+        else if ($size[2] == 3) 
+            $source = @imagecreatefrompng($srcimg);
+
+        if ($source == null)
+            return '';
+
+        // 이미지의 폭이 설정폭 보다 작다면
+        if ($size[0] < $width) {
+            $width  = $size[0];
+            $height = $size[1];
+        } else {
+            $rate = $width / $size[0];
+            $height = (int)($size[1] * $rate);
+        }
+
+        $target = @imagecreatetruecolor($width, $height);
+        $bgcolor = @imagecolorallocate($target, $this->red, $this->green, $this->blue); // 썸네일 배경
+        imagefilledrectangle($target, 0, 0, $width, $height, $bgcolor);
+        imagecopyresampled($source, $source, 0, 0, 0, 0, $width, $height, $size[0], $size[1]);
+        imagecopy($target, $source, 0, 0, 0, 0, $size[0], $size[1]);
+        imagejpeg($target, $thumbfile, $this->quality);
+        chmod($thumbfile, $this->permission); // 추후 삭제를 위하여 파일모드 변경
+        return $thumbfile;
+    }
+
+    function thumbnail($matches)
+    {
+        foreach ($matches as $img) {
+            preg_match("/src=[\"\']?([^\"\'\s>]+)/i", $img, $m);
+            $src = trim($m[1]);
+
+            $result = true;
+            if (preg_match("/\.(jpe?g|png|gif)$/i", $src)) {
+                // 유일한 파일명을 만든다.
+                $filename = md5($src).'_'.$this->width;
+                $thumb = $this->path.'/'.$filename;
+
+                if (!file_exists($thumb)) {
+                    $result = $this->create($src, $thumb);
+                }
+            }
+            else {
+                $thumb = $src;
+            }
+
+            if ($result) {
+                $size = @getimagesize($src);
+                if ($size[0] < $this->width) {
+                    return "<img src='$thumb' width='$size[0]' />";
+                } else {
+                    return "<a href='$src' target='_blank' title='클릭하시면 이미지가 크게 보입니다.'><img src='$thumb' width='{$this->width}' border='0' /></a>";
+                }
+            }
+        }
+    }
+
+    function run($content)
+    {
+        //return preg_replace_callback('#<img[^>]+>#iS', create_function('$matches', 'return g4_thumb::thumbnail($matches);'), $content);
+        //return preg_replace_callback('#<img[^>]+>#iS', array('g4_thumb', 'thumbnail'), $content);
+        //return preg_replace_callback('#<img[^>]+>#iS', 'g4_thumb::thumbnail', $content);
+        return preg_replace_callback('#<img[^>]+>#iS', array($this, 'thumbnail'), $content);
+    }
+}
+?>

skin/board/neo/view.skin.php

@@ -176,19 +176,27 @@ function board_move(href)
 
 <script>
 // 이미지 등비율 리사이징
-$(function(){
+$(window).load(function() {
-    var img = $('#bo_v_img img');
+    view_image_resize();
-    var img_org_width = img.width();
-    $(window).resize(function(){
-        var img_wrap = $('#bo_v_img').width();
-        img.each(function() {
-            var img_width = $(this).width();
-            if (img_width > img_wrap) {
-                $(this).addClass('img_fix');
-            } else if (img_width <= img_wrap && img_width >= img_org_width) {
-                $(this).removeClass('img_fix');
-            }
-        });
-    }).resize();
 });
+
+$(window).resize(function(){
+    view_image_resize();
+});
+
+function view_image_resize()
+{
+    var $img = $('#bo_v_img img');
+    var img_wrap = $('#bo_v_img').width();
+
+    $img.each(function() {
+        var img_width = $(this).width();
+        $(this).data("width", img_width); // 원래 이미지 사이즈
+        if (img_width > img_wrap) {
+            $(this).addClass('img_fix');
+        } else if (img_width <= img_wrap && img_width >= $(this).data("width")) {
+            $(this).removeClass('img_fix');
+        }
+    });
+}
 </script>