';
echo '해당 주소로 테스트 메일이 도착했는지 확인해 주십시오. ';
echo '만약, 테스트 메일이 오지 않는다면 더 다양한 계정의 메일 주소로 메일을 보내 보십시오. ';
echo '그래도 메일이 하나도 도착하지 않는다면 메일 서버(sendmail server)의 오류일 가능성이 높으니, 웹 서버관리자에게 문의하여 주십시오. ';
- echo '
';
+ echo '
';
echo '';
}
?>
diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 4c25615a0..bc14a45ee 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -727,7 +727,7 @@ if(!isset($default['de_root_index_use'])) {
diff --git a/adm/shop_admin/itemeventlist.php b/adm/shop_admin/itemeventlist.php
index 1a952abab..dabf6beab 100644
--- a/adm/shop_admin/itemeventlist.php
+++ b/adm/shop_admin/itemeventlist.php
@@ -201,7 +201,6 @@ function fitemeventlistupdatecheck(f)
if (!f.ev_id.value)
{
alert('이벤트를 선택하세요');
- document.flist.ev_id.focus();
return false;
}
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 568137a4e..bf22eee2c 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -505,11 +505,6 @@ if(!sql_query(" select ad_addr3 from {$g5['g5_shop_order_address_table']} limit
\ No newline at end of file
diff --git a/css/admin.css b/css/admin.css
index c07482ff1..9c9e87fb5 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -735,6 +735,8 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
#sms_sm_text {position:absolute;top:75px;left:27px;width:180px;color:#fff;font-size:2em;word-break:break-all}
#sms_sm p {position:absolute;bottom:-70px;left:0;font-size:0.95em;letter-spacing:-0.1em}
+#sms_send .local_desc01 {min-width:320px}
+
/* 가격비교사이트 */
#anc_pricecompare_info li {margin:5px 0}
diff --git a/css/default_shop.css b/css/default_shop.css
index 7c69cabdd..f4d7c75f4 100644
--- a/css/default_shop.css
+++ b/css/default_shop.css
@@ -710,6 +710,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
#sod_frm #od_memo {height:50px}
+#sod_frm_pt {margin:10px 0 5px}
+#sod_frm_pt_alert {margin:0 0 10px}
+
#sod_frm_pay {position:relative}
#sod_frm_pay h2 {margin:0 0 10px}
#sod_frm_pay .basic_tbl th {width:auto !important;font-weight:bold;text-align:center !important}
diff --git a/install/library.check.php b/install/library.check.php
index 96e77ce3f..e1cfe0e06 100644
--- a/install/library.check.php
+++ b/install/library.check.php
@@ -12,6 +12,9 @@ function die_utf8($msg)
if(!extension_loaded('gd') || !function_exists('gd_info'))
die_utf8('GD 라이브러리를 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
+if(!extension_loaded('openssl'))
+ die_utf8('openssl 모듈을 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
+
// SOAP 모듈체크
if(!extension_loaded('soap') || !class_exists('SOAPClient'))
die_utf8('SOAP 확장모듈을 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.');
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 26a9b6758..638a249e8 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -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('데모 화면에서는 하실(보실) 수 없는 작업입니다.');
}
@@ -1930,7 +1930,7 @@ function get_uniqid()
sql_query(" LOCK TABLE {$g5['uniqid_table']} WRITE ");
while (1) {
// 년월일시분초에 100분의 1초 두자리를 추가함 (1/100 초 앞에 자리가 모자르면 0으로 채움)
- $key = date('ymdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT);
+ $key = date('YmdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT);
$result = sql_query(" insert into {$g5['uniqid_table']} set uq_id = '$key', uq_ip = '{$_SERVER['REMOTE_ADDR']}' ", false);
if ($result) break; // 쿼리가 정상이면 빠진다.
diff --git a/lib/latest.lib.php b/lib/latest.lib.php
index 6786c4be1..71dad15bc 100644
--- a/lib/latest.lib.php
+++ b/lib/latest.lib.php
@@ -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();
diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php
index caf04acc1..3f71de35a 100644
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@@ -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);
diff --git a/mobile/index.php b/mobile/index.php
index 2359ac1ee..514a3223e 100644
--- a/mobile/index.php
+++ b/mobile/index.php
@@ -7,7 +7,7 @@ include_once(G5_MOBILE_PATH.'/_head.php');
'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++) {
// 이 함수가 바로 최신글을 추출하는 역할을 합니다.
diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php
index 74115f47b..5a4184b95 100644
--- a/mobile/skin/board/basic/write.skin.php
+++ b/mobile/skin/board/basic/write.skin.php
@@ -157,7 +157,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
diff --git a/mobile/skin/board/gallery/write.skin.php b/mobile/skin/board/gallery/write.skin.php
index 30870dc4c..9c6805945 100644
--- a/mobile/skin/board/gallery/write.skin.php
+++ b/mobile/skin/board/gallery/write.skin.php
@@ -157,7 +157,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
diff --git a/mobile/skin/qa/basic/write.skin.php b/mobile/skin/qa/basic/write.skin.php
index cbadd6028..c7fa1e568 100644
--- a/mobile/skin/qa/basic/write.skin.php
+++ b/mobile/skin/qa/basic/write.skin.php
@@ -110,7 +110,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
점 (점 단위로 입력하세요.)
diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php
index 8b74c24a2..07eb7f676 100644
--- a/skin/board/basic/write.skin.php
+++ b/skin/board/basic/write.skin.php
@@ -173,7 +173,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
diff --git a/skin/board/gallery/write.skin.php b/skin/board/gallery/write.skin.php
index 8b74c24a2..07eb7f676 100644
--- a/skin/board/gallery/write.skin.php
+++ b/skin/board/gallery/write.skin.php
@@ -173,7 +173,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
diff --git a/skin/qa/basic/write.skin.php b/skin/qa/basic/write.skin.php
index ced9ba8a7..817e8f943 100644
--- a/skin/qa/basic/write.skin.php
+++ b/skin/qa/basic/write.skin.php
@@ -110,7 +110,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가