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

merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2013-10-14 14:37:51 +09:00
parent e0f890d8d0 d3f41c99d7
commit 74788a221b
7 changed files with 156 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
adm/cache_file_delete.php
View File

@ -9,39 +9,40 @@ $g5['title'] = '캐시파일 일괄삭제';
include_once('./admin.head.php'); include_once('./admin.head.php');
?> ?>
<div id="cache_del"> <div class="local_desc02 local_desc">
<p> <p>
완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오. 완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.
</p> </p>
<?php
flush();
if (!$dir=@opendir(G5_DATA_PATH.'/cache')) {
echo '<p>캐시디렉토리를 열지못했습니다.</p>';
}
$cnt=0;
echo '<ul>'.PHP_EOL;
$files = glob(G5_DATA_PATH.'/cache/latest-*');
if (is_array($files)) {
foreach ($files as $cache_file) {
$cnt++;
unlink($cache_file);
echo '<li>'.$cache_file.'</li>'.PHP_EOL;
flush();
if ($cnt%10==0)
echo PHP_EOL;
}
}
echo '<li>완료됨</li></ul>'.PHP_EOL;
echo '<p><span>최신글 캐시파일 '.$cnt.'건 삭제가 완료됐습니다.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>'.PHP_EOL;
?>
</div> </div>
<?php
flush();
if (!$dir=@opendir(G5_DATA_PATH.'/cache')) {
echo '<p>캐시디렉토리를 열지못했습니다.</p>';
}
$cnt=0;
echo '<ul>'.PHP_EOL;
$files = glob(G5_DATA_PATH.'/cache/latest-*');
if (is_array($files)) {
foreach ($files as $cache_file) {
$cnt++;
unlink($cache_file);
echo '<li>'.$cache_file.'</li>'.PHP_EOL;
flush();
if ($cnt%10==0)
echo PHP_EOL;
}
}
echo '<li>완료됨</li></ul>'.PHP_EOL;
echo '<div class="local_desc01 local_desc"><p><strong>최신글 캐시파일 '.$cnt.'건 삭제 완료됐습니다.</strong><br>프로그램의 실행을 끝마치셔도 좋습니다.</p></div>'.PHP_EOL;
?>
<?php <?php
include_once('./admin.tail.php'); include_once('./admin.tail.php');
?> ?>

67
adm/gcaptcha_file_delete.php
View File

@ -9,44 +9,45 @@ $g5['title'] = '캡챠파일 일괄삭제';
include_once('./admin.head.php'); include_once('./admin.head.php');
?> ?>
<div id="cache_del"> <div class="local_desc02 local_desc">
<p> <p>
완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오. 완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.
</p> </p>
<?php
flush();
if (!$dir=@opendir(G5_DATA_PATH.'/cache')) {
echo '<p>캐시디렉토리를 열지못했습니다.</p>';
}
$cnt=0;
echo '<ul>'.PHP_EOL;
$files = glob(G5_DATA_PATH.'/cache/gcaptcha-*');
if (is_array($files)) {
$before_time = G5_SERVER_TIME - 3600; // 한시간전
foreach ($files as $gcaptcha_file) {
$modification_time = filemtime($gcaptcha_file); // 파일접근시간
if ($modification_time > $before_time) continue;
$cnt++;
unlink($gcaptcha_file);
echo '<li>'.$gcaptcha_file.'</li>'.PHP_EOL;
flush();
if ($cnt%10==0)
echo PHP_EOL;
}
}
echo '<li>완료됨</li></ul>'.PHP_EOL;
echo '<p><span>캡챠파일 '.$cnt.'건의 삭제가 완료됐습니다.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>'.PHP_EOL;
?>
</div> </div>
<?php
flush();
if (!$dir=@opendir(G5_DATA_PATH.'/cache')) {
echo '<p>캐시디렉토리를 열지못했습니다.</p>';
}
$cnt=0;
echo '<ul>'.PHP_EOL;
$files = glob(G5_DATA_PATH.'/cache/gcaptcha-*');
if (is_array($files)) {
$before_time = G5_SERVER_TIME - 3600; // 한시간전
foreach ($files as $gcaptcha_file) {
$modification_time = filemtime($gcaptcha_file); // 파일접근시간
if ($modification_time > $before_time) continue;
$cnt++;
unlink($gcaptcha_file);
echo '<li>'.$gcaptcha_file.'</li>'.PHP_EOL;
flush();
if ($cnt%10==0)
echo PHP_EOL;
}
}
echo '<li>완료됨</li></ul>'.PHP_EOL;
echo '<div class="local_desc01 local_desc"><p><strong>캡챠파일 '.$cnt.'건의 삭제 완료됐습니다.</strong><br>프로그램의 실행을 끝마치셔도 좋습니다.</p></div>'.PHP_EOL;
?>
<?php <?php
include_once('./admin.tail.php'); include_once('./admin.tail.php');
?> ?>

