g4s merge 충돌수정

bbs/ajax.autosave.php

@@ -0,0 +1,20 @@
+<?php
+include_once('./_common.php');
+
+if (!$is_member) die('0');
+
+$uid     = escape_trim($_REQUEST['uid']);
+$subject = escape_trim(stripslashes($_REQUEST['subject']));
+$content = escape_trim(stripslashes($_REQUEST['content']));
+
+if ($subject && $content) {
+    $sql = " select count(*) as cnt from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' and as_subject = '$subject' and as_content = '$content' ";
+    $row = sql_fetch($sql);
+    if (!$row['cnt']) {
+        $sql = " insert into {$g4['autosave_table']} set mb_id = '{$member['mb_id']}', as_uid = '{$uid}', as_subject = '$subject', as_content = '$content', as_datetime = '".G4_TIME_YMDHIS."' on duplicate key update as_subject = '$subject', as_content = '$content', as_datetime = '".G4_TIME_YMDHIS."' ";
+        $result = sql_query($sql, false);
+
+        echo autosave_count($member['mb_id']);
+    }
+}
+?>

bbs/ajax.autosavedel.php

@@ -0,0 +1,15 @@
+<?php
+include_once("./_common.php");
+
+if (!$is_member) die("0");
+
+$as_id = (int)$_REQUEST['as_id'];
+
+$sql = " delete from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' and as_id = {$as_id} ";
+$result = sql_query($sql);
+if (!$result) {
+    echo "-1";
+}
+
+echo autosave_count($member['mb_id']);
+?>

bbs/ajax.autosavelist.php

@@ -0,0 +1,21 @@
+<?php
+include_once('./_common.php');
+
+if (!$is_member) die('');
+
+$sql = " select as_id, as_uid, as_subject, as_datetime from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' order by as_id desc ";
+$result = sql_query($sql);
+echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+echo "<list>\n";
+for ($i=0; $row=sql_fetch_array($result); $i++) {
+    $subject  = htmlspecialchars(utf8_strcut($row['as_subject'], 25), ENT_QUOTES);
+    $datetime = substr($row['as_datetime'],2,14);
+    echo "<item>\n";
+    echo "<id>{$row['as_id']}</id>\n";
+    echo "<uid>{$row['as_uid']}</uid>\n";
+    echo "<subject><![CDATA[{$subject}]]></subject>\n";
+    echo "<datetime>{$datetime}</datetime>\n";
+    echo "</item>\n";
+}
+echo "</list>";
+?>

bbs/ajax.autosaveload.php

@@ -0,0 +1,18 @@
+<?php
+include_once('./_common.php');
+
+if (!$is_member) die('');
+
+$as_id = (int)$_REQUEST['as_id'];
+
+$sql = " select as_subject, as_content from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' and as_id = {$as_id} ";
+$row = sql_fetch($sql);
+$subject = $row['as_subject'];
+$content = $row['as_content'];
+
+echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+echo "<item>\n";
+echo "<subject><![CDATA[{$subject}]]></subject>\n";
+echo "<content><![CDATA[{$content}]]></content>\n";
+echo "</item>\n";
+?>

bbs/write.php

@@ -380,6 +380,9 @@ if (!G4_IS_MOBILE && $board['bo_use_dhtml_editor'] && $member['mb_level'] >= $bo
 }
 $editor_html = editor_html('wr_content', $content, $is_dhtml_editor);
 
+// 임시 저장된 글 갯수
+$autosave_count = autosave_count($member['mb_id']);
+
 include_once(G4_PATH.'/head.sub.php');
 @include_once ($board_skin_path.'/write.head.skin.php');
 include_once('./board_head.php');

bbs/write_update.php

@@ -555,6 +555,9 @@ for ($i=(int)$row['max_bf_no']; $i>=0; $i--)
 // 파일의 갯수를 게시물에 업데이트 한다.
 $row = sql_fetch(" select count(*) as cnt from {$g4['board_file_table']} where bo_table = '{$bo_table}' and wr_id = '{$wr_id}' ");
 sql_query(" update {$write_table} set wr_file = '{$row['cnt']}' where wr_id = '{$wr_id}' ");
+
+// 자동저장된 레코드를 삭제한다.
+sql_query(" delete from g4s_autosave where as_uid = '{$uid}' ");
 //------------------------------------------------------------------------------
 
 // 비밀글이라면 세션에 비밀글의 아이디를 저장한다. 자신의 글은 다시 패스워드를 묻지 않기 위함