From 7db2f889b105adee0ba1992c105f870ca2b42aed Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 30 Sep 2013 13:48:43 +0900
Subject: [PATCH 1/3] =?UTF-8?q?canonical=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 head.sub.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/head.sub.php b/head.sub.php
index 79711eac2..59b191974 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -44,6 +44,12 @@ if (G5_IS_MOBILE) {
 if (defined('G5_IS_ADMIN')) {
     echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/admin.css">'.PHP_EOL;
 } else {
+    // canonical 지정
+    $canonical = '';
+    if ($bo_table && $wr_id) $canonical = 'http://'.$_SERVER["HTTP_HOST"].'/bbs/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id;
+    else $canonical = 'http://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
+    echo '<link rel="canonical" href="'.$canonical.'">';
+
     echo '<link rel="stylesheet" href="'.G5_CSS_URL.'/'.(G5_IS_MOBILE?'mobile':'default').'.css">'.PHP_EOL;
 }
 echo '<meta http-equiv="imagetoolbar" content="no">';

From 5a6b84a924389fa5a61065b7989ab6f9421bb780 Mon Sep 17 00:00:00 2001
From: nemoluv <nemoluv@sir.co.kr>
Date: Mon, 30 Sep 2013 17:50:00 +0900
Subject: [PATCH 2/3] =?UTF-8?q?#5=20required=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=95=88=EB=90=9C=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                       | 3 +++
 adm/boardgroup_form.php          | 2 +-
 plugin/gcaptcha/gcaptcha.lib.php | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e26fb122..4ae7fdff4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@ nemoluv*
 cheditor*
 *.key
 *.sh
+kcho07_rss/
+mobile/skin/board/bach72_mobile/
+skin/board
diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php
index ce9f57c15..6b03a9467 100644
--- a/adm/boardgroup_form.php
+++ b/adm/boardgroup_form.php
@@ -53,7 +53,7 @@ include_once('./admin.head.php');
     <tbody>
     <tr>
         <th scope="row"><label for="gr_id">그룹 ID<?php echo $sound_only ?></label></th>
-        <td><input type="text" name="gr_id" value="<?php echo $group['gr_id'] ?>" id="gr_id" class="<?php echo $gr_id_attr ?> alnum_ frm_input" maxlength="10"> 
+        <td><input type="text" name="gr_id" value="<?php echo $group['gr_id'] ?>" id="gr_id" required class="<?php echo $gr_id_attr ?> alnum_ frm_input" maxlength="10"> 
             <?php 
             if ($w=='')
                 echo '영문자, 숫자, _ 만 가능 (공백없이)';
diff --git a/plugin/gcaptcha/gcaptcha.lib.php b/plugin/gcaptcha/gcaptcha.lib.php
index f25c26025..2bb2e0390 100644
--- a/plugin/gcaptcha/gcaptcha.lib.php
+++ b/plugin/gcaptcha/gcaptcha.lib.php
@@ -186,7 +186,7 @@ function captcha_html($class='captcha')
     if (G5_IS_MOBILE) $html .= '<audio src="'.$mp3_file_url.'?_='.$rand.'" controls></audio>';
     $html .= '<img src="'.$jpg_file_url.'?_='.$rand.'" alt="자동등록방지 숫자">';
     if (!G5_IS_MOBILE) $html .= '<a href="'.$mp3_file_url.'?_='.$rand.'" id="captcha_mp3" target="_blank"><img src="'.G5_GCAPTCHA_URL.'/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
-    $html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input" size="6" maxlength="6" required title="자동등록방지 숫자 입력">';
+    $html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input required" size="6" maxlength="6" required title="자동등록방지 숫자 입력">';
     $html .= '<p class="sound_only">자동등록방지 숫자를 순서대로 입력하세요.</p>';
     $html .= '</fieldset>';
     return $html;

From aed9ef05c1d8abc6fce37df2c958076b6a41ab06 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 30 Sep 2013 17:59:04 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20label=20input=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/boardgroup_form.php          | 6 ++++--
 plugin/gcaptcha/gcaptcha.lib.php | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php
index 6b03a9467..bc04e4506 100644
--- a/adm/boardgroup_form.php
+++ b/adm/boardgroup_form.php
@@ -7,9 +7,11 @@ auth_check($auth[$sub_menu], 'w');
 if ($is_admin != 'super' && $w == '') alert('최고관리자만 접근 가능합니다.');
 
 $html_title = '게시판그룹';
+$gr_id_attr = '';
+$sound_only = '';
 if ($w == '') {
     $gr_id_attr = 'required';
-    $sound_only = '<strong class="sound_only">필수</strong>';
+    $sound_only = '<strong class="sound_only"> 필수</strong>';
     $gr['gr_use_access'] = 0;
     $html_title .= ' 생성';
 } else if ($w == 'u') {
@@ -53,7 +55,7 @@ include_once('./admin.head.php');
     <tbody>
     <tr>
         <th scope="row"><label for="gr_id">그룹 ID<?php echo $sound_only ?></label></th>
-        <td><input type="text" name="gr_id" value="<?php echo $group['gr_id'] ?>" id="gr_id" required class="<?php echo $gr_id_attr ?> alnum_ frm_input" maxlength="10"> 
+        <td><input type="text" name="gr_id" value="<?php echo $group['gr_id'] ?>" id="gr_id" <?php echo $gr_id_attr; ?> class="<?php echo $gr_id_attr; ?> alnum_ frm_input" maxlength="10"> 
             <?php 
             if ($w=='')
                 echo '영문자, 숫자, _ 만 가능 (공백없이)';
diff --git a/plugin/gcaptcha/gcaptcha.lib.php b/plugin/gcaptcha/gcaptcha.lib.php
index 2bb2e0390..efd1d6681 100644
--- a/plugin/gcaptcha/gcaptcha.lib.php
+++ b/plugin/gcaptcha/gcaptcha.lib.php
@@ -184,9 +184,9 @@ function captcha_html($class='captcha')
     $html .= '<fieldset id="captcha" class="'.$class.'">';
     $html .= '<legend class="sound_only">자동등록방지</legend>';
     if (G5_IS_MOBILE) $html .= '<audio src="'.$mp3_file_url.'?_='.$rand.'" controls></audio>';
-    $html .= '<img src="'.$jpg_file_url.'?_='.$rand.'" alt="자동등록방지 숫자">';
+    $html .= '<img src="'.$jpg_file_url.'?_='.$rand.'" alt="">';
     if (!G5_IS_MOBILE) $html .= '<a href="'.$mp3_file_url.'?_='.$rand.'" id="captcha_mp3" target="_blank"><img src="'.G5_GCAPTCHA_URL.'/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
-    $html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box frm_input required" size="6" maxlength="6" required title="자동등록방지 숫자 입력">';
+    $html .= '<label class="sound_only">자동등록방지 숫자 </label><input type="text" name="captcha_key" id="captcha_key" required class="captcha_box frm_input required" size="6" maxlength="6">';
     $html .= '<p class="sound_only">자동등록방지 숫자를 순서대로 입력하세요.</p>';
     $html .= '</fieldset>';
     return $html;