firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'g4s'

Browse Source
This commit is contained in:
chicpro
2013-05-21 18:19:32 +09:00
parent a9a3dc99f0 91b4194daa
commit a91219c6f0
18 changed files with 18 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
adm/auth_list.php
View File

@ -203,13 +203,6 @@ $colspan = 5;
</tbody>
</table>
<fieldset id="admin_confirm">
<legend>XSS 혹은 CSRF 방지</legend>
<p>관리자 권한을 탈취당하는 경우를 대비하여 패스워드를 다시 한번 확인합니다.</p>
<label for="admin_password">관리자 패스워드</label>
<input type="password" name="admin_password" id="admin_password" required class="required frm_input">
</fieldset>
<div class="btn_confirm">
<input type="submit" value="완료" class="btn_submit">
</div>

4
adm/auth_update.php
View File

@ -11,10 +11,6 @@ if (!$mb['mb_id'])
check_token();
if ($member['mb_password'] != sql_password($_POST['admin_password'])) {
alert('패스워드가 다릅니다.');
}
$sql = " insert into {$g4['auth_table']}
set mb_id = '{$_POST['mb_id']}',
au_menu = '{$_POST['au_menu']}',

7
adm/board_form.php
View File

@ -1165,13 +1165,6 @@ $pg_anchor = '<ul class="anchor">
</table>
</section>
<fieldset id="admin_confirm">
<legend>XSS 혹은 CSRF 방지</legend>
<p>관리자 권한을 탈취당하는 경우를 대비하여 패스워드를 다시 한번 확인합니다.</p>
<label for="admin_password">관리자 패스워드<strong class="sound_only">필수</strong></label>
<input type="password" name="admin_password" id="admin_password" required class="required frm_input">
</fieldset>
<div class="btn_confirm">
<p>
작성하신 내용을 제출하시려면 <strong>확인</strong> 버튼을, 작성을 취소하고 목록으로 돌아가시려면 <strong>목록</strong> 링크를 누르세요.

9
adm/board_form_update.php
View File

@ -7,15 +7,6 @@ if ($w == 'u')
auth_check($auth[$sub_menu], 'w');
if ($_POST['admin_password']) {
if ($member['mb_password'] != sql_password($_POST['admin_password'])) {
alert('관리자 패스워드가 틀립니다.');
}
} else {
alert('관리자 패스워드를 입력하세요.');
}
if (!$_POST['gr_id']) { alert('그룹 ID는 반드시 선택하세요.'); }
if (!$bo_table) { alert('게시판 TABLE명은 반드시 입력하세요.'); }
if (!preg_match("/^([A-Za-z0-9_]{1,20})$/", $bo_table)) { alert('게시판 TABLE명은 공백없이 영문자, 숫자, _ 만 사용 가능합니다. (20자 이내)'); }

7
adm/config_form.php
View File

@ -727,13 +727,6 @@ $pg_anchor = '<ul class="anchor">
</table>
</section>
<fieldset id="admin_confirm">
<legend>XSS 혹은 CSRF 방지</legend>
<p>관리자 권한을 탈취당하는 경우를 대비하여 패스워드를 다시 한번 확인합니다.</p>
<label for="admin_password">관리자 패스워드<strong class="sound_only">필수</strong></label>
<input type="password" name="admin_password" id="admin_password" required class="required frm_input">
</fieldset>
<div class="btn_confirm">
<p>
작성하신 내용을 제출하시려면 <strong>확인</strong> 버튼을, 작성을 취소하고 목록으로 돌아가시려면 <strong>목록</strong> 링크를 누르세요.

4
adm/config_form_update.php
View File

@ -9,10 +9,6 @@ auth_check($auth[$sub_menu], 'w');
if ($is_admin != 'super')
alert('최고관리자만 접근 가능합니다.');
if ($member['mb_password'] != sql_password($_POST['admin_password'])) {
alert('패스워드가 다릅니다.');
}
$mb = get_member($cf_admin);
if (!$mb['mb_id'])
alert('최고관리자 회원아이디가 존재하지 않습니다.');

7
adm/member_form.php
View File