7
adm/session_file_delete.php
View File

@ -9,10 +9,11 @@ $g5['title'] = "세션파일 일괄삭제";
include_once("./admin.head.php"); include_once("./admin.head.php");
?> ?>
<div id="session_del"> <div class="local_desc02 local_desc">
<p> <p>
완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오. 완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.
</p> </p>
</div>
<?php <?php
flush(); flush();
@ -52,10 +53,8 @@ include_once("./admin.head.php");
} }
} }
echo $list_tag_end; echo $list_tag_end;
//echo "<script>document.getElementById('ct').innerHTML += '세션데이터 {$cnt}건 삭제 완료.<br><br>프로그램의 실행을 끝마치셔도 좋습니다.';</script>\n"; echo '<div class="local_desc01 local_desc"><p><strong>세션데이터 '.$cnt.'건 삭제 완료됐습니다.</strong><br>프로그램의 실행을 끝마치셔도 좋습니다.</p></div>'.PHP_EOL;
echo "<p><span>세션데이터 {$cnt}건 삭제 완료.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>\n";
?> ?>
</div>
<?php <?php
include_once("./admin.tail.php"); include_once("./admin.tail.php");

24
adm/shop_admin/index.php
View File

@ -20,17 +20,21 @@ $pg_anchor = '<ul class="anchor">
<h2>주문현황</h2> <h2>주문현황</h2>
<?php echo $pg_anchor; ?> <?php echo $pg_anchor; ?>
<?php <div class="local_desc01 local_desc">
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '주문' "; <p>
$row = sql_fetch($sql); <?php
echo "주문 : ".$row['cnt']; $sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '주문' ";
?> $row = sql_fetch($sql);
echo "주문 : ".$row['cnt'];
?>
<?php <?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '입금' "; $sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '입금' ";
$row = sql_fetch($sql); $row = sql_fetch($sql);
echo "입금 : ".$row['cnt']; echo "입금 : ".$row['cnt'];
?> ?>
</p>
</div>
</section> </section>
<section id="anc_sidx_rdy"> <section id="anc_sidx_rdy">

16
adm/shop_admin/orderlist2.php
View File

@ -88,14 +88,14 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<a href="./orderprint.php" class="btn_add01 btn_add_optional">주문내역출력</a> <a href="./orderprint.php" class="btn_add01 btn_add_optional">주문내역출력</a>
</div> </div>
<ul class="sort_odr"> <ul id="sodr_sort">
<li><a href="<?php echo title_sort("od_id", 1)."&amp;$qstr1"; ?>">주문번호</a></li> <li><a href="<?php echo title_sort("od_id", 1)."&amp;$qstr1"; ?>"<?php if ($sort1 == 'od_id') echo ' class="sort_on"'; ?>>주문번호</a></li>
<li><a href="<?php echo title_sort("od_name")."&amp;$qstr1"; ?>">주문자</a></li> <li><a href="<?php echo title_sort("od_name")."&amp;$qstr1"; ?>"<?php if ($sort1 == 'od_name') echo ' class="sort_on"'; ?>>주문자</a></li>
<li><a href="<?php echo title_sort("od_cart_count", 1)."&amp;$qstr1"; ?>">건수</a></li> <li><a href="<?php echo title_sort("od_cart_count", 1)."&amp;$qstr1"; ?>"<?php if ($sort1 == 'od_cart_count') echo ' class="sort_on"'; ?>>건수</a></li>
<li><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>">주문합계</a></li> <li><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>"<?php if ($sort1 == 'od_cart_price') echo ' class="sort_on"'; ?>>주문합계</a></li>
<li><a href="<?php echo title_sort("od_cancel_price", 1)."&amp;$qstr1"; ?>">주문취소</a></li> <li><a href="<?php echo title_sort("od_cancel_price", 1)."&amp;$qstr1"; ?>"<?php if ($sort1 == 'od_cancel_price') echo ' class="sort_on"'; ?>>주문취소</a></li>
<li><a href="<?php echo title_sort("od_receipt_price")."&amp;$qstr1"; ?>">입금합계</a></li> <li><a href="<?php echo title_sort("od_receipt_price")."&amp;$qstr1"; ?>"<?php if ($sort1 == 'od_receipt_price') echo ' class="sort_on"'; ?>>입금합계</a></li>
<li><a href="<?php echo title_sort("od_misu", 1)."&amp;$qstr1"; ?>">미수금</a></li> <li><a href="<?php echo title_sort("od_misu", 1)."&amp;$qstr1"; ?>"<?php if ($sort1 == 'od_misu') echo ' class="sort_on"'; ?>>미수금</a></li>
</ul> </ul>
<section id="sodr_all"> <section id="sodr_all">

