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

2013-02-18 15:29:24 +09:00
parent f4abade1ee 9e72067bbb
commit 3312cd2377
5 changed files with 85 additions and 64 deletions
--- a/adm/boardgroupmember_form.php
+++ b/adm/boardgroupmember_form.php
@ -21,6 +21,7 @@ $colspan = 4;
    <table>
    <thead>
    <tr>
+        <th scope="col"><input type="checkbox" id="chkall" name="chkall" value="1" title="현재 페이지 접근가능그룹 전체선택" onclick="check_all(this.form)"></th>
        <th scope="col">그룹아이디</th>
        <th scope="col">그룹</th>
        <th scope="col">처리일시</th>
@ -40,6 +41,7 @@ $colspan = 4;
        $s_del = '<a href="javascript:post_delete(\'boardgroupmember_update.php\', \''.$row['gm_id'].'\');">삭제</a>';
    ?>
    <tr>
+        <td class="td_chk"><input type="checkbox" id="chk_<?=$i?>" name="chk[]" value="<?=$i?>" title="<?=$row['gr_subject']?> 그룹 선택"></td>
        <td class="td_grid"><a href="<?=$g4['bbs_path']?>/group.php?gr_id=<?=$row['gr_id']?>"><?=$row['gr_id']?></a></td>
        <td class="td_category"><?=$row['gr_subject']?></td>
        <td class="td_time"><?=$row['gm_datetime']?></td>
@ -54,6 +56,10 @@ $colspan = 4;
    ?>
    </tbody>
    </table>
+
+    <div class="btn_list">
+        <input type="submit" name="" value="선택삭제">
+    </div>
 </div>

 <form id="fboardgroupmember_form" name="fboardgroupmember_form" method="post" action="./boardgroupmember_update.php" onsubmit="return boardgroupmember_form_check(this)">
@ -78,7 +84,7 @@ $colspan = 4;
    }
    ?>
    </select>
-    <input type="submit" class="btn_submit" value="완료" accesskey="s">
+    <input type="submit" class="btn_submit" value="선택" accesskey="s">
    <p>게시판 그룹이 존재하지 않는다면 <a href="./boardgroup_form.php">게시판그룹생성하기</a></p>
 </fieldset>
 </form>
--- a/adm/boardgroupmember_list.php
+++ b/adm/boardgroupmember_list.php
@ -63,7 +63,7 @@ $colspan = 7;
    <select id="sfl" name="sfl">
        <option value='a.mb_id'>회원아이디</option>
    </select>
-    <input type="text" id="stx" name="stx" required value="<? echo $stx ?>" title="검색어(필수)">
+    <input type="text" id="stx" name="stx" class="required frm_input" required value="<? echo $stx ?>" title="검색어(필수)">
    <input type="submit" class="btn_submit" value="검색">
 </fieldset>
 </form>
@ -98,7 +98,7 @@ $colspan = 7;
        $mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']);
    ?>
    <tr>
-        <td class="td_chk"> <input type="checkbox" id="chk_<?=$i?>" name="chk[]" value="<?=$i?>" title="<?=$row['mb_nick']?> 회원 선택"></td>
+        <td class="td_chk"><input type="checkbox" id="chk_<?=$i?>" name="chk[]" value="<?=$i?>" title="<?=$row['mb_nick']?> 회원 선택"></td>
        <td class="td_grid"><?=$group?></td>
        <td class="td_mbid"><?=$row['mb_id']?></td>
        <td class="td_mbname"><?=$row['mb_name']?></td>
--- a/adm/cache_file_delete.php
+++ b/adm/cache_file_delete.php
@ -12,39 +12,44 @@ include_once("./admin.head.php");
 <div id="cache_del">
    <p>
        완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.
-    <p>
-    <span id="delete_message">
-<?
-flush();
-
-if (!$dir=@opendir(G4_DATA_PATH.'/cache')) {
-  echo "최신글 캐시디렉토리를 열지못했습니다.";
-}
-
-$cnt=0;
-while($file=readdir($dir)) {
-    if ($file=='.' || $file=='..') continue;
-
-    $cache_file = G4_DATA_PATH.'/cache/'.$file;
-
-    if (!$atime=@fileatime($cache_file))
-        continue;
-
-    $cnt++;
-    $return = unlink($cache_file);
-    //echo "<script>document.getElementById('delete_message').innerHTML += '{$cache_file}<br/>';</script>\n";
-    echo "{$cache_file}<br/>\n";
-
+    </p>
+    <?
    flush();

-    if ($cnt%10==0)
-        //echo "<script>document.getElementById('delete_message').innerHTML = '';</script>\n";
-        echo "\n";
-}
-//echo "<script>document.getElementById('delete_message').innerHTML += '최신글 캐시파일 {$cnt}건 삭제 완료.<br><br>프로그램의 실행을 끝마치셔도 좋습니다.';</script>\n";
-echo "최신글 캐시파일 {$cnt}건 삭제 완료.<br><br>프로그램의 실행을 끝마치셔도 좋습니다.\n";
-?>
-    </span>
+    $list_tag_st = "";
+    $list_tag_end = "";
+    if (!$dir=@opendir(G4_DATA_PATH.'/cache')) {
+        echo "<p>최신글 캐시디렉토리를 열지못했습니다.</p>";
+    } else {
+        $list_tag_st = "<ul>\n<li>완료됨</li>\n";
+        $list_tag_end = "</ul>\n";
+    }
+
+    $cnt=0;
+    echo $list_tag_st;
+    while($file=readdir($dir)) {
+        if ($file=='.' || $file=='..') continue;
+
+        $cache_file = G4_DATA_PATH.'/cache/'.$file;
+
+        if (!$atime=@fileatime($cache_file))
+            continue;
+
+        $cnt++;
+        $return = unlink($cache_file);
+        //echo "<script>document.getElementById('delete_message').innerHTML += '{$cache_file}<br>';</script>\n";
+        echo "<li>{$cache_file}</li>\n";
+
+        flush();
+
+        if ($cnt%10==0)
+            //echo "<script>document.getElementById('delete_message').innerHTML = '';</script>\n";
+            echo "\n";
+    }
+    echo $list_tag_end;
+    //echo "<script>document.getElementById('delete_message').innerHTML += '최신글 캐시파일 {$cnt}건 삭제 완료.<br><br>프로그램의 실행을 끝마치셔도 좋습니다.';</script>\n";
+    echo "<p><span>최신글 캐시파일 {$cnt}건 삭제가 완료됐습니다.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>\n";
+    ?>
 </div>

 <?php
