harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wiki deletion works

Browse Source
This commit is contained in:
Andrew Manning 2016-05-27 20:20:33 -04:00
parent d554681174
commit 97e6b7c4ba
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wiki.php
View File

@ -103,7 +103,7 @@ function wiki_create_wiki($channel, $observer_hash, $name, $acl) {
} }
function wiki_delete_wiki($resource_id) { function wiki_delete_wiki($resource_id) {
$item = q("SELECT id FROM item WHERE resource_type = '%s' AND resource_id = '%s' AND item_deleted = 0 limit 1", $item = q("SELECT id, object FROM item WHERE resource_type = '%s' AND resource_id = '%s' AND item_deleted = 0 limit 1",
dbesc(WIKI_ITEM_RESOURCE_TYPE), dbesc(WIKI_ITEM_RESOURCE_TYPE),
dbesc($resource_id) dbesc($resource_id)
); );
@ -112,11 +112,15 @@ function wiki_delete_wiki($resource_id) {
} else { } else {
$drop = drop_item($item[0]['id'],false,DROPITEM_NORMAL,true); $drop = drop_item($item[0]['id'],false,DROPITEM_NORMAL,true);
$object = json_decode($item[0]['object'], true); $object = json_decode($item[0]['object'], true);
$abs_path = __DIR__ . '/../' . $object['path']; if(!realpath(__DIR__ . '/../' . $object['path'])) {
logger('path to delete: ' . $abs_path); return array('items' => null, 'success' => false);
$pathdel = true; }
//$pathdel = rrmdir($abs_path); // Path to wiki exists
$abs_path = realpath(__DIR__ . '/../' . $object['path']);
$pathdel = rrmdir($abs_path);
if($pathdel) {
info('Wiki deleted successfully');
}
return array('item' => $item, 'success' => (($drop === 1 && $pathdel) ? true : false)); return array('item' => $item, 'success' => (($drop === 1 && $pathdel) ? true : false));
} }
} }

2
view/tpl/wiki.tpl
View File

@ -105,7 +105,9 @@ function wiki_delete_wiki(wikiName, resource_id) {
if (data.success) { if (data.success) {
window.console.log('Wiki deleted'); window.console.log('Wiki deleted');
// Refresh list and redirect page as necessary // Refresh list and redirect page as necessary
window.location = 'wiki/{{$channel}}';
} else { } else {
alert('Error deleting wiki!');
window.console.log('Error deleting wiki.'); window.console.log('Error deleting wiki.');
} }
}, 'json'); }, 'json');