diff --git a/css/admin.css b/css/admin.css index 5f82f9522..e54b162a4 100644 --- a/css/admin.css +++ b/css/admin.css @@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} -select {font-size:1em} +textarea, select {font-size:1em} input {margin:0;padding:0;border-radius:0;font-family:dotum} input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none} button {border-radius:0;font-size:1em;-webkit-appearance:none} diff --git a/css/default.css b/css/default.css index d47a49703..7acffd2e7 100644 --- a/css/default.css +++ b/css/default.css @@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} - +textarea, select {font-size:1em} input {margin:0;padding:0;border-radius:0;font-family:dotum} input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none} @@ -138,7 +138,7 @@ fieldset .btn_submit {height:22px;font-size:1em} .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} .btn_cancel:focus, .btn_cancel:hover {text-decoration:none !important} -.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ +a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ button.btn_frmline {font-size:1em} .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ .btn_win button {display:inline-block;padding:0 10px;height:30px;border:0;background:#666;color:#fff;vertical-align:top;line-height:2em;cursor:pointer} diff --git a/css/mobile.css b/css/mobile.css index 8f0d99279..6a75f9b90 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -11,8 +11,8 @@ header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} label, input, select, img {vertical-align:middle} input,button {margin:0;padding:0} -input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em} /* 모바일에서만 사용 */ -select, textarea {font-size:1em} +input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em} +textarea, select {font-size:1em} textarea {border-radius:0;-webkit-appearance:none} p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all} hr {display:none} diff --git a/head.sub.php b/head.sub.php index 50917e9f7..7609d275b 100644 --- a/head.sub.php +++ b/head.sub.php @@ -81,7 +81,6 @@ if ($is_admin) { set_cookie("device_width", $(window).width(), 6, g5_cookie_domain); '.PHP_EOL; echo ''.PHP_EOL; // overflow scroll 감지 } //if(!defined('G5_IS_ADMIN')) diff --git a/install/index.php b/install/index.php index 65b5549d4..b6c140f2d 100644 --- a/install/index.php +++ b/install/index.php @@ -1,6 +1,7 @@ @@ -17,7 +18,7 @@ if ($exists_data_dir && $write_data_dir) {
- +
diff --git a/install/library.check.php b/install/library.check.php new file mode 100644 index 000000000..08889cc50 --- /dev/null +++ b/install/library.check.php @@ -0,0 +1,14 @@ +

'.$msg.'

'); +} + +if(!extension_loaded('gd') || !function_exists('gd_info')) + die('GD 라이브러리를 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.'); +?> \ No newline at end of file diff --git a/js/viewimageresize.js b/js/viewimageresize.js index b3c4ed65b..7893ae45c 100644 --- a/js/viewimageresize.js +++ b/js/viewimageresize.js @@ -14,14 +14,17 @@ } var $img = this.find(cfg.selector); - var width = this.width(); + var $this = this; function image_resize() { + var width = $this.width(); + $img.each(function() { $(this).removeAttr("width") .removeAttr("height") - .css("width",""); + .css("width","") + .css("height", ""); if($(this).data("width") == undefined) $(this).data("width", $(this).width()); diff --git a/lib/common.lib.php b/lib/common.lib.php index ac4e564dd..ee1bb82ac 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -1879,7 +1879,12 @@ function convert_charset($from_charset, $to_charset, $str) function escape_trim($field) { if ($field) { - return mysql_real_escape_string(@trim($field)); + $str = mysql_real_escape_string(@trim($field)); + + if(PHP_VERSION < '5.3.0') + $str = stripslashes($str); + + return $str; } } diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php index e6f7b05ff..337b92d42 100644 --- a/lib/thumbnail.lib.php +++ b/lib/thumbnail.lib.php @@ -80,27 +80,8 @@ function get_view_thumbnail($contents, $thumb_width=0) { global $board, $config; - if (!$thumb_width) { - $dvc_width = intval($_COOKIE['device_width']); - if(G5_IS_MOBILE && $dvc_width) { - // 썸네일 width 설정 - $thumb_width = 320; - - if($dvc_width > $board['bo_image_width']) { - $thumb_width = $board['bo_image_width']; - } else { - if($dvc_width >= 1000) { - $thumb_width = 1000; - } else if($dvc_width >= 760 && $dvc_width < 1000) { - $thumb_width = 760; - } else if($dvc_width >= 480 && $dvc_width < 760) { - $thumb_width = 480; - } - } - } else { - $thumb_width = $board['bo_image_width']; - } - } + if (!$thumb_width) + $thumb_width = $board['bo_image_width']; // $contents 중 img 태그 추출 $matchs = get_editor_image($contents); diff --git a/mobile/head.php b/mobile/head.php index aa323232d..0f4481fb3 100644 --- a/mobile/head.php +++ b/mobile/head.php @@ -107,7 +107,8 @@ include_once(G5_LIB_PATH.'/popular.lib.php');

- - - + + + +
\ No newline at end of file diff --git a/plugin/okname/key/.htaccess b/plugin/okname/key/.htaccess new file mode 100644 index 000000000..05196c0b3 --- /dev/null +++ b/plugin/okname/key/.htaccess @@ -0,0 +1 @@ +# .htaccess diff --git a/plugin/sns/view.sns.skin.php b/plugin/sns/view.sns.skin.php index 1e177053d..3b02f4b3b 100644 --- a/plugin/sns/view.sns.skin.php +++ b/plugin/sns/view.sns.skin.php @@ -9,7 +9,7 @@ $msg_url = $sns_msg.' : '.$sns_url; // 카카오톡 매뉴얼 : https://github.com/kakao/kakaolink-web $kakao_appid = $_SERVER['HTTP_HOST']; // Mobile Site Domain 정확히 입력하지 않을 경우 이용이 제한될 수 있습니다. -$kakao_appname = $g5['title']; +$kakao_appname = urlencode(str_replace('\"', '"', $g5['title'])); $facebook_url = 'http://www.facebook.com/sharer/sharer.php?s=100&p[url]='.$sns_url.'&p[title]='.$sns_msg; $twitter_url = 'http://twitter.com/home?status='.$msg_url; diff --git a/skin/board/basic/style.css b/skin/board/basic/style.css index 6cb723da4..2b9363fc5 100644 --- a/skin/board/basic/style.css +++ b/skin/board/basic/style.css @@ -26,7 +26,7 @@ #bo_w .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} #bo_w button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} #bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {text-decoration:none !important} -#bo_w .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ +#bo_w a.btn_frmline, #bo_w button.btn_frmline, {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ #bo_w button.btn_frmline {font-size:1em} /* 기본 테이블 */ @@ -66,7 +66,7 @@ #bo_w .frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;text-align:left} #bo_w .frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} #bo_w .frm_tbl textarea, #bo_w .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle} -#bo_w .frm_tbl textarea {width:98%;height:100px} +#bo_w .frm_tbl textarea {width:98%;height:200px} #bo_w .frm_address {display:block;margin-top:5px} #bo_w .frm_file {display:block;margin-bottom:5px} #bo_w .frm_tbl #captcha {margin:0;padding:0;border:0;background:transparent} diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css index 4fad47a1f..d1b4e3018 100644 --- a/skin/board/gallery/style.css +++ b/skin/board/gallery/style.css @@ -26,7 +26,7 @@ #bo_w .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} #bo_w button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} #bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {text-decoration:none !important} -#bo_w .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ +#bo_w a.btn_frmline, #bo_w button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ #bo_w button.btn_frmline {font-size:1em} /* 기본 테이블 */ @@ -50,7 +50,7 @@ #bo_w .frm_tbl th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f7f7f7;text-align:left} #bo_w .frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} #bo_w .frm_tbl textarea, #bo_w .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle} -#bo_w .frm_tbl textarea {width:98%;height:100px} +#bo_w .frm_tbl textarea {width:98%;height:200px} #bo_w .frm_address {display:block;margin-top:5px} #bo_w .frm_file {display:block;margin-bottom:5px} #bo_w .frm_tbl #captcha {margin:0;padding:0;border:0;background:transparent} diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php index 1edd550f8..acf89b32a 100644 --- a/skin/board/gallery/write.skin.php +++ b/skin/board/gallery/write.skin.php @@ -4,260 +4,265 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -

+
+

- - - - - - - - - - - - - + + + + + + + + + + + + + '."\n".''; - } - - if ($is_html) { - if ($is_dhtml_editor) { - $option_hidden .= ''; - } else { - $option .= "\n".''."\n".''; + $option_hidden = ''; + if ($is_notice || $is_html || $is_secret || $is_mail) { + $option = ''; + if ($is_notice) { + $option .= "\n".''."\n".''; } - } - if ($is_secret) { - if ($is_admin || $is_secret==1) { - $option .= "\n".''."\n".''; - } else { - $option_hidden .= ''; - } - } - - if ($is_mail) { - $option .= "\n".''."\n".''; - } -} - -echo $option_hidden; -?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
class="frm_input " maxlength="20">
옵션
- -
- - - - -
- 임시 저장된 글 목록 -
-
    -
    -
    - -
    - - -

    이 게시판은 최소 글자 이상, 최대 글자 이하까지 글을 쓰실 수 있습니다.

    - - - - -
    글자
    - -
    " id="wr_link" class="frm_input" size="50">
    파일 # - - - - - - - -
    자동등록방지 - -
    - -
    -

    - 작성하신 내용을 제출하시려면 글쓰기 버튼을, 작성을 취소하고 목록으로 돌아가시려면 취소 링크를 누르세요. -

    - - 취소 -
    - - - + + + + class="frm_input " maxlength="20"> + + + + + + + + + + + + + + + + + + + + 옵션 + + + + + + + + + + + + + + + + +
    + + + + +
    + 임시 저장된 글 목록 +
    +
      +
      +
      + +
      + + + + + + + + +

      이 게시판은 최소 글자 이상, 최대 글자 이하까지 글을 쓰실 수 있습니다.

      + + + + +
      글자
      + + + + + + + + " id="wr_link" class="frm_input" size="50"> + + + + + + 파일 # + + + + + + + + + + + + + + + 자동등록방지 + + + + + + + + + +
      +

      + 작성하신 내용을 제출하시려면 글쓰기 버튼을, 작성을 취소하고 목록으로 돌아가시려면 취소 링크를 누르세요. +

      + + 취소 +
      + + + +
      \ No newline at end of file diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css index 830cecf90..090d70283 100644 --- a/skin/member/basic/style.css +++ b/skin/member/basic/style.css @@ -13,7 +13,7 @@ .mbskin .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em} .mbskin button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em} .mbskin .btn_cancel:focus, .mbskin .btn_cancel:hover {text-decoration:none !important} -.mbskin .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ +.mbskin a.btn_frmline, .mbskin button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */ .mbskin button.btn_frmline {font-size:1em} .mbskin .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ .mbskin .btn_win button {display:inline-block;padding:0 10px;height:30px;border:0;background:#666;color:#fff;vertical-align:top;line-height:2em;cursor:pointer}