--- a/adm/session_file_delete.php
+++ b/adm/session_file_delete.php
@ -12,43 +12,49 @@ include_once("./admin.head.php");
 <div id="session_del">
    <p>
        완료 메세지가 나오기 전에 프로그램의 실행을 중지하지 마십시오.
-    <p>
-    <span id="ct">
-<?
-flush();
+    </p>

-if (!$dir=@opendir(G4_DATA_PATH.'/session')) {
-  echo "세션 디렉토리를 열지못했습니다.";
-}
+    <?
+    flush();

-$cnt=0;
-while($file=readdir($dir)) {
-
-    if (!strstr($file,'sess_')) continue;
-    if (strpos($file,'sess_')!=0) continue;
-
-    $session_file = G4_DATA_PATH.'/session/'.$file;
-
-    if (!$atime=@fileatime($session_file)) {
-        continue;
+    $list_tag_st = "";
+    $list_tag_end = "";
+    if (!$dir=@opendir(G4_DATA_PATH.'/session')) {
+      echo "<p>세션 디렉토리를 열지못했습니다.</p>";
+    } else {
+        $list_tag_st = "<ul>\n<li>완료됨</li>\n";
+        $list_tag_end = "</ul>\n";
    }
-    if (time() > $atime + (3600 * 6)) {  // 지난시간을 초로 계산해서 적어주시면 됩니다. default : 6시간전
-        $cnt++;
-        $return = unlink($session_file);
-        //echo "<script>document.getElementById('ct').innerHTML += '{$session_file}<br/>';</script>\n";
-        echo "{$session_file}<br/>\n";

-        flush();
+    $cnt=0;
+    echo $list_tag_st;
+    while($file=readdir($dir)) {

-        if ($cnt%10==0)
-            //echo "<script>document.getElementById('ct').innerHTML = '';</script>\n";
-            echo "\n";
+        if (!strstr($file,'sess_')) continue;
+        if (strpos($file,'sess_')!=0) continue;
+
+        $session_file = G4_DATA_PATH.'/session/'.$file;
+
+        if (!$atime=@fileatime($session_file)) {
+            continue;
+        }
+        if (time() > $atime + (3600 * 6)) {  // 지난시간을 초로 계산해서 적어주시면 됩니다. default : 6시간전
+            $cnt++;
+            $return = unlink($session_file);
+            //echo "<script>document.getElementById('ct').innerHTML += '{$session_file}<br/>';</script>\n";
+            echo "<li>{$session_file}</li>\n";
+
+            flush();
+
+            if ($cnt%10==0)
+                //echo "<script>document.getElementById('ct').innerHTML = '';</script>\n";
+                echo "\n";
+        }
    }
-}
-//echo "<script>document.getElementById('ct').innerHTML += '세션데이터 {$cnt}건 삭제 완료.<br><br>프로그램의 실행을 끝마치셔도 좋습니다.';</script>\n";
-echo "세션데이터 {$cnt}건 삭제 완료.<br><br>프로그램의 실행을 끝마치셔도 좋습니다.\n";
+    echo $list_tag_end;
+    //echo "<script>document.getElementById('ct').innerHTML += '세션데이터 {$cnt}건 삭제 완료.<br><br>프로그램의 실행을 끝마치셔도 좋습니다.';</script>\n";
+    echo "<p><span>세션데이터 {$cnt}건 삭제 완료.</span><br>프로그램의 실행을 끝마치셔도 좋습니다.</p>\n";
 ?>
-    </span>
 </div>

 <?php
--- a/css/adm.css
+++ b/css/adm.css
@ -240,6 +240,8 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 /* 세션파일일괄삭제 */
 #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}

 /* 사이드뷰 */
 .sv_wrap {display:inline-block;position:relative;font-weight:normal}
@ -255,6 +257,8 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 #admin_confirm {padding:0 0 10px;background:#222;text-align:center}
 #admin_confirm p {margin:0 0 10px;color:#9ab9c5;background:#383a3f}
 #admin_confirm label {color:#fff}
+#admin_confirm .frm_input {border-color:#000}
+#admin_confirm .frm_input:focus {border-color:#000}

 /* pagination */
 .pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}