Skip to content

Commit

Permalink
Delete access files when visibility changed to 'none' (#413)
Browse files Browse the repository at this point in the history 
* Fix for Issue #408

* Add Group ID in overview of Accounts Tool

* Modify on user changes (Tool Account Settings)

* Modify on user changes (Tool Account Settings) (corrections)

* Fix issue reported by user losttrip
https://forum.wbce.org/viewtopic.php?id=2762

* Delete access files when visibility changed to 'none'
or when page moved to trash

* Delete access files when visibility changed to 'none'
or when page moved to trash

* Delete access files when visibility changed to 'none'
or when page moved to trash

* Delete access files when visibility changed to 'none'
or when page moved to trash
  • Loading branch information
@WebDesignWorx @instantflorian
WebDesignWorx authored and instantflorian committed Apr 13, 2019
1 parent 470f861 commit 239e113
Show file tree
Hide file tree
Showing 4 changed files with 279 additions and 297 deletions.
80 changes: 34 additions & 46 deletions wbce/admin/pages/delete.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,73 +11,44 @@
*/

// Create new admin object and print admin header
require('../../config.php');
require_once(WB_PATH.'/framework/class.admin.php');
require '../../config.php';
$admin = new admin('Pages', 'pages_delete');

// Include the WB functions file
require_once(WB_PATH.'/framework/functions.php');


if( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) )
{
if ( (!($page_id = $admin->checkIDKEY('page_id', 0, $_SERVER['REQUEST_METHOD']))) ) {
$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS']);
exit();
}

/*
// Get page id
if(!isset($_GET['page_id']) || !is_numeric($_GET['page_id'])) {
header("Location: index.php");
exit(0);
} else {
$page_id = $_GET['page_id'];
}
*/
// Get perms
if (!$admin->get_page_permission($page_id,'admin')) {
$admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']);
}


// Find out more about the page
$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'";
$results = $database->query($query);
if($database->is_error()) {
$resPage = $database->query("SELECT * FROM {TP}pages WHERE page_id = '$page_id'");
if ($database->is_error()) {
$admin->print_error($database->get_error());
}
if($results->numRows() == 0) {
if ($resPage->numRows() == 0) {
$admin->print_error($MESSAGE['PAGES_NOT_FOUND']);
}

$results_array = $results->fetchRow();
$aPage = $resPage->fetchRow(MYSQLI_ASSOC);
$visibility = $aPage['visibility'];

$sFilePath = getAccessFilePath($page_id);
if (file_exists($sFilePath)) {
unlink($sFilePath);
}

$visibility = $results_array['visibility'];

// Check if we should delete it or just set the visibility to 'deleted'
if(PAGE_TRASH != 'disabled' AND $visibility != 'deleted') {
if (PAGE_TRASH != 'disabled' AND $visibility != 'deleted') {
// Page trash is enabled and page has not yet been deleted
// Function to change all child pages visibility to deleted
function trash_subs($parent = 0) {
global $database;
// Query pages
$query_menu = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' ORDER BY position ASC");
// Check if there are any pages to show
if($query_menu->numRows() > 0) {
// Loop through pages
while($page = $query_menu->fetchRow()) {
// Update the page visibility to 'deleted'
$database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'deleted' WHERE page_id = '".$page['page_id']."' LIMIT 1");
// Run this function again for all sub-pages
trash_subs($page['page_id']);
}
}
}

// Update the page visibility to 'deleted'
$database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'deleted' WHERE page_id = '$page_id.' LIMIT 1");

// Run trash subs for this page
trash_subs($page_id);
$database->query("UPDATE `{TP}pages` SET `visibility` = 'deleted' WHERE `page_id` = '$page_id.' LIMIT 1");
trash_subs($page_id); // Run trash subs for this page
} else {
// Really dump the page
// Delete page subs
Expand All @@ -90,11 +61,28 @@ function trash_subs($parent = 0) {
}

// Check if there is a db error, otherwise say successful
if($database->is_error()) {
if ($database->is_error()) {
$admin->print_error($database->get_error());
} else {
$admin->print_success($MESSAGE['PAGES_DELETED']);
}

// Print admin footer
$admin->print_footer();

// Function to change all child pages visibility to deleted
function trash_subs($iParentID = 0) {
global $database;
// Query pages
$rChildPages = $database->query("SELECT `page_id` FROM `{TP}pages` WHERE `parent` = '$iParentID' ORDER BY `position` ASC");
// Check if there are any pages to show
if ($rChildPages->numRows() > 0) {
// Loop through pages
while($row = $rChildPages->fetchRow()) {
// Update the page visibility to 'deleted'
$database->query("UPDATE `{TP}pages` SET `visibility` = 'deleted' WHERE `page_id` = '".$row['page_id']."' LIMIT 1");
// Run this function again for all sub-pages
trash_subs($row['page_id']);
}
}
}
93 changes: 43 additions & 50 deletions wbce/admin/pages/restore.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,28 @@

// Get page id
if(!isset($_GET['page_id']) OR !is_numeric($_GET['page_id'])) {
header("Location: index.php");
exit(0);
header("Location: index.php");
exit(0);
} else {
$page_id = $_GET['page_id'];
$page_id = $_GET['page_id'];
}

// Create new admin object and print admin header
require('../../config.php');
require_once(WB_PATH.'/framework/class.admin.php');
require '../../config.php';
$admin = new admin('Pages', 'pages_delete');

// Include the WB functions file
require_once(WB_PATH.'/framework/functions.php');

// Get perms
$results = $database->query("SELECT admin_groups,admin_users FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'");
$results_array = $results->fetchRow();

// Find out more about the page
$query = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '$page_id'";
$results = $database->query($query);
// Get Page Data from Database
$resPage = $database->query("SELECT * FROM `{TP}pages` WHERE `page_id` = ".$page_id);
if($database->is_error()) {
$admin->print_error($database->get_error());
$admin->print_error($database->get_error());
}
if($results->numRows() == 0) {
$admin->print_error($MESSAGE['PAGES_NOT_FOUND']);
if($resPage->numRows() == 0) {
$admin->print_error($MESSAGE['PAGES_NOT_FOUND']);
}
$results_array = $results->fetchRow();
$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups']));
$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users']));
$aPage = $resPage->fetchRow(MYSQLI_ASSOC);
$old_admin_groups = explode(',', str_replace('_', '', $aPage['admin_groups']));
$old_admin_users = explode(',', str_replace('_', '', $aPage['admin_users']));

$in_old_group = FALSE;
foreach($admin->get_groups_id() as $cur_gid){
Expand All @@ -50,47 +42,48 @@
}
}
if((!$in_old_group) AND !is_numeric(array_search($admin->get_user_id(), $old_admin_users))) {
$admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']);
$admin->print_error($MESSAGE['PAGES_INSUFFICIENT_PERMISSIONS']);
}

$visibility = $results_array['visibility'];
$visibility = $aPage['visibility'];

if(PAGE_TRASH) {
if($visibility == 'deleted') {
// Function to change all child pages visibility to deleted
function restore_subs($parent = 0) {
global $database;
// Query pages
$query_menu = $database->query("SELECT page_id FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' ORDER BY position ASC");
// Check if there are any pages to show
if($query_menu->numRows() > 0) {
// Loop through pages
while($page = $query_menu->fetchRow()) {
// Update the page visibility to 'deleted'
$database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'public' WHERE page_id = '".$page['page_id']."' LIMIT 1");
// Run this function again for all sub-pages
restore_subs($page['page_id']);
}
}
}

// Update the page visibility to 'deleted'
$database->query("UPDATE ".TABLE_PREFIX."pages SET visibility = 'public' WHERE page_id = '$page_id.' LIMIT 1");

// Run trash subs for this page
restore_subs($page_id);

}
if($visibility == 'deleted') {
// Update the page visibility to 'deleted'
$database->query("UPDATE `{TP}pages` SET `visibility` = 'public' WHERE `page_id` = '$page_id.' LIMIT 1");
// Run trash subs for this page
restore_subs($page_id);
}
}

$sFilePath = getAccessFilePath($page_id);
if (!file_exists($sFilePath)) {
create_access_file($sFilePath, $page_id, $aPage['level']);
}

// Check if there is a db error, otherwise say successful
if($database->is_error()) {
$admin->print_error($database->get_error());
$admin->print_error($database->get_error());
} else {
$admin->print_success($MESSAGE['PAGES_RESTORED']);
$admin->print_success($MESSAGE['PAGES_RESTORED']);
}

// Print admin footer
$admin->print_footer();

?>
// Function to change all child pages visibility to deleted
function restore_subs($parent = 0) {
global $database;
// Query pages
$query_menu = $database->query("SELECT `page_id` FROM `{TP}pages` WHERE `parent` = '".$parent."' ORDER BY `position` ASC");
// Check if there are any pages to show
if($query_menu->numRows() > 0) {
// Loop through pages
while($page = $query_menu->fetchRow()) {
// Update the page visibility to 'deleted'
$database->query("UPDATE `{TP}pages` SET `visibility` = 'public' WHERE `page_id` = '".$page['page_id']."' LIMIT 1");
// Run this function again for all sub-pages
restore_subs($page['page_id']);
}
}
}
Loading

0 comments on commit 239e113

Please sign in to comment.