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');
?>
<div id="cache_del">
<div class="local_desc02 local_desc">
<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>
<?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
include_once('./admin.tail.php');
?>

67
adm/gcaptcha_file_delete.php
View File

@ -9,44 +9,45 @@ $g5['title'] = '캡챠파일 일괄삭제';
include_once('./admin.head.php');
?>
<div id="cache_del">
<div class="local_desc02 local_desc">
<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>
<?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
include_once('./admin.tail.php');
?>

7
adm/session_file_delete.php
View File

@ -9,10 +9,11 @@ $g5['title'] = "세션파일 일괄삭제";
include_once("./admin.head.php");
?>
<div id="session_del">
<div class="local_desc02 local_desc">
<p>
완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.
</p>
</div>
<?php
flush();
@ -52,10 +53,8 @@ include_once("./admin.head.php");
}
}
echo $list_tag_end;
//echo "<script>document.getElementById('ct').innerHTML += '세션데이터 {$cnt}건 삭제 완료.<br><br>프로그램의 실행을 끝마치셔도 좋습니다.';</script>\n";
echo "<p><span>세션데이터 {$cnt}건 삭제 완료.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>\n";
echo '<div class="local_desc01 local_desc"><p><strong>세션데이터 '.$cnt.'건 삭제 완료됐습니다.</strong><br>프로그램의 실행을 끝마치셔도 좋습니다.</p></div>'.PHP_EOL;
?>
</div>
<?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>
<?php echo $pg_anchor; ?>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '주문' ";
$row = sql_fetch($sql);
echo "주문 : ".$row['cnt'];
?>
<div class="local_desc01 local_desc">
<p>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '주문' ";
$row = sql_fetch($sql);
echo "주문 : ".$row['cnt'];
?>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '입금' ";
$row = sql_fetch($sql);
echo "입금 : ".$row['cnt'];
?>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '입금' ";
$row = sql_fetch($sql);
echo "입금 : ".$row['cnt'];
?>
</p>
</div>
</section>
<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>
</div>
<ul class="sort_odr">
<li><a href="<?php echo title_sort("od_id", 1)."&amp;$qstr1"; ?>">주문번호</a></li>
<li><a href="<?php echo title_sort("od_name")."&amp;$qstr1"; ?>">주문자</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_price", 1)."&amp;$qstr1"; ?>">주문합계</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_receipt_price")."&amp;$qstr1"; ?>">입금합계</a></li>
<li><a href="<?php echo title_sort("od_misu", 1)."&amp;$qstr1"; ?>">미수금</a></li>
<ul id="sodr_sort">
<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"; ?>"<?php if ($sort1 == 'od_name') echo ' class="sort_on"'; ?>>주문자</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"; ?>"<?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"; ?>"<?php if ($sort1 == 'od_cancel_price') echo ' class="sort_on"'; ?>>주문취소</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"; ?>"<?php if ($sort1 == 'od_misu') echo ' class="sort_on"'; ?>>미수금</a></li>
</ul>
<section id="sodr_all">

97
adm/thumbnail_file_delete.php
View File

@ -9,59 +9,60 @@ $g5['title'] = '썸네일 일괄삭제';
include_once('./admin.head.php');
?>
<div id="thumbnail_del">
<div class="local_desc02 local_desc">
<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>
<?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
include_once('./admin.tail.php');
?>