97
adm/thumbnail_file_delete.php
View File

@ -9,59 +9,60 @@ $g5['title'] = '썸네일 일괄삭제';
include_once('./admin.head.php'); include_once('./admin.head.php');
?> ?>
<div id="thumbnail_del"> <div class="local_desc02 local_desc">
<p> <p>
완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오. 완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.
</p> </p>
<?php
$directory = array();
$dl = array('file', 'editor');
foreach($dl as $val) {
if($handle = opendir(G5_DATA_PATH.'/'.$val)) {
while(false !== ($entry = readdir($handle))) {
if($entry == '.' || $entry == '..')
continue;
$path = G5_DATA_PATH.'/'.$val.'/'.$entry;
if(is_dir($path))
$directory[] = $path;
}
}
}
flush();
if (empty($directory)) {
echo '<p>썸네일디렉토리를 열지못했습니다.</p>';
}
$cnt=0;
echo '<ul>'.PHP_EOL;
foreach($directory as $dir) {
$files = glob($dir.'/thumb-*');
if (is_array($files)) {
foreach($files as $thumbnail) {
$cnt++;
@unlink($thumbnail);
echo '<li>'.$thumbnail.'</li>'.PHP_EOL;
flush();
if ($cnt%10==0)
echo PHP_EOL;
}
}
}
echo '<li>완료됨</li></ul>'.PHP_EOL;
echo '<p><span>썸네일 '.$cnt.'건의 삭제가 완료됐습니다.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>'.PHP_EOL;
?>
</div> </div>
<?php
$directory = array();
$dl = array('file', 'editor');
foreach($dl as $val) {
if($handle = opendir(G5_DATA_PATH.'/'.$val)) {
while(false !== ($entry = readdir($handle))) {
if($entry == '.' || $entry == '..')
continue;
$path = G5_DATA_PATH.'/'.$val.'/'.$entry;
if(is_dir($path))
$directory[] = $path;
}
}
}
flush();
if (empty($directory)) {
echo '<p>썸네일디렉토리를 열지못했습니다.</p>';
}
$cnt=0;
echo '<ul>'.PHP_EOL;
foreach($directory as $dir) {
$files = glob($dir.'/thumb-*');
if (is_array($files)) {
foreach($files as $thumbnail) {
$cnt++;
@unlink($thumbnail);
echo '<li>'.$thumbnail.'</li>'.PHP_EOL;
flush();
if ($cnt%10==0)
echo PHP_EOL;
}
}
}
echo '<li>완료됨</li></ul>'.PHP_EOL;
echo '<div class="local_desc01 local_desc"><p><strong>썸네일 '.$cnt.'건의 삭제 완료됐습니다.</strong><br>프로그램의 실행을 끝마치셔도 좋습니다.</p></div>'.PHP_EOL;
?>
<?php <?php
include_once('./admin.tail.php'); include_once('./admin.tail.php');
?> ?>