@ -295,13 +295,6 @@ include_once('./admin.head.php');
</div>
<fieldset id="admin_confirm">
<legend>XSS 혹은 CSRF 방지</legend>
<p>관리자 권한을 탈취 당하는 경우를 대비하여 관리자의 패스워드를 다시 한번 확인합니다.</p>
<label for="admin_password">관리자 패스워드<strong class="sound_only">필수</strong></label>
<input type="password" name="admin_password" id="admin_password" required class="required frm_input">
</fieldset>
<div class="btn_confirm">
<p>
작성하신 내용을 제출하시려면 <strong>확인</strong> 버튼을, 작성을 취소하고 목록으로 돌아가시려면 <strong>목록</strong> 링크를 누르세요.

4
adm/member_form_update.php
View File

@ -10,10 +10,6 @@ auth_check($auth[$sub_menu], 'w');
check_token();
if ($member['mb_password'] != sql_password($_POST['admin_password'])) {
alert('패스워드가 다릅니다.');
}
$mb_id = escape_trim($_POST['mb_id']);
// 휴대폰번호 체크

7
adm/point_list.php
View File

@ -207,13 +207,6 @@ function point_clear()
</tbody>
</table>
<fieldset id="admin_confirm">
<legend>XSS 혹은 CSRF 방지</legend>
<p>관리자 권한을 탈취당하는 경우를 대비하여 패스워드를 다시 한번 확인합니다.</p>
<label for="admin_password">관리자패스워드<strong class="sound_only">필수</strong></label>
<input type="password" name="admin_password" id="admin_password" required class="required frm_input">
</fieldset>
<div class="btn_confirm">
<input type="submit" value="확인" class="btn_submit">
</div>

4
adm/point_update.php
View File

@ -6,10 +6,6 @@ auth_check($auth[$sub_menu], 'w');
check_token();
if ($member['mb_password'] != sql_password($_POST['admin_password'])) {
alert('패스워드가 다릅니다.');
}
$mb_id = $_POST['mb_id'];
$po_point = $_POST['po_point'];
$po_content = $_POST['po_content'];

2
config.php
View File

