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

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

Browse Source
This commit is contained in:
whitedot
2013-11-05 09:50:22 +09:00
parent cc1a955a7f 0edefbe3f9
commit a25042b2a4
7 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
adm/config_form.php
View File

@ -375,19 +375,19 @@ $pg_anchor = '<ul class="anchor">
<th scope="row"><label for="cf_possible_ip">접근가능 IP</label></th>
<td>
<?php echo help('입력된 IP의 컴퓨터만 접근할 수 있습니다.<br>123.123.+ 도 입력 가능. (엔터로 구분)') ?>
<textarea name="cf_possible_ip" id="cf_possible_ip"><?php echo $config['cf_possible_ip'] ?> </textarea>
<textarea name="cf_possible_ip" id="cf_possible_ip"><?php echo $config['cf_possible_ip'] ?></textarea>
</td>
<th scope="row"><label for="cf_intercept_ip">접근차단 IP</label></th>
<td>
<?php echo help('입력된 IP의 컴퓨터는 접근할 수 없음.<br>123.123.+ 도 입력 가능. (엔터로 구분)') ?>
<textarea name="cf_intercept_ip" id="cf_intercept_ip"><?php echo $config['cf_intercept_ip'] ?> </textarea>
<textarea name="cf_intercept_ip" id="cf_intercept_ip"><?php echo $config['cf_intercept_ip'] ?></textarea>
</td>
</tr>
<tr>
<th scope="row"><label for="cf_analytics">방문자분석 스크립트</label></th>
<td colspan="3">
<?php echo help('방문자분석 스크립트 코드를 입력합니다. 예) 구글 애널리스틱'); ?>
<textarea name="cf_analytics" id="cf_analytics"><?php echo $config['cf_analytics']; ?> </textarea>
<textarea name="cf_analytics" id="cf_analytics"><?php echo $config['cf_analytics']; ?></textarea>
</td>
</tr>
</tbody>
@ -467,7 +467,7 @@ $pg_anchor = '<ul class="anchor">
<th scope="row"><label for="cf_filter">단어 필터링</label></th>
<td colspan="3">
<?php echo help('입력된 단어가 포함된 내용은 게시할 수 없습니다. 단어와 단어 사이는 ,로 구분합니다.') ?>
<textarea name="cf_filter" id="cf_filter" rows="7"><?php echo $config['cf_filter'] ?> </textarea>
<textarea name="cf_filter" id="cf_filter" rows="7"><?php echo $config['cf_filter'] ?></textarea>
</td>
</tr>
</tbody>
@ -613,7 +613,7 @@ $pg_anchor = '<ul class="anchor">
</tr>
<tr>
<th scope="row"><label for="cf_privacy">개인정보취급방침</label></th>
<td colspan="3"><textarea id="cf_privacy" name="cf_privacy" rows="10"><?php echo $config['cf_privacy'] ?> </textarea></td>
<td colspan="3"><textarea id="cf_privacy" name="cf_privacy" rows="10"><?php echo $config['cf_privacy'] ?></textarea></td>
</tr>
</tbody>
</table>

1
common.php
View File

@ -95,6 +95,7 @@ if (file_exists($dbconfig_file)) {
$connect_db = sql_connect(G5_MYSQL_HOST, G5_MYSQL_USER, G5_MYSQL_PASSWORD) or die('MySQL Connect Error!!!');
$select_db = sql_select_db(G5_MYSQL_DB, $connect_db) or die('MySQL DB Error!!!');
@mysql_query(" set names utf8 ");
if(defined('G5_MYSQL_SET_MODE') && G5_MYSQL_SET_MODE) @mysql_query("SET SESSION sql_mode = ''");
if (defined(G5_TIMEZONE)) @mysql_query(" set time_zone = '".G5_TIMEZONE."'");
} else {
?>

12
install/install_db.php
View File

@ -23,7 +23,6 @@ $admin_pass = $_POST['admin_pass'];
$admin_name = $_POST['admin_name'];
$admin_email = $_POST['admin_email'];
@mysql_query('set names utf8');
$dblink = @mysql_connect($mysql_host, $mysql_user, $mysql_pass);
if (!$dblink) {
echo '<meta http-equiv="content-type" content="text/html; charset=utf-8">'.PHP_EOL;
@ -32,7 +31,6 @@ if (!$dblink) {
exit;
}
@mysql_query('set names utf8');
$select_db = @mysql_select_db($mysql_db, $dblink);
if (!$select_db) {
echo '<meta http-equiv="content-type" content="text/html; charset=utf-8">'.PHP_EOL;
@ -40,6 +38,13 @@ if (!$select_db) {
echo '<div><a href="./install_config.php">뒤로가기</a></div>'.PHP_EOL;
exit;
}
$mysql_set_mode = 'false';
@mysql_query('set names utf8');
if(version_compare(mysql_get_server_info(), '5.6.6', '>=') == 1) {
@mysql_query("SET SESSION sql_mode = ''");
$mysql_set_mode = 'true';
}
?>
<h2><?php echo G5_VERSION ?> 설치가 시작되었습니다.</h2>
@ -186,7 +191,8 @@ fwrite($f, "if (!defined('_GNUBOARD_')) exit;\n");
fwrite($f, "define('G5_MYSQL_HOST', '{$mysql_host}');\n");
fwrite($f, "define('G5_MYSQL_USER', '{$mysql_user}');\n");
fwrite($f, "define('G5_MYSQL_PASSWORD', '{$mysql_pass}');\n");
fwrite($f, "define('G5_MYSQL_DB', '{$mysql_db}');\n\n");
fwrite($f, "define('G5_MYSQL_DB', '{$mysql_db}');\n");
fwrite($f, "define('G5_MYSQL_SET_MODE', {$mysql_set_mode});\n\n");
fwrite($f, "define('G5_TABLE_PREFIX', '{$table_prefix}');\n\n");
fwrite($f, "\$g5['write_prefix'] = G5_TABLE_PREFIX.'write_'; // 게시판 테이블명 접두사\n\n");
fwrite($f, "\$g5['auth_table'] = G5_TABLE_PREFIX.'auth'; // 관리권한 설정 테이블\n");

3
mobile/skin/board/basic/list.skin.php
View File

@ -194,6 +194,9 @@ function fboardlist_submit(f) {
if(document.pressed == "선택삭제") {
if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다"))
return false;
f.removeAttribute("target");
f.action = "./board_list_update.php";
}
return true;

3
mobile/skin/board/gallery/list.skin.php
View File

@ -218,6 +218,9 @@ function fboardlist_submit(f) {
if(document.pressed == "선택삭제") {
if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다"))
return false;
f.removeAttribute("target");
f.action = "./board_list_update.php";
}
return true;

3
skin/board/basic/list.skin.php
View File

@ -223,6 +223,9 @@ function fboardlist_submit(f) {
if(document.pressed == "선택삭제") {
if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다"))
return false;
f.removeAttribute("target");
f.action = "./board_list_update.php";
}
return true;

3
skin/board/gallery/list.skin.php
View File

@ -217,6 +217,9 @@ function fboardlist_submit(f) {
if(document.pressed == "선택삭제") {
if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다"))
return false;
f.removeAttribute("target");
f.action = "./board_list_update.php";
}
return true;