FbIN/htmly
1
0
Fork 0
mirror of https://github.com/danpros/htmly.git synced 2026-04-22 21:46:22 +05:30
Code Issues Projects Releases Packages Wiki Activity

Fix autosave #789

Browse source 
Track last saved draft than compare the new filename against the old filename when saving.
This commit is contained in:
danpros 2024-10-10 12:09:36 +07:00
commit 9beafa63bb
7 changed files with 59 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

53
system/admin/admin.php
View file

@ -120,7 +120,7 @@ function remove_accent($str)
} }
// Add content // Add content
function add_content($title, $tag, $url, $content, $user, $draft, $category, $type, $description = null, $media = null, $dateTime = null, $autoSave = null) function add_content($title, $tag, $url, $content, $user, $draft, $category, $type, $description = null, $media = null, $dateTime = null, $autoSave = null, $oldfile = null)
{ {
if (!is_null($autoSave)) { if (!is_null($autoSave)) {
$draft = 'draft'; $draft = 'draft';
@ -234,12 +234,20 @@ function add_content($title, $tag, $url, $content, $user, $draft, $category, $ty
$dir = 'content/' . $user . '/blog/' . $category. '/draft/'; $dir = 'content/' . $user . '/blog/' . $category. '/draft/';
} }
if (is_dir($dir)) { if (!is_dir($dir)) {
file_put_contents($dir . $filename, print_r($post_content, true), LOCK_EX);
} else {
mkdir($dir, 0775, true); mkdir($dir, 0775, true);
file_put_contents($dir . $filename, print_r($post_content, true), LOCK_EX);
} }
$oldfile = $oldfile;
$newfile = $dir . $filename;
if ($oldfile !== $newfile) {
if (file_exists($oldfile)) {
rename($oldfile, $newfile);
}
}
file_put_contents($newfile, print_r($post_content, true), LOCK_EX);
if (empty($draft)) { if (empty($draft)) {
$draftFile = 'content/' . $user . '/blog/' . $category. '/draft/' . $filename; $draftFile = 'content/' . $user . '/blog/' . $category. '/draft/' . $filename;
@ -255,7 +263,7 @@ function add_content($title, $tag, $url, $content, $user, $draft, $category, $ty
clear_post_cache($post_date, $post_tag, $post_url, $dir . $filename, $category, $type); clear_post_cache($post_date, $post_tag, $post_url, $dir . $filename, $category, $type);
if (!is_null($autoSave)) { if (!is_null($autoSave)) {
return "Auto Saved"; return json_encode(array('message' => 'Auto Saved', 'file' => $newfile));
} }
if (empty($draft)) { if (empty($draft)) {
@ -482,7 +490,7 @@ function edit_content($title, $tag, $url, $content, $oldfile, $revertPost, $publ
} }
if (!is_null($autoSave)) { if (!is_null($autoSave)) {
return "Auto Saved"; return json_encode(array('message' => 'Auto Saved', 'file' => $newfile));
} }
if ($destination == 'post') { if ($destination == 'post') {
@ -517,12 +525,13 @@ function edit_content($title, $tag, $url, $content, $oldfile, $revertPost, $publ
} }
// Add static page // Add static page
function add_page($title, $url, $content, $draft, $description = null, $autoSave = null) function add_page($title, $url, $content, $draft, $description = null, $autoSave = null, $oldfile = null)
{ {
if (!is_null($autoSave)) { if (!is_null($autoSave)) {
$draft = 'draft'; $draft = 'draft';
} }
$post_title = safe_html($title); $post_title = safe_html($title);
$newfile = '';
$post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url))); $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
$description = safe_html($description); $description = safe_html($description);
if ($description !== null) { if ($description !== null) {
@ -565,7 +574,15 @@ function add_page($title, $url, $content, $draft, $description = null, $autoSave
} else { } else {
if (!is_dir($dirDraft)) { if (!is_dir($dirDraft)) {
mkdir($dirDraft, 0775, true); mkdir($dirDraft, 0775, true);
} }
$oldfile = $oldfile;
$newfile = $dirDraft . $filename;
if ($oldfile !== $newfile) {
if (file_exists($oldfile)) {
rename($oldfile, $newfile);
}
}
file_put_contents($dirDraft . $filename, print_r($post_content, true), LOCK_EX); file_put_contents($dirDraft . $filename, print_r($post_content, true), LOCK_EX);
} }
@ -573,7 +590,7 @@ function add_page($title, $url, $content, $draft, $description = null, $autoSave
clear_page_cache($post_url); clear_page_cache($post_url);
if (!is_null($autoSave)) { if (!is_null($autoSave)) {
return "Auto Saved"; return json_encode(array('message' => 'Auto Saved', 'file' => $newfile));
} }
if (empty($draft)) { if (empty($draft)) {
@ -587,12 +604,13 @@ function add_page($title, $url, $content, $draft, $description = null, $autoSave
} }
// Add static sub page // Add static sub page
function add_sub_page($title, $url, $content, $static, $draft, $description = null, $autoSave = null) function add_sub_page($title, $url, $content, $static, $draft, $description = null, $autoSave = null, $oldfile = null)
{ {
if (!is_null($autoSave)) { if (!is_null($autoSave)) {
$draft = 'draft'; $draft = 'draft';
} }
$post = find_page($static); $post = find_page($static);
$newfile = '';
$static = pathinfo($post['current']->md, PATHINFO_FILENAME); $static = pathinfo($post['current']->md, PATHINFO_FILENAME);
$post_title = safe_html($title); $post_title = safe_html($title);
$post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url))); $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
@ -638,11 +656,19 @@ function add_sub_page($title, $url, $content, $static, $draft, $description = nu
if (!is_dir($dirDraft)) { if (!is_dir($dirDraft)) {
mkdir($dirDraft, 0775, true); mkdir($dirDraft, 0775, true);
} }
$oldfile = $oldfile;
$newfile = $dirDraft . $filename;
if ($oldfile !== $newfile) {
if (file_exists($oldfile)) {
rename($oldfile, $newfile);
}
}
file_put_contents($dirDraft . $filename, print_r($post_content, true), LOCK_EX); file_put_contents($dirDraft . $filename, print_r($post_content, true), LOCK_EX);
} }
if (!is_null($autoSave)) { if (!is_null($autoSave)) {
return "Auto Saved"; return json_encode(array('message' => 'Auto Saved', 'file' => $newfile));
} }
rebuilt_cache('all'); rebuilt_cache('all');
@ -662,6 +688,7 @@ function edit_page($title, $url, $content, $oldfile, $revertPage, $publishDraft,
} else { } else {
$num = null; $num = null;
} }
$newfile = '';
$views = array(); $views = array();
$viewsFile = "content/data/views.json"; $viewsFile = "content/data/views.json";
$post_title = safe_html($title); $post_title = safe_html($title);
@ -788,7 +815,7 @@ function edit_page($title, $url, $content, $oldfile, $revertPage, $publishDraft,
} }
if (!is_null($autoSave)) { if (!is_null($autoSave)) {
return "Auto Saved"; return json_encode(array('message' => 'Auto Saved', 'file' => $newfile));
} }
if ($destination == 'post') { if ($destination == 'post') {

4
system/admin/views/add-content.html.php
View file

@ -172,6 +172,7 @@ $( function() {
<?php if ($type == 'is_post'):?> <?php if ($type == 'is_post'):?>
<input type="hidden" name="is_post" value="is_post"> <input type="hidden" name="is_post" value="is_post">
<?php endif;?> <?php endif;?>
<input id="oldfile" type="hidden" name="oldfile" class="text"/>
<input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>"> <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
</div> </div>
</div> </div>
@ -300,7 +301,6 @@ $( function() {
var base_path = '<?php echo site_url() ?>'; var base_path = '<?php echo site_url() ?>';
var initial_image = '<?php echo $images;?>'; var initial_image = '<?php echo $images;?>';
var parent_page = ''; var parent_page = '';
var oldfile = '';
var addEdit = 'add'; var addEdit = 'add';
var saveInterval = 60000; var saveInterval = 60000;
</script> </script>
@ -341,7 +341,7 @@ $('.img-container').on("click", ".the-img", function(e) {
document.getElementById('hideButton').addEventListener('click', toggleDivs); document.getElementById('hideButton').addEventListener('click', toggleDivs);
</script> </script>
<?php if (config('autosave.enable') == 'true' ):?> <?php if (config('autosave.enable') == 'true' ):?>
<script src="<?php echo site_url();?>system/resources/js/save_draft.js"></script> <script src="<?php echo site_url();?>system/resources/js/save_draft.js?v=1"></script>
<?php endif;?> <?php endif;?>
<script> <script>
if (localStorage.getItem("preview-state") === "open") { if (localStorage.getItem("preview-state") === "open") {

4
system/admin/views/add-page.html.php
View file

@ -46,6 +46,7 @@
<textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) {if (empty($postContent)) {echo 'error';}} ?>" name="content" cols="20" rows="10"><?php if (isset($postContent)) {echo $postContent;} ?></textarea> <textarea id="wmd-input" class="form-control wmd-input <?php if (isset($postContent)) {if (empty($postContent)) {echo 'error';}} ?>" name="content" cols="20" rows="10"><?php if (isset($postContent)) {echo $postContent;} ?></textarea>
<br> <br>
<input type="hidden" id="pType" name="posttype" value="<?php echo $type; ?>"> <input type="hidden" id="pType" name="posttype" value="<?php echo $type; ?>">
<input id="oldfile" type="hidden" name="oldfile" class="text"/>
<input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>"> <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
<?php if ($type == 'is_page' || $type == 'is_subpage') :?> <?php if ($type == 'is_page' || $type == 'is_subpage') :?>
<input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Publish');?>"/> <input type="submit" name="draft" class="btn btn-primary draft" value="<?php echo i18n('Save_as_draft');?>"/> <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Publish');?>"/> <input type="submit" name="draft" class="btn btn-primary draft" value="<?php echo i18n('Save_as_draft');?>"/>
@ -126,7 +127,6 @@
var base_path = '<?php echo site_url() ?>'; var base_path = '<?php echo site_url() ?>';
var initial_image = '<?php echo $images;?>'; var initial_image = '<?php echo $images;?>';
var parent_page = '<?php echo isset($parent) ? $parent : '';?>'; var parent_page = '<?php echo isset($parent) ? $parent : '';?>';
var oldfile = '';
var addEdit = 'add'; var addEdit = 'add';
var saveInterval = 60000; var saveInterval = 60000;
</script> </script>
@ -167,7 +167,7 @@ $('.img-container').on("click", ".the-img", function(e) {
</script> </script>
<?php if (config('autosave.enable') == 'true' ):?> <?php if (config('autosave.enable') == 'true' ):?>
<?php if ($type == 'is_page' || $type == 'is_subpage') :?> <?php if ($type == 'is_page' || $type == 'is_subpage') :?>
<script src="<?php echo site_url();?>system/resources/js/save_draft.js"></script> <script src="<?php echo site_url();?>system/resources/js/save_draft.js?v=1"></script>
<?php endif;?> <?php endif;?>
<?php endif;?> <?php endif;?>
<script> <script>

5
system/admin/views/edit-content.html.php
View file

@ -218,7 +218,7 @@ $( function() {
<?php if ($type == 'is_post'):?> <?php if ($type == 'is_post'):?>
<input type="hidden" name="is_post" value="is_post"> <input type="hidden" name="is_post" value="is_post">
<?php endif;?> <?php endif;?>
<input type="hidden" name="oldfile" class="text" value="<?php echo $filename; ?>"/> <input id="oldfile" type="hidden" name="oldfile" class="text" value="<?php echo $filename; ?>"/>
<input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>"> <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
</div> </div>
</div> </div>
@ -350,7 +350,6 @@ $( function() {
var base_path = '<?php echo site_url() ?>'; var base_path = '<?php echo site_url() ?>';
var initial_image = '<?php echo $images;?>'; var initial_image = '<?php echo $images;?>';
var parent_page = ''; var parent_page = '';
var oldfile = '<?php echo $filename;?>';
var addEdit = 'edit'; var addEdit = 'edit';
var saveInterval = 60000; var saveInterval = 60000;
</script> </script>
@ -392,7 +391,7 @@ $('.img-container').on("click", ".the-img", function(e) {
</script> </script>
<?php if (config('autosave.enable') == 'true' ):?> <?php if (config('autosave.enable') == 'true' ):?>
<?php if ($isdraft[4] == 'draft') : ?> <?php if ($isdraft[4] == 'draft') : ?>
<script src="<?php echo site_url();?>system/resources/js/save_draft.js"></script> <script src="<?php echo site_url();?>system/resources/js/save_draft.js?v=1"></script>
<?php endif;?> <?php endif;?>
<?php endif;?> <?php endif;?>
<script> <script>

7
system/admin/views/edit-page.html.php
View file

@ -151,10 +151,10 @@ $images = image_gallery(null, 1, 40);
<?php if($type == 'is_frontpage' || $type == 'is_profile') { ?> <?php if($type == 'is_frontpage' || $type == 'is_profile') { ?>
<input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save');?>"/> <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save');?>"/>
<?php } elseif ($type == 'is_category') {?> <?php } elseif ($type == 'is_category') {?>
<input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/> <input id="oldfile" type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
<input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save_category');?>"/> <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save_category');?>"/>
<?php } else {?> <?php } else {?>
<input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/> <input id="oldfile" type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
<?php $dd = find_subpage($oldmd); ?> <?php $dd = find_subpage($oldmd); ?>
<?php $dr = find_draft_subpage($oldmd);?> <?php $dr = find_draft_subpage($oldmd);?>
<?php if (stripos($dir . '/', '/draft/') !== false) { ?> <?php if (stripos($dir . '/', '/draft/') !== false) { ?>
@ -274,7 +274,6 @@ $images = image_gallery(null, 1, 40);
var base_path = '<?php echo site_url() ?>'; var base_path = '<?php echo site_url() ?>';
var initial_image = '<?php echo $images;?>'; var initial_image = '<?php echo $images;?>';
var parent_page = '<?php echo isset($parent) ? $parent : '';?>'; var parent_page = '<?php echo isset($parent) ? $parent : '';?>';
var oldfile = '<?php echo isset($url) ? $url : '';?>';
var addEdit = 'edit'; var addEdit = 'edit';
var saveInterval = 60000; var saveInterval = 60000;
</script> </script>
@ -319,7 +318,7 @@ $('.img-container').on("click", ".the-img", function(e) {
<?php if (config('autosave.enable') == 'true'):?> <?php if (config('autosave.enable') == 'true'):?>
<?php if ($type !== 'is_category' && $type !== 'is_profile' && $type !== 'is_frontpage') :?> <?php if ($type !== 'is_category' && $type !== 'is_profile' && $type !== 'is_frontpage') :?>
<?php if (stripos($dir . '/', '/draft/') !== false): ?> <?php if (stripos($dir . '/', '/draft/') !== false): ?>
<script src="<?php echo site_url();?>system/resources/js/save_draft.js"></script> <script src="<?php echo site_url();?>system/resources/js/save_draft.js?v=1"></script>
<?php endif;?> <?php endif;?>
<?php endif;?> <?php endif;?>
<?php endif;?> <?php endif;?>

11
system/htmly.php
View file

@ -911,6 +911,7 @@ post('/admin/autosave', function () {
$draft = 'draft'; $draft = 'draft';
$posttype = $_REQUEST['posttype']; $posttype = $_REQUEST['posttype'];
$autoSave = $_REQUEST['autoSave']; $autoSave = $_REQUEST['autoSave'];
$oldfile = $_REQUEST['oldfile'];
$addEdit = $_REQUEST['addEdit']; $addEdit = $_REQUEST['addEdit'];
$user = $_SESSION[site_url()]['user']; $user = $_SESSION[site_url()]['user'];
$role = user('role', $user); $role = user('role', $user);
@ -923,7 +924,6 @@ post('/admin/autosave', function () {
$revertPage = ''; $revertPage = '';
$revertPost = ''; $revertPost = '';
$publishDraft = ''; $publishDraft = '';
$oldfile = $_REQUEST['oldfile'];
$destination = null; $destination = null;
} }
@ -931,7 +931,7 @@ post('/admin/autosave', function () {
if ($posttype == 'is_page') { if ($posttype == 'is_page') {
if ($role === 'editor' || $role === 'admin') { if ($role === 'editor' || $role === 'admin') {
if ($addEdit == 'add') { if ($addEdit == 'add') {
$response = add_page($title, $url, $content, $draft, $description, $autoSave); $response = add_page($title, $url, $content, $draft, $description, $autoSave, $oldfile);
} else { } else {
$response = edit_page($title, $url, $content, $oldfile, $revertPage, $publishDraft, $destination, $description, null, $autoSave); $response = edit_page($title, $url, $content, $oldfile, $revertPage, $publishDraft, $destination, $description, null, $autoSave);
} }
@ -940,7 +940,7 @@ post('/admin/autosave', function () {
if ($role === 'editor' || $role === 'admin') { if ($role === 'editor' || $role === 'admin') {
$static = $_REQUEST['parent_page']; $static = $_REQUEST['parent_page'];
if ($addEdit == 'add') { if ($addEdit == 'add') {
$response = add_sub_page($title, $url, $content, $static, $draft, $description, $autoSave); $response = add_sub_page($title, $url, $content, $static, $draft, $description, $autoSave, $oldfile);
} else { } else {
$response = edit_page($title, $url, $content, $oldfile, $revertPage, $publishDraft, $destination, $description, $static, $autoSave); $response = edit_page($title, $url, $content, $oldfile, $revertPage, $publishDraft, $destination, $description, $static, $autoSave);
} }
@ -971,7 +971,7 @@ post('/admin/autosave', function () {
if (!empty($title) && !empty($tag) && !empty($content)) { if (!empty($title) && !empty($tag) && !empty($content)) {
if ($addEdit == 'add') { if ($addEdit == 'add') {
$response = add_content($title, $tag, $url, $content, $user, $draft, $category, $type, $description, $media, $dateTime, $autoSave); $response = add_content($title, $tag, $url, $content, $user, $draft, $category, $type, $description, $media, $dateTime, $autoSave, $oldfile);
} else { } else {
$arr = explode('/', $oldfile); $arr = explode('/', $oldfile);
if ($user === $arr[1] || $role === 'editor' || $role === 'admin') { if ($user === $arr[1] || $role === 'editor' || $role === 'admin') {
@ -981,8 +981,9 @@ post('/admin/autosave', function () {
} }
} }
} else { } else {
$response = "No content to save."; $response = json_encode(array('message' => 'No content to save.', 'file' => ''));
} }
header('Content-Type: application/json');
echo $response; echo $response;
} }
}); });

6
system/resources/js/save_draft.js
View file

@ -15,6 +15,7 @@ function updateData() {
var plink = $("#pLink").val(); var plink = $("#pLink").val();
var pDate = $("#pDate").val(); var pDate = $("#pDate").val();
var pTime = $("#pTime").val(); var pTime = $("#pTime").val();
var oldfile = $("#oldfile").val();
var dateTime = pDate + " " + pTime; var dateTime = pDate + " " + pTime;
var autoSave = 'autoSave'; var autoSave = 'autoSave';
@ -44,7 +45,8 @@ function updateData() {
type: "POST", type: "POST",
data: data, data: data,
success: function(response) { success: function(response) {
$("#response").html(response); $("#response").html(response.message);
$("#oldfile").val(response.file);
$("#response").fadeIn(600, function() { $("#response").fadeIn(600, function() {
$("#response").css("display", "block"); $("#response").css("display", "block");
}); });
@ -59,4 +61,4 @@ function updateData() {
$(document).ready(function() { $(document).ready(function() {
setInterval(updateData, saveInterval); setInterval(updateData, saveInterval);
}); });