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

merge

Browse Source
This commit is contained in:
whitedot
2013-03-08 10:14:28 +09:00
parent 2d0add10ce 58918b3528
commit 03c40ba3ff
4 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adm/board_form.php
View File

@ -53,7 +53,7 @@ if ($w == '') {
$board['bo_mobile_gallery_cols'] = 2; $board['bo_mobile_gallery_cols'] = 2;
$board['bo_mobile_gallery_width'] = 160; $board['bo_mobile_gallery_width'] = 160;
$board['bo_mobile_gallery_height'] = 120; $board['bo_mobile_gallery_height'] = 120;
$board['bo_table_width'] = 97; $board['bo_table_width'] = 100;
$board['bo_page_rows'] = $config['cf_page_rows']; $board['bo_page_rows'] = $config['cf_page_rows'];
$board['bo_subject_len'] = 60; $board['bo_subject_len'] = 60;
$board['bo_new'] = 24; $board['bo_new'] = 24;
@ -765,7 +765,7 @@ $pg_anchor = "<ul class=\"anchor\">
</td> </td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="bo_table_width">게시판 테이블 폭<strong class="sound_only">필수</strong></label></th> <th scope="row"><label for="bo_table_width">게시판 폭<strong class="sound_only">필수</strong></label></th>
<td> <td>
<?=help('100 이하는 %')?> <?=help('100 이하는 %')?>
<input type="text" id="bo_table_width" name="bo_table_width" class="required numeric frm_input" required value="<?=$board['bo_table_width']?>" size="4"> <input type="text" id="bo_table_width" name="bo_table_width" class="required numeric frm_input" required value="<?=$board['bo_table_width']?>" size="4">

2
adm/config_form.php
View File

@ -475,7 +475,7 @@ $pg_anchor = "
</td> </td>
<th scope="row"><label for="cf_prohibit_email">입력 금지 메일</label></th> <th scope="row"><label for="cf_prohibit_email">입력 금지 메일</label></th>
<td> <td>
<?=help('hanmail.net과 같은 메일 주소는 입력을 못합니다. 엔터로 구분')?> <?=help('hotmail.com과 같은 메일 주소는 사용하지 못하도록 못합니다. 엔터로 구분')?>
<textarea id="cf_prohibit_email" name="cf_prohibit_email" rows="5"><?=$config['cf_prohibit_email']?></textarea> <textarea id="cf_prohibit_email" name="cf_prohibit_email" rows="5"><?=$config['cf_prohibit_email']?></textarea>
</td> </td>
</tr> </tr>

2
bbs/register_form_update_mail2.php
View File

@ -27,7 +27,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
회원 별명 : <?=$mb_nick?><br> 회원 별명 : <?=$mb_nick?><br>
추천인아이디 : <?=$mb_recommend?> 추천인아이디 : <?=$mb_recommend?>
</p> </p>
<a href="<?=G4_BBS_URL?>/member_form.php?w=u&amp;mb_id=<?=$mb_id?>" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">관리자에서 회원정보 확인하기</a> <a href="<?=G4_ADMIN_URL?>/member_form.php?w=u&amp;mb_id=<?=$mb_id?>" style="display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center">관리자에서 회원정보 확인하기</a>
</div> </div>
</div> </div>

5
install/install_db.php
View File

@ -72,7 +72,7 @@ $download_point = -20;
//------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------
// config 테이블 설정 // config 테이블 설정
$sql = " insert into `{$table_prefix}config` $sql = " insert into `{$table_prefix}config`
set cf_title = '그누보드4', set cf_title = '그누보드4s',
cf_admin = '$admin_id', cf_admin = '$admin_id',
cf_use_point = '1', cf_use_point = '1',
cf_use_norobot = '1', cf_use_norobot = '1',
@ -105,7 +105,7 @@ $sql = " insert into `{$table_prefix}config`
cf_leave_day = '30', cf_leave_day = '30',
cf_search_part = '10000', cf_search_part = '10000',
cf_email_use = '1', cf_email_use = '1',
cf_prohibit_id = 'admin,administrator,관리자,관리자,어드민,주인장,webmaster,웹마스터,sysop,시삽,시샵,manager,매니저,메니저,root,루트,su,guest,방문객', cf_prohibit_id = 'admin,administrator,관리자,운영자,어드민,주인장,webmaster,웹마스터,sysop,시삽,시샵,manager,매니저,메니저,root,루트,su,guest,방문객',
cf_prohibit_email = '', cf_prohibit_email = '',
cf_new_del = '30', cf_new_del = '30',
cf_memo_del = '180', cf_memo_del = '180',
@ -124,6 +124,7 @@ $sql = " insert into `{$table_prefix}config`
cf_stipulation = '해당 홈페이지에 맞는 회원가입약관을 입력합니다.', cf_stipulation = '해당 홈페이지에 맞는 회원가입약관을 입력합니다.',
cf_privacy = '해당 홈페이지에 맞는 개인정보취급방침을 입력합니다.' cf_privacy = '해당 홈페이지에 맞는 개인정보취급방침을 입력합니다.'
"; ";
>>>>>>> 58918b3528c5945215be90227f5d74759b172042
mysql_query($sql) or die(mysql_error() . "<p>" . $sql); mysql_query($sql) or die(mysql_error() . "<p>" . $sql);
// 관리자 회원가입 // 관리자 회원가입