36
css/admin.css
View File

@ -51,7 +51,7 @@ h2.h2_frm {padding-top:15px}
#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli {z-index:13;clear:both;zoom:1} .gnb_1dli {z-index:13;clear:both;zoom:1}
.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli a {display:block;float:left;width:110px;height:35px;color:#e0e0e0;font-weight:bold;line-height:2.95em;text-decoration:none} .gnb_1dli a {display:block;float:left;padding:10px 0;width:110px;color:#e0e0e0;font-weight:bold;text-decoration:none}
.gnb_1dli a:focus, .gnb_1dli a:hover {text-decoration:none} .gnb_1dli a:focus, .gnb_1dli a:hover {text-decoration:none}
.gnb_2dul {float:left;width:auto} .gnb_2dul {float:left;width:auto}
.gnb_2dli {float:left} .gnb_2dli {float:left}
@ -62,10 +62,10 @@ h2.h2_frm {padding-top:15px}
.gnb_js #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_js #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_js .gnb_1dli {clear:none;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0} .gnb_js .gnb_1dli {clear:none;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0}
.gnb_js .gnb_1dli a {color:#fff;text-align:center} .gnb_js .gnb_1dli a {color:#fff;text-align:center}
.gnb_js .gnb_1dli_air a {float:none;background:#222;color:#fff} .gnb_js .gnb_1dli_air a {float:none;background:#fff;color:#000}
.gnb_js .gnb_1dli_on a {float:none;background:#fff;color:#000} .gnb_js .gnb_1dli_on a {float:none;background:#282828;color:#fff}
.gnb_js .gnb_2dul {display:none;position:absolute;top:35px;width:181px;border:1px solid #999;border-top:0;background:#fff} .gnb_js .gnb_2dul {display:none;position:absolute;top:34px;width:181px;border:1px solid #999;border-top:0;background:#fff}
.gnb_js .gnb_2dli a {display:inline-block;float:none;padding:0 10px;width:161px;background:#fff;color:#000;text-align:left} .gnb_js .gnb_2dli a {display:inline-block;float:none;padding:8px 10px;width:161px;background:#fff;color:#000;text-align:left}
.gnb_js .gnb_2dli a:focus, .gnb_js .gnb_2dli a:hover {background:#484848;color:#fff} .gnb_js .gnb_2dli a:focus, .gnb_js .gnb_2dli a:hover {background:#484848;color:#fff}
.gnb_1dli_over .gnb_2dul {display:block;left:-1px} .gnb_1dli_over .gnb_2dul {display:block;left:-1px}
.gnb_1dli_over2 .gnb_2dul {display:block;right:-1px} .gnb_1dli_over2 .gnb_2dul {display:block;right:-1px}
@ -74,7 +74,9 @@ h2.h2_frm {padding-top:15px}
.gnb_js .gnb_grp_style:focus, .gnb_js .gnb_grp_style:hover {background:#484848 !important} .gnb_js .gnb_grp_style:focus, .gnb_js .gnb_grp_style:hover {background:#484848 !important}
.gnb_js .gnb_grp_div {border-top:1px solid #eee} .gnb_js .gnb_grp_div {border-top:1px solid #eee}
#lnb {margin:0;padding:10px 15px;list-style:none;zoom:1}
#lnb {margin:0;padding:10px 15px;border-bottom:1px solid #e9e9e9;list-style:none;zoom:1}
#lnb:after {display:block;visibility:hidden;clear:both;content:""} #lnb:after {display:block;visibility:hidden;clear:both;content:""}
#lnb li {float:left} #lnb li {float:left}
#lnb a {display:inline-block;padding:5px;font-size:0.95em;letter-spacing:-0.1em} #lnb a {display:inline-block;padding:5px;font-size:0.95em;letter-spacing:-0.1em}
@ -393,10 +395,6 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
/* 메일 테스트 */ /* 메일 테스트 */
#fsendmailtest {margin-bottom:20px;padding:30px 0;border:1px solid #ced9de;background:#fff;text-align:center} #fsendmailtest {margin-bottom:20px;padding:30px 0;border:1px solid #ced9de;background:#fff;text-align:center}
/* 세션파일일괄삭제 */
#session_del p, #cache_del p {margin-bottom:20px;padding:13px;border:1px solid #ced9de;background:#fff}
#session_del p span, #cache_del p span {color:#ff3061}
/* ########## 쇼핑몰 사용시 적용 ########## */ /* ########## 쇼핑몰 사용시 적용 ########## */
/* 쇼핑몰 설정 */ /* 쇼핑몰 설정 */
@ -460,30 +458,34 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
#sodr_request_list p {position:relative;padding:5px 0;border-bottom:1px solid #e9e9e9} #sodr_request_list p {position:relative;padding:5px 0;border-bottom:1px solid #e9e9e9}
/* 주문통합내역 */ /* 주문통합내역 */
#sodr_sort {margin:0 20px 20px;padding:0;list-style:none;zoom:1}
#sodr_sort:after {display:block;visibility:hidden;clear:both;content:""}
#sodr_sort li {float:left;margin:0 10px 0 0}
#sodr_sort a {font-size:0.95em;text-decoration:underline;letter-spacing:-0.1em}
#sodr_sort a.sort_on {color:#ff3061}
#sodr_all {margin:0 20px} #sodr_all {margin:0 20px}
#sodr_all h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} #sodr_all h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#sodr_all .btn_list {margin:10px 0} #sodr_all .btn_list {margin:10px 0}
.sodr_all_list {clear:both;margin:0;padding:10px 0 0;border-top:25px solid #f7f7f7;list-style:none} .sodr_all_list {clear:both;margin:0 0 50px;padding:0;list-style:none}
.sodr_all_list li {margin:0 20px 10px;border-bottom:5px solid #f7f7f7}
.sodr_all_list th {text-align:center}
.sodr_all_list .sodr_basic {float:left;zoom:1} .sodr_all_list .sodr_basic {float:left;zoom:1}
.sodr_all_list .sodr_basic:after {display:block;visibility:hidden;clear:both;content:""} .sodr_all_list .sodr_basic:after {display:block;visibility:hidden;clear:both;content:""}
.sodr_all_list .sodr_basic dt {float:left;margin:0 10px 0 0} .sodr_all_list .sodr_basic dt {float:left;margin:0 10px 0 0}
.sodr_all_list .sodr_basic dd {float:left;margin:0 30px 0 0} .sodr_all_list .sodr_basic dd {float:left;margin:0 30px 0 0}
.sodr_all_list .sodr_basic strong a {color:#ff3061} .sodr_all_list .sodr_basic strong a {color:#ff3061;text-decoration:underline}
.sodr_all_list .sodr_person {float:right;zoom:1} .sodr_all_list .sodr_person {float:right;zoom:1}
.sodr_all_list .sodr_person:after {display:block;visibility:hidden;clear:both;content:""} .sodr_all_list .sodr_person:after {display:block;visibility:hidden;clear:both;content:""}
.sodr_all_list .sodr_person dt {float:left;margin:0 0 0 30px} .sodr_all_list .sodr_person dt {float:left;margin:0 0 0 30px}
.sodr_all_list .sodr_person dd {float:left;margin:0 0 0 10px} .sodr_all_list .sodr_person dd {float:left;margin:0 0 0 10px}
.sodr_all_list .sodr_pay {clear:both;margin:0;border-top:1px solid #606060;border-bottom:1px solid #606060;zoom:1} .sodr_all_list .sodr_pay {clear:both;margin:0;border-top:1px solid #d1dee2;zoom:1}
.sodr_all_list .sodr_pay:after {display:block;visibility:hidden;clear:both;content:""} .sodr_all_list .sodr_pay:after {display:block;visibility:hidden;clear:both;content:""}
.sodr_all_list .sodr_pay dt {float:left;padding:10px 0;width:15%} .sodr_all_list .sodr_pay dt {float:left;padding:8px 0;width:15%}
.sodr_all_list .sodr_pay dd {float:left;margin:0;padding:10px 0;width:35%} .sodr_all_list .sodr_pay dd {float:left;margin:0;padding:8px 0;width:35%}
#sodr_total table {text-align:center} #sodr_total table {text-align:center}
#sodr_total th {width:125px} #sodr_total th {width:125px}