From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/sites/web_folder_del.php | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/interface/web/sites/web_folder_del.php b/interface/web/sites/web_folder_del.php
index 81faa65..c7b6038 100644
--- a/interface/web/sites/web_folder_del.php
+++ b/interface/web/sites/web_folder_del.php
@@ -40,8 +40,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,19 +52,20 @@
class page_action extends tform_actions {
function onBeforeDelete() {
global $app; $conf;
-
- if($app->tform->checkPerm($this->id,'d') == false) $app->error($app->lng('error_no_delete_permission'));
-
+
+ if($app->tform->checkPerm($this->id, 'd') == false) $app->error($app->lng('error_no_delete_permission'));
+
// Delete all users that belong to this folder.
- $records = $app->db->queryAllRecords("SELECT web_folder_user_id FROM web_folder_user WHERE web_folder_id = '".intval($this->id)."'");
+ $records = $app->db->queryAllRecords("SELECT web_folder_user_id FROM web_folder_user WHERE web_folder_id = ?", $this->id);
foreach($records as $rec) {
- $app->db->datalogDelete('web_folder_user','web_folder_user_id',$rec['web_folder_user_id']);
+ $app->db->datalogDelete('web_folder_user', 'web_folder_user_id', $rec['web_folder_user_id']);
}
unset($records);
}
+
}
$page = new page_action;
$page->onDelete();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1