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

adm/mail_form.php

@@ -1,5 +1,6 @@
 <?
 $sub_menu = "200300";
+define('G4_EDITOR', 1);
 include_once('./_common.php');
 
 auth_check($auth[$sub_menu], 'r');
@@ -38,9 +39,8 @@ include_once('./admin.head.php');
 <tr>
     <th scope="row"><label for="ma_content">메일 내용<strong class="sound_only">필수</strong></label></th>
     <td>
-        <?=help('{이름} , {별명} , {회원아이디} , {이메일} 처럼 HTML 코드에 삽입하면 해당 내용에 맞게 변환하여 메일 발송합니다.')?>
+        <?=help('{이름} , {별명} , {회원아이디} , {이메일} 처럼 내용에 삽입하면 해당 내용에 맞게 변환하여 메일 발송합니다.')?>
-        <?=textarea_size('ma_content')?>
+        <?=editor_html("ma_content", $ma['ma_content'], '400');?>
-        <textarea id="ma_content" name="ma_content" rows="20" class="required" required title="메일내용"><?=$ma['ma_content']?></textarea>
     </td>
 </tr>
 </tbody>

adm/member_list.php

@@ -37,10 +37,7 @@ if (!$sst) {
 
 $sql_order = " order by {$sst} {$sod} ";
 
-$sql = " select count(*) as cnt
+$sql = " select count(*) as cnt {$sql_common} {$sql_search} {$sql_order} ";
-            {$sql_common}
-            {$sql_search}
-            {$sql_order} ";
 $row = sql_fetch($sql);
 $total_count = $row['cnt'];
 
@@ -50,20 +47,12 @@ if (!$page) $page = 1; // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
 // 탈퇴회원수
-$sql = " select count(*) as cnt
+$sql = " select count(*) as cnt {$sql_common} {$sql_search} and mb_leave_date <> '' {$sql_order} ";
-            {$sql_common}
-            {$sql_search}
-            and mb_leave_date <> ''
-            {$sql_order} ";
 $row = sql_fetch($sql);
 $leave_count = $row['cnt'];
 
 // 차단회원수
-$sql = " select count(*) as cnt
+$sql = " select count(*) as cnt {$sql_common} {$sql_search} and mb_intercept_date <> '' {$sql_order} ";
-            {$sql_common}
-            {$sql_search}
-            and mb_intercept_date <> ''
-            {$sql_order} ";
 $row = sql_fetch($sql);
 $intercept_count = $row['cnt'];
 
@@ -74,21 +63,13 @@ if (isset($sfl) || isset($stx)) // 검색일 때만 처음 버튼을 보여줌
 $g4['title'] = '회원관리';
 include_once('./admin.head.php');
 
-$sql = " select *
+$sql = " select * {$sql_common} {$sql_search} {$sql_order} limit {$from_record}, {$rows} "; 
-            {$sql_common}
-            {$sql_search}
-            {$sql_order}
-            limit {$from_record}, {$rows} ";
 $result = sql_query($sql);
 
 $colspan = 15;
 ?>
 
 <script src="<?=$g4['path']?>/js/sideview.js"></script>
-<script>
-var list_update_php = 'member_list_update.php';
-var list_delete_php = 'member_list_delete.php';
-</script>
 
 <form id="fsearch" name="fsearch" method="get">
 <fieldset>
@@ -239,20 +220,15 @@ if ($i == 0)
 </div>
 
 <?
-$pagelist = get_paging($config['cf_write_pages'], $page, $total_page, '?'.$qstr.'&amp;page=');
+echo get_paging($config['cf_write_pages'], $page, $total_page, '?'.$qstr.'&amp;page=');
 ?>
-<div class="pg">
-    <?=$pagelist?>
-</div>
 
-<?
-if (isset($stx))
-    echo '<script>document.fsearch.sfl.value = \''.$sfl.'\';</script>';
-?>
 </form>
 
-
 <script>
+<?
+if (isset($_GET['sfl'])) echo '$("#sfl").val("'.$sfl.'");'.PHP_EOL;
+?>
 function fmemberlist_submit(f)
 {
     if (!is_checked("chk[]")) {

bbs/ckeditor/upload.php

@@ -1,15 +1,12 @@
 <?php
+define('G4_EDITOR', 1);
 $g4_path = "../.."; // common.php 의 상대 경로
 include_once("$g4_path/common.php");
 
-$up_dir = $g4['path'].'/'.$ckeditor->data;; // 기본 업로드 폴더
-@mkdir($up_dir, 0707);
-@chmod($up_dir, 0707);
-
 $ym = date('ym', $g4['server_time']);
 
-$data_dir = $g4['path'].'/'.$ckeditor->data.'/'.$ym;
+$data_dir = $g4['ckeditor_data_path'].'/'.$ym;
-$data_url = $g4['url'] .'/'.$ckeditor->data.'/'.$ym;
+$data_url = $g4['ckeditor_data_url'].'/'.$ym;
 @mkdir($data_dir, 0707);
 @chmod($data_dir, 0707);
  

extend/g4s.extend.php

@@ -39,7 +39,8 @@ if (G4_EDITOR) {
     $g4['ckeditor_dir']  = 'ckeditor';
     $g4['ckeditor_url']  = $g4['bbs_url'].'/'.$g4['ckeditor_dir'];
     $g4['ckeditor_path'] = $g4['bbs_path'].'/'.$g4['ckeditor_dir'];
-    $g4['ckeditor_data'] = $g4['bbs_path'].'/'.$g4['data_dir'].'/editor';
+    $g4['ckeditor_data_path'] = $g4['data_path'].'/editor';
+    $g4['ckeditor_data_url']  = $g4['data_url'].'/editor';
 
     include_once($g4['ckeditor_path']."/ckeditor.lib.php");
 

install/install_db.php

@@ -259,11 +259,12 @@ flush(); usleep(50000);
 $file = '../data/dbconfig.php';
 $f = @fopen($file, "w");
 
-fwrite($f, "<?\n");
+fwrite($f, "<?php\n");
-fwrite($f, "\$mysql_host = '$mysql_host';\n");
+fwrite($f, "if (!defined('_GNUBOARD_')) exit;\n");
-fwrite($f, "\$mysql_user = '$mysql_user';\n");
+fwrite($f, "define('G4_MYSQL_HOST', '$mysql_host');\n");
-fwrite($f, "\$mysql_password = '$mysql_pass';\n");
+fwrite($f, "define('G4_MYSQL_USER', '$mysql_user');\n");
-fwrite($f, "\$mysql_db = '$mysql_db';\n");
+fwrite($f, "define('G4_MYSQL_PASSWORD', '$mysql_pass');\n");
+fwrite($f, "define('G4_MYSQL_DB', '$mysql_db');\n");
 fwrite($f, "?>");
 
 fclose($f);
@@ -273,15 +274,18 @@ echo "<script>document.frminstall2.job3.value='DB설정 파일 생성 완료';</
 flush(); usleep(50000);
 
 
-// 1.00.09 - data/log 삽입
 // 디렉토리 생성
-$dir_arr = array ("../data",
+$dir_arr = array (
-                  "../data/file",
+    "../data",
-                  "../data/log",
+    "../data/cache",
-                  "../data/member",
+    "../data/cache/captcha",
-                  "../data/session",
+    "../data/cache/latest",
-                  "../data/$g4[cheditor4]",
+    "../data/editor",
-                  "../data/$g4[editor]");
+    "../data/file",
+    "../data/log",
+    "../data/member",
+    "../data/session"
+);
 for ($i=0; $i<count($dir_arr); $i++)
 {
     @mkdir($dir_arr[$i], 0707);
@@ -298,8 +302,6 @@ Deny from all
 EOD;
 fwrite($f, $str);
 fclose($f);
-
-//@rename("../install", "../install.bak");
 //-------------------------------------------------------------------------------------------------
 
 echo "<script language='JavaScript'>document.frminstall2.status_bar.value += '■';</script>\n";