From ebd0e986ed11f2a34fb58cdd33efbfab192083ad Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Fri, 22 Apr 2016 05:26:17 -0400 Subject: [PATCH] Added PHP 7 check in installer and updater. --- interface/web/sites/web_vhost_subdomain_del.php | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/interface/web/sites/web_vhost_subdomain_del.php b/interface/web/sites/web_vhost_subdomain_del.php index 9d3609b..f64ff66 100644 --- a/interface/web/sites/web_vhost_subdomain_del.php +++ b/interface/web/sites/web_vhost_subdomain_del.php @@ -39,8 +39,8 @@ * End Form configuration ******************************************/ -require_once('../../lib/config.inc.php'); -require_once('../../lib/app.inc.php'); +require_once '../../lib/config.inc.php'; +require_once '../../lib/app.inc.php'; //* Check permissions for module $app->auth->check_module_permissions('sites'); @@ -51,22 +51,23 @@ function onBeforeDelete() { global $app; $conf; - + //* Delete all web folders - $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = '".$app->functions->intval($this->id)."'"); - foreach($records as $rec) { - //* Delete all web folder users - $records2 = $app->db->queryAllRecords("SELECT web_folder_user_id FROM web_folder_user WHERE web_folder_id = '".$rec['web_folder_id']."'"); + $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = '".$app->functions->intval($this->id)."'"); + foreach($records as $rec) { + //* Delete all web folder users + $records2 = $app->db->queryAllRecords("SELECT web_folder_user_id FROM web_folder_user WHERE web_folder_id = '".$app->functions->intval($rec['web_folder_id'])."'"); foreach($records2 as $rec2) { - $app->db->datalogDelete('web_folder_user','web_folder_user_id',$rec2['web_folder_user_id']); - } - $app->db->datalogDelete('web_folder','web_folder_id',$rec['web_folder_id']); - } + $app->db->datalogDelete('web_folder_user', 'web_folder_user_id', $rec2['web_folder_user_id']); + } + $app->db->datalogDelete('web_folder', 'web_folder_id', $rec['web_folder_id']); + } } + } $page = new page_action; $page->onDelete(); -?> \ No newline at end of file +?> -- Gitblit v1.9.1