@ -7,7 +7,7 @@
// 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
define('_GNUBOARD_', true);
if (PHP_VERSION >= '5.3.0') {
if (PHP_VERSION >= '5.1.0') {
//if (function_exists("date_default_timezone_set")) date_default_timezone_set("Asia/Seoul");
date_default_timezone_set("Asia/Seoul");
}

2
css/admin.css
View File

@ -331,7 +331,7 @@ fieldset button:focus, .fieldset_submit:focus {padding:0 15px;height:23px;border
.adm_field_explain {display:block;padding:0 0 5px;color:#5b747e}
/* 목록 바로가기 */
.anchor {margin:0 0 10px;padding:0;zoom:1}
.anchor {margin:0 0 10px 1px;padding:0;zoom:1}
.anchor:after {display:block;visibility:hidden;clear:both;content:""}
.anchor li {float:left;margin-left:-1px;list-style:none}
.anchor a {display:inline-block;border:1px solid #586267;background:#667379;padding:0 7px;height:30px;color:#fff;text-decoration:none;line-height:2.6em}

8
css/default.css
View File

@ -20,7 +20,7 @@ a:focus,
a:active {color:#000;text-decoration:underline}
/* 상단 레이아웃 */
#hd {border-top:3px solid #151515;background:#fff}
#hd {z-index:10;position:relative;border-top:3px solid #151515;background:#fff}
#hd h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#hd_wrapper {position:relative;margin:0 auto;width:980px}
@ -28,7 +28,7 @@ a:active {color:#000;text-decoration:underline}
/* 전체 검색 */
#sch_all {position:absolute;top:22px;left:70px;margin:0;padding:0;border:1px solid #555}
#sch_all legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
#sch_all legend {position:absolute;text-indent:-9999em;overflow:hidden}
#sch_all_stx {padding-left:5px;width:165px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em}
#sch_all_submit {padding:0 5px;height:26px;border:0;background:#555;color:#fff}
@ -42,7 +42,7 @@ a:active {color:#000;text-decoration:underline}
#tnb img {margin-right:3px}
/* gnb js off */
#gnb {z-index:10;margin:-1px 0 0;border-bottom:1px solid #c3c7c5;background:#f0f4f8}
#gnb {position:relative;margin:-1px 0 0;border-bottom:1px solid #c3c7c5;background:#f0f4f8}
#gnb h2 {position:absolute;margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
#gnb_1dul {margin:0 auto;padding:0;width:980px;zoom:1}
#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
@ -157,7 +157,7 @@ button.btn_frmline {font-size:1em}
/* 기본테이블 */
.basic_tbl {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0}
.basic_tbl caption {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
.basic_tbl caption {padding:0;font-size:0;line-height:0;overflow:hidden}
.basic_tbl thead th {padding:12px 0 8px;background:#565e60;color:#fff}
.basic_tbl thead a {color:#fff}
.basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */

2
css/mobile.css
View File

@ -170,7 +170,7 @@ td.empty_table {padding:5em 0;text-align:center}
.new_win_ul {margin:-1.8em 0 1.5em 0;padding:0 0 0 1.5em;border-bottom:1px solid #455255;background:#484848;list-style:none}
.new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}
.new_win_ul li {float:left;margin-left:-1px}
.new_win_ul a {display:block;padding:1em 1em 8px;border-right:1px solid #455255;border-left:1px solid #455255;color:#fff;font-family:"dotum";font-weight:bold;text-decoration:none}
.new_win_ul a {display:block;padding:1em 1em 8px;border-right:1px solid #455255;border-left:1px solid #455255;color:#fff;font-weight:bold;text-decoration:none}
.new_win_desc {padding:1em}
/* 사이드뷰 */

2
extend/.htaccess
View File

@ -1 +1 @@
#
# .htaccess

2
head.php
View File

@ -31,7 +31,7 @@ if ($config['cf_include_head']) {
<div id="hd_wrapper">
<div id="logo">
<a href="<?php echo G4_URL ?>"><img src="<?php echo G4_IMG_URL ?>/logo.jpg" alt="처음으로" width="53" height="37"></a>
<a href="<?php echo G4_URL ?>"><img src="<?php echo G4_IMG_URL ?>/logo.jpg" alt="처음으로"></a>
</div>
<fieldset id="sch_all">

12
lib/common.lib.php
View File

@ -37,7 +37,7 @@ function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
if ($cur_page != $k)
$str .= '<a href="'.$url.$k.$add.'" class="pg_page">'.$k.'</a><span class="sound_only">페이지</span>'.PHP_EOL;
else
$str .= '<span class="sound_only">선택된</span><strong class="pg_current">'.$k.'</strong><span class="sound_only">페이지</span>'.PHP_EOL;
$str .= '<span class="sound_only">열린</span><strong class="pg_current">'.$k.'</strong><span class="sound_only">페이지</span>'.PHP_EOL;
}
}
@ -982,7 +982,8 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$tmp_name = "";
if ($mb_id) {
$tmp_name = "<a href=\"".G4_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" target=\"_blank\" onclick=\"return false;\">$name</a>";
//$tmp_name = "<a href=\"".G4_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" target=\"_blank\" onclick=\"return false;\">$name</a>";
$tmp_name = '<a href="'.G4_BBS_URL.'/profile.php?mb_id='.$mb_id.'" class="sv_member" title="'.$name.' 자기소개" target="_blank" onclick="return false;">';
if ($config['cf_use_member_icon']) {
$mb_dir = substr($mb_id,0,2);
@ -992,12 +993,15 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$width = $config['cf_member_icon_width'];
$height = $config['cf_member_icon_height'];
$icon_file_url = G4_DATA_URL.'/member/'.$mb_dir.'/'.$mb_id.'.gif';
$tmp_name = '<img src="'.$icon_file_url.'" width="'.$width.'" height="'.$height.'" alt="">';
$tmp_name .= '<img src="'.$icon_file_url.'" width="'.$width.'" height="'.$height.'" alt="">';
if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
$tmp_name = $tmp_name . " <a href=\"".G4_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" target=\"_blank\" onclick=\"return false;\">$name</a>";
$tmp_name = $tmp_name.' '.$name;
}
} else {
$tmp_name = $tmp_name.' '.$name;
}
$tmp_name .= '</a>';
$title_mb_id = '['.$mb_id.']';
} else {

2
plugin/kcpcert/kcpcert_config.php
View File

@ -23,7 +23,7 @@ if(!$site_cd)
alert('KCP 휴대폰 본인확인 서비스 사이트코드가 없습니다.\\관리자 > 기본환경설정에 KCP 사이트코드를 입력해 주십시오.', G4_URL);
// KCP 인증 라이브러리
require G4_KCP_PATH.'/lib/ct_cli_lib.php';
require G4_KCPCERT_PATH.'/lib/ct_cli_lib.php';
/* ============================================================================== */
/* = null 값을 처리하는 메소드 = */