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_domain_del.php | 103 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 44 deletions(-)
diff --git a/interface/web/sites/web_domain_del.php b/interface/web/sites/web_domain_del.php
index a69923f..7ee5d13 100644
--- a/interface/web/sites/web_domain_del.php
+++ b/interface/web/sites/web_domain_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');
@@ -52,59 +52,74 @@
function onBeforeDelete() {
global $app; $conf;
-
- if($app->tform->checkPerm($this->id,'d') == false) $app->error($app->lng('error_no_delete_permission'));
-
- //* Delete all records that belog to this zone.
- $records = $app->db->queryAllRecords("SELECT domain_id FROM web_domain WHERE parent_domain_id = '".intval($this->id)."' AND type != 'vhost'");
+
+ if($app->tform->checkPerm($this->id, 'd') == false) $app->error($app->lng('error_no_delete_permission'));
+
+ //* Delete all records that belong to this web.
+ $records = $app->db->queryAllRecords("SELECT domain_id FROM web_domain WHERE parent_domain_id = '".$app->functions->intval($this->id)."' AND type != 'vhost'");
foreach($records as $rec) {
- $app->db->datalogDelete('web_domain','domain_id',$rec['domain_id']);
+ $app->db->datalogDelete('web_domain', 'domain_id', $rec['domain_id']);
}
-
- //* Delete all records that belog to this zone.
- $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = '".intval($this->id)."'");
+
+ //* Delete all records that belong to this web.
+ $records = $app->db->queryAllRecords("SELECT ftp_user_id FROM ftp_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
foreach($records as $rec) {
- $app->db->datalogDelete('ftp_user','ftp_user_id',$rec['ftp_user_id']);
+ $app->db->datalogDelete('ftp_user', 'ftp_user_id', $rec['ftp_user_id']);
}
-
+
+ //* Delete all records that belong to this web.
+ $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('shell_user', 'shell_user_id', $rec['shell_user_id']);
+ }
+
+ //* Delete all records that belong to this web.
+ $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('cron', 'id', $rec['id']);
+ }
+
+ //* Delete all records that belong to this web
+ $records = $app->db->queryAllRecords("SELECT webdav_user_id FROM webdav_user WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('webdav_user', 'webdav_user_id', $rec['webdav_user_id']);
+ }
+
+ //* Delete all records that belong to this web
+ $records = $app->db->queryAllRecords("SELECT backup_id FROM web_backup WHERE parent_domain_id = '".$app->functions->intval($this->id)."'");
+ foreach($records as $rec) {
+ $app->db->datalogDelete('web_backup', 'backup_id', $rec['backup_id']);
+ }
+
//* Delete all records that belog to this web.
- $records = $app->db->queryAllRecords("SELECT shell_user_id FROM shell_user WHERE parent_domain_id = '".intval($this->id)."'");
- foreach($records as $rec) {
- $app->db->datalogDelete('shell_user','shell_user_id',$rec['shell_user_id']);
+ $web_domain = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
+ if($web_domain['domain'] != ''){
+ $aps_instances = $app->db->queryAllRecords("SELECT instance_id FROM aps_instances_settings WHERE name = 'main_domain' AND value = '".$app->db->quote($web_domain['domain'])."'");
+ if(is_array($aps_instances) && !empty($aps_instances)){
+ foreach($aps_instances as $aps_instance){
+ if($aps_instance['instance_id'] > 0){
+ $app->db->datalogDelete('aps_instances_settings', 'instance_id', $aps_instance['instance_id']);
+ $app->db->datalogDelete('aps_instances', 'id', $aps_instance['instance_id']);
+ }
+ }
+ }
}
-
- //* Delete all records that belog to this web.
- $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = '".intval($this->id)."'");
- foreach($records as $rec) {
- $app->db->datalogDelete('cron','id',$rec['id']);
- }
-
- //* Delete all records that belog to this web.
- $records = $app->db->queryAllRecords("SELECT id FROM cron WHERE parent_domain_id = '".intval($this->id)."'");
- foreach($records as $rec) {
- $app->db->datalogDelete('cron','id',$rec['id']);
- }
-
- //* Delete all records that belog to this web
- $records = $app->db->queryAllRecords("SELECT webdav_user_id FROM webdav_user WHERE parent_domain_id = '".intval($this->id)."'");
- foreach($records as $rec) {
- $app->db->datalogDelete('webdav_user','webdav_user_id',$rec['webdav_user_id']);
- }
-
+
//* Delete all web folders
- $records = $app->db->queryAllRecords("SELECT web_folder_id FROM web_folder WHERE parent_domain_id = '".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