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

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

Browse Source
This commit is contained in:
chicpro
2013-03-08 13:35:50 +09:00
parent 802d83c810 f89253e472
commit 48d0aaeaa8
11 changed files with 100 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.head.php
View File

@ -66,7 +66,7 @@ function imageview(id, w, h)
<div id="logo"><a href="<?=G4_ADMIN_URL?>"><img src="<?=G4_ADMIN_URL?>/img/logo.jpg" alt="<?=$config['cf_title']?> 관리자 처음으로"></a></div>
<div id="snb">
<div id="mb_nb">
<ul>
<li>
<a href="<?=G4_ADMIN_URL?>/member_form.php?w=u&amp;mb_id=<?=$member['mb_id']?>">

2
adm/board_form.php
View File

@ -30,7 +30,7 @@ if (!isset($board['bo_mobile_skin'])) {
}
if (!isset($board['bo_gallery_width'])) {
sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_gallery_width` INT NOT NULL AFTER `bo_gallery_cols`, ADD `bo_gallery_height` INT NOT NULL AFTER `bo_gallery_width`, ADD `bo_moblie_gallery_cols` INT NOT NULL AFTER `bo_gallery_height`, ADD `bo_mobile_gallery_width` INT NOT NULL AFTER `bo_mobile_gallery_cols`, ADD `bo_mobile_gallery_height` INT NOT NULL AFTER `bo_mobile_gallery_width` ", false);
sql_query(" ALTER TABLE `{$g4['board_table']}` ADD `bo_gallery_width` INT NOT NULL AFTER `bo_gallery_cols`, ADD `bo_gallery_height` INT NOT NULL DEFAULT '0' AFTER `bo_gallery_width`, ADD `bo_mobile_gallery_cols` INT NOT NULL DEFAULT '0' AFTER `bo_gallery_height`, ADD `bo_mobile_gallery_width` INT NOT NULL DEFAULT '0' AFTER `bo_mobile_gallery_cols`, ADD `bo_mobile_gallery_height` INT NOT NULL DEFAULT '0' AFTER `bo_mobile_gallery_width` ", false);
}
if ($w == '') {

119
adm/sql_write.sql
View File

@ -1,77 +1,42 @@
CREATE TABLE `__TABLE_NAME__` (
`wr_id` int(11) NOT NULL auto_increment,
`wr_num` int(11) NOT NULL default '0',
`wr_reply` varchar(10) NOT NULL default '',
`wr_parent` int(11) NOT NULL default '0',
`wr_is_comment` tinyint(4) NOT NULL default '0',
`wr_comment` int(11) NOT NULL default '0',
`wr_comment_reply` varchar(5) NOT NULL default '',
`ca_name` varchar(255) NOT NULL default '',
`wr_option` set('html1','html2','secret','mail') NOT NULL default '',
`wr_subject` varchar(255) NOT NULL default '',
`wr_content` text NOT NULL,
`wr_link1` text NOT NULL,
`wr_link2` text NOT NULL,
`wr_link1_hit` int(11) NOT NULL default '0',
`wr_link2_hit` int(11) NOT NULL default '0',
`wr_trackback` varchar(255) NOT NULL default '',
`wr_hit` int(11) NOT NULL default '0',
`wr_good` int(11) NOT NULL default '0',
`wr_nogood` int(11) NOT NULL default '0',
`mb_id` varchar(255) NOT NULL default '',
`wr_password` varchar(255) NOT NULL default '',
`wr_name` varchar(255) NOT NULL default '',
`wr_email` varchar(255) NOT NULL default '',
`wr_homepage` varchar(255) NOT NULL default '',
`wr_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
`wr_last` varchar(19) NOT NULL default '',
`wr_ip` varchar(255) NOT NULL default '',
`wr_1` varchar(255) NOT NULL default '',
`wr_2` varchar(255) NOT NULL default '',
`wr_3` varchar(255) NOT NULL default '',
`wr_4` varchar(255) NOT NULL default '',
`wr_5` varchar(255) NOT NULL default '',
`wr_6` varchar(255) NOT NULL default '',
`wr_7` varchar(255) NOT NULL default '',
`wr_8` varchar(255) NOT NULL default '',
`wr_9` varchar(255) NOT NULL default '',
`wr_10` varchar(255) NOT NULL default '',
PRIMARY KEY (`wr_id`),
KEY `wr_num_reply_parent` (`wr_num`,`wr_reply`,`wr_parent`),
KEY `wr_is_comment` (`wr_is_comment`,`wr_id`)
) DEFAULT CHARSET=utf8;
CREATE TABLE `__TABLE_NAME__` (
`wr_id` int(11) NOT NULL auto_increment,
`wr_num` int(11) NOT NULL default '0',
`wr_reply` varchar(10) NOT NULL default '',
`wr_parent` int(11) NOT NULL default '0',
`wr_is_comment` tinyint(4) NOT NULL default '0',
`wr_comment` int(11) NOT NULL default '0',
`wr_comment_reply` varchar(5) NOT NULL default '',
`ca_name` varchar(255) NOT NULL default '',
`wr_option` set('html1','html2','secret','mail') NOT NULL default '',
`wr_subject` varchar(255) NOT NULL default '',
`wr_content` text NOT NULL,
`wr_link1` text NOT NULL,
`wr_link2` text NOT NULL,
`wr_link1_hit` int(11) NOT NULL default '0',
`wr_link2_hit` int(11) NOT NULL default '0',
`wr_trackback` varchar(255) NOT NULL default '',
`wr_hit` int(11) NOT NULL default '0',
`wr_good` int(11) NOT NULL default '0',
`wr_nogood` int(11) NOT NULL default '0',
`mb_id` varchar(255) NOT NULL default '',
`wr_password` varchar(255) NOT NULL default '',
`wr_name` varchar(255) NOT NULL default '',
`wr_email` varchar(255) NOT NULL default '',
`wr_homepage` varchar(255) NOT NULL default '',
`wr_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
`wr_last` varchar(19) NOT NULL default '',
`wr_ip` varchar(255) NOT NULL default '',
`wr_1` varchar(255) NOT NULL default '',
`wr_2` varchar(255) NOT NULL default '',
`wr_3` varchar(255) NOT NULL default '',
`wr_4` varchar(255) NOT NULL default '',
`wr_5` varchar(255) NOT NULL default '',
`wr_6` varchar(255) NOT NULL default '',
`wr_7` varchar(255) NOT NULL default '',
`wr_8` varchar(255) NOT NULL default '',
`wr_9` varchar(255) NOT NULL default '',
`wr_10` varchar(255) NOT NULL default '',
PRIMARY KEY (`wr_id`),
KEY `wr_num_reply_parent` (`wr_num`,`wr_reply`,`wr_parent`),
KEY `wr_is_comment` (`wr_is_comment`,`wr_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

4
bbs/poll_etc_update.php
View File

@ -20,8 +20,8 @@ if ($w == '')
$name = cut_str($pc_name, $config['cf_cut_name']);
$mb_id = '';
if ($member[mb_id])
$mb_id = '($member[mb_id])';
if ($member['mb_id'])
$mb_id = '('.$member['mb_id'].')';
// 환경설정의 투표 기타의견 작성시 최고관리자에게 메일발송 사용에 체크되어 있을 경우
if ($config['cf_email_po_super_admin'])

12
css/admin.css
View File

@ -45,12 +45,12 @@ h2 {font-size:1.2em}
#logo {position:relative;height:70px}
#logo img {position:absolute;top:15px;left:0}
#snb {z-index:2;position:absolute;top:16px;right:0;zoom:1}
#snb:after {display:block;visibility:hidden;clear:both;content:""}
#snb ul {float:right;margin:0;padding:0;zoom:1}
#snb ul:after {display:block;visibility:hidden;clear:both;content:""}
#snb li {float:left;margin-left:20px}
#snb a {display:inline-block;padding:5px 0;color:#e0e0e0;font-size:0.9em;text-decoration:none}
#mb_nb {z-index:2;position:absolute;top:16px;right:0;zoom:1}
#mb_nb:after {display:block;visibility:hidden;clear:both;content:""}
#mb_nb ul {float:right;margin:0;padding:0;zoom:1}
#mb_nb ul:after {display:block;visibility:hidden;clear:both;content:""}
#mb_nb li {float:left;margin-left:20px}
#mb_nb a {display:inline-block;padding:5px 0;color:#e0e0e0;font-size:0.9em;text-decoration:none}
/* gnb js off */
#gnb {z-index:10;background:#383a3f}

18
css/default.css
View File

@ -51,14 +51,14 @@ a:active {color:#000;text-decoration:underline}
#schall_stx {padding-left:5px;width:156px;height:24px;border:1px solid #aaa;border-right:0;background:#f7f7f2;line-height:1.9em !important;line-height:1.6em}
#schall_submit {border:1px solid #aaa;border-left:0}
#snb {position:absolute;top:18px;right:0;zoom:1}
#snb:after {display:block;visibility:hidden;clear:both;content:""}
#snb li {float:left}
#snb a {display:block;padding:5px 10px;color:#333;letter-spacing:-0.1em}
#snb a:focus,
#snb a:hover,
#snb a:active {text-decoration:none}
#snb img {margin-right:3px}
#mb_nb {position:absolute;top:18px;right:0;zoom:1}
#mb_nb:after {display:block;visibility:hidden;clear:both;content:""}
#mb_nb li {float:left}
#mb_nb a {display:block;padding:5px 10px;color:#333;letter-spacing:-0.1em}
#mb_nb a:focus,
#mb_nb a:hover,
#mb_nb a:active {text-decoration:none}
#mb_nb img {margin-right:3px}
/* gnb js off */
#gnb {z-index:10;margin:-1px 0 0;border-bottom:1px solid #c3c7c5;background:#f0f4f8}
@ -95,7 +95,7 @@ a:active {color:#000;text-decoration:underline}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#wrapper_title {margin-bottom:20px;font-size:1.2em}
#lnb {float:right;width:209px;border:1px solid #cfded8;background:#fff}
#side_nb {float:right;width:209px;border:1px solid #cfded8;background:#fff}
#container {z-index:4;position:relative;float:left;padding:25px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border:1px solid #cfded8;background:#fff;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}

26
css/mobile.css
View File

@ -45,19 +45,11 @@ pre {overflow-x:scroll;font-size:1.1em}
#schall_stx {padding-left:0.3em;width:100px;height:1.5em;border:1px solid #aaa;border-right:0;background:#f7f7f7;line-height:1.5em;-webkit-appearance:none}
#schall_submit {border:1px solid #aaa;border-left:0}
#snb {clear:both;border-top:1px solid #e7f1ed;background:#151515;text-align:center}
#snb li {display:inline-block;border-right:1px solid #333}
#snb li:nth-last-of-type(1) {border-right:0 !important}
#snb a {display:inline-block;padding:0.5em;color:#fff;text-decoration:none}
#snb img {display:none}
#gnb {border-bottom:1px solid #c3c7c5;background:#f0f4f8;zoom:1}
#gnb:after {display:block;visibility:hidden;clear:both;content:""}
#gnb h2 {display:none}
#gnb_ul {border-top:1px solid #e7f1ed}
#gnb li {float:left;width:25%;border-bottom:1px solid #e7f1ed}
#gnb li ul {display:none}
.gnb_1depth a {display:block;padding:1em 0;border-right:1px solid #e7f1ed;color:#000;text-align:center;text-decoration:none}
#mb_nb {clear:both;border-top:1px solid #e7f1ed;background:#151515;text-align:center}
#mb_nb li {display:inline-block;border-right:1px solid #333}
#mb_nb li:nth-last-of-type(1) {border-right:0 !important}
#mb_nb a {display:inline-block;padding:0.5em;color:#fff;text-decoration:none}
#mb_nb img {display:none}
/* 배포시에는 필요없는 부분 */
#sirgle_title {padding:0 1em;height:100px;color:#fff;font-size:2em}
@ -75,6 +67,14 @@ pre {overflow-x:scroll;font-size:1.1em}
#text_size {margin:0 0 1em;text-align:center}
/* 하단 레이아웃 */
#gnb {border-top:1px solid #c3c7c5;border-bottom:1px solid #c3c7c5;background:#f0f4f8;zoom:1}
#gnb:after {display:block;visibility:hidden;clear:both;content:""}
#gnb h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#gnb ul {border-top:1px solid #e7f1ed}
#gnb li {float:left;width:25%;border-bottom:1px solid #e7f1ed}
#gnb li ul {display:none}
#gnb li a {display:block;padding:1em 0;border-right:1px solid #e7f1ed;color:#000;text-align:center;text-decoration:none}
#ft {background:#484848}
#ft h1 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}

4
head.php
View File

@ -71,7 +71,7 @@ if ($config['cf_include_head']) {
</script>
</fieldset>
<ul id="snb">
<ul id="mb_nb">
<li>
<a href="<?=G4_BBS_URL?>/current_connect.php" id="snb_cnt">
<img src="<?=G4_IMG_URL?>/snb_cnt.jpg" alt="">
@ -154,7 +154,7 @@ if ($config['cf_include_head']) {
<hr>
<div id="wrapper">
<div id="lnb">
<div id="side_nb">
<?=(G4_IS_MOBILE?outlogin('basic'):outlogin('basic')); // 외부 로그인 ?>
<?=(G4_IS_MOBILE?poll('basic'):poll('basic')); // 설문조사 ?>
</div>

52
install/gnuboard4s.sql
View File

@ -683,57 +683,7 @@ CREATE TABLE IF NOT EXISTS `g4s_visit_sum` (
-- --------------------------------------------------------
--
-- Table structure for table `g4s_write`
--
DROP TABLE IF EXISTS `g4s_write`;
CREATE TABLE IF NOT EXISTS `g4s_write` (
`wr_id` int(11) NOT NULL auto_increment,
`wr_num` int(11) NOT NULL default '0',
`wr_reply` varchar(10) NOT NULL default '',
`wr_parent` int(11) NOT NULL default '0',
`wr_is_comment` tinyint(4) NOT NULL default '0',
`wr_comment` int(11) NOT NULL default '0',
`wr_comment_reply` varchar(5) NOT NULL default '',
`ca_name` varchar(255) NOT NULL default '',
`wr_option` set('html1','html2','secret','mail') NOT NULL default '',
`wr_subject` varchar(255) NOT NULL default '',
`wr_content` text NOT NULL,
`wr_link1` text NOT NULL,
`wr_link2` text NOT NULL,
`wr_link1_hit` int(11) NOT NULL default '0',
`wr_link2_hit` int(11) NOT NULL default '0',
`wr_trackback` varchar(255) NOT NULL default '',
`wr_hit` int(11) NOT NULL default '0',
`wr_good` int(11) NOT NULL default '0',
`wr_nogood` int(11) NOT NULL default '0',
`mb_id` varchar(255) NOT NULL default '',
`wr_password` varchar(255) NOT NULL default '',
`wr_name` varchar(255) NOT NULL default '',
`wr_email` varchar(255) NOT NULL default '',
`wr_homepage` varchar(255) NOT NULL default '',
`wr_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
`wr_last` varchar(19) NOT NULL default '',
`wr_ip` varchar(255) NOT NULL default '',
`wr_1` varchar(255) NOT NULL default '',
`wr_2` varchar(255) NOT NULL default '',
`wr_3` varchar(255) NOT NULL default '',
`wr_4` varchar(255) NOT NULL default '',
`wr_5` varchar(255) NOT NULL default '',
`wr_6` varchar(255) NOT NULL default '',
`wr_7` varchar(255) NOT NULL default '',
`wr_8` varchar(255) NOT NULL default '',
`wr_9` varchar(255) NOT NULL default '',
`wr_10` varchar(255) NOT NULL default '',
PRIMARY KEY (`wr_id`),
KEY `wr_num_reply_parent` (`wr_num`,`wr_reply`,`wr_parent`),
KEY `wr_is_comment` (`wr_is_comment`,`wr_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
-- Table structure for table `g4s_write`
-- Table structure for table `g4s_unique`
--
DROP TABLE IF EXISTS `g4s_unique`;

27
mobile/head.php
View File

@ -58,7 +58,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
</script>
</fieldset>
<ul id="snb">
<ul id="mb_nb">
<li><a href="<?=G4_BBS_URL?>/current_connect.php" id="snb_cnt">접속자 <?=connect(); // 현재 접속자수 ?></a></li>
<li><a href="<?=G4_BBS_URL?>/new.php" id="snb_new">새글</a></li>
<? if ($is_member) { ?>
@ -78,27 +78,14 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<hr>
<nav id="gnb">
<script>$('#gnb').addClass('gnb_js');</script>
<h2>홈페이지 메인메뉴</h2>
<nav id="lnb">
<ul>
<?
$sql = " select * from {$g4['group_table']} where gr_show_menu order by gr_order ";
$result = sql_query($sql);
for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
$sql2 = " select * from {$g4['board_table']} where gr_id = '{$gr_id}' order by bo_order ";
$result2 = sql_query($sql2);
for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
?>
<li class="gnb_1depth">
<a href="<?=G4_BBS_URL?>/group.php?gr_id=<?=$row['gr_id']?>"><?=$row['gr_subject']?></a>
<ul>
<?
$sql2 = " select * from {$g4['board_table']} where gr_id = '{$row['gr_id']}' order by bo_order ";
$result2 = sql_query($sql2);
for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
?>
<li class="gnb_2depth"><a href="<?=G4_BBS_URL?>/board.php?bo_table=<?=$row2['bo_table']?>"><?=$row2['bo_subject']?></a></li>
<?}?>
</ul>
</li>
<li><a href="<?=G4_BBS_URL?>/board.php?bo_table=<?=$row2['bo_table']?>"><?=$row2['bo_subject']?></a></li>
<?}?>
</ul>
</nav>
@ -106,7 +93,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<hr>
<div id="wrapper">
<div id="lnb">
<div id="side_nb">
<?=(G4_IS_MOBILE?outlogin('basic'):outlogin('basic')); // 외부 로그인 ?>
<?=(G4_IS_MOBILE?poll('basic'):poll('basic')); // 설문조사 ?>
</div>

16
mobile/tail.php
View File

@ -6,6 +6,22 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<hr>
<nav id="gnb">
<script>$('#gnb').addClass('gnb_js');</script>
<h2>홈페이지 메인메뉴</h2>
<ul>
<?
$sql = " select * from {$g4['group_table']} where gr_show_menu order by gr_order ";
$result = sql_query($sql);
for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
?>
<li><a href="<?=G4_BBS_URL?>/group.php?gr_id=<?=$row['gr_id']?>"><?=$row['gr_subject']?></a></li>
<?}?>
</ul>
</nav>
<hr>
<footer id="ft">
<h1><?=$config['cf_title']?> 정보</h1>
<?=popular('basic'); // 인기검색어 ?>