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
2014-01-17 09:57:12 +09:00
parent 702a75dd67 a502508d73
commit 4c44421169
11 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
!.gitignore
.htaccess
data/
test/
sirgle/

4
adm/boardgroup_list.php
View File

@ -101,7 +101,7 @@ $colspan = 11;
</th>
<th scope="col"><?php echo subject_sort_link('gr_id') ?>그룹아이디</a></th>
<th scope="col"><?php echo subject_sort_link('gr_subject') ?>제목</a></th>
<?php if ($is_admin == 'super'){ ?><th scope="col"><?php echo subject_sort_link('gr_admin') ?>그룹관리자</a></th><?php } ?>
<th scope="col"><?php echo subject_sort_link('gr_admin') ?>그룹관리자</a></th>
<th scope="col">게시판</th>
<th scope="col">접근<br>사용</th>
<th scope="col">접근<br>회원수</th>
@ -144,7 +144,7 @@ $colspan = 11;
<label for="gr_admin_<?php echo $i; ?>" class="sound_only">그룹관리자</label>
<input type="text" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>" id="gr_admin_<?php echo $i ?>" class="frm_input" size="10" maxlength="20">
<?php }else{ ?>
<input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>"><td><?php echo $row['gr_admin'] ?>
<input type="hidden" name="gr_admin[<?php echo $i ?>]" value="<?php echo $row['gr_admin'] ?>"><?php echo $row['gr_admin'] ?>
<?php } ?>
</td>
<td class="td_numsmall"><a href="./board_list.php?sfl=a.gr_id&amp;stx=<?php echo $row['gr_id'] ?>"><?php echo $row2['cnt'] ?></a></td>

12
adm/config_form.php
View File

@ -120,6 +120,11 @@ if(!isset($config['cf_analytics'])) {
ADD `cf_analytics` TEXT NOT NULL AFTER `cf_intercept_ip` ", true);
}
if(!isset($config['cf_add_meta'])) {
sql_query(" ALTER TABLE `{$g5['config_table']}`
ADD `cf_add_meta` TEXT NOT NULL AFTER `cf_analytics` ", true);
}
if(!isset($config['cf_sms_use'])) {
sql_query(" ALTER TABLE `{$g5['config_table']}`
ADD `cf_sms_use` varchar(255) NOT NULL DEFAULT '' AFTER `cf_cert_limit`,
@ -418,6 +423,13 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
<textarea name="cf_analytics" id="cf_analytics"><?php echo $config['cf_analytics']; ?></textarea>
</td>
</tr>
<tr>
<th scope="row"><label for="cf_add_meta">추가 메타태그</label></th>
<td colspan="3">
<?php echo help('추가로 사용하실 meta 태그를 입력합니다.'); ?>
<textarea name="cf_add_meta" id="cf_add_meta"><?php echo $config['cf_add_meta']; ?></textarea>
</td>
</tr>
</tbody>
</table>
</div>

1
adm/config_form_update.php
View File

@ -53,6 +53,7 @@ $sql = " update {$g5['config_table']}
cf_possible_ip = '".trim($_POST['cf_possible_ip'])."',
cf_intercept_ip = '".trim($_POST['cf_intercept_ip'])."',
cf_analytics = '{$_POST['cf_analytics']}',
cf_add_meta = '{$_POST['cf_add_meta']}',
cf_member_skin = '{$_POST['cf_member_skin']}',
cf_use_homepage = '{$_POST['cf_use_homepage']}',
cf_req_homepage = '{$_POST['cf_req_homepage']}',

3
config.php
View File

@ -156,4 +156,7 @@ define('G5_SMTP', '127.0.0.1');
// 게시판에서 링크의 기본개수를 말합니다.
// 필드를 추가하면 이 숫자를 필드수에 맞게 늘려주십시오.
define('G5_LINK_COUNT', 2);
// 썸네일 jpg Quality 설정
define('G5_THUMB_JPG_QUALITY', 90);
?>

3
head.sub.php
View File

@ -41,6 +41,9 @@ if (G5_IS_MOBILE) {
echo '<meta http-equiv="imagetoolbar" content="no">'.PHP_EOL;
echo '<meta http-equiv="X-UA-Compatible" content="IE=10,chrome=1">'.PHP_EOL;
}
if($config['cf_add_meta'])
echo $config['cf_add_meta'].PHP_EOL;
?>
<title><?php echo $g5_head_title; ?></title>
<?php

1
install/gnuboard5.sql
View File

@ -222,6 +222,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
`cf_possible_ip` text NOT NULL,
`cf_intercept_ip` text NOT NULL,
`cf_analytics` text NOT NULL,
`cf_add_meta` text NOT NULL,
`cf_register_skin` varchar(255) NOT NULL DEFAULT 'basic',
`cf_member_skin` varchar(255) NOT NULL DEFAULT '',
`cf_use_homepage` tinyint(4) NOT NULL DEFAULT '0',

4
lib/common.lib.php
View File

@ -1662,8 +1662,8 @@ function time_select($time, $name="")
// DEMO 라는 파일이 있으면 데모 화면으로 인식함
function check_demo()
{
global $g5;
if (file_exists($g5['path'].'/DEMO'))
global $is_admin;
if ($is_admin != 'super' && file_exists(G5_PATH.'/DEMO'))
alert('데모 화면에서는 하실(보실) 수 없는 작업입니다.');
}

2
lib/latest.lib.php
View File

@ -3,7 +3,7 @@ if (!defined('_GNUBOARD_')) exit;
// 최신글 추출
// $cache_time 캐시 갱신시간
function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=1)
function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $cache_time=1, $options='')
{
global $g5;
//static $css = array();

7
lib/thumbnail.lib.php
View File

@ -356,7 +356,12 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
UnsharpMask($dst, $val[0], $val[1], $val[2]);
}
imagejpeg($dst, $thumb_file, 90);
if(!defined('G5_THUMB_JPG_QUALITY'))
$jpg_quality = 90;
else
$jpg_quality = G5_THUMB_JPG_QUALITY;
imagejpeg($dst, $thumb_file, $jpg_quality);
chmod($thumb_file, G5_FILE_PERMISSION); // 추후 삭제를 위하여 파일모드 변경
imagedestroy($src);

2
mobile/index.php
View File

@ -7,7 +7,7 @@ include_once(G5_MOBILE_PATH.'/_head.php');
<!-- 메인화면 최신글 시작 -->
<?php
// 최신글
$sql = " select bo_table from {$g5['board_table']} where bo_device <> 'pc' order by gr_id, bo_table ";
$sql = " select bo_table from `{$g5['board_table']}` a left join `{$g5['group_table']}` b on (a.gr_id=b.gr_id) where a.bo_device <> 'pc' order by b.gr_order, a.bo_order ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
// 이 함수가 바로 최신글을 추출하는 역할을 합니다.